mtsinc7
/
gourmetj-springboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up POM, views

Browse Source
main
tim holloway 3 months ago
parent a4e70a0739
commit 34645fc8da
7 changed files with 24 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      pom.xml
  2. 2
      src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
  3. 2
      src/main/java/com/mousetech/gourmetj/SpringSecurityConfig.java
  4. 18
      src/main/resources/META-INF/resources/detailEdit.xhtml
  5. 2
      src/main/resources/META-INF/resources/recipeDetails.xhtml
  6. 10
      src/main/resources/META-INF/resources/recipePrint.xhtml
  7. 4
      src/main/resources/META-INF/resources/shoppingList.xhtml

32
pom.xml
Unescape View File

@ -7,7 +7,7 @@
<groupId>com.mousetech.gourmet</groupId> <groupId>com.mousetech.gourmet</groupId>
<artifactId>gourmetj</artifactId> <artifactId>gourmetj</artifactId>
<version>0.2.5</version> <version>0.2.6</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>GourmetJ</name> <name>GourmetJ</name>
@ -84,10 +84,6 @@
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<!-- <dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</dependency>-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <artifactId>spring-boot-starter-security</artifactId>
@ -96,14 +92,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency> </dependency>
<!--
https://mvnrepository.com/artifact/jakarta.persistence/jakarta.persistence-api -->
<!-- <dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<version>2.2</version>
</dependency>-->
<dependency> <dependency>
<groupId>jakarta.validation</groupId> <groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId> <artifactId>jakarta.validation-api</artifactId>
@ -129,21 +117,11 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- <dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
-->
<dependency> <dependency>
<groupId>org.apache.tomcat.embed</groupId> <groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId> <artifactId>tomcat-embed-jasper</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- <dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
</dependency>
-->
<!-- <!--
https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core --> https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core -->
@ -158,7 +136,6 @@
</dependency> </dependency>
<!-- <!--
https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-webp --> https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-webp -->
<!-- In Core??? -->
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-webp</artifactId> <artifactId>imageio-webp</artifactId>
@ -166,7 +143,6 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- Needed only if you deploy ImageIO plugins as part of a web app. <!-- Needed only if you deploy ImageIO plugins as part of a web app.
Make sure you add the IIOProviderContextListener to your web.xml.
--> -->
<dependency> <dependency>
<groupId>com.twelvemonkeys.servlet</groupId> <groupId>com.twelvemonkeys.servlet</groupId>
@ -184,12 +160,6 @@
<version>8.0.30</version> <version>8.0.30</version>
</dependency> </dependency>
<!-- <dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.faces</artifactId>
<version>${com.sun.faces.version}</version>
</dependency>-->
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId> <artifactId>junit-jupiter</artifactId>

2
src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
Unescape View File

@ -721,7 +721,7 @@ public class RecipeDetailBean implements Serializable {
if (recipeService.save(this.getRecipe())) { if (recipeService.save(this.getRecipe())) {
userSession.setRecipe(null); userSession.setRecipe(null);
return "recipeDetails"; return "recipeDetails?faces-redirect=true";
} else { } else {
JSFUtils.addErrorMessage("Save recipe failed"); JSFUtils.addErrorMessage("Save recipe failed");
return null; return null;

2
src/main/java/com/mousetech/gourmetj/SpringSecurityConfig.java
Unescape View File

@ -136,6 +136,6 @@ public class SpringSecurityConfig {
"/recipeDetails.jsf", "/recipeDetails.jsf",
"/recipeDetails.xhtml", "/recipeDetails.xhtml",
"/shoppingList.jsf", "/shoppingList.jsf",
"/recipePrint.jsf"); "/recipePrint.xhtml");
} }
} }

18
src/main/resources/META-INF/resources/detailEdit.xhtml
Unescape View File

