melhorias de telas e rotas

mdsreq-fga-unb · Nov 23, 2023 · a8c9eae · a8c9eae
1 parent ecf5c3f
commit a8c9eae
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 15 deletions.
diff --git a/frontend/src/components/Footer/index.js b/frontend/src/components/Footer/index.js
@@ -1,9 +1,13 @@
 import React from "react";
-import * as C from "./styles";
+import { Box, Center, Text } from '@chakra-ui/react';
 
 const Footer = () => {
   return (
-    <></>
+    <Box as="footer" py="8" bg="gray.800" color="white" backgroundColor={'#243A69'}>
+      <Center padding={'1vh'} justify="space-between" >
+        <Text fontSize="sm" >Copyright © 2023 Centro de Ensino Médio de Taguatinga Norte. Todos os direitos reservados.</Text>
+      </Center>
+    </Box>
   );
 };
 

diff --git a/...end/src/pages/ElectivesExclusion/index.js → ...tend/src/pages/ExclusionEletivas/index.js b/...end/src/pages/ElectivesExclusion/index.js → ...tend/src/pages/ExclusionEletivas/index.js
@@ -20,7 +20,7 @@ import {
 } from "@chakra-ui/react"
 ;
 
-const ElectivesList = () => {
+const ExclusionEletivas = () => {
   const [eletivas, setEletivas] = useState([]);
   const [eletivasSelecionadas, setEletivasSelecionadas] = useState([]);
 
@@ -109,4 +109,4 @@ const ElectivesList = () => {
   );
 };
 
-export default ElectivesList;
+export default ExclusionEletivas;
diff --git a/frontend/src/pages/PathExclusion/index.js → frontend/src/pages/ExclusionTrilhas/index.js b/frontend/src/pages/PathExclusion/index.js → frontend/src/pages/ExclusionTrilhas/index.js
@@ -20,7 +20,7 @@ import {
 } from "@chakra-ui/react"
 ;
 
-const TrilhasList = () => {
+const ExclusionTrilhas = () => {
   const [trilhas, setTrilhas] = useState([]);
   const [trilhasSelecionadas, setTrilhasSelecionadas] = useState([]);
 
@@ -114,4 +114,4 @@ const TrilhasList = () => {
   );
 };
 
-export default TrilhasList;
+export default ExclusionTrilhas;
diff --git a/frontend/src/pages/PathExclusion/style.js → frontend/src/pages/ExclusionTrilhas/style.js b/frontend/src/pages/PathExclusion/style.js → frontend/src/pages/ExclusionTrilhas/style.js
diff --git a/frontend/src/pages/Home/index.js b/frontend/src/pages/Home/index.js
@@ -1,10 +1,25 @@
 import React from "react";
-import Header from '../../components/Header/index.js'
+import { Container, Flex, Stack, Box, Wrap, WrapItem, Button, Center } from "@chakra-ui/react";
+import Header from "../../components/Header/index.js";
+import Footer from "../../components/Footer/index.js";
+import { Link } from "react-router-dom";
 
 const Home = () => {
-
-return (
-    <Header></Header>
+  return (
+    <Flex direction="column" minH="100vh">
+      <Header />
+      <Container flex="2">
+        <Center>
+          <Link to='/criar-trilhas'>Vasco</Link>
+          <Link to='/criar-eletivas'>Vasco</Link>
+        </Center>
+        <Center>
+          <Link to='/trilhas'>Vasco</Link>
+          <Link to='/eletivas'>Vasco</Link>
+        </Center>
+      </Container>
+      <Footer />
+    </Flex>
   );
 };
 

diff --git a/frontend/src/routes/index.js b/frontend/src/routes/index.js
@@ -4,10 +4,12 @@ import useAuth from "../hooks/useAuth";
 import Home from "../pages/Home";
 import Signin from "../pages/Signin";
 import Signup from "../pages/Signup";
-import TrilhasList from "../pages/PathExclusion";
-import ElectivesList from "../pages/ElectivesExclusion"
+import TrilhasList from "../pages/ExclusionTrilhas";
+import ElectivesList from "../pages/ExclusionEletivas"
 import CreateEletivas from "../pages/CreateEletivas";
 import CreateTrilhas from "../pages/CreateTrilhas";
+import ExclusionTrilhas from "../pages/ExclusionTrilhas";
+import ExclusionEletivas from "../pages/ExclusionEletivas";
 
 const Private = ({ Item }) => {
   const { signed } = useAuth();
@@ -24,8 +26,8 @@ const RoutesApp = () => {
           <Route path="/" element={<Signin />} />
           <Route exact path="/signup" element={<Signup />} />
           <Route path="*" element={<Signin />} />
-          <Route path="/trilhas" element={<TrilhasList />} />
-          <Route path="/eletivas" element={<ElectivesList />} />
+          <Route path="/eletivas" element={<ExclusionEletivas />} />
+          <Route path="/trilhas" element={<ExclusionTrilhas />} />
           <Route exact path="/criar-eletiva" element={<CreateEletivas />} />
           <Route exact path="/criar-trilha" element={<CreateTrilhas />} />
         </Routes>

diff --git a/frontend/src/styles/global.js b/frontend/src/styles/global.js
@@ -6,7 +6,7 @@ const GlobalStyle = createGlobalStyle`
     margin: 0;
     padding: 0;
     box-sizing: border-box;
-      //border: 1px solid hotpink;
+    //border: 1px solid hotpink;
   }
 
   body {