Commit Graph

337 Commits

Author SHA1 Message Date
Capelier-Marla
064b55d63f buttons go to actual pages 2023-01-25 20:24:36 +01:00
Thomas Rubini
05c1f2b476
Merge pull request #93 from ThomasRubini/descr 2023-01-25 20:19:19 +01:00
Thomas Rubini
d2c5fbcbde
change SQL parameter to descr 2023-01-25 20:18:40 +01:00
Thomas Rubini
87252f0ed7
Revert "replace DESCR with DESC"
This reverts commit 1522018708.
2023-01-25 20:16:53 +01:00
Marla
d1f73e09d5
Merge pull request #92 from ThomasRubini/home_css
Home css
2023-01-25 19:35:06 +01:00
Capelier-Marla
cf074988cc sticky ctagory section 2023-01-25 19:20:59 +01:00
Capelier-Marla
aaac7f2f84 added recipe style (maybe not finished) 2023-01-25 19:18:14 +01:00
Capelier-Marla
b96c3c6a4e putted li into ul 2023-01-25 19:18:14 +01:00
Capelier-Marla
ad4352fae5 added class to recipe 2023-01-25 19:18:09 +01:00
Capelier-Marla
9e067464c8 putted each recipe in ul-li 2023-01-25 19:17:19 +01:00
Capelier-Marla
ca47bf6c62 moved category list in main and main content in article 2023-01-25 19:17:19 +01:00
Capelier-Marla
6b590330b5 setted style for aside part (categories) 2023-01-25 19:17:19 +01:00
Thomas Rubini
755ea94775
Merge pull request #91 from ThomasRubini/user_update_errors 2023-01-25 17:03:17 +01:00
Thomas Rubini
d676042792
do not make an error when user doesn't fill out all fields to update 2023-01-25 17:01:50 +01:00
Thomas Rubini
cba94b818a
Merge pull request #90 from ThomasRubini/query_img 2023-01-25 16:53:05 +01:00
Thomas Rubini
112f4daf81
do not call queryImg() twice 2023-01-25 16:50:05 +01:00
Thomas Rubini
7baf1bdcf3
rename some methods 2023-01-25 16:46:59 +01:00
Thomas Rubini
8272de705b
Merge pull request #89 from ThomasRubini/recipe_note 2023-01-25 16:43:37 +01:00
Thomas Rubini
f08f6ab102
add recipe note 2023-01-25 16:42:30 +01:00
Thomas Rubini
438738dde4
Merge pull request #86 from ThomasRubini/home_random_recipes 2023-01-25 16:15:09 +01:00
Thomas Rubini
752796fab3
Show 3 random recipes on home page 2023-01-25 16:14:46 +01:00
Thomas Rubini
d356a4d816
Merge pull request #85 from ThomasRubini/fix 2023-01-25 15:59:06 +01:00
Thomas Rubini
63f8b9468a
start to adapt views to new Recipe Model 2023-01-25 15:58:07 +01:00
Thomas Rubini
1522018708
replace DESCR with DESC 2023-01-25 15:57:52 +01:00
Thomas Rubini
9f3b566575
make functions to get links 2023-01-25 15:47:09 +01:00
Thomas Rubini
f9de8858cf
make searchRecipesByName() return Recipe objects 2023-01-25 15:45:19 +01:00
Thomas Rubini
1140dcf064
add createFromRow() 2023-01-25 15:44:41 +01:00
eb3d681992
Merge pull request #84 from ThomasRubini/recipe_model_refactor
refactored recipeModel
2023-01-25 15:38:25 +01:00
9633e59e5e refactored recipeModel 2023-01-25 15:37:20 +01:00
Marla
01ae39a025
Merge pull request #82 from ThomasRubini/moving_main_in_article
moved from files home/view, recipe/search, recipe/view
2023-01-25 15:02:08 +01:00
Capelier-Marla
9750af7839 moved from files home/view, recipe/search, recipe/view 2023-01-25 14:53:39 +01:00
Thomas Rubini
f030eff9c9
Merge pull request #81 from ThomasRubini/manage-user-controller 2023-01-24 21:05:25 +01:00
Thomas Rubini
1e64bbf286
use ints instead of numbers for DISABLED property 2023-01-24 21:04:09 +01:00
Thomas Rubini
d472729992
show controls for every user in search 2023-01-24 21:03:29 +01:00
Thomas Rubini
4a4f740e69
fix update method of User model 2023-01-24 21:03:29 +01:00
Thomas Rubini
92544228d2
add method manageUser/update 2023-01-24 21:03:18 +01:00
Thomas Rubini
2bfec0df03
force admin status everywhere on ManagerUser Controller 2023-01-24 21:01:02 +01:00
Thomas Rubini
d0648e30d0
Merge pull request #71 from ThomasRubini/manage-users-view 2023-01-24 21:00:24 +01:00
Thomas Rubini
c7974b4505
Merge pull request #79 from ThomasRubini/comment 2023-01-24 20:14:08 +01:00
Thomas Rubini
b53dd6844e
remove old comment 2023-01-24 20:13:58 +01:00
Thomas Rubini
0ff447fe58
Merge pull request #78 from ThomasRubini/new_recipe 2023-01-24 20:13:13 +01:00
Thomas Rubini
1a1226700b
require login to create a new recipe 2023-01-24 20:12:29 +01:00
Thomas Rubini
ef61cbcb3e
allow admins to edit any recipe 2023-01-24 20:12:16 +01:00
Thomas Rubini
8871d9bb21
modify structure sent to recipe/edit to include POST_URI 2023-01-24 20:11:12 +01:00
Thomas Rubini
ff6ac2eb49
add action recipe/new 2023-01-24 20:03:23 +01:00
Thomas Rubini
961cd27e88
move debug echo in recipe/edit 2023-01-24 20:03:17 +01:00
Thomas Rubini
7e73139ace
make '+' button redirect to /recipe/new 2023-01-24 20:02:45 +01:00
Thomas Rubini
5abfd65948
Merge pull request #77 from ThomasRubini/signup_auth 2023-01-24 20:00:54 +01:00
Thomas Rubini
092d534dc8
Authenticate user on signup 2023-01-24 20:00:07 +01:00
Thomas Rubini
d17a92c551
Merge pull request #76 from ThomasRubini/return_uri 2023-01-24 19:58:42 +01:00