@ -62,12 +62,12 @@
<p:outputLabel for="@next" <p:outputLabel for="@next"
value="Title" value="Title"
/> />
<p:focus/>
<p:inputText id="rtitle" <p:inputText id="rtitle"
size="45" required="true" size="45" required="true"
placeholder="A recipe title is required." placeholder="A recipe title is required."
value="#{recipeDetailBean.recipe.title}" value="#{recipeDetailBean.recipe.title}"
> >
<p:focus />
<f:ajax execute="rtitle" <f:ajax execute="rtitle"
render="editorPanel" render="editorPanel"
/> />
@ -372,28 +372,34 @@
> >
<p:panel header="Instructions"> <p:panel header="Instructions">
<div id="insection"> <div id="insection">
<p:focus/>
<h:inputTextarea <h:inputTextarea
id="ctlInstructions" id="ctlInstructions"
rows="30" cols="120" rows="30" cols="120"
escape="false" escape="false"
value="#{recipeDetailBean.recipe.instructions}" value="#{recipeDetailBean.recipe.instructions}"
/> >
<p:focus />
</h:inputTextarea>
</div> </div>
</p:panel> </p:panel>
</p:tab> </p:tab>
<p:tab id="notesTab" title="Notes"> <p:tab id="notesTab" title="Notes">
<p:panel header="Notes"> <p:panel header="Notes">
<p:focus/>
<h:inputTextarea id="ctlNotes" <h:inputTextarea id="ctlNotes"
rows="30" cols="120" rows="30" cols="120"
escape="false" escape="false"
value="#{recipeDetailBean.recipe.modifications}" value="#{recipeDetailBean.recipe.modifications}"
/> >
<p:focus/>
</h:inputTextarea>
</p:panel> </p:panel>
</p:tab> </p:tab>
</p:tabView> </p:tabView>
<p:commandButton id="doSave" value="Save" icon="ui-icon-pencil" ajax="false" disabled="{not recipeDetailBean.dirty}" action="#{recipeDetailBean.doSave}" /> <p:commandButton id="doSave" value="Save"
icon="ui-icon-pencil" ajax="false"
disabled="{not recipeDetailBean.dirty}"
action="#{recipeDetailBean.doSave}"
/>
<p:commandButton id="doCancel" value="Cancel" <p:commandButton id="doCancel" value="Cancel"
ajax="false" immediate="true" ajax="false" immediate="true"
action="recipeDetails.jsf" action="recipeDetails.jsf"

2
src/main/resources/META-INF/resources/recipeDetails.xhtml
Unescape View File

@ -54,7 +54,7 @@
<p:commandButton ajax="false" <p:commandButton ajax="false"
value="Print" value="Print"
icon="ui-icon-print" icon="ui-icon-print"
action="recipePrint.jsf" action="recipePrint.jsf?faces-redirect=true"
styleClass="ui-button-print" styleClass="ui-button-print"
immediate="true" immediate="true"
/> />

10
src/main/resources/META-INF/resources/recipePrint.xhtml
Unescape View File

@ -50,7 +50,7 @@
/> />
</p:panelGrid> </p:panelGrid>
<!-- --> <!-- -->
<p:panelGrid id="ingredientsc"> <p:panelGrid id="ingredientsc" columns="1">
<f:facet name="header"> <f:facet name="header">
<h:outputText styleClass="subtitle" <h:outputText styleClass="subtitle"
value="Ingredients" value="Ingredients"
@ -61,6 +61,7 @@
showDirectLinksArrows="true" showDirectLinksArrows="true"
value="#{recipeDetailBean.ingredients}" value="#{recipeDetailBean.ingredients}"
var="ingredient" var="ingredient"
style="width: 100%"
> >
<p:column <p:column
style="text-align: right; width: 2em" style="text-align: right; width: 2em"
@ -100,9 +101,7 @@
</p:dataTable> </p:dataTable>
</p:column> </p:column>
</p:panelGrid> </p:panelGrid>
<h:outputText <!-- -->
value="Recipe ID: #{recipeDetailBean.recipe.id}"
/>
<p:panelGrid columns="1" style="width: 100%"> <p:panelGrid columns="1" style="width: 100%">
<f:facet name="header"> <f:facet name="header">
<h:outputText styleClass="subtitle" <h:outputText styleClass="subtitle"
@ -126,6 +125,9 @@
value="#{recipeDetailBean.modifications}" value="#{recipeDetailBean.modifications}"
/> />
</p:panelGrid> </p:panelGrid>
<h:outputText
value="Recipe ID: #{recipeDetailBean.recipe.id}"
/>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>

4
src/main/resources/META-INF/resources/shoppingList.xhtml
Unescape View File

@ -42,7 +42,7 @@
<p:tab id="overviewTab" title="Shopping List"> <p:tab id="overviewTab" title="Shopping List">
<h:form id="form1"> <h:form id="form1">
<p:dataTable id="tblRecipes" <p:dataTable id="tblRecipes"
style="width: 40em" style="width: 60em"
value="#{shoppingListBean.recipeList}" value="#{shoppingListBean.recipeList}"
var="item" var="item"
> >
@ -87,7 +87,7 @@
> >
<p:dataTable id="tblShopIngredients" <p:dataTable id="tblShopIngredients"
value="#{shoppingListBean.ingredientList}" value="#{shoppingListBean.ingredientList}"
style="width: 40em;" style="width: 60em;"
sortBy="#{item.shopCat}" var="item" sortBy="#{item.shopCat}" var="item"
> >
<f:facet name="header"> <f:facet name="header">

Write Preview
Loading…
Cancel
Save