#130 начал реализацию другого календаря, чуть изменил расположение файлов для удобства

planner-front/src/components/Calendars/MonthCalendar/MonthCalendarBody/CalendarRowDay/CalendarRowDay.js

 import { Grid } from "@mui/material";
 import { memo, useMemo } from "react";
 import { getHoursInDayNumbers, getAvailableTasks, getLinesInDay, getSortedTasks } from "../../../../../helpers/CalendarHelpers";
-import CalendarStandartCell from "../../../CalendarStandartCell/CalendarStandartCell";
+import CalendarStandartCell from "../../../UI/CalendarStandartCell/CalendarStandartCell";
 import CalendarTask from "../CalendarTask/CalendarTask";
 import EmptyBox from "./EmptyBox/EmptyBox";
 import { getBoxesInLine } from "./Helpers";

planner-front/src/components/Calendars/MonthCalendar/MonthCalendarBody/CalendarRowDay/EmptyBox/EmptyBox.js

 import { Grid } from "@mui/material";
 import React, { memo, useEffect, useState } from "react";
-import DefaultTask from "../../../../DefaultTask/DefaultTask";
+import DefaultTask from "../../../../UI/DefaultTask/DefaultTask";
 
 const EmptyBox = ({ hourNumber, handleOpen, dayNumber, xs, dragTaskHandler, modal, createTaskInCellHandler, copyTask, createCopyTask }) => {
 

planner-front/src/components/Calendars/MonthCalendar/MonthCalendarBody/MonthCalendarBody.js

 import { Box, FormControlLabel, Switch } from "@mui/material";
 import { useCallback, useState } from "react";
-import CalendarRow from "../../CalendarRow/CalendarRow";
-import CalendarSmallCell from "../../CalendarSmallCell/CalendarSmallCell";
-import CalendarStandartCell from "../../CalendarStandartCell/CalendarStandartCell";
-import ModalTask from "../../ModalTask/ModalTask"
-import MonthCalendarModalContent from "../../CalendarModalTaskContent/CalendarModalTaskContent";
+import CalendarRow from "../../UI/CalendarRow/CalendarRow";
+import CalendarSmallCell from "../../UI/CalendarSmallCell/CalendarSmallCell";
+import CalendarStandartCell from "../../UI/CalendarStandartCell/CalendarStandartCell";
+import ModalTask from "../../UI/ModalTask/ModalTask"
+import MonthCalendarModalContent from "../../UI/CalendarModalTaskContent/CalendarModalTaskContent";
 import CalendarRowDay from "./CalendarRowDay/CalendarRowDay";
 import { useSelector } from "react-redux";
 

planner-front/src/components/Calendars/MonthCalendar/MonthCalendarHeader/MonthCalendarHeader.js

 import { AppBar, Button, Toolbar, Typography } from '@mui/material';
 import { Box } from '@mui/system';
+import CalendarUserDisplayName from '../../UI/CalendarUserDisplayName/CalendarUserDisplayName';
 import MonthAndYearInfo from './MonthAndYearInfo/MonthAndYearInfo';
 
 function MonthCalendarHeader({ currentMonthString, decrementMonth, incrementMonth, year, handleOpen, currentCalendarDisplayName, user, userId}) {
@@ -11,9 +12,9 @@ function MonthCalendarHeader({ currentMonthString, decrementMonth, incrementMont
           <Toolbar>
 
             <Box>
-              <Typography variant="h5" sx={{ margin: "20px 0 20px 0" }}>
-                Календарь:  {currentCalendarDisplayName}
-              </Typography>
+              <CalendarUserDisplayName
+                currentCalendarDisplayName={currentCalendarDisplayName}
+              />
               <MonthAndYearInfo
                 currentMonthString={currentMonthString}
                 decrementMonth={decrementMonth}

planner-front/src/components/Calendars/CalendarModalTaskContent/CalendarModalTaskContent.js → planner-front/src/components/Calendars/UI/CalendarModalTaskContent/CalendarModalTaskContent.js

 import { Button, TextField } from "@mui/material";
 import { memo } from "react";
 import { useSelector } from "react-redux";
-import { priorities } from "../../../constants";
-import CustomSelect from '../../UI/СustomSelect/СustomSelect'
+import { priorities } from "../../../../constants";
+import CustomSelect from '../../../UI/СustomSelect/СustomSelect'
 import { isValidate } from "./Helpers";
 
 

planner-front/src/components/Calendars/UI/CalendarUserDisplayName/CalendarUserDisplayName.js

+import { Typography } from '@mui/material';
+
+function CalendarUserDisplayName({currentCalendarDisplayName}) {
+
+  return (
+    <>
+      <Typography variant="h5" sx={{ margin: "20px 0 20px 0" }}>
+        Календарь:  {currentCalendarDisplayName}
+      </Typography>
+    </>
+  );
+}
+
+export default CalendarUserDisplayName;
\ No newline at end of file

planner-front/src/components/Calendars/WeekCalendar/WeekCalendarBody/CalendarColumnDayWeek/CalendarColumnDayWeek.js

 import { useMemo } from "react";
 import { getHoursInDayNumbers, getAvailableTasks, getLinesInDay, getSortedTasks } from "../../../../../helpers/CalendarHelpers";
-import CalendarStandartCell from "../../../CalendarStandartCell/CalendarStandartCell";
+import CalendarStandartCell from "../../../UI/CalendarStandartCell/CalendarStandartCell";
 import { useEffect, useRef, useState } from "react";
 import { Grid } from "@mui/material";
 import CalendarWeekTask from "./CalendarWeekTask/CalendarWeekTask";

planner-front/src/components/Calendars/WeekCalendar/WeekCalendarBody/WeekCalendarBody.js

 import { Grid } from "@mui/material";
 import { Box } from "@mui/system";
 import { useCallback, useState } from "react";
-import ModalTask from "../../ModalTask/ModalTask";
-import CalendarModalTaskContent from "../../CalendarModalTaskContent/CalendarModalTaskContent";
-import CalendarRow from "../../CalendarRow/CalendarRow";
-import CalendarSmallCell from "../../CalendarSmallCell/CalendarSmallCell";
-import CalendarStandartCell from "../../CalendarStandartCell/CalendarStandartCell";
-import HourFormatSwitch from "../../HourFormatSwitch/HourFormatSwitch";
+import ModalTask from "../../UI/ModalTask/ModalTask";
+import CalendarModalTaskContent from "../../UI/CalendarModalTaskContent/CalendarModalTaskContent";
+import CalendarRow from "../../UI/CalendarRow/CalendarRow";
+import CalendarSmallCell from "../../UI/CalendarSmallCell/CalendarSmallCell";
+import CalendarStandartCell from "../../UI/CalendarStandartCell/CalendarStandartCell";
+import HourFormatSwitch from "../../UI/HourFormatSwitch/HourFormatSwitch";
 import CalendarColumnDayWeek from "./CalendarColumnDayWeek/CalendarColumnDayWeek";
 import { getCurrentWeekDayString, getMonthToDayColumn } from "./Helpers";
 

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

@@ -6,16 +6,18 @@ import WeekCalendarHeader from '../../components/Calendars/WeekCalendar/WeekCale
 import { getWeekInfoString, getWeekFromCurrentDate, dateToISOLikeButLocal } from '../../helpers/CalendarHelpers';
 import { fetchAllUserProjects } from '../../store/actions/projectsActions';
 import { addCalendarTask, addCopyCalendarTask, deleteCalendarTask, editCalendarTask, fetchCalendarTasks } from '../../store/actions/tasksActions';
+import { fetchCurrentCalendarDisplayName } from '../../store/actions/usersActions';
 
 
 function WeekCalendar() {
   const dispatch = useDispatch();
   const { calendarTasks } = useSelector(state => state.tasks);
-  const { allUserProjects } = useSelector(state => state.projects)
-  const user = useSelector(state => state.users?.user);
+  const { user, currentCalendarDisplayName } = useSelector(state => state.users);
+  const { allUserProjects, project } = useSelector(state => state.projects)
 
   const [copyTask, setCopyTask] = useState(null)
   const [weekGoal, setWeekGoal] = useState('Наладить режим сна')
+  const [userCalendarId, setUserCalendarId] = useState(null)
   const [weekPriorities, setWeekPriorities] = useState({ priorityOne: 'Один', priorityTwo: 'Два', priorityThree: 'Три' })
   const [dateNow, setDateNow] = useState({ year: '', month: '', currentDay: '' })
   const [currentTask, setCurrentTask] = useState({ title: '', description: '', priority: null, infoForCell: { startHour: null, endHour: null } })
@@ -29,9 +31,22 @@ function WeekCalendar() {
     setDateNow({ year: year, month: month, currentDay: currentDay })
     dispatch(fetchCalendarTasks(user.id))
     dispatch(fetchAllUserProjects())
-    setUserId(user.id)
   }, [dispatch, user.id])
 
+  useEffect(() => {
+    if (userCalendarId) {
+      setUserId(userCalendarId)
+      dispatch(fetchCalendarTasks(userCalendarId))
+      dispatch(fetchCurrentCalendarDisplayName(userCalendarId))
+      dispatch(fetchAllUserProjects())
+    } else {
+      setUserId(user.id)
+      dispatch(fetchCalendarTasks(user.id))
+      dispatch(fetchCurrentCalendarDisplayName(user.id))
+      dispatch(fetchAllUserProjects())
+    }
+  }, [userCalendarId, dispatch, user.id])
+
   const hoursInDay = useMemo(() => {
     let arr
     if (hourFormat) {