157 Commits

Author SHA1 Message Date
kaipher7 ac87b86787 explore page in progress 2026-04-16 11:20:57 -06:00
Madeleine Stamp 07bde2afd4 Update 12 files
- /demo/src/main/java/com/example/demo/entity/User.java
- /demo/src/main/java/com/example/demo/entity/Recipe.java
- /demo/src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java
- /demo/src/main/java/com/example/demo/service/Impl/UserServiceImpl.java
- /demo/src/main/java/com/example/demo/service/CustomUserDetailsService.java
- /demo/src/main/java/com/example/demo/service/UserService.java
- /demo/src/main/java/com/example/demo/service/RecipeService.java
- /demo/src/main/java/com/example/demo/repository/RecipeRepo.java
- /demo/src/main/java/com/example/demo/config/SecurityConfig.java
- /demo/src/main/java/com/example/demo/controller/RecipeController.java
- /demo/src/main/java/com/example/demo/controller/UserController.java
- /demo/src/main/java/com/example/demo/controller/AdminController.java
2026-04-15 19:36:35 -06:00
durn de379799a2 linked up create recipe html to api, also added some more validation to recipe inputs 2026-04-15 17:20:11 -06:00
durn dc8c2a2de4 quantity should be number NOT A STRING 2026-04-09 16:20:30 -06:00
durn cfc414b0e7 modified ingredient input field and getingredient function so it fits with the json the backend expects 2026-04-09 16:10:04 -06:00
durn 4cce9018f8 added searching for recipes and users plus some cleanup 2026-04-08 13:26:22 -06:00
kaipher7 f1c2968dce fixed buttons again 2026-04-02 22:23:57 -06:00
kaipher7 f279e53bd0 fixed button and fonts 2026-04-02 22:11:07 -06:00
kaipher7 93ca192eb2 changed fonts / style 2026-04-02 13:45:25 -06:00
kaipher7 cb6a880638 create recipe form created but not linked to database yet 2026-04-02 12:13:27 -06:00
etc404 f0bc54854d Better password 2026-03-26 17:24:53 -06:00
moon.gibson 387b3adfd6 css changes/ ingredients work 2026-03-26 01:42:54 -06:00
etc404 87f8f7e4d7 Visual improvements 2026-03-12 13:19:48 -06:00
durn 3858673569 no more smoosh image and also flex wrap 2026-03-12 12:42:14 -06:00
etc404 ed8bd88b42 AAAA emergency fixes wip 2026-03-12 12:22:23 -06:00
etc404 988fb067fe Fixed merge issues. 2026-03-11 19:57:12 -06:00
kaipher7 22235f38b3 trying to fix 2026-03-11 19:38:28 -06:00
etc404 738c6970dd Cosmetic changes. 2026-03-11 19:21:29 -06:00
durn 0a593c0491 modified site controller and home.html so recipeDto's work and appear 2026-03-11 14:58:14 -06:00
etc404 56f91e1e06 Login page and logout functionality complete, some file formatting and corrections. 2026-03-11 13:23:16 -06:00
etc404 de1d5549b4 Fixed redirect-on-login. 2026-03-11 11:28:18 -06:00
kaipher7 6f24d3692a imgs 2026-03-11 11:10:12 -06:00
kaipher7 b0c61d767c logout & images 2026-03-11 00:40:17 -06:00
etc404 dd55101486 Login page technically functional. 2026-03-10 18:45:37 -06:00
etc404 fd6cacd13c VISUALS WORK
wip though
2026-03-10 15:18:55 -06:00
kaipher7 43dd602a48 added create-account + fixes 2026-03-09 00:49:23 -06:00
kaipher7 5ce0af0e92 colors and formatting ready for demo 2026-03-07 23:45:43 -07:00
kaipher7 63f0987020 updates to home 2026-03-07 21:19:51 -07:00
Madeleine Stamp 9994b9c746 Edit RecipeServiceImpl.java 2026-03-06 09:46:51 -07:00
Autumn Wolf fe17089e85 Merge branch '4-basic-auth' into 'main'
Implemented User Auth Via DB

See merge request etc404/software-engineering-project!1
2026-03-05 19:32:17 -07:00
etc404 3cb703f4a0 Database-sourced authentication functional. 2026-03-05 19:31:29 -07:00
etc404 be449f621f Added BCrypt password encoding. 2026-03-05 19:31:29 -07:00
etc404 fa35b3a646 User password override, re-enabled login page. 2026-03-05 19:31:29 -07:00
Madeleine Stamp d97edaaf0b Added thymeleaf 2026-03-05 17:59:33 -07:00
Madeleine Stamp 0b1968da8e Finaly did the README.md 2026-03-05 10:24:36 -07:00
Madeleine Stamp 549b81112e Update 2 files
- /demo/src/main/java/com/example/demo/repository/RecipeIngredientRepo.java
- /demo/src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java
2026-03-05 09:55:47 -07:00
Madeleine Stamp fe2cd38277 Update 4 files
- /demo/src/main/java/com/example/demo/dto/RecipeUpdateRequest.java
- /demo/src/main/java/com/example/demo/dto/IngredientDto.java
- /demo/src/main/java/com/example/demo/dto/RecipeCreateRequest.java
- /demo/src/main/java/com/example/demo/dto/RecipeResponse.java
2026-03-04 13:59:31 -07:00
Madeleine Stamp 9335314e1f Update 4 files
- /demo/src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java
- /demo/src/main/java/com/example/demo/dto/RecipeDto.java
- /demo/src/main/java/com/example/demo/repository/IngredientRepo.java
- /demo/src/main/java/com/example/demo/repository/RecipeIngredientRepo.java
2026-03-04 13:35:40 -07:00
durn 4bdb449f47 cleaned up code format 2026-03-04 01:27:15 -07:00
durn 0a38aa3ded added delete favorite api call 2026-03-03 23:59:07 -07:00
durn d03cbaf9a3 tag recipe relationship made 2026-03-03 21:44:04 -07:00
durn fcb00b32a7 images and steps added to recipe 2026-03-03 05:45:39 -07:00
durn e2fb9c1034 User Recipe one to many relationship established 2026-03-03 03:44:57 -07:00
durn 5c78a983dc Merge branch 'main' of https://gitlab.com/etc404/software-engineering-project 2026-03-03 01:18:41 -07:00
durn fa18b3e223 recipe ingredient relations and API calls established 2026-03-03 01:14:02 -07:00
kaipher7 df03756102 Merge branch 'main' of gitlab.com:etc404/software-engineering-project 2026-03-03 00:30:13 -07:00
kaipher7 418ddf483c not pretty wip homepage 2026-03-03 00:29:42 -07:00
durn af514d408d User Controller working, refactored structure 2026-03-02 18:35:04 -07:00
kaipher7 137dcbf948 Merge branch 'main' of gitlab.com:etc404/software-engineering-project 2026-02-26 17:52:30 -07:00
kaipher7 e893ded28c not pretty login 2026-02-26 17:50:32 -07:00