From 17cedd0faca7de0e91bf986c02ac38e92610a15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cain=C3=A3=20Milech?= Date: Wed, 4 Jan 2023 23:35:37 -0300 Subject: [PATCH 1/8] feat: Adiciona header top --- react-project/src/assets/images/svgs/cart.svg | 12 +++ react-project/src/assets/images/svgs/logo.svg | 9 +++ .../src/assets/images/svgs/logo4k.svg | 9 +++ .../src/assets/images/svgs/search.svg | 10 +++ .../assets/styles/modules/Header.module.scss | 76 +++++++++++++++++++ .../src/assets/styles/variables.scss | 2 + react-project/src/components/Header.tsx | 60 ++++++++++++++- 7 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 react-project/src/assets/images/svgs/cart.svg create mode 100644 react-project/src/assets/images/svgs/logo.svg create mode 100644 react-project/src/assets/images/svgs/logo4k.svg create mode 100644 react-project/src/assets/images/svgs/search.svg create mode 100644 react-project/src/assets/styles/modules/Header.module.scss diff --git a/react-project/src/assets/images/svgs/cart.svg b/react-project/src/assets/images/svgs/cart.svg new file mode 100644 index 0000000..fd775ad --- /dev/null +++ b/react-project/src/assets/images/svgs/cart.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/react-project/src/assets/images/svgs/logo.svg b/react-project/src/assets/images/svgs/logo.svg new file mode 100644 index 0000000..7f767d8 --- /dev/null +++ b/react-project/src/assets/images/svgs/logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/react-project/src/assets/images/svgs/logo4k.svg b/react-project/src/assets/images/svgs/logo4k.svg new file mode 100644 index 0000000..f57d95b --- /dev/null +++ b/react-project/src/assets/images/svgs/logo4k.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/react-project/src/assets/images/svgs/search.svg b/react-project/src/assets/images/svgs/search.svg new file mode 100644 index 0000000..4374b77 --- /dev/null +++ b/react-project/src/assets/images/svgs/search.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/react-project/src/assets/styles/modules/Header.module.scss b/react-project/src/assets/styles/modules/Header.module.scss new file mode 100644 index 0000000..01d9d1f --- /dev/null +++ b/react-project/src/assets/styles/modules/Header.module.scss @@ -0,0 +1,76 @@ +header { + background-color: var(--black); + display: flex; + flex-direction: column; + color: var(--white); + + .spread { + border-bottom: 1px solid var(--gray-100); + } + + .header { + margin-left: 100px; + margin-right: 100px; + display: flex; + justify-content: space-between; + padding: 22px 0; + align-items: center; + + a { + display: contents; + + figure { + display: contents; + } + } + + &__search { + form { + position: relative; + + input { + padding: 8px 44px 8px 16px; + background-color: var(--white); + border: 2px solid var(--gray-500); + border-radius: 5px; + color: var(--gray-600); + font-weight: 400; + font-size: 14px; + line-height: 16px; + width: 264px; + height: 32px; + + &::placeholder { + color: var(--gray-600); + } + } + + button { + position: absolute; + top: 6px; + right: 16px; + border: 0; + background-color: var(--white); + cursor: pointer; + } + } + } + + &__account { + display: flex; + align-items: center; + gap: 55px; + + &__login { + color: var(--white); + font-weight: 400; + font-size: 14px; + line-height: 16px; + } + } + } + + .menu { + display: flex; + } +} diff --git a/react-project/src/assets/styles/variables.scss b/react-project/src/assets/styles/variables.scss index b14bee3..cf335db 100644 --- a/react-project/src/assets/styles/variables.scss +++ b/react-project/src/assets/styles/variables.scss @@ -12,6 +12,8 @@ --gray-200: #7d7d7d; --gray-300: #e5e5e5; --gray-400: #b9b7b7; + --gray-500: #f2f2f2; + --gray-600: #c6c6c6; --red-100: #ff0000; diff --git a/react-project/src/components/Header.tsx b/react-project/src/components/Header.tsx index b4c852b..f13a8bf 100644 --- a/react-project/src/components/Header.tsx +++ b/react-project/src/components/Header.tsx @@ -1,7 +1,63 @@ -import React from "react"; +import header from "../assets/styles/modules/Header.module.scss"; + +import { Formik, Form, Field, ErrorMessage } from "formik"; + +//IMAGES +import logo from "../assets/images/svgs/logo.svg"; +import search from "../assets/images/svgs/search.svg"; +import cart from "../assets/images/svgs/cart.svg"; + +interface ISearchType { + search: string; +} const Header = () => { - return
Header
; + return ( +
+
+
+ +
+ Logo M3 Academy +
+ + +
+ { + actions.resetForm(); + }} + initialValues={{ search: "" }} + > +
+ + + +
+
+ +
+ + ENTRAR + + +
+ Carrinho de compras +
+ +
+
+
+ +
+
a
+
b
+
c
+
+
+ ); }; export { Header }; From c87ecd9c6e76441826a8a79e8c65707d7152d350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cain=C3=A3=20Milech?= Date: Thu, 5 Jan 2023 23:35:57 -0300 Subject: [PATCH 2/8] feat: Adiciona menu no header --- .../assets/styles/modules/Header.module.scss | 19 ++++++++++++++ .../assets/styles/modules/Menu.module.scss | 0 react-project/src/components/Header.tsx | 20 ++++++++++---- react-project/src/components/Main.tsx | 26 ++++++++++--------- react-project/src/components/Menu.tsx | 13 ++++++++++ react-project/src/components/Navigation.tsx | 1 - react-project/src/schema/FormSchema.ts | 7 ++++- 7 files changed, 67 insertions(+), 19 deletions(-) create mode 100644 react-project/src/assets/styles/modules/Menu.module.scss create mode 100644 react-project/src/components/Menu.tsx diff --git a/react-project/src/assets/styles/modules/Header.module.scss b/react-project/src/assets/styles/modules/Header.module.scss index 01d9d1f..f63576c 100644 --- a/react-project/src/assets/styles/modules/Header.module.scss +++ b/react-project/src/assets/styles/modules/Header.module.scss @@ -71,6 +71,25 @@ header { } .menu { + margin-left: 100px; + margin-right: 100px; display: flex; + padding: 14px 0; + + ul { + display: flex; + gap: 55px; + list-style: none; + + li { + a { + font-weight: 500; + font-size: 14px; + line-height: 16px; + color: var(--white); + text-decoration: none; + } + } + } } } diff --git a/react-project/src/assets/styles/modules/Menu.module.scss b/react-project/src/assets/styles/modules/Menu.module.scss new file mode 100644 index 0000000..e69de29 diff --git a/react-project/src/components/Header.tsx b/react-project/src/components/Header.tsx index f13a8bf..dbf2bc3 100644 --- a/react-project/src/components/Header.tsx +++ b/react-project/src/components/Header.tsx @@ -7,6 +7,8 @@ import logo from "../assets/images/svgs/logo.svg"; import search from "../assets/images/svgs/search.svg"; import cart from "../assets/images/svgs/cart.svg"; +import { Menu } from "./Menu"; + interface ISearchType { search: string; } @@ -51,11 +53,19 @@ const Header = () => { -
-
a
-
b
-
c
-
+ ); }; diff --git a/react-project/src/components/Main.tsx b/react-project/src/components/Main.tsx index 0704091..859a008 100644 --- a/react-project/src/components/Main.tsx +++ b/react-project/src/components/Main.tsx @@ -31,20 +31,22 @@ const Main = () => { INSTITUCIONAL -

INSTITUCIONAL

+
+

INSTITUCIONAL

-
- +
+ - - } /> - } /> - } /> - } /> - } /> - } /> - -
+ + } /> + } /> + } /> + } /> + } /> + } /> + +
+
); }; diff --git a/react-project/src/components/Menu.tsx b/react-project/src/components/Menu.tsx new file mode 100644 index 0000000..5b81f3e --- /dev/null +++ b/react-project/src/components/Menu.tsx @@ -0,0 +1,13 @@ +import menu from "../assets/styles/modules/Menu.module.scss"; + +const Menu = () => { + return ( +
+ CURSOS + SAIBA MAIS + INSTITUCIONAIS +
+ ); +}; + +export { Menu }; diff --git a/react-project/src/components/Navigation.tsx b/react-project/src/components/Navigation.tsx index ad7294a..6560c72 100644 --- a/react-project/src/components/Navigation.tsx +++ b/react-project/src/components/Navigation.tsx @@ -1,4 +1,3 @@ -import React from "react"; import { NavLink } from "react-router-dom"; import navigation from "../assets/styles/modules/Navigation.module.scss"; diff --git a/react-project/src/schema/FormSchema.ts b/react-project/src/schema/FormSchema.ts index f926c23..1566dc0 100644 --- a/react-project/src/schema/FormSchema.ts +++ b/react-project/src/schema/FormSchema.ts @@ -14,6 +14,11 @@ export default Yup.object().shape({ telefone: Yup.string() .matches(/^\([1-9]{2}\) [0-9]{5}\-[0-9]{4}$/, "Número inválido") .required("*Campo obrigatorio"), - instagram: Yup.string(), + instagram: Yup.string() + .min(3, "Digite no mínimo 3 caracteres") + .matches( + /^@(?!.*\.\.)(?!.*\.$)[^\W][\w.]{0,29}$/, + "Insira @ no começo do seu user ou certifique-se que seja um user válido" + ), terms: Yup.boolean().oneOf([true], ""), }); From bdd10a41fc251a6a0fbc60aa969eab3d14a9b67f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cain=C3=A3=20Milech?= Date: Fri, 6 Jan 2023 18:50:50 -0300 Subject: [PATCH 3/8] feat: Cria menu hamburguer --- react-project/package-lock.json | 50 +++++++++++++++ react-project/package.json | 1 + react-project/src/App.tsx | 1 + react-project/src/Declarations.d.ts | 1 + .../src/assets/images/svgs/close.svg | 4 ++ .../src/assets/images/svgs/hamburguer.svg | 5 ++ react-project/src/assets/styles/global.scss | 63 +++++++++++++++++++ .../styles/modules/Hambuguer.module.scss | 0 .../assets/styles/modules/Header.module.scss | 1 + react-project/src/components/Header.tsx | 4 +- .../src/components/MenuHamburguer.tsx | 44 +++++++++++++ react-project/src/pages/Institucional.tsx | 2 - 12 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 react-project/src/assets/images/svgs/close.svg create mode 100644 react-project/src/assets/images/svgs/hamburguer.svg create mode 100644 react-project/src/assets/styles/modules/Hambuguer.module.scss create mode 100644 react-project/src/components/MenuHamburguer.tsx diff --git a/react-project/package-lock.json b/react-project/package-lock.json index 128dd0d..f310550 100644 --- a/react-project/package-lock.json +++ b/react-project/package-lock.json @@ -20,6 +20,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-input-mask": "^2.0.4", + "react-modal": "^3.16.1", "react-router-dom": "^6.6.1", "react-scripts": "5.0.1", "react-text-mask": "^5.5.0", @@ -7827,6 +7828,11 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/exenv": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", + "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==" + }, "node_modules/exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", @@ -15109,6 +15115,29 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, + "node_modules/react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + }, + "node_modules/react-modal": { + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz", + "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==", + "dependencies": { + "exenv": "^1.2.0", + "prop-types": "^15.7.2", + "react-lifecycles-compat": "^3.0.0", + "warning": "^4.0.3" + }, + "engines": { + "node": ">=8" + }, + "peerDependencies": { + "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18", + "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18" + } + }, "node_modules/react-refresh": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", @@ -24128,6 +24157,11 @@ "strip-final-newline": "^2.0.0" } }, + "exenv": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", + "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==" + }, "exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", @@ -29264,6 +29298,22 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, + "react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + }, + "react-modal": { + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz", + "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==", + "requires": { + "exenv": "^1.2.0", + "prop-types": "^15.7.2", + "react-lifecycles-compat": "^3.0.0", + "warning": "^4.0.3" + } + }, "react-refresh": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", diff --git a/react-project/package.json b/react-project/package.json index 081aa34..8d8bcc3 100644 --- a/react-project/package.json +++ b/react-project/package.json @@ -15,6 +15,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-input-mask": "^2.0.4", + "react-modal": "^3.16.1", "react-router-dom": "^6.6.1", "react-scripts": "5.0.1", "react-text-mask": "^5.5.0", diff --git a/react-project/src/App.tsx b/react-project/src/App.tsx index 773fa05..6354bed 100644 --- a/react-project/src/App.tsx +++ b/react-project/src/App.tsx @@ -1,4 +1,5 @@ import React from "react"; + import logo from "./logo.svg"; import "../src/assets/styles/global.scss"; import { Institucional } from "./pages/Institucional"; diff --git a/react-project/src/Declarations.d.ts b/react-project/src/Declarations.d.ts index b614a49..ff21304 100644 --- a/react-project/src/Declarations.d.ts +++ b/react-project/src/Declarations.d.ts @@ -1 +1,2 @@ declare module "react-text-mask"; +declare module "react-modal"; diff --git a/react-project/src/assets/images/svgs/close.svg b/react-project/src/assets/images/svgs/close.svg new file mode 100644 index 0000000..e0e6d36 --- /dev/null +++ b/react-project/src/assets/images/svgs/close.svg @@ -0,0 +1,4 @@ + + + + diff --git a/react-project/src/assets/images/svgs/hamburguer.svg b/react-project/src/assets/images/svgs/hamburguer.svg new file mode 100644 index 0000000..6cadeb3 --- /dev/null +++ b/react-project/src/assets/images/svgs/hamburguer.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/react-project/src/assets/styles/global.scss b/react-project/src/assets/styles/global.scss index 4135aca..e190d3c 100644 --- a/react-project/src/assets/styles/global.scss +++ b/react-project/src/assets/styles/global.scss @@ -4,3 +4,66 @@ margin: 0; font-family: var(--font-roboto); } + +.divhamb { + position: relative; + border: 1px solid red; + /*width: 50px; + height: 50px;*/ +} + +.fundo { + background-color: blue; + border: 10px solid yellow; +} + +.modal-content { + position: absolute; + background-color: var(--white); + border: 1px solid green; + width: 97.4609%; + height: 585px; + + .modal-top { + display: flex; + justify-content: space-between; + padding: 31px 16px; + background-color: var(--black); + a { + font-weight: 400; + font-size: 14px; + line-height: 16px; + color: var(--white); + text-decoration: none; + } + + button { + background: none; + border: 0; + display: contents; + cursor: pointer; + + img { + width: 15px; + height: 15px; + } + } + } + + ul { + padding: 31px 16px; + list-style: none; + + li { + margin-bottom: 12px; + + a { + color: var(--gray-100); + text-decoration: none; + font-weight: 500; + font-size: 14px; + line-height: 16px; + } + } + } +} diff --git a/react-project/src/assets/styles/modules/Hambuguer.module.scss b/react-project/src/assets/styles/modules/Hambuguer.module.scss new file mode 100644 index 0000000..e69de29 diff --git a/react-project/src/assets/styles/modules/Header.module.scss b/react-project/src/assets/styles/modules/Header.module.scss index f63576c..a409448 100644 --- a/react-project/src/assets/styles/modules/Header.module.scss +++ b/react-project/src/assets/styles/modules/Header.module.scss @@ -71,6 +71,7 @@ header { } .menu { + display: none; margin-left: 100px; margin-right: 100px; display: flex; diff --git a/react-project/src/components/Header.tsx b/react-project/src/components/Header.tsx index dbf2bc3..b8929a8 100644 --- a/react-project/src/components/Header.tsx +++ b/react-project/src/components/Header.tsx @@ -7,7 +7,7 @@ import logo from "../assets/images/svgs/logo.svg"; import search from "../assets/images/svgs/search.svg"; import cart from "../assets/images/svgs/cart.svg"; -import { Menu } from "./Menu"; +import { MenuHamburguer } from "./MenuHamburguer"; interface ISearchType { search: string; @@ -66,6 +66,8 @@ const Header = () => { + + ); }; diff --git a/react-project/src/components/MenuHamburguer.tsx b/react-project/src/components/MenuHamburguer.tsx new file mode 100644 index 0000000..348e967 --- /dev/null +++ b/react-project/src/components/MenuHamburguer.tsx @@ -0,0 +1,44 @@ +import { useState } from "react"; +import Modal from "react-modal"; + +import close from "../assets/images/svgs/close.svg"; + +const MenuHamburguer = () => { + const [hambActive, setHamb] = useState(false); + const HambMode = () => { + setHamb(!hambActive); + }; + + return ( +
+ + +
+ ENTRAR + +
+ + + +
+ ); +}; + +export { MenuHamburguer }; diff --git a/react-project/src/pages/Institucional.tsx b/react-project/src/pages/Institucional.tsx index 0d62218..48ac4d5 100644 --- a/react-project/src/pages/Institucional.tsx +++ b/react-project/src/pages/Institucional.tsx @@ -1,5 +1,3 @@ -import React from "react"; - import "../assets/styles/variables.scss"; import { Header } from "../components/Header"; From 14eb63f5c67dfffe7a7028fd8a01e46794e137d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cain=C3=A3=20Milech?= Date: Sat, 7 Jan 2023 11:17:39 -0300 Subject: [PATCH 4/8] feat: Separa components --- README.md | 93 +----------------- react-project/README.md | 1 - react-project/public/index.html | 31 +----- react-project/public/logo512.png | Bin 9664 -> 0 bytes .../src/components/{ => Footer}/Footer.tsx | 2 - .../components/{ => Footer}/Newsletter.tsx | 2 +- .../assets}/modules/Newsletter.module.scss | 0 .../src/components/{ => Header}/Header.tsx | 8 +- .../src/components/{ => Header}/Menu.tsx | 2 +- .../{ => Header}/MenuHamburguer.tsx | 2 +- .../assets}/modules/Hambuguer.module.scss | 0 .../Header/assets}/modules/Header.module.scss | 0 .../Header/assets}/modules/Menu.module.scss | 0 .../Header/assets}/svgs/cart.svg | 0 .../Header/assets}/svgs/close.svg | 0 .../Header/assets}/svgs/hamburguer.svg | 0 .../Header/assets}/svgs/logo.svg | 0 .../Header/assets}/svgs/logo4k.svg | 0 .../Header/assets}/svgs/search.svg | 0 .../{ => MainInstitucional}/Contato.tsx | 4 +- .../{ => MainInstitucional}/Entrega.tsx | 3 +- .../{ => MainInstitucional}/Main.tsx | 6 +- .../{ => MainInstitucional}/Navigation.tsx | 14 +-- .../{ => MainInstitucional}/Pagamento.tsx | 3 +- .../{ => MainInstitucional}/Seguranca.tsx | 3 +- .../{ => MainInstitucional}/Sobre.tsx | 3 +- .../{ => MainInstitucional}/Troca.tsx | 3 +- .../assets}/modules/Contato.module.scss | 0 .../assets}/modules/Main.module.scss | 0 .../assets}/modules/Navigation.module.scss | 0 .../assets/schemas}/FormSchema.ts | 0 .../assets}/svgs/arrow-right.svg | 0 .../MainInstitucional/assets}/svgs/home.svg | 0 react-project/src/pages/Institucional.tsx | 6 +- 34 files changed, 35 insertions(+), 151 deletions(-) delete mode 100644 react-project/README.md delete mode 100644 react-project/public/logo512.png rename react-project/src/components/{ => Footer}/Footer.tsx (84%) rename react-project/src/components/{ => Footer}/Newsletter.tsx (94%) rename react-project/src/{assets/styles => components/Footer/assets}/modules/Newsletter.module.scss (100%) rename react-project/src/components/{ => Header}/Header.tsx (88%) rename react-project/src/components/{ => Header}/Menu.tsx (74%) rename react-project/src/components/{ => Header}/MenuHamburguer.tsx (94%) rename react-project/src/{assets/styles => components/Header/assets}/modules/Hambuguer.module.scss (100%) rename react-project/src/{assets/styles => components/Header/assets}/modules/Header.module.scss (100%) rename react-project/src/{assets/styles => components/Header/assets}/modules/Menu.module.scss (100%) rename react-project/src/{assets/images => components/Header/assets}/svgs/cart.svg (100%) rename react-project/src/{assets/images => components/Header/assets}/svgs/close.svg (100%) rename react-project/src/{assets/images => components/Header/assets}/svgs/hamburguer.svg (100%) rename react-project/src/{assets/images => components/Header/assets}/svgs/logo.svg (100%) rename react-project/src/{assets/images => components/Header/assets}/svgs/logo4k.svg (100%) rename react-project/src/{assets/images => components/Header/assets}/svgs/search.svg (100%) rename react-project/src/components/{ => MainInstitucional}/Contato.tsx (98%) rename react-project/src/components/{ => MainInstitucional}/Entrega.tsx (94%) rename react-project/src/components/{ => MainInstitucional}/Main.tsx (88%) rename react-project/src/components/{ => MainInstitucional}/Navigation.tsx (81%) rename react-project/src/components/{ => MainInstitucional}/Pagamento.tsx (95%) rename react-project/src/components/{ => MainInstitucional}/Seguranca.tsx (95%) rename react-project/src/components/{ => MainInstitucional}/Sobre.tsx (94%) rename react-project/src/components/{ => MainInstitucional}/Troca.tsx (94%) rename react-project/src/{assets/styles => components/MainInstitucional/assets}/modules/Contato.module.scss (100%) rename react-project/src/{assets/styles => components/MainInstitucional/assets}/modules/Main.module.scss (100%) rename react-project/src/{assets/styles => components/MainInstitucional/assets}/modules/Navigation.module.scss (100%) rename react-project/src/{schema => components/MainInstitucional/assets/schemas}/FormSchema.ts (100%) rename react-project/src/{assets/images => components/MainInstitucional/assets}/svgs/arrow-right.svg (100%) rename react-project/src/{assets/images => components/MainInstitucional/assets}/svgs/home.svg (100%) diff --git a/README.md b/README.md index 96b9d3b..d322d72 100644 --- a/README.md +++ b/README.md @@ -1,93 +1,8 @@ # Desafio REACT e Typescript +Para rodar o projeto, use o no terminal: +cd react-project +npm start -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -- [ ] [Create](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin https://gitlab.com/m3-academy/fase-06/desafio-react-e-typescript.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://gitlab.com/m3-academy/fase-06/desafio-react-e-typescript/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Automatically merge when pipeline succeeds](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://gitlab.com/-/experiment/new_project_readme_content:6ad80019019932803f32a91ae13cb05b?https://www.makeareadme.com/) for this template. - -## Suggestions for a good README -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. - +O projeto irá rodar localmente na porta 3000. diff --git a/react-project/README.md b/react-project/README.md deleted file mode 100644 index de5a25e..0000000 --- a/react-project/README.md +++ /dev/null @@ -1 +0,0 @@ -# REACT APP - INSTITUCIONAL diff --git a/react-project/public/index.html b/react-project/public/index.html index 2923ec7..90fbfb0 100644 --- a/react-project/public/index.html +++ b/react-project/public/index.html @@ -1,5 +1,5 @@ - + @@ -9,34 +9,11 @@ content="Web site created using create-react-app" /> - - - - React App + + Desafio React M3 -
- +
diff --git a/react-project/public/logo512.png b/react-project/public/logo512.png deleted file mode 100644 index a4e47a6545bc15971f8f63fba70e4013df88a664..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9664 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 b{|{}U^kRn2wo}j7|0ATu<;8xA7zX}7|B6mN diff --git a/react-project/src/components/Footer.tsx b/react-project/src/components/Footer/Footer.tsx similarity index 84% rename from react-project/src/components/Footer.tsx rename to react-project/src/components/Footer/Footer.tsx index 09fef9a..354d4b6 100644 --- a/react-project/src/components/Footer.tsx +++ b/react-project/src/components/Footer/Footer.tsx @@ -1,5 +1,3 @@ -import React from "react"; - import { Newsletter } from "./Newsletter"; const Footer = () => { diff --git a/react-project/src/components/Newsletter.tsx b/react-project/src/components/Footer/Newsletter.tsx similarity index 94% rename from react-project/src/components/Newsletter.tsx rename to react-project/src/components/Footer/Newsletter.tsx index 75a9a5b..f2c7f57 100644 --- a/react-project/src/components/Newsletter.tsx +++ b/react-project/src/components/Footer/Newsletter.tsx @@ -1,4 +1,4 @@ -import newsletter from "../assets/styles/modules/Newsletter.module.scss"; +import newsletter from "./assets/modules/Newsletter.module.scss"; import { Formik, Form, Field, ErrorMessage } from "formik"; diff --git a/react-project/src/assets/styles/modules/Newsletter.module.scss b/react-project/src/components/Footer/assets/modules/Newsletter.module.scss similarity index 100% rename from react-project/src/assets/styles/modules/Newsletter.module.scss rename to react-project/src/components/Footer/assets/modules/Newsletter.module.scss diff --git a/react-project/src/components/Header.tsx b/react-project/src/components/Header/Header.tsx similarity index 88% rename from react-project/src/components/Header.tsx rename to react-project/src/components/Header/Header.tsx index b8929a8..b258325 100644 --- a/react-project/src/components/Header.tsx +++ b/react-project/src/components/Header/Header.tsx @@ -1,11 +1,11 @@ -import header from "../assets/styles/modules/Header.module.scss"; +import header from "./assets/modules/Header.module.scss"; import { Formik, Form, Field, ErrorMessage } from "formik"; //IMAGES -import logo from "../assets/images/svgs/logo.svg"; -import search from "../assets/images/svgs/search.svg"; -import cart from "../assets/images/svgs/cart.svg"; +import logo from "./assets/svgs/logo.svg"; +import search from "./assets/svgs/search.svg"; +import cart from "./assets/svgs/cart.svg"; import { MenuHamburguer } from "./MenuHamburguer"; diff --git a/react-project/src/components/Menu.tsx b/react-project/src/components/Header/Menu.tsx similarity index 74% rename from react-project/src/components/Menu.tsx rename to react-project/src/components/Header/Menu.tsx index 5b81f3e..09d41f8 100644 --- a/react-project/src/components/Menu.tsx +++ b/react-project/src/components/Header/Menu.tsx @@ -1,4 +1,4 @@ -import menu from "../assets/styles/modules/Menu.module.scss"; +import menu from "./assets/modules/Menu.module.scss"; const Menu = () => { return ( diff --git a/react-project/src/components/MenuHamburguer.tsx b/react-project/src/components/Header/MenuHamburguer.tsx similarity index 94% rename from react-project/src/components/MenuHamburguer.tsx rename to react-project/src/components/Header/MenuHamburguer.tsx index 348e967..20c7092 100644 --- a/react-project/src/components/MenuHamburguer.tsx +++ b/react-project/src/components/Header/MenuHamburguer.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import Modal from "react-modal"; -import close from "../assets/images/svgs/close.svg"; +import close from "./assets/svgs/close.svg"; const MenuHamburguer = () => { const [hambActive, setHamb] = useState(false); diff --git a/react-project/src/assets/styles/modules/Hambuguer.module.scss b/react-project/src/components/Header/assets/modules/Hambuguer.module.scss similarity index 100% rename from react-project/src/assets/styles/modules/Hambuguer.module.scss rename to react-project/src/components/Header/assets/modules/Hambuguer.module.scss diff --git a/react-project/src/assets/styles/modules/Header.module.scss b/react-project/src/components/Header/assets/modules/Header.module.scss similarity index 100% rename from react-project/src/assets/styles/modules/Header.module.scss rename to react-project/src/components/Header/assets/modules/Header.module.scss diff --git a/react-project/src/assets/styles/modules/Menu.module.scss b/react-project/src/components/Header/assets/modules/Menu.module.scss similarity index 100% rename from react-project/src/assets/styles/modules/Menu.module.scss rename to react-project/src/components/Header/assets/modules/Menu.module.scss diff --git a/react-project/src/assets/images/svgs/cart.svg b/react-project/src/components/Header/assets/svgs/cart.svg similarity index 100% rename from react-project/src/assets/images/svgs/cart.svg rename to react-project/src/components/Header/assets/svgs/cart.svg diff --git a/react-project/src/assets/images/svgs/close.svg b/react-project/src/components/Header/assets/svgs/close.svg similarity index 100% rename from react-project/src/assets/images/svgs/close.svg rename to react-project/src/components/Header/assets/svgs/close.svg diff --git a/react-project/src/assets/images/svgs/hamburguer.svg b/react-project/src/components/Header/assets/svgs/hamburguer.svg similarity index 100% rename from react-project/src/assets/images/svgs/hamburguer.svg rename to react-project/src/components/Header/assets/svgs/hamburguer.svg diff --git a/react-project/src/assets/images/svgs/logo.svg b/react-project/src/components/Header/assets/svgs/logo.svg similarity index 100% rename from react-project/src/assets/images/svgs/logo.svg rename to react-project/src/components/Header/assets/svgs/logo.svg diff --git a/react-project/src/assets/images/svgs/logo4k.svg b/react-project/src/components/Header/assets/svgs/logo4k.svg similarity index 100% rename from react-project/src/assets/images/svgs/logo4k.svg rename to react-project/src/components/Header/assets/svgs/logo4k.svg diff --git a/react-project/src/assets/images/svgs/search.svg b/react-project/src/components/Header/assets/svgs/search.svg similarity index 100% rename from react-project/src/assets/images/svgs/search.svg rename to react-project/src/components/Header/assets/svgs/search.svg diff --git a/react-project/src/components/Contato.tsx b/react-project/src/components/MainInstitucional/Contato.tsx similarity index 98% rename from react-project/src/components/Contato.tsx rename to react-project/src/components/MainInstitucional/Contato.tsx index b9ded7c..eb54c6c 100644 --- a/react-project/src/components/Contato.tsx +++ b/react-project/src/components/MainInstitucional/Contato.tsx @@ -1,9 +1,9 @@ import { Formik, Form, Field, ErrorMessage } from "formik"; -import FormSchema from "../schema/FormSchema"; +import FormSchema from "./assets/schemas/FormSchema"; import MaskedInput from "react-text-mask"; -import contato from "../assets/styles/modules/Contato.module.scss"; +import contato from "./assets/modules/Contato.module.scss"; interface IFormikValues { name: string; diff --git a/react-project/src/components/Entrega.tsx b/react-project/src/components/MainInstitucional/Entrega.tsx similarity index 94% rename from react-project/src/components/Entrega.tsx rename to react-project/src/components/MainInstitucional/Entrega.tsx index 781f37c..4d199c9 100644 --- a/react-project/src/components/Entrega.tsx +++ b/react-project/src/components/MainInstitucional/Entrega.tsx @@ -1,5 +1,4 @@ -import React from "react"; -import main from "../assets/styles/modules/Main.module.scss"; +import main from "./assets/modules/Main.module.scss"; const Entrega = () => { return ( diff --git a/react-project/src/components/Main.tsx b/react-project/src/components/MainInstitucional/Main.tsx similarity index 88% rename from react-project/src/components/Main.tsx rename to react-project/src/components/MainInstitucional/Main.tsx index 859a008..3a0841e 100644 --- a/react-project/src/components/Main.tsx +++ b/react-project/src/components/MainInstitucional/Main.tsx @@ -1,6 +1,6 @@ import { Routes, Route } from "react-router-dom"; -import main from "../assets/styles/modules/Main.module.scss"; +import main from "./assets/modules/Main.module.scss"; import { Navigation } from "./Navigation"; @@ -12,8 +12,8 @@ import { Seguranca } from "./Seguranca"; import { Contato } from "./Contato"; //IMAGES -import iconHome from "../assets/images/svgs/home.svg"; -import iconArrow from "../assets/images/svgs/arrow-right.svg"; +import iconHome from "./assets/svgs/home.svg"; +import iconArrow from "./assets/svgs/arrow-right.svg"; const Main = () => { return ( diff --git a/react-project/src/components/Navigation.tsx b/react-project/src/components/MainInstitucional/Navigation.tsx similarity index 81% rename from react-project/src/components/Navigation.tsx rename to react-project/src/components/MainInstitucional/Navigation.tsx index 6560c72..cf1422c 100644 --- a/react-project/src/components/Navigation.tsx +++ b/react-project/src/components/MainInstitucional/Navigation.tsx @@ -1,13 +1,13 @@ import { NavLink } from "react-router-dom"; -import navigation from "../assets/styles/modules/Navigation.module.scss"; +import navigation from "./assets/modules/Navigation.module.scss"; const Navigation = () => { /*let activeClassName = "ativo";*/ return (
    -
  • +
  • @@ -17,7 +17,7 @@ const Navigation = () => { Sobre
    • -
  • +
  • @@ -27,7 +27,7 @@ const Navigation = () => { Forma de Pagamento
    • -
  • +
  • @@ -37,7 +37,7 @@ const Navigation = () => { Entrega
    • -
  • +
  • @@ -47,7 +47,7 @@ const Navigation = () => { Troca e Devolução
    • -
  • +
  • @@ -57,7 +57,7 @@ const Navigation = () => { Segurança e Privacidade
    • -
  • +
  • diff --git a/react-project/src/components/Pagamento.tsx b/react-project/src/components/MainInstitucional/Pagamento.tsx similarity index 95% rename from react-project/src/components/Pagamento.tsx rename to react-project/src/components/MainInstitucional/Pagamento.tsx index fcbd8b8..4148087 100644 --- a/react-project/src/components/Pagamento.tsx +++ b/react-project/src/components/MainInstitucional/Pagamento.tsx @@ -1,5 +1,4 @@ -import React from "react"; -import main from "../assets/styles/modules/Main.module.scss"; +import main from "./assets/modules/Main.module.scss"; const Pagamento = () => { return ( diff --git a/react-project/src/components/Seguranca.tsx b/react-project/src/components/MainInstitucional/Seguranca.tsx similarity index 95% rename from react-project/src/components/Seguranca.tsx rename to react-project/src/components/MainInstitucional/Seguranca.tsx index dbcb12f..66a590f 100644 --- a/react-project/src/components/Seguranca.tsx +++ b/react-project/src/components/MainInstitucional/Seguranca.tsx @@ -1,5 +1,4 @@ -import React from "react"; -import main from "../assets/styles/modules/Main.module.scss"; +import main from "./assets/modules/Main.module.scss"; const Seguranca = () => { return ( diff --git a/react-project/src/components/Sobre.tsx b/react-project/src/components/MainInstitucional/Sobre.tsx similarity index 94% rename from react-project/src/components/Sobre.tsx rename to react-project/src/components/MainInstitucional/Sobre.tsx index 928ddf3..6f57a04 100644 --- a/react-project/src/components/Sobre.tsx +++ b/react-project/src/components/MainInstitucional/Sobre.tsx @@ -1,5 +1,4 @@ -import React from "react"; -import main from "../assets/styles/modules/Main.module.scss"; +import main from "./assets/modules/Main.module.scss"; const Sobre = () => { return ( diff --git a/react-project/src/components/Troca.tsx b/react-project/src/components/MainInstitucional/Troca.tsx similarity index 94% rename from react-project/src/components/Troca.tsx rename to react-project/src/components/MainInstitucional/Troca.tsx index 8cb53ce..ec040c4 100644 --- a/react-project/src/components/Troca.tsx +++ b/react-project/src/components/MainInstitucional/Troca.tsx @@ -1,5 +1,4 @@ -import React from "react"; -import main from "../assets/styles/modules/Main.module.scss"; +import main from "./assets/modules/Main.module.scss"; const Troca = () => { return ( diff --git a/react-project/src/assets/styles/modules/Contato.module.scss b/react-project/src/components/MainInstitucional/assets/modules/Contato.module.scss similarity index 100% rename from react-project/src/assets/styles/modules/Contato.module.scss rename to react-project/src/components/MainInstitucional/assets/modules/Contato.module.scss diff --git a/react-project/src/assets/styles/modules/Main.module.scss b/react-project/src/components/MainInstitucional/assets/modules/Main.module.scss similarity index 100% rename from react-project/src/assets/styles/modules/Main.module.scss rename to react-project/src/components/MainInstitucional/assets/modules/Main.module.scss diff --git a/react-project/src/assets/styles/modules/Navigation.module.scss b/react-project/src/components/MainInstitucional/assets/modules/Navigation.module.scss similarity index 100% rename from react-project/src/assets/styles/modules/Navigation.module.scss rename to react-project/src/components/MainInstitucional/assets/modules/Navigation.module.scss diff --git a/react-project/src/schema/FormSchema.ts b/react-project/src/components/MainInstitucional/assets/schemas/FormSchema.ts similarity index 100% rename from react-project/src/schema/FormSchema.ts rename to react-project/src/components/MainInstitucional/assets/schemas/FormSchema.ts diff --git a/react-project/src/assets/images/svgs/arrow-right.svg b/react-project/src/components/MainInstitucional/assets/svgs/arrow-right.svg similarity index 100% rename from react-project/src/assets/images/svgs/arrow-right.svg rename to react-project/src/components/MainInstitucional/assets/svgs/arrow-right.svg diff --git a/react-project/src/assets/images/svgs/home.svg b/react-project/src/components/MainInstitucional/assets/svgs/home.svg similarity index 100% rename from react-project/src/assets/images/svgs/home.svg rename to react-project/src/components/MainInstitucional/assets/svgs/home.svg diff --git a/react-project/src/pages/Institucional.tsx b/react-project/src/pages/Institucional.tsx index 48ac4d5..744c2bd 100644 --- a/react-project/src/pages/Institucional.tsx +++ b/react-project/src/pages/Institucional.tsx @@ -1,8 +1,8 @@ import "../assets/styles/variables.scss"; -import { Header } from "../components/Header"; -import { Main } from "../components/Main"; -import { Footer } from "../components/Footer"; +import { Header } from "../components/Header/Header"; +import { Main } from "../components/MainInstitucional/Main"; +import { Footer } from "../components/Footer/Footer"; const Institucional = () => { return ( From 3a94c2af7b8f3205b9f6e6d712b34b9dfb7d4273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cain=C3=A3=20Milech?= Date: Sat, 7 Jan 2023 20:09:15 -0300 Subject: [PATCH 5/8] feat: Adiciona header mobile --- react-project/src/assets/styles/global.scss | 63 ----------------- react-project/src/components/Header/Cart.tsx | 13 ++++ .../{MenuHamburguer.tsx => Hamburguer.tsx} | 21 +++--- .../src/components/Header/Header.tsx | 49 +++---------- .../src/components/Header/HeaderMobile.tsx | 23 +++++++ react-project/src/components/Header/Logo.tsx | 13 ++++ react-project/src/components/Header/Menu.tsx | 13 ---- .../src/components/Header/SearchInput.tsx | 30 ++++++++ .../assets/modules/Hambuguer.module.scss | 0 .../assets/modules/Hamburguer.module.scss | 68 +++++++++++++++++++ .../Header/assets/modules/Header.module.scss | 38 ++--------- .../assets/modules/HeaderMobile.module.scss | 21 ++++++ .../Header/assets/modules/Menu.module.scss | 0 .../assets/modules/SearchInput.module.scss | 35 ++++++++++ react-project/src/pages/Institucional.tsx | 6 +- 15 files changed, 234 insertions(+), 159 deletions(-) create mode 100644 react-project/src/components/Header/Cart.tsx rename react-project/src/components/Header/{MenuHamburguer.tsx => Hamburguer.tsx} (61%) create mode 100644 react-project/src/components/Header/HeaderMobile.tsx create mode 100644 react-project/src/components/Header/Logo.tsx delete mode 100644 react-project/src/components/Header/Menu.tsx create mode 100644 react-project/src/components/Header/SearchInput.tsx delete mode 100644 react-project/src/components/Header/assets/modules/Hambuguer.module.scss create mode 100644 react-project/src/components/Header/assets/modules/Hamburguer.module.scss create mode 100644 react-project/src/components/Header/assets/modules/HeaderMobile.module.scss delete mode 100644 react-project/src/components/Header/assets/modules/Menu.module.scss create mode 100644 react-project/src/components/Header/assets/modules/SearchInput.module.scss diff --git a/react-project/src/assets/styles/global.scss b/react-project/src/assets/styles/global.scss index e190d3c..4135aca 100644 --- a/react-project/src/assets/styles/global.scss +++ b/react-project/src/assets/styles/global.scss @@ -4,66 +4,3 @@ margin: 0; font-family: var(--font-roboto); } - -.divhamb { - position: relative; - border: 1px solid red; - /*width: 50px; - height: 50px;*/ -} - -.fundo { - background-color: blue; - border: 10px solid yellow; -} - -.modal-content { - position: absolute; - background-color: var(--white); - border: 1px solid green; - width: 97.4609%; - height: 585px; - - .modal-top { - display: flex; - justify-content: space-between; - padding: 31px 16px; - background-color: var(--black); - a { - font-weight: 400; - font-size: 14px; - line-height: 16px; - color: var(--white); - text-decoration: none; - } - - button { - background: none; - border: 0; - display: contents; - cursor: pointer; - - img { - width: 15px; - height: 15px; - } - } - } - - ul { - padding: 31px 16px; - list-style: none; - - li { - margin-bottom: 12px; - - a { - color: var(--gray-100); - text-decoration: none; - font-weight: 500; - font-size: 14px; - line-height: 16px; - } - } - } -} diff --git a/react-project/src/components/Header/Cart.tsx b/react-project/src/components/Header/Cart.tsx new file mode 100644 index 0000000..b7b21b6 --- /dev/null +++ b/react-project/src/components/Header/Cart.tsx @@ -0,0 +1,13 @@ +import cart from "./assets/svgs/cart.svg"; + +const Cart = () => { + return ( + +
    + Carrinho de compras +
    +     + ); +}; + +export { Cart }; diff --git a/react-project/src/components/Header/MenuHamburguer.tsx b/react-project/src/components/Header/Hamburguer.tsx similarity index 61% rename from react-project/src/components/Header/MenuHamburguer.tsx rename to react-project/src/components/Header/Hamburguer.tsx index 20c7092..247d859 100644 --- a/react-project/src/components/Header/MenuHamburguer.tsx +++ b/react-project/src/components/Header/Hamburguer.tsx @@ -1,24 +1,29 @@ import { useState } from "react"; import Modal from "react-modal"; +import hamburguer from "./assets/modules/Hamburguer.module.scss"; + +import hamb from "./assets/svgs/hamburguer.svg"; import close from "./assets/svgs/close.svg"; -const MenuHamburguer = () => { +const Hamburguer = () => { const [hambActive, setHamb] = useState(false); const HambMode = () => { setHamb(!hambActive); }; return ( -
    - + <> + -
    +
    ENTRAR
- + ); }; -export { MenuHamburguer }; +export { Hamburguer }; diff --git a/react-project/src/components/Header/Header.tsx b/react-project/src/components/Header/Header.tsx index b258325..676297f 100644 --- a/react-project/src/components/Header/Header.tsx +++ b/react-project/src/components/Header/Header.tsx @@ -1,54 +1,23 @@ import header from "./assets/modules/Header.module.scss"; -import { Formik, Form, Field, ErrorMessage } from "formik"; - -//IMAGES -import logo from "./assets/svgs/logo.svg"; -import search from "./assets/svgs/search.svg"; -import cart from "./assets/svgs/cart.svg"; - -import { MenuHamburguer } from "./MenuHamburguer"; - -interface ISearchType { - search: string; -} +import { Logo } from "./Logo"; +import { SearchInput } from "./SearchInput"; +import { Cart } from "./Cart"; const Header = () => { return ( -
+
- -
- Logo M3 Academy -
- + -
- { - actions.resetForm(); - }} - initialValues={{ search: "" }} - > -
- - - -
-
+
@@ -66,9 +35,7 @@ const Header = () => { - - -
+ ); }; diff --git a/react-project/src/components/Header/HeaderMobile.tsx b/react-project/src/components/Header/HeaderMobile.tsx new file mode 100644 index 0000000..a2372f5 --- /dev/null +++ b/react-project/src/components/Header/HeaderMobile.tsx @@ -0,0 +1,23 @@ +import headerMobile from "./assets/modules/HeaderMobile.module.scss"; + +import { Hamburguer } from "./Hamburguer"; +import { Logo } from "./Logo"; +import { Cart } from "./Cart"; +import { SearchInput } from "./SearchInput"; + +const HeaderMobile = () => { + return ( +
+
+ + + +
+
+ +
+
+ ); +}; + +export { HeaderMobile }; diff --git a/react-project/src/components/Header/Logo.tsx b/react-project/src/components/Header/Logo.tsx new file mode 100644 index 0000000..052ed69 --- /dev/null +++ b/react-project/src/components/Header/Logo.tsx @@ -0,0 +1,13 @@ +import logo from "./assets/svgs/logo.svg"; + +const Logo = () => { + return ( + +
+ Logo M3 Academy +
+ + ); +}; + +export { Logo }; diff --git a/react-project/src/components/Header/Menu.tsx b/react-project/src/components/Header/Menu.tsx deleted file mode 100644 index 09d41f8..0000000 --- a/react-project/src/components/Header/Menu.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import menu from "./assets/modules/Menu.module.scss"; - -const Menu = () => { - return ( - - ); -}; - -export { Menu }; diff --git a/react-project/src/components/Header/SearchInput.tsx b/react-project/src/components/Header/SearchInput.tsx new file mode 100644 index 0000000..9fe1ad8 --- /dev/null +++ b/react-project/src/components/Header/SearchInput.tsx @@ -0,0 +1,30 @@ +import search from "./assets/svgs/search.svg"; +import searchStyle from "./assets/modules/SearchInput.module.scss"; + +import { Formik, Form, Field, ErrorMessage } from "formik"; + +interface ISearchType { + search: string; +} + +const SearchInput = () => { + return ( +
+ { + actions.resetForm(); + }} + initialValues={{ search: "" }} + > +
+ + + +
+
+ ); +}; + +export { SearchInput }; diff --git a/react-project/src/components/Header/assets/modules/Hambuguer.module.scss b/react-project/src/components/Header/assets/modules/Hambuguer.module.scss deleted file mode 100644 index e69de29..0000000 diff --git a/react-project/src/components/Header/assets/modules/Hamburguer.module.scss b/react-project/src/components/Header/assets/modules/Hamburguer.module.scss new file mode 100644 index 0000000..cbc395b --- /dev/null +++ b/react-project/src/components/Header/assets/modules/Hamburguer.module.scss @@ -0,0 +1,68 @@ +.hamburguer { + display: contents; + cursor: pointer; + + img { + width: 28px; + height: 22.5px; + } +} + +.content { + position: absolute; + background-color: var(--white); + width: 97.4609%; + height: 585px; + + &__top { + display: flex; + justify-content: space-between; + padding: 31px 16px; + background-color: var(--black); + a { + font-weight: 400; + font-size: 14px; + line-height: 16px; + color: var(--white); + text-decoration: none; + } + + button { + background: none; + border: 0; + display: contents; + cursor: pointer; + + img { + width: 15px; + height: 15px; + } + } + } + + ul { + padding: 31px 16px; + list-style: none; + + li { + margin-bottom: 12px; + + a { + color: var(--gray-100); + text-decoration: none; + font-weight: 500; + font-size: 14px; + line-height: 16px; + } + } + } +} + +.overlay { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + background: rgba(69, 69, 69, 0.7); +} diff --git a/react-project/src/components/Header/assets/modules/Header.module.scss b/react-project/src/components/Header/assets/modules/Header.module.scss index a409448..0c583a1 100644 --- a/react-project/src/components/Header/assets/modules/Header.module.scss +++ b/react-project/src/components/Header/assets/modules/Header.module.scss @@ -1,9 +1,13 @@ -header { +.header-desktop { background-color: var(--black); display: flex; flex-direction: column; color: var(--white); + @media screen and (max-width: 1024px) { + display: none; + } + .spread { border-bottom: 1px solid var(--gray-100); } @@ -24,38 +28,6 @@ header { } } - &__search { - form { - position: relative; - - input { - padding: 8px 44px 8px 16px; - background-color: var(--white); - border: 2px solid var(--gray-500); - border-radius: 5px; - color: var(--gray-600); - font-weight: 400; - font-size: 14px; - line-height: 16px; - width: 264px; - height: 32px; - - &::placeholder { - color: var(--gray-600); - } - } - - button { - position: absolute; - top: 6px; - right: 16px; - border: 0; - background-color: var(--white); - cursor: pointer; - } - } - } - &__account { display: flex; align-items: center; diff --git a/react-project/src/components/Header/assets/modules/HeaderMobile.module.scss b/react-project/src/components/Header/assets/modules/HeaderMobile.module.scss new file mode 100644 index 0000000..770284d --- /dev/null +++ b/react-project/src/components/Header/assets/modules/HeaderMobile.module.scss @@ -0,0 +1,21 @@ +.header-mobile { + background-color: var(--black); + display: flex; + flex-direction: column; + color: var(--white); + + @media screen and (min-width: 1025px) { + display: none; + } + + &__header { + display: flex; + justify-content: space-between; + padding: 16px 25px; + align-items: center; + } + + &__input { + padding: 0 25px 25px; + } +} diff --git a/react-project/src/components/Header/assets/modules/Menu.module.scss b/react-project/src/components/Header/assets/modules/Menu.module.scss deleted file mode 100644 index e69de29..0000000 diff --git a/react-project/src/components/Header/assets/modules/SearchInput.module.scss b/react-project/src/components/Header/assets/modules/SearchInput.module.scss new file mode 100644 index 0000000..4368141 --- /dev/null +++ b/react-project/src/components/Header/assets/modules/SearchInput.module.scss @@ -0,0 +1,35 @@ +.search { + form { + position: relative; + + input { + padding: 8px 44px 8px 16px; + background-color: var(--white); + border: 2px solid var(--gray-500); + border-radius: 5px; + color: var(--gray-600); + font-weight: 400; + font-size: 14px; + line-height: 16px; + width: 264px; + height: 32px; + + @media screen and (max-width: 1024px) { + width: 100%; + } + + &::placeholder { + color: var(--gray-600); + } + } + + button { + position: absolute; + top: 6px; + right: 16px; + border: 0; + background-color: var(--white); + cursor: pointer; + } + } +} diff --git a/react-project/src/pages/Institucional.tsx b/react-project/src/pages/Institucional.tsx index 744c2bd..86a5dc8 100644 --- a/react-project/src/pages/Institucional.tsx +++ b/react-project/src/pages/Institucional.tsx @@ -1,13 +1,17 @@ import "../assets/styles/variables.scss"; import { Header } from "../components/Header/Header"; +import { HeaderMobile } from "../components/Header/HeaderMobile"; import { Main } from "../components/MainInstitucional/Main"; import { Footer } from "../components/Footer/Footer"; const Institucional = () => { return (
-
+
+
+ +
From 86c973016a3aa9e99a27787c6039ab42c9d34823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cain=C3=A3=20Milech?= Date: Sun, 8 Jan 2023 18:47:27 -0300 Subject: [PATCH 6/8] feat: Adiciona componente de menu --- .../src/components/Header/Header.tsx | 15 ++------- react-project/src/components/Header/Logo.tsx | 4 ++- react-project/src/components/Header/Menu.tsx | 21 ++++++++++++ .../Header/assets/modules/Header.module.scss | 32 ------------------- .../Header/assets/modules/Logo.module.scss | 7 ++++ .../Header/assets/modules/Menu.module.scss | 22 +++++++++++++ .../MainInstitucional/Breadcrumb.tsx | 23 +++++++++++++ .../components/MainInstitucional/Contato.tsx | 11 ------- .../src/components/MainInstitucional/Main.tsx | 18 ++--------- .../assets/modules/Breadcrumb.module.scss | 21 ++++++++++++ .../assets/modules/Main.module.scss | 22 +------------ 11 files changed, 102 insertions(+), 94 deletions(-) create mode 100644 react-project/src/components/Header/Menu.tsx create mode 100644 react-project/src/components/Header/assets/modules/Logo.module.scss create mode 100644 react-project/src/components/Header/assets/modules/Menu.module.scss create mode 100644 react-project/src/components/MainInstitucional/Breadcrumb.tsx create mode 100644 react-project/src/components/MainInstitucional/assets/modules/Breadcrumb.module.scss diff --git a/react-project/src/components/Header/Header.tsx b/react-project/src/components/Header/Header.tsx index 676297f..4cfcb22 100644 --- a/react-project/src/components/Header/Header.tsx +++ b/react-project/src/components/Header/Header.tsx @@ -3,6 +3,7 @@ import header from "./assets/modules/Header.module.scss"; import { Logo } from "./Logo"; import { SearchInput } from "./SearchInput"; import { Cart } from "./Cart"; +import { Menu } from "./Menu"; const Header = () => { return ( @@ -22,19 +23,7 @@ const Header = () => { - + ); }; diff --git a/react-project/src/components/Header/Logo.tsx b/react-project/src/components/Header/Logo.tsx index 052ed69..8718b4a 100644 --- a/react-project/src/components/Header/Logo.tsx +++ b/react-project/src/components/Header/Logo.tsx @@ -1,8 +1,10 @@ import logo from "./assets/svgs/logo.svg"; +import logoStyle from "./assets/modules/Logo.module.scss"; + const Logo = () => { return ( - +
Logo M3 Academy
diff --git a/react-project/src/components/Header/Menu.tsx b/react-project/src/components/Header/Menu.tsx new file mode 100644 index 0000000..286435f --- /dev/null +++ b/react-project/src/components/Header/Menu.tsx @@ -0,0 +1,21 @@ +import menu from "./assets/modules/Menu.module.scss"; + +const Menu = () => { + return ( + + ); +}; + +export { Menu }; diff --git a/react-project/src/components/Header/assets/modules/Header.module.scss b/react-project/src/components/Header/assets/modules/Header.module.scss index 0c583a1..50d4388 100644 --- a/react-project/src/components/Header/assets/modules/Header.module.scss +++ b/react-project/src/components/Header/assets/modules/Header.module.scss @@ -20,14 +20,6 @@ padding: 22px 0; align-items: center; - a { - display: contents; - - figure { - display: contents; - } - } - &__account { display: flex; align-items: center; @@ -41,28 +33,4 @@ } } } - - .menu { - display: none; - margin-left: 100px; - margin-right: 100px; - display: flex; - padding: 14px 0; - - ul { - display: flex; - gap: 55px; - list-style: none; - - li { - a { - font-weight: 500; - font-size: 14px; - line-height: 16px; - color: var(--white); - text-decoration: none; - } - } - } - } } diff --git a/react-project/src/components/Header/assets/modules/Logo.module.scss b/react-project/src/components/Header/assets/modules/Logo.module.scss new file mode 100644 index 0000000..739488d --- /dev/null +++ b/react-project/src/components/Header/assets/modules/Logo.module.scss @@ -0,0 +1,7 @@ +.logo { + display: contents; + + figure { + display: contents; + } +} diff --git a/react-project/src/components/Header/assets/modules/Menu.module.scss b/react-project/src/components/Header/assets/modules/Menu.module.scss new file mode 100644 index 0000000..54c928d --- /dev/null +++ b/react-project/src/components/Header/assets/modules/Menu.module.scss @@ -0,0 +1,22 @@ +.menu { + margin-left: 100px; + margin-right: 100px; + display: flex; + padding: 14px 0; + + ul { + display: flex; + gap: 55px; + list-style: none; + + li { + a { + font-weight: 500; + font-size: 14px; + line-height: 16px; + color: var(--white); + text-decoration: none; + } + } + } +} diff --git a/react-project/src/components/MainInstitucional/Breadcrumb.tsx b/react-project/src/components/MainInstitucional/Breadcrumb.tsx new file mode 100644 index 0000000..7ecd2c9 --- /dev/null +++ b/react-project/src/components/MainInstitucional/Breadcrumb.tsx @@ -0,0 +1,23 @@ +import breadcrumb from "./assets/modules/Breadcrumb.module.scss"; + +import iconHome from "./assets/svgs/home.svg"; +import iconArrow from "./assets/svgs/arrow-right.svg"; + +const Breadcrumb = () => { + return ( +
+ +
+ Icone Home +
+ + +
+ Icone Flecha para direita +
+ INSTITUCIONAL +
+ ); +}; + +export { Breadcrumb }; diff --git a/react-project/src/components/MainInstitucional/Contato.tsx b/react-project/src/components/MainInstitucional/Contato.tsx index eb54c6c..57ff157 100644 --- a/react-project/src/components/MainInstitucional/Contato.tsx +++ b/react-project/src/components/MainInstitucional/Contato.tsx @@ -13,7 +13,6 @@ interface IFormikValues { telefone: string; instagram: string; terms: boolean; - /*sent: boolean;*/ } //setar valores iniciais @@ -68,16 +67,6 @@ const phoneNumberMask = [ const insta = ["@"]; const Contato = () => { - /*const handleFormikSubmit = (values: IFormikValues, actions) => {};*/ - - /*const teste = (values: IFormikValues) => { - if (values.sent) { - const h2Tag = document.querySelector("#enviado") as HTMLSpanElement; - h2Tag.innerHTML = "TESTE"; - alert("TESTANDO TESTE"); - } - };*/ - return (

Preencha o formulário

diff --git a/react-project/src/components/MainInstitucional/Main.tsx b/react-project/src/components/MainInstitucional/Main.tsx index 3a0841e..c59ede7 100644 --- a/react-project/src/components/MainInstitucional/Main.tsx +++ b/react-project/src/components/MainInstitucional/Main.tsx @@ -2,6 +2,7 @@ import { Routes, Route } from "react-router-dom"; import main from "./assets/modules/Main.module.scss"; +import { Breadcrumb } from "./Breadcrumb"; import { Navigation } from "./Navigation"; import { Sobre } from "./Sobre"; @@ -11,25 +12,10 @@ import { Troca } from "./Troca"; import { Seguranca } from "./Seguranca"; import { Contato } from "./Contato"; -//IMAGES -import iconHome from "./assets/svgs/home.svg"; -import iconArrow from "./assets/svgs/arrow-right.svg"; - const Main = () => { return (
-
- -
- Icone Home -
- - -
- Icone Flecha para direita -
- INSTITUCIONAL -
+

INSTITUCIONAL

diff --git a/react-project/src/components/MainInstitucional/assets/modules/Breadcrumb.module.scss b/react-project/src/components/MainInstitucional/assets/modules/Breadcrumb.module.scss new file mode 100644 index 0000000..9723cf9 --- /dev/null +++ b/react-project/src/components/MainInstitucional/assets/modules/Breadcrumb.module.scss @@ -0,0 +1,21 @@ +.breadcrumb { + display: flex; + align-items: center; + gap: 9.72px; + margin-bottom: 80px; + + a { + display: contents; + } + + figure { + display: contents; + } + + span { + color: var(--gray-100); + font-weight: 400; + font-size: 12px; + line-height: 14px; + } +} diff --git a/react-project/src/components/MainInstitucional/assets/modules/Main.module.scss b/react-project/src/components/MainInstitucional/assets/modules/Main.module.scss index 5b1f8e1..4a9370b 100644 --- a/react-project/src/components/MainInstitucional/assets/modules/Main.module.scss +++ b/react-project/src/components/MainInstitucional/assets/modules/Main.module.scss @@ -2,27 +2,7 @@ border: 1px solid var(--gray-100); margin-left: 100px; margin-right: 100px; - - &__breadcrumb { - display: flex; - align-items: center; - gap: 9.72px; - - a { - display: contents; - } - - figure { - display: contents; - } - - span { - color: var(--gray-100); - font-weight: 400; - font-size: 12px; - line-height: 14px; - } - } + margin-top: 29px; &__title { color: var(--black-100); From af1bf06ae8ace09fbeb072bc0418b885392ed870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cain=C3=A3=20Milech?= Date: Sun, 8 Jan 2023 18:56:48 -0300 Subject: [PATCH 7/8] feat: Adiciona espacamentos header mobile --- .../components/Header/assets/modules/HeaderMobile.module.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/react-project/src/components/Header/assets/modules/HeaderMobile.module.scss b/react-project/src/components/Header/assets/modules/HeaderMobile.module.scss index 770284d..b90d5ad 100644 --- a/react-project/src/components/Header/assets/modules/HeaderMobile.module.scss +++ b/react-project/src/components/Header/assets/modules/HeaderMobile.module.scss @@ -11,11 +11,11 @@ &__header { display: flex; justify-content: space-between; - padding: 16px 25px; + padding: 25px 16px; align-items: center; } &__input { - padding: 0 25px 25px; + padding: 0 16px 25px; } } From 1da5fea327d6acd31df973ee909edeff1390e079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cain=C3=A3=20Milech?= Date: Sun, 8 Jan 2023 19:46:51 -0300 Subject: [PATCH 8/8] feat: Adiciona header 4k --- react-project/src/components/Header/Cart.tsx | 4 +++- .../Header/assets/modules/Cart.module.scss | 14 +++++++++++++ .../Header/assets/modules/Header.module.scss | 6 ++++++ .../Header/assets/modules/Logo.module.scss | 10 +++++++++ .../Header/assets/modules/Menu.module.scss | 5 +++++ .../assets/modules/SearchInput.module.scss | 21 +++++++++++++++++++ .../components/Header/assets/svgs/logo4k.svg | 9 -------- 7 files changed, 59 insertions(+), 10 deletions(-) create mode 100644 react-project/src/components/Header/assets/modules/Cart.module.scss delete mode 100644 react-project/src/components/Header/assets/svgs/logo4k.svg diff --git a/react-project/src/components/Header/Cart.tsx b/react-project/src/components/Header/Cart.tsx index b7b21b6..8eea37f 100644 --- a/react-project/src/components/Header/Cart.tsx +++ b/react-project/src/components/Header/Cart.tsx @@ -1,8 +1,10 @@ import cart from "./assets/svgs/cart.svg"; +import cartStyle from "./assets/modules/Cart.module.scss"; + const Cart = () => { return ( - +
Carrinho de compras
diff --git a/react-project/src/components/Header/assets/modules/Cart.module.scss b/react-project/src/components/Header/assets/modules/Cart.module.scss new file mode 100644 index 0000000..a1cf729 --- /dev/null +++ b/react-project/src/components/Header/assets/modules/Cart.module.scss @@ -0,0 +1,14 @@ +.cart { + display: contents; + + figure { + display: contents; + + img { + @media screen and (min-width: 2500px) { + width: 54.68px; + height: 54.68px; + } + } + } +} diff --git a/react-project/src/components/Header/assets/modules/Header.module.scss b/react-project/src/components/Header/assets/modules/Header.module.scss index 50d4388..429c023 100644 --- a/react-project/src/components/Header/assets/modules/Header.module.scss +++ b/react-project/src/components/Header/assets/modules/Header.module.scss @@ -30,6 +30,12 @@ font-weight: 400; font-size: 14px; line-height: 16px; + text-decoration: none; + + @media screen and (min-width: 2500px) { + font-size: 28px; + line-height: 33px; + } } } } diff --git a/react-project/src/components/Header/assets/modules/Logo.module.scss b/react-project/src/components/Header/assets/modules/Logo.module.scss index 739488d..2acbcfb 100644 --- a/react-project/src/components/Header/assets/modules/Logo.module.scss +++ b/react-project/src/components/Header/assets/modules/Logo.module.scss @@ -3,5 +3,15 @@ figure { display: contents; + + img { + width: 136px; + height: 25.86px; + + @media screen and (min-width: 2500px) { + width: 265.62px; + height: 50.5px; + } + } } } diff --git a/react-project/src/components/Header/assets/modules/Menu.module.scss b/react-project/src/components/Header/assets/modules/Menu.module.scss index 54c928d..3538177 100644 --- a/react-project/src/components/Header/assets/modules/Menu.module.scss +++ b/react-project/src/components/Header/assets/modules/Menu.module.scss @@ -16,6 +16,11 @@ line-height: 16px; color: var(--white); text-decoration: none; + + @media screen and (min-width: 2500px) { + font-size: 28px; + line-height: 33px; + } } } } diff --git a/react-project/src/components/Header/assets/modules/SearchInput.module.scss b/react-project/src/components/Header/assets/modules/SearchInput.module.scss index 4368141..e5c3af6 100644 --- a/react-project/src/components/Header/assets/modules/SearchInput.module.scss +++ b/react-project/src/components/Header/assets/modules/SearchInput.module.scss @@ -14,6 +14,14 @@ width: 264px; height: 32px; + @media screen and (min-width: 2500px) { + width: 515.62px; + height: 57px; + padding: 12px 60px 12px 16px; + font-size: 28px; + line-height: 33px; + } + @media screen and (max-width: 1024px) { width: 100%; } @@ -28,8 +36,21 @@ top: 6px; right: 16px; border: 0; + padding-top: 1px; background-color: var(--white); cursor: pointer; + + @media screen and (min-width: 2500px) { + top: 11px; + padding: 1px; + } + + img { + @media screen and (min-width: 2500px) { + width: 35.15px; + height: 35.15px; + } + } } } } diff --git a/react-project/src/components/Header/assets/svgs/logo4k.svg b/react-project/src/components/Header/assets/svgs/logo4k.svg deleted file mode 100644 index f57d95b..0000000 --- a/react-project/src/components/Header/assets/svgs/logo4k.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - -