Merge branch 'development' of…

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

planner-front/src/App.css

-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}

planner-front/src/App.js

-import './App.css';
+import {Routes, Route, Outlet, Navigate, BrowserRouter} from "react-router-dom";
+import {Container} from "@mui/material";
+import {useSelector} from "react-redux";
+import AppToolbar from "./components/UI/AppToolBar/AppToolBar";
 import MyTasks from './containers/MyTasks/MyTasks'
 
-function App() {
-  return (
-    <div className="App">
-      <MyTasks/>
-    </div>
-  );
-}
+const ProtectedRoute = ({isAllowed, roles, redirectUrl, children}) => {
+  const user = useSelector(state => state.users?.user);
+  if (!isAllowed && !roles?.includes(user?.role)) {
+      return <Navigate to={redirectUrl} />
+  }
+  return children || <Outlet />;
+};
+
+const App = () => {
+    const user = useSelector(state => state.users?.user);
+    return (
+    <BrowserRouter>
+      <Routes>
+          <Route element={
+            <>
+              <AppToolbar/>
+              <main>
+                  <Container>
+                      <Outlet/>
+                  </Container>
+              </main>
+            </>
+          }>
+
+            <Route path={"/"} element={
+              <ProtectedRoute
+                  isAllowed={user}
+                  redirectUrl={"/log-in"}
+              >
+                  <h1>week page</h1>
+              </ProtectedRoute>
+            }/>
+
+            <Route path={"/week"} element={
+              <ProtectedRoute
+                  isAllowed={user}
+                  redirectUrl={"/log-in"}
+              >
+                  <h1>week page</h1>
+              </ProtectedRoute>
+            }/>
+
+            <Route path={"/month"} element={
+              <ProtectedRoute
+                  isAllowed={user}
+                  redirectUrl={"/log-in"}
+              >
+                  <h1>month page</h1>
+              </ProtectedRoute>
+            }/>
+
+            <Route path={"/my-tasks"} element={
+              <ProtectedRoute
+                  isAllowed={user}
+                  redirectUrl={"/log-in"}
+              >
+                    <MyTasks/>
+              </ProtectedRoute>
+            }/>
+
+            <Route path={"/profile/:id"} element={
+              <ProtectedRoute
+                  isAllowed={user}
+                  redirectUrl={"/log-in"}
+              >
+                  <h1>profile page</h1>
+              </ProtectedRoute>
+            }/>
+
+            <Route path={"/workers-tasks"} element={
+              <ProtectedRoute
+                  roles={["superuser"]}
+                  redirectUrl={"/"}
+              >
+                  <h1>workers tasks page</h1>
+              </ProtectedRoute>
+            }/>
+
+            <Route path={"/sign-up"} element={
+              <ProtectedRoute
+                  roles={["superuser"]}
+                  redirectUrl={"/"}
+              >
+                  <h1>sign-up page</h1>
+              </ProtectedRoute>
+            }/>
+
+            <Route path={"/log-in"} element={<h1>log-in page</h1>}/>
+            <Route path='*' element={<h1>404</h1>}/>
+          </Route>
+      </Routes>
+    </BrowserRouter>
+    )
+};
 
 export default App;

planner-front/src/App.test.js

-import { render, screen } from '@testing-library/react';
-import App from './App';
-
-test('renders learn react link', () => {
-  render(<App />);
-  const linkElement = screen.getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
-});

planner-front/src/components/Menus/AdminMenu/AdminMenu.js

+import {Button} from "@mui/material";
+import {NavLink} from "react-router-dom";
+
+const AdminMenu = () => {
+    return <>
+        <Button
+            component={NavLink}
+            to="/week"
+            color="inherit"
+            size="large"
+        >
+            Неделя
+        </Button>
+        <Button
+            component={NavLink}
+            to="/month"
+            color="inherit"
+            size="large"
+        >
+            Месяц
+        </Button>
+        <Button
+            component={NavLink}
+            to="/my-tasks"
+            color="inherit"
+            size="large"
+        >
+            Мои задачи
+        </Button>
+        <Button
+            component={NavLink}
+            to="/workers-tasks"
+            color="inherit"
+            size="large"
+        >
+            Задачи сотрудников
+        </Button>
+        <Button
+            component={NavLink}
+            to="/sign-up"
+            color="inherit"
+            size="large"
+        >
+            Создать сотрудника
+        </Button>
+        <Button
+            component={NavLink}
+            to="/profile/test"
+            color="inherit"
+            size="large"
+        >
+            Профиль
+        </Button>
+    </>
+};
+
+export default AdminMenu;
\ No newline at end of file

planner-front/src/components/Menus/AnonymousMenu/AnonymousMenu.js

+import {Button} from "@mui/material";
+import {NavLink} from "react-router-dom";
+
+const AnonymousMenu = () => {
+    return <>
+        <Button
+            component={NavLink}
+            color="inherit"
+            to="/log-in"
+        >
+            Вход
+        </Button>
+    </>
+};
+
+export default AnonymousMenu;

