Merge pull request #13 from leomurca/feature/professor_initial_setup

Setup inicial para o app da versao do professor

src/app/AuthenticatedApp.js

@@ -1,22 +1,20 @@
-import { Navigate, Route, Routes, useNavigate } from 'react-router-dom';
+import { lazy } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { Container } from '@mui/system';
-import { useUser } from '../context/user';
 import { useAuthState } from '../context/auth';
+import { useUser } from '../context/user';
 
 import MainMenu from '../components/MainMenu';
-import Home from '../screens/Home';
-import Information from '../screens/Information';
-import Calendar from '../screens/Calendar';
 import useLayoutType from '../hooks/useLayoutType';
 import Toolbar from '../components/Toolbar';
-import Classroom from '../screens/Classroom';
-import Assignment from '../screens/Assignment';
-import Profile from '../screens/Profile';
 
 import { avatarMenuOptions, menuOptions } from './data';
 
 import styles from './styles';
 
+const StudentRoutes = lazy(() => import('./StudentRoutes'));
+const ProfessorRoutes = lazy(() => import('./ProfessorRoutes'));
+
 function AuthenticatedApp() {
   const navigate = useNavigate();
   const { state } = useUser();
@@ -24,6 +22,17 @@ function AuthenticatedApp() {
   const layoutType = useLayoutType();
   const { container, toolbar } = styles[layoutType];
 
+  const routeResolver = role => {
+    switch (role) {
+      case 'STUDENT':
+        return <StudentRoutes />;
+      case 'PROFESSOR':
+        return <ProfessorRoutes />;
+      default:
+        return null;
+    }
+  };
+
   return (
     state &&
     state.user && (
@@ -43,21 +52,7 @@ function AuthenticatedApp() {
             options={menuOptions(state.pathname)}
             layoutType={layoutType}
           />
-          <Routes>
+          {routeResolver(state.user.role)}
-            <Route path="/home" element={<Home />} />
-            <Route path="/info" element={<Information />} />
-            <Route path="/calendar" element={<Calendar />} />
-            <Route path="/profile" element={<Profile />} />
-            <Route path="/class">
-              <Route path=":id" element={<Classroom />} />
-            </Route>
-            <Route path="/assignment">
-              <Route path=":id" element={<Assignment />} />
-            </Route>
-            <Route path="/login" element={<Navigate to="/home" />} />
-            <Route path="/register" element={<Navigate to="/home" />} />
-            <Route path="/" element={<Navigate to="/home" />} />
-          </Routes>
         </Container>
       </>
     )

src/app/ProfessorRoutes.js

@@ -0,0 +1,17 @@
+import { Navigate, Route, Routes } from 'react-router-dom';
+
+function ProfessorRoutes() {
+  return (
+    <Routes>
+      <Route path="/calendar" element={<h1>Calendar</h1>} />
+      <Route path="/profile" element={<h1>Profile</h1>} />
+      <Route path="/info" element={<h1>Information</h1>} />
+      <Route path="/home" element={<h1>Home</h1>} />
+      <Route path="/login" element={<Navigate to="/home" />} />
+      <Route path="/register" element={<Navigate to="/home" />} />
+      <Route path="/" element={<Navigate to="/home" />} />
+    </Routes>
+  );
+}
+
+export default ProfessorRoutes;

src/app/StudentRoutes.js

@@ -0,0 +1,30 @@
+import { Navigate, Route, Routes } from 'react-router-dom';
+
+import Home from '../screens/Home';
+import Information from '../screens/Information';
+import Calendar from '../screens/Calendar';
+import Classroom from '../screens/Classroom';
+import Assignment from '../screens/Assignment';
+import Profile from '../screens/Profile';
+
+function StudentRoutes() {
+  return (
+    <Routes>
+      <Route path="/home" element={<Home />} />
+      <Route path="/info" element={<Information />} />
+      <Route path="/calendar" element={<Calendar />} />
+      <Route path="/profile" element={<Profile />} />
+      <Route path="/class">
+        <Route path=":id" element={<Classroom />} />
+      </Route>
+      <Route path="/assignment">
+        <Route path=":id" element={<Assignment />} />
+      </Route>
+      <Route path="/login" element={<Navigate to="/home" />} />
+      <Route path="/register" element={<Navigate to="/home" />} />
+      <Route path="/" element={<Navigate to="/home" />} />
+    </Routes>
+  );
+}
+
+export default StudentRoutes;

src/app/data.js

@@ -28,6 +28,7 @@ const menuOptions = activePath => [
     isActive:
       activePath === '/home' ||
       activePath === '/login' ||
+      activePath === '/register' ||
       activePath === '/profile' ||
       activePath === '/' ||
       activePath.indexOf('class') !== -1 ||

src/context/auth.js

@@ -22,10 +22,9 @@ function AuthProvider(props) {
 
   const register = data => {
     setState({ ...state, status: 'pending' });
-    let shouldFail = false;
 
-    return registerUser(data, shouldFail).then(data => {
+    return registerUser(data).then(data => {
-      if (shouldFail) {
+      if (data.message) {
         return setState({ status: 'error', user: null, error: data });
       } else {
         return setState({ status: 'success', user: data, error: null });
@@ -35,10 +34,9 @@ function AuthProvider(props) {
 
   const login = (email, password) => {
     setState({ ...state, status: 'pending' });
-    let shouldFail = email !== 'teste@teste.com' || password !== '#teste1234';
 
-    return getUser(shouldFail).then(data => {
+    return getUser(email, password).then(data => {
-      if (shouldFail) {
+      if (data.message) {
         return setState({ status: 'error', user: null, error: data });
       } else {
         return setState({ status: 'success', user: data, error: null });

src/services/mocks.js

@@ -534,7 +534,7 @@ const allPeople = [
   },
 ];
 
-const user = {
+const studentUser = {
   id: '123',
   ra: '0021123',
   username: 'ronaldosilva',
@@ -548,6 +548,24 @@ const user = {
   course: 0,
   termsAgreed: true,
   year: 2018,
+  role: 'STUDENT',
+};
+
+const professorUser = {
+  id: '321',
+  ra: '0021123',
+  username: 'cazalbe',
+  email: 'carlos.junior@ifmg.edu.br',
+  password: '#carlos1234', // TODO: Remove this!
+  firstName: 'Carlos',
+  lastName: 'Severiano',
+  token: 'xkhfb9458hnsdfsi9q8345bsdf9b834yr',
+  phone: '31111111111',
+  avatar: 'https://i.pravatar.cc/300?img=61',
+  course: 0,
+  termsAgreed: true,
+  year: 2018,
+  role: 'PROFESSOR',
 };
 
 const authFailure = {
@@ -560,7 +578,8 @@ export {
   allClassroomAnnouncements,
   allPeople,
   faq,
-  user,
+  studentUser,
+  professorUser,
   authFailure,
   allUpcomingAssignments,
 };

src/services/user-service.js

@@ -3,7 +3,8 @@ import {
   allClassrooms,
   allAssignments,
   faq,
-  user,
+  studentUser,
+  professorUser,
   authFailure,
   allClassroomAnnouncements,
   allUpcomingAssignments,
@@ -84,25 +85,32 @@ const getFaq = () =>
     };
   });
 
-const getUser = shouldFail =>
+const getUser = (email, password) =>
   sleep(300).then(() => {
-    if (shouldFail) {
+    let user;
-      return authFailure;
+    if (email === 'p@test.com' && password === 'p123') {
+      user = professorUser;
+    } else if (email === 's@test.com' && password === 's123') {
+      user = studentUser;
     } else {
-      window.localStorage.setItem('$USER', JSON.stringify(user));
+      return authFailure;
-      return user;
     }
+    window.localStorage.setItem('$USER', JSON.stringify(user));
+    return user;
   });
 
-const registerUser = (data, shouldFail) =>
+const registerUser = data =>
   sleep(300).then(() => {
-    if (shouldFail) {
+    let userData;
-      return authFailure;
+    if (data.email === 'p@test.com') {
+      userData = { ...data, role: 'PROFESSOR' };
+    } else if (data.email === 's@test.com') {
+      userData = { ...data, role: 'STUDENT' };
     } else {
-      console.log(data);
+      return authFailure;
-      window.localStorage.setItem('$USER', JSON.stringify(data));
-      return data;
     }
+    window.localStorage.setItem('$USER', JSON.stringify(data));
+    return userData;
   });
 
 export {