web_programming/fridge_bites
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completed web programming project #44

Merged
steve_dekart merged 117 commits from develop into master 2025-07-07 19:00:18 +02:00
Conversation 1 Commits 117 Files Changed 86 +4418 -634

117 Commits

Author SHA1 Message Date
David Katrinka
9a28d6b322 fixed reviews adaptive 2025-07-07 13:01:32 +02:00
Stepan
8356c80ca3 Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into develop 2025-07-07 12:58:17 +02:00
Stepan
03fa67da84 Minor changer 2025-07-07 12:58:06 +02:00
greendavid004
7c69e94afa TIST-44: added documentation 2025-07-07 09:36:51 +02:00
David Katrinka
3e0f72c4f6 fixed keywords on single item 2025-07-06 15:14:08 +02:00
Stepan
2860cd182f Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into develop 2025-07-06 14:43:57 +02:00
Stepan
552970f8b0 updated 2025-07-06 14:43:45 +02:00
greendavid004
59f5e7b6b0 Merge pull request 'TIST-50: fixed adaptive for submit recipe page' (#43) from TIST-50 into develop 
Reviewed-on: #43
 2025-07-06 14:40:30 +02:00
David Katrinka
8e4996651e TIST-50: fixed adaptive for submit recipe page 2025-07-06 14:39:06 +02:00
steve_dekart
7012c9aa85 Merge pull request 'TIST-16: Add new recipes by user' (#42) from TIST-16 into develop 
Reviewed-on: #42
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
 2025-07-06 14:32:59 +02:00
Stepan
e2cc848fec Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into TIST-16 2025-07-06 14:31:28 +02:00
steve_dekart
b21465e89f Merge pull request 'TIST-49: fixed display issues of warning and success alerts' (#41) from TIST-49 into develop 
Reviewed-on: #41
 2025-07-06 14:31:23 +02:00
Stepan
5cd2030848 Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into TIST-16 2025-07-06 14:31:08 +02:00
Stepan
6dc6cd98ea Added functional for submit recipe 2025-07-06 14:30:47 +02:00
David Katrinka
db6f9538e1 TIST-49: fixed display issues of warning and success alerts 2025-07-06 13:57:56 +02:00
steve_dekart
d0db460f28 Merge pull request 'TIST-45: added custom error page' (#40) from TIST-45 into develop 
Reviewed-on: #40
 2025-07-06 13:51:53 +02:00
steve_dekart
df65db797b Merge pull request 'TIST-48: added reset button in catalog filters' (#39) from TIST-48 into develop 
Reviewed-on: #39
 2025-07-06 13:51:46 +02:00
steve_dekart
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
steve_dekart
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
David Katrinka
924fb17927 TIST-45: added custom error page 2025-07-06 13:48:20 +02:00
David Katrinka
ba7a1eac31 TIST-48: added reset button in catalog filters 2025-07-06 13:34:59 +02:00
David Katrinka
97895c35d2 TIST-47: fixed display issues with pagination 2025-07-06 13:23:27 +02:00
David Katrinka
ffaef7e153 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-46 2025-07-06 13:07:08 +02:00
David Katrinka
931596354b TIST-46: fixed display issues with recent reviews and daily recipes 2025-07-06 13:06:57 +02:00
steve_dekart
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
David Katrinka
bb8cbbb274 added link to submit to header 2025-07-06 11:34:39 +02:00
David Katrinka
36e7435bd4 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-22 2025-07-06 11:20:51 +02:00
David Katrinka
26cf158ec5 TIST-22: added single recipe submit page and new ingredient modal 2025-07-06 11:20:45 +02:00
steve_dekart
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
Stepan
9fc579fc56 Added review model and user can publish it 2025-07-06 09:53:02 +02:00
greendavid004
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
David Katrinka
1974d44a35 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-41 2025-07-05 20:52:46 +02:00
greendavid004
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
David Katrinka
4ccb8ac05e fixed display issue with select dropdown 2025-07-05 20:51:43 +02:00
David Katrinka
a6a7fbade6 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-39 2025-07-05 20:36:37 +02:00
steve_dekart
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
Stepan
81a88b93d5 Added in_usermenu field for RecipeModel 2025-07-05 20:35:34 +02:00
Stepan
b854c92377 Filled index, meals and favorites page. Added pagination for recipes 2025-07-05 20:20:33 +02:00
David Katrinka
3f67fe27d0 TIST-39: added ajax to daily meals select 2025-07-05 20:19:45 +02:00
David Katrinka
6ef6930766 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-41 2025-07-04 21:33:08 +02:00
David Katrinka
f1bebeee48 TIST-41: added reviews and reviews form to singe recipe page 2025-07-04 21:32:57 +02:00
steve_dekart
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
Stepan
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
greendavid004
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
Stepan
15f3b42d84 Added prefetch_related function to relate origin models with their relations 2025-07-04 20:49:37 +02:00
David Katrinka
d846de0182 TIST-38: fixed width of single recipe info details 2025-07-04 19:54:48 +02:00
greendavid004
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
David Katrinka
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
David Katrinka
44863aecbd Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-40 2025-07-03 22:30:18 +02:00
steve_dekart
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
Stepan
2651014595 Added id fields for search ingredients ajax action 2025-07-03 22:23:42 +02:00
Stepan
572b7cf3f4 Added url, id, image_url fields for search ajax action 2025-07-03 22:21:24 +02:00
David Katrinka
a6a759b8f9 TIST-40: added search functionality using fetch 2025-07-03 15:36:57 +02:00
steve_dekart
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
Stepan
f0ed2f0712 added files 2025-07-02 22:33:45 +02:00
Stepan
6f306beb4b Added favorite button functional 2025-07-02 22:32:15 +02:00
steve_dekart
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
Stepan
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
greendavid004
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
Stepan
ae65ec769a Added new property for Recipe 2025-07-02 20:41:41 +02:00
David Katrinka
36b0f58638 TIST-23: added static favorites page and controller 2025-07-01 15:35:50 +02:00
steve_dekart
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
Stepan
d0ceea9a60 fixed minor issues 2025-06-30 22:19:15 +02:00
steve_dekart
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
Stepan
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
greendavid004
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
David Katrinka
7dfdc37a90 removed unused 'use' from daily recipes controller 2025-06-30 22:09:56 +02:00
Stepan
2caecfe4a4 Fixed eng mistakes 2 2025-06-30 21:57:10 +02:00
Stepan
797d9fd334 Fixed eng mistakes 2025-06-30 21:56:20 +02:00
Stepan
f66b0f6a1e Added FavoriteModel on db and created new endpoint for ajax 2025-06-30 21:51:00 +02:00
David Katrinka
46adce3c77 added static daily meals page 2025-06-29 18:03:04 +02:00
greendavid004
3e9fdd36bb Merge pull request 'TIST-28: Create ajax endpoint to create new ingredient and search ingredients' (#20) from TIST-28 into develop 
Reviewed-on: #20
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
 2025-06-29 17:35:27 +02:00
greendavid004
f588e5f608 Merge pull request 'TIST-30: fixed catalog anchor textt decorations and removed display grid from filters, removed images from categories in index and updated design' (#21) from TIST-30 into develop 
Reviewed-on: #21
Reviewed-by: steve_dekart <stevedekart2020@gmail.com>
 2025-06-29 17:33:27 +02:00
David Katrinka
fc357f4eb5 TIST-30: fixed catalog anchor textt decorations and removed display grid from filters, removed images from categories in index and updated design 2025-06-29 15:43:04 +02:00
Stepan
95e41b813f Added ajax endpoints to search and create ingredient 2025-06-29 15:02:57 +02:00
greendavid004
c35cf57eab Merge pull request 'TIST-24: Fixed small issues on admin page' (#19) from TIST-24 into develop 
Reviewed-on: #19
Reviewed-by: steve_dekart <stevedekart2020@gmail.com>
 2025-06-29 13:43:48 +02:00
David Katrinka
f556d9948c fixed more small issues on admin page 2025-06-29 13:23:34 +02:00
David Katrinka
184d7f43cb TIST-20: Fixed small issues on admin page 2025-06-29 12:27:12 +02:00
steve_dekart
420d0bfc6c Merge pull request 'TIST-17: added single recipe page' (#15) from TIST-17 into develop 
Reviewed-on: #15
 2025-06-29 12:25:44 +02:00
David Katrinka
76d4011c41 fixed all issues other than modal 2025-06-29 12:11:07 +02:00
David Katrinka
c58a94d23c TIST-17: added single recipe page 2025-06-29 12:11:07 +02:00
steve_dekart
703a327f39 Merge pull request 'TIST-29: ThreeJS' (#18) from TIST-29 into develop 
Reviewed-on: #18
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
 2025-06-29 11:58:00 +02:00
Stepan
3959a8c55a Added 3d model and customized first block on index page 2025-06-29 11:39:17 +02:00
steve_dekart
b6cc9e7a02 Merge pull request 'TIST-27: UserMenu model and ajax endpoint to add' (#17) from TIST-27 into develop 
Reviewed-on: #17
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
 2025-06-29 10:03:39 +02:00
Stepan
4b2cac054f Fixed const name 2025-06-29 00:53:28 +02:00
Stepan
c3967b9abc Added UserMenu ajax endpoint 2025-06-29 00:51:43 +02:00
Stepan
bb00e19385 Updated README 2025-06-28 11:47:16 +02:00
steve_dekart
dba1d5c8ae Merge pull request 'TIST-26: Added export recipe to pdf endpoint' (#14) from TIST-26 into develop 
Reviewed-on: #14
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
 2025-06-28 11:28:27 +02:00
Stepan
6259cc3688 Added export recipe to pdf endpoint 2025-06-28 11:25:24 +02:00
steve_dekart
a2c2b31597 Merge pull request 'TIST-25: filter form on catalog page' (#13) from TIST-25 into develop 
Reviewed-on: #13
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
 2025-06-28 08:47:23 +02:00
steve_dekart
783e951570 Merge pull request 'TIST-12: Create endpoint for search in ajax' (#12) from TIST-12 into develop 
Reviewed-on: #12
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
 2025-06-28 08:43:57 +02:00
steve_dekart
d78de57b84 Merge pull request 'TIST-15: Add additional information for dashboard' (#11) from TIST-15 into develop 
Reviewed-on: #11
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
 2025-06-28 08:43:47 +02:00
Stepan
51899db9fb Added filter on the page 2025-06-28 08:41:09 +02:00
Stepan
c374c50ca0 Added ajax search and fixed body type for request on ajax 2025-06-28 00:39:25 +02:00
Stepan
b66f2c6709 Added information on dashboard 2025-06-28 00:10:15 +02:00
Stepan
b6970ebef7 Fixed path issue during upload image by model 2025-06-27 22:44:05 +02:00
steve_dekart
318a40c222 Merge pull request 'TIST-11: Create filter with ManyToMany relation between Recipe and Ingredients' (#10) from TIST-11 into develop 
Reviewed-on: #10
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
 2025-06-22 20:40:14 +02:00
Stepan
0a7ce228a2 Create filter with ManyToMany relation between Recipe and Ingredients 2025-06-21 23:51:26 +02:00
steve_dekart
5b1d4e60da Merge pull request 'TIST-20: added recipes page, addded recipes page to header links, added display: grid to daily meals' (#9) from TIST-20 into develop 
Reviewed-on: #9
Reviewed-by: steve_dekart <stevedekart2020@gmail.com>
 2025-06-19 18:18:43 +02:00
David Katrinka
3ad1eada3d TIST-20: added recipes page, addded recipes page to header links, added display: grid to daily meals 2025-06-18 19:36:35 +02:00
steve_dekart
32c0529a4e Merge pull request 'TIST-14: admin panel frontend' (#7) from TIST-14 into develop 
Reviewed-on: #7
Reviewed-by: steve_dekart <stevedekart2020@gmail.com>
 2025-06-17 18:58:08 +02:00
David Katrinka
871f656007 fixed admin widgets css 2025-06-17 17:31:23 +02:00
steve_dekart
58bd2bee3c Merge pull request 'Create pages for recipe on Admin Panel' (#8) from TIST-19 into develop 
Reviewed-on: #8
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
 2025-06-16 21:59:12 +02:00
Stepan
abbf111b4e Create pages for recipe on Admin Panel 2025-06-16 21:46:01 +02:00
David Katrinka
945aa9d18c admin panel frontend 2025-06-16 19:45:30 +02:00
steve_dekart
e860e0c338 Merge pull request 'added frontend for search input and user/login button' (#6) from TIST-13 into develop 
Reviewed-on: #6
 2025-06-15 21:45:29 +02:00
steve_dekart
b628b32301 Merge pull request 'fixed recent reviews and daily recipes adaptive' (#5) from TIST-10 into develop 
Reviewed-on: #5
 2025-06-15 21:45:18 +02:00
steve_dekart
28592fd2d6 Merge pull request 'TIST-9: updated font size for faq' (#4) from TIST-9 into develop 
Reviewed-on: #4
 2025-06-15 21:38:45 +02:00
David Katrinka
9faa333c2e added frontend for search input and user/login button 2025-06-15 20:55:22 +02:00
David Katrinka
6dadf22b1e fixed recent reviews and daily recipes adaptive 2025-06-15 20:23:06 +02:00
David Katrinka
9b45f69a8f TIST-9: updated font size for faq 2025-06-15 20:14:08 +02:00
steve_dekart
82b4c98f29 Merge pull request 'Create models for the recipe app and connect them to the database' (#3) from TIST-5 into develop 
Reviewed-on: #3
Reviewed-by: greendavid004 <davidkatrinka1995@gmail.com>
 2025-06-15 18:25:22 +02:00
Stepan
597d46e2ab Create models for the recipe app and connect them to the database 2025-06-15 18:08:00 +02:00
steve_dekart
ed9cbb1d36 Merge pull request 'TIST 6: adaptive for header and footer' (#2) from TIST-6 into develop 
Reviewed-on: #2
 2025-06-14 20:16:24 +02:00
David Katrinka
1b4abcd062 TIST 6: adaptive for header and footer 2025-06-14 16:41:44 +02:00
steve_dekart
28b4eb6127 Merge pull request 'TIST-7' (#1) from TIST-7 into develop 
Reviewed-on: #1
 2025-06-14 14:48:59 +02:00
Stepan
22103ffeb1 Fixed english names 2025-06-14 14:41:41 +02:00