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

Delivereat app #5

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
68b5279
Added Menu api
Jun 29, 2018
be9444e
Adde Menu component
Jun 29, 2018
db96407
Added dish info
Jun 29, 2018
0cafa7b
Added Header
Jun 29, 2018
051c0ea
Added Search component
Jun 29, 2018
633481f
Added menu styles
Jun 29, 2018
edb7405
Moved Search to App component
Jun 29, 2018
67ea884
Added add to cart button
Jun 29, 2018
9fb1078
Added dish quantity input
Jun 29, 2018
80e1574
Added dish quantity input 2
Jun 29, 2018
7eead62
Added basket
Jun 30, 2018
f14e992
Added basket count
Jun 30, 2018
4ead651
Added disabled state to decrease button + checkout button
Jul 1, 2018
d66ab84
Added basket amount to checkout button
Jul 1, 2018
fee031a
Added footer
Jul 1, 2018
e600239
Added orders page
Jul 1, 2018
fb166f1
Style updates
Jul 1, 2018
3d6587c
Working on OldOrders..
Jul 1, 2018
c29222a
Working on OldOrders..
Jul 1, 2018
49a0398
Refactor Menu comp to functional comp
Jul 2, 2018
31f228c
Refactor Dish comp to functional comp
Jul 2, 2018
3032db9
Delete console.logs
Jul 2, 2018
d9a9ea5
Refactor file structure
Jul 2, 2018
0636b98
Refactor Basket
Jul 3, 2018
c19d68a
Moved subnav to own comp
Jul 3, 2018
672968b
Updated /api/orders get on the server
Jul 3, 2018
665e7b1
Order object update
Jul 3, 2018
7e3ac16
Refactor old orders
Jul 4, 2018
23571d2
Working on it...
Jul 4, 2018
605a538
Working on it...
Jul 4, 2018
e9c8953
Added routing
Jul 4, 2018
424f3c5
Added order placed confirmation
Jul 4, 2018
5717af5
Added Order History delete order
Jul 5, 2018
59d1039
Added re-order button funtionality
Jul 5, 2018
f5ae81e
Heroku deployment
Jul 5, 2018
99fdff3
Conflicts resolution
Jul 5, 2018
d29c14c
Git conflits solved
Jul 5, 2018
00a619a
gitignore update
Jul 5, 2018
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
/node_modules
/static/bundle.js
/static/bundle.map.js
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: node server.js
23 changes: 0 additions & 23 deletions index.js

This file was deleted.

Loading