Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
8e7bbb5
Update README.md
PaulaRabelo May 16, 2022
705fe00
pastas iniciais, hooks, e estruturação de rotas
Pabloweb2022 May 16, 2022
59b0624
Merge pull request #1 from future4code/pablo-start-projeto
Pabloweb2022 May 16, 2022
88892e6
Início do Login
servuloccsilva May 16, 2022
df10583
Merge pull request #2 from future4code/login-cadastro
willmarques09 May 16, 2022
b3b8d0d
principais rotas criadas
Pabloweb2022 May 16, 2022
64497e4
Merge pull request #3 from future4code/pablo-rotas
Pabloweb2022 May 16, 2022
dbdac76
Ajuste de erros iniciais
matheus92as May 16, 2022
71612bd
Merge pull request #4 from future4code/matheus-souza-pag-restaurante
Pabloweb2022 May 16, 2022
ec7411d
pastas
Pabloweb2022 May 16, 2022
e5ad2ea
Merge pull request #5 from future4code/pablo-pastas
Pabloweb2022 May 16, 2022
30ed3dc
footer
willmarques09 May 16, 2022
5183cdf
Merge pull request #6 from future4code/willhan-marquess
matheus92as May 16, 2022
5b12817
Fiz login e signup
SantosRodrigo89 May 16, 2022
68e976c
pequena alteração
SantosRodrigo89 May 16, 2022
605b487
Merge pull request #7 from future4code/rodrigo
SantosRodrigo89 May 16, 2022
0652664
Criação de pagina do restaurante
matheus92as May 16, 2022
5b3cd5f
Merge pull request #8 from future4code/matheus-souza-pag-restaurante
matheus92as May 16, 2022
48a7af9
iniciei a pagina de perfil
Pabloweb2022 May 16, 2022
002907a
Merge pull request #9 from future4code/pablo-editar-cadastro
Pabloweb2022 May 16, 2022
43385a0
Fiz o cadastro de endereços
SantosRodrigo89 May 17, 2022
9155f0e
Merge branch 'master' into rodrigo
SantosRodrigo89 May 17, 2022
e947b54
Merge pull request #10 from future4code/rodrigo
SantosRodrigo89 May 17, 2022
dfcde23
refatorei a pagina profile
Pabloweb2022 May 17, 2022
bf68379
Merge pull request #11 from future4code/pablo-profile
Pabloweb2022 May 17, 2022
aa3045b
adjustes de estilização no profile
Pabloweb2022 May 17, 2022
c50916d
Merge pull request #12 from future4code/pablo-profile
Pabloweb2022 May 17, 2022
92c9ac4
Fiz tentativas de funcionamento da pagina de cadastro de endereços
SantosRodrigo89 May 17, 2022
819b07f
Merge branch 'master' of https://github.com/future4code/Shaw-labe-foo…
SantosRodrigo89 May 17, 2022
f084fd3
Merge pull request #13 from future4code/rodrigo
SantosRodrigo89 May 17, 2022
2568d90
Resolvi o erro do cadastro de endereços ao remover o user do coordinator
SantosRodrigo89 May 17, 2022
4cbb765
So falta estilizar
SantosRodrigo89 May 17, 2022
45394b1
Fiz o botão do footer
SantosRodrigo89 May 17, 2022
334a95a
Merge pull request #14 from future4code/rodrigo
SantosRodrigo89 May 17, 2022
0414f24
Card Restaurantes iniciado e renderizados na Home
servuloccsilva May 17, 2022
b8ec082
Merge branch 'master' into home-servulo
servuloccsilva May 17, 2022
baffbd4
Merge pull request #15 from future4code/home-servulo
servuloccsilva May 17, 2022
4e8d71a
funcionalidades de ediçao de dados nominais ok
Pabloweb2022 May 17, 2022
eda5450
Merge branch 'master' into pablo-profile
Pabloweb2022 May 17, 2022
a693a94
pequena alteração
SantosRodrigo89 May 17, 2022
8cbd2b0
tirei um erro no router
Pabloweb2022 May 17, 2022
28c85d3
Merge pull request #16 from future4code/pablo-profile
Pabloweb2022 May 17, 2022
0d75387
Merge branch 'master' of https://github.com/future4code/Shaw-labe-foo…
Pabloweb2022 May 17, 2022
e45c919
atualizei o botao de ir pra pagina de ediçao de endereço
Pabloweb2022 May 17, 2022
b37c5e9
Merge pull request #17 from future4code/pablo-profile
Pabloweb2022 May 17, 2022
c7348ef
carrinho
willmarques09 May 17, 2022
3553005
Merge branch 'master' into carrinho
willmarques09 May 17, 2022
25485c3
Merge pull request #18 from future4code/carrinho
willmarques09 May 17, 2022
e3e68ed
Cards do restaurante quase completos
servuloccsilva May 17, 2022
8a8174a
Cards do restaurante
servuloccsilva May 17, 2022
1740b1d
linkei a pagina de cadastros ao profile
Pabloweb2022 May 17, 2022
4b2265e
Merge pull request #19 from future4code/pablo-profile
Pabloweb2022 May 17, 2022
23534eb
Merge pull request #20 from future4code/home-servulo
servuloccsilva May 17, 2022
d0613a4
Fiz as estilizações do login, signup e cadastro de endereço usando MUI
SantosRodrigo89 May 17, 2022
42c992e
Merge pull request #21 from future4code/rodrigo
SantosRodrigo89 May 17, 2022
f7c33ca
Apenas organizando conflitos home
servuloccsilva May 17, 2022
1cb23e0
Merge branch 'master' of https://github.com/future4code/Shaw-labe-foo…
servuloccsilva May 17, 2022
14e4f62
Ajuste de navegação
matheus92as May 17, 2022
5fc4be8
estilizei o botao e coloquei a rota correta na requisiçao
Pabloweb2022 May 17, 2022
f1d8949
Merge pull request #22 from future4code/pablo-profile
Pabloweb2022 May 17, 2022
b2d6749
Conflito na Home
servuloccsilva May 17, 2022
7cb4d8a
Merge pull request #23 from future4code/home-servulo
servuloccsilva May 17, 2022
86222a6
Fiz a estilização dos botões
SantosRodrigo89 May 17, 2022
c88941a
Merge branch 'master' into rodrigo
SantosRodrigo89 May 17, 2022
e602a6d
Merge pull request #24 from future4code/rodrigo
SantosRodrigo89 May 17, 2022
ee378ce
Ajuste de header e footer nas paginas
matheus92as May 17, 2022
2a82c56
Merge branch 'master' into matheus-souza-pag-restaurante
matheus92as May 17, 2022
c0f161b
Fiz a função de esconder e mostrat o password
SantosRodrigo89 May 17, 2022
27065e9
Merge branch 'master' of https://github.com/future4code/Shaw-labe-foo…
SantosRodrigo89 May 17, 2022
f42037a
Merge pull request #26 from future4code/rodrigo
SantosRodrigo89 May 17, 2022
6465a03
Merge branch 'master' into matheus-souza-pag-restaurante
matheus92as May 18, 2022
251cf06
Merge pull request #25 from future4code/matheus-souza-pag-restaurante
SantosRodrigo89 May 18, 2022
4057220
Início do Slider
servuloccsilva May 18, 2022
3190c81
Merge pull request #27 from future4code/slider-servulo
servuloccsilva May 18, 2022
c6a2fc4
Filtro funcionando
servuloccsilva May 18, 2022
c1073ed
Merge pull request #28 from future4code/filter-servulo
servuloccsilva May 18, 2022
0aa0a12
ajustei os cards endereço e nome com um padding e coloquei o header n…
Pabloweb2022 May 18, 2022
7e2f4c6
Merge pull request #29 from future4code/pablo-ajustesProfile
SantosRodrigo89 May 18, 2022
44e8f3c
Arrumei a estilização do Botão estilização do SignUp
SantosRodrigo89 May 18, 2022
3fa9202
Criei o thema do MUI e já setei as cores do projeto como primária e s…
SantosRodrigo89 May 18, 2022
12b079b
adicionei o endereço a pagina de carrinho, ajustei o estilo do card q…
Pabloweb2022 May 18, 2022
c7e6528
Merge pull request #30 from future4code/pablo-edereçoCarrinho
Pabloweb2022 May 18, 2022
a850bc4
Centralização e margens da home
servuloccsilva May 18, 2022
a66b49d
Merge pull request #31 from future4code/home-servulo
servuloccsilva May 18, 2022
52c9b44
Filtros de nome e categoria funcionando
servuloccsilva May 18, 2022
4255200
Merge pull request #32 from future4code/home-servulo
servuloccsilva May 18, 2022
983fb29
Renderização de pedidos no carrinho
matheus92as May 18, 2022
182f094
Merge branch 'master' into matheus-souza-funções-carrinho
matheus92as May 18, 2022
a4b1e57
Merge pull request #33 from future4code/matheus-souza-funções-carrinho
Pabloweb2022 May 19, 2022
721c4bd
botao do cartpage
willmarques09 May 19, 2022
a5ad3cd
Merge pull request #34 from future4code/will-marquess
Pabloweb2022 May 19, 2022
285ca35
Alterações sem expressãoFunction Key
SantosRodrigo89 May 19, 2022
97dce08
debuguei o endereço
Pabloweb2022 May 19, 2022
919f266
Corrigindo conflitos
SantosRodrigo89 May 19, 2022
6b1b0cf
Merge branch 'master' into rodrigo
SantosRodrigo89 May 19, 2022
6cbffaf
Merge pull request #35 from future4code/rodrigo
SantosRodrigo89 May 19, 2022
3392cd5
Merge pull request #36 from future4code/pablo-endereço
Pabloweb2022 May 19, 2022
d6a6aa1
Tentativa de resolver o conflito
SantosRodrigo89 May 19, 2022
33cacfb
Função de finalizar pedido
matheus92as May 19, 2022
a32dd31
Sem mudanças
SantosRodrigo89 May 19, 2022
1729127
Merge branch 'master' of https://github.com/future4code/Shaw-labe-foo…
SantosRodrigo89 May 19, 2022
89bdd9a
reederização e estiliazação card order history
Pabloweb2022 May 19, 2022
eb23859
Fiz a confirmação de password e a mensagem de erro ao ter mensagem er…
SantosRodrigo89 May 19, 2022
dfebfe3
Merge pull request #37 from future4code/rodrigo
SantosRodrigo89 May 19, 2022
78c402b
Merge pull request #38 from future4code/pablo-CardorderHistory
Pabloweb2022 May 19, 2022
20e7ee3
Adição de opção remover em card de produtos
matheus92as May 20, 2022
b4390a8
Merge pull request #39 from future4code/revisao-page-restaurante
willmarques09 May 20, 2022
164bdd1
Update README.md
servuloccsilva May 22, 2022
2cac63e
Update README.md
servuloccsilva May 22, 2022
b1e36b8
coloquei a seta no header do modificar perfil!
Pabloweb2022 Jun 9, 2022
a022258
Merge pull request #41 from future4code/seta
Pabloweb2022 Jun 9, 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
75 changes: 38 additions & 37 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,68 +1,69 @@
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
Layout: rappi4B

