Implement public dashboard and user dashboard with in seprate view

Author: khuongdn16

app/src/Dashboard/ProjectContainer.jsx

@@ -33,28 +33,40 @@ const ProjectContainer = () => {
   if (loading) return <p>Loading...</p>;
   if (error) return <p>Error :{error}</p>;
   // based on resolver(getAllProject) for this query, the data is stored in the data object with the key 'getAllProjects'
-  const myProjs = data.getAllProjects;
-  console.log('Projects >>> ', myProjs);
+  const projects = data.getAllProjects;
+  console.log('Projects >>> ', projects);
   // generate an array of Project components based on data
-  const projects = myProjs.map((proj, index) => <Project 
-    key= { index }
-    name = {proj.name}
-    likes = {proj.likes}
-    userId = {proj.userId}
-    username = {proj.username}
-    id = {proj.id}
-    />);
+  const publicProjects = [];
+  const userProjects = []; 
+  projects.forEach((proj, index) => {
+    const component = <Project 
+                  key= { index }
+                  name = {proj.name}
+                  likes = {proj.likes}
+                  userId = {proj.userId}
+                  username = {proj.username}
+                  id = {proj.id}
+                />;
+    if (username === proj.username) userProjects.push(component);
+    else publicProjects.push(component);
+  });
 
   return (
       <div>
-        <h1> Public Dashboard </h1>
         <Link to="/">
           <button type="button">Go Back</button>
         </Link>
+        <h1> Public Dashboard </h1>
+        <div className = "projectContainer">
+            {publicProjects}
+        </div>
+        <hr></hr>
+        <h1> User Dashboard </h1>
         <div className = "projectContainer">
-          {projects}
+            {userProjects}
+        </div>
+
         </div>
-      </div>
   );
 };
 

server/graphQL/resolvers/mutation.js

@@ -104,7 +104,7 @@ const Project = {
     const filter = { _id: projId };
     const options = { strict: true };
     const resp = await Projects.findOneAndDelete(filter, options);
-    console.log("resp", resp);
+    // console.log("resp", resp);
     if (resp) {
       return ({
         name: resp.name,

server/models/reactypeModels.js

@@ -66,7 +66,8 @@ const projectSchema = new Schema({
   },
   username: {type: String, required: true }, 
   createdAt: { type: Date, default: Date.now }
-}, { minimize: false });
+}, { minimize: false }
+);
 // option 'minimize' prevent Mongoose from removing empty 'style' value in the copy
 
 // Test schema for implementing GraphQL