From 68462514db39f9f8055b49f8c1176c2f6ae0b7e9 Mon Sep 17 00:00:00 2001
From: tim holloway <timh@mousetech.com>
Date: Thu, 1 Feb 2024 15:52:21 -0500
Subject: [PATCH] cleanups for shopping list

---
 README.md                                          | 14 ++++++++++++--
 application.properties                             |  5 ++---
 .../META-INF/resources/WEB-INF/layout/layout.xhtml |  2 +-
 .../META-INF/resources/shoppingList.xhtml          |  6 +++---
 src/main/resources/application.yml                 |  9 +++++----
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index e9d0f5e..30acbde 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Gourmet Recipe Manager - Spring Boot
+# Gourmet Recipe Manager - Spring Boot - Version 2
 
 This is a port of Thomas Hinkle (thinkle) Gourmet Recipe Manager.
 
@@ -85,4 +85,14 @@ employed when you run this app on your local desktop.
 ### Improved graphics support
 
 A lot of recipe websites publish images in webp form. Support
-for webp has now been added.
\ No newline at end of file
+for webp has now been added.
+
+### Better session management
+
+JSF tends to depend on session-scope context. Sessions, however
+time out and this has been an annoyance when a recipe is being
+displayed. To minimize this, better timeout mechanisms have been
+installed and the recipe browser keeps last-search and search-type
+values in long-lived cookies on the client. The server will read
+and cache them, but if the server times out, it will automatically
+re-read the cookies on the next request.
\ No newline at end of file
diff --git a/application.properties b/application.properties
index 75d475a..c931454 100644
--- a/application.properties
+++ b/application.properties
@@ -21,7 +21,6 @@ spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 
 # My special properties
 gourmet.password.file=${user.home}/.gourmetpw
-joinfaces.primefaces.theme=le-frog
-#joinfaces.primefaces.THEME=vela
 
-server.servlet.context-parameters.primefaces.THEME=le-frog
+# This will override aplication.yml
+#server.servlet.context-parameters.primefaces.THEME=le-frog
diff --git a/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml b/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml
index b739d47..aeacf07 100644
--- a/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml
+++ b/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml
@@ -28,7 +28,7 @@
                 </ui:insert>
                 <!--  -->
                 <div id="footer">
-                    (C) 2021 Tim Holloway, Licensed under the <a
+                    (C) 2021, 2024 Tim Holloway, Licensed under the <a
                         href="http://www.apache.org/licenses/LICENSE-2.0"
                     >Apache License, Version 2.0</a>.
                     <p>Based on Gourmet Recipe Manager by T.
diff --git a/src/main/resources/META-INF/resources/shoppingList.xhtml b/src/main/resources/META-INF/resources/shoppingList.xhtml
index 0434e97..9210e72 100644
--- a/src/main/resources/META-INF/resources/shoppingList.xhtml
+++ b/src/main/resources/META-INF/resources/shoppingList.xhtml
@@ -6,7 +6,7 @@
     xmlns:p="http://primefaces.org/ui"
     xmlns:c="http://xmlns.jcp.org/jstl"
 >
-    <!-- Tabbed page for the Mainpage "More..." button -->
+    <!-- Tabbed page for the Mainpage "Shopping..." button -->
     <ui:define name="title">Gourmet Recipe Manager - Shopping</ui:define>
     <ui:define name="content">
         <style>
@@ -34,6 +34,7 @@
 	
 }
 </style>
+        This is the list of recipe items you've selected to shop for.
         <h:messages />
         <p:tabView id="tabGroupClient" orientation="left"
             dynamic="true"
@@ -95,13 +96,11 @@
                                     value="Ingredients"
                                 />
                             </f:facet>
-                            <p:headerRow>
                                 <p:column colspan="4">
                                     <h:outputText
                                         value="#{item.shopCat}"
                                     />
                                 </p:column>
-                            </p:headerRow>
                             <p:column label="Amt"
                                 style="width: 3em; text-align: right"
                             >
@@ -150,6 +149,7 @@
             </p:tab>
             <!--  -->
             <p:tab id="tabPantry" title="Pantry">
+                <h:outputText value="Stuff already in the pantry." />
                 <h:outputText value="For future implementation" />
             </p:tab>
             <!--  -->
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c572b4f..5d7da18 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -26,9 +26,10 @@ server:
     servlet:
         session:
             timeout: '30m'
-        context-parameters:
-            primefaces:
-                THEME: casablanca
+# Theme here pverrides jinfaces theme            
+#        context-parameters:
+#            primefaces:
+#                THEME: vela
 
 
 gourmet:
@@ -37,4 +38,4 @@ gourmet:
         
 joinfaces:
   primefaces:
-    theme: delta
+    theme: casablanca