Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR de correção. Não precisa mergeear. #58

Open
wants to merge 133 commits into
base: correcao-projeto
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
2c392e9
add libs
nizolnier Dec 7, 2020
a7061f6
Merge pull request #1 from future4code/config
nizolnier Dec 7, 2020
851a9f7
add pastas e alguns components
nizolnier Dec 7, 2020
3d3d7dc
Merge pull request #2 from future4code/pastas
nizolnier Dec 7, 2020
c9354b4
criando o formulário de cadastro
nyhvignoli Dec 7, 2020
bb27a38
add login page
nizolnier Dec 7, 2020
c03466b
deletando useForm2
nizolnier Dec 7, 2020
e0600f0
Adicionando AdressPage e CartPage
DiaMont30 Dec 7, 2020
82b1f78
O nome da branch é loading, mas eu fiz a página de restaurante.
Fefealfonsi Dec 8, 2020
4eacf00
Merge pull request #6 from future4code/loading
Fefealfonsi Dec 8, 2020
56549a5
Merge pull request #5 from future4code/static-address-page
azzinogueira-marina Dec 8, 2020
b39efa8
Merge pull request #4 from future4code/login
azzinogueira-marina Dec 8, 2020
fb981fd
Merge branch 'master' into sign-up
azzinogueira-marina Dec 8, 2020
c87c78c
Merge pull request #3 from future4code/sign-up
azzinogueira-marina Dec 8, 2020
3308f2c
EditProfilePage criada com forms, falta fazer a appbar e criar funçõe…
Dec 8, 2020
6a447da
função para cadastro ok
nyhvignoli Dec 8, 2020
fa5d9e5
arquivo router atualizado com loadingpage
Dec 8, 2020
b4974c9
Merge pull request #7 from future4code/signup-function
azzinogueira-marina Dec 8, 2020
72aafaf
estilização do loading em andamento
Fefealfonsi Dec 8, 2020
bf0144c
Merge pull request #8 from future4code/editprofilepage
nyhvignoli Dec 8, 2020
c7037d8
Merge pull request #9 from future4code/estilizando-o-loading
Fefealfonsi Dec 8, 2020
0bfa809
funcao login :)
nizolnier Dec 8, 2020
b20204d
Merge pull request #10 from future4code/funcao-login
DiaMont30 Dec 8, 2020
5aac976
estilização básica signup form
nyhvignoli Dec 8, 2020
283a8af
função para ver compatibilidade da senha
nyhvignoli Dec 8, 2020
c433ebe
criando feedpage, falta testar API e estilizar
Dec 8, 2020
9fc0cd2
Merge pull request #11 from future4code/feedpage
azzinogueira-marina Dec 8, 2020
8b227b4
adicionando função de adicionar endereço
DiaMont30 Dec 8, 2020
1f1cc9c
Merge pull request #12 from future4code/funcoes-adress
DiaMont30 Dec 8, 2020
f652056
problema do git resolvido
nizolnier Dec 8, 2020
1550415
criei máscara para CPF
nyhvignoli Dec 8, 2020
0e138db
Mensagem de erro para e-mail ou CPF já cadastrados
nyhvignoli Dec 8, 2020
7f4d532
verificar se as senhas correspondem no onChange e alterar estado do i…
nyhvignoli Dec 8, 2020
8097a12
error page e goToSignUp na login page
nizolnier Dec 8, 2020
574c913
logo consertada viva o illustrator
nizolnier Dec 8, 2020
4202878
Merge pull request #13 from future4code/teste-funcao
DiaMont30 Dec 8, 2020
ca4dfdc
Merge pull request #14 from future4code/signup-form-validate
DiaMont30 Dec 8, 2020
c47f7df
Merge pull request #15 from future4code/error-page
DiaMont30 Dec 8, 2020
1a6db3d
estilizando loading
Fefealfonsi Dec 8, 2020
1f556ac
Merge pull request #16 from future4code/estilizando-o-loading
Fefealfonsi Dec 8, 2020
09e03ef
parte estática da ProfilePage
nyhvignoli Dec 8, 2020
aa7776d
funções para enviar o usuário para EditProfile e AdressPage
nyhvignoli Dec 8, 2020
80c2e43
requisição de api no feed feita
Dec 8, 2020
c02be03
Merge pull request #18 from future4code/feedpage2
DiaMont30 Dec 8, 2020
d5ecf72
Merge pull request #17 from future4code/profile
DiaMont30 Dec 8, 2020
a9d77ae
Adicionando função get AllAddress
Fefealfonsi Dec 8, 2020
3e53d3f
Merge pull request #19 from future4code/função-getDetails
Fefealfonsi Dec 8, 2020
f99d7ba
passando props Feed para RestaurantCard
Dec 8, 2020
b448d64
Merge pull request #20 from future4code/feedpage3
azzinogueira-marina Dec 8, 2020
a587b55
começo de implementação de funções no RestaurantCard e na Restaurant…
Fefealfonsi Dec 8, 2020
32ad1e0
Merge pull request #21 from future4code/funcao-getDetail
Fefealfonsi Dec 8, 2020
3bb3ae0
renderizando infos da API no feed, estilizando RestaurantCard e navbar
Dec 8, 2020
f213b5b
Merge pull request #22 from future4code/feedpage4
azzinogueira-marina Dec 8, 2020
696b6fb
só pra mudar de branch
Fefealfonsi Dec 8, 2020
ec57c4c
integração com a API e estilização
Fefealfonsi Dec 9, 2020
d9bb5e0
Merge pull request #23 from future4code/funcao-getDetails-verdade-agora
Fefealfonsi Dec 9, 2020
0b38a45
colocando o debug.log no gitignore
nyhvignoli Dec 9, 2020
bc04180
funcoes de add e remove naquela base
nizolnier Dec 9, 2020
501c5f3
pegando dados do usuario e exibindo na ProfilePage
nyhvignoli Dec 9, 2020
9a8cd86
Merge pull request #24 from future4code/user-profile
azzinogueira-marina Dec 9, 2020
3d6054d
funcao add/remove cart na pagina details
nizolnier Dec 9, 2020
c56daa6
Merge pull request #25 from future4code/global-state
nizolnier Dec 9, 2020
7b56e7e
navbar feita, falta arrumar o posicionamento nas páginas em que só há…
Dec 9, 2020
e2f4b8b
Merge pull request #26 from future4code/navbar
nizolnier Dec 9, 2020
ac5d68b
exibir histórico de pedidos e função para formatar data
nyhvignoli Dec 9, 2020
82483b5
search funcionando porem nao do jeito que eh pra ser
nizolnier Dec 9, 2020
f148220
Merge pull request #27 from future4code/orders-history
azzinogueira-marina Dec 9, 2020
512199b
Merge pull request #28 from future4code/search
azzinogueira-marina Dec 9, 2020
8c9cfb2
editprofile estilizado e conectado com API
Dec 9, 2020
8655e95
Adicionando função de categorias e nav-bottom incompleto
DiaMont30 Dec 9, 2020
ad8bd2d
Merge branch 'master' into nav-bottom
nizolnier Dec 10, 2020
a3519d2
Merge pull request #30 from future4code/editprofile-cont
nizolnier Dec 10, 2020
ca2ea3c
Merge pull request #31 from future4code/nav-bottom
nizolnier Dec 10, 2020
01cca26
tentando deixar o console limpinho sem erros
nizolnier Dec 10, 2020
fb7ae1a
Merge pull request #32 from future4code/peacemaker
nizolnier Dec 10, 2020
24b4478
Nav-bottom finalizado
DiaMont30 Dec 10, 2020
a53f597
Merge pull request #33 from future4code/nav-bottom
azzinogueira-marina Dec 10, 2020
5c2e56d
carrinho com cards, endereço, info restaurante
nizolnier Dec 10, 2020
a74dc6d
Merge pull request #34 from future4code/cart
nyhvignoli Dec 10, 2020
ddbb745
carrossel em processo
Fefealfonsi Dec 10, 2020
d4c7f8c
Merge branch 'master' into carrosel-feedPage
Fefealfonsi Dec 10, 2020
31da22a
Merge pull request #35 from future4code/carrosel-feedPage
Fefealfonsi Dec 10, 2020
45355d3
função subtotal atualizando quando adiciona ou remove itens
nyhvignoli Dec 10, 2020
e4bca9f
removendo console.log
nyhvignoli Dec 10, 2020
494c41d
Merge pull request #36 from future4code/subtotal
DiaMont30 Dec 10, 2020
bc1f080
loadingPage iniciando app e carrosel do feed funcionando
Fefealfonsi Dec 10, 2020
f3e30a9
Merge branch 'master' into carosel-and-loadingPage
nizolnier Dec 10, 2020
287c13a
Merge pull request #37 from future4code/carosel-and-loadingPage
nizolnier Dec 10, 2020
c782796
Adiconando função getAllAddrresss
DiaMont30 Dec 10, 2020
8e6fe52
Merge pull request #38 from future4code/filter-categories
DiaMont30 Dec 10, 2020
ce9cf92
corrigindo bugs
DiaMont30 Dec 10, 2020
5e58e3a
Merge pull request #39 from future4code/filter-categories
DiaMont30 Dec 10, 2020
75c8ff3
controlando o input do radio-button
nyhvignoli Dec 10, 2020
35eb7ea
função place order funcionando!
nyhvignoli Dec 10, 2020
14d8ded
Merge pull request #40 from future4code/place-order
DiaMont30 Dec 10, 2020
c0fa7a0
colocando nav-bottom na restaurantPage e corrigindo loading
DiaMont30 Dec 10, 2020
8aef830
Merge pull request #41 from future4code/correcoes
DiaMont30 Dec 10, 2020
1457b8c
search consertado :)
nizolnier Dec 10, 2020
c762a19
adicionando várias correções de estilização
DiaMont30 Dec 11, 2020
e08e575
Merge pull request #42 from future4code/search-certo
nyhvignoli Dec 11, 2020
288bbbf
Merge pull request #43 from future4code/correcoes
nyhvignoli Dec 11, 2020
eb7c94c
ajustando largura do NavBottom e paddings e margins na FeedPage e Res…
nyhvignoli Dec 11, 2020
4167a32
corrigindo estilo
DiaMont30 Dec 11, 2020
94fd8f4
editprofile com infos da API, botão e função logout feitas e testadas
Dec 11, 2020
9e64533
Merge pull request #44 from future4code/ajustes-estilizacao
azzinogueira-marina Dec 11, 2020
9cc0531
Merge pull request #45 from future4code/correcoes
Fefealfonsi Dec 11, 2020
9834679
Merge pull request #46 from future4code/editprofile-ajustes
Fefealfonsi Dec 11, 2020
17065a6
centralizando carrinho
DiaMont30 Dec 11, 2020
d2ee5f8
Merge pull request #47 from future4code/correcoes
Fefealfonsi Dec 11, 2020
dc62c41
criando o componente Snackbar
nyhvignoli Dec 11, 2020
df7d6db
Merge pull request #48 from future4code/snackbar
nizolnier Dec 11, 2020
cf2e581
snackbar com as infos
nizolnier Dec 11, 2020
18ba366
Merge pull request #49 from future4code/snackbar
Fefealfonsi Dec 11, 2020
477f7a7
estilização do feed e search ok
nyhvignoli Dec 11, 2020
88da67d
Merge pull request #50 from future4code/estilizacao-feed
Fefealfonsi Dec 11, 2020
c4be511
Update README.md
nizolnier Dec 11, 2020
95c2482
função para fechar dialog
nyhvignoli Dec 11, 2020
e688674
botão de contituar comprando funcionando, falta arrumar margem
Fefealfonsi Dec 11, 2020
60454eb
bug de requisições de login e signup resolvido
Dec 11, 2020
d107186
add correções de estilo
DiaMont30 Dec 11, 2020
62ebb23
Merge pull request #53 from future4code/botton-continuar-comprando
Fefealfonsi Dec 11, 2020
b2c7d39
Merge branch 'master' into snackbar-ajustes
nyhvignoli Dec 11, 2020
925163e
Merge pull request #52 from future4code/snackbar-ajustes
nyhvignoli Dec 11, 2020
c7c55e9
Merge branch 'master' into estilo-profile
nizolnier Dec 11, 2020
c059381
Merge pull request #54 from future4code/estilo-profile
nizolnier Dec 11, 2020
6463c48
Merge pull request #51 from future4code/botao-fechar-dialog
nizolnier Dec 11, 2020
8d1cca8
apenas para mudar de branch
Fefealfonsi Dec 11, 2020
d31c1ab
Merge branch 'master' into mudando-o-botão-de-lugar
Fefealfonsi Dec 11, 2020
dedfe8a
Merge pull request #55 from future4code/mudando-o-botão-de-lugar
Fefealfonsi Dec 11, 2020
a1e5c72
cart limpo dps de pedir e snackbar certinho
nizolnier Dec 11, 2020
133a16f
Merge pull request #56 from future4code/limpar-cart
nizolnier Dec 11, 2020
f1d445b
Update README.md
nizolnier Dec 11, 2020
b002f8b
Update README.md
nizolnier Dec 12, 2020
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
debug.log
120 changes: 53 additions & 67 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,68 +1,54 @@
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
# FutureEats


### Nome dos integrantes:
- Aline Vignoli
- Diana Monteiro
- Fernanda Alfonsi
- Marina Nogueira
- Nicole Zolnier

### Link do Surge:
https://future-eats4-dumont.surge.sh/

### O que funciona:
- rotas
- tela inicial preta
- sign up
- login / logout
- cadastro de endereço
- loadings
- feed
- função get restaurants
- filtro de categorias no carrossel
- ir pro detalhes
- snackbar se tiver pedido ativo (função get active order)
- search
- inicia vazio e vai aparecendo conforme o usuario busca
- barra funcionando e filtrando
- se nao tiver resultados, volta um textinho massa
- detalhes do restaurante
- filtro por categorias dos itens
- função adicionar (pelo dialog) / remover itens do carrinho
- carrinho
- pegar os itens que foram pra ele
- pegar os detalhes do restaurante de volta
- função get full address
- funcao de subtotal
- função place order que leva o usuario pro feed com a snackbar
- perfil
- função get profile
- função get orders history
- função editar perfil/ editar endereço (começa com as informações preenchidas <3)
- responsivo


### O que não funciona:
- tudo funciona :)

### Bibliotecas Usadas
- axios
- styled-components
- Material-UI
- react-router-dom

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