Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
6b5d2b7
Update README.md
PaulaRabelo May 16, 2022
c0d4cb4
esqueleto do site com router
lauraamancio May 16, 2022
1fa4436
Merge pull request #1 from future4code/desenvolvimento
lisfribeiro May 16, 2022
d8aa342
logos
lauraamancio May 16, 2022
6216f6d
Merge pull request #2 from future4code/desenvolvimento
lisfribeiro May 16, 2022
82e2cb5
Att esqueleto
May 16, 2022
350205d
Merge pull request #3 from future4code/desenvolvimento
DiasSergio May 16, 2022
c7edf6b
Criação de Endereço
May 17, 2022
64a00d9
Criacao da página Login
lisfribeiro May 17, 2022
dbd6662
Implementação (sem estilização) da página MEU PERFIL, e setup do glob…
DiasSergio May 17, 2022
d372c95
Merge pull request #5 from future4code/Lis-login
martinelle-dev May 17, 2022
6a68d7e
Merge pull request #4 from future4code/Matheus-AdressPage
DiasSergio May 17, 2022
71ecc6b
Merge pull request #6 from future4code/Sergio-profilePage
martinelle-dev May 17, 2022
367e677
Formulário singup page
sabrinapiress May 17, 2022
7fc4989
Merge pull request #7 from future4code/Sabrina-SingUpPage
lisfribeiro May 17, 2022
262bd00
ajustes
lauraamancio May 17, 2022
6b222f9
Merge pull request #8 from future4code/ajustes-laura
sabrinapiress May 17, 2022
a322046
atualização pagina de update profile
DiasSergio May 17, 2022
fd7e6e3
Merge pull request #9 from future4code/Sergio-profilePage
lauraamancio May 17, 2022
5b02f56
atualizacao formato data e minima estilizacao
DiasSergio May 17, 2022
356b80a
Att Requisição AddAdress
May 17, 2022
dbbb420
Merge pull request #10 from future4code/Sergio-profilePage
lauraamancio May 17, 2022
4720a15
Merge pull request #11 from future4code/Matheus-AdressPage
lauraamancio May 17, 2022
98d2d88
estilização com material
sabrinapiress May 17, 2022
fcccd24
Merge pull request #12 from future4code/Sabrina-SingUpPage
martinelle-dev May 17, 2022
7fe8495
global states get restaurants e BO nos tokens (importacao na mão)
DiasSergio May 17, 2022
4dc419d
Merge pull request #13 from future4code/Sergio-profilePage
sabrinapiress May 17, 2022
6e63a43
tokens do login() e ajuste do date moment
DiasSergio May 17, 2022
6986082
Merge pull request #14 from future4code/Sergio-profilePage
lisfribeiro May 17, 2022
b46902f
Condicional AdressPage
May 17, 2022
4b389fa
logica do header utilizando o global state
DiasSergio May 17, 2022
44eaac8
Merge pull request #16 from future4code/Sergio-profilePage
martinelle-dev May 17, 2022
8617bb8
Merge pull request #17 from future4code/Matheus-AdressPage
DiasSergio May 17, 2022
aedde66
css do feed e tentativa de filtro, mudamos a secondy color
lauraamancio May 17, 2022
a12b1bf
Merge pull request #18 from future4code/feed-laura
sabrinapiress May 17, 2022
d4645da
filtro de pesquisa por nome funcionando
lauraamancio May 18, 2022
cef4a7f
Merge pull request #19 from future4code/teste-feed-laura
lisfribeiro May 18, 2022
4011dbd
Implementando Header Basic
May 18, 2022
1093536
Merge pull request #20 from future4code/Matheus-Header
DiasSergio May 18, 2022
a5bb8de
inicio da pagina de detalhes
DiasSergio May 18, 2022
bb18acb
Merge pull request #21 from future4code/Sergio-restaurantDetails
sabrinapiress May 18, 2022
94d9bee
Footer e estilização do CardRestaurants
sabrinapiress May 18, 2022
306c712
Merge branch 'desenvolvimento' into Sabrina-Footer
sabrinapiress May 18, 2022
c346488
Merge pull request #22 from future4code/Sabrina-Footer
martinelle-dev May 18, 2022
5fa5c61
inicio logica do carrinho na pagina de detalhes
DiasSergio May 18, 2022
d59d727
Merge pull request #24 from future4code/Sergio-restaurantDetails
martinelle-dev May 18, 2022
9e37e8e
Estilização DetailPage
sabrinapiress May 18, 2022
d05525a
Merge pull request #25 from future4code/Sabrina-Footer
lisfribeiro May 18, 2022
27757c7
Add font Roboto; Att Feed(filter category, css)/Cards(css)
May 19, 2022
fae5fb3
Merge pull request #26 from future4code/Matheus-Feed
lisfribeiro May 19, 2022
74fba38
Att Feed
May 19, 2022
fe553ce
Merge pull request #27 from future4code/Matheus-Feed
DiasSergio May 19, 2022
5fb8596
lógica final da pagina de detalhes, sem estilizaçao
DiasSergio May 19, 2022
bf1983a
Merge pull request #28 from future4code/Sergio-restaurantDetails
lisfribeiro May 19, 2022
b4e467a
Loading: signup, login, endereco e feed
lisfribeiro May 19, 2022
c375980
Merge pull request #30 from future4code/Lis-loading
martinelle-dev May 19, 2022
c27e206
inputs de address e profile ficam com infos do usuário
lauraamancio May 19, 2022
da96269
Merge branch 'desenvolvimento' into update-style-laura
lauraamancio May 19, 2022
8efacda
Merge pull request #31 from future4code/update-style-laura
lisfribeiro May 19, 2022
58c9ba4
array de dependencias acertado
lauraamancio May 19, 2022
2f376c8
Estilização pagina de detalhes
sabrinapiress May 19, 2022
973c954
Merge pull request #32 from future4code/Sabrina-Estilizacao
martinelle-dev May 19, 2022
653e0d9
style do profile page(falta os cards de pedidos
lauraamancio May 19, 2022
0fb6a74
Merge pull request #33 from future4code/style-profile-laura
lisfribeiro May 19, 2022
20df4a7
inicio da logica do carrinho
DiasSergio May 19, 2022
2b16f98
Merge pull request #34 from future4code/Cart-branch
lisfribeiro May 19, 2022
6a69527
Att Header, ajustes gerais Endereço
May 19, 2022
314d417
Merge branch 'desenvolvimento' into Matheus-Header
martinelle-dev May 19, 2022
1056ae1
Merge pull request #35 from future4code/Matheus-Header
sabrinapiress May 19, 2022
6b9e10d
Resolvendo loading infinito feed, reset detailsPage
May 19, 2022
4461362
Merge pull request #36 from future4code/Matheus-Restaurante
lauraamancio May 19, 2022
5a49153
continuacao logica do carrinho
DiasSergio May 19, 2022
8fd8e13
Merge branch 'desenvolvimento' into Cart-branch
martinelle-dev May 19, 2022
065a2a4
Merge pull request #37 from future4code/Cart-branch
martinelle-dev May 19, 2022
dd96d0a
apagando uma chave a mais
May 19, 2022
1554f89
Merge pull request #38 from future4code/Matheus-Restaurante
lisfribeiro May 19, 2022
a3f3601
descomentando uma função
May 19, 2022
dbca1a1
Merge pull request #39 from future4code/Matheus-Restaurante
lisfribeiro May 19, 2022
95dad0a
Organizando código e resolvendo problemas
May 20, 2022
a1342b1
Merge pull request #40 from future4code/Matheus-AdressPage
lisfribeiro May 20, 2022
f1f85e4
refatorando e corrigindo alguns bugs
DiasSergio May 20, 2022
f5923c5
address page
DiasSergio May 20, 2022
88927ea
Merge pull request #41 from future4code/Cart-branch
sabrinapiress May 20, 2022
b03acaf
Panico
sabrinapiress May 20, 2022
6f22ebf
Merge branch 'desenvolvimento' into Sabrina-Estilizacao
sabrinapiress May 20, 2022
1e1207b
Merge pull request #42 from future4code/Sabrina-Estilizacao
lisfribeiro May 20, 2022
cb6c6b2
alert + redirecionamento para feed em caso de sucesso
DiasSergio May 20, 2022
0bbd0d9
Merge pull request #43 from future4code/Sergio-teste
lisfribeiro May 20, 2022
52a1d2a
resolvendo bug input complement
May 20, 2022
51296b4
Merge pull request #44 from future4code/Matheus-Feed
lauraamancio May 20, 2022
36bbb3a
resolucao do loop infinito profile page
DiasSergio May 20, 2022
330aeb7
Merge pull request #45 from future4code/Sergio-teste
lauraamancio May 20, 2022
b6ffcca
Ajustes
lisfribeiro May 20, 2022
aaf9925
Merge pull request #46 from future4code/Lis-login
DiasSergio May 20, 2022
64a4432
protected e unprotect
lisfribeiro May 20, 2022
23147aa
Merge pull request #47 from future4code/Lis-protect-page
DiasSergio May 20, 2022
a37d8da
css do profile feita, fonte do site padronizada no index (roboto)
lauraamancio May 20, 2022
ea891da
Merge pull request #48 from future4code/style-profile-laura
lisfribeiro May 20, 2022
4beca37
Resolvendo bug filtro, Add modal
May 20, 2022
2cfe80a
Merge branch 'desenvolvimento' into Matheus-Restaurante
martinelle-dev May 20, 2022
88beae5
Merge pull request #49 from future4code/Matheus-Restaurante
martinelle-dev May 20, 2022
1e115c0
condição só um restaurante no carrinho
DiasSergio May 20, 2022
7d5f9c6
lógica card de pedido andamento feita
lauraamancio May 20, 2022
16ecf53
Merge branch 'desenvolvimento' into orderCard-lislau
lauraamancio May 20, 2022
51adcf4
Merge pull request #51 from future4code/orderCard-lislau
lisfribeiro May 20, 2022
a7c7f5d
Merge branch 'desenvolvimento' into Sergio-teste
martinelle-dev May 20, 2022
9de324c
Merge pull request #50 from future4code/Sergio-teste
martinelle-dev May 20, 2022
fed1a7a
bugs resolvidos feed e activeorder
lauraamancio May 20, 2022
ea83717
Merge pull request #52 from future4code/bugfix-activeorder
lisfribeiro May 20, 2022
3ea509a
correçao das quebras
DiasSergio May 20, 2022
5bb0869
Merge pull request #53 from future4code/Sergio-teste
sabrinapiress May 20, 2022
98ccc8e
Básico da página de erro
lisfribeiro May 20, 2022
f3fad7e
inicio da logica funcoes modal
DiasSergio May 20, 2022
13dfc91
Merge pull request #54 from future4code/Lis-page-error
martinelle-dev May 20, 2022
950f1f9
Estilização card
sabrinapiress May 21, 2022
6b1abf0
inicio logica das funcoes do modal
DiasSergio May 21, 2022
56471ba
Merge pull request #56 from future4code/Sergio-teste
martinelle-dev May 21, 2022
d648372
Merge branch 'desenvolvimento' into Sabrina-Estlizacao-Pedido
sabrinapiress May 21, 2022
109f6a6
Merge pull request #55 from future4code/Sabrina-Estlizacao-Pedido
lisfribeiro May 21, 2022
4955ef8
organizando o codigo para fazer as funcoes do modal
DiasSergio May 21, 2022
ef55631
Merge pull request #57 from future4code/Sergio-Modal-Functions
martinelle-dev May 21, 2022
654f72c
Estilização Carrinho
sabrinapiress May 21, 2022
5da2205
Estilização Carrinho
sabrinapiress May 21, 2022
cf13afb
Estilização Carrinho resolvendo conflito
sabrinapiress May 21, 2022
c842074
Merge pull request #58 from future4code/Sabrina-Estlizacao-Pedido
lauraamancio May 21, 2022
ad05f6f
logicas
DiasSergio May 21, 2022
37240aa
card de activeorder feito, css pronto
lauraamancio May 21, 2022
f390918
Merge pull request #59 from future4code/bugfix-activeorder
martinelle-dev May 21, 2022
bbd2a3b
logica das funcoes do modal
DiasSergio May 21, 2022
ec34472
Merge pull request #60 from future4code/Sergio-Modal-Functions
lauraamancio May 21, 2022
3af0ebc
Opening-Screen
May 21, 2022
7c527ce
Merge pull request #61 from future4code/Matheus-OpeningScreen
lisfribeiro May 21, 2022
9b06246
Ajustes CartPage
May 22, 2022
6562caa
Att Login e SignUp
May 22, 2022
8569a53
ajustes de larguras p/ desktop em Login e SignUp
May 22, 2022
168d1fe
Merge branch 'desenvolvimento' of https://github.com/future4code/Shaw…
May 22, 2022
e26071c
Ajustes Adress e Update
May 22, 2022
3339cfb
Ajustes p/ Feed e UpdateProfile em Desktop
May 22, 2022
e8faa4f
Ajustes Profile page, div feed, texto activeOrder
May 22, 2022
4a95d65
Att Header e ajuste do activeOrder
May 22, 2022
34634c5
Merge pull request #62 from future4code/Matheus-Ajustes
DiasSergio May 22, 2022
eedd165
funcao de useEffect para mostrar produtos no carrinho tambem na pagin…
DiasSergio May 22, 2022
d60384a
Merge pull request #63 from future4code/Sergio-Modal-Functions
martinelle-dev May 22, 2022
e6a6362
ajustes page detalhes
May 23, 2022
d366be6
Merge pull request #64 from future4code/Matheus-Ajustes
martinelle-dev May 23, 2022
5d0d76a
Merge pull request #65 from future4code/desenvolvimento
martinelle-dev May 23, 2022
4539371
Update README.md
martinelle-dev May 23, 2022
2a6e74f
Favicon, um pouco de responsividade, css
May 23, 2022
48a70d6
Merge pull request #66 from future4code/desenvolvimento
martinelle-dev May 23, 2022
516c094
Update README.md
martinelle-dev May 23, 2022
fdbdcd1
Update README.md
DiasSergio May 23, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 76 additions & 68 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,68 +1,76 @@
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

## Available Scripts

In the project directory, you can run:

### `npm start`

Runs the app in the development mode.<br />
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.

The page will reload if you make edits.<br />
You will also see any lint errors in the console.

### `npm test`

Launches the test runner in the interactive watch mode.<br />
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `npm run build`

Builds the app for production to the `build` folder.<br />
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.<br />
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can’t go back!**

If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.

You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).

