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. #41

Open
wants to merge 111 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
111 commits
Select commit Hold shift + click to select a range
21cb0af
criando-parte-estatica
RPCaetano Dec 7, 2020
cbfc93d
Merge pull request #1 from future4code/dia1
luverdinelli Dec 7, 2020
05cc8c2
HomePage
RPCaetano Dec 7, 2020
7754734
Merge pull request #2 from future4code/dia1
RPCaetano Dec 7, 2020
3e02f77
Parte da Criação da pagina de Restaurante
luverdinelli Dec 7, 2020
b2c9167
Merge pull request #3 from future4code/Dia1CriarPages
rodrfx Dec 7, 2020
db221cf
footer-restaurant
RPCaetano Dec 7, 2020
b82ba89
Merge pull request #4 from future4code/dia1
rodrfx Dec 7, 2020
4f5dec4
componente header
rodrfx Dec 7, 2020
3522600
Merge pull request #5 from future4code/header
Vanessasz Dec 7, 2020
3e5fd07
Mexi na parte das rotas, criei conforme o que tá sendo feito, e na pa…
Vanessasz Dec 7, 2020
6b9615e
Merge branch 'master' into dia1-vanessa
Vanessasz Dec 7, 2020
aa938c9
Merge pull request #6 from future4code/dia1-vanessa
Vanessasz Dec 7, 2020
9d28cf7
Tive que mexer aqui porque tava dando erro.
Vanessasz Dec 7, 2020
0397df3
Merge pull request #7 from future4code/dia2-vanessa
Vanessasz Dec 7, 2020
a392fc9
Telas de Login e cadastro em fase de conclusão
Rafaela-Quinzel Dec 7, 2020
1929b45
Header corrigido- esta em um componente que pode ser chamado para as …
rodrfx Dec 8, 2020
bf0e84c
arrumei conflito
rodrfx Dec 8, 2020
ff74279
Merge pull request #9 from future4code/header1
rodrfx Dec 8, 2020
20b01fb
merge dia1-rafaela
RPCaetano Dec 8, 2020
ea2b231
Merge pull request #8 from future4code/dia1-rafaela
RPCaetano Dec 8, 2020
1f00578
Correção no página signup.js e router.js
Rafaela-Quinzel Dec 8, 2020
f4a730b
Merge pull request #10 from future4code/dia2-rafaela
RPCaetano Dec 8, 2020
740de1f
Correção na página de erro
Rafaela-Quinzel Dec 8, 2020
773c94d
Merge pull request #11 from future4code/dia2-rafaela
RPCaetano Dec 8, 2020
8e9c95b
Tentando fazer a requisição get
Vanessasz Dec 8, 2020
c305b54
Criar RestaurantPage
luverdinelli Dec 8, 2020
a640c72
Merge branch 'master' into dia2-vanessa
Vanessasz Dec 8, 2020
da27d86
Merge pull request #12 from future4code/dia2-vanessa
Vanessasz Dec 8, 2020
5db0705
Inclusao da foto do Hamburguer
luverdinelli Dec 8, 2020
dba4c3e
Mais algumas coisas de hamburguers
luverdinelli Dec 8, 2020
6a94142
Fiz alguns ajustes nas páginas de login, cadastro e endereço
Rafaela-Quinzel Dec 8, 2020
0525c47
Mais alguns itens do lanche
luverdinelli Dec 8, 2020
a1a8e19
Merge pull request #14 from future4code/dia2-rafaela
RPCaetano Dec 8, 2020
6d92ed2
Merge branch 'master' into Dia2CriarRestaurantPage
RPCaetano Dec 8, 2020
5b5e807
Merge pull request #13 from future4code/Dia2CriarRestaurantPage
RPCaetano Dec 8, 2020
2e108e2
homepage + styles
rodrfx Dec 8, 2020
ffcd3f6
Merge branch 'master' into homepage
rodrfx Dec 8, 2020
dc466ca
Merge pull request #15 from future4code/homepage
RPCaetano Dec 8, 2020
eb44c64
corrigindo-conflitos
RPCaetano Dec 8, 2020
d4dc30a
Merge pull request #16 from future4code/dia2-renata
rodrfx Dec 8, 2020
0477bac
Criação das páginas de perfil e editar dados perfil
Rafaela-Quinzel Dec 8, 2020
8ac6c5f
Resolvendo conflito
Rafaela-Quinzel Dec 8, 2020
afec60e
corrigindo-estilizacao-login-signup
RPCaetano Dec 8, 2020
8e618fa
Merge pull request #17 from future4code/dia2-rafaela
RPCaetano Dec 8, 2020
78b49a9
Merge pull request #18 from future4code/dia2-renata
Rafaela-Quinzel Dec 8, 2020
29e59bb
inciando as informacoes do carrinho de compras
rodrfx Dec 8, 2020
3c4a364
Merge pull request #19 from future4code/shoppingcart
Rafaela-Quinzel Dec 8, 2020
f9f0c32
Fazendo os estilos da FeedPage
Vanessasz Dec 8, 2020
06a87ad
Merge branch 'master' into dia2-vanessa
Vanessasz Dec 8, 2020
3209d69
Merge pull request #20 from future4code/dia2-vanessa
Vanessasz Dec 8, 2020
aff6b1b
Demais informações da Restaurant Page
luverdinelli Dec 8, 2020
a2e7799
Merge branch 'master' into Dia2Restaurant
RPCaetano Dec 8, 2020
1b88f92
Merge pull request #21 from future4code/Dia2Restaurant
luverdinelli Dec 8, 2020
664f3da
Fazendo a parte de feed os estilos
Vanessasz Dec 8, 2020
eadf5b5
corrigindo-rota
RPCaetano Dec 8, 2020
3eb044c
Merge pull request #22 from future4code/dia2-renatacaetano
luverdinelli Dec 8, 2020
c7fa741
Página AddressEditPage criada
Rafaela-Quinzel Dec 8, 2020
3be8db1
Página SignUpEditPage criada
Rafaela-Quinzel Dec 8, 2020
cdf4177
Página ProfilePage criada
Rafaela-Quinzel Dec 8, 2020
aa74552
Termino da pagina de Restaurantes
luverdinelli Dec 9, 2020
a157c5d
Criei os arquivos que faltava da home
Vanessasz Dec 9, 2020
395f83a
Merge branch 'master' into dia2-vanessa
Vanessasz Dec 9, 2020
66ae799
Fiz mais alguns ajustes nas páginas
Rafaela-Quinzel Dec 9, 2020
09d9293
Pagina de Confirmacao
luverdinelli Dec 9, 2020
967273d
Merge pull request #25 from future4code/Dia2Estilizacao
RPCaetano Dec 9, 2020
9ed33e0
Merge pull request #24 from future4code/dia2-3-rafaela
RPCaetano Dec 9, 2020
8500707
Merge branch 'master' into dia2-vanessa
Vanessasz Dec 9, 2020
2a4cf34
Merge pull request #23 from future4code/dia2-vanessa
Vanessasz Dec 9, 2020
4145ea3
Ajustes antes do prox pull
luverdinelli Dec 9, 2020
089f46e
Merge pull request #26 from future4code/Dia3RevisarPages
RPCaetano Dec 9, 2020
199674f
Fiz ajuste no coordinator. Páginas de login, cadastro e cadastrar end…
Rafaela-Quinzel Dec 9, 2020
0d239a4
Merge pull request #27 from future4code/dia3-rafaela
Vanessasz Dec 9, 2020
b965c85
botao-voltar-outros
RPCaetano Dec 9, 2020
22aa449
Merge pull request #28 from future4code/dia3-1.0
RPCaetano Dec 9, 2020
bb0a385
pagina estatica carrinho
rodrfx Dec 9, 2020
60c774f
Merge pull request #29 from future4code/paginacarrinho
RPCaetano Dec 9, 2020
f850a65
Função de editar endereço do usuário foi criada, testada e está funci…
Rafaela-Quinzel Dec 9, 2020
c8808d4
Funções de pegar dados e pedidos do usuário logado na página de perfi…
Rafaela-Quinzel Dec 9, 2020
878bcae
Tentei fazer ajustes para resolver o problema do token, mas ainda não…
Rafaela-Quinzel Dec 9, 2020
29843bb
Mais uma tentativa de fazer o login funcionar, porém não deu certo
Rafaela-Quinzel Dec 10, 2020
0f65bbe
Merge pull request #30 from future4code/dia3-1-rafaela
rodrfx Dec 10, 2020
5619850
Função de login consertada e funcionando
Rafaela-Quinzel Dec 10, 2020
438200b
Merge pull request #31 from future4code/dia4-rafaela
luverdinelli Dec 10, 2020
5865598
Fiz alguns ajustes nas páginas de login, cadastro e endereço
Rafaela-Quinzel Dec 10, 2020
2e189a8
Ajustes e testes na página de editar endereço
Rafaela-Quinzel Dec 10, 2020
ea98982
Ajustes na página de perfil do usuário
Rafaela-Quinzel Dec 10, 2020
f87e447
Ajustes na função de editar dados do usuário
Rafaela-Quinzel Dec 10, 2020
50ece3c
Acrescentei as funções de troca de página no footer
Rafaela-Quinzel Dec 10, 2020
9f50a36
Fiz mais alguns ajustes
Rafaela-Quinzel Dec 10, 2020
027894a
Merge pull request #32 from future4code/dia4-1-rafaela
luverdinelli Dec 10, 2020
87e4e48
Dados da api
Vanessasz Dec 10, 2020
dacfc17
tentando integrar os detalhes de restaurantes
luverdinelli Dec 11, 2020
144725e
Merge branch 'master' into dia4-vanessa
Vanessasz Dec 11, 2020
325a467
Merge pull request #34 from future4code/dia4-vanessa
Vanessasz Dec 11, 2020
c6c204e
Ajustes no coordinator e Router
Rafaela-Quinzel Dec 11, 2020
ef69133
Merge pull request #35 from future4code/dia5-rafaela
luverdinelli Dec 11, 2020
1d51774
Merge pull request #33 from future4code/Dia4Boratentardenovo
Rafaela-Quinzel Dec 11, 2020
47e60af
Tentativas de integrar a api
luverdinelli Dec 11, 2020
7ebbdd5
Ajustes API OK
luverdinelli Dec 11, 2020
c64e64e
Merge pull request #36 from future4code/Dia5Integracao
Rafaela-Quinzel Dec 11, 2020
a88e5a5
Funções de perfil e histórico de pedidos funcionando novamente
Rafaela-Quinzel Dec 11, 2020
181a72d
Merge pull request #37 from future4code/dia5-1-rafaela
luverdinelli Dec 11, 2020
35a9671
styledFeed&Card
RPCaetano Dec 11, 2020
151b71b
Merge pull request #38 from future4code/dia5-1.0renata
luverdinelli Dec 11, 2020
3d33176
Tentando fazer a parte de busca
Vanessasz Dec 11, 2020
09a7a1b
Merge branch 'master' into dia5-vanessa
Vanessasz Dec 11, 2020
7e4569c
finalizandostyled
RPCaetano Dec 11, 2020
a7c734f
Merge pull request #39 from future4code/dia5-vanessa
RPCaetano Dec 11, 2020
4c06e24
Merge pull request #40 from future4code/dia5-1.1renata
RPCaetano Dec 11, 2020
d3e5e3c
Update README.md
RPCaetano Dec 11, 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
104 changes: 36 additions & 68 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,68 +1,36 @@
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
-----Projeto Rappi4

Nome dos integrantes:
*Luciana Verdinelli
*Vanessa Saint Helena
*Rafaela Quinzel
*Renata Caetano
*Rodrigo Ferreira Xavier
**********************************************
----Link do Surge:

wanting-eye.surge.sh
*********************************
----O que funciona:
rotas;
tela inicial;
sign up;
login;
logout quando o usuário altera o cadastro;
cadastro de endereço;
alteração de endereço e cadastro;
loading na página de perfil;
feed;
função get restaurants;
ir pro detalhes;
pegar os detalhes do restaurante;
perfil;
função get profile;
função get orders history;
******************************************
----O que não funciona:
Botão Add;
Botão Remover;
Confirmar Pedido;
Buscar resturantes;
Splash Screen;
1 change: 1 addition & 0 deletions debug.log
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[1211/165403.660:ERROR:directory_reader_win.cc(43)] FindFirstFile: O sistema n�o pode encontrar o caminho especificado. (0x3)
Loading