Skip to content

backend #60

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

Open
wants to merge 97 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
c6a5ee8
Flask setup
SGathuku Jul 10, 2024
0b680df
Flask initiation
SGathuku Jul 10, 2024
4de8e6c
Flask Setup
SGathuku Jul 10, 2024
adb6ad8
Flask Setup
SGathuku Jul 10, 2024
bb56b95
Flask Setup
SGathuku Jul 10, 2024
f7c05ea
Route setup
SGathuku Jul 10, 2024
9a8d2df
Testing backend functionality
SGathuku Jul 10, 2024
5586ef3
Testing backend functionality
SGathuku Jul 10, 2024
ab7e87f
Testing backend functionality
SGathuku Jul 10, 2024
47b400c
Testing backend functionality
SGathuku Jul 10, 2024
60c744a
Adding Classes to models.py file
SGathuku Jul 10, 2024
5ed4da7
Flask re-initialization
SGathuku Jul 10, 2024
f5861fc
Flask re-initialization
SGathuku Jul 10, 2024
f3d8a82
Merge pull request #1 from SGathuku/main
SGathuku Jul 10, 2024
8d3b2e2
firstfront end commit
Mosh9098 Jul 10, 2024
e0da050
firstfront end commit
Mosh9098 Jul 10, 2024
76e7599
created homepage and order list
Molly-Mbugi Jul 10, 2024
bc1eef9
created menu table
Molly-Mbugi Jul 10, 2024
cc8c10d
created the two pages and routes
Molly-Mbugi Jul 10, 2024
fe5c9ab
styling menu table
Molly-Mbugi Jul 10, 2024
f4c2a38
created buttons
Molly-Mbugi Jul 10, 2024
2e2d987
validated using formik
Molly-Mbugi Jul 10, 2024
6f82cfe
updates
Mosh9098 Jul 10, 2024
41cb528
updated code
Mosh9098 Jul 11, 2024
4ffcffd
updated code
Mosh9098 Jul 11, 2024
61eb12a
updated code
Mosh9098 Jul 11, 2024
02ea21e
updated
Mosh9098 Jul 11, 2024
46c993b
edited menu
Molly-Mbugi Jul 11, 2024
cc19cae
server backend
tubisaffo Jul 11, 2024
4f04d81
update
Mosh9098 Jul 11, 2024
b79973d
update
Mosh9098 Jul 11, 2024
640dd0b
app.js
Molly-Mbugi Jul 11, 2024
baf344a
Merge branch 'main' of github.com:tubisaffo/python-p4-Hotel-Menu-project
Molly-Mbugi Jul 11, 2024
e77c201
Merge branch 'main' into Molly
Molly-Mbugi Jul 12, 2024
97c73c2
server backend
tubisaffo Jul 12, 2024
3451058
Merge pull request #2 from tubisaffo/Molly
Molly-Mbugi Jul 12, 2024
c231f4d
server backend
tubisaffo Jul 12, 2024
383ef07
Merge remote-tracking branch 'origin/main'
tubisaffo Jul 12, 2024
7ad137e
resolved conflicts
Molly-Mbugi Jul 12, 2024
c285bd6
conflicts
Molly-Mbugi Jul 12, 2024
a51d692
solved respective links conflicts
Molly-Mbugi Jul 12, 2024
ecc2ee0
styling navbar
Molly-Mbugi Jul 12, 2024
2d27f47
adding log out button
Molly-Mbugi Jul 12, 2024
765982e
resizing form
Molly-Mbugi Jul 12, 2024
d790d69
created menu list un alterd
Molly-Mbugi Jul 12, 2024
c18247f
ctreated order list table
Molly-Mbugi Jul 12, 2024
31aaad4
updated
tubisaffo Jul 13, 2024
08f44f0
update
Mosh9098 Jul 13, 2024
2974f49
Committing changes before completing merge
Mosh9098 Jul 13, 2024
8b05cf0
Resolved merge conflicts
Mosh9098 Jul 13, 2024
517a754
Resolved conflicts from merge of 'Davey' branch
Mosh9098 Jul 13, 2024
bd71a5a
Resolved conflicts from merge of 'Davey' branch
Mosh9098 Jul 13, 2024
9652e26
Resolved conflicts from merge of 'Davey' branch
Mosh9098 Jul 13, 2024
05751c0
addedd unmerged changes
tubisaffo Jul 14, 2024
807979c
updated commits
tubisaffo Jul 14, 2024
cc46e30
Orders navbar added
Mosh9098 Jul 14, 2024
b1dd30a
Updated Login Page
Mosh9098 Jul 14, 2024
45c2447
frontend merge
tubisaffo Jul 16, 2024
91dbbf9
added login
tubisaffo Jul 18, 2024
b341ee2
edited readme file
Molly-Mbugi Jul 18, 2024
c1a1780
edited readme file headers
Molly-Mbugi Jul 18, 2024
1db5062
adding description to the file
Molly-Mbugi Jul 18, 2024
ef49f1a
adding db diagram
Molly-Mbugi Jul 18, 2024
a3c1858
Final Readme file
Molly-Mbugi Jul 18, 2024
9870c40
almost
tubisaffo Jul 18, 2024
de59c03
added the orderitem
tubisaffo Jul 18, 2024
ff96e45
updated login page
Mosh9098 Jul 18, 2024
0966f82
Merge branch 'main' of https://github.com/tubisaffo/python-p4-Hotel-M…
Mosh9098 Jul 18, 2024
a5735f9
deleted order list
Molly-Mbugi Jul 19, 2024
80432cf
addint edit button
Molly-Mbugi Jul 19, 2024
22bf204
Commit message describing your changes
tubisaffo Jul 19, 2024
668e55b
fullstack app
tubisaffo Jul 19, 2024
5a7923f
updated navbar
Mosh9098 Jul 19, 2024
0cd0d35
updated navbar
Mosh9098 Jul 21, 2024
9585d46
updated navbar
Mosh9098 Jul 19, 2024
c25acb4
Merge branch 'Davey' of https://github.com/tubisaffo/python-p4-Hotel-…
Mosh9098 Jul 21, 2024
cf8a452
update navbar
Mosh9098 Jul 21, 2024
651fbba
update admin navbar menu list css
Mosh9098 Jul 21, 2024
857bf2e
updated login page css reset
Mosh9098 Jul 21, 2024
859ee80
updated pages
Mosh9098 Jul 21, 2024
d752d86
updated pages
Mosh9098 Jul 21, 2024
ea7be71
updated pages
Mosh9098 Jul 21, 2024
77f6fc6
updated pages
Mosh9098 Jul 21, 2024
b5c44cd
deployed my project
tubisaffo Jul 22, 2024
c4ef475
added cart icon
tubisaffo Jul 22, 2024
3c0eaa3
added render
tubisaffo Jul 22, 2024
eb3d170
added orders page
tubisaffo Jul 22, 2024
32c8803
added order
tubisaffo Jul 22, 2024
5b50f35
updated code
Mosh9098 Jul 22, 2024
9577ad7
update navbar
Mosh9098 Jul 22, 2024
1ba050a
created all orders page
Molly-Mbugi Jul 22, 2024
7063588
all orders
Molly-Mbugi Jul 22, 2024
a821ed6
edited details
Molly-Mbugi Jul 22, 2024
355db01
cart js botton
Molly-Mbugi Jul 22, 2024
5f55e5f
cart js button to edit the cart
Molly-Mbugi Jul 22, 2024
c2ef64f
final trial corrections
Molly-Mbugi Jul 22, 2024
3e1466a
css
tubisaffo Jul 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name = "pypi"
[packages]
ipdb = "0.13.9"
flask = "*"
flask-sqlalchemy = "3.0.3"
flask-sqlalchemy = "*"
Werkzeug = "2.2.2"
flask-migrate = "*"
sqlalchemy-serializer = "*"
Expand Down
20 changes: 20 additions & 0 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading