Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
194 commits
Select commit Hold shift + click to select a range
f8283e4
adicionar-projeto
deoliveiraluana Sep 13, 2022
e03c971
Merge pull request #1 from future4code/luana-labefood
CarolineMartins09 Sep 13, 2022
e35a8dc
Remover arquivos que não serão utilizados
FluffyThread Sep 13, 2022
1175fea
add folders
Jeferson-Beiertorf Sep 14, 2022
928d4ce
add chakra/mui
Jeferson-Beiertorf Sep 14, 2022
a0e3be3
Merge pull request #3 from future4code/Jeferson-Beiertorf-Inicio
FluffyThread Sep 14, 2022
310ff2d
Merge pull request #2 from future4code/leonardo-excluir-arquivos-desn…
FluffyThread Sep 14, 2022
b3b6623
page-inicial
CarolineMartins09 Sep 14, 2022
6613782
Merge pull request #5 from future4code/carol-inicial-page
BiancaPaccola Sep 14, 2022
655b50c
test bug
Jeferson-Beiertorf Sep 15, 2022
312365d
test-bug-page-inicial
CarolineMartins09 Sep 15, 2022
fc71790
Merge pull request #8 from future4code/demo-feature
FluffyThread Sep 15, 2022
b290594
alterado home
Jeferson-Beiertorf Sep 15, 2022
f1401a6
Add useRequest
Jeferson-Beiertorf Sep 15, 2022
cc6f74d
login
CarolineMartins09 Sep 16, 2022
ff65205
Merge pull request #9 from future4code/Jeferson-Beiertorf-01
Jeferson-Beiertorf Sep 16, 2022
3626523
Merge pull request #10 from future4code/carol-login
Jeferson-Beiertorf Sep 16, 2022
173772a
style e validacao dos dados do cadastro
BiancaPaccola Sep 16, 2022
23f89ca
Resolver conflitos e identação
FluffyThread Sep 16, 2022
7d98654
Resolver bug no botão de revelar senha
FluffyThread Sep 16, 2022
d0a8a1a
Merge pull request #11 from future4code/bianca-cadastro
CarolineMartins09 Sep 16, 2022
c8f2ceb
ajustes de style e requisicao
BiancaPaccola Sep 17, 2022
ffc9957
Adicionar botão de voltar
FluffyThread Sep 18, 2022
305051a
centralizar e retirar background botão de revelar senha
FluffyThread Sep 18, 2022
cd63e48
Merge pull request #13 from future4code/teste-bianca-cadastro-II
FluffyThread Sep 19, 2022
9c7121c
alguns ajustes
BiancaPaccola Sep 20, 2022
d432978
Ajustar inputs tela de login
FluffyThread Sep 20, 2022
1ddece9
Ajustar botão de login
FluffyThread Sep 20, 2022
3193792
Merge pull request #14 from future4code/bianca-ajustes-signup
Jeferson-Beiertorf Sep 20, 2022
16741fc
Criar novos inputs e adicionar nas paginas como componentes
FluffyThread Sep 20, 2022
fd7aba6
Resolver conflitos
FluffyThread Sep 20, 2022
26b140e
Adicionar resolução do bug de requisição no cadastro
FluffyThread Sep 20, 2022
bdb4b84
Merge pull request #15 from future4code/leonardo-ajustes-inputs
BiancaPaccola Sep 20, 2022
d3faf81
cadastrar endereço
Jeferson-Beiertorf Sep 20, 2022
0375478
Merge branch 'master' into Jeferson-Beiertorf-01
Jeferson-Beiertorf Sep 20, 2022
8aa37d3
readme
deoliveiraluana Sep 20, 2022
a71a27a
Merge pull request #16 from future4code/Jeferson-Beiertorf-01
Jeferson-Beiertorf Sep 20, 2022
9e879b1
README atualizado
deoliveiraluana Sep 20, 2022
6b95d5b
Merge pull request #17 from future4code/lu-labefood
deoliveiraluana Sep 20, 2022
d37fe5e
alteração name component
Jeferson-Beiertorf Sep 20, 2022
7a26e3c
feed-estatico
CarolineMartins09 Sep 21, 2022
48b59a7
scroll
CarolineMartins09 Sep 21, 2022
e485791
timeout
CarolineMartins09 Sep 21, 2022
e25c65a
Merge pull request #18 from future4code/carol-feed
CarolineMartins09 Sep 22, 2022
1b959cc
Fix: Ajeitar input repetido de logradouro e obrigatoriedade do comple…
FluffyThread Sep 22, 2022
5d39df8
style: ajustar inputs do cadastro e botão
FluffyThread Sep 22, 2022
04eac96
fix: alterar o nome do bairro que estava como o mesmo nome do logradouro
FluffyThread Sep 22, 2022
a9da277
style: implementacao estilo feed, ainda nao completo
CarolineMartins09 Sep 22, 2022
4e0327e
style: layout do carrinho
FluffyThread Sep 22, 2022
650ac20
feat: adicionei footer com rotas, estilizacao e funcionalidade na pag…
CarolineMartins09 Sep 22, 2022
975f340
Merge pull request #20 from future4code/fix-cadastro-endereco-leonardo
Jeferson-Beiertorf Sep 22, 2022
e363459
style: footer fixado na tela
CarolineMartins09 Sep 22, 2022
3b14367
fix: Fixed bug inputs address
Jeferson-Beiertorf Sep 23, 2022
ff5967d
feat: renderizar de forma diferente se existir algo no carrinho
FluffyThread Sep 23, 2022
659c042
Logica input filtro nao funciona ainda
CarolineMartins09 Sep 23, 2022
bc59e77
feat: adicionar filtro de busca
FluffyThread Sep 23, 2022
f8570be
style/fix: ajustar espaçamento e consertar filtro de busca
FluffyThread Sep 23, 2022
7e2db7d
Merge pull request #23 from future4code/teste-feed-carol-II
CarolineMartins09 Sep 23, 2022
57827d3
input bairro estava como rua av
CarolineMartins09 Sep 23, 2022
b153d66
style: adicionar card
FluffyThread Sep 23, 2022
149e8c1
fix: resolver conflitos
FluffyThread Sep 23, 2022
eb9ca9c
style: adicionar informações do restaurante
FluffyThread Sep 23, 2022
a008d58
implementacao de mensagem de erro no busca
CarolineMartins09 Sep 23, 2022
45f83e0
lógicas dos botoes do footer e mais ajustes
BiancaPaccola Sep 23, 2022
5c1999e
requisicao do restaurant detail, ainda em andamento
CarolineMartins09 Sep 24, 2022
92c27eb
fix: fixed bug PUT ADDRESS and cleaned commnent code
Jeferson-Beiertorf Sep 24, 2022
62bb63f
Merge branch 'master' into Jeferson-Beiertorf-03
Jeferson-Beiertorf Sep 24, 2022
11e6231
style: implementacao do style page restaurants detail, nao concluida
CarolineMartins09 Sep 24, 2022
d3a36dc
Merge pull request #25 from future4code/bianca-paccola-sexta
CarolineMartins09 Sep 24, 2022
8e20ba0
Merge pull request #22 from future4code/leonardo-carrinho
CarolineMartins09 Sep 24, 2022
d83a54f
nao entendi
CarolineMartins09 Sep 24, 2022
0ce8f03
style: estilização pagina de detalhes
FluffyThread Sep 25, 2022
e25b126
EM ANDAMENTO
FluffyThread Sep 26, 2022
bf7ea83
fix: corrigindo bug do cadastro
BiancaPaccola Sep 26, 2022
50b11cf
identacao e comentario adicionado
BiancaPaccola Sep 26, 2022
f3fe453
implementacao estado global
CarolineMartins09 Sep 26, 2022
5e8000b
fix: arrumando o filtro para nao diferenciar maisc/minusc. arrumando …
BiancaPaccola Sep 26, 2022
34757d6
add onclick que faltou
BiancaPaccola Sep 26, 2022
daaf283
add mensagem de carregamento
BiancaPaccola Sep 26, 2022
790eca3
add spin de carregamento da requisicao
BiancaPaccola Sep 26, 2022
3d9c825
Merge branch 'master' into Jeferson-Beiertorf-03
CarolineMartins09 Sep 26, 2022
7671062
conteiner dos inputs faltando um D dai nao estava reconhecendo
CarolineMartins09 Sep 26, 2022
9cea814
Merge pull request #30 from future4code/teste-branch-jeferson
CarolineMartins09 Sep 26, 2022
43d2201
Merge branch 'master' into carol
CarolineMartins09 Sep 26, 2022
18472d0
Merge pull request #24 from future4code/carol
CarolineMartins09 Sep 26, 2022
2c13e91
Merge branch 'master' into bianca-paccola-sexta
CarolineMartins09 Sep 26, 2022
8642b13
foi uma chave que apaguei sem querer e agora tem que comittar
CarolineMartins09 Sep 27, 2022
059b3d3
Merge pull request #31 from future4code/teste-branch-bianca
CarolineMartins09 Sep 27, 2022
415ebd0
console que coloquei e tirei pra testar
CarolineMartins09 Sep 27, 2022
236a088
header-profile
deoliveiraluana Sep 27, 2022
0fb9c2d
chave que coloquei e deu erro
CarolineMartins09 Sep 27, 2022
62b428d
Merge pull request #32 from future4code/caroline
CarolineMartins09 Sep 27, 2022
95d8ab7
profile
deoliveiraluana Sep 27, 2022
504b16b
Merge pull request #33 from future4code/lu-labefood
Jeferson-Beiertorf Sep 27, 2022
e790d01
feat-inProgress: adicionar o popup que seleciona a quantidade emudar …
FluffyThread Sep 27, 2022
42d9eb4
style: mudar cores dos botões
FluffyThread Sep 27, 2022
3b1ffd4
alteração footer
Jeferson-Beiertorf Sep 27, 2022
3f67406
update profile
Jeferson-Beiertorf Sep 27, 2022
0ce05a4
update profile
Jeferson-Beiertorf Sep 28, 2022
b51857d
Merge branch 'master' into continuacao-carrinho-global-teste
BiancaPaccola Sep 28, 2022
4f83bff
teste do carrinho
BiancaPaccola Sep 28, 2022
2c0bd91
acertando a lógica da quantidade de produtos
BiancaPaccola Sep 28, 2022
3975525
fix: arrumar renderização das informações do restaurante
FluffyThread Sep 28, 2022
6daf825
Comentar código do profile
FluffyThread Sep 28, 2022
baf193c
Merge pull request #37 from future4code/pagina-produtos-teste
FluffyThread Sep 28, 2022
cb007e8
feat: adicionar produtos e preço total
FluffyThread Sep 28, 2022
386300d
feat: adicionar preço do frete
FluffyThread Sep 28, 2022
38c813c
fix: consertar problema que a página quebrava caso o carrinho estives…
FluffyThread Sep 28, 2022
af52a59
fix: chamar variavel de endereço pelo nome certo
FluffyThread Sep 28, 2022
e0a3407
feat: função excluir EM ANDAMENTO
FluffyThread Sep 28, 2022
193f9c7
styled: se estiver ok arruma o footer
CarolineMartins09 Sep 28, 2022
3271a7e
feat: adicionar endereço de entrega
FluffyThread Sep 28, 2022
a19fac8
Merge pull request #39 from future4code/carol-ajustes
FluffyThread Sep 28, 2022
b9f9ac5
fix: resolver conflitos
FluffyThread Sep 28, 2022
1621951
feat: adicionar endereço e tempo do restaurante
FluffyThread Sep 28, 2022
5f42a0b
ajustes footer
CarolineMartins09 Sep 28, 2022
4f22e5e
Merge pull request #40 from future4code/carol-ajustes
FluffyThread Sep 28, 2022
3c038cd
juntar branches
FluffyThread Sep 28, 2022
6dffd6b
Merge branch 'master' into Jeferson-Beiertorf-02
Jeferson-Beiertorf Sep 28, 2022
b664b23
Merge pull request #41 from future4code/Jeferson-Beiertorf-02
Jeferson-Beiertorf Sep 28, 2022
153a597
Merge branch 'master' into Jeferson-Beiertorf-04
Jeferson-Beiertorf Sep 28, 2022
ea5e49b
Merge pull request #35 from future4code/Jeferson-Beiertorf-04
Jeferson-Beiertorf Sep 28, 2022
9818997
style/feat: consertar estilo dos cards e adicionar função de remover
FluffyThread Sep 28, 2022
786ff34
fix: retirar excesso de requisições
FluffyThread Sep 28, 2022
7a0c0f4
›fix: fixed bug address
Jeferson-Beiertorf Sep 28, 2022
5e8cc0f
Merge pull request #42 from future4code/Jeferson-Beiertorf-05
CarolineMartins09 Sep 28, 2022
0848a3c
edit profile and address
Jeferson-Beiertorf Sep 29, 2022
81d730d
style: mudar estilo do botão
FluffyThread Sep 29, 2022
01a494a
fix: endereço undefined
FluffyThread Sep 29, 2022
35874cf
styled: adicionando ao readme
CarolineMartins09 Sep 29, 2022
dfe3359
readme
CarolineMartins09 Sep 29, 2022
558a65f
Merge pull request #43 from future4code/Jeferson-Beiertorf-06
Jeferson-Beiertorf Sep 29, 2022
fe70c74
readme prints
CarolineMartins09 Sep 29, 2022
ee6ad90
Merge pull request #44 from future4code/carol-ajustes
CarolineMartins09 Sep 29, 2022
bab16b0
ajustes
CarolineMartins09 Sep 29, 2022
a594232
Merge pull request #45 from future4code/carol-ajustes
CarolineMartins09 Sep 29, 2022
f4f8c8a
erro
CarolineMartins09 Sep 29, 2022
30e459e
Merge pull request #46 from future4code/carol-ajustes
CarolineMartins09 Sep 29, 2022
4a0c5d8
feat: requisição place order
FluffyThread Sep 29, 2022
f5ef6a9
readme-ajuste
CarolineMartins09 Sep 29, 2022
d5aa43f
Merge pull request #47 from future4code/carol-ajustes
CarolineMartins09 Sep 29, 2022
761db5b
reajuste
CarolineMartins09 Sep 29, 2022
94005ab
Merge pull request #48 from future4code/carol-ajustes
CarolineMartins09 Sep 29, 2022
9fcb6e4
Merge branch 'master' into get-cart-data
FluffyThread Sep 30, 2022
8c26488
header edit address
Jeferson-Beiertorf Sep 30, 2022
e5afba9
padding profile
Jeferson-Beiertorf Sep 30, 2022
e92d53d
conflito
CarolineMartins09 Sep 30, 2022
4e8cf58
Merge pull request #49 from future4code/teste-carrinho
CarolineMartins09 Sep 30, 2022
3482123
add logic for history orders
Jeferson-Beiertorf Sep 30, 2022
e3c5bb2
history orders
Jeferson-Beiertorf Sep 30, 2022
1c26548
excluir comemtados, cardHistory, mapHistory
CarolineMartins09 Sep 30, 2022
55e580f
Merge branch 'master' into teste-profile
CarolineMartins09 Sep 30, 2022
81b5c81
fix: importar useContext
FluffyThread Sep 30, 2022
2e79125
Merge pull request #52 from future4code/teste-profile-carol-pr51
CarolineMartins09 Sep 30, 2022
6311f6b
excluir comentados, arrumar formato data do profile
CarolineMartins09 Sep 30, 2022
8e4d75f
erro
CarolineMartins09 Sep 30, 2022
aff79e6
DATE formato arrumado
CarolineMartins09 Sep 30, 2022
5a8174a
Merge pull request #53 from future4code/carol-ajustes
CarolineMartins09 Sep 30, 2022
5060daa
detalhes, excluir console e add link surge readme
CarolineMartins09 Sep 30, 2022
1dd983c
Merge pull request #54 from future4code/carol-ajustes
CarolineMartins09 Sep 30, 2022
bb9ec0f
fix: retirar R$ perdido
FluffyThread Oct 1, 2022
f08df76
style: banner estilizado
FluffyThread Oct 1, 2022
ca2ec9f
feat: adicionar banner com pedido ativo
FluffyThread Oct 1, 2022
f0ef676
fix/style proteger página de carrinho e tirar o clear inputs
FluffyThread Oct 1, 2022
57691f6
feat: alert caso o pedido de certo
FluffyThread Oct 1, 2022
684db2b
style: adicionar virgula no endereço
FluffyThread Oct 1, 2022
9b0eb9a
style: formatar endereço de entrega
FluffyThread Oct 1, 2022
6d93010
Merge pull request #55 from future4code/feat-banner-leonardo
CarolineMartins09 Oct 1, 2022
22835b8
readme add fotos
CarolineMartins09 Oct 1, 2022
7b4a17c
Merge pull request #56 from future4code/carol-ajustes
CarolineMartins09 Oct 1, 2022
915fdac
readme fotos excluir console
CarolineMartins09 Oct 1, 2022
6b5ed48
Merge pull request #57 from future4code/carol-ajustes
CarolineMartins09 Oct 1, 2022
7d583d0
readme fotos
CarolineMartins09 Oct 1, 2022
7da687a
Merge pull request #58 from future4code/carol-ajustes
CarolineMartins09 Oct 1, 2022
616f81d
readme
CarolineMartins09 Oct 1, 2022
eda261d
Merge pull request #59 from future4code/carol-ajustes
CarolineMartins09 Oct 1, 2022
c859e6c
fix: bug de clicar 2 vezes para cadastrar
BiancaPaccola Oct 1, 2022
23de37f
link surge
CarolineMartins09 Oct 1, 2022
8358756
Merge pull request #61 from future4code/carol-ajustes
CarolineMartins09 Oct 1, 2022
7807702
msg igual do zeplin
BiancaPaccola Oct 2, 2022
5e39a47
Merge pull request #60 from future4code/bianca-bug-cadastro
CarolineMartins09 Oct 2, 2022
be054da
ajustes surge
CarolineMartins09 Oct 2, 2022
e4c45ae
Merge pull request #62 from future4code/carol-ajustes
CarolineMartins09 Oct 2, 2022
2f6cffa
verificando readme
CarolineMartins09 Dec 1, 2022
415a5dd
Merge pull request #64 from CarolineMartins09/carol-readme
CarolineMartins09 Dec 1, 2022
ca263bc
readme
CarolineMartins09 Dec 1, 2022
9e8571d
readme imgs
CarolineMartins09 Dec 1, 2022
f9d4495
Merge pull request #1 from CarolineMartins09/carol-readme
CarolineMartins09 Dec 1, 2022
0802e62
readme alterações
CarolineMartins09 Dec 1, 2022
32538c8
Merge pull request #65 from CarolineMartins09/carol-readme
CarolineMartins09 Dec 1, 2022
24ece6d
Merge pull request #66 from CarolineMartins09/master
CarolineMartins09 Dec 1, 2022
3626146
fix:ajustar readme
FluffyThread Feb 16, 2023
29a87ae
Merge branch 'master' into adjust-readme
FluffyThread Feb 16, 2023
06a7a58
Merge pull request #67 from FluffyThread/adjust-readme
FluffyThread Feb 16, 2023
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
97 changes: 96 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,96 @@
### Projeto LabeFood



