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

Open
wants to merge 92 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
92 commits
Select commit Hold shift + click to select a range
d9d4ee3
componentes criados
felipepolato Dec 7, 2020
96670ac
Merge pull request #1 from future4code/componentes
laurasanches Dec 7, 2020
94af5c9
rotas prontas
laurasanches Dec 7, 2020
10ba890
Merge pull request #2 from future4code/rotas
laurasanches Dec 7, 2020
1de5c2d
searchPage
felipepolato Dec 7, 2020
a5eea9b
Merge branch 'master' into futureEats
felipepolato Dec 7, 2020
cd5d45e
Merge pull request #3 from future4code/futureEats
felipepolato Dec 7, 2020
a8838cf
router com todas as paginas
nohahjeong Dec 7, 2020
b8e80f9
Merge pull request #4 from future4code/router
felipepolato Dec 7, 2020
33ae2bc
rotas
felipepolato Dec 7, 2020
8f414af
Merge pull request #6 from future4code/rotasFeitas
nohahjeong Dec 7, 2020
84fe8a2
router com r minisculo
felipepolato Dec 7, 2020
7f4be21
Merge pull request #7 from future4code/rotasProntas
felipepolato Dec 7, 2020
e260e08
Login - SignUp - Adress Page
murilomendonca89 Dec 7, 2020
ade6801
Merge pull request #8 from future4code/labefood-login
murilomendonca89 Dec 7, 2020
31ec6db
pagina de carrinho estatica
Augustoluna Dec 7, 2020
050d3fa
Merge pull request #9 from future4code/pagina-de-carrinho
Augustoluna Dec 7, 2020
8e53e08
iniciada a pagina estatica do carrinho
Augustoluna Dec 7, 2020
9bf7886
Merge pull request #10 from future4code/carrinho-estatica
murilomendonca89 Dec 7, 2020
d37be9e
colors.js, theme.js, cores primárias, login, cadastro, endereco alinh…
murilomendonca89 Dec 7, 2020
d850246
Merge pull request #11 from future4code/labefood-colors
murilomendonca89 Dec 7, 2020
550a335
feedPage e RestaurantCard meio feitos
nohahjeong Dec 8, 2020
ad4f2db
Merge pull request #12 from future4code/feedPage
laurasanches Dec 8, 2020
699ce1c
começo de estilização das pags editar perfil e editar endereço
laurasanches Dec 8, 2020
cf1473f
Merge pull request #13 from future4code/perfil
felipepolato Dec 8, 2020
1281d3b
login ok - signup ok - cadastro de endereco falta bater na api
murilomendonca89 Dec 8, 2020
bcc086b
Merge pull request #14 from future4code/labefood-signup
murilomendonca89 Dec 8, 2020
aa8d7b8
erros corrigidos
murilomendonca89 Dec 8, 2020
fbd3aaa
Merge pull request #15 from future4code/labefood-adress
murilomendonca89 Dec 8, 2020
27134e5
feed page
felipepolato Dec 8, 2020
4e5a2fb
Merge branch 'master' into searchbar
felipepolato Dec 8, 2020
36685e8
Merge pull request #16 from future4code/searchbar
felipepolato Dec 8, 2020
7358e2e
feedPage e categorias de restaurantes
felipepolato Dec 8, 2020
f8d9b95
Merge pull request #18 from future4code/feedpage-Felipe
felipepolato Dec 8, 2020
45e9a66
cadastro de endereço OK
murilomendonca89 Dec 8, 2020
d755a80
Merge pull request #19 from future4code/adress-murilo
murilomendonca89 Dec 8, 2020
2369c66
signUp com u maiusculo
felipepolato Dec 8, 2020
29ef96d
Merge pull request #20 from future4code/router-com-u-maiusculo
felipepolato Dec 8, 2020
f21ef0f
login OK
murilomendonca89 Dec 8, 2020
624c9f1
Merge pull request #22 from future4code/murilo-login
murilomendonca89 Dec 8, 2020
dca474c
signUp com u maiusculo
felipepolato Dec 8, 2020
1d26250
Subindo o codigo novamente apos erro
Augustoluna Dec 8, 2020
a8536eb
Merge pull request #23 from future4code/carrinho-agora-vai
Augustoluna Dec 8, 2020
c9ff157
search com token estatico
felipepolato Dec 8, 2020
cef05f3
Merge pull request #24 from future4code/seach-2
felipepolato Dec 8, 2020
267d598
começo da estilização perfil
laurasanches Dec 8, 2020
c79643f
Tentando solucionar a parte lógica do projeto
Augustoluna Dec 8, 2020
7d1bef3
restaurnatpage falta finalizar dishcard
nohahjeong Dec 8, 2020
f03ceb3
Merge pull request #25 from future4code/perfil
felipepolato Dec 8, 2020
273b13e
Merge pull request #26 from future4code/comecar-restaurantpage
felipepolato Dec 8, 2020
965b297
algumas funcionalidades dos perfis
laurasanches Dec 9, 2020
bff8b09
Merge pull request #27 from future4code/perfil
nohahjeong Dec 9, 2020
5614cf8
Merge pull request #28 from future4code/tentativa1-de-logica
Augustoluna Dec 9, 2020
3b5ed12
search com token chumbado
felipepolato Dec 9, 2020
ddd44ac
Merge pull request #29 from future4code/felipe
felipepolato Dec 9, 2020
346a91d
header e footer montados, faltando algumas adequacoes
Augustoluna Dec 9, 2020
0d32bef
Merge pull request #30 from future4code/component-header
Augustoluna Dec 9, 2020
80beee9
arrumando feedpage e fazendo restaurantpage e dishcard
nohahjeong Dec 9, 2020
ebfe94c
Merge pull request #31 from future4code/arrumando-restaurantpage
nohahjeong Dec 9, 2020
a280965
search com token em outro navegador
felipepolato Dec 9, 2020
5951e2c
Merge pull request #32 from future4code/felipe2
felipepolato Dec 9, 2020
e748cd2
search pronto com token e filter e const token no perfil
felipepolato Dec 9, 2020
63b08e5
Merge pull request #33 from future4code/felipe3
felipepolato Dec 9, 2020
fc228e2
funcionalidades
laurasanches Dec 9, 2020
afe8f08
Merge pull request #34 from future4code/laura
Augustoluna Dec 9, 2020
3abd36a
erros do console OK
murilomendonca89 Dec 9, 2020
0749438
Merge pull request #35 from future4code/labeddit-home
murilomendonca89 Dec 9, 2020
2295acc
header alterado
Augustoluna Dec 9, 2020
43c5e5b
Merge branch 'master' into header-footer
Augustoluna Dec 9, 2020
a4b57c1
Merge pull request #36 from future4code/header-footer
Augustoluna Dec 9, 2020
adea7cc
adicionei header e footer nas paginas e acertei alguns tokens que est…
Augustoluna Dec 9, 2020
50a3842
Merge pull request #37 from future4code/adicionando-headers
Augustoluna Dec 9, 2020
535904b
header footer route cart varias paradas
nohahjeong Dec 10, 2020
4c0aebf
Merge pull request #38 from future4code/noh-quinta-manha
murilomendonca89 Dec 10, 2020
4753145
loading page
murilomendonca89 Dec 10, 2020
0b0c08d
Merge pull request #39 from future4code/muri-lab
murilomendonca89 Dec 10, 2020
9920bf7
active order estatico
murilomendonca89 Dec 10, 2020
66c409c
Merge pull request #40 from future4code/active-order
murilomendonca89 Dec 10, 2020
7966d34
tentando mandar dados para o carrinho
nohahjeong Dec 10, 2020
0f852b0
Merge pull request #41 from future4code/noh-quinta-manha
felipepolato Dec 10, 2020
b655cba
icones de edição funcionando para as páginas adequadas.
laurasanches Dec 11, 2020
ca0a4be
Merge pull request #42 from future4code/lauraa
murilomendonca89 Dec 11, 2020
0738b73
funcao de editar perfil OK
murilomendonca89 Dec 11, 2020
072a1f0
Merge pull request #43 from future4code/login-refacao
murilomendonca89 Dec 11, 2020
42001e2
pagina de edicao de endereco OK
murilomendonca89 Dec 11, 2020
e37f397
Merge pull request #44 from future4code/edit-address
murilomendonca89 Dec 11, 2020
5ff09c6
carrinho meio feito
nohahjeong Dec 11, 2020
4a5ad05
Merge pull request #45 from future4code/fazendo-global
felipepolato Dec 11, 2020
670d00d
finalzim
nohahjeong Dec 11, 2020
9f0d66f
Merge pull request #46 from future4code/final-da-tarde
nohahjeong Dec 11, 2020
6ee0921
alterei o readme
Augustoluna Dec 11, 2020
6e62094
Merge pull request #47 from future4code/readme-alterado
Augustoluna 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
75 changes: 12 additions & 63 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,68 +1,17 @@
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
Nome dos integrantes:

## Available Scripts
Noh Ah Jeong
Felipe Polato
Murilo Mendonça
Laura Sanches
Carlos Augusto Luna

In the project directory, you can run:
O que não funciona:

### `npm start`
- Histórico de compras
- Quantidade de produtos do carrinho
- Active order

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

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
hard-to-find-animal.surge.sh
Loading