diff --git a/src/main/java/ru/ulstu/fc/config/SecurityConfiguration.java b/src/main/java/ru/ulstu/fc/config/SecurityConfiguration.java index 7547aaa..18900be 100644 --- a/src/main/java/ru/ulstu/fc/config/SecurityConfiguration.java +++ b/src/main/java/ru/ulstu/fc/config/SecurityConfiguration.java @@ -19,6 +19,7 @@ public class SecurityConfiguration { private final String[] permittedUrls = new String[]{ "/login", "/index", "/user/register", "/public/**", "/organizers", "/webjars/**", + "/error", "/register", "/h2-console/*", "/h2-console", "/css/**", "/js/**", "/img/**", "/templates/**", "/webjars/**"}; diff --git a/src/main/java/ru/ulstu/fc/config/TemplateConfiguration.java b/src/main/java/ru/ulstu/fc/config/TemplateConfiguration.java index 118618c..8ecec34 100644 --- a/src/main/java/ru/ulstu/fc/config/TemplateConfiguration.java +++ b/src/main/java/ru/ulstu/fc/config/TemplateConfiguration.java @@ -3,6 +3,7 @@ package ru.ulstu.fc.config; import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect; import org.thymeleaf.spring6.SpringTemplateEngine; import org.thymeleaf.templateresolver.ITemplateResolver; @@ -10,10 +11,11 @@ import org.thymeleaf.templateresolver.ITemplateResolver; public class TemplateConfiguration { @Bean - public SpringTemplateEngine templateEngine(ITemplateResolver templateResolver) { + public SpringTemplateEngine templateEngine(ITemplateResolver templateResolver, SpringSecurityDialect sec) { final SpringTemplateEngine templateEngine = new SpringTemplateEngine(); templateEngine.addTemplateResolver(templateResolver); templateEngine.addDialect(new LayoutDialect()); + templateEngine.addDialect(sec); return templateEngine; } } diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index e6a830d..783a0fc 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -1,57 +1,71 @@ - + + - + Нечеткий контроллер - + - - - + + + - - -
- -
- -
-
+ \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index d84a8aa..a903e3b 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -24,7 +24,8 @@
- + + Регистрация
diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index a56d912..be9a380 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -1,26 +1,28 @@
-

form

+

Регистрация

-
- - +
+ +

Validation error

-
- - +
+ +

Validation error

-
- - +
+ +
- + + Вернуться на страницу входа - - login