157 Commits

Author SHA1 Message Date
Madeleine Stamp 64cd8f2cb5 Update file ProfileController.java 2026-04-23 12:50:23 -06:00
Madeleine Stamp c4a40c1068 Update 2 files
- /src/main/java/com/example/demo/controller/RecipeUploadController.java
- /src/main/java/com/example/demo/controller/RecipeUploadForm.java
2026-04-23 12:41:10 -06:00
Madeleine Stamp 339cbbdf6e Update 13 files
- /src/main/java/com/example/demo/service/Impl/UserServiceImpl.java
- /src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java
- /src/main/java/com/example/demo/service/UserService.java
- /src/main/java/com/example/demo/controller/SiteController.java
- /src/main/java/com/example/demo/controller/RecipeUploadForm.java
- /src/main/java/com/example/demo/controller/ProfileController.java
- /src/main/java/com/example/demo/config/SecurityConfig.java
- /src/main/java/com/example/demo/config/WebConfig.java
- /src/main/resources/templates/explore.html
- /src/main/resources/templates/view-recipe.html
- /src/main/resources/templates/public-profile.html
- /src/main/resources/templates/my-profile.html
- /src/main/resources/templates/home.html
2026-04-23 12:33:42 -06:00
Madeleine Stamp 2ed5f11b21 Update 6 files
- /src/main/resources/application.properties
- /src/main/resources/static/css/home.css
- /src/main/resources/static/css/explore.css
- /src/main/resources/static/css/my-profile.css
- /src/main/resources/static/css/public-profile.css
- /src/main/resources/static/css/view-recipe.css
2026-04-23 12:25:59 -06:00
durn 6bafcd6f63 quantities are now option and can also be fractions 2026-04-23 11:02:03 -06:00
kaipher7 ff3137c4b6 small tweaks new bar 2026-04-22 08:35:52 -06:00
kaipher7 2225cbdf4b idk if i made changes 2026-04-22 08:27:53 -06:00
kaipher7 725244a6d7 view recipe display 2026-04-22 02:31:29 -06:00
kaipher7 2499ea086d public profile display 2026-04-22 00:43:24 -06:00
kaipher7 d568538177 updated cost after pulling changes 2026-04-22 00:03:06 -06:00
kaipher7 9f2a7a12c3 cost 2026-04-22 00:00:32 -06:00
kaipher7 f8f41d680b new recipe bar on home working 2026-04-21 23:54:16 -06:00
moon.gibson 231b1ed360 $ fix extended edition 2026-04-21 22:28:48 -06:00
kaipher7 c0b536cba6 fixes 2026-04-21 22:25:12 -06:00
kaipher7 de7595e52f dollar signs and filtering css 2026-04-21 21:59:50 -06:00
moon.gibson 2afab06410 dollar sign fix 2026-04-21 19:28:24 -06:00
durn d0910dabe8 fixed check boxes 2026-04-21 19:16:53 -06:00
durn 18e58ca5a5 Resolve merge
'
2026-04-21 18:37:28 -06:00
durn 69d823c977 got rid of odd duplicate lines 2026-04-21 18:24:46 -06:00
moon.gibson 9e59930de9 fix for recipe ingred steps ordering (hopefully) 2026-04-21 18:04:12 -06:00
etc404 e84ec7b0eb Realized I was being silly. 2026-04-21 15:50:44 -06:00
etc404 adca9f28bf Commit to test workflow. 2026-04-21 15:47:35 -06:00
etc404 83bafabb14 CI/CD Additions 2026-04-21 15:35:18 -06:00
Madeleine Stamp 022db901ae Fixed a redirect 2026-04-21 13:58:29 -06:00
Madeleine Stamp edb4ef7c0d Delete WebConfig (accidentally made) 2026-04-21 13:55:50 -06:00
Madeleine Stamp 267d5c7bdf Update 17 files
- /src/main/resources/application.properties
- /src/main/resources/templates/view-recipe.html
- /src/main/resources/templates/create-recipe.html
- /src/main/resources/templates/home.html
- /src/main/resources/templates/explore.html
- /src/main/resources/templates/public-profile.html
- /src/main/resources/templates/my-profile.html
- /src/main/resources/templates/update-recipe.html
- /src/main/resources/static/css/view-recipe.css
- /src/main/java/com/example/demo/controller/SiteController.java
- /src/main/java/com/example/demo/controller/RecipeUploadController.java
- /src/main/java/com/example/demo/controller/RecipeUploadForm.java
- /src/main/java/com/example/demo/config/WebConfig
- /src/main/java/com/example/demo/config/SecurityConfig.java
- /src/main/java/com/example/demo/config/WebConfig.java
- /src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java
- /src/main/java/com/example/demo/service/RecipeService.java
2026-04-21 13:37:02 -06:00
kaipher7 ce3cea01c3 js for cost on creating a recipe 2026-04-20 21:09:24 -06:00
kaipher7 37f8cca781 js for cost 2026-04-20 20:58:23 -06:00
kaipher7 24d193504e create icon and cards improved 2026-04-20 11:38:46 -06:00
kaipher7 5cf01983e6 my-profile pretty much done' 2026-04-20 00:34:59 -06:00
kaipher7 12afcaa58a explore visual tweaks 2026-04-19 17:08:25 -06:00
kaipher7 3afe31d425 explore visual tweaks 2026-04-19 16:54:20 -06:00
Madeleine Stamp 7d59e99f7d Update 3 files
- /src/main/resources/templates/explore.html
- /src/main/resources/templates/my-profile.html
- /src/main/resources/templates/public-profile.html
2026-04-19 10:06:02 -06:00
kaipher7 3d4e64826f Merge branch 'main' of gitlab.com:etc404/software-engineering-project
i didn't commit my decorative changes before create-html was updated
sorry
2026-04-18 23:51:59 -06:00
kaipher7 0c71ecf4a5 added swirl decor to login and create account 2026-04-18 23:51:48 -06:00
Madeleine Stamp 2a14f1264a Edit SecurityConfig.java 2026-04-18 14:09:38 -06:00
Madeleine Stamp 659ab79497 Update 16 files
- /src/main/resources/templates/create-account.html
- /src/main/resources/templates/my-profile.html
- /src/main/resources/templates/home.html
- /src/main/resources/templates/update-recipe.html
- /src/main/resources/templates/explore.html
- /src/main/resources/templates/public-profile.html
- /src/main/java/com/example/demo/controller/SiteController.java
- /src/main/java/com/example/demo/controller/ProfileController.java
- /src/main/java/com/example/demo/dto/UserDto.java
- /src/main/java/com/example/demo/dto/UpdateProfileDto.java
- /src/main/java/com/example/demo/dto/ProfileDto.java
- /src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java
- /src/main/java/com/example/demo/service/Impl/UserServiceImpl.java
- /src/main/java/com/example/demo/service/UserService.java
- /src/main/java/com/example/demo/config/SecurityConfig.java
- /src/main/java/com/example/demo/entity/User.java
2026-04-18 14:08:08 -06:00
durn c2e6722829 explore page working i believe 2026-04-17 19:30:25 -06:00
durn b26af70ef5 create account and recipe working. Explore kind of works 2026-04-17 10:46:38 -06:00
etc404 b32b3d3a03 Oops 2026-04-16 18:34:58 -06:00
etc404 6663539011 The Unpopular Decision 2026-04-16 17:49:41 -06:00
etc404 cefc69bd33 The Unpopular Decision 2026-04-16 17:47:56 -06:00
etc404 f9852facb3 P removal 2026-04-16 17:42:52 -06:00
Madeleine Stamp 04fb4c6465 Update file UserController.java 2026-04-16 17:40:18 -06:00
kaipher7 20a6670668 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-04-16 17:38:07 -06:00
kaipher7 27838a1678 view recipe, not working 2026-04-16 17:26:33 -06:00
etc404 06df1e9d1b Re-add create account page 2026-04-16 17:22:04 -06:00
Autumn Wolf 0d4c8582f8 Merge branch 'NapoleonsLeftBoot-main-patch-74b7' into 'main'
Update 12 files

See merge request etc404/software-engineering-project!2
2026-04-16 17:16:59 -06:00
kaipher7 dfa91947f9 more explore page edits 2026-04-16 17:09:05 -06:00
kaipher7 a7eaddbf5e explore page in progress 2026-04-16 11:22:18 -06:00