105 Commits

Author SHA1 Message Date
c56bfdc80e Merge pull request 'TIST-47: fixed display issues with pagination' (#38) from TIST-47 into develop
Reviewed-on: #38
2025-07-06 13:51:40 +02:00
cbcb3f1c5a Merge pull request 'TIST-46: fixed display issues with recent reviews and daily recipes' (#37) from TIST-46 into develop
Reviewed-on: #37
2025-07-06 13:51:16 +02:00
97895c35d2 TIST-47: fixed display issues with pagination 2025-07-06 13:23:27 +02:00
ffaef7e153 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-46 2025-07-06 13:07:08 +02:00
931596354b TIST-46: fixed display issues with recent reviews and daily recipes 2025-07-06 13:06:57 +02:00
2a97a3b2c7 Merge pull request 'TIST-22: added submit recipe page and create ingredient modal' (#36) from TIST-22 into develop
Reviewed-on: #36
Reviewed-by: steve_dekart <stevedekart2020@gmail.com>
2025-07-06 12:57:33 +02:00
bb8cbbb274 added link to submit to header 2025-07-06 11:34:39 +02:00
36e7435bd4 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-22 2025-07-06 11:20:51 +02:00
26cf158ec5 TIST-22: added single recipe submit page and new ingredient modal 2025-07-06 11:20:45 +02:00
e2fe1a4173 Merge pull request 'TIST-32: Reviews model and publish as pending' (#35) from TIST-32 into develop
Reviewed-on: #35
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
2025-07-06 09:55:55 +02:00
9fc579fc56 Added review model and user can publish it 2025-07-06 09:53:02 +02:00
9f2d2a13d2 Merge pull request 'TIST-41: added reviews and reviews form to singe recipe page' (#32) from TIST-41 into develop
Reviewed-on: #32
Reviewed-by: steve_dekart <stevedekart2020@gmail.com>
2025-07-05 20:53:06 +02:00
1974d44a35 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-41 2025-07-05 20:52:46 +02:00
f336917b62 Merge pull request 'TIST-39: added ajax to daily meals select' (#33) from TIST-39 into develop
Reviewed-on: #33
Reviewed-by: steve_dekart <stevedekart2020@gmail.com>
2025-07-05 20:52:28 +02:00
4ccb8ac05e fixed display issue with select dropdown 2025-07-05 20:51:43 +02:00
a6a7fbade6 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-39 2025-07-05 20:36:37 +02:00
9a3d2da412 Merge pull request 'TIST-43: Fill index page, favorites and meal of day' (#34) from TIST-43 into develop
Reviewed-on: #34
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
2025-07-05 20:36:04 +02:00
81a88b93d5 Added in_usermenu field for RecipeModel 2025-07-05 20:35:34 +02:00
b854c92377 Filled index, meals and favorites page. Added pagination for recipes 2025-07-05 20:20:33 +02:00
3f67fe27d0 TIST-39: added ajax to daily meals select 2025-07-05 20:19:45 +02:00
6ef6930766 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-41 2025-07-04 21:33:08 +02:00
f1bebeee48 TIST-41: added reviews and reviews form to singe recipe page 2025-07-04 21:32:57 +02:00
9a66bb2b6f Merge pull request 'TIST-36: Prefetch related models for a list of model instances' (#31) from TIST-36 into develop
Reviewed-on: #31
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
2025-07-04 20:52:55 +02:00
69f47cdc42 Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into TIST-36 2025-07-04 20:52:31 +02:00
ec6f7bcabd Merge pull request 'TIST-38: fixed width of single recipe info details' (#30) from TIST-38 into develop
Reviewed-on: #30
Reviewed-by: steve_dekart <stevedekart2020@gmail.com>
2025-07-04 20:52:18 +02:00
15f3b42d84 Added prefetch_related function to relate origin models with their relations 2025-07-04 20:49:37 +02:00
d846de0182 TIST-38: fixed width of single recipe info details 2025-07-04 19:54:48 +02:00
07c4c49cf0 Merge pull request 'TIST-40: added search functionality using fetch' (#28) from TIST-40 into develop
Reviewed-on: #28
Reviewed-by: steve_dekart <stevedekart2020@gmail.com>
2025-07-03 22:41:54 +02:00
caa48d3b62 added href to search results, changed to use global hidden atribute, added click outside of search to hide results 2025-07-03 22:40:09 +02:00
44863aecbd Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-40 2025-07-03 22:30:18 +02:00
34df639446 Merge pull request 'TIST-42: Add id or url to item for search action on ajax' (#29) from TIST-42 into develop
Reviewed-on: #29
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
2025-07-03 22:27:51 +02:00
2651014595 Added id fields for search ingredients ajax action 2025-07-03 22:23:42 +02:00
572b7cf3f4 Added url, id, image_url fields for search ajax action 2025-07-03 22:21:24 +02:00
a6a759b8f9 TIST-40: added search functionality using fetch 2025-07-03 15:36:57 +02:00
80a23a5080 Merge pull request 'TIST-37: Send ajax request to add favorite' (#27) from TIST-37 into develop
Reviewed-on: #27
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
2025-07-02 22:35:06 +02:00
f0ed2f0712 added files 2025-07-02 22:33:45 +02:00
6f306beb4b Added favorite button functional 2025-07-02 22:32:15 +02:00
cc0125d997 Merge pull request 'TIST-35: Favorite property on ProductModel' (#26) from TIST-35 into develop
Reviewed-on: #26
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
2025-07-02 20:45:28 +02:00
c1dc0389e9 Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into TIST-35 2025-07-02 20:45:01 +02:00
aa0e153f65 Merge pull request 'TIST-23: added static favorites page and controller' (#25) from TIST-23 into develop
Reviewed-on: #25
Reviewed-by: steve_dekart <stevedekart2020@gmail.com>
2025-07-02 20:44:44 +02:00
ae65ec769a Added new property for Recipe 2025-07-02 20:41:41 +02:00
36b0f58638 TIST-23: added static favorites page and controller 2025-07-01 15:35:50 +02:00
1f43f408cc Merge pull request 'TIST-34: Fix display issues on Admin page for select and catalog' (#24) from TIST-34 into develop
Reviewed-on: #24
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
2025-06-30 22:22:19 +02:00
d0ceea9a60 fixed minor issues 2025-06-30 22:19:15 +02:00
216a1f8b7a Merge pull request 'TIST-31: Favorites model and ajax endpoint' (#23) from TIST-31 into develop
Reviewed-on: #23
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
2025-06-30 22:14:10 +02:00
e5b2a7fd62 Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into TIST-31 2025-06-30 22:13:14 +02:00
29d9f21d71 Merge pull request 'TIST-21: added static daily meals page' (#22) from TIST-21 into develop
Reviewed-on: #22
Reviewed-by: steve_dekart <stevedekart2020@gmail.com>
2025-06-30 22:12:39 +02:00
7dfdc37a90 removed unused 'use' from daily recipes controller 2025-06-30 22:09:56 +02:00
2caecfe4a4 Fixed eng mistakes 2 2025-06-30 21:57:10 +02:00
797d9fd334 Fixed eng mistakes 2025-06-30 21:56:20 +02:00