develop #7

Merged
cainamilech merged 46 commits from develop into main 2023-01-12 14:40:36 +00:00
7 changed files with 176 additions and 2 deletions
Showing only changes of commit 17cedd0fac - Show all commits

View File

@ -0,0 +1,12 @@
<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_3715_4730)">
<path d="M27.823 4.07236C27.6697 3.88079 27.4377 3.76928 27.1923 3.76928H5.69581L5.09469 1.16451C5.01009 0.798054 4.68377 0.538452 4.30768 0.538452H0.80768C0.361648 0.538452 0 0.9001 0 1.34619C0 1.79227 0.361648 2.15387 0.80768 2.15387H3.66516L7.7455 19.8355C7.83005 20.2019 8.15642 20.4615 8.53251 20.4615H24.7154C25.1614 20.4615 25.523 20.0999 25.523 19.6539C25.523 19.2078 25.1614 18.8462 24.7154 18.8462H9.17509L8.55384 16.1539H24.7693C25.1471 16.1539 25.4744 15.892 25.5573 15.5235L27.9803 4.75426C28.0342 4.51483 27.9763 4.26398 27.823 4.07236Z" fill="white"/>
<path d="M11.8461 21.5385C10.2132 21.5385 8.88458 22.867 8.88458 24.5C8.88458 26.133 10.2131 27.4615 11.8461 27.4615C13.4791 27.4615 14.8077 26.133 14.8077 24.5C14.8077 22.867 13.4792 21.5385 11.8461 21.5385Z" fill="white"/>
<path d="M21.5385 21.5385C19.9055 21.5385 18.5769 22.867 18.5769 24.5C18.5769 26.133 19.9054 27.4615 21.5385 27.4615C23.1714 27.4615 24.5 26.133 24.5 24.5C24.5 22.867 23.1715 21.5385 21.5385 21.5385Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_3715_4730">
<rect width="28" height="28" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 19 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -0,0 +1,10 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_5332_39)">
<path d="M13.2094 11.6187C14.0951 10.4091 14.6249 8.92334 14.6249 7.31267C14.6249 3.2807 11.3444 0.000183105 7.31245 0.000183105C3.28048 0.000183105 0 3.2807 0 7.31267C0 11.3446 3.28052 14.6252 7.31248 14.6252C8.92315 14.6252 10.409 14.0953 11.6186 13.2095L16.4092 18.0001L18 16.4093C18 16.4092 13.2094 11.6187 13.2094 11.6187ZM7.31248 12.3751C4.52086 12.3751 2.25001 10.1043 2.25001 7.31267C2.25001 4.52104 4.52086 2.25019 7.31248 2.25019C10.1041 2.25019 12.375 4.52104 12.375 7.31267C12.375 10.1043 10.1041 12.3751 7.31248 12.3751Z" fill="#303030"/>
</g>
<defs>
<clipPath id="clip0_5332_39">
<rect width="18" height="18" rx="5" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 804 B

View File

@ -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;
}
}

View File

@ -12,6 +12,8 @@
--gray-200: #7d7d7d;
--gray-300: #e5e5e5;
--gray-400: #b9b7b7;
--gray-500: #f2f2f2;
--gray-600: #c6c6c6;
--red-100: #ff0000;

View File

@ -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>Header</header>;
return (
<header>
<div className={header["spread"]}>
<div className={header["header"]}>
<a href="/">
<figure>
<img src={logo} alt="Logo M3 Academy" />
</figure>
</a>
<div className={header["header__search"]}>
<Formik
onSubmit={(values: ISearchType, actions) => {
actions.resetForm();
}}
initialValues={{ search: "" }}
>
<Form>
<Field placeholder="Buscar..." id="search" name="search" />
<button type="submit">
<img src={search} alt="Icone de pesquisa" />
</button>
</Form>
</Formik>
</div>
<div className={header["header__account"]}>
<a className={header["header__account__login"]} href="/">
ENTRAR
</a>
<a href="/">
<figure>
<img src={cart} alt="Carrinho de compras" />
</figure>
</a>
</div>
</div>
</div>
<div className={header["menu"]}>
<div>a</div>
<div>b</div>
<div>c</div>
</div>
</header>
);
};
export { Header };