From fd6cacd13cc39c92e15d76bb65c746a20fc3ffd7 Mon Sep 17 00:00:00 2001 From: etc404 Date: Tue, 10 Mar 2026 15:18:55 -0600 Subject: [PATCH 1/2] VISUALS WORK wip though --- .../example/demo/controller/SiteController.java | 15 +++++++++++++++ .../resources/static}/css/create-account.css | 0 .../{ => src/main/resources/static}/css/home.css | 0 .../main/resources/static}/css/login.css | 0 .../resources/static}/images/create_icon.png | Bin .../resources/static}/images/header_left.png | Bin .../resources/static}/images/header_right.png | Bin .../resources/static}/images/logout_icon.png | Bin .../resources/templates}/create-account.html | 2 +- .../{ => src/main/resources/templates}/home.html | 2 +- .../main/resources/templates}/login.html | 2 +- 11 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 demo/src/main/java/com/example/demo/controller/SiteController.java rename demo/{ => src/main/resources/static}/css/create-account.css (100%) rename demo/{ => src/main/resources/static}/css/home.css (100%) rename demo/{ => src/main/resources/static}/css/login.css (100%) rename demo/{ => src/main/resources/static}/images/create_icon.png (100%) rename demo/{ => src/main/resources/static}/images/header_left.png (100%) rename demo/{ => src/main/resources/static}/images/header_right.png (100%) rename demo/{ => src/main/resources/static}/images/logout_icon.png (100%) rename demo/{ => src/main/resources/templates}/create-account.html (97%) rename demo/{ => src/main/resources/templates}/home.html (96%) rename demo/{ => src/main/resources/templates}/login.html (95%) diff --git a/demo/src/main/java/com/example/demo/controller/SiteController.java b/demo/src/main/java/com/example/demo/controller/SiteController.java new file mode 100644 index 0000000..12b7443 --- /dev/null +++ b/demo/src/main/java/com/example/demo/controller/SiteController.java @@ -0,0 +1,15 @@ +package com.example.demo.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class SiteController { + @GetMapping("/") + public String viewHomePage(Model model) { + //model.addAttribute("allemplist", employeeServiceImpl.getAllEmployee()); + return "home"; + } +} \ No newline at end of file diff --git a/demo/css/create-account.css b/demo/src/main/resources/static/css/create-account.css similarity index 100% rename from demo/css/create-account.css rename to demo/src/main/resources/static/css/create-account.css diff --git a/demo/css/home.css b/demo/src/main/resources/static/css/home.css similarity index 100% rename from demo/css/home.css rename to demo/src/main/resources/static/css/home.css diff --git a/demo/css/login.css b/demo/src/main/resources/static/css/login.css similarity index 100% rename from demo/css/login.css rename to demo/src/main/resources/static/css/login.css diff --git a/demo/images/create_icon.png b/demo/src/main/resources/static/images/create_icon.png similarity index 100% rename from demo/images/create_icon.png rename to demo/src/main/resources/static/images/create_icon.png diff --git a/demo/images/header_left.png b/demo/src/main/resources/static/images/header_left.png similarity index 100% rename from demo/images/header_left.png rename to demo/src/main/resources/static/images/header_left.png diff --git a/demo/images/header_right.png b/demo/src/main/resources/static/images/header_right.png similarity index 100% rename from demo/images/header_right.png rename to demo/src/main/resources/static/images/header_right.png diff --git a/demo/images/logout_icon.png b/demo/src/main/resources/static/images/logout_icon.png similarity index 100% rename from demo/images/logout_icon.png rename to demo/src/main/resources/static/images/logout_icon.png diff --git a/demo/create-account.html b/demo/src/main/resources/templates/create-account.html similarity index 97% rename from demo/create-account.html rename to demo/src/main/resources/templates/create-account.html index 745d256..826f243 100644 --- a/demo/create-account.html +++ b/demo/src/main/resources/templates/create-account.html @@ -3,7 +3,7 @@ Create Thyme Crunch Account - + diff --git a/demo/home.html b/demo/src/main/resources/templates/home.html similarity index 96% rename from demo/home.html rename to demo/src/main/resources/templates/home.html index 000880d..f6bebd9 100644 --- a/demo/home.html +++ b/demo/src/main/resources/templates/home.html @@ -3,7 +3,7 @@ Thyme Crunch Home - + diff --git a/demo/login.html b/demo/src/main/resources/templates/login.html similarity index 95% rename from demo/login.html rename to demo/src/main/resources/templates/login.html index 5968092..3832321 100644 --- a/demo/login.html +++ b/demo/src/main/resources/templates/login.html @@ -3,7 +3,7 @@ Thyme Crunch Login - + From dd5510148637a021fb2f26dbaf8060d5b6bf39e5 Mon Sep 17 00:00:00 2001 From: etc404 Date: Tue, 10 Mar 2026 18:45:37 -0600 Subject: [PATCH 2/2] Login page technically functional. --- .../example/demo/config/SecurityConfig.java | 18 ++++++++++++++++++ .../demo/controller/SiteController.java | 5 +++++ demo/src/main/resources/templates/login.html | 8 ++++++-- 3 files changed, 29 insertions(+), 2 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 3d17139..ff2067d 100644 --- a/demo/src/main/java/com/example/demo/config/SecurityConfig.java +++ b/demo/src/main/java/com/example/demo/config/SecurityConfig.java @@ -2,8 +2,10 @@ package com.example.demo.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; @Configuration public class SecurityConfig { @@ -11,4 +13,20 @@ public class SecurityConfig { public PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http + .authorizeHttpRequests(auth -> auth + .requestMatchers("/login", "/css/**").permitAll() + .anyRequest().authenticated() + ) + .formLogin(form -> form + .loginPage("/login") +// .defaultSuccessUrl("/", true) + .permitAll() + ) + .logout(logout -> logout.permitAll()); + return http.build(); + } } \ No newline at end of file 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 12b7443..f349c45 100644 --- a/demo/src/main/java/com/example/demo/controller/SiteController.java +++ b/demo/src/main/java/com/example/demo/controller/SiteController.java @@ -12,4 +12,9 @@ public class SiteController { //model.addAttribute("allemplist", employeeServiceImpl.getAllEmployee()); return "home"; } + + @GetMapping("/login") + public String viewLoginPage(Model model) { + return "login"; + } } \ No newline at end of file diff --git a/demo/src/main/resources/templates/login.html b/demo/src/main/resources/templates/login.html index 3832321..989ce48 100644 --- a/demo/src/main/resources/templates/login.html +++ b/demo/src/main/resources/templates/login.html @@ -18,9 +18,13 @@

Log In

-
+
+ Invalid username and password.
+
+ You have been logged out.
+ - +