fix: write page api and fixes #348

fixed write page save to draft , publish and fixes
Planet-NULLCAST · Nov 3, 2021 · 603734d · 603734d
1 parent 99f33d9
commit 603734d
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 34 deletions.
diff --git a/component/myblogs/MyBlogs.jsx b/component/myblogs/MyBlogs.jsx
@@ -11,15 +11,15 @@ export default function MyBlogs({ posts }) {
       <div className="w-full">
         {posts &&
           posts.map((item) => (
-            <div className={`${MyBlogsstyles.oddBg} w-full`} key={item._id}>
+            <div className={`${MyBlogsstyles.oddBg} w-full`} key={item.id}>
               <div
                 className={`flex flex-col md:flex-row md:items-center justify-between p-4`}
               >
                 <div className="">
                   <Link
                     href={{
                       pathname: `/posts/write`,
-                      query: { post_id: `${item._id}` }
+                      query: { post_id: `${item.id}` }
                     }}
                     className={`text-15 font-semibold mb-1 ${MyBlogsstyles.color_blue_910}`}
                   >
@@ -79,7 +79,7 @@ export default function MyBlogs({ posts }) {
                   <Link
                     href={{
                       pathname: `/posts/write`,
-                      query: { post_id: `${item._id}` }
+                      query: { post_id: `${item.id}` }
                     }}
                   >
                     <a target="_blank">

diff --git a/component/myblogs/WriteNav.jsx b/component/myblogs/WriteNav.jsx
@@ -56,7 +56,7 @@ export default function WriteNav({
   }, [post]);
 
   useEffect(() => {
-    // getSettingsTags();
+    getSettingsTags();
     if (userCookie.roles === "admin") {
       getIsAdmin();
     }
@@ -81,7 +81,7 @@ export default function WriteNav({
   async function getSettingsTags() {
     try {
       const res = await TagService.getTags();
-      // console.log("get tags response", res);
+      console.log("get tags response", res);
       if (res && res.length) {
         const resTagOptions = res.map((tag) => {
           return {
@@ -108,12 +108,12 @@ export default function WriteNav({
     const newTag = e
       .filter((tag) => {
         if (tag.__isNew__ === true) {
-          // console.log(tag);
+          console.log(tag);
           return tag;
         }
       })
       .map((fTag) => fTag.value);
-    // console.log(newTag);
+    console.log(newTag, 'newtag');
     try {
       const res = await TagService.postTags(userCookie, newTag);
       // console.log({ res });

diff --git a/config/config.js b/config/config.js
@@ -19,6 +19,7 @@ const userUrl = `${apiVerUrl}/user`;
 const usersUrl = `${apiVerUrl}/users`;
 const adminUrl = "api/admin";
 const tagUrl = `${apiVerUrl}/tags`;
+const CreateTagUrl = `${apiVerUrl}/tag`;
 const skillUrl = "api/skills";
 const searchUrl = "api/search";
 const forgotPasswordUrl = "api/auth/reset-password";
@@ -47,6 +48,7 @@ const configVars = {
   userUrl,
   adminUrl,
   tagUrl,
+  CreateTagUrl,
   serverUrl,
   searchUrl,
   forgotPasswordUrl,

diff --git a/pages/posts/index.js b/pages/posts/index.js
@@ -74,18 +74,18 @@ export default function Posts() {
       pageNo: router.query.pageNo,
       limit: postData.limit,
       tag: router.query.tag,
-      status: router.query.status
-      // with_table: ["user"]
+      status: router.query.status,
+      with_table: ["user"]
     };
-    // getPosts(newReqData);
+    getPosts(newReqData);
   }, [router.query.pageNo, router.query.tag, router.query.status]);
 
   async function getPosts(reqData) {
     // console.log("getposts call");
     try {
       const data = await PostService.getPostsByUserId(reqData);
-      const { posts, count } = data;
-      // console.log({ posts });
+      const { posts, count } = data.data;
+      console.log({ posts });
       if (data) {
         setLoaded(true);
       }

diff --git a/pages/posts/write.js b/pages/posts/write.js
@@ -154,6 +154,7 @@ export default function Write({
     }
   }
 
+
   async function updatePostById(updateData, newPostId) {
     try {
       const res = await PostService.updatePostById(updateData, newPostId);
@@ -171,38 +172,41 @@ export default function Write({
     iframeRef.current.contentWindow.postMessage({ msg: "savePost" }, TARGET);
     setTimeout(() => {
       // wait for the response post message to get the post from the state
-      // console.log({ postElement });
+      console.log(postElement.current.scratch );
       // console.log(postElement.current.scratch);
-      const newMobiledoc = postElement.current.scratch;
-      const title = postElement.current.titleScratch || "[Untitled]";
+      const newMobiledoc = postElement?.current.scratch;
+      const title = postElement?.current.titleScratch || "[Untitled]";
 
       if (postId) {
         //updatePost
         const newUpdatedPost = {
+          status: 'drafted',
           title: title,
-          mobiledoc: newMobiledoc
+          mobiledoc: newMobiledoc,
         };
-        console.log({ newUpdatedPost });
-        updatePostById(newUpdatedPost, postId);
+        updatePostById(postId, newUpdatedPost); 
       }
     }, 500);
+
   };
 
   async function submitForReview() {
+    iframeRef.current.contentWindow.postMessage({ msg: "savePost" }, TARGET);
     //change status to "pending" if submitted for review
     // console.log(postId);
     try {
       const statusUpdate = {
-        status: "pending"
+        status: "pending",
+        // mobiledoc: postElement.current.scratch,
+        // mobiledoc: post.mobiledoc,
       };
-      const msg = await PostService.changePostStatus(
-        userCookie,
+      const msg = await PostService.updatePostById(
         postId,
-        statusUpdate
-      );
-      // console.log(msg);
+        statusUpdate,
+        );
+      console.log(msg);
       if (msg) {
-        // notify(msg);
+        notify(msg);  
         return msg;
       }
     } catch (err) {

diff --git a/services/PostService.js b/services/PostService.js
@@ -17,7 +17,7 @@ import { getUrl } from "../lib/getUrl";
 
 async function getPostsByUserId(reqData) {
   try {
-    const { data } = await axios.get(`${baseUrl}/${allPostsUrl}`, {
+    const { data } = await axios.get(`${baseUrl}/${postsUrl}`, {
       params: reqData
     });
     console.log(data);
@@ -62,7 +62,7 @@ async function createPost(post) {
 async function getLatestPosts(reqParams) {
   let url = getUrl();
   try {
-    const res = await axios.get(`${url}/${postsUrl}`, {
+    const res = await axios.get(`${baseUrl}/${postsUrl}`, {
       params: reqParams
     });
     return res.data.data;
@@ -94,9 +94,9 @@ async function adminGetLatestPosts(reqParams) {
   }
 }
 
-async function updatePostById(post, postId) {
+async function updatePostById(postId, postDetails) {
   try {
-    const { data } = await axios.put(`${baseUrl}/${postUrl}/${postId}`, post);
+    const { data } = await axios.put(`${baseUrl}/${postUrl}/${postId}`, postDetails);
     return data;
   } catch (err) {
     console.log(err);

diff --git a/services/TagService.js b/services/TagService.js
@@ -1,18 +1,17 @@
 const axios = require("axios");
-import { baseUrl, tagUrl } from "../config/config";
+import { baseUrl, tagUrl,CreateTagUrl } from "../config/config";
 import { getUrl } from "../lib/getUrl";
 
 async function getTags(filterWhatsNew) {
-  let url = getUrl();
 
   try {
     const { data } = await axios.get(
-      `${url}/${tagUrl}`
+      `${baseUrl}/${tagUrl}`
       // {
       //   params: { filterWhatsNew }
       // }
     );
-    // console.log(data);
+    console.log(data);
     return data;
   } catch (err) {
     console.log(err);
@@ -23,7 +22,7 @@ async function getTags(filterWhatsNew) {
 async function postTags(userCookie, newTag) {
   try {
     const { data } = await axios.post(
-      `${baseUrl}/${tagUrl}`,
+      `${baseUrl}/${CreateTagUrl}`,
       { tags: newTag },
       {
         headers: {