diff --git a/.gitignore b/.gitignore index 23b8c12..abbc4bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ target/ +.settings/ *~ diff --git a/application.properties b/application.properties index d1f779d..f0afec8 100644 --- a/application.properties +++ b/application.properties @@ -19,4 +19,4 @@ spring.jpa.database-platform=org.sqlite.hibernate.dialect.SQLiteDialect #spring.jpa.show-sql: true # My special properties -gourmet.password.file=.gourmetpw +gourmet.password.file=${user.home}/.gourmetpw diff --git a/src/main/java/com/mousetech/gourmetj/SpringSecurityConfig.java b/src/main/java/com/mousetech/gourmetj/SpringSecurityConfig.java index 6064ff3..f7f5940 100644 --- a/src/main/java/com/mousetech/gourmetj/SpringSecurityConfig.java +++ b/src/main/java/com/mousetech/gourmetj/SpringSecurityConfig.java @@ -34,8 +34,13 @@ public class SpringSecurityConfig // require all requests to be authenticated except // for the resources http.authorizeRequests() - .antMatchers("/javax.faces.resource/**", "/main.jsf", - "/img/**", "/recipeDetails.jsf") + .antMatchers("/javax.faces.resource/**", + "/", + "/index.jsf", + "/main.jsf", + "/img/**", + "/recipeDetails.jsf", + "/recipePrint.jsf") .permitAll().anyRequest().authenticated(); // login http.formLogin()// .loginPage("/login.xhtml") diff --git a/src/main/java/com/mousetech/gourmetj/UserSession.java b/src/main/java/com/mousetech/gourmetj/UserSession.java index 5d8e0c6..47411c5 100644 --- a/src/main/java/com/mousetech/gourmetj/UserSession.java +++ b/src/main/java/com/mousetech/gourmetj/UserSession.java @@ -204,9 +204,14 @@ public class UserSession implements Serializable { public String logoutAction() { log.warn("Session Idle listener logout"); - return "/main.jsf"; + return goHome(); } + public String goHome() { + log.warn("E.T. Go Home!"); + return "/main.jsf?faces-redirect=true"; + } + public List getShoppingList() { return this.shoppingList ; } diff --git a/src/main/java/com/mousetech/gourmetj/WelcomePageRedirect.java b/src/main/java/com/mousetech/gourmetj/WelcomePageRedirect.java new file mode 100644 index 0000000..6f09231 --- /dev/null +++ b/src/main/java/com/mousetech/gourmetj/WelcomePageRedirect.java @@ -0,0 +1,17 @@ +package com.mousetech.gourmetj; + +import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WelcomePageRedirect implements WebMvcConfigurer { + + @Override + public void addViewControllers(ViewControllerRegistry registry) { + registry.addViewController("/") + .setViewName("forward:/index.xhtml"); + registry.setOrder(Ordered.HIGHEST_PRECEDENCE); + } +} diff --git a/src/main/resources/META-INF/resources/WEB-INF/faces-config.xml b/src/main/resources/META-INF/resources/WEB-INF/faces-config.xml index ace799c..2fb8d0d 100644 --- a/src/main/resources/META-INF/resources/WEB-INF/faces-config.xml +++ b/src/main/resources/META-INF/resources/WEB-INF/faces-config.xml @@ -8,10 +8,13 @@ > GourmetJ + Global Navigation + Navigation /* + Go Home home - main.jsf + /main.xhtml diff --git a/src/main/resources/META-INF/resources/css/style.css b/src/main/resources/META-INF/resources/css/style.css index fc7c387..94484a1 100644 --- a/src/main/resources/META-INF/resources/css/style.css +++ b/src/main/resources/META-INF/resources/css/style.css @@ -22,6 +22,15 @@ textarea { font-size: 1em } +@media print { + .noprint { + display: none; + } + .printonly { + display: block; + } +} + #footer { bottom: 90px; width: 100%; diff --git a/src/main/resources/META-INF/resources/recipePrint.xhtml b/src/main/resources/META-INF/resources/recipePrint.xhtml index 776a1bc..d9e530a 100644 --- a/src/main/resources/META-INF/resources/recipePrint.xhtml +++ b/src/main/resources/META-INF/resources/recipePrint.xhtml @@ -23,9 +23,11 @@ style="vertical-align: middle; text-align: left; border: none" >