From f57fe9e233dafaa3d3b6acaba30a9e90ba90a16f Mon Sep 17 00:00:00 2001
From: Nikitha <nikithareddy1189@gmail.com>
Date: Tue, 14 Apr 2026 22:02:05 -0600
Subject: [PATCH 1/2] Chat Saving

saving chat history
---
 web/components/FloatingChat.js | 68 ++++++++++++++++++++++++++++++----
 1 file changed, 60 insertions(+), 8 deletions(-)

diff --git a/web/components/FloatingChat.js b/web/components/FloatingChat.js
index 4b17232d..9db78e1a 100644
--- a/web/components/FloatingChat.js
+++ b/web/components/FloatingChat.js
@@ -130,22 +130,66 @@ export default function FloatingChat() {
                 </div>
               )}
 
-              {conversations.map((conv) => (
-                <button key={conv.id} style={s.convItem} onClick={() => openLiveConversation(conv.id, token)}>
+
+              {/*open & active conversations*/}
+              {conversations.filter(c => c.status === "OPEN" && c.staffId).length > 0 && (
+                <div style={s.sectionLabel}> Active 
+                </div>
+              )}
+              {conversations.filter(c => c.status === "OPEN" && c.staffId).map((conv) => (
+                <button key={conv.Id} style={s.convItem} onClick={() => openLiveConversation(conv.id, token)}>
                   <div style={s.convTop}>
                     <span style={s.convSubject}>{conv.subject || `Conversation #${conv.id}`}</span>
-                    <span style={{ ...s.statusBadge, ...(conv.status === "OPEN" ? s.statusOpen : s.statusClosed) }}>
-                      {conv.status}
-                    </span>
+                     <span style={{ ...s.statusBadge, ...s.statusOpen }}>Active</span>
                   </div>
                   <div style={s.convBottom}>
-                    <span style={s.convMode}>{conv.mode === "HUMAN" ? "👤 Live Support" : "🤖 AI Support"}</span>
+                    <span style={s.convMode}>Live Support</span>
                     <span style={s.convDate}>{conv.createdAt ? new Date(conv.createdAt).toLocaleDateString() : ""}</span>
                   </div>
+
                 </button>
-              ))}
-            </div>
+
+
+            
+          ))}
+
+          {/* Unclaimed - waiting for staff */}
+          {conversations.filter(c => c.status === "OPEN" && !c.staffId).length > 0 && (
+            <div style={s.sectionLabel}> Waiting </div>
           )}
