Skip to content

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

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.

Sign up for GitHub

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

Open
pedro-severo wants to merge 72 commits into
base: correcao-projeto
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
a44be4a
Diretorios
feliperdi Jun 24, 2020
55882c4
Merge pull request #1 from future4code/feliphe
EuJulioGabriel Jun 24, 2020
296c6d7
Filtro-Alpha
feliperdi Jun 24, 2020
a6c1a8d
Criei containers da loja e states. Adicionei funções de soma.
acretelli Jun 24, 2020
5a03c15
Merge pull request #2 from future4code/feliphe
acretelli Jun 24, 2020
6294cc8
Merge pull request #3 from future4code/anna
acretelli Jun 24, 2020
e19ad7b
Filtro 1.0
feliperdi Jun 24, 2020
5830eec
Filtro-1
feliperdi Jun 24, 2020
3fef1e9
Merge pull request #4 from future4code/feliphe
feliperdi Jun 24, 2020
895e919
Filtro-1
feliperdi Jun 24, 2020
13bee38
Merge pull request #5 from future4code/feliphe
feliperdi Jun 24, 2020
266c8c1
Ajustei os filtros e acrescentei o container para cadastrar novo produto
acretelli Jun 24, 2020
cfcfc4b
Merge pull request #7 from future4code/anna
alicepsz98 Jun 24, 2020
ea564da
Botão do Carrinho abre o Carrinho
EuJulioGabriel Jun 24, 2020
3c17cbb
Acrescentei filtro de ordem crescente e decrescente
acretelli Jun 24, 2020
e39f5e9
merge master com novos componentes
acretelli Jun 24, 2020
64596e9
Componente Itens criado
alicepsz98 Jun 24, 2020
482c916
Merge pull request #9 from future4code/anna
acretelli Jun 24, 2020
244a6ef
ajustes
acretelli Jun 24, 2020
48a93c1
peguei componentes que estavam faltando
acretelli Jun 24, 2020
e30ea67
Merge pull request #8 from future4code/Julio-Carrinho
EuJulioGabriel Jun 24, 2020
f98e176
Juntei o componente itens em app
acretelli Jun 24, 2020
5974a89
Merge pull request #10 from future4code/anna
acretelli Jun 24, 2020
61c5f96
Add função abre carrinho Júlio em app
acretelli Jun 24, 2020
191e354
Merge pull request #11 from future4code/anna
acretelli Jun 24, 2020
ef373c9
Modificações no componente Itens
alicepsz98 Jun 24, 2020
df4c9ea
Teste
alicepsz98 Jun 25, 2020
bcd4cb8
Merge pull request #12 from future4code/alice-souza
alicepsz98 Jun 25, 2020
1270023
Ajustei o filtro
acretelli Jun 25, 2020
2438ee2
Merge com estilos dos componentes
acretelli Jun 25, 2020
e3027f1
Ajustes no estilo do item
acretelli Jun 25, 2020
564aa13
Merge pull request #13 from future4code/anna
alicepsz98 Jun 25, 2020
c150a6e
Modificação no Itens
alicepsz98 Jun 25, 2020
34d8eb9
Merge pull request #14 from future4code/alice-souza
feliperdi Jun 25, 2020
461e5e5
Add container item.
acretelli Jun 25, 2020
59c722c
Merge pull request #15 from future4code/anna
acretelli Jun 25, 2020
4061ebe
fix - items handles
feliperdi Jun 25, 2020
69737d0
Funcionalidades do carrinho
EuJulioGabriel Jun 25, 2020
99793c6
Merge pull request #16 from future4code/feliphe
feliperdi Jun 25, 2020
4031006
Merge pull request #17 from future4code/Julio-Carrinho-Dia2
EuJulioGabriel Jun 25, 2020
f5ebfb3
Criei a função que abre o card
acretelli Jun 25, 2020
2106805
Merge pull request #18 from future4code/anna
acretelli Jun 25, 2020
47711ea
Fix layout
feliperdi Jun 25, 2020
e204d39
Merge pull request #19 from future4code/feliphe
feliperdi Jun 25, 2020
116959b
Criei função click carrinho
acretelli Jun 25, 2020
3e9d53f
Merge pull request #20 from future4code/anna
acretelli Jun 25, 2020
30072de
Ajustes
acretelli Jun 25, 2020
ec9a7ed
Ajustamos add de produtos no carrinho
acretelli Jun 25, 2020
4a42bbc
Merge pull request #21 from future4code/anna
acretelli Jun 25, 2020
7277283
Fiz a estilização da home
acretelli Jun 25, 2020
551cb09
Merge pull request #22 from future4code/anna
acretelli Jun 25, 2020
08d22a6
Estilização do carrinho
EuJulioGabriel Jun 25, 2020
34ecd9f
Estilizei card aberto
acretelli Jun 26, 2020
edfb542
Merge pull request #23 from future4code/Julio-Carrinho-Dia2
EuJulioGabriel Jun 26, 2020
9e51db1
ajustei conflitos
acretelli Jun 26, 2020
350d282
Ajustei botão apagar
acretelli Jun 26, 2020
367b4d8
Tirei btn adiciona item
acretelli Jun 26, 2020
895af06
Merge pull request #24 from future4code/anna
acretelli Jun 26, 2020
b011675
Ajustes
acretelli Jun 26, 2020
29601d5
Merge pull request #25 from future4code/anna
acretelli Jun 26, 2020
a8739ea
Ajustes
acretelli Jun 26, 2020
e38c6d1
Merge pull request #26 from future4code/anna
acretelli Jun 26, 2020
86a9e70
Soter nos ajudou a ajeitar o código
acretelli Jun 26, 2020
f1f746d
Merge pull request #27 from future4code/anna
acretelli Jun 26, 2020
faa5787
Arrumamos o filtro e a contagem dos valores no carrinho
acretelli Jun 26, 2020
8678227
Achei o bug que não atualizava o carrinho
acretelli Jun 26, 2020
5564988
Ajustei bug no resultado
acretelli Jun 26, 2020
44573a0
Add btn de comprar no card aberto
acretelli Jun 26, 2020
76a75c5
Merge pull request #28 from future4code/anna
acretelli Jun 26, 2020
22cdeab
Add botão limpar carrinho e estilização de fundo
acretelli Jun 26, 2020
29a720f
Merge pull request #29 from future4code/anna
acretelli Jun 26, 2020
5023690
A ordenação estava bugada por causa de uma key errada, foi corrigida.
acretelli Jun 26, 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
13,974 changes: 13,974 additions & 0 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"@testing-library/user-event": "^7.1.2",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-scripts": "3.4.1"
"react-scripts": "3.4.1",
"styled-components": "^5.1.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
Loading
Loading