fix: admin api intergration #513

completed api intergration in admin page
Planet-NULLCAST · Nov 23, 2021 · e7edc42 · e7edc42
2 parents 74e3cf2 + 0531c3e
commit e7edc42
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 27 deletions.
diff --git a/component/layout/SiteHeader/SiteHeader.jsx b/component/layout/SiteHeader/SiteHeader.jsx
@@ -145,6 +145,13 @@ export default function HomeSpotlight() {
                           </a>
                         </Link>
                       </li>
+                      <li>
+                        <Link href="/events">
+                          <a onClick={() => setMenu(true)} className="w-full font-semibold">
+                            Events
+                          </a>
+                        </Link>
+                      </li>
                       <li>
                         <Link href="/code-of-conduct">
                           <a onClick={() => setMenu(true)} className="w-full font-semibold">

diff --git a/config/config.js b/config/config.js
@@ -12,15 +12,15 @@ const postsUrl = `${apiVerUrl}/posts`;
 const allPostsUrl = "api/posts";
 const postUser = `${apiVerUrl}/posts-by-user`;
 const eventsUrl = `${apiVerUrl}/events`;
-const createEventUrl = `${apiVerUrl}/admin/event`;
 const eventIdUrl = `${apiVerUrl}/event`;
+const createEventUrl = `${apiVerUrl}/admin/event`;
 const changeStatusUrl = "api/user/post";
 const subscribeUrl = "api/subscribe";
 const loginUrl = `${apiVerUrl}/signin`;
 const signUpUrl = `${apiVerUrl}/user`;
 const userUrl = `${apiVerUrl}/user`;
 const usersUrl = `${apiVerUrl}/users`;
-const adminUrl = "api/admin";
+const adminUrl = `${apiVerUrl}/admin`;
 const tagUrl = `${apiVerUrl}/tags`;
 const postTagUrl = `${apiVerUrl}/post-tag`;
 const postTagsUrl = `${apiVerUrl}/post-tags`;
@@ -57,6 +57,7 @@ const configVars = {
   createEventUrl,
   eventIdUrl,
   changeStatusUrl,
+  createEventUrl,
   subscribeUrl,
   editorUrl,
   userUrl,

diff --git a/pages/events/[event_id].js b/pages/events/[event_id].js
@@ -13,7 +13,6 @@ export async function getServerSideProps(context) {
   try {
     const eid = context.params.event_id;
     const response = await EventService.getEventById(eid);
-
     if (!response?.data) {
       return {
         redirect: {

diff --git a/pages/events/index.js b/pages/events/index.js
@@ -18,11 +18,12 @@ export async function getServerSideProps() {
       sort_field: "event_time",
       order: "ASC",
       limit: limit,
+      status: "drafted",
       page: 1,
       with_table: "users, tags"
     };
     const responseEvents = await EventService.getLatestEvents(postParams);
-    if (responseEvents.events.length > 0) {
+    if (responseEvents.count > 0) {
       return {
         props: {
           events: responseEvents.events,
@@ -34,7 +35,8 @@ export async function getServerSideProps() {
       return {
         props: {
           events: [],
-          count: 0
+          count: 0,
+          limit: 0
         }
       };
     }
@@ -47,7 +49,6 @@ export async function getServerSideProps() {
 }
 
 export default function EventListing({ events, count, limit }) {
-
   const [newEvents, setNewEvents] = useState(events);
 
   const currentCount = (count) => {
@@ -59,6 +60,7 @@ export default function EventListing({ events, count, limit }) {
       sort_field: "published_at",
       order: "ASC",
       limit: limit,
+      status: "drafted",
       page: 1,
       with_table: "users, tags"
     };
@@ -121,7 +123,7 @@ export default function EventListing({ events, count, limit }) {
         />
       ) : (
         <div className="flex items-center justify-center m-9 font-semibold">
-          There's no published blogs yet!
+          There's no events yet!
         </div>
       )}
       <SectionSwag />

diff --git a/pages/signup.js b/pages/signup.js
@@ -213,11 +213,12 @@ export default function SignUp({ referer }) {
           //   .catch((err) => {
           //     console.log(err.message);
           //   });
-          if (referer) {
-            router.back();
-          } else {
-            router.push("/");
-          }
+          // console.log(referer , 'here')
+          // if (referer) {
+          //   router.back();
+          // } else {
+          //   router.push("/");
+          // }
       } else {
           setIsLoading(false);
           if (!fName) {

diff --git a/pages/whats-new.js b/pages/whats-new.js
@@ -17,36 +17,35 @@ export async function getServerSideProps(context) {
     if (tag) {
       searchArray = ["whats-new", tag];
     }
-    const { posts, count } = await PostService.getPostsByMultipleTags(
-      searchArray,
-      0
-    );
+    const {
+      data: { posts, count }
+    } = await PostService.getPostByTags(searchArray, 0);
     return {
       props: {
         blogs: posts
       }
     };
   } catch (err) {
-    notify(err?.response?.data?.message ?? err?.message, 'error');
-    
+    notify(err?.response?.data?.message ?? err?.message, "error");
+
     return {
       props: {
         blogs: []
       }
-    }
+    };
   }
 }
 
-export default function whatsNew({blogs}) {
-  console.log(blogs)
+export default function whatsNew({ blogs }) {
+  console.log(blogs);
   return (
     <>
       <Head>
         <title> What's new | Nullcast</title>
       </Head>
       <SiteHeader />
       <WhatsNewSpotlight />
-     {blogs?.length > 0 && <WhatsNewPosts blogs={blogs} />}
+      {blogs?.length > 0 && <WhatsNewPosts blogs={blogs} />}
       <SectionSwag />
       <SiteFooter />
     </>

diff --git a/services/EventService.js b/services/EventService.js
@@ -32,11 +32,9 @@ async function getEventById(eventId) {
 
 async function createNewEvent(userCookie, eventData) {
   try {
-    const response = await axios.post(
-      `${baseUrl}/${createEventUrl}`,
-      eventData
-    );
-    return response;
+    const response = await axios.post(`${baseUrl}/${createEventUrl}` , eventData)
+    console.log(response);
+    return response
   } catch (err) {
     console.log(err);
     throw err;