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.

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

Jump to bottom

Dev #14

Open
wants to merge 155 commits into
base: temp-recovery
Choose a base branch
from
Open

Dev #14

wants to merge 155 commits into from

Conversation

gabrdean
Copy link
Owner

No description provided.

burakoncuy and others added 30 commits February 14, 2025 12:28
@burakoncuy
update menuitemlist and detail
f1aa052
@gabrdean
Dev into Temp
29e72af
@gabrdean
RestaurantForm Saved
92d7c23
@gabrdean
Merge branch 'temp-recovery' into dev
2602b0c
@gabrdean
Merge branch 'temp-recovery' into dev
900836d
@gabrdean
Index.html Fixed Render
6d1810c
@Mcode4
guess account pt1
a89c16a
@Mcode4
guess account pt2
ce00864
@Mcode4
guess account complete
f820068
@burakoncuy
Merge branch 'dev' into newmenu
908f5bf
@burakoncuy
updated back to buttons
c7f6541
@Mcode4
guest
c510c15
@Mcode4
guest
9d3b7a2
@gabrdean
Merge branch 'temp-recovery' into dev
69ae867
@Mcode4
address to new
76dcfca
@gabrdean
restaurant error validation + Cart item Validation
0d1363f
@heykatie
add className to add your restaurant button attempt - Files: Pipfile …
9d2f6b6 
…instance/dev.db
@gabrdean
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
6f66fae
@gabrdean
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
6e43856
@Mcode4
redirect no user
a380858
@heykatie
add your restaurant button css attempt - Files: react-vite/src/compon…
6630355 
…ents/Navigation/DropdownMenu.jsx
@Mcode4
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
93dccd1
@Mcode4
user redirect
eb4088f
@heykatie
- Files: app/api/order_routes.py instance/dev.db react-vite/public/i…
74b0df9 
…mages/orders.png react-vite/src/components/Orders/Orders.css react-vite/src/components/Orders/Orders.jsx react-vite/src/redux/orders.js
@heykatie
- Files: instance/dev.db
30edad9
@gabrdean
New users can now create restaurants
f87f5ea
@gabrdean
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
e198aaf
@heykatie
users reviews page - Files: app/api/review_routes.py react-vite/src/c…
16e7752 
…omponents/Navigation/DropdownMenu.jsx react-vite/src/components/Reviews/MyReviews.css react-vite/src/components/Reviews/MyReviews.jsx react-vite/src/components/Reviews/index.js react-vite/src/redux/reviews.js react-vite/src/router/index.jsx
@heykatie
Merge branch 'cart' into dev
8d9e0f7
@heykatie
remove errors from dropdownmenu class -> className - Files: react-vit…
7b68b4b 
…e/src/components/Navigation/DropdownMenu.jsx
burakoncuy and others added 30 commits February 16, 2025 22:49
@burakoncuy
updated with button function
dbc54d0
@burakoncuy
synced with newmenu
9112177
@heykatie
remove console log - Files: react-vite/dist/assets/index-ae773596.js …
ec2bbdd 
…react-vite/dist/index.html react-vite/src/components/Orders/OrderRestaurant/OrderRestaurant.jsx
@gabrdean
Restauarant Rating Calculations Added
95b6560
@gabrdean
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
5f921cb
@gabrdean
Restaurant Ratings Average Added
c5e972f
@heykatie
fix order item quantity added to cart - Files: instance/dev.db react-…
3338f90 
…vite/dist/assets/index-592cf315.js react-vite/dist/index.html react-vite/src/components/MenuItemDetail/MenuItemDetail.jsx react-vite/src/redux/cart.js
@heykatie
Merge branch 'cart' into dev
ff73a65
@heykatie
clicking items & restaurant in cart closes cart - Files: instance/dev…
9e37270 
….db react-vite/dist/assets/index-441474cb.js react-vite/dist/assets/index-f109a885.css react-vite/dist/index.html react-vite/src/components/Cart/Cart.css react-vite/src/components/Cart/Cart.jsx react-vite/src/components/Cart/CartItems/CartItems.jsx react-vite/src/components/Orders/Order/Order.jsx react-vite/src/components/Orders/OrderRestaurant/OrderRestaurant.jsx
@heykatie
fix clear cart button - Files: instance/dev.db react-vite/dist/assets…
c8912ce 
…/index-2397990a.js react-vite/dist/index.html react-vite/src/components/Cart/Cart.jsx
@heykatie
checkout responsive css - Files: instance/dev.db react-vite/dist/asse…
4522995 
…ts/index-704c88d3.css react-vite/dist/assets/index-a18da32f.js react-vite/dist/index.html react-vite/src/components/Cart/Cart.css react-vite/src/components/Cart/CartItems/CartItems.css react-vite/src/components/Cart/Checkout/Checkout.css
@heykatie
cart summary in checkout expands - Files: instance/dev.db react-vite/…
ce5f6d9 
…dist/assets/index-99493773.css react-vite/dist/assets/index-a18da32f.js react-vite/dist/assets/index-c0893dfb.js react-vite/dist/index.html react-vite/src/components/Cart/Checkout/Checkout.css react-vite/src/components/Cart/Checkout/Checkout.jsx
@heykatie
past orders responsiveness css - Files: instance/dev.db react-vite/di…
6a92dfe 
…st/assets/index-bac90928.css react-vite/dist/assets/index-e6abc1e4.js react-vite/dist/index.html react-vite/src/components/Cart/CartItems/CartItems.jsx react-vite/src/components/Orders/OrderRestaurant/OrderRestaurant.jsx react-vite/src/components/Orders/Orders.css
@heykatie
align order-actions css - Files: react-vite/dist/assets/index-8f6568c…
1e75532 
…3.css react-vite/dist/assets/index-e153ca7f.js react-vite/dist/index.html react-vite/src/components/Orders/Orders.css react-vite/src/components/Orders/Orders.jsx
@heykatie
checkout css - Files: instance/dev.db react-vite/dist/assets/index-4a…
93d867c 
…91fc43.js react-vite/dist/assets/index-860775f2.css react-vite/dist/index.html react-vite/src/components/Cart/Checkout/Checkout.css react-vite/src/components/Cart/Checkout/Checkout.jsx
@heykatie
checkout tip alignment - Files: react-vite/dist/assets/index-3ca18084…
d179444 
….css react-vite/dist/assets/index-94e829a4.js react-vite/dist/index.html react-vite/src/components/Cart/Checkout/Checkout.css react-vite/src/components/Cart/Checkout/Checkout.jsx
@heykatie
checkout css - Files: react-vite/dist/assets/index-89ce1e97.js react-…
e6c2bb9 
…vite/dist/assets/index-9a8a9c8c.css react-vite/dist/index.html react-vite/src/components/Cart/Checkout/Checkout.css
@heykatie
build & deploy - Files: instance/dev.db
dfafd68
@heykatie
remove unsued vars - Files: react-vite/dist/assets/index-68086aba.js …
a0f4c2c 
…react-vite/dist/index.html react-vite/src/components/Orders/OrderRestaurant/OrderRestaurant.jsx
@heykatie
- Files: instance/dev.db
af07d7d
@heykatie
build & deploy - Files: instance/dev.db
abab7ad
@heykatie
Merge branch 'dev' into cart
4c83871
@heykatie
build & deploy - Files: app/api/order_routes.py
177f739
@heykatie
reorder error - Files: app/api/order_routes.py instance/dev.db react-…
8c92648 
…vite/dist/assets/index-203fccee.js react-vite/dist/index.html react-vite/src/redux/orders.js
@heykatie
build & deploy - Files: instance/dev.db
a85f59d
@heykatie
change orders seed data ids - Files: app/seeds/orders.py
7141459
@heykatie
build - Files: instance/dev.db
6eaa77c
@heykatie
change seed order ids - Files: app/seeds/orders.py instance/dev.db
acbd206
@heykatie
build - Files: instance/dev.db
b8cb4e6
@heykatie
update readme screenshots - Files: instance/dev.db react-vite/public/…
7b0a8f8 
…images/cart.png react-vite/public/images/checkout.png react-vite/public/images/past-orders.png
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@gabrdean @burakoncuy @Mcode4 @heykatie @SamaAlt