Merge pull request 'feature/header' (#2) from feature/header into develop

Reviewed-on: #2
This commit is contained in:
Cainã Milech 2023-01-08 22:50:48 +00:00
commit e18341008e
50 changed files with 646 additions and 238 deletions

View File

@ -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.

View File

@ -1 +0,0 @@
# REACT APP - INSTITUCIONAL

View File

@ -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",

View File

@ -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",

View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="pt-BR">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
@ -9,34 +9,11 @@
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>Desafio React M3</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
<div id="root"></div>
</body>
</html>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

View File

@ -1,4 +1,5 @@
import React from "react";
import logo from "./logo.svg";
import "../src/assets/styles/global.scss";
import { Institucional } from "./pages/Institucional";

View File

@ -1 +1,2 @@
declare module "react-text-mask";
declare module "react-modal";

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,5 +1,3 @@
import React from "react";
import { Newsletter } from "./Newsletter";
const Footer = () => {

View File

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

View File

@ -1,7 +0,0 @@
import React from "react";
const Header = () => {
return <header>Header</header>;
};
export { Header };

View File

@ -0,0 +1,15 @@
import cart from "./assets/svgs/cart.svg";
import cartStyle from "./assets/modules/Cart.module.scss";
const Cart = () => {
return (
<a className={cartStyle["cart"]} href="/">
<figure>
<img src={cart} alt="Carrinho de compras" />
</figure>
</a>
);
};
export { Cart };

View File

@ -0,0 +1,49 @@
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 Hamburguer = () => {
const [hambActive, setHamb] = useState(false);
const HambMode = () => {
setHamb(!hambActive);
};
return (
<>
<button className={hamburguer["hamburguer"]} onClick={HambMode}>
<img src={hamb} alt="Menu Hamburguer" />
</button>
<Modal
isOpen={hambActive}
onRequestClose={HambMode}
overlayClassName={hamburguer["overlay"]}
className={hamburguer["content"]}
>
<div className={hamburguer["content__top"]}>
<a href="/">ENTRAR</a>
<button onClick={HambMode}>
<img src={close} alt="Botão de fechar menu" />
</button>
</div>
<ul>
<li>
<a href="/">CURSOS</a>
</li>
<li>
<a href="/">SAIBA MAIS</a>
</li>
<li>
<a href="/">INSTITUCIONAIS</a>
</li>
</ul>
</Modal>
</>
);
};
export { Hamburguer };

View File

@ -0,0 +1,31 @@
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 (
<div className={header["header-desktop"]}>
<div className={header["spread"]}>
<div className={header["header"]}>
<Logo />
<SearchInput />
<div className={header["header__account"]}>
<a className={header["header__account__login"]} href="/">
ENTRAR
</a>
<Cart />
</div>
</div>
</div>
<Menu />
</div>
);
};
export { Header };

View File

@ -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 (
<div className={headerMobile["header-mobile"]}>
<div className={headerMobile["header-mobile__header"]}>
<Hamburguer />
<Logo />
<Cart />
</div>
<div className={headerMobile["header-mobile__input"]}>
<SearchInput />
</div>
</div>
);
};
export { HeaderMobile };

View File

@ -0,0 +1,15 @@
import logo from "./assets/svgs/logo.svg";
import logoStyle from "./assets/modules/Logo.module.scss";
const Logo = () => {
return (
<a className={logoStyle["logo"]} href="/">
<figure>
<img src={logo} alt="Logo M3 Academy" />
</figure>
</a>
);
};
export { Logo };

View File

@ -0,0 +1,21 @@
import menu from "./assets/modules/Menu.module.scss";
const Menu = () => {
return (
<nav className={menu["menu"]}>
<ul>
<li>
<a href="/">CURSOS</a>
</li>
<li>
<a href="/">SAIBA MAIS</a>
</li>
<li>
<a href="/">INSTITUCIONAIS</a>
</li>
</ul>
</nav>
);
};
export { Menu };

View File

