From adca3bf80283ace69c2af7ce53fd1b6851279523 Mon Sep 17 00:00:00 2001 From: Eduardo-Pyment Date: Fri, 12 Jan 2024 12:16:10 -0300 Subject: [PATCH 1/4] ModuloEducacionais_small responsive --- .../ModulosEducacionais_small.scss | 229 ++++++++++-------- .../ModulosEducacionais_small.tsx | 110 ++++++--- src/styles/anims_presets.scss | 43 +++- 3 files changed, 252 insertions(+), 130 deletions(-) diff --git a/src/components/ModulosEducacionais_small/ModulosEducacionais_small.scss b/src/components/ModulosEducacionais_small/ModulosEducacionais_small.scss index 08a0625..012ca66 100644 --- a/src/components/ModulosEducacionais_small/ModulosEducacionais_small.scss +++ b/src/components/ModulosEducacionais_small/ModulosEducacionais_small.scss @@ -3,10 +3,10 @@ section { padding: 2rem 0rem; > h2 { + font-size: clamp(1rem, 1rem + 1vw, 3.5rem); margin-bottom: 2rem; color: $red-ligh; font-weight: 800; - font-size: 2rem; } div { .modulos-paginas { @@ -17,7 +17,7 @@ section { text-align: center; display: inline; button { - font-size: clamp(0.3rem, 0.5rem + 1vw, 1.5rem); + font-size: clamp(0.3rem, 0.5rem + 1vw, 1.8rem); font-weight: 600; margin: 0.5rem 0.5rem; padding: 0.5rem 1rem; @@ -27,6 +27,7 @@ section { } } .modulos-lista { + margin-bottom: 2.5rem; flex-direction: row; list-style: none; flex-wrap: wrap; @@ -41,17 +42,71 @@ section { min-width: 100%; div { justify-content: space-around; + transition: all 200ms linear; flex-direction: row; align-items: center; font-weight: 500; display: flex; width: 100%; + @media only screen and (max-width: 980px) { + flex-direction: column; + } + .modulo-estatisticas { + width: 125%; + @media only screen and (max-width: 980px) { + flex-direction: row; + margin: 1rem 0rem; + width: 10rem; + } + .modulo-matriculados { + justify-content: left; + font-size: clamp(0.1rem, 0.3rem + 1vw, 1.5rem); + > img { + width: fit-content; + margin: 0; + } + span { + padding-left: 0.2rem; + width: fit-content; + } + } + .modulo-duracao { + justify-content: left; + font-size: clamp(0.1rem, 0.3rem + 1vw, 1.5rem); + > img { + width: fit-content; + margin: 0; + } + span { + padding-left: 0.2rem; + width: fit-content; + margin: 0; + } + } + .modulo-avaliacao { + justify-content: left; + font-size: clamp(0.1rem, 0.3rem + 1vw, 1.5rem); + > img { + width: fit-content; + margin: 0; + } + span { + padding-left: 0.2rem; + width: fit-content; + margin: 0; + } + } + } .modulo-capa { img { border-radius: 1.5rem; object-fit: cover; height: 9rem; width: 9rem; + @media only screen and (max-width: 980px) { + width: 70%; + height: auto; + } } } .modulo-cabecalho { @@ -59,118 +114,100 @@ section { flex-direction: column; padding-left: 0.8rem; text-align: left; + padding: 0.4rem; min-width: 35%; display: flex; .modulo-titulo { padding-bottom: 0.2rem; - font-size: clamp(0.1rem, 0.35rem + 1vw, 2.2rem); + font-size: clamp(0.01rem, 0.35rem + 1vw, 1.7rem); font-weight: 800; - padding: 0.4rem; - } - .modulo-parceiros { - font-size: clamp(0.1rem, 0.2rem + 1vw, 2rem); - letter-spacing: $letter-spacing-min; - color: $red-ligh; - font-weight: 400; - padding: 0.4rem; - padding-top: 0; - width: 100%; - } - } - .modulo-matriculados { - justify-content: left; - font-size: clamp(0.1rem, 0.2rem + 1vw, 1rem); - > img { - width: fit-content; - margin: 0; - } - span { - padding-left: 0.2rem; - width: fit-content; - margin: 0; + @media only screen and (max-width: 980px) { + text-align: center; + font-size: 1.2rem; + margin: 1.5rem 0rem; + } } } - .modulo-duracao { - justify-content: left; - font-size: clamp(0.1rem, 0.2rem + 1vw, 1rem); - > img { - width: fit-content; - margin: 0; - } - span { - padding-left: 0.2rem; - width: fit-content; - margin: 0; + .modulo-parceiros { + font-size: clamp(0.1rem, 0.2rem + 1vw, 1.6rem); + letter-spacing: $letter-spacing-min; + color: $red-ligh; + font-weight: 600; + padding: 0.4rem; + padding-top: 0; + width: 100%; + @media only screen and (max-width: 980px) { + font-size: clamp(0.1rem, 0.5rem + 1vw, 1.5rem); + text-align: center; + margin-top: -1rem; + font-weight: 800; } } - .modulo-avaliacao { - justify-content: left; - font-size: clamp(0.1rem, 0.2rem + 1vw, 1rem); - > img { - width: fit-content; - margin: 0; + } + .modulo-verModulo { + justify-content: center; + a { + justify-content: center; + text-decoration: none; + color: $ui-lightest; + &:hover > button, + &:focus-visible > button { + background-color: $ui-lightest; + border: 3px solid $ui-light; + color: $ui-darkest; } - span { - padding-left: 0.2rem; - width: fit-content; - margin: 0; + @media only screen and (max-width: 980px) { + width: 100%; } - } - .modulo-verModulo { - justify-content: center; - a { - justify-content: center; - text-decoration: none; + button { + all: unset; + font-size: clamp(0.1rem, 0.2rem + 1vw, 1.5rem); + border: 3px solid transparent; + background-color: $ui-light; + transition: all 200ms; + padding: 0.3rem 1rem; + align-items: center; + border-radius: 2rem; color: $ui-lightest; - &:hover, - &:focus-visible > button { - background-color: $ui-lightest; - border: 3px solid $ui-light; - color: $ui-darkest; - } - button { - all: unset; - font-size: clamp(0.1rem, 0.2rem + 1vw, 1.5rem); - border: 3px solid transparent; - background-color: $ui-light; - transition: all 200ms; - padding: 0.3rem 1rem; - align-items: center; - border-radius: 2rem; - color: $ui-lightest; - object-fit: contain; - text-wrap: nowrap; - font-weight: 800; - cursor: pointer; - width: 80%; + object-fit: contain; + text-wrap: nowrap; + font-weight: 800; + cursor: pointer; + width: 80%; + @media only screen and (max-width: 980px) { + padding: 0.5rem 0rem; + font-size: clamp(0.6rem, 0.7rem + 1vw, 2rem); } } } } } } -} -div { - a { - &:hover, - &:focus-visible > .modulo-verMais { - background-color: $ui-lightest; - border: 3px solid $ui-light; - color: $ui-darkest; - } - .modulo-verMais { - border: 3px solid transparent; - background-color: $ui-light; - transition: all 200ms; - padding: 0.4rem 2.5rem; - color: $ui-lightest; - border-radius: 3rem; - width: fit-content; - font-size: 1.2rem; - text-wrap: nowrap; - margin-top: 1rem; - font-weight: 600; - cursor: pointer; + div { + a { + &:hover > .modulo-verMais, + &:focus-visible > .modulo-verMais { + background-color: $ui-lightest; + border: 3px solid $ui-light; + color: $ui-darkest; + } + .modulo-verMais { + font-size: clamp(0.1rem, 0.3rem + 1vw, 1.5rem); + border: 3px solid transparent; + background-color: $ui-light; + transition: all 200ms; + padding: 0.4rem 2.5rem; + color: $ui-lightest; + border-radius: 3rem; + width: fit-content; + text-wrap: nowrap; + margin-top: 1rem; + font-weight: 600; + cursor: pointer; + @media only screen and (max-width: 980px) { + font-size: clamp(0.9rem, 0.4rem + 1vw, 2rem); + } + } } } } diff --git a/src/components/ModulosEducacionais_small/ModulosEducacionais_small.tsx b/src/components/ModulosEducacionais_small/ModulosEducacionais_small.tsx index 759ae56..b255a25 100644 --- a/src/components/ModulosEducacionais_small/ModulosEducacionais_small.tsx +++ b/src/components/ModulosEducacionais_small/ModulosEducacionais_small.tsx @@ -1,14 +1,14 @@ import { useQuery } from "@tanstack/react-query"; import { useState } from "react"; -import "./ModulosEducacionais_small.scss"; -import "../../styles/anims_presets.scss"; - import Timer from "../../assets/feather/clock.svg"; import User from "../../assets/feather/user.svg"; import Star from "../../assets/feather/star.svg"; import { Link } from "react-router-dom"; +import "./ModulosEducacionais_small.scss"; +import "../../styles/anims_presets.scss"; + const ModulosEducacionais_small = () => { const [sort, setSort] = useState("matriculados"); @@ -20,25 +20,62 @@ const ModulosEducacionais_small = () => { return data; }; - const { isLoading, error, data, isFetching } = useQuery({ + const { isLoading, data, isFetching, error } = useQuery({ queryKey: ["queryModulosSmall", sort], queryFn: () => fetchModulosS(sort), }); - if (isLoading || isFetching) { - return ( -

- Carregando Modulos.... -

- ); - } else if (error) { + if (isLoading || isFetching || error) { return ( -

- Error: {error.message} -

+ <> +
+

Modulos Educacionais

+
+
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
+
    +

    + +

    +
+
+
+ + + +
+
+ ); } - return ( <>
@@ -47,17 +84,26 @@ const ModulosEducacionais_small = () => {
  • -
  • -
  • -
    • @@ -75,17 +121,19 @@ const ModulosEducacionais_small = () => { {data.titulo} {data.parceiros}
-
- - {data.matriculados} -
-
- - {data.duracao} -
-
- - {data.avaliacao} +
+
+ + {data.matriculados} +
+
+ + {data.duracao} +
+
+ + {data.avaliacao} +
@@ -100,7 +148,9 @@ const ModulosEducacionais_small = () => {
- +
diff --git a/src/styles/anims_presets.scss b/src/styles/anims_presets.scss index 9780078..363d528 100644 --- a/src/styles/anims_presets.scss +++ b/src/styles/anims_presets.scss @@ -1,5 +1,7 @@ @import "../variables"; +//Curtain grow on hover + .button-growBox { all: unset; border-bottom: 4px solid $ui-lighter; @@ -24,9 +26,8 @@ transform: translate3D(0, -100%, 0); transform-origin: center center; transform: scale(1, 0); - transition: all 250ms; + transition: all 200ms; background: $red-ligh; - background: $ui-dark; position: absolute; height: 100%; content: ""; @@ -46,10 +47,44 @@ transition: all 250ms; } &:hover:before, - &:hover:after , + &:hover:after, &:focus-visible:after, - &:focus-visible:before{ + &:focus-visible:before { transform: scale(1); border-radius: 0; } } + +//Loader +.loaderDots { + @keyframes fill { + 0% { + box-shadow: 0 0 0 2px inset; + } + 100% { + box-shadow: 0 0 0 10px inset; + } + } + animation: fill 1s ease-in infinite alternate; + position: relative; + border-radius: 50%; + color: $red-ligh; + height: 32px; + width: 32px; + &::before, + &::after { + animation: fill 0.9s ease-in infinite alternate; + border-radius: 50%; + position: absolute; + height: 100%; + content: ""; + width: 100%; + left: 48px; + top: 0; + } + &::after { + animation-duration: 1.1s; + right: 48px; + left: auto; + } +} From 81a75ba0cb0032e0d507678d69dd9de8437c6edc Mon Sep 17 00:00:00 2001 From: Eduardo-Pyment Date: Fri, 12 Jan 2024 12:29:58 -0300 Subject: [PATCH 2/4] Parceiros_small made reponsive --- src/components/Parceiros_small/Parceiros_small.scss | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/Parceiros_small/Parceiros_small.scss b/src/components/Parceiros_small/Parceiros_small.scss index 51b2cb9..a5ac624 100644 --- a/src/components/Parceiros_small/Parceiros_small.scss +++ b/src/components/Parceiros_small/Parceiros_small.scss @@ -2,32 +2,35 @@ .parceirosS-section { .parceirosS-titulo { + font-size: clamp(1rem, 1rem + 1vw, 3.5rem); padding: 2rem 0rem; padding-top: 0rem; - font-size: 2rem; } .parceirosS-row { - -webkit-box-shadow: 3px 2px 10px 0px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 3px 2px 10px 0px rgba(0, 0, 0, 0.2); box-shadow: 3px 2px 10px 0px rgba(0, 0, 0, 0.2); background-color: $ui-lighter; border-radius: 1rem; flex-direction: row; display: flex; width: 80%; + @media only screen and (max-width: 760px) { + flex-direction: column; + width: fit-content; + } .parceirosS-container { flex-direction: column; padding: 1rem 1rem; display: flex; .parceirosS-head { + font-size: clamp(0.1rem, 1rem + 1vw, 1.5rem); + transition: all 200ms linear; margin-bottom: 0.5rem; width: fit-content; - font-size: 1.35rem; font-weight: 600; } .parceirosS-texto { + font-size: clamp(0.1rem, 1rem + 1vw, 1rem); max-width: 16rem; - font-size: 1rem; color: $ui-dark; width: 90%; } From 3b4c909948ec8e60b4f5273500c351ab8448841a Mon Sep 17 00:00:00 2001 From: Eduardo-Pyment Date: Fri, 12 Jan 2024 13:10:53 -0300 Subject: [PATCH 3/4] Footer is responsive --- src/components/Footer/Footer.scss | 44 ++++++++++++++++++++++++++----- src/styles/anims_presets.scss | 7 +++-- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/src/components/Footer/Footer.scss b/src/components/Footer/Footer.scss index 74ab8db..dd9f528 100644 --- a/src/components/Footer/Footer.scss +++ b/src/components/Footer/Footer.scss @@ -1,21 +1,29 @@ @import "../../variables"; - +// * { +// border: 1px solid black; +// } .footer-title { letter-spacing: $letter-spacing-max; font-size: 1.7rem; - font-weight: 600; + font-weight: 800; } .main-footer { color: $ui-lightest; - width: 100%; .footer-realizacao { background-color: $red-ligh; flex-wrap: wrap; padding: 1.8rem; display: flex; + @media only screen and (max-width: 980px) { + flex-direction: column; + span { + margin-bottom: 2rem; + font-size: clamp(1rem, 1rem + 1vw, 3rem); + } + } span { - display: block; + display: inline-block; width: 100%; } img { @@ -28,8 +36,17 @@ padding-top: 3rem; display: flex; padding: 1rem; + @media only screen and (max-width: 980px) { + flex-direction: column; + } .footer-lais { - img{ + @media only screen and (max-width: 980px) { + margin: 1rem 0rem; + img { + width: 50%; + } + } + img { filter: brightness(0) invert(1); width: 12rem; } @@ -39,9 +56,18 @@ } } .footer-links-uteis { + @media only screen and (max-width: 980px) { + margin: 2rem 0rem; + ul { + a { + li { + text-align: center; + } + } + } + } ul { list-style: none; - padding: 1rem; width: 12rem; a { text-decoration: none; @@ -65,6 +91,12 @@ padding-top: 1.5rem; display: flex; width: 8rem; + @media only screen and (max-width: 980px) { + width: 10rem; + img { + width: fit-content; + } + } a { padding: 0.35rem; } diff --git a/src/styles/anims_presets.scss b/src/styles/anims_presets.scss index 363d528..cd70b28 100644 --- a/src/styles/anims_presets.scss +++ b/src/styles/anims_presets.scss @@ -38,7 +38,8 @@ top: 0; } &:hover, - &:focus-visible { + &:focus-visible, + &:focus { color: $ui-lightest; } &:hover:after, @@ -49,7 +50,9 @@ &:hover:before, &:hover:after, &:focus-visible:after, - &:focus-visible:before { + &:focus-visible:before, + &:focus:before, + &:focus:after { transform: scale(1); border-radius: 0; } From 1f2888cd5dfc565975dd60118dfa2798df4b9a07 Mon Sep 17 00:00:00 2001 From: Eduardo-Pyment Date: Fri, 12 Jan 2024 19:08:29 -0300 Subject: [PATCH 4/4] Header overhauled to NavigationBar & responsivity --- src/components/MainHeader/MainHeader.scss | 58 -------- src/components/MainHeader/MainHeader.tsx | 44 ------ src/components/MainHeader/NavigationBar.scss | 137 +++++++++++++++++++ src/components/MainHeader/NavigationBar.tsx | 59 ++++++++ src/routes/Contato/Contato.tsx | 4 +- src/routes/Cursos/Cursos.tsx | 4 +- src/routes/Home/Home.tsx | 4 +- src/routes/Modulo/Modulo.tsx | 4 +- src/routes/Parceiros/Parceiros.tsx | 4 +- src/routes/Sobre/Sobre.tsx | 4 +- src/routes/Transparencia/Transparencia.tsx | 4 +- 11 files changed, 210 insertions(+), 116 deletions(-) delete mode 100644 src/components/MainHeader/MainHeader.scss delete mode 100644 src/components/MainHeader/MainHeader.tsx create mode 100644 src/components/MainHeader/NavigationBar.scss create mode 100644 src/components/MainHeader/NavigationBar.tsx diff --git a/src/components/MainHeader/MainHeader.scss b/src/components/MainHeader/MainHeader.scss deleted file mode 100644 index dd278d8..0000000 --- a/src/components/MainHeader/MainHeader.scss +++ /dev/null @@ -1,58 +0,0 @@ -@import "../../variables"; - -.navbar { - border-bottom: 2px solid $ui-lighter; - background-color: $ui-lightest; - justify-content: center; - align-items: center; - position: sticky; - z-index: 999; - top: 0; - .navbar-group { - justify-content: center; - flex-direction: row; - align-items: center; - text-wrap: nowrap; - list-style: none; - display: flex; - a { - text-decoration: none; - } - .navbar-group-item { - font-size: clamp(0.1rem, 0.2rem + 1vw, 1.4rem); - letter-spacing: $letter-spacing-mid; - padding: 0.8rem 0.5rem; - color: $ui-dark; - img { - min-width: 5rem; - width: 80%; - } - .nav-button { - border: solid 1px $ui-grey; - padding: 0.3rem 0.8rem; - border-radius: 10rem; - box-shadow: none; - } - .nav-button-entrar { - background-color: $ui-lightest; - color: $ui-darker; - } - .nav-button-cadastrar { - background-color: $ui-grey; - color: $ui-lightest; - } - input#nav-searchbar { - border: solid 1px $ui-grey; - padding: 0.1rem 0.3rem; - border-radius: 2rem; - min-width: 2rem; - } - #nav-searchbar::placeholder { - color: $ui-darkest; - } - #nav-searchbar::placeholder :focus { - color: $red-ligh; - } - } - } -} diff --git a/src/components/MainHeader/MainHeader.tsx b/src/components/MainHeader/MainHeader.tsx deleted file mode 100644 index 45ad2fc..0000000 --- a/src/components/MainHeader/MainHeader.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import { Link } from "react-router-dom"; -import "./MainHeader.scss"; - -import logoSmall from "../../assets/images/logo-small.png" - -const MainHeader = () => { - return ( - <> - - - ); -}; - -export default MainHeader; diff --git a/src/components/MainHeader/NavigationBar.scss b/src/components/MainHeader/NavigationBar.scss new file mode 100644 index 0000000..d3ca4c1 --- /dev/null +++ b/src/components/MainHeader/NavigationBar.scss @@ -0,0 +1,137 @@ +@import "../../variables"; + +// * { +// border: 1px solid black; +// } + + +.Navbar { + border-bottom: 2px solid $ui-lighter; + justify-content: space-between; + background: $ui-lightest; + align-items: center; + position: fixed; + display: flex; + z-index: 999; + height: auto; + width: 100%; +} + +.Navbar > .nav-logo { + color: $ui-darker; + font-weight: 700; + font-size: 21px; + margin: 15px; +} + +.Navbar > .nav-items > a { + text-decoration: none; + position: relative; + border-radius: 2px; + color: $ui-darker; + font-size: 16px; + margin: 15px; + opacity: 0.9; +} + +.Navbar > .nav-items > a:hover { + opacity: 1; +} + +.Navbar > .nav-items > a::before { + background: $ui-darker; + transition: all 0.45s; + position: absolute; + content: ""; + height: 2px; + bottom: 0; + width: 0; + left: 0; +} + +.Navbar > .nav-items > a:hover::before { + width: 100%; +} + +.Navbar > .nav-toggle { + display: none; +} + +@media (max-width: 700px) { + .Navbar > .nav-items { + transform: translateX(-100%); + backdrop-filter: blur(12px); + background: #ffEFEFD0; + flex-direction: column; + transition: all 0.45s; + position: absolute; + display: flex; + height: 100dvh; + width: 100%; + top: 70px; + right: 0; + } + + .Navbar > .nav-items > a::before { + background: transparent; + } + + .Navbar > .nav-items.open { + transform: translateX(0); + } + + .Navbar > .nav-toggle { + justify-content: center; + align-items: center; + cursor: pointer; + display: flex; + height: 50px; + width: 50px; + } + + .nav-toggle > .bar { + transition: all 200ms ease-in-out; + background: $ui-darker; + position: relative; + border-radius: 2px; + width: 32px; + height: 2px; + right: 0; + } + + .nav-toggle > .bar::before, + .nav-toggle > .bar::after { + transition: all 200ms ease-in-out; + background: $ui-darker; + position: absolute; + border-radius: 2px; + content: ""; + height: 2px; + } + + .nav-toggle > .bar::before { + transform: translateY(-8px); + width: 32px; + right: 0; + } + + .nav-toggle > .bar::after { + transform: translateY(8px); + width: 32px; + right: 0; + } + + .nav-toggle.open > .bar { + transform: translateX(-40px); + background: transparent; + } + + .nav-toggle.open > .bar::before { + transform: rotate(45deg) translate(26px, -26px); + width: 32px; + } + + .nav-toggle.open > .bar::after { + transform: rotate(-45deg) translate(26px, 26px); + } +} diff --git a/src/components/MainHeader/NavigationBar.tsx b/src/components/MainHeader/NavigationBar.tsx new file mode 100644 index 0000000..b5faa5b --- /dev/null +++ b/src/components/MainHeader/NavigationBar.tsx @@ -0,0 +1,59 @@ +import { useState } from "react"; +import { Link } from "react-router-dom"; + +import "./NavigationBar.scss"; + +import logoSmall from "../../assets/images/logo-small.png"; + +const NavigationBar = () => { + const [isOpen, setIsOpen] = useState(false); + + return ( + <> + + + ); +}; + + /* + Logo AVASUS + +
+ Início + Sobre Nós + Cursos + Parceiros + Transparência + Contato +
setIsOpen(!IsOpen)}> + +
+
*/ + + + /*
+ + + +
*/ + + +export default NavigationBar; diff --git a/src/routes/Contato/Contato.tsx b/src/routes/Contato/Contato.tsx index 8248f53..4b073f9 100644 --- a/src/routes/Contato/Contato.tsx +++ b/src/routes/Contato/Contato.tsx @@ -1,11 +1,11 @@ -import MainHeader from "../../components/MainHeader/MainHeader"; +import NavigationBar from "../../components/MainHeader/NavigationBar"; import Footer from "../../components/Footer/Footer"; const Contato = () => { return (
- +

Contato

diff --git a/src/routes/Cursos/Cursos.tsx b/src/routes/Cursos/Cursos.tsx index 398442e..bea2252 100644 --- a/src/routes/Cursos/Cursos.tsx +++ b/src/routes/Cursos/Cursos.tsx @@ -1,4 +1,4 @@ -import MainHeader from "../../components/MainHeader/MainHeader"; +import NavigationBar from "../../components/MainHeader/NavigationBar"; import ModulosEducacionais_big from "../../components/ModulosEducacionais_big/ModulosEducacionais_big"; @@ -7,7 +7,7 @@ import Footer from "../../components/Footer/Footer"; const Cursos = () => { return (
- +
diff --git a/src/routes/Home/Home.tsx b/src/routes/Home/Home.tsx index da32587..aefb0b2 100644 --- a/src/routes/Home/Home.tsx +++ b/src/routes/Home/Home.tsx @@ -1,4 +1,4 @@ -import MainHeader from "../../components/MainHeader/MainHeader"; +import NavigationBar from "../../components/MainHeader/NavigationBar"; import ImageSlider from "../../components/ImageSlider/ImageSlider"; import ModulosEducacionais_small from "../../components/ModulosEducacionais_small/ModulosEducacionais_small"; import Parceiros_small from "../../components/Parceiros_small/Parceiros_small"; @@ -7,7 +7,7 @@ import Footer from "../../components/Footer/Footer"; const Home = () => { return (
- + diff --git a/src/routes/Modulo/Modulo.tsx b/src/routes/Modulo/Modulo.tsx index dd52570..c622529 100644 --- a/src/routes/Modulo/Modulo.tsx +++ b/src/routes/Modulo/Modulo.tsx @@ -1,11 +1,11 @@ -import MainHeader from "../../components/MainHeader/MainHeader"; +import NavigationBar from "../../components/MainHeader/NavigationBar"; import ModuloDetalhe from "../../components/ModuloDetalhe/ModuloDetalhe"; import Footer from "../../components/Footer/Footer"; const Modulo = () => { return (
- +
diff --git a/src/routes/Parceiros/Parceiros.tsx b/src/routes/Parceiros/Parceiros.tsx index a43dbd2..1c7812b 100644 --- a/src/routes/Parceiros/Parceiros.tsx +++ b/src/routes/Parceiros/Parceiros.tsx @@ -1,11 +1,11 @@ -import MainHeader from "../../components/MainHeader/MainHeader"; +import NavigationBar from "../../components/MainHeader/NavigationBar"; import Parceiros_big from "../../components/Parceiros_big/Parceiros_big"; import Footer from "../../components/Footer/Footer"; const Parceiros = () => { return (
- +
diff --git a/src/routes/Sobre/Sobre.tsx b/src/routes/Sobre/Sobre.tsx index 4ed2e14..84ff1d9 100644 --- a/src/routes/Sobre/Sobre.tsx +++ b/src/routes/Sobre/Sobre.tsx @@ -1,11 +1,11 @@ -import MainHeader from "../../components/MainHeader/MainHeader"; +import NavigationBar from "../../components/MainHeader/NavigationBar"; import Footer from "../../components/Footer/Footer"; const Sobre = () => { return (
- +

Sobre

diff --git a/src/routes/Transparencia/Transparencia.tsx b/src/routes/Transparencia/Transparencia.tsx index a85788c..53f94d3 100644 --- a/src/routes/Transparencia/Transparencia.tsx +++ b/src/routes/Transparencia/Transparencia.tsx @@ -1,4 +1,4 @@ -import MainHeader from "../../components/MainHeader/MainHeader"; +import NavigationBar from "../../components/MainHeader/NavigationBar"; import Tranparencia_DadosGerais from "../../components/Tranparencia_DadosGerais/Tranparencia_DadosGerais"; import Transparencia_UsuariosPorCurso from "../../components/Transparencia_UsuariosPorCurso/Transparencia_UsuariosPorCurso"; import Transparencia_UsuariosPorEstado from "../../components/Transparencia_UsuariosPorEstado/Transparencia_UsuariosPorEstado"; @@ -9,7 +9,7 @@ import "./Transparencia.scss"; const Transparencia = () => { return (
- +