planner-front/src/components/Menus/WorkerMenu/WorkerMenu.js

+import {Button} from "@mui/material";
+import {NavLink} from "react-router-dom";
+
+const WorkerMenu = ({user}) => {
+    return <>
+        <Button
+            component={NavLink}
+            to="/week"
+            color="inherit"
+            size="large"
+        >
+            Неделя
+        </Button>
+        <Button
+            component={NavLink}
+            to="/month"
+            color="inherit"
+            size="large"
+        >
+            Месяц
+        </Button>
+        <Button
+            component={NavLink}
+            to="/my-tasks"
+            color="inherit"
+            size="large"
+        >
+            Мои задачи
+        </Button>
+        <Button
+            component={NavLink}
+            to="/profile/test"
+            color="inherit"
+            size="large"
+        >
+            Профиль
+        </Button>
+    </>
+};
+
+export default WorkerMenu;

planner-front/src/components/UI/AppToolBar/AppToolBar.js

+import {AppBar, Box, Toolbar, Typography} from "@mui/material";
+import {NavLink} from "react-router-dom";
+import {useSelector} from "react-redux";
+import HasAccess from "../HasAccess/HasAccess";
+import AnonymousMenu from "../../Menus/AnonymousMenu/AnonymousMenu";
+import WorkerMenu from "../../Menus/WorkerMenu/WorkerMenu";
+import AdminMenu from "../../Menus/AdminMenu/AdminMenu";
+
+const AppToolbar = () => {
+    const user = useSelector(state => state.users.user);
+
+    return <Box sx={{ flexGrow: 1, mb: "40px" }}>
+        <AppBar position="static"> 
+            <Toolbar>
+                <Typography 
+                    variant="h4" 
+                    component="div" 
+                    sx={{ flexGrow: 1 }}>
+
+                    <NavLink to='/' style={{textDecoration: 'none', color: 'inherit'}}>Task Manager</NavLink>
+                </Typography>   
+
+                <HasAccess allowed={!user}>
+                    <AnonymousMenu/>
+                </HasAccess>
+                <HasAccess roles={['user']}>
+                    <WorkerMenu/>
+                </HasAccess>
+                <HasAccess roles={['superuser']}>
+                    <AdminMenu/>
+                </HasAccess>
+            </Toolbar>
+        </AppBar>
+    </Box>
+};
+
+export default AppToolbar;

planner-front/src/components/UI/HasAccess/HasAccess.js

+import {useSelector} from "react-redux";
+
+const HasAccess = ({allowed, roles, children}) => {
+    const user = useSelector(state => state.users?.user);
+    return allowed || roles?.includes(user?.role) ? children : null;
+};
+
+export default HasAccess;
\ No newline at end of file

planner-front/src/index.js

@@ -2,16 +2,35 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import './index.css';
 import App from './App';
-import reportWebVitals from './reportWebVitals';
+import { configureStore } from '@reduxjs/toolkit';
+import { Provider } from 'react-redux';
+import usersReducer from './store/reducers/usersReducer';
+
+const localStorageMiddleware = ({getState}) => (next) => (action) => {
+  const result = next(action);
+  localStorage.setItem("user", JSON.stringify(getState().users.user));
+  return result;
+};
+
+const loadFromLocalStorage = () => {
+  if (localStorage.getItem("user") !== null) {
+      return {users: {user: JSON.parse(localStorage.getItem("user"))}}
+  }
+  return undefined;
+};
+
+
+const store = configureStore({
+  reducer: {
+    users: usersReducer,
+  },
+  preloadedState: loadFromLocalStorage(),
+  middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(localStorageMiddleware)
+})
 
 const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(
-  <React.StrictMode>
+  <Provider store={store}>
     <App />
-  </React.StrictMode>
-);
-
+  </Provider>
+);
\ No newline at end of file
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();

planner-front/src/logo.svg

-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
\ No newline at end of file

planner-front/src/reportWebVitals.js

-const reportWebVitals = onPerfEntry => {
-  if (onPerfEntry && onPerfEntry instanceof Function) {
-    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
-      getCLS(onPerfEntry);
-      getFID(onPerfEntry);
-      getFCP(onPerfEntry);
-      getLCP(onPerfEntry);
-      getTTFB(onPerfEntry);
-    });
-  }
-};
-
-export default reportWebVitals;

planner-front/src/setupTests.js

-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';

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

+const initialState = {
+  user: {
+    name: 'Ivan',
+    surname: 'Petrov',
+    email: 'test@gmail.com',
+    role: 'superuser'
+  }
+};
+
+const usersReducer = (state = initialState, action) => {
+  switch(action.type) {
+      default:
+          return state;
+  }
+};
+
+export default usersReducer;
\ No newline at end of file