![](./src/img/capa-readme2.png)


---

## 📱 Responsividade:
- Para melhor experiência recomendamos a visualização em dispositivo Mobile ou no desktop visualizar pelo inspecionar do seu navegador.
---

<h4 align="left">
Aplicativo web para serviços de delivery de restaurantes.
</h4>

---

## 🔐 Acesso:
- Cadastre-se ou acesse com login e senha (login: astrodev@gmail.com senha:123456)

---

## 👩🏽👨🏾 Integrantes do grupo:

- [Bianca Giovana Paccola](https://github.com/BiancaPaccola)
- [Caroline Martins](https://github.com/CarolineMartins09)
- [Jeferson Beiertorf](https://github.com/Jeferson-Beiertorf)
- [Leonardo Barros de Souza](https://github.com/FluffyThread)
- [Luana Barbosa de Oliveira](https://github.com/deoliveiraluana)

---

## 🎯Objetivo do Projeto

Este é um projeto de Front-end, baseado em aplicativos de delivery de comida, desenvolvido no bootcamp da Labenu. Por ser o último projeto do módulo de Front-end o principal objetivo é estudar e compreender todas tecnologias utlizadas nesse módulo, sendo elas:
* _React_
* [API](https://documenter.getpostman.com/view/7549981/SWTEdGtT#e6c05246-7dcc-483c-95a3-269792e59c37)
* _Javascript_
* _HTML_
* _Styled-components_
* _Chakra UI_


---
## 🔗Link para Acessar


- [Ifuture.com](https://kaput-flesh.surge.sh/)


---

### 💡 Funcionalidades:
✅ Login <br/>
✅ Cadastro mais Cadastro endereço <br/>
✅ Feed, com busca por nome ou categorias do restaurante e detalhes como frete tempo de entrega<br/>
✅ Feed, com aviso caso possua pedido em andamento<br/>
✅ Restaurante, com seus detalhes e seus respectivos produtos podendo ser adicionados com quantidade escolhida ao carrinho <br/>
✅ Carrinho de compras, com endereço de entrega, produtos escolhidos( caso não possuir tem mensagem de aviso) e forma de pagamento <br/>
✅ Carrinho de compras, não é possivel realizar outro pedido quando tem outro em andamento, user recebe aviso sobre<br/>
✅ Perfil, contendo nome do user, endereço e dados, adicionamos uma opção de logout <br/>
✅ Perfil, user pode fazer mudanças nos seus dados pessoais e visualizar seu historico de pedidos

## 📷 Prints Páginas

## HOME e LOGIN

![](./src/img/home-login.png)

## Cadastro Dados e Endereço
![](./src/img/name-endereco.png)

## Feed e Feed filtro Busca por nome
![](./src//img/feed1.0.JPG)

## Feed filtro por tipo de restaurante e mensagem se não ouver nome procurado
![](./src/img/feed2.0.JPG)

## Feed com pedido em andamento

![](./src/img/feed-banner.png)

## Carrinho com pedido
![](./src/img/cart.JPG)

## Carrinho vazio
![](./src/img/cart-vazio.png)

## Perfil com histórico
![](./src/img/perfil.png)

## Edição do perfil
![](./src/img/edit-profile.JPG)


23 changes: 23 additions & 0 deletions labefood/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
Loading