Gabriel_Ferraz_Nogueira/desafio-react-e-typescript
1
0
Fork 0
forked from M3-Academy/desafio-react-e-typescript
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: adição scss main-container desktop e mobile

Browse Source
This commit is contained in:
Gabriel Ferraz Nogueira 2023-01-11 17:34:30 -03:00
parent 2704bbea3e
commit c5b1eb3d0e
16 changed files with 216 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
desafio-react-e-typescript/src/App.scss
View File

@ -1,3 +1,5 @@
@import "./components/Variables.scss";
body {
margin: 0;
}
@ -16,6 +18,43 @@ body {
display: flex;
max-width: 100%;
.Main_textArea {
width: 100%;
@media (min-width: 1025px) {
padding: 20px 100px 20px 30px;
}
h2 {
margin: 0 30px;
font-family: $fontFamily;
font-style: normal;
font-weight: 700;
font-size: 24px;
line-height: 28px;
color: $color-gray-800;
@media (max-width: 1024px) {
text-align: center;
margin-top: 20px;
}
}
.MainText {
margin: 12px 0 0 25px;
font-family: $fontFamily;
font-style: normal;
font-weight: 400;
font-size: 13px;
line-height: 15px;
color: $color-gray-500;
p {
margin: 20px 0;
}
}
}
@media (max-width: 1024px) {
flex-direction: column;
}

2
desafio-react-e-typescript/src/components/ContactForm.tsx
View File

@ -34,8 +34,6 @@ export const ContactForm = () => {
>
{({ errors, touched }) => (
<Form>
<h2>Preencha o formulário </h2>
<label htmlFor="name">Nome</label>
<Field
id="name"

35
desafio-react-e-typescript/src/components/Container-menu/TextContainer.tsx Normal file
View File

@ -0,0 +1,35 @@
export const MainText = () => {
return (
<>
<div className="MainText">
<p>
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.
</p>
<p>
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.
</p>
<p>
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?
</p>
</div>
</>
);
};

7
desafio-react-e-typescript/src/components/Container-menu/TopContainer.modules.scss
View File

@ -15,7 +15,7 @@
font-weight: 400;
font-size: 12px;
line-height: 14px;
color: $color-grey;
color: $color-gray;
text-transform: uppercase;
}
}
@ -25,6 +25,7 @@
justify-content: center;
.Title {
margin-bottom: 90px;
font-family: $fontFamily;
font-style: normal;
font-weight: 400;
@ -33,5 +34,9 @@
letter-spacing: 0.1em;
text-transform: uppercase;
color: $color-gray-800;
@media (max-width: 1024px) {
margin-bottom: 50px;
}
}
}

4
desafio-react-e-typescript/src/components/Header/HeaderDesktop.modules.scss
View File

@ -6,7 +6,7 @@
padding: 22px 100px;
background: $color-black;
font-family: $fontFamily;
border-bottom: 1px solid $color-grey;
border-bottom: 1px solid $color-gray;
.m3LogoWrapper {
display: flex;
@ -30,7 +30,7 @@
padding: 8px;
border: 2px solid $color-white-100;
border-radius: 5px;
color: $color-grey;
color: $color-gray;
@media (min-width: 2500px) {
height: 33px;

4
desafio-react-e-typescript/src/components/Header/HeaderMobile.modules.scss
View File

@ -33,7 +33,7 @@
z-index: 8;
button {
color: $color-grey;
color: $color-gray;
background: $color-white;
}
}
@ -99,7 +99,7 @@
background: $color-white;
border: 2px solid $color-white-100;
border-radius: 5px;
color: $color-grey;
color: $color-gray;
}
.SearchIcon {

29
desafio-react-e-typescript/src/components/Navegation.modules.scss
View File

@ -4,7 +4,7 @@
padding: 0 16px;
@media (min-width: 1025px) {
min-width: 24%;
min-width: 25%;
margin-left: 100px;
padding: 0;
}
@ -12,19 +12,26 @@
ul {
list-style: none;
padding: 0;
border-right: 1px solid $color-black;
li {
padding: 16px 10px;
margin: 10px 0;
.Title_links {
a {
display: flex;
width: 97%;
padding: 26px 16px;
@media (max-width: 1024px) {
padding: 10px 16px;
}
@media (min-width: 1025px) {
border-right: 1px solid $color-black;
}
}
}
li.active {
.active {
background: $color-black;
a {
color: $color-white;
}
color: $color-white;
}
a {
@ -33,7 +40,7 @@
font-weight: 400;
font-size: 16px;
line-height: 19px;
color: $color-grey-500;
color: $color-gray-500;
text-decoration: none;
}
}

42
desafio-react-e-typescript/src/components/Navegation.tsx
View File

@ -16,52 +16,22 @@ export const Navegation = () => {
<>
<nav className="MenuRoutes">
<ul className="links_wrapper">
<li
className={`Title_links ${toggleClassCheck} `}
onClick={() => {
handlechange();
}}
>
<li className={`Title_links ${toggleClassCheck} `} onClick={() => {}}>
<NavLink to={"/"}> Sobre </NavLink>
</li>
<li
className={`Title_links ${toggleClassCheck} `}
onClick={() => {
handlechange();
}}
>
<li className={`Title_links ${toggleClassCheck} `} onClick={() => {}}>
<NavLink to={"/Pagamentos"}> Formas de Pagamento </NavLink>
</li>
<li
className={`Title_links ${toggleClassCheck} `}
onClick={() => {
handlechange();
}}
>
<li className={`Title_links ${toggleClassCheck} `} onClick={() => {}}>
<NavLink to={"/Entrega"}> Entrega </NavLink>
</li>
<li
className={`Title_links ${toggleClassCheck} `}
onClick={() => {
handlechange();
}}
>
<li className={`Title_links ${toggleClassCheck} `} onClick={() => {}}>
<NavLink to={"/Devolução"}> Troca e Devolução </NavLink>
</li>
<li
className={`Title_links ${toggleClassCheck} `}
onClick={() => {
handlechange();
}}
>
<li className={`Title_links ${toggleClassCheck} `} onClick={() => {}}>
<NavLink to={"/Segurança"}> Segurança e Privacidade </NavLink>
</li>
<li
className={`Title_links ${toggleClassCheck} `}
onClick={() => {
handlechange();
}}
>
<li className={`Title_links ${toggleClassCheck} `} onClick={() => {}}>
<NavLink to={"/Contatos"}> Contatos </NavLink>
</li>
</ul>

8
desafio-react-e-typescript/src/components/Variables.scss
View File

@ -1,10 +1,14 @@
$fontFamily: "Roboto", sans-serif;
$color-black: #000;
$color-black-800: #100d0e;
$color-white: #fff;
$color-white-100: #f0f0f0;
$color-grey: #c4c4c4;
$color-grey-500: #7d7d7d;
$color-gray: #c4c4c4;
$color-gray-300: #b9b7b7;
$color-gray-500: #7d7d7d;
$color-gray-800: #292929;
$color-red: #ff0000;

11
desafio-react-e-typescript/src/pages/About.tsx
View File

@ -1,3 +1,12 @@
import { MainText } from "../components/Container-menu/TextContainer";
export const About = () => {
return <h2>Sobre</h2>;
return (
<>
<div className="Main_textArea">
<h2>Sobre</h2>
<MainText />
</div>
</>
);
};

51
desafio-react-e-typescript/src/pages/Contact.modules.scss
View File

@ -1,16 +1,61 @@
@import "../components/Variables.scss";
form {
display: flex;
flex-direction: column;
width: 100%;
padding: 16px;
font-family: $fontFamily;
font-style: normal;
font-weight: 400;
font-size: 14px;
line-height: 16px;
input {
margin-bottom: 12px;
@media (min-width: 1025px) {
width: 100%;
padding: 12px 30px;
}
input {
padding: 15px 20px;
margin: 12px 0;
border: 1px solid $color-black-800;
border-radius: 25px;
font-family: $fontFamily;
font-style: normal;
font-weight: 400;
font-size: 14px;
line-height: 16px;
color: $color-black;
&::placeholder {
color: $color-gray-300;
}
}
button {
padding: 17px;
background: $color-black;
border-radius: 25px;
color: $color-white;
}
div {
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 12px;
label {
order: 2;
}
input {
order: 3;
width: 18px;
height: 18px;
border: 1px solid $color-black;
border-radius: 3px;
margin: 0 4px;
}
}
@media (max-width: 1024px) {

5
desafio-react-e-typescript/src/pages/Contact.tsx
View File

@ -4,7 +4,10 @@ import "./Contact.modules.scss";
export const Form = () => {
return (
<>
<ContactForm />
<div className="Main_textArea">
<h2>Preencha o formulário </h2>
<ContactForm />
</div>
</>
);
};

11
desafio-react-e-typescript/src/pages/Delivery.tsx
View File

@ -1,3 +1,12 @@
import { MainText } from "../components/Container-menu/TextContainer";
export const Delivery = () => {
return <h2> Entrega </h2>;
return (
<>
<div className="Main_textArea">
<h2>Entrega</h2>
<MainText />
</div>
</>
);
};

11
desafio-react-e-typescript/src/pages/Payments.tsx
View File

@ -1,3 +1,12 @@
import { MainText } from "../components/Container-menu/TextContainer";
export const Payments = () => {
return <h2>Pagamentos</h2>;
return (
<>
<div className="Main_textArea">
<h2>Pagamentos</h2>
<MainText />
</div>
</>
);
};

11
desafio-react-e-typescript/src/pages/Privacy.tsx
View File

@ -1,3 +1,12 @@
import { MainText } from "../components/Container-menu/TextContainer";
export const Privacy = () => {
return <h2> Seguraça e Privacidade </h2>;
return (
<>
<div className="Main_textArea">
<h2>Seguraça e Privacidade</h2>
<MainText />
</div>
</>
);
};

11
desafio-react-e-typescript/src/pages/Refund.tsx
View File

@ -1,3 +1,12 @@
import { MainText } from "../components/Container-menu/TextContainer";
export const Refund = () => {
return <h2> Troca ou Devolução </h2>;
return (
<>
<div className="Main_textArea">
<h2>Troca ou Devolução</h2>
<MainText />
</div>
</>
);
};