@ -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 (
<div className={searchStyle["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>
);
};
export { SearchInput };

View File

@ -0,0 +1,14 @@
.cart {
display: contents;
figure {
display: contents;
img {
@media screen and (min-width: 2500px) {
width: 54.68px;
height: 54.68px;
}
}
}
}

View File

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

View File

@ -0,0 +1,42 @@
.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);
}
.header {
margin-left: 100px;
margin-right: 100px;
display: flex;
justify-content: space-between;
padding: 22px 0;
align-items: center;
&__account {
display: flex;
align-items: center;
gap: 55px;
&__login {
color: var(--white);
font-weight: 400;
font-size: 14px;
line-height: 16px;
text-decoration: none;
@media screen and (min-width: 2500px) {
font-size: 28px;
line-height: 33px;
}
}
}
}
}

View File

@ -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: 25px 16px;
align-items: center;
}
&__input {
padding: 0 16px 25px;
}
}

View File

@ -0,0 +1,17 @@
.logo {
display: contents;
figure {
display: contents;
img {
width: 136px;
height: 25.86px;
@media screen and (min-width: 2500px) {
width: 265.62px;
height: 50.5px;
}
}
}
}

View File

@ -0,0 +1,27 @@
.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;
@media screen and (min-width: 2500px) {
font-size: 28px;
line-height: 33px;
}
}
}
}
}

View File

@ -0,0 +1,56 @@
.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 (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%;
}
&::placeholder {
color: var(--gray-600);
}
}
button {
position: absolute;
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;
}
}
}
}
}

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

View File

@ -0,0 +1,4 @@
<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.2284 1.28215L1.22996 10.9942C0.550673 11.6541 0.568968 12.7044 1.27083 13.3401C1.97268 13.9759 3.09232 13.9564 3.77161 13.2966L13.77 3.58449C14.4493 2.92466 14.431 1.87436 13.7292 1.23858C13.0273 0.602806 11.9077 0.622311 11.2284 1.28215Z" fill="white"/>
<path d="M1.65213 3.40819L10.8751 13.7186C11.5082 14.4263 12.6262 14.5239 13.3724 13.9366C14.1185 13.3493 14.2102 12.2995 13.5771 11.5918L4.35414 1.28143C3.72107 0.573715 2.603 0.476092 1.85686 1.06338C1.11072 1.65067 1.01906 2.70048 1.65213 3.40819Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 638 B

View File

@ -0,0 +1,5 @@
<svg width="28" height="23" viewBox="0 0 28 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M26.25 19.0001H1.75002C0.783509 19.0001 0 19.7836 0 20.7501C0 21.7166 0.783508 22.5001 1.75002 22.5001H26.25C27.2165 22.5001 28 21.7166 28 20.7501C28 19.7836 27.2165 19.0001 26.25 19.0001Z" fill="white"/>
<path d="M26.25 9.5H1.75002C0.783509 9.5 0 10.2835 0 11.25C0 12.2165 0.783508 13 1.75002 13H26.25C27.2165 13 28 12.2165 28 11.25C28 10.2835 27.2165 9.5 26.25 9.5Z" fill="white"/>
<path d="M26.25 0H1.75002C0.783509 0 0 0.783509 0 1.75002C0 2.71652 0.783508 3.50003 1.75002 3.50003H26.25C27.2165 3.50003 28 2.71652 28 1.75002C28 0.783509 27.2165 0 26.25 0Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 688 B

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

@ -1,52 +0,0 @@
import { Routes, Route } from "react-router-dom";
import main from "../assets/styles/modules/Main.module.scss";
import { Navigation } from "./Navigation";
import { Sobre } from "./Sobre";
import { Pagamento } from "./Pagamento";
import { Entrega } from "./Entrega";
import { Troca } from "./Troca";
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";
const Main = () => {
return (
<div className={main["main"]}>
<div className={main["main__breadcrumb"]}>
<a href="/">
<figure>
<img src={iconHome} alt="Icone Home" />
</figure>
</a>
<figure>
<img src={iconArrow} alt="Icone Flecha para direita" />
</figure>
<span>INSTITUCIONAL</span>
</div>
<h1 className={main["main__title"]}>INSTITUCIONAL</h1>
<div className={main["main__wrapperNav"]}>
<Navigation />
<Routes>
<Route path="/" element={<Sobre />} />
<Route path="/pagamento" element={<Pagamento />} />
<Route path="/entrega" element={<Entrega />} />
<Route path="/troca" element={<Troca />} />
<Route path="/seguranca" element={<Seguranca />} />
<Route path="/contato" element={<Contato />} />
</Routes>
</div>
</div>
);
};
export { Main };

