#94 added ProjecetComponents in Components

planner-api/src/routers/projects.ts

@@ -12,6 +12,7 @@ router.get('/',async (req:Request, res:Response): Promise<Response>=> {
     const projects:Project[] = await dataSource.manager.find(Project)
     return res.send({projects})
 })
+
 /**get projects were user is member, by user token */
 router.get('/my',auth, async (req:Request, res:Response): Promise<Response>=> {
     const user = req.body.user
@@ -43,6 +44,9 @@ router.get('/my',auth, async (req:Request, res:Response): Promise<Response>=> {
     return res.send({projects})
 })
 
+
+
+
 /**create new project */
 router.post('/',auth, async (req:Request, res:Response): Promise<Response> => {
     if (!req.body) return res.status(400).send({Message:'problem in incoming req.body'})
@@ -114,6 +118,10 @@ router.get('/user/:userId', async (req : Request, res : Response): Promise<Respo
 })
 
 
+
+
+
+
 /** Add user to specific project  */
 
 router.post('/add-user/', authAdminProject, async (req: Request, res: Response):Promise<Response>=>{

planner-api/src/routers/users.ts

@@ -35,6 +35,22 @@ const users = await dataSource
 return res.send({users})
 }) 
 
+
+//** return all users of DB */
+router.get('/all-fields/', async (req : Request, res : Response):Promise<object> => {
+    const users = await dataSource
+        .getRepository(User)
+        .find({
+            relations:{
+                members:{
+                    project:true,
+                    user:true
+                },
+            }
+        })
+    return res.send({users})
+    }) 
+
 /**create new user*/
 router.post('/', upload.single("avatar"), async (req : Request, res : Response):Promise<object> => {
     const {name,surname,password,email, role} = req.body;

planner-front/src/components/ProjectForm/ProjectForm.js → planner-front/src/components/ProjectComponents/ProjectForm/ProjectForm.js

 import {Box, Button, Grid, Modal} from "@mui/material";
 import {useState} from "react";
 import { useSelector } from "react-redux";
-import FormElement from "../UI/Form/FormElement/FormElement";
+import FormElement from "../../UI/Form/FormElement/FormElement";
 import {Typography} from "@mui/material";
 
 const style = {

planner-front/src/components/ProjectTasks/ProjectTasksBody.js → planner-front/src/components/ProjectComponents/ProjectTasks/ProjectTasksBody.js

@@ -10,11 +10,11 @@ import {
   Paper
 } from "@mui/material";
 import { useState } from "react";
-import TaskModal from "../../components/MyTasksCompoments/TaskModal/TaskModal";
+import TaskModal from "../../../components/MyTasksCompoments/TaskModal/TaskModal";
 import moment from "moment";
-import CustomTableCell from "../../components/MyTasksCompoments/CustomTableCell";
-import MaterialUIPickers from "../../components/MyTasksCompoments/DateTimePicker/DateTimePicker";
-import BasicSelect from "../../components/UI/Select/Select";
+import CustomTableCell from "../../../components/MyTasksCompoments/CustomTableCell";
+import MaterialUIPickers from "../../../components/MyTasksCompoments/DateTimePicker/DateTimePicker";
+import BasicSelect from "../../../components/UI/Select/Select";
 import ProjectTasksHeader from "./ProjectTasksHeader";
 
 export default function ProjectTasksBody({ tasks }) {

planner-front/src/containers/FullProject/FullProject.js

@@ -3,9 +3,9 @@ import { useParams } from "react-router-dom";
 import { useSelector, useDispatch } from "react-redux";
 import { useEffect } from "react";
 import { fetchProject } from "../../store/actions/projectsActions";
-import ProjectTasksBody from "../../components/ProjectTasks/ProjectTasksBody";
+import ProjectTasksBody from "../../components/ProjectComponents/ProjectTasks/ProjectTasksBody";
 import { fetchUsers } from "../../store/actions/usersActions";
-import ProjectMembersList from "../../components/ProjectMembersList/ProjectMembersList";
+import ProjectMembersList from "../../components/ProjectComponents/ProjectMembersList/ProjectMembersList";
 import NewMember from "../NewMember/NewMember";
 
 const FullProject = () => {

planner-front/src/containers/NewMember/NewMember.js

@@ -2,7 +2,7 @@ import {useNavigate} from "react-router-dom";
 import {useDispatch, useSelector} from "react-redux";
 
 import { useEffect } from "react";
-import ProjectForm from "../../components/ProjectForm/ProjectForm";
+import ProjectForm from "../../components/ProjectComponents/ProjectForm/ProjectForm";
 import { createMember, createProject, fetchMembers, fetchProjects } from "../../store/actions/projectsActions";
 import MemberForm from "../../components/MemberForm/MemberForm";
 

planner-front/src/containers/NewProject/NewProject.js

@@ -2,7 +2,7 @@ import {useNavigate} from "react-router-dom";
 import {useDispatch, useSelector} from "react-redux";
 
 import { useEffect } from "react";
-import ProjectForm from "../../components/ProjectForm/ProjectForm";
+import ProjectForm from "../../components/ProjectComponents/ProjectForm/ProjectForm";
 import { createProject, fetchProjects } from "../../store/actions/projectsActions";
 
 const NewProject = () => {

planner-front/src/containers/Projects/Projects.js

@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from "react-redux";
 import Loader from "../../components/UI/Loader/Loader";
 import HasAccess from "../../components/UI/HasAccess/HasAccess";
 import { fetchProjects } from "../../store/actions/projectsActions";
-import ProjectsList from "../../components/ProjectsList/ProjectsList";
+import ProjectsList from "../../components/ProjectComponents/ProjectsList/ProjectsList";
 import NewProject from "../NewProject/NewProject";
 
 const Projects = () => {