nova homepara cada tipo de usuário usuário

mdsreq-fga-unb · Dec 13, 2023 · 806946c · 806946c
1 parent 2264df0
commit 806946c
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 50 deletions.
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -6,7 +6,7 @@ import GlobalStyle from "./styles/global";
 const App = () => (
   <AuthProvider>
     <RoutesApp />
-    <GlobalStyle />
+    {/* <GlobalStyle /> */}
   </AuthProvider>
 );
 

diff --git a/frontend/src/contexts/auth.js b/frontend/src/contexts/auth.js
@@ -27,6 +27,7 @@ export const AuthProvider = ({ children }) => {
 
   const isSuperUser = () => {
     const userType = sessionStorage.getItem("superuser");
+    console.log(userType)
     return userType
   }
 

diff --git a/frontend/src/pages/Home/index.js b/frontend/src/pages/Home/index.js
@@ -1,35 +1,57 @@
 import React from "react";
-import { Container, Flex, Stack, Box, Wrap, WrapItem, Button, Center } from "@chakra-ui/react";
+import { Container, Flex, Text, HStack, Wrap, WrapItem, Button, Center } from "@chakra-ui/react";
 import Header from "../../components/Header/index.js";
 import Footer from "../../components/Footer/index.js";
 import { ChakraProvider } from "@chakra-ui/react";
-
+import * as C from "./styles";
 import { Link } from "react-router-dom";
 
 const Home = () => {
   return (
     <ChakraProvider>
       <Flex direction="column" minH="100vh">
       <Header />
-      <Container flex="1">
+      <Container flex="1" marginTop='5vh'>
+        <Center>
+          <C.titulo>
+              <Text
+              textAlign={"center"}
+              fontSize={"3xl"}
+              color={"#243A69"}
+              as={"b"}
+              >
+              Bem vindo, administrador!
+              </Text>
+          </C.titulo>
+        </Center>
         <Center>
-        <Button colorScheme='blue' variant='ghost'>
-        <Link to='/criar-trilha'>Criar trilha</Link>
-        </Button>
-        <Button colorScheme='blue' variant='ghost'>
-        <Link to='/criar-eletiva'>Criar Eletiva </Link>
-        </Button>
-        <Button colorScheme='blue' variant='ghost'>
-        <Link to='/excluir-trilhas'>Excluir trilha</Link>
-        </Button>
-        <Button colorScheme='blue' variant='ghost'>
-        <Link to='/excluir-eletivas'>Excluir eletiva</Link>
-        </Button>
-        <Button colorScheme='blue' variant='ghost'>
-        <Link to='/recommendations'>Recomendações</Link>
-        </Button>
+            <HStack marginTop='2vh'>
+                <Button colorScheme='facebook'>
+                <Link to='/criar-trilha'>Criar trilha</Link>
+                </Button>
+                <Button colorScheme='facebook'>
+                <Link to='/criar-eletiva'>Criar Eletiva</Link>
+                </Button>
+            </HStack>
         </Center>
+
+        <Center>
+            <HStack marginTop='2vh'>
+                <Button colorScheme='facebook'>
+                <Link to='/excluir-trilhas'>Excluir trilha</Link>
+                </Button>
+                <Button colorScheme='facebook'>
+                <Link to='/excluir-eletivas'>Excluir eletiva</Link>
+                </Button>
+            </HStack>
+        </Center>
+
         <Center>
+            <HStack marginTop='2vh'>
+                <Button colorScheme='facebook'>
+                <Link to='/recommendations'>Recomendações</Link>
+                </Button>
+            </HStack>
         </Center>
       </Container>
       <Footer />

diff --git a/frontend/src/pages/Home/styles.js b/frontend/src/pages/Home/styles.js
@@ -1,4 +1,5 @@
 import { chakra, MenuList, MenuItem, Image, Container } from '@chakra-ui/react';
+import styled from "styled-components";
 
 export const StyledMenuList = chakra(MenuList, {
   baseStyle: {
@@ -8,6 +9,15 @@ export const StyledMenuList = chakra(MenuList, {
   },
 });
 
+export const titulo = styled.div`
+  font-size: 150%;
+  font-weight: 600;
+  color: #243A69;
+  margin-left: 20px;
+  margin-top: 20px;
+  align: center;
+`;
+
 // export const StyledContainer = chakra( Container, {
 //   baseStyle: {
 //     gap:'15vh',

diff --git a/frontend/src/pages/Signin/index.js b/frontend/src/pages/Signin/index.js
@@ -31,11 +31,15 @@ const Signin = () => {
         sessionStorage.setItem("superuser", response.data.superuser);
 
         signin();
-        console.log("oi")
-        console.log( sessionStorage.getItem("superuser"))
-        console.log(isSuperUser())
-        navigate("/home");
+        let typeUser = isSuperUser()
 
+        if(typeUser == "true"){
+          console.log("é adm ")
+          navigate("/home");
+        } else {
+          console.log("é aluno ")
+          navigate('/home')
+        }
 
         } else {
         setError("Credenciais inválidas");

diff --git a/frontend/src/pages/StudentHome/index.js b/frontend/src/pages/StudentHome/index.js
@@ -0,0 +1,51 @@
+import React from "react";
+import { Container, Flex, Text, HStack, Wrap, WrapItem, Button, Center } from "@chakra-ui/react";
+import Header from "../../components/Header/index.js";
+import Footer from "../../components/Footer/index.js";
+import { ChakraProvider } from "@chakra-ui/react";
+import * as C from "./styles";
+
+
+import { Link } from "react-router-dom";
+
+const StudentHome = () => {
+  return (
+    <ChakraProvider>
+      <Flex direction="column" minH="100vh">
+      <Header />
+      <Container flex="1" marginTop='5vh'>
+        <Center>
+            <C.titulo>
+                <Text
+                textAlign={"center"}
+                fontSize={"3xl"}
+                color={"#243A69"}
+                as={"b"}
+                >
+                Bem vindo, estudante!
+                </Text>
+            </C.titulo>
+        </Center>
+        <Center>
+            <HStack marginTop='2vh'>
+                <Button colorScheme='facebook'>
+                <Link to='/eletivas'>Nova matrícula</Link>
+                </Button>
+                <Button colorScheme='facebook'>
+                <Link to='/trilhas'>Visualizar grade</Link>
+                </Button>
+            </HStack>
+        </Center>
+
+
+
+
+      </Container>
+      <Footer />
+    </Flex>
+    </ChakraProvider>
+
+  );
+};
+
+export default StudentHome;
diff --git a/frontend/src/pages/StudentHome/styles.js b/frontend/src/pages/StudentHome/styles.js
@@ -0,0 +1,10 @@
+import styled from "styled-components";
+
+export const titulo = styled.div`
+  font-size: 150%;
+  font-weight: 600;
+  color: #243A69;
+  margin-left: 20px;
+  margin-top: 20px;
+  align: center;
+`;
diff --git a/frontend/src/routes/index.js b/frontend/src/routes/index.js
@@ -1,5 +1,5 @@
-import { Navigate, Route, BrowserRouter, Routes } from "react-router-dom";
 import React from "react";
+import { Navigate, Route, BrowserRouter, Routes } from "react-router-dom";
 import useAuth from "../hooks/useAuth";
 import Home from "../pages/Home";
 import Signin from "../pages/Signin";
@@ -11,14 +11,14 @@ import ExclusionTrilhas from "../pages/ExclusionTrilhas";
 import Recommendations from "../pages/Recommendations";
 import SendStudent from "../pages/SendStudents";
 import RegistrationPeriod from "../pages/RegistrationPeriod"
-import ChoiceList from "../pages/ChoiceList"
-import ListElectives from "../pages/ListElectives"
-import ListLearningPath from "../pages/ListLearningPath"
+import StudentHome from "../pages/StudentHome"
 
 const RoutesApp = () => {
   const { isAuthenticated, isSuperUser } = useAuth();
+  let typeUser = isSuperUser()
+  console.log('type:', typeUser == 'true')
+
 
-  isSuperUser()
 
   return (
     <BrowserRouter>
@@ -27,7 +27,7 @@ const RoutesApp = () => {
         <Route path="/signup" element={<Signup />} />
         <Route path="/" element={<Navigate to="/signin" />} />
 
-        {isSuperUser() ? (
+        {typeUser == 'true' ? (
           <>
             <Route
               path="/home"
@@ -60,7 +60,7 @@ const RoutesApp = () => {
               }
             />
             <Route
-              path="/excluir-trilha"
+              path="/excluir-trilhas"
               element={
                 !isAuthenticated() ? <Navigate to="/signin" /> : <ExclusionTrilhas />
               }
@@ -77,30 +77,12 @@ const RoutesApp = () => {
                 !isAuthenticated() ? <Navigate to="/signin" /> : <RegistrationPeriod />
               }
             />
-            <Route
-              path="/lista"
-              element={
-                !isAuthenticated() ? <Navigate to="/signin" /> : <ChoiceList />
-              }
-            />
-            <Route
-              path="/eletivas"
-              element={
-                !isAuthenticated() ? <Navigate to="/signin" /> : <ListElectives />
-              }
-            />
-            <Route
-              path="/trilhas"
-              element={
-                !isAuthenticated() ? <Navigate to="/signin" /> : <ListLearningPath />
-              }
-            />
           </>
         ) : (
           <Route
-            path="/home"
+            path="/home-student"
             element={
-              !isAuthenticated() ? <Navigate to="/signin" /> : <Home />
+              !isAuthenticated() ? <Navigate to="/signin" /> : <StudentHome />
             }
           />
         )}