Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
3a47841
Refatorado aplicação, limpando arquivos dispensáveis. Criado pastas e…
Shidoshi93 Mar 1, 2021
ec7c444
Criado alguns arquivos nas pastas.
Shidoshi93 Mar 1, 2021
fa71b9b
Merge pull request #1 from future4code/futereEats-danielR-versao-1
Shidoshi93 Mar 1, 2021
4fd1128
card do carrinho finalizado
fsantos1224 Mar 1, 2021
f724476
.
fsantos1224 Mar 1, 2021
c97b423
Merge pull request #2 from future4code/fabio-cart-card
Shidoshi93 Mar 1, 2021
b489557
Filter component
josevictorsss Mar 1, 2021
d02a656
Tirando do app.js
josevictorsss Mar 1, 2021
f1fface
feito card dos restaurantes
Mar 1, 2021
40fe9a6
Merge pull request #3 from future4code/search-component
josevictorsss Mar 1, 2021
64bc99d
mudança
Mar 2, 2021
79ff2a4
Botoes criados, depois só alterar o nome conforme vai na pagina
Bruno-Vallim Mar 2, 2021
37d56c8
Criado componentes dos inputs.
Shidoshi93 Mar 2, 2021
25144e1
changes
Mar 2, 2021
84d0cfb
Merge pull request #4 from future4code/branch-danielpr
DanielRatti Mar 2, 2021
ca5101e
Alterado heigth dos container dos inputs.
Shidoshi93 Mar 2, 2021
ace49ca
Merge branch 'master' into component-input
Shidoshi93 Mar 2, 2021
aa8dbe8
Mudança feita no button, centralizado
Bruno-Vallim Mar 2, 2021
81bd4ac
Merge branch 'master' into bruno-branch1
Shidoshi93 Mar 2, 2021
a8ee248
Merge pull request #5 from future4code/bruno-branch1
Bruno-Vallim Mar 2, 2021
0402a2a
Merge pull request #6 from future4code/component-input
Shidoshi93 Mar 2, 2021
7540503
Pagina de Login pronta e estilizada, falta testar com API, criado um …
Bruno-Vallim Mar 2, 2021
ccd4d1d
Pagina de login pronta e estilizada, falta bater na API, criado um us…
Bruno-Vallim Mar 2, 2021
4ee5a62
Screen de restaurantes finalizada + alterações no cart card
fsantos1224 Mar 3, 2021
8834363
.
fsantos1224 Mar 3, 2021
a557879
Merge pull request #8 from future4code/fabio-restaurant
fsantos22 Mar 3, 2021
a08f679
Carrinho vazio
josevictorsss Mar 2, 2021
94d4e5e
Layout carrinho ok, faltando funcionalidades
josevictorsss Mar 3, 2021
2a9dbbf
novo card criado exclusivamente pra tela do restaurante
fsantos1224 Mar 3, 2021
9af2b3b
Layout carrinho ok, pasta services com algumas funções, GlobalState d…
josevictorsss Mar 3, 2021
9e2888f
LoadingPage
josevictorsss Mar 3, 2021
324122e
Merge pull request #9 from future4code/restaurant-card
fsantos22 Mar 3, 2021
b35c8d2
Implementado página de restaurantes e filtros da mesma. Também criei …
Shidoshi93 Mar 3, 2021
f1a7d26
Merge pull request #12 from future4code/pageFeed-versao-1
Shidoshi93 Mar 4, 2021
f8a03c8
Merge pull request #10 from future4code/cartpage
josevictorsss Mar 4, 2021
ba03333
Merge branch 'master' into loadingpage
josevictorsss Mar 4, 2021
5451dd1
header e footer
fsantos1224 Mar 4, 2021
03fb910
Merge branch 'master' into header-footer
fsantos22 Mar 4, 2021
d296e48
Merge pull request #13 from future4code/header-footer
fsantos22 Mar 4, 2021
a8e17a8
Parte de cadastrar, login e add address funcionando, falta por as rot…
Bruno-Vallim Mar 4, 2021
83d4749
Merge branch 'master' into bruno-branch2
josevictorsss Mar 4, 2021
f711502
pagina de profile completa
Mar 4, 2021
02bc6eb
changes
Mar 4, 2021
395520d
pagina profile
Mar 4, 2021
7f169a5
Merge pull request #7 from future4code/bruno-branch2
Bruno-Vallim Mar 4, 2021
488bf76
arrumado width
Mar 4, 2021
a2001e9
Implementado alerta de erro do input de confirmação do password.
Shidoshi93 Mar 5, 2021
d55f8d5
Merge pull request #11 from future4code/loadingpage
josevictorsss Mar 5, 2021
6da1720
Merge pull request #15 from future4code/branch-danielpr1
DanielRatti Mar 5, 2021
d6f4af0
Merge pull request #16 from future4code/input-passwordError-versao-1
Shidoshi93 Mar 5, 2021
d3d7051
Terminado rotas.
Shidoshi93 Mar 5, 2021
c27873d
Merge pull request #17 from future4code/router
fsantos22 Mar 5, 2021
a420999
ajustes de texto feito, adicionado o sistema de cpf ao usuario digita…
Bruno-Vallim Mar 5, 2021
5dab83f
Merge pull request #18 from future4code/bruno-branch3
Bruno-Vallim Mar 5, 2021
04bb271
Feito o pedido em andamento
josevictorsss Mar 5, 2021
b856e29
pagina profile e edit profile prontas
Mar 5, 2021
3155548
Merge pull request #19 from future4code/order-active
josevictorsss Mar 6, 2021
51119ed
Merge pull request #20 from future4code/branch-danielpr1
josevictorsss Mar 6, 2021
49e7850
Login Page
fsantos1224 Mar 7, 2021
abb4bec
Merge pull request #22 from future4code/login-page
fsantos22 Mar 7, 2021
eb932d8
Tentativa de enviar o pedido
josevictorsss Mar 7, 2021
177b811
Merge branch 'master' into jose-1
josevictorsss Mar 7, 2021
8b403eb
login, feed, details, cart, header, footer
fsantos1224 Mar 7, 2021
d5bddd6
Merge pull request #25 from future4code/fab-01
fsantos22 Mar 7, 2021
2bdba35
mudanças estilizaçao
Mar 7, 2021
03a2ded
Merge pull request #26 from future4code/branch-danielpr1
DanielRatti Mar 7, 2021
82c17c3
Implementado página de busca.
Shidoshi93 Mar 7, 2021
b57b5fc
Merge pull request #27 from future4code/screen-search-versao-1
Shidoshi93 Mar 7, 2021
c8c2bb8
bugs no login e carrinho corrigidos
fsantos1224 Mar 7, 2021
b7e0dd9
Merge branch 'master' into fab-03
fsantos22 Mar 7, 2021
025b2d5
Merge pull request #28 from future4code/fab-03
josevictorsss Mar 7, 2021
cba160c
Resolvido erro na requisição de order.
Shidoshi93 Mar 7, 2021
a26cff0
Merge pull request #29 from future4code/request-cart
Shidoshi93 Mar 7, 2021
9bcdbee
Error Page
fsantos1224 Mar 8, 2021
71d7ad7
Ajustes na estilização e no código
josevictorsss Mar 8, 2021
542ee72
Merge pull request #30 from future4code/fab-04
josevictorsss Mar 8, 2021
c7cd083
Update README.md
josevictorsss Mar 8, 2021
8e59cc4
Merge pull request #31 from future4code/jose-2
fsantos22 Mar 8, 2021
1fcb4b0
Update README.md
josevictorsss Mar 8, 2021
3d223bb
versão final
fsantos1224 Mar 8, 2021
b4bfa57
Merge pull request #34 from future4code/fab-07
Shidoshi93 Mar 8, 2021
400eb8a
Update README.md
Shidoshi93 Mar 8, 2021
75def9c
Fesolvido bug na página de login.
Shidoshi93 Mar 8, 2021
dc9706e
Merge pull request #35 from future4code/bug-registerPage
Shidoshi93 Mar 8, 2021
e4d8c83
Corrigdo bug na soma do subtotal.
Shidoshi93 Mar 8, 2021
d09142c
Merge pull request #36 from future4code/bug-subtotal-cart
Shidoshi93 Mar 8, 2021
d8ba805
Removendo código não utilizado.
Shidoshi93 Mar 8, 2021
825f9ad
Merge pull request #37 from future4code/refatorando
Shidoshi93 Mar 8, 2021
16ad1df
Ajeitado margin dos cards dos produtos.
Shidoshi93 Mar 8, 2021
334a8fa
Merge pull request #38 from future4code/styled-cartCard
Shidoshi93 Mar 8, 2021
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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"explorer.compactFolders": false
}
105 changes: 37 additions & 68 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,68 +1,37 @@
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
# FutureEats

## ✨ Tecnologias
Esse projeto foi desenvolvido com as seguintes tecnologias:

* ReactJS
* Context
* Material - UI
* Styled-Components
* React-dom-router

## 💻 Projeto
Projeto desenvolvido durante o final do curso de Front-End da Labenu.

## Surge
[FutureEats](http://futureeats-epps.surge.sh/)

## 🚀 Como executar
* Clone o repositório
```
$https://github.com/future4code/epps-labe-food4.git
```
* Instale as dependências com
```
npm install
```
* Inicie o servidor com
```
npm run start
```

## Grupo:
- Fabio Dos Santos;
- Daniel Ratti;
- Bruno Galhardi Vallim;
- José Victor Ferreira;
- Daniel Ribeiro Sacramento;
Loading