From a8c9eae2031fca1f33b24fefc82bfdb2da80ce70 Mon Sep 17 00:00:00 2001 From: Algusto-RC Date: Wed, 22 Nov 2023 23:26:55 -0300 Subject: [PATCH] melhorias de telas e rotas --- frontend/src/components/Footer/index.js | 8 +++++-- .../index.js | 4 ++-- .../index.js | 4 ++-- .../style.js | 0 frontend/src/pages/Home/index.js | 23 +++++++++++++++---- frontend/src/routes/index.js | 10 ++++---- frontend/src/styles/global.js | 2 +- 7 files changed, 36 insertions(+), 15 deletions(-) rename frontend/src/pages/{ElectivesExclusion => ExclusionEletivas}/index.js (97%) rename frontend/src/pages/{PathExclusion => ExclusionTrilhas}/index.js (98%) rename frontend/src/pages/{PathExclusion => ExclusionTrilhas}/style.js (100%) diff --git a/frontend/src/components/Footer/index.js b/frontend/src/components/Footer/index.js index 392110f3..84bedaf3 100644 --- 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 ( - <> + +
+ Copyright © 2023 Centro de Ensino Médio de Taguatinga Norte. Todos os direitos reservados. +
+
); }; diff --git a/frontend/src/pages/ElectivesExclusion/index.js b/frontend/src/pages/ExclusionEletivas/index.js similarity index 97% rename from frontend/src/pages/ElectivesExclusion/index.js rename to frontend/src/pages/ExclusionEletivas/index.js index c506bc2c..4d75504b 100644 --- a/frontend/src/pages/ElectivesExclusion/index.js +++ b/frontend/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 b/frontend/src/pages/ExclusionTrilhas/index.js similarity index 98% rename from frontend/src/pages/PathExclusion/index.js rename to frontend/src/pages/ExclusionTrilhas/index.js index 0bda75ea..cb93d89e 100644 --- a/frontend/src/pages/PathExclusion/index.js +++ b/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 b/frontend/src/pages/ExclusionTrilhas/style.js similarity index 100% rename from frontend/src/pages/PathExclusion/style.js rename to frontend/src/pages/ExclusionTrilhas/style.js diff --git a/frontend/src/pages/Home/index.js b/frontend/src/pages/Home/index.js index 02462060..24bb0f7a 100644 --- 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 ( -
+ return ( + +
+ +
+ Vasco + Vasco +
+
+ Vasco + Vasco +
+
+