### Code Splitting

This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting

### Analyzing the Bundle Size

This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size

### Making a Progressive Web App

This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app

### Advanced Configuration

This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration

### Deployment

This section has moved here: https://facebook.github.io/create-react-app/docs/deployment

### `npm run build` fails to minify

This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
<h1 id="top"> 💻 Projeto Final do Frontend: LabeFoods </h1>

<div align="center">
<img src="https://cdn.zeplin.io/5dd5ae92669af1bc817c8359/assets/2996043A-2111-4F86-AB91-37474F98621C.svg" width="100%" height="250" />
</div>

<br>

## :dart: Objetivo do projeto:
Como último projeto do módulo Frontend da instituição Labenu, a proposta é uma aplicação que se aproxima mais do mundo real, formada por um grupo de 5 pessoas para reproduzir um layout pronto feito por uma designer experiente: Camila Mizutanios.
Se baseando nos aplicativos famosos de delivery, devemos aplicar os conhecimentos adquiridos para poder fazer um site funcional em Mobile First, ou seja, uma aplicação focada para dispositivos móveis, com autenticação, formulários com validações, navegação, e muitas outras funcionalidades para o usuário usufruir ao máximo.

## ✍️ Layout:
Visualize os layouts desenvolvidos pela designer Camila Mizutanios [clicando aqui.](https://scene.zeplin.io/project/5dd5ae92669af1bc817c8359)

<br>

## ⚙️ Funcionalidades:
- Login: utilizando um email e uma senha cadastrada o usuário consegue ter acesso as páginas da aplicação com proteções de autenticações;
- Cadastro: efetua o cadastro de um novo usuário para adquirir uma autenticação e encaminha para registrar o endereço de entrega do delivery;
- Cadastro de Endereço: armazena as informações de endereço do usuário e recebe outra autenticação, em seguida o caminha para a página inicial;
- Home: filtra por categoria ou nome de restaurante, além do usuário poder acessar cada restaurante clicando no respectivo card;
- Restaurante: visualiza informações do restaurante e consegue adicionar ou remover produtos no carrinho clicando no respectivo botão;
- Carrinho: mostra os produtos adicionados, podendo remover ou continuar o processo escolhendo uma forma de pagamento e confirmando (só poderá fazer outro pedido após o tempo de entrega do respectivo restaurante);
- Perfil: acessa as páginas de dados do usuário podendo editar as informações de endereço ou login, além de ver seu histórico de pedidos finalizados;
- Footer: permite navegar entre as três principais páginas clicando nos seus respectivos ícones.

## :books: Bibliotecas utilizadas:
- [axios](https://github.com/axios/axios)
- [material-ui](https://mui.com/pt/)
- [react-router-dom](https://v5.reactrouter.com/)
- [styled-components](https://styled-components.com/)

## 🔗 Link Surge:
- Acesse Rappi4 [clicando aqui.](https://ragged-yard.surge.sh/)

<br>

## 📱 Imagens Mobile:

Tela de Entrada | Página de Login
:-------------------------:|:-------------------------:
![Tela de Entrada](https://user-images.githubusercontent.com/98998030/169790812-82e116b2-c95b-46a1-952b-176c5fa94904.png) | ![Página de Login](https://user-images.githubusercontent.com/98998030/169790954-1f40d9a2-83a1-460a-8c1c-b686d5f9e824.png)

Página de Cadastro | Página de Cadastro de Endereço
:-------------------------:|:-------------------------:
![Página de Cadastro](https://user-images.githubusercontent.com/98998030/169791533-d7d3d080-48c9-4dcd-b5d8-19cc7b884bab.png) | ![Página de Cadastro de Endereço](https://user-images.githubusercontent.com/98998030/169791631-7c6e46b1-b9ef-4fbe-9498-44abe1414f15.png)

Home | Home com filtro selecionado
:-------------------------:|:-------------------------:
![Home Page](https://user-images.githubusercontent.com/98998030/169793268-c65046db-a1f8-46e0-b0c0-ef77c1c2ae5a.png) | ![Home Page com filtro selecionado](https://user-images.githubusercontent.com/98998030/169792454-10b2974d-eb0d-4d02-a02b-1a36bff89586.png)

Página do Restaurante | Página do Carrinho
:-------------------------:|:-------------------------:
![Página do Restaurante](https://user-images.githubusercontent.com/98998030/169794711-019c27bf-618a-4611-bf41-d2de384499dd.png) | ![Página do Carrinho](https://user-images.githubusercontent.com/98998030/169794787-a92d5d52-3a17-47aa-b968-63167e829026.png)

Notificação do Pedido | Página de Perfil
:-------------------------:|:-------------------------:
![Notificação do Pedido](https://user-images.githubusercontent.com/98998030/169795158-bc753501-a49d-41cf-813a-486dc16adf5d.png) | ![Página de Perfil](https://user-images.githubusercontent.com/98998030/169795247-64056325-9399-4d87-acef-6b159b547428.png)

Edição dos dados pessoais | Edição dos dados de endereço
:-------------------------:|:-------------------------:
![Edição dos dados pessoais](https://user-images.githubusercontent.com/98998030/169795525-ca6ffa0a-c9a8-473a-85f9-1918ee07ba95.png) | ![Edição dos dados de endereço](https://user-images.githubusercontent.com/98998030/169795667-88e1a65d-3d29-489d-820e-d1ef7c3830b1.png)

<br>

## 👨‍💻 Desenvolvedores:

| [<img src="https://avatars.githubusercontent.com/u/98964160?v=4" width=115><br><sub>Laura Neves Amancio</sub>](https://github.com/lauraamancio) | [<img src="https://avatars.githubusercontent.com/u/99135090?v=4" width=115><br><sub>Sérgio Pereira Dias</sub>](https://github.com/Sergiopdias) | [<img src="https://avatars.githubusercontent.com/u/99182969?v=4" width=115><br><sub>Lis Fernanda Ribeiro dos Santos</sub>](https://github.com/lisfribeiro) | [<img src="https://avatars.githubusercontent.com/u/98998030?v=4" width=115><br><sub>Matheus Martinelle Barros</sub>](https://github.com/MatthsMB) | [<img src="https://avatars.githubusercontent.com/u/99099328?v=4" width=115><br><sub>Sabrina Caroline Pires da Silva</sub>](https://github.com/sabrinapiress) |
| :---: | :---: | :---: | :---: | :---: |

<br>

<h2>
<a href='#top'>Voltar para o topo.</a>
</h2>
Loading