 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 |
|
|
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 |
|