## Available Scripts
Projeto final do Frontend do curso de Desenvolvimento Web Full Stack da Labenu intitulado de *LabeFood*.

In the project directory, you can run:
LabeFood

### `npm start`
Descrição do Projeto:
- Site/app de delivery de comida inspirado no Rappi

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

The page will reload if you make edits.<br />
You will also see any lint errors in the console.
Tecnologias utilizadas:
- JavaScrit - React - HTML - CSS

### `npm test`
Pessoas Contribuidoras:
- Rodrigo Vieira
- Sérvulo Silva
- Pablo Gomes
- Matheus Souza
- Willhan Marques

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.
Link Surge:
http://labefood-rappi.surge.sh

### `npm run build`
Imagens:

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

The build is minified and the filenames include the hashes.<br />
Your app is ready to be deployed!
![image](https://user-images.githubusercontent.com/99182794/169717831-102b4f14-0172-4c4c-98b9-e1f1c28f5bb4.png)

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!**
Cadastro

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.
![image](https://user-images.githubusercontent.com/99182794/169717932-26193de3-ca35-4f1c-ab8d-970faccad209.png)

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
Home

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
![image](https://user-images.githubusercontent.com/99182794/169718097-532ce6a7-94af-45b5-b688-b3b43b77e8d1.png)

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
Página do Restaurante

### Analyzing the Bundle Size
![image](https://user-images.githubusercontent.com/99182794/169718130-615be444-63a8-498b-aaae-d068958442dd.png)

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
Adicionando produtos ao carrinho

### Advanced Configuration
![image](https://user-images.githubusercontent.com/99182794/169718152-ac881964-4c04-46a4-8398-667e310b02b7.png)

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
Carrinho


![image](https://user-images.githubusercontent.com/99182794/169718220-7e859d86-dba3-4254-8d23-c3929a0b8823.png)



Perfil

![image](https://user-images.githubusercontent.com/99182794/169718250-fa78486a-c773-4d3e-a078-069a5f53648e.png)

### `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
Loading