From 006c5efbefcd0260e51fbbf18a511228c503cf06 Mon Sep 17 00:00:00 2001 From: Matheus Date: Thu, 19 Jan 2023 13:13:17 -0300 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20constru=C3=A7=C3=A3o=20do=20main-to?= =?UTF-8?q?p?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/svg/arrow.svg | 3 ++ src/assets/svg/house.svg | 3 ++ src/components/Main/main.module.scss | 42 ++++++++++++++++++++++++++ src/components/Main/main.scss | 0 src/components/Main/main.tsx | 33 +++++++++++++++++++- src/components/Main/mainNewsLetter.tsx | 13 ++++++++ 6 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 src/assets/svg/arrow.svg create mode 100644 src/assets/svg/house.svg create mode 100644 src/components/Main/main.module.scss delete mode 100644 src/components/Main/main.scss create mode 100644 src/components/Main/mainNewsLetter.tsx diff --git a/src/assets/svg/arrow.svg b/src/assets/svg/arrow.svg new file mode 100644 index 0000000..313a213 --- /dev/null +++ b/src/assets/svg/arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/house.svg b/src/assets/svg/house.svg new file mode 100644 index 0000000..1226d2e --- /dev/null +++ b/src/assets/svg/house.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/Main/main.module.scss b/src/components/Main/main.module.scss new file mode 100644 index 0000000..cef7623 --- /dev/null +++ b/src/components/Main/main.module.scss @@ -0,0 +1,42 @@ +.conteiner-main{ + padding: 0 100px; + + .main-top{ + position: relative; + + .main-house{ + display: flex; + align-items: center; + font-family: 'Roboto'; + font-weight: 400; + font-size: 12px; + line-height: 14px; + color: #C4C4C4; + margin-top: 30px; + text-transform: uppercase; + + .img-house{ + height: 16px; + width: 16px; + } + + .img-arrow{ + height: 8px; + width: 8px; + margin: 0 8px; + } + } + + .main-title{ + margin: 80px 40.6481481%; + font-family: 'Roboto'; + font-weight: 400; + font-size: 24px; + line-height: 28px; + color: #292929; + letter-spacing: 0.1em; + text-transform: uppercase; + } + + } +} \ No newline at end of file diff --git a/src/components/Main/main.scss b/src/components/Main/main.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/Main/main.tsx b/src/components/Main/main.tsx index a4f4f27..471137c 100644 --- a/src/components/Main/main.tsx +++ b/src/components/Main/main.tsx @@ -1,7 +1,38 @@ import React from 'react'; +import house from '../../assets/svg/house.svg'; +import arrow from '../../assets/svg/arrow.svg'; +import styles from './main.module.scss'; + +const Li = () => { + return( +
  • oi
    • + ) +} + const Main = () => { - return
    + return ( +
    +
    +
    + casa + flecha + Institucional +
    +

    Institucional

    +
    +
    +
      +
    • +
    • +
    • +
    • +
    • +
    +
    +
    + ) + } export { Main }; \ No newline at end of file diff --git a/src/components/Main/mainNewsLetter.tsx b/src/components/Main/mainNewsLetter.tsx new file mode 100644 index 0000000..2a889eb --- /dev/null +++ b/src/components/Main/mainNewsLetter.tsx @@ -0,0 +1,13 @@ +import React from 'react'; + +const newsLetter = () => { + return ( +
    +

    Assine nossa Newsletter

    + + +
    + ) +} + +export { newsLetter } \ No newline at end of file From c4c21aa30ee3964d12e787b29c346317fcec09cb Mon Sep 17 00:00:00 2001 From: Matheus Date: Fri, 20 Jan 2023 02:36:17 -0300 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20constru=C3=A7=C3=A3o=20do=20nav=20m?= =?UTF-8?q?enu=20e=20ajuste=20no=20header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 67 ++++++++++++++++++++++++ package.json | 1 + public/index.html | 2 +- src/components/Header/headerBottom.tsx | 4 +- src/components/Main/main.module.scss | 63 ++++++++++++++++++++++ src/components/Main/main.tsx | 19 ++----- src/components/Main/mainNav.tsx | 72 ++++++++++++++++++++++++++ src/components/Main/mainNewsLetter.tsx | 13 ----- src/components/Main/mainSobre.tsx | 72 ++++++++++++++++++++++++++ 9 files changed, 282 insertions(+), 31 deletions(-) create mode 100644 src/components/Main/mainNav.tsx delete mode 100644 src/components/Main/mainNewsLetter.tsx create mode 100644 src/components/Main/mainSobre.tsx diff --git a/package-lock.json b/package-lock.json index 45ecb5d..3bb59aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "web-vitals": "^2.1.4" }, "devDependencies": { + "react-router-dom": "^6.7.0", "sass": "^1.57.1" } }, @@ -3066,6 +3067,15 @@ } } }, + "node_modules/@remix-run/router": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.3.0.tgz", + "integrity": "sha512-nwQoYb3m4DDpHTeOwpJEuDt8lWVcujhYYSFGLluC+9es2PyLjm+jjq3IeRBQbwBtPLJE/lkuHuGHr8uQLgmJRA==", + "dev": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@rollup/plugin-babel": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", @@ -13994,6 +14004,38 @@ "node": ">=0.10.0" } }, + "node_modules/react-router": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.7.0.tgz", + "integrity": "sha512-KNWlG622ddq29MAM159uUsNMdbX8USruoKnwMMQcs/QWZgFUayICSn2oB7reHce1zPj6CG18kfkZIunSSRyGHg==", + "dev": true, + "dependencies": { + "@remix-run/router": "1.3.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "react": ">=16.8" + } + }, + "node_modules/react-router-dom": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.7.0.tgz", + "integrity": "sha512-jQtXUJyhso3kFw430+0SPCbmCmY1/kJv8iRffGHwHy3CkoomGxeYzMkmeSPYo6Egzh3FKJZRAL22yg5p2tXtfg==", + "dev": true, + "dependencies": { + "@remix-run/router": "1.3.0", + "react-router": "6.7.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, "node_modules/react-scripts": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", @@ -18919,6 +18961,12 @@ "source-map": "^0.7.3" } }, + "@remix-run/router": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.3.0.tgz", + "integrity": "sha512-nwQoYb3m4DDpHTeOwpJEuDt8lWVcujhYYSFGLluC+9es2PyLjm+jjq3IeRBQbwBtPLJE/lkuHuGHr8uQLgmJRA==", + "dev": true + }, "@rollup/plugin-babel": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", @@ -26692,6 +26740,25 @@ "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==" }, + "react-router": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.7.0.tgz", + "integrity": "sha512-KNWlG622ddq29MAM159uUsNMdbX8USruoKnwMMQcs/QWZgFUayICSn2oB7reHce1zPj6CG18kfkZIunSSRyGHg==", + "dev": true, + "requires": { + "@remix-run/router": "1.3.0" + } + }, + "react-router-dom": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.7.0.tgz", + "integrity": "sha512-jQtXUJyhso3kFw430+0SPCbmCmY1/kJv8iRffGHwHy3CkoomGxeYzMkmeSPYo6Egzh3FKJZRAL22yg5p2tXtfg==", + "dev": true, + "requires": { + "@remix-run/router": "1.3.0", + "react-router": "6.7.0" + } + }, "react-scripts": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", diff --git a/package.json b/package.json index 4598d22..4003297 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ ] }, "devDependencies": { + "react-router-dom": "^6.7.0", "sass": "^1.57.1" } } diff --git a/public/index.html b/public/index.html index 153310f..c0cd245 100644 --- a/public/index.html +++ b/public/index.html @@ -16,7 +16,7 @@ - + React App diff --git a/src/components/Header/headerBottom.tsx b/src/components/Header/headerBottom.tsx index c33d268..561bc35 100644 --- a/src/components/Header/headerBottom.tsx +++ b/src/components/Header/headerBottom.tsx @@ -15,11 +15,11 @@ const Links = (props: text) => { const HeaderBottom = () => { return( -
    +
    + ) }; diff --git a/src/components/Main/main.module.scss b/src/components/Main/main.module.scss index cef7623..97bc381 100644 --- a/src/components/Main/main.module.scss +++ b/src/components/Main/main.module.scss @@ -39,4 +39,67 @@ } } + .conteiner-div{ + display: flex; + + .conteiner-nav{ + border-right: 1px solid black; + height: 285px; + width: 27.962963%; + + .conteiner-ul { + width: 100%; + + li{ + list-style: none; + + .item-li, .active-style{ + display: block; + width: 100%; + padding: 10px 16px; + font-family: 'Roboto'; + font-size: 16px; + line-height: 19px; + text-decoration: none; + + } + + .item-li{ + color: #7D7D7D; + font-weight: 400; + } + + .active-style{ + background-color: black; + color: white; + font-weight: 700; + } + } + + } + } + .conteiner-item-description{ + padding: 10px 0 81px 30px; + + .item-description-text, .item-description-title{ + font-family: 'Roboto'; + } + .item-description-title{ + font-weight: 700; + font-size: 24px; + line-height: 28px; + margin-bottom: 12px; + color: #292929; + } + + .item-description-text { + font-weight: 400; + font-size: 13px; + line-height: 15px; + color: #7D7D7D; + max-width: 748px; + text-align: justify; + } + } + } } \ No newline at end of file diff --git a/src/components/Main/main.tsx b/src/components/Main/main.tsx index 471137c..2d6259e 100644 --- a/src/components/Main/main.tsx +++ b/src/components/Main/main.tsx @@ -4,12 +4,9 @@ import arrow from '../../assets/svg/arrow.svg'; import styles from './main.module.scss'; -const Li = () => { - return( -
  • oi
    • - ) -} - +import { Nav } from './mainNav' + + const Main = () => { return (
    @@ -21,15 +18,7 @@ const Main = () => {

    Institucional

    -
    -
      -
    • -
    • -
    • -
    • -
    • -
    -
    +