+          {conversations.filter(c => c.status === "OPEN" && !c.staffId).map((conv) => (
+            <button key={conv.id} style={s.convItem} onClick={() => openLiveConversation(conv.id, token)}>
+            <div style={s.convTop}>
+               <span style={s.convSubject}>{conv.subject || `Conversation #${conv.id}`}</span>
+               <span style={{ ...s.statusBadge, ...s.statusUnclaimed }}>Waiting</span>
+              </div> 
+              <div style={s.convBottom}>
+                <span style={s.convMode}>⏳ Waiting for agent</span>
+                <span style={s.convDate}>{conv.createdAt ? new Date(conv.createdAt).toLocaleDateString() : ""}</span>
+    
+                </div> 
+
+            </button>
+
+          ))}
+
+          {/* Closed convesations*/}
+          {conversations.filter(c => c.status === "CLOSED").length > 0 && (
+            <div style={s.sectionLabel}> Closed</div>
+          )}
+          {conversations.filter(c => c.status === "CLOSED").map((conv) => (
+            <button key={conv.id} style={{ ...s.convItem, ...s.convItemClosed }} onClick={() => openLiveConversation(conv.id, token)}>
+             <div style={s.convTop}>
+               <span style={{ ...s.convSubject, color: "#aaa" }}>{conv.subject || `Conversation #${conv.id}`}</span>
+               <span style={{ ...s.statusBadge, ...s.statusClosed }}>Closed</span>
+               </div> 
+            </button>
+          ))}
+
+          </div>
+          )}
+
+
 
           {/* Live chat view */}
           {user && view === "live" && (
@@ -457,6 +501,14 @@ const s = {
     padding: "0.45rem 0.85rem", borderBottom: "1px solid #f0f0f0",
     background: "#fafafa", flexShrink: 0,
   },
+  statusUnclaimed: { background: "#fff8e1", color: "#f57f17" },
+  sectionLabel: {
+    fontSize: "0.7rem", fontWeight: 700, color: "#aaa",
+    padding: "0.4rem 0.85rem 0.2rem", textTransform: "uppercase",
+    letterSpacing: "0.05em", background: "#fafafa",
+  },
+
+convItemClosed: { background: "#fafafa", opacity: 0.75 },
   closedBanner: {
     background: "#f5f5f5", borderTop: "1px solid #e0e0e0", color: "#888",
     padding: "0.65rem 0.85rem", fontSize: "0.84rem", textAlign: "center", flexShrink: 0,

From 2fa7b99966936eb464eaff9901f346c8535fce52 Mon Sep 17 00:00:00 2001
From: Nikitha <nikithareddy1189@gmail.com>
Date: Wed, 15 Apr 2026 08:12:16 -0600
Subject: [PATCH 2/2] Chat Widget, changes in nav bar

Auto Scroll chat and changes in Nav bar
---
 web/app/chat/page.js             |  8 ++++-
 web/app/globals.css              | 13 +++----
 web/app/page.js                  | 38 ++++++++++++++++++++-
 web/components/FloatingChat.js   | 16 +++++++--
 web/components/Navigation.js     |  4 +--
 web/context/ChatWidgetContext.js | 58 ++++++++++++++++++++++----------
 6 files changed, 106 insertions(+), 31 deletions(-)

diff --git a/web/app/chat/page.js b/web/app/chat/page.js
index e54ea966..57692641 100644
--- a/web/app/chat/page.js
+++ b/web/app/chat/page.js
@@ -32,10 +32,16 @@ function ChatPage() {
     }
   }, [authLoading, user, router, conversationIdParam]);
 
-  useEffect(() => {
+ const prevMsgLengthRef = useRef(0);
+
+useEffect(() => {
+  if (messages.length > prevMsgLengthRef.current) {
     messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
+  }
+  prevMsgLengthRef.current = messages.length;
   }, [messages]);
 
+
   const fetchMessages = useCallback(async (convId) => {
     if (!token || !convId) return;
     try {
diff --git a/web/app/globals.css b/web/app/globals.css
index 2dbbe14a..33b7f646 100644
--- a/web/app/globals.css
+++ b/web/app/globals.css
@@ -36,7 +36,7 @@ body {
   padding: 0.5rem 2rem;
   display: flex;
   align-items: center;
-  flex-wrap: wrap;
+  justify-content: space-between;
   min-height: 70px;
   /* border-radius: 0px 0px 10px 10px; */
 }
@@ -71,17 +71,18 @@ body {
 .nav-link {
   color: #2f2f2f;
   text-decoration: none;
-  font-size: 1.1rem;
-  font-weight: 700;
+  font-size: 1.05rem;
+  font-weight: 600;
   padding: 0.5rem 1rem;
-  border-radius: 4px;
-  transition: all 0.3s ease;
+  border-radius: 6px;
+  transition: background-color 0.25s ease, color 0.25s ease;
   position: relative;
 }
 
 /* Alternative Hover Effect - Background */
 .nav-link:hover {
-  background-color: rgba(255, 255, 255, 0.171);
+  background-color: rgba(255, 255, 255, 0.25);
+  
 }
 
 
diff --git a/web/app/page.js b/web/app/page.js
index 91f71946..0f277b1d 100644
--- a/web/app/page.js
+++ b/web/app/page.js
@@ -15,7 +15,7 @@ const navImages = [
   {id: "nav-adopt", src: "/images/home/navimages/adopt.jpg", alt: "Adopt a Pet", link: "/adopt", title: "Adopt a Pet"},
   {id: "nav-products", src: "/images/home/navimages/store.jpg", alt: "Online Store", link: "/products", title: "Online Store"},
   {id: "nav-appointments", src: "/images/home/navimages/appointments.jpg", alt: "Appointments", link: "/appointments", title: "Appointments"},
-  {id: "nav-about", src: "/images/home/navimages/about.jpg", alt: "About Us", link: "/about", title: "About Us"},
+  
 ];
 
 export default function Home() {
@@ -76,6 +76,42 @@ export default function Home() {
           ))}
         </div>
       </section>
+
+       {/* About Us Section */}
+      <section className="info-page">
+        <div className="info-hero">
+          <h2 className="info-title">About Leon&apos;s Pet Store</h2>
+          <p className="info-subtitle">Pet care, adoption support, grooming, and everyday essentials in one place.</p>
+          <div className="title-decoration"></div>
+        </div>
+
+        <div className="info-content">
+          <div className="info-card">
+            <h2>What We Do</h2>
+            <p>
+              Leon&apos;s Pet Store connects families with adoptable pets, helpful services, and quality products for day-to-day pet care.
+            </p>
+          </div>
+
+          <div className="info-card">
+            <h2>Our Focus</h2>
+            <ul className="info-list">
+              <li>Support responsible pet adoption</li>
+              <li>Provide grooming and care services</li>
+              <li>Offer reliable pet supplies and essentials</li>
+              <li>Create a friendly experience for customers and staff</li>
+            </ul>
+          </div>
+
+          <div className="info-card">
+            <h2>Visit the Store</h2>
+            <p>
+              Browse adoptable pets, schedule appointments, shop products, or contact the team for help finding the right fit for a pet and household.
+            </p>
+          </div>
+        </div>
+      </section>
+
     </main>
   );
 }
diff --git a/web/components/FloatingChat.js b/web/components/FloatingChat.js
index 9db78e1a..4c6b45ab 100644
--- a/web/components/FloatingChat.js
+++ b/web/components/FloatingChat.js
@@ -21,10 +21,20 @@ export default function FloatingChat() {
 
   const [input, setInput] = useState("");
   const messagesEndRef = useRef(null);
+ const prevAiLengthRef = useRef(0);
+const prevLiveLengthRef = useRef(0);  
 
   useEffect(() => {
-    if (isOpen) messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
-  }, [aiMessages, liveMessages, isOpen]);
+  if (!isOpen) return;
+  const aiGrew = aiMessages.length > prevAiLengthRef.current;
+  const liveGrew = liveMessages.length > prevLiveLengthRef.current;
+  prevAiLengthRef.current = aiMessages.length;
+  prevLiveLengthRef.current = liveMessages.length;
+  if (aiGrew || liveGrew) {
+    messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
+  }
+}, [aiMessages, liveMessages, isOpen]);
+
 
   useEffect(() => {
     if (view === "history" && token && isOpen) loadConversations(token);
@@ -137,7 +147,7 @@ export default function FloatingChat() {
                 </div>
               )}
               {conversations.filter(c => c.status === "OPEN" && c.staffId).map((conv) => (
-                <button key={conv.Id} style={s.convItem} onClick={() => openLiveConversation(conv.id, token)}>
+                <button key={conv.id} style={s.convItem} onClick={() => openLiveConversation(conv.id, token)}>
                   <div style={s.convTop}>
                     <span style={s.convSubject}>{conv.subject || `Conversation #${conv.id}`}</span>
                      <span style={{ ...s.statusBadge, ...s.statusOpen }}>Active</span>
diff --git a/web/components/Navigation.js b/web/components/Navigation.js
index afd1ea50..5038ebd7 100644
--- a/web/components/Navigation.js
+++ b/web/components/Navigation.js
@@ -55,7 +55,7 @@ export default function DisplayNav() {
         <Link href="/appointments" className="nav-link">Appointments</Link>
         <Link href="/ai-chat" className="nav-link">Help</Link>
         <Link href="/contact" className="nav-link">Contact</Link>
-        <Link href="/about" className="nav-link">About</Link>
+      {/*}  <Link href="/about" className="nav-link">About</Link> */}
       </div>
 
       <div className="nav-auth">
@@ -131,7 +131,7 @@ export default function DisplayNav() {
           <Link href="/appointments" className="nav-drawer-link" onClick={closeMenu}>Appointments</Link>
           <Link href="/ai-chat" className="nav-drawer-link" onClick={closeMenu}>Help</Link>
           <Link href="/contact" className="nav-drawer-link" onClick={closeMenu}>Contact</Link>
-          <Link href="/about" className="nav-drawer-link" onClick={closeMenu}>About</Link>
+         {/* <Link href="/about" className="nav-drawer-link" onClick={closeMenu}>About</Link> */}
 
           <div className="nav-drawer-divider" />
 
diff --git a/web/context/ChatWidgetContext.js b/web/context/ChatWidgetContext.js
index 0b506dbf..82943654 100644
--- a/web/context/ChatWidgetContext.js
+++ b/web/context/ChatWidgetContext.js
@@ -6,13 +6,23 @@ const ChatWidgetContext = createContext(null);
 const API_BASE = "";
 
 export function ChatWidgetProvider({ children }) {
-  const [isOpen, setIsOpen]   = useState(false);
-  const [view,   setView]     = useState("ai"); // "ai" | "history" | "live"
+  const [isOpen, setIsOpen] = useState(false);
+  const [view, setView] = useState("ai"); // "ai" | "history" | "live"
 
   // AI chat
-  const [aiMessages, setAiMessages] = useState([]);
-  const [aiSending,  setAiSending]  = useState(false);
-  const [aiError,    setAiError]    = useState(null);
+  const [aiMessages, setAiMessages] = useState(() => {
+    try {
+      const saved = localStorage.getItem("fc_aiMessages");
+      return saved ? JSON.parse(saved) : [];
+    } catch { return []; }
+  });
+  const [aiSending, setAiSending] = useState(false);
+  const [aiError, setAiError] = useState(null);
+
+  // Persist aiMessages to localStorage
+  useEffect(() => {
+    localStorage.setItem("fc_aiMessages", JSON.stringify(aiMessages));
+  }, [aiMessages]);
 
   // Keep a ref so sendAiMessage stays stable (no stale-closure over messages)
   const aiMessagesRef = useRef(aiMessages);
@@ -41,17 +51,18 @@ export function ChatWidgetProvider({ children }) {
     }
   }, []);
 
-  //Live chat
-  const [conversations,  setConversations]  = useState([]);
-  const [convsLoading,   setConvsLoading]   = useState(false);
-  const [activeConvId,   setActiveConvId]   = useState(null);
-  const [activeConv,     setActiveConv]     = useState(null);
-  const [liveMessages,   setLiveMessages]   = useState([]);
-  const [liveSending,    setLiveSending]    = useState(false);
+  // Live chat
+  const [conversations, setConversations] = useState([]);
+  const [convsLoading, setConvsLoading] = useState(false);
+  const [activeConvId, setActiveConvId] = useState(null);
+  const [activeConv, setActiveConv] = useState(null);
+  const [liveMessages, setLiveMessages] = useState([]);
+  const [liveSending, setLiveSending] = useState(false);
   const [switchingToHuman, setSwitchingToHuman] = useState(false);
 
-  const pollRef      = useRef(null);
+  const pollRef = useRef(null);
   const activeConvIdRef = useRef(null);
+  const tokenRef = useRef(null); // FIX: store token so polling can restart
 
   const stopPolling = useCallback(() => {
     if (pollRef.current) { clearInterval(pollRef.current); pollRef.current = null; }
@@ -87,6 +98,7 @@ export function ChatWidgetProvider({ children }) {
   const openLiveConversation = useCallback(async (convId, token) => {
     if (!convId || !token) return;
     stopPolling();
+    tokenRef.current = token; // FIX: save token for polling restart
     setActiveConvId(convId);
     activeConvIdRef.current = convId;
     setLiveMessages([]);
@@ -137,12 +149,22 @@ export function ChatWidgetProvider({ children }) {
     }
   }, [switchingToHuman, openLiveConversation]);
 
-  // Stop polling when navigating away from live view or closing widget
-  useEffect(() => { if (view !== "live") stopPolling(); }, [view, stopPolling]);
-  useEffect(() => { if (!isOpen) stopPolling(); }, [isOpen, stopPolling]);
+  // FIX: Single effect that handles both stopping AND restarting polling
+  useEffect(() => {
+    if (!isOpen || view !== "live") {
+      stopPolling();
+    } else if (isOpen && view === "live" && activeConvIdRef.current && tokenRef.current) {
+      stopPolling();
+      fetchLiveMessages(activeConvIdRef.current, tokenRef.current);
+      pollRef.current = setInterval(
+        () => fetchLiveMessages(activeConvIdRef.current, tokenRef.current),
+        2500
+      );
+    }
+  }, [isOpen, view, stopPolling, fetchLiveMessages]);
 
   const toggleOpen = useCallback(() => setIsOpen((o) => !o), []);
-  const openView   = useCallback((v) => setView(v), []);
+  const openView = useCallback((v) => setView(v), []);
 
   return (
     <ChatWidgetContext.Provider value={{
@@ -163,4 +185,4 @@ export function useChatWidget() {
   const ctx = useContext(ChatWidgetContext);
   if (!ctx) throw new Error("useChatWidget must be used within ChatWidgetProvider");
   return ctx;
-}
+}
\ No newline at end of file