diff --git a/package.json b/package.json index fd39bdd..e52e788 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-headless-accordion": "^1.0.2", + "react-router-dom": "^6.6.2", "react-scripts": "5.0.1", "typescript": "^4.4.2", "web-vitals": "^2.1.0", diff --git a/src/components/BreadCrumb/BreadCreumb.tsx b/src/components/BreadCrumb/BreadCreumb.tsx new file mode 100644 index 0000000..89903d4 --- /dev/null +++ b/src/components/BreadCrumb/BreadCreumb.tsx @@ -0,0 +1,39 @@ +import React from "react"; +import { IconLink } from "../utils/IconLink"; +import { ListItem } from "../utils/ListItem"; +import homeIcon from "./assets/svgs/home.svg" +import arrowRight from "./assets/svgs/arrow-right.svg" + +import { useLocation, Link } from "react-router-dom" +import styles from "./BreadCrumb.module.scss" +export const BreadCrumb = () => { + + const { pathname } = useLocation() + + const routeName = pathname.split("/")[1] + + + return ( + + ); +} \ No newline at end of file diff --git a/src/components/BreadCrumb/BreadCrumb.module.scss b/src/components/BreadCrumb/BreadCrumb.module.scss new file mode 100644 index 0000000..b206042 --- /dev/null +++ b/src/components/BreadCrumb/BreadCrumb.module.scss @@ -0,0 +1,27 @@ +.breadNav { + display: flex; + gap: 12px; + align-items: center; + margin: 0 7.8125%; + padding: 30px 16px; +} + +.navItem { + display: flex; + gap: 12px; + align-items: center; + +} + +.routeName { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 14px; + + + color: #C4C4C4; + + text-transform: uppercase; +} \ No newline at end of file diff --git a/src/components/Main/BreadCrumb/assets/svgs/arrow-right.svg b/src/components/BreadCrumb/assets/svgs/arrow-right.svg similarity index 100% rename from src/components/Main/BreadCrumb/assets/svgs/arrow-right.svg rename to src/components/BreadCrumb/assets/svgs/arrow-right.svg diff --git a/src/components/Main/BreadCrumb/assets/svgs/home.svg b/src/components/BreadCrumb/assets/svgs/home.svg similarity index 100% rename from src/components/Main/BreadCrumb/assets/svgs/home.svg rename to src/components/BreadCrumb/assets/svgs/home.svg diff --git a/src/components/Footer/NewsLetter/Newsletter.module.scss b/src/components/Footer/NewsLetter/Newsletter.module.scss index 24f71cb..eddc9c4 100644 --- a/src/components/Footer/NewsLetter/Newsletter.module.scss +++ b/src/components/Footer/NewsLetter/Newsletter.module.scss @@ -1,6 +1,8 @@ .newsLetter { width: 100%; padding: 16px 0; + border-top: 1px solid; + border-bottom: 1px solid; &__wrapper { display: flex; diff --git a/src/components/Footer/Rodape/Rodape.module.scss b/src/components/Footer/Rodape/Rodape.module.scss index 9a6e575..e0ee5cd 100644 --- a/src/components/Footer/Rodape/Rodape.module.scss +++ b/src/components/Footer/Rodape/Rodape.module.scss @@ -22,21 +22,6 @@ margin: 0 16px; } - - // .container { - // width: 94.9734%; - - // align-items: center; - // display: flex; - // justify-content: space-between; - - // @media (max-width: 1024px) { - // flex-direction: column; - // align-items: flex-start; - // margin: 0 16px; - - // } - // } } &__address { @@ -96,6 +81,7 @@ img { width: 36px; height: 20.2px; + @media(min-width:2500px) { width: 70px; height: 39.27px; @@ -109,13 +95,14 @@ @media (max-width: 490px) { width: 30px; height: 17px; - + } + @media (max-width: 370px) { - column-gap: 5.5px; - width: 18px; - width: 19px; - + column-gap: 5.5px; + width: 18px; + width: 19px; + } diff --git a/src/components/Header/HeaderDesk/HeaderBottom.tsx b/src/components/Header/HeaderDesk/HeaderBottom.tsx index da18f3b..c893593 100644 --- a/src/components/Header/HeaderDesk/HeaderBottom.tsx +++ b/src/components/Header/HeaderDesk/HeaderBottom.tsx @@ -1,19 +1,21 @@ import React from "react"; import styleHeader from '../styles/Header.module.scss'; +import { Link } from "react-router-dom" export const HeaderBottom = () => { return (
); diff --git a/src/components/Header/styles/Header.module.scss b/src/components/Header/styles/Header.module.scss index 310fcd7..9ecedfe 100644 --- a/src/components/Header/styles/Header.module.scss +++ b/src/components/Header/styles/Header.module.scss @@ -314,7 +314,7 @@ a { background: #FFFFFF; transition: all .45s; - + } @media (max-width:1024px) { diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx new file mode 100644 index 0000000..6dd3e50 --- /dev/null +++ b/src/components/Layout/index.tsx @@ -0,0 +1,24 @@ +import { Outlet } from "react-router-dom" +import { Footer } from "../Footer/Footer" +import { Header } from "../Header/Header" +import { BreadCrumb } from "../BreadCrumb/BreadCreumb" +import styles from "./styles.module.scss" + + + + + +export const Layout = () => { + + return ( +
+
+ +
+ +
+ +
+ ) +} \ No newline at end of file diff --git a/src/components/Layout/styles.module.scss b/src/components/Layout/styles.module.scss new file mode 100644 index 0000000..26e74c0 --- /dev/null +++ b/src/components/Layout/styles.module.scss @@ -0,0 +1,19 @@ +.container { + display: flex; + flex-direction: column; + + height: 100vh; + overflow: hidden; +} + +.main { + display: flex; + + height: auto; + margin: 0 7.8125%; + + + flex-direction: column; + + +} \ No newline at end of file diff --git a/src/components/Main/BreadCrumb/BreadCreumb.tsx b/src/components/Main/BreadCrumb/BreadCreumb.tsx deleted file mode 100644 index 51aff47..0000000 --- a/src/components/Main/BreadCrumb/BreadCreumb.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import React from "react"; -import { IconLink } from "../../utils/IconLink"; -import { ListItem } from "../../utils/ListItem"; -import homeIcon from "./assets/svgs/home.svg" -import arrowRight from "./assets/svgs/arrow-right.svg" - -export const BreadCrumb = () => { - return ( - - ); -} \ No newline at end of file diff --git a/src/components/Main/BreadCrumb/BreadCrumb.module.scss b/src/components/Main/BreadCrumb/BreadCrumb.module.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/Main/Main.module.scss b/src/components/Main/Main.module.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/Main/Main.tsx b/src/components/Main/Main.tsx deleted file mode 100644 index 2599e83..0000000 --- a/src/components/Main/Main.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import React from "react"; - -import "./Main.module.scss"; - -export const Main = () => { - return ( - -
- - ); -} \ No newline at end of file diff --git a/src/index.tsx b/src/index.tsx index 9bcb06b..b3797f5 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,12 +1,16 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; -import { Home } from './pages/Home'; import './index.css'; +import { BrowserRouter } from "react-router-dom" +import { Routes } from './routes'; function App() { return ( - + + + + ); } diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx deleted file mode 100644 index be34808..0000000 --- a/src/pages/Home.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import React from "react"; -import { Footer } from "../components/Footer/Footer"; -import { Header } from "../components/Header/Header"; -import { Main } from "../components/Main/Main"; - - -export const Home = () => { - return ( - <> -
-
-