From de1d5549b4c722678361b462129b199496ad7f9a Mon Sep 17 00:00:00 2001 From: etc404 Date: Wed, 11 Mar 2026 11:28:18 -0600 Subject: [PATCH 1/4] Fixed redirect-on-login. --- .../main/java/com/example/demo/config/SecurityConfig.java | 2 +- demo/src/main/resources/templates/login.html | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/demo/src/main/java/com/example/demo/config/SecurityConfig.java b/demo/src/main/java/com/example/demo/config/SecurityConfig.java index ff2067d..4476904 100644 --- a/demo/src/main/java/com/example/demo/config/SecurityConfig.java +++ b/demo/src/main/java/com/example/demo/config/SecurityConfig.java @@ -23,7 +23,7 @@ public class SecurityConfig { ) .formLogin(form -> form .loginPage("/login") -// .defaultSuccessUrl("/", true) + .defaultSuccessUrl("/", true) .permitAll() ) .logout(logout -> logout.permitAll()); diff --git a/demo/src/main/resources/templates/login.html b/demo/src/main/resources/templates/login.html index 989ce48..26ee3e2 100644 --- a/demo/src/main/resources/templates/login.html +++ b/demo/src/main/resources/templates/login.html @@ -7,7 +7,7 @@ -
+
Violin f-hole shape to the left of header.

Thyme Crunch

Violin f-hole shape to the right of header. @@ -36,6 +36,5 @@

OR SIGN UP FOR AN ACCOUNT

- - + From 56f91e1e06eaa6b498c37ee5d1cbef4e63ef06f9 Mon Sep 17 00:00:00 2001 From: etc404 Date: Wed, 11 Mar 2026 13:23:16 -0600 Subject: [PATCH 2/4] Login page and logout functionality complete, some file formatting and corrections. --- .../example/demo/config/SecurityConfig.java | 2 +- .../demo/controller/SiteController.java | 5 ++ demo/src/main/resources/templates/home.html | 70 +++++++++---------- demo/src/main/resources/templates/login.html | 2 +- 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/demo/src/main/java/com/example/demo/config/SecurityConfig.java b/demo/src/main/java/com/example/demo/config/SecurityConfig.java index 4476904..8df7bce 100644 --- a/demo/src/main/java/com/example/demo/config/SecurityConfig.java +++ b/demo/src/main/java/com/example/demo/config/SecurityConfig.java @@ -18,7 +18,7 @@ public class SecurityConfig { public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http .authorizeHttpRequests(auth -> auth - .requestMatchers("/login", "/css/**").permitAll() + .requestMatchers("/login", "/register", "/css/**").permitAll() .anyRequest().authenticated() ) .formLogin(form -> form diff --git a/demo/src/main/java/com/example/demo/controller/SiteController.java b/demo/src/main/java/com/example/demo/controller/SiteController.java index f349c45..3d5db60 100644 --- a/demo/src/main/java/com/example/demo/controller/SiteController.java +++ b/demo/src/main/java/com/example/demo/controller/SiteController.java @@ -17,4 +17,9 @@ public class SiteController { public String viewLoginPage(Model model) { return "login"; } + + @GetMapping("/register") + public String viewRegisterPage(Model model) { + return "create-account"; + } } \ No newline at end of file diff --git a/demo/src/main/resources/templates/home.html b/demo/src/main/resources/templates/home.html index f6bebd9..c453555 100644 --- a/demo/src/main/resources/templates/home.html +++ b/demo/src/main/resources/templates/home.html @@ -1,9 +1,9 @@ - - Thyme Crunch Home - + + Thyme Crunch Home + @@ -11,54 +11,50 @@ Violin f-hole shape to the left of header.

Thyme Crunch

Violin f-hole shape to the right of header. -
+
-
+
- - - - Description of the icon - - + + Description of the icon +
-
- -
-
-

-

-
-
- ${recipe.imageAltText} -

-
-
-
+
+
+
+

+

+
+
+ ${recipe.imageAltText} +

+
+
+
-
- -
- - +
diff --git a/demo/src/main/resources/templates/login.html b/demo/src/main/resources/templates/login.html index 26ee3e2..2ec19f9 100644 --- a/demo/src/main/resources/templates/login.html +++ b/demo/src/main/resources/templates/login.html @@ -33,7 +33,7 @@
-

OR SIGN UP FOR AN ACCOUNT

+

OR SIGN UP FOR AN ACCOUNT

From 0a593c0491bc9d2741781c9db2bc60b287464d9f Mon Sep 17 00:00:00 2001 From: durn Date: Wed, 11 Mar 2026 14:58:14 -0600 Subject: [PATCH 3/4] modified site controller and home.html so recipeDto's work and appear --- .../com/example/demo/controller/SiteController.java | 13 +++++++++++++ .../demo/service/Impl/RecipeServiceImpl.java | 1 + demo/src/main/resources/templates/home.html | 5 +++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/demo/src/main/java/com/example/demo/controller/SiteController.java b/demo/src/main/java/com/example/demo/controller/SiteController.java index 3d5db60..22fee15 100644 --- a/demo/src/main/java/com/example/demo/controller/SiteController.java +++ b/demo/src/main/java/com/example/demo/controller/SiteController.java @@ -1,15 +1,28 @@ package com.example.demo.controller; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; +import com.example.demo.service.RecipeService; +import com.example.demo.dto.RecipeDto; +import com.example.demo.entity.Recipe; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @Controller public class SiteController { + + private final RecipeService recipeService; + + public SiteController(RecipeService recipeService) { + this.recipeService = recipeService; + } @GetMapping("/") public String viewHomePage(Model model) { //model.addAttribute("allemplist", employeeServiceImpl.getAllEmployee()); + List recipes = recipeService.getAllRecipes(); + model.addAttribute("recipes", recipes); return "home"; } diff --git a/demo/src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java b/demo/src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java index c223bae..fc86289 100644 --- a/demo/src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java +++ b/demo/src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java @@ -76,6 +76,7 @@ public class RecipeServiceImpl implements RecipeService { } @Override + @Transactional public RecipeDto saveRecipe(RecipeDto dto) { User user = userRepository.findById(dto.getUserDto().getId()) diff --git a/demo/src/main/resources/templates/home.html b/demo/src/main/resources/templates/home.html index c453555..5b95231 100644 --- a/demo/src/main/resources/templates/home.html +++ b/demo/src/main/resources/templates/home.html @@ -44,8 +44,9 @@

- ${recipe.imageAltText} -

+
+ Recipe Image +
From 738c6970dde9507734a43ead0f3e9aadd5b41e23 Mon Sep 17 00:00:00 2001 From: etc404 Date: Wed, 11 Mar 2026 19:21:29 -0600 Subject: [PATCH 4/4] Cosmetic changes. --- .../example/demo/config/SecurityConfig.java | 2 +- .../resources/static/css/create-account.css | 2 +- .../resources/templates/create-account.html | 66 +++++++++---------- demo/src/main/resources/templates/home.html | 4 +- demo/src/main/resources/templates/login.html | 4 +- 5 files changed, 37 insertions(+), 41 deletions(-) diff --git a/demo/src/main/java/com/example/demo/config/SecurityConfig.java b/demo/src/main/java/com/example/demo/config/SecurityConfig.java index 8df7bce..0507a6a 100644 --- a/demo/src/main/java/com/example/demo/config/SecurityConfig.java +++ b/demo/src/main/java/com/example/demo/config/SecurityConfig.java @@ -18,7 +18,7 @@ public class SecurityConfig { public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http .authorizeHttpRequests(auth -> auth - .requestMatchers("/login", "/register", "/css/**").permitAll() + .requestMatchers("/login", "/register", "/css/**", "/images/**").permitAll() .anyRequest().authenticated() ) .formLogin(form -> form diff --git a/demo/src/main/resources/static/css/create-account.css b/demo/src/main/resources/static/css/create-account.css index 04c238f..8430983 100644 --- a/demo/src/main/resources/static/css/create-account.css +++ b/demo/src/main/resources/static/css/create-account.css @@ -74,7 +74,7 @@ body, html { } -.login-box rows { +.login-box .rows { display: flex; gap: 10px; align-items: center; diff --git a/demo/src/main/resources/templates/create-account.html b/demo/src/main/resources/templates/create-account.html index 826f243..78ec2d3 100644 --- a/demo/src/main/resources/templates/create-account.html +++ b/demo/src/main/resources/templates/create-account.html @@ -1,50 +1,46 @@ - - Create Thyme Crunch Account - + + Create Thyme Crunch Account +
- Violin f-hole shape to the left of header. + Violin f-hole shape to the left of header.

Thyme Crunch

- Violin f-hole shape to the right of header. + Violin f-hole shape to the right of header. +
- - - -
- + + + +
diff --git a/demo/src/main/resources/templates/home.html b/demo/src/main/resources/templates/home.html index 5b95231..9734a42 100644 --- a/demo/src/main/resources/templates/home.html +++ b/demo/src/main/resources/templates/home.html @@ -8,9 +8,9 @@
- Violin f-hole shape to the left of header. + Violin f-hole shape to the left of header.

Thyme Crunch

- Violin f-hole shape to the right of header. + Violin f-hole shape to the right of header.
diff --git a/demo/src/main/resources/templates/login.html b/demo/src/main/resources/templates/login.html index 2ec19f9..64eb148 100644 --- a/demo/src/main/resources/templates/login.html +++ b/demo/src/main/resources/templates/login.html @@ -8,9 +8,9 @@
- Violin f-hole shape to the left of header. + Violin f-hole shape to the left of header.

Thyme Crunch

- Violin f-hole shape to the right of header. + Violin f-hole shape to the right of header.