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

Subtrair item #45

Open
wants to merge 118 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
e544c7c
react install
LuanaGss Feb 8, 2021
3b79d96
Merge pull request #1 from LuanaGss/Luana
LuanaGss Feb 8, 2021
9647e0c
Install react
LuanaGss Feb 8, 2021
60b3ded
Merge pull request #2 from LuanaGss/Luana
LuanaGss Feb 8, 2021
ec73efd
ajuste
TanagraAndria Feb 10, 2021
1d6bf2e
gitignore
LuanaGss Feb 10, 2021
894a836
Merge pull request #3 from LuanaGss/Luana
LuanaGss Feb 10, 2021
bd3653f
Mergin
TanagraAndria Feb 10, 2021
7908a16
Merge pull request #4 from LuanaGss/login
LuanaGss Feb 10, 2021
75f9214
adds .gitignore file
LuanaGss Feb 10, 2021
49c97b4
Ajustes
TanagraAndria Feb 10, 2021
d552572
Mergin
TanagraAndria Feb 10, 2021
beed7f0
Merge pull request #6 from LuanaGss/login
TanagraAndria Feb 10, 2021
f0524be
atualizar
LuanaGss Feb 10, 2021
55a6a0b
merging
TanagraAndria Feb 10, 2021
43aed37
atualizar
LuanaGss Feb 10, 2021
e80e2c3
Ajustes
TanagraAndria Feb 10, 2021
12f583e
Ajustes
TanagraAndria Feb 10, 2021
cd17665
Adição do logo
TanagraAndria Feb 10, 2021
b4e9cda
icones: panela e bandeja
TanagraAndria Feb 10, 2021
0b14987
Merge pull request #8 from LuanaGss/login
TanagraAndria Feb 10, 2021
ebcba26
remocao node_modules
LuanaGss Feb 10, 2021
f121c3b
CODE: Tela de cadastrar com imputs funcionando e enviando as informações
TanagraAndria Feb 12, 2021
2f7f8d5
CODE: página de cadastro funcionando
TanagraAndria Feb 12, 2021
5c2d120
CODE: Página de Cadastro
TanagraAndria Feb 12, 2021
6545942
Ajustes
TanagraAndria Feb 12, 2021
2ed0a21
Merge branch 'main' into login
TanagraAndria Feb 12, 2021
1e99dfd
ajuste
TanagraAndria Feb 12, 2021
c146f70
atualizar
LuanaGss Feb 15, 2021
08c2bca
Merge pull request #12 from LuanaGss/login
LuanaGss Feb 15, 2021
55193c3
atualizar
LuanaGss Feb 15, 2021
b869b44
atualizar
LuanaGss Feb 15, 2021
e29d3a7
Ajuste
TanagraAndria Feb 15, 2021
45919da
Merge pull request #13 from LuanaGss/login
LuanaGss Feb 15, 2021
5d13d34
atualizar
LuanaGss Feb 15, 2021
7f2c2f0
logica login e CSS
LuanaGss Feb 16, 2021
34288e6
logica login e CSS
LuanaGss Feb 16, 2021
b5786c3
logica login e CSS
LuanaGss Feb 16, 2021
610df96
Merge pull request #15 from LuanaGss/LOGIN
LuanaGss Feb 16, 2021
c1dc75e
ajustes responsivo
LuanaGss Feb 16, 2021
e628bb3
Delete App.js
LuanaGss Feb 16, 2021
53f9342
Delete App.test.js
LuanaGss Feb 16, 2021
d7e532d
Delete index.css
LuanaGss Feb 16, 2021
18fb697
Merge pull request #16 from LuanaGss/responsivo
LuanaGss Feb 16, 2021
d543a81
separaçao de pastas CSS
LuanaGss Feb 16, 2021
17faed5
Merge pull request #17 from LuanaGss/responsivo
LuanaGss Feb 16, 2021
fcb630a
Ajuste
TanagraAndria Feb 17, 2021
25cb887
junção de arquivos
TanagraAndria Feb 17, 2021
5c94847
rotas funcionando
LuanaGss Feb 17, 2021
ba87487
Merge pull request #18 from LuanaGss/responsivo
LuanaGss Feb 17, 2021
7bf1fab
Merge branch 'main' of https://github.com/LuanaGss/SAP005-burger-quee…
TanagraAndria Feb 17, 2021
33f1bcb
Imagens: delet e exit
TanagraAndria Feb 18, 2021
366cf03
Code: waiter exit from login
TanagraAndria Feb 18, 2021
5b0a563
Code: sair, e adição de imagem exit
TanagraAndria Feb 18, 2021
fc1cff7
Merge pull request #19 from LuanaGss/waiter
TanagraAndria Feb 18, 2021
110f017
itens menu
LuanaGss Feb 19, 2021
d57252f
itens menu
LuanaGss Feb 19, 2021
fb4fcd6
Merge pull request #20 from LuanaGss/responsivo
LuanaGss Feb 19, 2021
3e3c4cd
Filtro menu
TanagraAndria Feb 19, 2021
168ef7e
CODE: botões do menu com imagem, div do pedido
TanagraAndria Feb 20, 2021
9693be2
Merge pull request #21 from LuanaGss/filter
LuanaGss Feb 22, 2021
6375be9
CODE: order
TanagraAndria Feb 22, 2021
a189047
Merge pull request #22 from LuanaGss/filter
TanagraAndria Feb 22, 2021
0d049e1
atualizar
LuanaGss Feb 22, 2021
6cbe91e
Code: botões menu
TanagraAndria Feb 22, 2021
2a01b5c
atualizar
LuanaGss Feb 23, 2021
f705b60
atualizar
LuanaGss Feb 23, 2021
c38dd81
Merge pull request #23 from LuanaGss/filter
LuanaGss Feb 23, 2021
682f031
CODE: Kitchen
TanagraAndria Feb 24, 2021
2440cb7
Merge pull request #24 from LuanaGss/filter
TanagraAndria Feb 24, 2021
ec7b93f
Ajuste css
TanagraAndria Feb 24, 2021
9ce8b2a
Merge pull request #25 from LuanaGss/filter
TanagraAndria Feb 24, 2021
08228ce
Ajuste css
TanagraAndria Feb 25, 2021
fb6307d
Merge pull request #26 from LuanaGss/filter
TanagraAndria Feb 25, 2021
0d71d8d
CODE: Historico de Pedidos
TanagraAndria Feb 25, 2021
0e96990
Merge pull request #27 from LuanaGss/filter
TanagraAndria Feb 25, 2021
e22ab77
Novos ícones
TanagraAndria Feb 25, 2021
1238547
Merge pull request #28 from LuanaGss/filter
TanagraAndria Feb 25, 2021
9440ec4
Ajuste
TanagraAndria Feb 26, 2021
298b893
Merge pull request #29 from LuanaGss/filter
TanagraAndria Feb 26, 2021
22374cd
atualizar
LuanaGss Feb 26, 2021
e3551e4
CSS Kitchen
TanagraAndria Feb 26, 2021
2b21cea
CSS Kitchen
TanagraAndria Feb 26, 2021
3effbbc
funçao quantidade dos produtos
LuanaGss Feb 28, 2021
01ea37e
Merge pull request #30 from LuanaGss/itensMenu
LuanaGss Feb 28, 2021
0a24627
ajustes
TanagraAndria Feb 28, 2021
1a2ff3b
Merge branch 'main' of https://github.com/LuanaGss/SAP005-burger-quee…
TanagraAndria Feb 28, 2021
9e7eb85
Code review
TanagraAndria Feb 28, 2021
b64025b
Merge pull request #31 from LuanaGss/filter
TanagraAndria Feb 28, 2021
c6e494d
Ajustes
TanagraAndria Mar 1, 2021
e8c5c7c
Merge branch 'main' of https://github.com/LuanaGss/SAP005-burger-quee…
TanagraAndria Mar 1, 2021
86366cc
CSS e itensMenu
LuanaGss Mar 1, 2021
befca9a
Merge pull request #32 from LuanaGss/menu
LuanaGss Mar 1, 2021
255d4a0
Merge branch 'main' of https://github.com/LuanaGss/SAP005-burger-quee…
TanagraAndria Mar 1, 2021
afffb0d
CODE: post order
TanagraAndria Mar 1, 2021
fea838d
Merge pull request #33 from LuanaGss/filter
TanagraAndria Mar 1, 2021
451b7ee
Ajustes gerais
TanagraAndria Mar 2, 2021
def2d2b
Merge pull request #34 from LuanaGss/filter
TanagraAndria Mar 2, 2021
d1f653d
CODE: ajustes gerais em todo o app
TanagraAndria Mar 2, 2021
52da70a
Merge pull request #35 from LuanaGss/filter
TanagraAndria Mar 2, 2021
af7b6cd
História 3
TanagraAndria Mar 4, 2021
81545a3
Merge pull request #36 from LuanaGss/filter
TanagraAndria Mar 4, 2021
134e053
Code: data e hora. Code : Ajustes gerais
TanagraAndria Mar 5, 2021
633c260
Merge pull request #37 from LuanaGss/history4
TanagraAndria Mar 5, 2021
7615a42
subtrair item e total itens
LuanaGss Mar 5, 2021
5a3e825
Readme
TanagraAndria Mar 5, 2021
d239c0d
Merge pull request #38 from LuanaGss/history4
TanagraAndria Mar 5, 2021
2a990e6
Readme
TanagraAndria Mar 5, 2021
c6261e4
Merge pull request #39 from LuanaGss/history4
TanagraAndria Mar 5, 2021
3468bd1
Readme
TanagraAndria Mar 5, 2021
c40ca05
Merge pull request #41 from LuanaGss/history4
TanagraAndria Mar 5, 2021
6d477e8
Resolução de conflitos de CSS, junção de configurações
TanagraAndria Mar 5, 2021
6e76108
Merge pull request #42 from LuanaGss/junção
TanagraAndria Mar 5, 2021
abee391
Ajuste CSS
TanagraAndria Mar 5, 2021
dcd6c75
Ajuste CSS
TanagraAndria Mar 5, 2021
df7d209
Merge pull request #43 from LuanaGss/junção
TanagraAndria Mar 5, 2021
ba213e6
atualizar
LuanaGss Mar 5, 2021
d29174e
ajustes CSS
LuanaGss Mar 5, 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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.DS_Store
*.swp
coverage/
node_modules/
yarn.lock
package-lock.json
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"git.ignoreLimitWarning": true
}
Loading