View File

@ -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 (
<div className={breadcrumb["breadcrumb"]}>
<a href="/">
<figure>
<img src={iconHome} alt="Icone Home" />
</figure>
</a>
<figure>
<img src={iconArrow} alt="Icone Flecha para direita" />
</figure>
<span>INSTITUCIONAL</span>
</div>
);
};
export { Breadcrumb };

View File

@ -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;
@ -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 (
<div className={contato["forms"]}>
<h2>Preencha o formulário</h2>

View File

@ -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 (

View File

@ -0,0 +1,40 @@
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";
import { Pagamento } from "./Pagamento";
import { Entrega } from "./Entrega";
import { Troca } from "./Troca";
import { Seguranca } from "./Seguranca";
import { Contato } from "./Contato";
const Main = () => {
return (
<div className={main["main"]}>
<Breadcrumb />
<section>
<h1 className={main["main__title"]}>INSTITUCIONAL</h1>
<div className={main["main__wrapperNav"]}>
<Navigation />
<Routes>
<Route path="/" element={<Sobre />} />
<Route path="/pagamento" element={<Pagamento />} />
<Route path="/entrega" element={<Entrega />} />
<Route path="/troca" element={<Troca />} />
<Route path="/seguranca" element={<Seguranca />} />
<Route path="/contato" element={<Contato />} />
</Routes>
</div>
</section>
</div>
);
};
export { Main };

View File

@ -1,14 +1,13 @@
import React from "react";
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 (
<ul className={navigation["items"]}>
<li className={navigation["item"]}>
<li>
<NavLink
to="/"
className={({ isActive }) =>
@ -18,7 +17,7 @@ const Navigation = () => {
Sobre
</NavLink>
</li>
<li className={navigation["item"]}>
<li>
<NavLink
to="/pagamento"
className={({ isActive }) =>
@ -28,7 +27,7 @@ const Navigation = () => {
Forma de Pagamento
</NavLink>
</li>
<li className={navigation["item"]}>
<li>
<NavLink
to="/entrega"
className={({ isActive }) =>
@ -38,7 +37,7 @@ const Navigation = () => {
Entrega
</NavLink>
</li>
<li className={navigation["item"]}>
<li>
<NavLink
to="/troca"
className={({ isActive }) =>
@ -48,7 +47,7 @@ const Navigation = () => {
Troca e Devolução
</NavLink>
</li>
<li className={navigation["item"]}>
<li>
<NavLink
to="/seguranca"
className={({ isActive }) =>
@ -58,7 +57,7 @@ const Navigation = () => {
Segurança e Privacidade
</NavLink>
</li>
<li className={navigation["item"]}>
<li>
<NavLink
to="/contato"
className={({ isActive }) =>

View File

@ -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 (

View File

@ -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 (

View File

@ -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 (

View File

@ -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 (

View File

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

View File

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

View File

@ -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], ""),
});

View File

Before

Width:  |  Height:  |  Size: 510 B

After

Width:  |  Height:  |  Size: 510 B

View File

Before

Width:  |  Height:  |  Size: 986 B

After

Width:  |  Height:  |  Size: 986 B

View File

@ -1,15 +1,17 @@
import React from "react";
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 { HeaderMobile } from "../components/Header/HeaderMobile";
import { Main } from "../components/MainInstitucional/Main";
import { Footer } from "../components/Footer/Footer";
const Institucional = () => {
return (
<div>
<Header />
<header>
<Header />
<HeaderMobile />
</header>
<Main />
<Footer />
</div>