Merge branch 'development' of…

Merge branch 'development' of ssh://git.attractor-school.com:30022/apollo64/crm-team-one into task-27-fixing_bags_page_my_tasks

planner-api/package-lock.json

@@ -13,6 +13,7 @@
         "@types/cors": "^2.8.12",
         "@types/express": "^4.17.14",
         "bcrypt": "^5.1.0",
+        "class-transformer": "^0.5.1",
         "class-validator": "^0.13.2",
         "cors": "^2.8.5",
         "express": "^4.18.2",
@@ -2491,6 +2492,11 @@
         "node": ">=10"
       }
     },
+    "node_modules/class-transformer": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz",
+      "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw=="
+    },
     "node_modules/class-validator": {
       "version": "0.13.2",
       "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.13.2.tgz",
@@ -7724,6 +7730,11 @@
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
     },
+    "class-transformer": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz",
+      "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw=="
+    },
     "class-validator": {
       "version": "0.13.2",
       "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.13.2.tgz",

planner-api/package.json

@@ -26,6 +26,7 @@
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.14",
     "bcrypt": "^5.1.0",
+    "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
     "cors": "^2.8.5",
     "express": "^4.18.2",

planner-api/src/models/Task.ts

@@ -12,6 +12,7 @@ import {
   import {Project} from './Project';
 
   type taskFinishType = "open" | "done" |"failed";
+  type priorityType = "A" | "B" |"C";
 
   interface ITask{
     id: string;
@@ -21,6 +22,7 @@ import {
     dateTimeStart:Date| null;
     dateTimeDue:Date| null;
     accomplish: taskFinishType;
+    priority: priorityType;
     author: User;
     project:Project|null;
     executors:User[]
@@ -40,6 +42,7 @@ import {
     dateTimeStart!: Date | null;
     @Column({ name: 'dateTimeDue', type: Date,nullable: true })
     dateTimeDue!: Date | null;
+
     @Column({
         type: "enum",
         enum: ["opened", "done" , "failed"],
@@ -47,6 +50,15 @@ import {
       })
       accomplish!: taskFinishType
 
+     
+    @Column({
+      type: "enum",
+      enum: ["A", "B" , "C"],
+      default: "C"
+    })
+    priority!: priorityType
+
+    
 
     @ManyToOne(() => User, (user: { tasks: Task[]; }) => user.tasks,{eager : true})
       author!: User;
@@ -54,10 +66,10 @@ import {
     @ManyToMany(() => User,{eager : true})
     @JoinTable()
     executors!: User[];
-
+    
     @ManyToOne(()=>Project,(project:{tasks: Task[]}) => project.tasks)
     project!: Project | null;
-  
-     
-  
+    
+    
+    
   }

planner-api/src/models/User.ts

@@ -7,11 +7,11 @@ import {
   BaseEntity,
   ManyToMany,
   OneToMany,
-  JoinTable
-
+  JoinTable,
 } from 'typeorm';
 import {IsEmail
 } from "class-validator";
+import { Exclude, instanceToPlain } from "class-transformer";
 import bcrypt from 'bcrypt';
 import {nanoid} from 'nanoid';
 import {Task} from './Task';
@@ -20,17 +20,17 @@ import {Project} from './Project';
 const SALT_WORK_FACTOR= 10;
 
 
-type userRoleType = "worker" | "director";
+export enum UserRole  {USER="user" ,DIRECTOR= "director",SUPERUSER="superuser"}
 
 interface IUser {
   id:string;
+  role: UserRole;
   name: string;
   surname: string;
   email: string;
   displayName: string;
   password:string;
   token: string;
-  role: userRoleType;
   createdAt: Date;
   createdTasks:Task[];
   workerInProjects:Project[];
@@ -41,39 +41,40 @@ interface IUser {
 
 @Entity({ name: 'User' })
 export class User extends BaseEntity implements IUser {
-  @PrimaryGeneratedColumn('uuid')
-  id!: string
+  @PrimaryGeneratedColumn("uuid")
+  id!: string;
   @Column({ name: 'name', type: 'varchar', length:20,nullable: false })
-  name!: string
+  name!: string;
 
   @Column({ name: 'surname', type: 'varchar', length:30,nullable: false })
-  surname!: string
+  surname!: string;
 
   @Column({ name: 'displayName', type: 'varchar', length:30,nullable: false })
-  displayName!: string
+  displayName!: string;
 
   @Column({ name: 'email', type: 'varchar',length:20, unique: true, nullable: false })
   @IsEmail()
-  email!: string
+  email!: string;
 
   @Column({ name: 'phone', type: 'varchar',length:10, unique: true, nullable: true})
-  phone?: string
+  phone?: string;
 
   @Column({ name: 'token', type: 'varchar',length:100, unique: true, nullable: false })
-  token!: string
+  token!: string;
   
   @CreateDateColumn({ name: 'created_at', type: Date, default: new Date() })
   createdAt!: Date;
   
   @Column({
     type: "enum",
-    enum: ["worker", "director"],
-    default: "worker"
+    enum: UserRole,
+    default: UserRole.USER
   })
-  role!: userRoleType
+  role!: UserRole
   
-  @Column({ type: 'varchar', nullable: false, select:false })
-  password!: string
+  @Column({ type: 'varchar', nullable: false, select:true })
+  @Exclude({ toPlainOnly: true })
+  password!: string;
 
   
   @OneToMany(() => Task, (task: { user: User }) => task.user)
@@ -106,20 +107,16 @@ export class User extends BaseEntity implements IUser {
   public async checkPassword(
     candidatePassword: string,
   ):Promise<boolean> {
-    console.log("Checking password", candidatePassword,'this.password', this.password)
     return await bcrypt.compare(candidatePassword, this.password);
   }
   
-
+  toJSON() {
+    return instanceToPlain(this);
 }
 
 
 
-
-
-
-
-
+}
 
 
 

planner-api/src/routers/tasks.ts

@@ -17,7 +17,7 @@ export default router;
 router.post('/', async(req:Request, res:Response):Promise<Response>=>{
     const token = req.get('Authorization');
     const newTask = new Task();
-    const {title,description,project,executors,dateTimeDue,dateTimeStart} = req.body;
+    const {title,description,project,executors,dateTimeDue,dateTimeStart,accomplish,priority} = req.body;
     const user = await dataSource
     .createQueryBuilder()
     .select("user")
@@ -32,11 +32,13 @@ router.post('/', async(req:Request, res:Response):Promise<Response>=>{
     newTask.dateTimeDue = dateTimeDue;
     newTask.dateTimeStart = dateTimeStart;
     newTask.author= user;
+    newTask.accomplish = accomplish;
+    newTask.priority = priority;
     await newTask.save();
     return res.send({newTask})
 })
 
-router.get('/userId/:userId', async (req: Request, res: Response)=>{
+router.get('/userId/:userId', async (req: Request, res: Response):Promise<Response>=>{
     const userId = req.params.userId;
     const tasks = await dataSource
     .getRepository(Task)
@@ -47,8 +49,7 @@ router.get('/userId/:userId', async (req: Request, res: Response)=>{
     return res.send({tasks})
 })
 
-
-router.get('/my', async (req: Request, res: Response)=>{
+router.get('/my', async (req: Request, res: Response):Promise<Response>=>{
     const token = req.get('Authorization');
     const user = await dataSource
     .createQueryBuilder()
@@ -64,4 +65,56 @@ router.get('/my', async (req: Request, res: Response)=>{
     .where('user.id = :userId',   {userId :user.id})
     .getMany()
     return res.send({tasks})
-})
\ No newline at end of file
+})
+
+router.delete('/:taskId',async (req: Request, res: Response):Promise<Response>=>{
+    // const token = req.get('Authorization');
+    // const user = await dataSource
+    // .createQueryBuilder()
+    // .select("user")
+    // .from(User, "user")
+    // .where("user.token = :token", { token: token })
+    // .getOne()
+    // if(!user) return res.status(404).send({Message:'user not found'})
+    const taskId = req.params.taskId;
+    await myDataSource
+    .createQueryBuilder()
+    .delete()
+    .from(Task)
+    .where("id = :id", { id: taskId })
+    .execute()
+    return res.send({message: 'Task deleted successfully'})
+
+})
+
+router.put('/',async(req:Request, res:Response)=> {
+    const token = req.get('Authorization');
+    const user = await dataSource
+    .createQueryBuilder()
+    .select("user")
+    .from(User, "user")
+    .where("user.token = :token", { token: token })
+    .getOne()
+    if (!user) return res.status(404).send({Message:'user not found'})
+
+    const {id,title,description,project,executors,dateTimeDue,dateTimeStart,accomplish,priority} = req.body;
+    await dataSource
+    .createQueryBuilder()
+    .update(Task)
+    .set({ 
+        title: title, 
+        description: description,
+        project: project,
+        executors: executors,
+        dateTimeDue: dateTimeDue,
+        dateTimeStart: dateTimeStart,
+        author:user,
+        accomplish: accomplish,
+        priority: priority
+    })
+    .where("id = :id", { id: id })
+    .execute()
+    
+    res.send({message:'update task successfully'})
+    // res.send({task})
+})

planner-api/src/routers/users.ts

@@ -17,7 +17,7 @@ return res.send({users})
 
 router.post('/', async (req : Request, res : Response):Promise<object> => {
 
-    const {name,surname,password,email} = req.body;
+    const {name,surname,password,email, role} = req.body;
     const displayName = surname+' '+name[0]+'.'
     const user = new User();
     user.name = name;
@@ -25,6 +25,7 @@ router.post('/', async (req : Request, res : Response):Promise<object> => {
     user.password = password;
     user.displayName= displayName;
     user.email = email;
+    user.role = role;
     user.generateToken()
     await user.save();
     const userToFront:User|null = await dataSource.manager.findOneBy(User, {
@@ -41,9 +42,9 @@ router.post('/sessions/', async (req : Request, res : Response):Promise<object>
     .select("user")
     .from(User, "user")
     .where("user.email = :email", { email: email })
+    .addSelect('password')
     .getOne()
     if(!user) return res.status(404).send({Message:'user not found'})
-
     const isMatch:boolean = await user.checkPassword(password);
     if (!isMatch) return res.status(400).send({
         error: "Wrong Password"
@@ -67,7 +68,6 @@ router.delete('/sessions', async(req: Request, res: Response):Promise<void | obj
         token: token
     })
     if(!user) return res.send({successMsg});
-    console.log('token: ' + token)
     user.token = nanoid();
     await user.save();
    

planner-front/src/components/MonthCalendarBody/CalendarRow/CalendarRow.js

+import { Grid } from "@mui/material";
+
+const CalendarRow = ({children}) => {
+    return <>
+        <Grid 
+          container 
+          align='center'
+          sx={{borderBottom: '1px solid black', borderRight: '1px solid black', borderLeft: '1px solid black'}}
+          >
+            {children}
+          </Grid>
+    </>
+};
+
+export default CalendarRow;
+
+

planner-front/src/components/MonthCalendarBody/CalendarSmallCell/CalendarSmallCell.js

+import { Grid } from "@mui/material";
+
+const CalendarSmallCell = ({children, xs}) => {
+    return <>
+        <Grid align='center' item xs={xs} sx={{borderRight: '1px solid black'}}>
+          {children}
+        </Grid>
+    </>
+};
+
+export default CalendarSmallCell;
\ No newline at end of file

planner-front/src/components/MonthCalendarBody/CalendarStandartCell.js/CalendarStandartCell.js

+import { Grid } from "@mui/material";
+
+const CalendarStandartCell = ({children, xs, onClick}) => {
+    return <>
+        <Grid  
+            item xs={xs} 
+            sx={{borderRight: '1px solid black'}} 
+            onClick={onClick}>
+            {children}
+        </Grid>
+    </>
+};
+
+export default CalendarStandartCell;
\ No newline at end of file

planner-front/src/components/MonthCalendarBody/CalendarTask/CalendarTask.js

+import { Grid, TextField } from "@mui/material";
+import React, { useEffect, useState } from "react";
+
+const CalendarTask = ({year, month, tasks, day, hours, setCurrentTask, onChange, hourFormat}) => {
+
+  const getTaskInDayCell = (tasks, day, hours) => {
+    const hour = parseInt(hours.split(':')[0])
+    let hourDiffEnd
+    let hourDiffStart
+    if (hourFormat) {
+      hourDiffEnd = hour + 1
+    } else {
+      hourDiffEnd = hour + 2
+    }
+    if (hourFormat) {
+      hourDiffStart = hour - 1
+    } else {
+      hourDiffStart = hour - 2
+    }
+    const tasksCell = tasks.filter(task=> {
+    if (year === task.infoForCell.startYear) {
+      if (month + 1 === task.infoForCell.startMonth) {
+        if (day.dayNumber === task.infoForCell.startDay) {
+          if (((task.infoForCell.endHour <= hour || task.infoForCell.startHour <= hour) && (task.infoForCell.endHour > hour))  
+          || (task.infoForCell.startHour >= hour  && task.infoForCell.endHour < hourDiffEnd)
+          || (task.infoForCell.endMinute <= 59 && task.infoForCell.endHour === hour)) {
+              return task
+          }
+        }
+      }      
+    }
+    })
+    return tasksCell
+  }
+  
+  const tasksCell = getTaskInDayCell(tasks, day, hours)
+
+  return (<> 
+      {tasksCell.length ? tasksCell.map((task, i)=>
+      {
+      return (
+      <Grid  key={task.id} sx={{backgroundColor: 'lightgreen'}}>
+        <TextField 
+        id={task.title} 
+        variant="standard" 
+        value={task.title} 
+        name='title' 
+        onClick={(e)=>{e.stopPropagation(); setCurrentTask(task)}}
+        onChange={onChange}>
+        </TextField>
+      </Grid>)}
+      ) : null }
+  </>)
+};
+
+export default CalendarTask;
\ No newline at end of file

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

 import { Container } from '@mui/material';
 import { useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import MonthCalendarBody from '../../components/MonthCalendarBody/MonthCalendarBody';
 import MonthCalendarHeader from '../../components/MonthCalendarHeader/MonthCalendarHeader';
+import { addTask, fetchTasks} from '../../store/actions/tasksActions';
 
 function MonthCalendar() {
+  const dispatch = useDispatch();
+  const { tasks } = useSelector(state => state.tasks);
+
+  const [hourFormat, setHourFormat] = useState(false);
   const [month, setMonth] = useState('')
   const [year, setYear] = useState('')
   const [worker, setWorker] = useState('');
   const [calendarType, setCalendarType] = useState('Месяц');
-
+  const [currentTask, setCurrentTask] = useState({})
   
   useEffect(()=>{
     setMonth(new Date().getMonth())
     setYear(new Date().getFullYear())
-  },[])
+    dispatch(fetchTasks())
+  }, [dispatch])
+
   const onChangeWorkerHandler = (event) => {
     setWorker(event.target.value);
   };
@@ -46,6 +54,40 @@ function MonthCalendar() {
     })
   }
 
+  function dateToISOLikeButLocal(date) {
+    const offsetMs = date.getTimezoneOffset() * 60 * 1000;
+    const msLocal =  date.getTime() - offsetMs;
+    const dateLocal = new Date(msLocal);
+    const iso = dateLocal.toISOString();
+    return iso;
+  }
+
+  const createTaskInCellHandler = (dayNumber, dayHour) => {
+    const hour = parseInt(dayHour.split(':')[0])
+    let hourDue
+    if (hourFormat) {
+      hourDue = hour + 0
+    } else {
+      hourDue = hour + 1
+    }
+    const newTask = {
+      title:"Задача",
+      description:"описание",
+      dateTimeStart: dateToISOLikeButLocal(new Date(year, month, dayNumber, hour, 0)),
+      dateTimeDue: dateToISOLikeButLocal(new Date(year, month, dayNumber, hourDue, 59)),
+    }
+    console.log(newTask)
+    dispatch(addTask(newTask))
+    setCurrentTask((newTask))
+  }
+
+  const onChangeCellTaskTitle = (e) => {
+    e.stopPropagation()
+    const value = e.target.value;
+    const name = e.target.name;
+    setCurrentTask({ ...currentTask, [name]: value })
+  }
+
   return (
     <>
     <Container>
@@ -63,6 +105,12 @@ function MonthCalendar() {
       <MonthCalendarBody
         month={month}
         year={year}
+        tasks={tasks}
+        createTaskInCellHandler={createTaskInCellHandler}
+        onChangeCellTaskTitle={onChangeCellTaskTitle}
+        setCurrentTask={setCurrentTask}
+        hourFormat={hourFormat} 
+        setHourFormat={setHourFormat}
       />
     </Container>
     </>

planner-front/src/index.js

@@ -5,6 +5,7 @@ import App from './App';
 import { configureStore } from '@reduxjs/toolkit';
 import { Provider } from 'react-redux';
 import usersReducer from './store/reducers/usersReducer';
+import tasksReducer from './store/reducers/tasksReducer';
 import axios from 'axios';
 
 const localStorageMiddleware = ({getState}) => (next) => (action) => {
@@ -31,6 +32,7 @@ axios.interceptors.request.use(config=>{
 const store = configureStore({
   reducer: {
     users: usersReducer,
+    tasks: tasksReducer
   },
   preloadedState: loadFromLocalStorage(),
   middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(localStorageMiddleware)

planner-front/src/store/actionTypes/tasksTypes.js

+export const FETCH_TASKS_REQUEST = "FETCH_TASKS_REQUEST";
+export const FETCH_TASKS_SUCCESS = "FETCH_TASKS_SUCCESS";
+export const FETCH_TASKS_FAILURE = "FETCH_TASKS_FAILURE";
+
+export const ADD_NEW_TASK_REQUEST = "ADD_NEW_TASK_REQUEST";
+export const ADD_NEW_TASK_SUCCESS = "ADD_NEW_TASK_SUCCESS";
+export const ADD_NEW_TASK_FAILURE = "ADD_NEW_TASK_FAILURE";
\ No newline at end of file

planner-front/src/store/actions/tasksActions.js

+import { ADD_NEW_TASK_FAILURE, ADD_NEW_TASK_REQUEST, ADD_NEW_TASK_SUCCESS, FETCH_TASKS_FAILURE, FETCH_TASKS_REQUEST, FETCH_TASKS_SUCCESS} from "../actionTypes/tasksTypes";
+import axios from '../../axiosPlanner'
+
+const fetchTasksRequest = () => {
+  return {type:  FETCH_TASKS_REQUEST}
+};
+
+const fetchTasksSuccess = (tasks) => {
+  return {type: FETCH_TASKS_SUCCESS, tasks}
+};
+
+const fetchTasksFailure = (error) => {
+  return {type: FETCH_TASKS_FAILURE, error}
+};
+
+export const fetchTasks = () => {
+  return async (dispatch) => {
+      dispatch(fetchTasksRequest());
+      try {
+        const response = await axios.get("/tasks");
+        dispatch(fetchTasksSuccess(response.data.tasks))
+      } catch (error) {
+        dispatch(fetchTasksFailure(error.response.data));
+      }
+  }
+}
+
+const addTaskRequest = () => {
+  return {type: ADD_NEW_TASK_REQUEST}
+};
+
+const addTaskSuccess = () => {
+  return {type: ADD_NEW_TASK_SUCCESS}
+};
+
+const addTaskFailure = (error) => {
+  return {type: ADD_NEW_TASK_FAILURE, error}
+};
+
+export const addTask = (task) => {
+  return async (dispatch, getState) => {
+      dispatch(addTaskRequest());
+      const token = getState().users?.user?.token;
+      try {
+        await axios.post("/tasks", task, {
+          headers: {
+            'Authorization': 'aBhHYW8kXUUzjXlxOwGmg'
+          }
+        });
+        dispatch(addTaskSuccess())
+        dispatch(fetchTasks())
+      } catch (error) {
+        dispatch(addTaskFailure(error.response.data));
+      }
+  }
+}
\ No newline at end of file

planner-front/src/store/reducers/tasksReducer.js

+import { FETCH_TASKS_FAILURE, FETCH_TASKS_REQUEST, FETCH_TASKS_SUCCESS} from "../actionTypes/tasksTypes";
+
+const initialState = {
+    tasks: [],
+    loading: false,
+    error: null
+};
+
+const tasksReduсer = (state = initialState, action) => {
+  switch(action.type) {
+    case FETCH_TASKS_REQUEST:
+        return {...state, loading: true};
+    case FETCH_TASKS_SUCCESS:
+        const newArr = []
+        action.tasks.forEach((task)=>{
+            if (task.dateTimeStart && task.dateTimeDue) {
+              const dateStart = task.dateTimeStart.split('T')[0]
+              const timeStart = task.dateTimeStart.split('T')[1]
+              const timeEnd = task.dateTimeDue.split('T')[1]
+              const dayStart = parseInt(dateStart.split('-')[2])
+              const monthStartNumber =  parseInt(dateStart.split('-')[1])
+              const yearStartNumber =  parseInt(dateStart.split('-')[0])
+              const timeStartHour = parseInt(timeStart.split(':')[0])
+              const timeEndHour = parseInt(timeEnd.split(':')[0])
+              const timeStartMinute = parseInt(timeStart.split(':')[1])
+              const timeEndMinute = parseInt(timeEnd.split(':')[1])
+              newArr.push({...task, infoForCell: { 
+                startDay: dayStart, 
+                startHour: timeStartHour, 
+                startMonth: monthStartNumber,
+                startYear: yearStartNumber,
+                startMinute: timeStartMinute,
+                endHour: timeEndHour,
+                endMinute: timeEndMinute,
+                }
+              } )
+            }
+          })
+        return {...state, loading: false, tasks: newArr};
+    case FETCH_TASKS_FAILURE:
+        return {...state, loading: false, error: action.error};
+    default: 
+        return state;
+}
+};
+
+export default tasksReduсer;
\ No newline at end of file

planner-front/src/store/reducers/usersReducer.js

@@ -5,14 +5,14 @@ const initialState = {
         name: 'Ivan',
         surname: 'Petrov',
         email: 'test@gmail.com',
-        role: 'user'
+        role: 'superuser'
       },
     registerError: null,
     loginError: null,
     loading: false
 };
 
-const usersReduser = (state = initialState, action) => {
+const usersReducer = (state = initialState, action) => {
     switch(action.type) {
         case REGISTER_USER_REQUEST:
             return {...state, loading: true};
@@ -31,4 +31,4 @@ const usersReduser = (state = initialState, action) => {
     }
 };
 
-export default usersReduser;
+export default usersReducer;