diff --git a/src/main/java/ru/ulstu/configuration/Constants.java b/src/main/java/ru/ulstu/configuration/Constants.java index 77a9a4d..5738b8f 100644 --- a/src/main/java/ru/ulstu/configuration/Constants.java +++ b/src/main/java/ru/ulstu/configuration/Constants.java @@ -14,7 +14,7 @@ public class Constants { public static final String LOGIN_REGEX = "^[_'.@A-Za-z0-9-]*$"; public static final String COOKIES_NAME = "JSESSIONID"; - public static final String LOGOUT_URL = "/login?logout"; + public static final String LOGOUT_URL = "/login.xhtml"; public static final String SESSION_ID_ATTR = "sessionId"; public static final int SESSION_TIMEOUT_SECONDS = 30 * 60; @@ -22,4 +22,4 @@ public class Constants { public static final String PASSWORD_RESET_PAGE = "/reset"; public static final int RESET_KEY_LENGTH = 6; -} \ No newline at end of file +} diff --git a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java index ebabf71..25d244f 100644 --- a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java @@ -109,6 +109,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { public void configure(WebSecurity web) { web.ignoring() .antMatchers("/css/**") + .antMatchers("/javax.faces.resource/**") .antMatchers("/js/**") .antMatchers("/templates/**") .antMatchers("/webjars/**") diff --git a/src/main/resources/META-INF/resources/basicTemplate.xhtml b/src/main/resources/META-INF/resources/basicTemplate.xhtml index ed7d082..fb6778a 100644 --- a/src/main/resources/META-INF/resources/basicTemplate.xhtml +++ b/src/main/resources/META-INF/resources/basicTemplate.xhtml @@ -38,7 +38,7 @@ - +
diff --git a/src/main/resources/META-INF/resources/login.xhtml b/src/main/resources/META-INF/resources/login.xhtml new file mode 100644 index 0000000..446f5c9 --- /dev/null +++ b/src/main/resources/META-INF/resources/login.xhtml @@ -0,0 +1,58 @@ + + + + + + + Вход в систему + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + +
+
+
+
+ +
+ +
+
+ +
+
+
+
+ +