From 8f5d9e1993440cdfab3aec0cf1c2d6b50de1065f Mon Sep 17 00:00:00 2001 From: Savio Date: Thu, 19 Jan 2023 12:15:19 -0300 Subject: [PATCH 1/2] feat(Body): Adicionado Rota institucional --- src/components/NavigationBar/NavigationBar.tsx | 2 +- src/components/Router/Router.tsx | 5 +++++ src/pages/Institucionais.tsx | 12 ++++++++++++ src/sectors/Body/CursosBody.tsx | 6 +++++- src/sectors/Body/InstitucionaisBody.tsx | 11 +++++++++++ 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/pages/Institucionais.tsx create mode 100644 src/sectors/Body/InstitucionaisBody.tsx diff --git a/src/components/NavigationBar/NavigationBar.tsx b/src/components/NavigationBar/NavigationBar.tsx index c6c173e..0e4f629 100644 --- a/src/components/NavigationBar/NavigationBar.tsx +++ b/src/components/NavigationBar/NavigationBar.tsx @@ -64,7 +64,7 @@ const NavigationBar = () => {
  • - + INSTITUCIONAIS
    • diff --git a/src/components/Router/Router.tsx b/src/components/Router/Router.tsx index 5be1701..81e380f 100644 --- a/src/components/Router/Router.tsx +++ b/src/components/Router/Router.tsx @@ -4,6 +4,7 @@ import { Routes, Route, BrowserRouter } from "react-router-dom"; import { Home } from "../../pages/Home"; import { Teste } from "../../pages/Teste"; import { Cursos } from "../../pages/Cursos"; +import { Institucionais } from "../../pages/Institucionais"; /* import Home from "./Home"; import Sobre from "./Sobre"; @@ -18,6 +19,10 @@ const RoutesUrl = () => { }> } /> + } + /> ); }; diff --git a/src/pages/Institucionais.tsx b/src/pages/Institucionais.tsx new file mode 100644 index 0000000..149e19e --- /dev/null +++ b/src/pages/Institucionais.tsx @@ -0,0 +1,12 @@ +import { Caminhos } from "../components/Caminhos/Caminhos"; +import { InstitucionaisBody } from "../sectors/Body/InstitucionaisBody"; +const Institucionais = (prop: { titulo: string }) => { + return ( +
    + + +
    + ); +}; + +export { Institucionais }; diff --git a/src/sectors/Body/CursosBody.tsx b/src/sectors/Body/CursosBody.tsx index 62fbce4..c4f5a8e 100644 --- a/src/sectors/Body/CursosBody.tsx +++ b/src/sectors/Body/CursosBody.tsx @@ -1,7 +1,11 @@ import React from "react"; const CursosBody = () => { - return

    Cursos

    ; + return ( +
    +

    Cursos

    ; +
    + ); }; export { CursosBody }; diff --git a/src/sectors/Body/InstitucionaisBody.tsx b/src/sectors/Body/InstitucionaisBody.tsx new file mode 100644 index 0000000..55f0e08 --- /dev/null +++ b/src/sectors/Body/InstitucionaisBody.tsx @@ -0,0 +1,11 @@ +import React from "react"; + +const InstitucionaisBody = () => { + return ( +
    +

    INSTITUCIONAL

    +
    + ); +}; + +export { InstitucionaisBody }; -- 2.34.1 From 9d943d37007f628f1974eb9ed56e7f82b17a2e64 Mon Sep 17 00:00:00 2001 From: Savio Date: Thu, 19 Jan 2023 13:05:34 -0300 Subject: [PATCH 2/2] feat(form): Adicionado o accordion no body --- .../AccordionBody/AccordionBody.tsx | 37 ++++++++++++++++--- .../AccordionBody/accordionBody.module.scss | 1 + .../FormInput/formInput.module.scss | 24 ++---------- src/sectors/Body/InstitucionaisBody.tsx | 7 ++-- src/styles/main.scss | 1 + src/styles/partials/body.scss | 16 ++++++++ 6 files changed, 57 insertions(+), 29 deletions(-) create mode 100644 src/styles/partials/body.scss diff --git a/src/components/AccordionBody/AccordionBody.tsx b/src/components/AccordionBody/AccordionBody.tsx index e870032..46dbe79 100644 --- a/src/components/AccordionBody/AccordionBody.tsx +++ b/src/components/AccordionBody/AccordionBody.tsx @@ -2,7 +2,7 @@ import Col from "react-bootstrap/Col"; import ListGroup from "react-bootstrap/ListGroup"; import Row from "react-bootstrap/Row"; import Tab from "react-bootstrap/Tab"; - +import { FormInput } from "../FormInput/FormInput"; import styles from "./accordionBody.module.scss"; const AccordionBody = () => { return ( @@ -11,20 +11,47 @@ const AccordionBody = () => { - Link 1 + Sobre - Link 2 + Contato -

    oi

    +
    +

    Sobre

    +

    + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed + do eiusmod tempor incididunt ut labore et dolore magna aliqua. + Ut enim ad minim veniam, quis nostrud exercitation ullamco + laboris nisi ut aliquip ex ea commodo consequat. Duis aute + irure dolor in reprehenderit in voluptate velit esse cillum + dolore eu fugiat nulla pariatur. Excepteur sint occaecat + cupidatat non proident, sunt in culpa qui officia deserunt + mollit anim id est laborum. Sed ut perspiciatis unde omnis + iste natus error sit voluptatem accusantium doloremque + laudantium, totam rem aperiam, eaque ipsa quae ab illo + inventore veritatis et quasi architecto beatae vitae dicta + sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit + aspernatur aut odit aut fugit, sed quia consequuntur magni + dolores eos qui ratione voluptatem sequi nesciunt. Neque porro + quisquam est, qui dolorem ipsum quia dolor sit amet, + consectetur, adipisci velit, sed quia non numquam eius modi + tempora incidunt ut labore et dolore magnam aliquam quaerat + voluptatem. Ut enim ad minima veniam, quis nostrum + exercitationem ullam corporis suscipit laboriosam, nisi ut + aliquid ex ea commodi consequatur? Quis autem vel eum iure + reprehenderit qui in ea voluptate velit esse quam nihil + molestiae consequatur, vel illum qui dolorem eum fugiat quo + voluptas nulla pariatur? +

    +
    -

    tchau

    +     diff --git a/src/components/AccordionBody/accordionBody.module.scss b/src/components/AccordionBody/accordionBody.module.scss index b3a97b5..fd883e2 100644 --- a/src/components/AccordionBody/accordionBody.module.scss +++ b/src/components/AccordionBody/accordionBody.module.scss @@ -1,4 +1,5 @@ .accordion-wrapper { + width: 100%; display: flex; flex-direction: column; } diff --git a/src/components/FormInput/formInput.module.scss b/src/components/FormInput/formInput.module.scss index e6ba9c2..e684a46 100644 --- a/src/components/FormInput/formInput.module.scss +++ b/src/components/FormInput/formInput.module.scss @@ -1,27 +1,9 @@ -/*.form { - display: flex; - flex-direction: column; -} -.form-item { - display: flex; - flex-direction: column; - margin-bottom: 10px; -} -.textForm { - display: flex; - flex-direction: row; -} -.errorFormik { - margin-left: 80px; - color: red; -} -*/ .form-wrapper { width: 100%; - max-width: 720px; - min-height: 100vh; + max-width: 748px; + //min-height: 100vh; margin: 0 auto; - padding: 0 12px; + //padding: 0 12px; display: flex; justify-content: center; diff --git a/src/sectors/Body/InstitucionaisBody.tsx b/src/sectors/Body/InstitucionaisBody.tsx index 55f0e08..36834bf 100644 --- a/src/sectors/Body/InstitucionaisBody.tsx +++ b/src/sectors/Body/InstitucionaisBody.tsx @@ -1,9 +1,10 @@ import React from "react"; - +import { AccordionBody } from "../../components/AccordionBody/AccordionBody"; const InstitucionaisBody = () => { return ( -
    -

    INSTITUCIONAL

    +
    +

    INSTITUCIONAL

    +
    ); }; diff --git a/src/styles/main.scss b/src/styles/main.scss index c0f7eff..405da12 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -7,6 +7,7 @@ @import "partials/navigation.scss"; @import "partials/top_header.scss"; @import "partials/bottom_header.scss"; +@import "partials/body.scss"; @import "partials/top_footer.scss"; @import "partials/footer.scss"; @import "partials/bottom_footer.scss"; diff --git a/src/styles/partials/body.scss b/src/styles/partials/body.scss new file mode 100644 index 0000000..609d6fc --- /dev/null +++ b/src/styles/partials/body.scss @@ -0,0 +1,16 @@ +.institucional-wrapper { + width: 100%; + display: flex; + flex-direction: column; + align-items: center; +} +.institucional-title { + font-family: "Roboto"; + font-weight: 400; + font-size: 24px; + line-height: 28.13px; + @media screen and (min-width: 2500px) { + font-size: 48px; + line-height: 56.25px; + } +} -- 2.34.1