Merge pull request #254 from RecentRunner/web-v1

Web v1

backend/src/main/java/com/petshop/backend/controller/CartController.java

@@ -91,4 +91,13 @@ public class CartController {
 
         return ResponseEntity.noContent().build();
     }
+
+    @PostMapping("/checkout/cancel")
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<Void> cancelCheckout(@RequestParam Long storeId) {
+        Long userId = AuthenticationHelper.getAuthenticatedUserId();
+        cartService.cancelCheckout(userId, storeId);
+
+        return ResponseEntity.noContent().build();
+    }
 }

backend/src/main/java/com/petshop/backend/controller/ChatController.java

@@ -68,9 +68,10 @@ public class ChatController {
 
     @GetMapping("/conversations")
     @PreAuthorize("hasAnyRole('CUSTOMER', 'STAFF', 'ADMIN')")
-    public ResponseEntity<List<ConversationResponse>> getConversations() {
+    public ResponseEntity<List<ConversationResponse>> getConversations(
+            @RequestParam(required = false, defaultValue = "false") boolean mine) {
         User user = getCurrentUser();
-        List<ConversationResponse> conversations = chatService.getConversations(user.getId(), user.getRole());
+        List<ConversationResponse> conversations = chatService.getConversations(user.getId(), user.getRole(), mine);
         return ResponseEntity.ok(conversations);
     }
 

backend/src/main/java/com/petshop/backend/dto/cart/CartResponse.java

@@ -16,6 +16,7 @@ public class CartResponse {
     private String couponCode;
     private Boolean pointsApplied;
     private Integer availableLoyaltyPoints;
+    private Boolean checkoutPending;
 
     public CartResponse() {
     }
@@ -53,4 +54,7 @@ public class CartResponse {
     public Integer getAvailableLoyaltyPoints() { return availableLoyaltyPoints; }
     public void setAvailableLoyaltyPoints(Integer availableLoyaltyPoints) { this.availableLoyaltyPoints = availableLoyaltyPoints; }
 
+    public Boolean getCheckoutPending() { return checkoutPending; }
+    public void setCheckoutPending(Boolean checkoutPending) { this.checkoutPending = checkoutPending; }
+
 }

backend/src/main/java/com/petshop/backend/service/CartService.java

@@ -482,15 +482,21 @@ public class CartService {
         List<CartItemResponse> itemResponses = cartItemRepository
                 .findByCartCartId(cart.getCartId())
                 .stream()
-                .map(item -> new CartItemResponse(
+                .map(item -> {
-                        item.getCartItemId(),
+                    String rawImageUrl = item.getProduct().getImageUrl();
-                        item.getProduct().getProdId(),
+                    String imageUrl = (rawImageUrl != null && !rawImageUrl.isBlank())
-                        item.getProduct().getProdName(),
+                            ? "/api/v1/products/" + item.getProduct().getProdId() + "/image"
-                        item.getProduct().getImageUrl(),
+                            : null;
-                        item.getUnitPrice(),
+                    return new CartItemResponse(
-                        item.getQuantity(),
+                            item.getCartItemId(),
-                        item.getUnitPrice().multiply(BigDecimal.valueOf(item.getQuantity()))
+                            item.getProduct().getProdId(),
-                ))
+                            item.getProduct().getProdName(),
+                            imageUrl,
+                            item.getUnitPrice(),
+                            item.getQuantity(),
+                            item.getUnitPrice().multiply(BigDecimal.valueOf(item.getQuantity()))
+                    );
+                })
                 .toList();
 
         CartResponse response = new CartResponse();
@@ -505,7 +511,23 @@ public class CartService {
         response.setCouponCode(cart.getCoupon() != null ? cart.getCoupon().getCouponCode() : null);
         response.setPointsApplied(cart.getPointsApplied());
         response.setAvailableLoyaltyPoints(cart.getUser() != null ? cart.getUser().getLoyaltyPoints() : null);
+        response.setCheckoutPending(cart.getCheckoutPending());
 
         return response;
     }
+
+    @Transactional
+    public void cancelCheckout(Long userId, Long storeId) {
+        cartRepository.findActiveCartByUserAndStore(userId, storeId, "ACTIVE")
+                .ifPresent(cart -> {
+                    if (!Boolean.TRUE.equals(cart.getCheckoutPending())) {
+                        return;
+                    }
+                    cart.setCheckoutPending(false);
+                    cart.setCheckoutAmount(null);
+                    cart.setCheckoutStartedAt(null);
+                    cart.setCheckoutPaymentIntentId(null);
+                    cartRepository.save(cart);
+                });
+    }
 }

backend/src/main/java/com/petshop/backend/service/ChatService.java

@@ -65,10 +65,10 @@ public class ChatService {
         return ConversationResponse.fromEntity(conversation, request.getMessage(), userId);
     }
 
-    public List<ConversationResponse> getConversations(Long userId, User.Role role) {
+    public List<ConversationResponse> getConversations(Long userId, User.Role role, boolean mine) {
         List<Conversation> conversations;
 
-        if (role == User.Role.CUSTOMER) {
+        if (mine || role == User.Role.CUSTOMER) {
             conversations = conversationRepository.findByCustomerId(userId);
         } else if (role == User.Role.STAFF) {
             List<Conversation> assignedToMe = conversationRepository.findByStaffId(userId);

web/app/adopt/page.js

@@ -15,7 +15,6 @@ export default function AdoptPage() {
   const [pets, setPets] = useState([]);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
-  const [health, setHealth] = useState(null);
 
   const [search, setSearch] = useState("");
   const [query, setQuery] = useState("");
@@ -26,16 +25,9 @@ export default function AdoptPage() {
   // Species options come from a dedicated fetch (only store-filtered, no species filter)
   const [speciesOptions, setSpeciesOptions] = useState([]);
 
-  // ---------- health check ----------
-  useEffect(() => {
-    fetch(`${API_BASE}/api/v1/health`)
-      .then((res) => (res.ok ? setHealth("online") : setHealth("error")))
-      .catch(() => setHealth("offline"));
-  }, []);
-
   useEffect(() => {
     setSelectedSpecies("");
-    const params = new URLSearchParams({ status: "Available", page: "0", size: String(PAGE_SIZE) });
+    const params = new URLSearchParams({ page: "0", size: String(PAGE_SIZE) });
     if (selectedStoreId) params.set("storeId", String(selectedStoreId));
 
     fetch(`${API_BASE}/api/v1/pets?${params}`)
@@ -62,7 +54,6 @@ export default function AdoptPage() {
         page: String(page),
         size: String(PAGE_SIZE),
         sort: "id,asc",
-        status: "Available",
       });
       if (query) params.set("q", query);
       if (selectedSpecies) params.set("species", selectedSpecies);
@@ -161,15 +152,6 @@ export default function AdoptPage() {
               Clear Filters
             </button>
           )}
-
-          <span
-            className={`backend-status backend-status--${health ?? "checking"}`}
-            title={
-              health === "online" ? "Backend online" :
-              health === "offline" ? "Backend offline" :
-              health === "error" ? "Backend error" : "Checking…"
-            }
-          />
         </div>
       </section>
 
@@ -180,13 +162,7 @@ export default function AdoptPage() {
           <div className="adopt-error-box">
             <p className="adopt-error-title">Failed to load pets</p>
             <code className="adopt-error-detail">{error}</code>
-            <p className="adopt-error-hint">
+            <p className="adopt-error-hint">Make sure the backend is running and try again.</p>
-              {health === "offline"
-                ? "The Spring Boot backend is not reachable. Make sure it is running in IntelliJ on port 8080."
-                : health === "error"
-                ? "The backend responded with an error. Check the IntelliJ Run console for stack traces."
-                : "The backend is reachable but the /pets endpoint failed. Check the IntelliJ Run console."}
-            </p>
           </div>
         )}
 

web/app/cart/page.js

@@ -85,6 +85,7 @@ export default function CartPage() {
     clearCart,
     applyCoupon,
     checkout,
+    cancelCheckout,
   } = useCart();
   const router = useRouter();
 
@@ -114,6 +115,14 @@ export default function CartPage() {
     }
   }, [cart]);
 
+  // If the cart arrives already locked (e.g. user closed the page mid-checkout)
+  // and there is no active Stripe session, release the lock automatically.
+  useEffect(() => {
+    if (cart?.checkoutPending && !clientSecret) {
+      cancelCheckout().catch(() => {});
+    }
+  }, [cart?.checkoutPending, clientSecret, cancelCheckout]);
+
   async function handleQuantityChange(cartItemId, newQty) {
     if (newQty < 1) {
       return;
@@ -351,7 +360,10 @@ export default function CartPage() {
                     setClientSecret(null);
                     setConfirmed(true);
                   }}
-                  onCancel={() => setClientSecret(null)}
+                  onCancel={async () => {
+                    await cancelCheckout().catch(() => {});
+                    setClientSecret(null);
+                  }}
                 />
               </Elements>
             )}

web/app/globals.css

@@ -30,13 +30,14 @@ body {
   top: 0;
   left: 0;
   width: 100%;
-  background: orange;
+  background: #e68672;
   box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
   z-index: 1000;
   padding: 0.5rem 2rem;
   display: flex;
   align-items: center;
-  height: 70px;
+  flex-wrap: wrap;
+  min-height: 70px;
   border-radius: 0px 0px 10px 10px;
 }
 
@@ -62,14 +63,18 @@ body {
   display: flex;
   align-items: center;
   gap: 2rem;
-  margin-left: 2rem;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
 }
 
 /* Indivdual Link Styles */
 .nav-link {
-  color: rgb(255, 255, 255);
+  color: #2f2f2f;
   text-decoration: none;
   font-size: 1.1rem;
+  font-weight: 700;
   padding: 0.5rem 1rem;
   border-radius: 4px;
   transition: all 0.3s ease;
@@ -365,7 +370,7 @@ body {
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 160px;
+  aspect-ratio: 1 / 1;
 }
 
 .pet-card-emoji {
@@ -380,31 +385,34 @@ body {
 }
 
 .pet-card-body {
-  padding: 1rem 1.25rem 1.25rem;
+  padding: 0.6rem 0.75rem 0.75rem;
   display: flex;
   flex-direction: column;
-  gap: 0.3rem;
+  gap: 0.2rem;
 }
 
 .pet-card-name {
-  font-size: 1.2rem;
+  font-size: 0.95rem;
   font-weight: 700;
   color: #222;
   margin: 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .pet-card-species {
-  font-size: 0.95rem;
+  font-size: 0.8rem;
   color: #666;
   margin: 0;
 }
 
 .pet-card-status {
   display: inline-block;
-  margin-top: 0.4rem;
+  margin-top: 0.2rem;
-  padding: 0.2rem 0.75rem;
+  padding: 0.15rem 0.5rem;
   border-radius: 20px;
-  font-size: 0.8rem;
+  font-size: 0.7rem;
   font-weight: 600;
   text-transform: capitalize;
   width: fit-content;
@@ -595,6 +603,71 @@ body {
   margin: 0 0 1rem;
 }
 
+.product-qty-row {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+  margin-bottom: 1rem;
+}
+
+.product-qty-label {
+  font-size: 0.95rem;
+  font-weight: 600;
+  color: #555;
+}
+
+.product-qty-controls {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.product-add-to-cart-btn {
+  width: 100%;
+  padding: 0.85rem;
+  background: #e68672;
+  color: #2f2f2f;
+  border: none;
+  border-radius: 10px;
+  font-size: 1rem;
+  font-weight: 700;
+  cursor: pointer;
+  transition: background 0.2s ease, transform 0.1s ease;
+}
+
+.product-add-to-cart-btn:hover:not(:disabled) {
+  background: #d4705e;
+  color: #fff;
+}
+
+.product-add-to-cart-btn:active:not(:disabled) {
+  transform: scale(0.98);
+}
+
+.product-add-to-cart-btn:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+
+.product-cart-feedback {
+  margin: 0.75rem 0 0;
+  font-size: 0.9rem;
+  border-radius: 8px;
+  padding: 0.6rem 1rem;
+}
+
+.product-cart-feedback--success {
+  background: #f0fff4;
+  border: 1px solid #b2dfdb;
+  color: #1a7a3c;
+}
+
+.product-cart-feedback--error {
+  background: #fff0f0;
+  border: 1px solid #f5c6c6;
+  color: #c0392b;
+}
+
 .pet-detail-cta-btn {
   display: inline-block;
   padding: 0.65rem 1.5rem;
@@ -733,8 +806,8 @@ body {
   }
 
   .adopt-grid {
-    grid-template-columns: repeat(2, 1fr);
+    grid-template-columns: repeat(3, 1fr);
-    gap: 1.25rem;
+    gap: 1rem;
   }
 
   .pet-detail-card {
@@ -754,7 +827,8 @@ body {
 
 @media (max-width: 480px) {
   .adopt-grid {
-    grid-template-columns: 1fr;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 0.6rem;
   }
 
   .adopt-hero-title,
@@ -884,29 +958,6 @@ body {
   gap: 1rem;
 }
 
-.backend-status {
-  display: inline-block;
-  width: 12px;
-  height: 12px;
-  border-radius: 50%;
-  flex-shrink: 0;
-}
-
-.backend-status--online {
-  background: #1a7a3c;
-}
-
-.backend-status--offline {
-  background: #c0392b;
-}
-
-.backend-status--error {
-  background: #e67e00;
-}
-
-.backend-status--checking {
-  background: #bbb;
-}
 
 .adopt-error-box {
   max-width: 640px;
@@ -959,26 +1010,26 @@ body {
 }
 
 .nav-greeting {
-  font-weight: 600;
+  font-weight: 700;
   white-space: nowrap;
 }
 
 .nav-register-btn {
-  background: white;
+  background: #2f2f2f;
-  color: orange !important;
+  color: #e68672 !important;
   font-weight: 600;
   border-radius: 20px;
   padding: 0.4rem 1rem !important;
 }
 
 .nav-register-btn:hover {
-  background: #fff3e0 !important;
+  background: #444 !important;
 }
 
 .nav-logout-btn {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(47, 47, 47, 0.15);
-  color: white;
+  color: #2f2f2f;
-  border: 1px solid rgba(255, 255, 255, 0.6);
+  border: 1px solid rgba(47, 47, 47, 0.4);
   border-radius: 20px;
   padding: 0.35rem 1rem;
   font-size: 0.95rem;
@@ -988,7 +1039,7 @@ body {
 }
 
 .nav-logout-btn:hover {
-  background: rgba(255, 255, 255, 0.35);
+  background: rgba(47, 47, 47, 0.25);
 }
 
 /* Login/Register */
@@ -1896,12 +1947,12 @@ body {
   color: #333;
 }
 
-/* ── Store Selector ──────────────────────────────────────── */
+/* Store Selector */
 
 .nav-store-select {
-  background: rgba(255, 255, 255, 0.15);
+  background: rgba(47, 47, 47, 0.1);
-  color: white;
+  color: #2f2f2f;
-  border: 1px solid rgba(255, 255, 255, 0.4);
+  border: 1px solid rgba(47, 47, 47, 0.35);
   border-radius: 6px;
   padding: 0.3rem 0.6rem;
   font-size: 0.9rem;
@@ -1912,15 +1963,15 @@ body {
 }
 
 .nav-store-select option {
-  background: #333;
+  background: #fff;
-  color: white;
+  color: #2f2f2f;
 }
 
 .nav-store-select:hover {
-  background: rgba(255, 255, 255, 0.25);
+  background: rgba(47, 47, 47, 0.2);
 }
 
-/* ── Cart Badge ──────────────────────────────────────────── */
+/* Cart Badge */
 
 .nav-cart-btn {
   position: relative;
@@ -2422,3 +2473,365 @@ body {
 
 @keyframes bounce { 0%, 80%, 100% { transform: translateY(0); } 40% { transform: translateY(-6px); } }
 @keyframes spin { to { transform: rotate(360deg); } }
+
+/* Floating chat widget */
+.fc-dot {
+  display: inline-block;
+  width: 7px;
+  height: 7px;
+  border-radius: 50%;
+  background: #aaa;
+  animation: bounce 1s infinite;
+}
+
+/* Footer */
+.site-footer {
+  background: #e68672;
+  color: #2f2f2f;
+  margin-top: 4rem;
+  border-radius: 10px 10px 0 0;
+}
+
+.footer-container {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 3rem 2rem 2rem;
+  display: grid;
+  grid-template-columns: 2fr 1fr 1fr 1fr;
+  gap: 2rem;
+}
+
+.footer-logo {
+  border-radius: 50%;
+  margin-bottom: 0.75rem;
+}
+
+.footer-tagline {
+  font-size: 0.95rem;
+  line-height: 1.5;
+  opacity: 0.9;
+  max-width: 260px;
+}
+
+.footer-heading {
+  font-size: 1rem;
+  font-weight: 700;
+  margin-bottom: 1rem;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+}
+
+.footer-links {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+
+.footer-links a {
+  color: #2f2f2f;
+  text-decoration: none;
+  font-size: 0.95rem;
+  opacity: 0.85;
+  transition: opacity 0.2s ease;
+}
+
+.footer-links a:hover {
+  opacity: 1;
+  text-decoration: underline;
+}
+
+.footer-contact li {
+  font-size: 0.95rem;
+  opacity: 0.85;
+}
+
+.footer-bottom {
+  border-top: 1px solid rgba(47, 47, 47, 0.2);
+  text-align: center;
+  padding: 1rem 2rem;
+  font-size: 0.85rem;
+  opacity: 0.8;
+}
+
+@media (max-width: 900px) {
+  .footer-container {
+    grid-template-columns: 1fr 1fr;
+  }
+  .footer-brand {
+    grid-column: 1 / -1;
+  }
+}
+
+@media (max-width: 550px) {
+  .footer-container {
+    grid-template-columns: 1fr;
+  }
+}
+
+/* Mobile / Responsive */
+
+@media (max-width: 768px) {
+  .navbar {
+    padding: 0.5rem 1rem;
+  }
+}
+
+/* Hamburger button – hidden on desktop */
+.nav-mobile-bar {
+  display: none;
+}
+
+.nav-hamburger {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  gap: 5px;
+  width: 36px;
+  height: 36px;
+  background: transparent;
+  border: none;
+  cursor: pointer;
+  padding: 4px;
+  border-radius: 6px;
+  transition: background 0.2s ease;
+}
+
+.nav-hamburger:hover {
+  background: rgba(47, 47, 47, 0.12);
+}
+
+.nav-hamburger span {
+  display: block;
+  height: 2px;
+  width: 100%;
+  background: #2f2f2f;
+  border-radius: 2px;
+  transition: transform 0.25s ease, opacity 0.25s ease;
+  transform-origin: center;
+}
+
+/* Animate bars to X when open */
+.nav-hamburger--open span:nth-child(1) {
+  transform: translateY(7px) rotate(45deg);
+}
+.nav-hamburger--open span:nth-child(2) {
+  opacity: 0;
+}
+.nav-hamburger--open span:nth-child(3) {
+  transform: translateY(-7px) rotate(-45deg);
+}
+
+/* Mobile slide-down drawer */
+.nav-drawer {
+  display: none;
+}
+
+@media (max-width: 768px) {
+  /* Show hamburger bar, hide desktop nav */
+  .nav-mobile-bar {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    margin-left: auto;
+  }
+
+  .nav-links,
+  .nav-auth {
+    display: none;
+  }
+
+  /* Drawer panel */
+  .nav-drawer {
+    display: flex;
+    flex-direction: column;
+    position: absolute;
+    top: 70px;
+    left: 0;
+    width: 100%;
+    background: #e68672;
+    padding: 1rem 1.5rem 1.5rem;
+    z-index: 999;
+    box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
+    border-radius: 0 0 10px 10px;
+    gap: 0.25rem;
+  }
+
+  .nav-drawer-link {
+    display: block;
+    color: #2f2f2f;
+    text-decoration: none;
+    font-size: 1.05rem;
+    font-weight: 500;
+    padding: 0.65rem 0.5rem;
+    border-radius: 6px;
+    transition: background 0.2s ease;
+  }
+
+  .nav-drawer-link:hover {
+    background: rgba(47, 47, 47, 0.1);
+  }
+
+  .nav-drawer-link--register {
+    margin-top: 0.25rem;
+    background: #2f2f2f;
+    color: #e68672 !important;
+    font-weight: 700;
+    border-radius: 20px;
+    padding: 0.6rem 1rem;
+    text-align: center;
+  }
+
+  .nav-drawer-link--register:hover {
+    background: #444 !important;
+  }
+
+  .nav-drawer-divider {
+    height: 1px;
+    background: rgba(47, 47, 47, 0.2);
+    margin: 0.5rem 0;
+  }
+
+  .nav-store-select--drawer {
+    width: 100%;
+    margin: 0 0 0.25rem;
+  }
+
+  .nav-logout-btn--drawer {
+    width: 100%;
+    margin-top: 0.25rem;
+    border-radius: 8px;
+    padding: 0.65rem;
+    font-size: 1rem;
+  }
+}
+
+/* Cart item row – stack on small screens */
+@media (max-width: 600px) {
+  .cart-item-row {
+    grid-template-columns: 56px 1fr;
+    grid-template-rows: auto auto;
+    gap: 0.5rem 0.75rem;
+  }
+
+  .cart-item-img {
+    width: 56px;
+    height: 56px;
+    grid-row: 1 / 3;
+  }
+
+  .cart-item-details {
+    grid-column: 2;
+    grid-row: 1;
+  }
+
+  .cart-item-qty-controls {
+    grid-column: 2;
+    grid-row: 2;
+  }
+
+  .cart-item-line-total {
+    display: none;
+  }
+
+  .cart-item-remove {
+    position: absolute;
+    top: 0.75rem;
+    right: 0;
+  }
+
+  .cart-item-row {
+    position: relative;
+    padding-right: 2rem;
+  }
+}
+
+/* Adopt filters - stack vertically on mobile */
+@media (max-width: 600px) {
+  .adopt-filters-row {
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  .adopt-filter-group {
+    min-width: 0;
+    width: 100%;
+  }
+
+  .adopt-filter-select {
+    width: 100%;
+  }
+
+  .adopt-search-form {
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  .adopt-search-input {
+    max-width: 100%;
+  }
+
+  .adopt-search-btn,
+  .adopt-clear-btn {
+    width: 100%;
+  }
+}
+
+/* Appointments - fix adopt grid on narrow screens */
+@media (max-width: 480px) {
+  .appt-adopt-grid {
+    grid-template-columns: 1fr;
+  }
+
+  .appt-modal {
+    margin: 1rem;
+    padding: 1.25rem;
+  }
+
+  .appt-slots-grid {
+    gap: 0.4rem;
+  }
+
+  .appt-slot-btn {
+    padding: 0.5rem 0.75rem;
+    font-size: 0.9rem;
+  }
+}
+
+/* Auth pages - reduce padding on very small screens */
+@media (max-width: 480px) {
+  .auth-card {
+    padding: 1.5rem 1.25rem;
+  }
+
+  .auth-title {
+    font-size: 1.4rem;
+  }
+}
+
+/* Profile - tighten padding on mobile */
+@media (max-width: 480px) {
+  .profile-card {
+    padding: 1.5rem 1.25rem;
+  }
+
+  .profile-pets-section {
+    padding: 1.25rem;
+  }
+
+  .profile-pets-header {
+    flex-wrap: wrap;
+    gap: 0.5rem;
+  }
+}
+
+/* General – prevent horizontal overflow on all pages */
+html, body {
+  overflow-x: hidden;
+}
+
+img, video, iframe {
+  max-width: 100%;
+}

web/app/layout.js

@@ -1,6 +1,7 @@
 import { Geist, Geist_Mono } from "next/font/google";
 import "./globals.css";
 import DisplayNav from "@/components/Navigation";
+import Footer from "@/components/Footer";
 import ClientProviders from "@/components/ClientProviders";
 
 export const metadata = {
@@ -15,6 +16,7 @@ export default function RootLayout({children}) {
         <ClientProviders>
           <DisplayNav />
           {children}
+          <Footer />
         </ClientProviders>
       </body>
     </html>

web/app/products/[id]/page.js

@@ -41,6 +41,7 @@ export default function ProductDetailPage() {
 
         {!loading && !error && product && (
           <ProductProfile
+            prodId={product.prodId}
             prodName={product.prodName}
             categoryName={product.categoryName}
             prodDesc={product.prodDesc}

web/components/ClientProviders.js

@@ -2,11 +2,18 @@
 
 import { AuthProvider } from "@/context/AuthContext";
 import { CartProvider } from "@/context/CartContext";
+import { ChatWidgetProvider } from "@/context/ChatWidgetContext";
+import FloatingChat from "@/components/FloatingChat";
 
 export default function ClientProviders({ children }) {
   return (
     <AuthProvider>
-      <CartProvider>{children}</CartProvider>
+      <CartProvider>
+        <ChatWidgetProvider>
+          {children}
+          <FloatingChat />
+        </ChatWidgetProvider>
+      </CartProvider>
     </AuthProvider>
   );
 }

web/components/FloatingChat.js

@@ -0,0 +1,464 @@
+"use client";
+
+import { useState, useRef, useEffect } from "react";
+import Link from "next/link";
+import { usePathname } from "next/navigation";
+import { useAuth } from "@/context/AuthContext";
+import { useChatWidget } from "@/context/ChatWidgetContext";
+
+export default function FloatingChat() {
+  const pathname = usePathname();
+  const { user, token } = useAuth();
+  const {
+    isOpen, toggleOpen,
+    view, openView,
+    aiMessages, aiSending, aiError, setAiError, sendAiMessage,
+    conversations, convsLoading, loadConversations,
+    activeConvId, activeConv, liveMessages, liveSending,
+    openLiveConversation, sendLiveMessage,
+    startLiveChat, switchingToHuman,
+  } = useChatWidget();
+
+  const [input, setInput] = useState("");
+  const messagesEndRef = useRef(null);
+
+  useEffect(() => {
+    if (isOpen) messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
+  }, [aiMessages, liveMessages, isOpen]);
+
+  useEffect(() => {
+    if (view === "history" && token && isOpen) loadConversations(token);
+  }, [view, token, isOpen, loadConversations]);
+
+  // Hide widget on dedicated chat pages
+  if (pathname === "/ai-chat" || pathname === "/chat") return null;
+
+  const openConvCount = conversations.filter((c) => c.status === "OPEN").length;
+  const isLiveClosed  = activeConv?.status === "CLOSED";
+
+  async function handleSend(e) {
+    e?.preventDefault();
+    const text = input.trim();
+    if (!text) return;
+    setInput("");
+    if (view === "ai") {
+      await sendAiMessage(text, token);
+    } else if (view === "live" && activeConvId) {
+      await sendLiveMessage(text, token, activeConvId);
+    }
+  }
+
+  function handleKeyDown(e) {
+    if (e.key === "Enter" && !e.shiftKey) { e.preventDefault(); handleSend(); }
+  }
+
+  return (
+    <>
+      {/* Floating toggle button */}
+      <button onClick={toggleOpen} style={s.fab} aria-label={isOpen ? "Close chat" : "Open chat"}>
+        <span style={{ fontSize: "1.4rem", lineHeight: 1 }}>{isOpen ? "✕" : "💬"}</span>
+        {!isOpen && openConvCount > 0 && <span style={s.fabBadge}>{openConvCount}</span>}
+      </button>
+
+      {/* Chat window */}
+      {isOpen && (
+        <div style={s.window}>
+
+          {/* Header */}
+          <div style={s.header}>
+            <div style={s.headerLeft}>
+              <div style={s.headerAvatar}>🐾</div>
+              <div>
+                <div style={s.headerTitle}>Leon's Assistant</div>
+                <div style={s.headerSub}>
+                  {view === "live"
+                    ? (activeConv?.mode === "HUMAN" ? "Live Support" : "AI Support")
+                    : view === "history" ? "Your Conversations"
+                    : "AI Chat"}
+                </div>
+              </div>
+            </div>
+            <div style={s.headerRight}>
+              {view !== "ai" && (
+                <button style={s.headerNavBtn} onClick={() => openView("ai")}>AI</button>
+              )}
+              <button
+                style={{ ...s.headerNavBtn, ...(view === "history" ? s.headerNavBtnActive : {}) }}
+                onClick={() => openView("history")}
+              >
+                History
+              </button>
+              <button style={s.headerClose} onClick={toggleOpen} aria-label="Close">✕</button>
+            </div>
+          </div>
+
+          {/* Guest */}
+          {!user && (
+            <div style={s.guestBody}>
+              <span style={{ fontSize: "2.5rem" }}>🐾</span>
+              <p style={{ color: "#555", fontSize: "0.95rem", margin: "0.75rem 0 1.25rem", textAlign: "center" }}>
+                Log in to chat with our pet assistant!
+              </p>
+              <Link href="/login" style={s.loginBtn} onClick={toggleOpen}>Log In</Link>
+            </div>
+          )}
+
+          {/* History view */}
+          {user && view === "history" && (
+            <div style={{ flex: 1, overflowY: "auto", display: "flex", flexDirection: "column" }}>
+              <div style={s.historyToolbar}>
+                <button
+                  style={{ ...s.newChatBtn, ...(switchingToHuman ? s.disabledBtn : {}) }}
+                  onClick={() => startLiveChat(token)}
+                  disabled={switchingToHuman}
+                >
+                  {switchingToHuman ? "Starting…" : "+ New Live Chat"}
+                </button>
+                <button style={s.aiTabBtn} onClick={() => openView("ai")}>AI Chat</button>
+              </div>
+
+              {convsLoading && (
+                <p style={{ color: "#aaa", fontSize: "0.85rem", padding: "1.25rem", textAlign: "center" }}>
+                  Loading…
+                </p>
+              )}
+
+              {!convsLoading && conversations.length === 0 && (
+                <div style={{ ...s.empty, flex: 1 }}>
+                  <span style={{ fontSize: "2rem" }}>💬</span>
+                  <p style={s.emptyText}>No conversations yet.<br />Start a live chat above.</p>
+                </div>
+              )}
+
+              {conversations.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>
+                  </div>
+                  <div style={s.convBottom}>
+                    <span style={s.convMode}>{conv.mode === "HUMAN" ? "👤 Live Support" : "🤖 AI Support"}</span>
+                    <span style={s.convDate}>{conv.createdAt ? new Date(conv.createdAt).toLocaleDateString() : ""}</span>
+                  </div>
+                </button>
+              ))}
+            </div>
+          )}
+
+          {/* Live chat view */}
+          {user && view === "live" && (
+            <>
+              {activeConv && (
+                <div style={s.liveStatus}>
+                  <span style={{ ...s.statusBadge, ...(activeConv.status === "OPEN" ? s.statusOpen : s.statusClosed) }}>
+                    {activeConv.status}
+                  </span>
+                  <span style={s.convMode}>
+                    {activeConv.mode === "HUMAN" ? "👤 Live Support" : "🤖 AI Support"}
+                  </span>
+                  <Link href={`/chat?id=${activeConvId}`} style={s.fullPageLink} onClick={toggleOpen}>
+                    Full page ↗
+                  </Link>
+                </div>
+              )}
+
+              <div style={s.messages}>
+                {liveMessages.length === 0 && (
+                  <div style={s.empty}>
+                    <p style={{ color: "#aaa", fontSize: "0.85rem" }}>No messages yet.</p>
+                  </div>
+                )}
+                {liveMessages.map((msg) => {
+                  const isUser = msg.senderRole === "CUSTOMER";
+                  return (
+                    <div key={msg.id} style={{ ...s.row, ...(isUser ? s.rowUser : s.rowOther) }}>
+                      {!isUser && (
+                        <div style={s.otherAvatar}>{msg.senderRole === "BOT" ? "🐾" : "👤"}</div>
+                      )}
+                      <div style={{ ...s.bubble, ...(isUser ? s.bubbleUser : s.bubbleOther) }}>
+                        {!isUser && (
+                          <div style={s.senderName}>
+                            {msg.senderName || (msg.senderRole === "BOT" ? "AI Bot" : "Staff")}
+                          </div>
+                        )}
+                        {msg.content}
+                      </div>
+                      {isUser && (
+                        <div style={s.userAvatar}>
+                          {user?.fullName ? user.fullName.charAt(0).toUpperCase() : "U"}
+                        </div>
+                      )}
+                    </div>
+                  );
+                })}
+                <div ref={messagesEndRef} />
+              </div>
+
+              {isLiveClosed ? (
+                <div style={s.closedBanner}>This conversation is closed.</div>
+              ) : (
+                <form style={s.inputRow} onSubmit={handleSend}>
+                  <input
+                    style={s.input}
+                    value={input}
+                    onChange={(e) => setInput(e.target.value)}
+                    onKeyDown={handleKeyDown}
+                    placeholder="Type a message…"
+                    disabled={liveSending}
+                    autoComplete="off"
+                  />
+                  <button type="submit"
+                    style={{ ...s.sendBtn, ...(!input.trim() || liveSending ? s.sendBtnDisabled : {}) }}
+                    disabled={!input.trim() || liveSending}>➤</button>
+                </form>
+              )}
+            </>
+          )}
+
+          {/* AI chat view */}
+          {user && view === "ai" && (
+            <>
+              <div style={s.toolbar}>
+                <Link href="/ai-chat" style={s.fullPageLink} onClick={toggleOpen}>Open full page ↗</Link>
+                <button
+                  style={{ ...s.humanBtn, ...(switchingToHuman ? s.disabledBtn : {}) }}
+                  onClick={() => startLiveChat(token)}
+                  disabled={switchingToHuman}
+                >
+                  {switchingToHuman ? "Connecting…" : "Chat with a human"}
+                </button>
+              </div>
+
+              <div style={s.messages}>
+                {aiMessages.length === 0 && (
+                  <div style={s.empty}>
+                    <span style={{ fontSize: "2rem" }}>🐾</span>
+                    <p style={s.emptyText}>
+                      Hi{user?.fullName ? `, ${user.fullName.split(" ")[0]}` : ""}!<br />
+                      Ask me anything about pets.
+                    </p>
+                  </div>
+                )}
+
+                {aiMessages.map((msg) => (
+                  <div key={msg.id} style={{ ...s.row, ...(msg.role === "user" ? s.rowUser : s.rowOther) }}>
+                    {msg.role === "assistant" && <div style={s.otherAvatar}>🐾</div>}
+                    <div style={{ ...s.bubble, ...(msg.role === "user" ? s.bubbleUser : s.bubbleOther) }}>
+                      {msg.content.split("\n").map((line, i, arr) => (
+                        <span key={i}>{line}{i < arr.length - 1 && <br />}</span>
+                      ))}
+                    </div>
+                    {msg.role === "user" && (
+                      <div style={s.userAvatar}>
+                        {user?.fullName ? user.fullName.charAt(0).toUpperCase() : "U"}
+                      </div>
+                    )}
+                  </div>
+                ))}
+
+                {aiSending && (
+                  <div style={{ ...s.row, ...s.rowOther }}>
+                    <div style={s.otherAvatar}>🐾</div>
+                    <div style={{ ...s.bubble, ...s.bubbleOther, ...s.typingBubble }}>
+                      <span className="fc-dot" />
+                      <span className="fc-dot" style={{ animationDelay: "0.2s" }} />
+                      <span className="fc-dot" style={{ animationDelay: "0.4s" }} />
+                    </div>
+                  </div>
+                )}
+
+                {aiError && (
+                  <div style={s.errorBar}>
+                    {aiError}
+                    <button style={s.errorClose} onClick={() => setAiError(null)}>✕</button>
+                  </div>
+                )}
+
+                <div ref={messagesEndRef} />
+              </div>
+
+              <form style={s.inputRow} onSubmit={handleSend}>
+                <input
+                  style={s.input}
+                  value={input}
+                  onChange={(e) => setInput(e.target.value)}
+                  onKeyDown={handleKeyDown}
+                  placeholder="Ask about pet care…"
+                  disabled={aiSending}
+                  autoComplete="off"
+                />
+                <button type="submit"
+                  style={{ ...s.sendBtn, ...(!input.trim() || aiSending ? s.sendBtnDisabled : {}) }}
+                  disabled={!input.trim() || aiSending}>➤</button>
+              </form>
+            </>
+          )}
+
+        </div>
+      )}
+    </>
+  );
+}
+
+// Styles
+const s = {
+  fab: {
+    position: "fixed", bottom: 24, right: 24,
+    width: 56, height: 56, borderRadius: "50%",
+    background: "#e68672", color: "#2f2f2f", border: "none",
+    cursor: "pointer", zIndex: 9999,
+    boxShadow: "0 4px 18px rgba(0,0,0,0.22)",
+    display: "flex", alignItems: "center", justifyContent: "center",
+    transition: "transform 0.15s, box-shadow 0.15s",
+  },
+  fabBadge: {
+    position: "absolute", top: 2, right: 2,
+    background: "#e53935", color: "white",
+    borderRadius: "999px", fontSize: "0.62rem", fontWeight: 700,
+    minWidth: 17, height: 17,
+    display: "flex", alignItems: "center", justifyContent: "center", padding: "0 3px",
+  },
+  window: {
+    position: "fixed", bottom: 92, right: 24,
+    width: 370, height: 530,
+    background: "#fff", borderRadius: 16,
+    boxShadow: "0 8px 36px rgba(0,0,0,0.18)",
+    zIndex: 9998, display: "flex", flexDirection: "column",
+    overflow: "hidden", fontFamily: "Arial, sans-serif",
+  },
+  header: {
+    background: "#e68672", padding: "0.8rem 1rem",
+    display: "flex", alignItems: "center", justifyContent: "space-between", flexShrink: 0,
+  },
+  headerLeft:  { display: "flex", alignItems: "center", gap: "0.6rem" },
+  headerAvatar: {
+    width: 36, height: 36, borderRadius: "50%",
+    background: "rgba(255,255,255,0.25)",
+    display: "flex", alignItems: "center", justifyContent: "center", fontSize: "1.1rem",
+  },
+  headerTitle: { fontWeight: 700, fontSize: "0.92rem", color: "#2f2f2f" },
+  headerSub:   { fontSize: "0.7rem", color: "rgba(47,47,47,0.65)", marginTop: 1 },
+  headerRight: { display: "flex", alignItems: "center", gap: "0.35rem" },
+  headerNavBtn: {
+    background: "rgba(255,255,255,0.22)", border: "none", borderRadius: 6,
+    padding: "0.28rem 0.6rem", fontSize: "0.75rem", fontWeight: 600,
+    color: "#2f2f2f", cursor: "pointer",
+  },
+  headerNavBtnActive: { background: "rgba(255,255,255,0.45)" },
+  headerClose: {
+    background: "transparent", border: "none",
+    fontSize: "0.95rem", color: "#2f2f2f", cursor: "pointer", padding: "0.2rem 0.35rem", lineHeight: 1,
+  },
+  guestBody: {
+    flex: 1, display: "flex", flexDirection: "column",
+    alignItems: "center", justifyContent: "center", padding: "2rem",
+  },
+  loginBtn: {
+    background: "#e68672", color: "#2f2f2f",
+    padding: "0.6rem 1.5rem", borderRadius: 8,
+    textDecoration: "none", fontWeight: 700, fontSize: "0.95rem",
+  },
+  toolbar: {
+    display: "flex", alignItems: "center", justifyContent: "space-between",
+    padding: "0.5rem 0.85rem", borderBottom: "1px solid #f0f0f0",
+    background: "#fafafa", flexShrink: 0,
+  },
+  fullPageLink: { color: "#e68672", fontSize: "0.76rem", fontWeight: 600, textDecoration: "none" },
+  humanBtn: {
+    background: "transparent", border: "1.5px solid #e68672", color: "#e68672",
+    borderRadius: 6, padding: "0.28rem 0.65rem", fontSize: "0.76rem", fontWeight: 600, cursor: "pointer",
+  },
+  disabledBtn: { opacity: 0.55, cursor: "not-allowed" },
+  messages: {
+    flex: 1, overflowY: "auto", padding: "0.8rem",
+    display: "flex", flexDirection: "column", gap: "0.55rem",
+  },
+  empty: {
+    flex: 1, display: "flex", flexDirection: "column",
+    alignItems: "center", justifyContent: "center", gap: "0.5rem", margin: "auto",
+  },
+  emptyText: { color: "#aaa", fontSize: "0.88rem", textAlign: "center", lineHeight: 1.5, margin: 0 },
+  row:      { display: "flex", alignItems: "flex-end", gap: "0.4rem" },
+  rowUser:  { flexDirection: "row-reverse" },
+  rowOther: { flexDirection: "row" },
+  otherAvatar: {
+    width: 26, height: 26, borderRadius: "50%", background: "#f0f0f0",
+    display: "flex", alignItems: "center", justifyContent: "center",
+    fontSize: "0.75rem", flexShrink: 0,
+  },
+  userAvatar: {
+    width: 26, height: 26, borderRadius: "50%", background: "#e68672", color: "#2f2f2f",
+    display: "flex", alignItems: "center", justifyContent: "center",
+    fontSize: "0.72rem", fontWeight: 700, flexShrink: 0,
+  },
+  bubble: {
+    maxWidth: "76%", padding: "0.5rem 0.75rem", borderRadius: 12,
+    fontSize: "0.86rem", lineHeight: 1.5, wordBreak: "break-word",
+  },
+  bubbleUser:   { background: "#e68672", color: "#2f2f2f", borderBottomRightRadius: 4 },
+  bubbleOther:  { background: "#f4f4f4", color: "#1a1a1a", borderBottomLeftRadius: 4 },
+  typingBubble: { display: "flex", alignItems: "center", gap: "4px", padding: "0.65rem 0.85rem" },
+  senderName:   { fontSize: "0.7rem", fontWeight: 700, color: "#888", marginBottom: 2 },
+  errorBar: {
+    background: "#fff0f0", borderTop: "1px solid #ffd0d0", color: "#c0392b",
+    padding: "0.5rem 0.85rem", fontSize: "0.8rem",
+    display: "flex", alignItems: "center", justifyContent: "space-between", flexShrink: 0,
+  },
+  errorClose: { background: "none", border: "none", color: "#c0392b", cursor: "pointer" },
+  inputRow: {
+    display: "flex", gap: "0.45rem", padding: "0.6rem 0.85rem",
+    borderTop: "1px solid #f0f0f0", flexShrink: 0,
+  },
+  input: {
+    flex: 1, border: "1.5px solid #e0e0e0", borderRadius: 8,
+    padding: "0.48rem 0.75rem", fontSize: "0.86rem", outline: "none", fontFamily: "inherit",
+  },
+  sendBtn: {
+    background: "#e68672", color: "#2f2f2f", border: "none", borderRadius: 8,
+    padding: "0.48rem 0.75rem", fontSize: "0.95rem", fontWeight: 700, cursor: "pointer", flexShrink: 0,
+  },
+  sendBtnDisabled: { background: "#f0c8be", cursor: "not-allowed" },
+  historyToolbar: {
+    display: "flex", gap: "0.5rem", padding: "0.65rem 0.85rem",
+    borderBottom: "1px solid #f0f0f0", flexShrink: 0,
+  },
+  newChatBtn: {
+    flex: 1, background: "#e68672", color: "#2f2f2f", border: "none",
+    borderRadius: 8, padding: "0.5rem", fontSize: "0.8rem", fontWeight: 700, cursor: "pointer",
+  },
+  aiTabBtn: {
+    background: "#f4f4f4", color: "#555", border: "none", borderRadius: 8,
+    padding: "0.5rem 0.85rem", fontSize: "0.8rem", fontWeight: 600, cursor: "pointer",
+  },
+  convItem: {
+    display: "flex", flexDirection: "column", gap: "0.2rem",
+    padding: "0.7rem 0.85rem", borderBottom: "1px solid #f0f0f0",
+    background: "white", border: "none", textAlign: "left", cursor: "pointer", width: "100%",
+  },
+  convTop:    { display: "flex", alignItems: "center", justifyContent: "space-between", gap: "0.5rem" },
+  convBottom: { display: "flex", alignItems: "center", justifyContent: "space-between" },
+  convSubject: {
+    fontSize: "0.86rem", fontWeight: 600, color: "#222",
+    overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", flex: 1,
+  },
+  convMode:  { fontSize: "0.74rem", color: "#999" },
+  convDate:  { fontSize: "0.7rem", color: "#bbb" },
+  statusBadge: {
+    fontSize: "0.67rem", fontWeight: 700, borderRadius: 20,
+    padding: "0.13rem 0.5rem", flexShrink: 0,
+    textTransform: "uppercase", letterSpacing: "0.04em",
+  },
+  statusOpen:   { background: "#e6f9ee", color: "#1a7a3c" },
+  statusClosed: { background: "#f0f0f0", color: "#888" },
+  liveStatus: {
+    display: "flex", alignItems: "center", gap: "0.5rem",
+    padding: "0.45rem 0.85rem", borderBottom: "1px solid #f0f0f0",
+    background: "#fafafa", flexShrink: 0,
+  },
+  closedBanner: {
+    background: "#f5f5f5", borderTop: "1px solid #e0e0e0", color: "#888",
+    padding: "0.65rem 0.85rem", fontSize: "0.84rem", textAlign: "center", flexShrink: 0,
+  },
+};

web/components/Footer.js

@@ -0,0 +1,57 @@
+import Link from "next/link";
+import Image from "next/image";
+
+export default function Footer() {
+  return (
+    <footer className="site-footer">
+      <div className="footer-container">
+
+        <div className="footer-brand">
+          <Image
+            src="/logo_simple.png"
+            alt="Leon's Pet Store logo"
+            width={50}
+            height={50}
+            className="footer-logo"
+          />
+          <p className="footer-tagline">
+            Your neighbourhood pet store!
+          </p>
+        </div>
+
+        <div className="footer-section">
+          <h3 className="footer-heading">Quick Links</h3>
+          <ul className="footer-links">
+            <li><Link href="/">Home</Link></li>
+            <li><Link href="/adopt">Adopt a Pet</Link></li>
+            <li><Link href="/products">Online Store</Link></li>
+            <li><Link href="/appointments">Schedule an Appointment</Link></li>
+            <li><Link href="/ai-chat">AI Assistant</Link></li>
+          </ul>
+        </div>
+
+        <div className="footer-section">
+          <h3 className="footer-heading">Company</h3>
+          <ul className="footer-links">
+            <li><Link href="/about">About Us</Link></li>
+            <li><Link href="/contact">Contact Us</Link></li>
+          </ul>
+        </div>
+
+        <div className="footer-section">
+          <h3 className="footer-heading">Contact</h3>
+          <ul className="footer-links footer-contact">
+            <li>(403) 123-4567</li>
+            <li>support@leonspetstore.com</li>
+            <li>123 Street Street, Calgary, Alberta, Canada</li>
+          </ul>
+        </div>
+
+      </div>
+
+      <div className="footer-bottom">
+        <p>&copy; {new Date().getFullYear()} Leon&apos;s Pet Store. All rights reserved.</p>
+      </div>
+    </footer>
+  );
+}

web/components/Navigation.js

@@ -12,6 +12,7 @@ export default function DisplayNav() {
   const { itemCount, selectedStoreId, setStoreId } = useCart();
   const router = useRouter();
   const [stores, setStores] = useState([]);
+  const [menuOpen, setMenuOpen] = useState(false);
 
   useEffect(() => {
     if (!token) return;
@@ -26,27 +27,35 @@ export default function DisplayNav() {
   function handleLogout() {
     logout();
     router.push("/");
+    setMenuOpen(false);
+  }
+
+  function closeMenu() {
+    setMenuOpen(false);
   }
 
   return (
     <nav className="navbar">
-      <Image
+      <Link href="/" onClick={closeMenu}>
-        className="mx-3"
+        <Image
-        src="/logo_simple.png"
+          className="mx-3"
-        alt="store_logo"
+          src="/logo_simple.png"
-        width={50}
+          alt="store_logo"
-        height={50}
+          width={50}
-        id="logo"
+          height={50}
-      />
+          id="logo"
+        />
+      </Link>
 
+      {/* Desktop: inline links + auth */}
       <div className="nav-links">
         <Link href="/" className="nav-link">Home</Link>
-        <Link href="/adopt" className="nav-link">Adopt a Pet</Link>
+        <Link href="/adopt" className="nav-link">Adopt</Link>
-        <Link href="/products" className="nav-link">Online Store</Link>
+        <Link href="/products" className="nav-link">Store</Link>
-        <Link href="/appointments" className="nav-link">Schedule an Appointment</Link>
+        <Link href="/appointments" className="nav-link">Appointments</Link>
-        <Link href="/ai-chat" className="nav-link">AI Assistant</Link>
+        <Link href="/ai-chat" className="nav-link">Help</Link>
-        <Link href="/contact" className="nav-link">Contact Us</Link>
+        <Link href="/contact" className="nav-link">Contact</Link>
-        <Link href="/about" className="nav-link">About Us</Link>
+        <Link href="/about" className="nav-link">About</Link>
       </div>
 
       <div className="nav-auth">
@@ -77,7 +86,7 @@ export default function DisplayNav() {
         {loading ? null : user ? (
           <>
             <Link href="/profile" className="nav-link nav-greeting">
-              Hello, {user.fullName || user.username}
+              Hello, {(user.fullName || user.username).split(" ")[0]}
             </Link>
             <button type="button" className="nav-logout-btn" onClick={handleLogout}>
               Log Out
@@ -90,6 +99,74 @@ export default function DisplayNav() {
           </>
         )}
       </div>
+
+      {/* Mobile: cart icon + hamburger always in topbar */}
+      <div className="nav-mobile-bar">
+        {user && (
+          <Link href="/cart" className="nav-cart-btn" aria-label="Cart" onClick={closeMenu}>
+            🛒
+            {itemCount > 0 && (
+              <span className="nav-cart-badge">{itemCount > 99 ? "99+" : itemCount}</span>
+            )}
+          </Link>
+        )}
+        <button
+          className={`nav-hamburger${menuOpen ? " nav-hamburger--open" : ""}`}
+          aria-label="Toggle navigation menu"
+          aria-expanded={menuOpen}
+          onClick={() => setMenuOpen((o) => !o)}
+        >
+          <span />
+          <span />
+          <span />
+        </button>
+      </div>
+
+      {/* Mobile dropdown drawer */}
+      {menuOpen && (
+        <div className="nav-drawer">
+          <Link href="/" className="nav-drawer-link" onClick={closeMenu}>Home</Link>
+          <Link href="/adopt" className="nav-drawer-link" onClick={closeMenu}>Adopt</Link>
+          <Link href="/products" className="nav-drawer-link" onClick={closeMenu}>Store</Link>
+          <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>
+
+          <div className="nav-drawer-divider" />
+
+          {stores.length > 0 && (
+            <select
+              className="nav-store-select nav-store-select--drawer"
+              value={selectedStoreId ?? ""}
+              onChange={(e) => { setStoreId(e.target.value || null); closeMenu(); }}
+            >
+              <option value="">All Stores</option>
+              {stores.map((s) => (
+                <option key={s.storeId} value={s.storeId}>
+                  {s.storeName}
+                </option>
+              ))}
+            </select>
+          )}
+
+          {loading ? null : user ? (
+            <>
+              <Link href="/profile" className="nav-drawer-link" onClick={closeMenu}>
+                My Profile ({user.fullName || user.username})
+              </Link>
+              <button type="button" className="nav-logout-btn nav-logout-btn--drawer" onClick={handleLogout}>
+                Log Out
+              </button>
+            </>
+          ) : (
+            <>
+              <Link href="/login" className="nav-drawer-link" onClick={closeMenu}>Log In</Link>
+              <Link href="/register" className="nav-drawer-link nav-drawer-link--register" onClick={closeMenu}>Register</Link>
+            </>
+          )}
+        </div>
+      )}
     </nav>
   );
 }

web/components/ProductProfile.js

@@ -1,6 +1,35 @@
-import Link from "next/link";
+"use client";
+
+import { useState } from "react";
+import { useAuth } from "@/context/AuthContext";
+import { useCart } from "@/context/CartContext";
+
+export default function ProductProfile({ prodId, prodName, categoryName, prodDesc, prodPrice, imageUrl }) {
+  const { user } = useAuth();
+  const { addItem, selectedStoreId } = useCart();
+
+  const [quantity, setQuantity] = useState(1);
+  const [adding, setAdding] = useState(false);
+  const [feedback, setFeedback] = useState(null); // { type: "success"|"error", message }
+
+  function changeQty(delta) {
+    setQuantity((q) => Math.max(1, q + delta));
+  }
+
+  async function handleAddToCart() {
+    setAdding(true);
+    setFeedback(null);
+    try {
+      await addItem(prodId, quantity);
+      setFeedback({ type: "success", message: `${quantity} × ${prodName} added to cart!` });
+      setQuantity(1);
+    } catch (err) {
+      setFeedback({ type: "error", message: err.message ?? "Failed to add to cart." });
+    } finally {
+      setAdding(false);
+    }
+  }
 
-export default function ProductProfile({ prodName, categoryName, prodDesc, prodPrice, imageUrl }) {
   return (
     <div className="pet-detail-card">
       <div className="pet-detail-image-wrapper">
@@ -36,6 +65,57 @@ export default function ProductProfile({ prodName, categoryName, prodDesc, prodP
             <span className="pet-detail-value">{prodDesc ?? "—"}</span>
           </div>
         </div>
+
+        <div className="pet-detail-cta">
+          {!user ? (
+            <p className="pet-detail-cta-text">
+              <a href="/login" className="appt-link">Log in</a> to purchase this item.
+            </p>
+          ) : !selectedStoreId ? (
+            <p className="pet-detail-cta-text">
+              Select a store from the navigation bar to add items to your cart.
+            </p>
+          ) : (
+            <>
+              <div className="product-qty-row">
+                <span className="product-qty-label">Quantity</span>
+                <div className="product-qty-controls">
+                  <button
+                    className="cart-qty-btn"
+                    onClick={() => changeQty(-1)}
+                    disabled={quantity <= 1 || adding}
+                    aria-label="Decrease quantity"
+                  >
+                    −
+                  </button>
+                  <span className="cart-qty-val">{quantity}</span>
+                  <button
+                    className="cart-qty-btn"
+                    onClick={() => changeQty(1)}
+                    disabled={adding}
+                    aria-label="Increase quantity"
+                  >
+                    +
+                  </button>
+                </div>
+              </div>
+
+              <button
+                className="product-add-to-cart-btn"
+                onClick={handleAddToCart}
+                disabled={adding}
+              >
+                {adding ? "Adding…" : "Add to Cart"}
+              </button>
+
+              {feedback && (
+                <p className={`product-cart-feedback product-cart-feedback--${feedback.type}`}>
+                  {feedback.message}
+                </p>
+              )}
+            </>
+          )}
+        </div>
       </div>
     </div>
   );

web/context/CartContext.js

@@ -10,6 +10,7 @@ import {
   apiClearCart,
   apiApplyCoupon,
   apiCheckout,
+  apiCancelCheckout,
 } from "@/lib/cartApi";
 
 const CartContext = createContext(null);
@@ -133,6 +134,15 @@ export function CartProvider({ children }) {
     [token, selectedStoreId]
   );
 
+  const cancelCheckout = useCallback(
+    async () => {
+      if (!token || !selectedStoreId) return;
+      await apiCancelCheckout(token, selectedStoreId);
+      await refreshCart();
+    },
+    [token, selectedStoreId, refreshCart]
+  );
+
   const itemCount = cart?.items?.reduce((sum, i) => sum + i.quantity, 0) ?? 0;
 
   return (
@@ -150,6 +160,7 @@ export function CartProvider({ children }) {
         clearCart,
         applyCoupon,
         checkout,
+        cancelCheckout,
         refreshCart,
       }}
     >

web/context/ChatWidgetContext.js

@@ -0,0 +1,166 @@
+"use client";
+
+import { createContext, useContext, useState, useRef, useCallback, useEffect } from "react";
+
+const ChatWidgetContext = createContext(null);
+const API_BASE = "";
+
+export function ChatWidgetProvider({ children }) {
+  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);
+
+  // Keep a ref so sendAiMessage stays stable (no stale-closure over messages)
+  const aiMessagesRef = useRef(aiMessages);
+  useEffect(() => { aiMessagesRef.current = aiMessages; }, [aiMessages]);
+
+  const sendAiMessage = useCallback(async (text, token) => {
+    if (!text.trim() || !token) return;
+    const userMsg = { role: "user", content: text, id: Date.now() };
+    setAiMessages((prev) => [...prev, userMsg]);
+    setAiSending(true);
+    setAiError(null);
+    try {
+      const history = aiMessagesRef.current.map((m) => ({ role: m.role, content: m.content }));
+      const res = await fetch(`${API_BASE}/api/v1/ai-chat/message`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
+        body: JSON.stringify({ message: text, history }),
+      });
+      const data = await res.json();
+      if (!res.ok || !data.success) { setAiError(data.error || "Failed to get a response."); return; }
+      setAiMessages((prev) => [...prev, { role: "assistant", content: data.message, id: Date.now() + 1 }]);
+    } catch {
+      setAiError("Network error. Please try again.");
+    } finally {
+      setAiSending(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 activeConvIdRef = useRef(null);
+
+  const stopPolling = useCallback(() => {
+    if (pollRef.current) { clearInterval(pollRef.current); pollRef.current = null; }
+  }, []);
+
+  const fetchLiveMessages = useCallback(async (convId, token) => {
+    if (!convId || !token) return;
+    try {
+      const res = await fetch(`${API_BASE}/api/v1/chat/conversations/${convId}/messages`, {
+        headers: { Authorization: `Bearer ${token}` },
+      });
+      if (!res.ok) return;
+      const data = await res.json();
+      if (Array.isArray(data)) setLiveMessages(data);
+    } catch { /* silent */ }
+  }, []);
+
+  const loadConversations = useCallback(async (token) => {
+    if (!token) return;
+    setConvsLoading(true);
+    try {
+      const res = await fetch(`${API_BASE}/api/v1/chat/conversations?mine=true`, {
+        headers: { Authorization: `Bearer ${token}` },
+      });
+      if (!res.ok) return;
+      const data = await res.json();
+      setConversations(Array.isArray(data) ? data : (data.content ?? []));
+    } catch { /* silent */ } finally {
+      setConvsLoading(false);
+    }
+  }, []);
+
+  const openLiveConversation = useCallback(async (convId, token) => {
+    if (!convId || !token) return;
+    stopPolling();
+    setActiveConvId(convId);
+    activeConvIdRef.current = convId;
+    setLiveMessages([]);
+    setView("live");
+    try {
+      const res = await fetch(`${API_BASE}/api/v1/chat/conversations/${convId}`, {
+        headers: { Authorization: `Bearer ${token}` },
+      });
+      if (res.ok) setActiveConv(await res.json());
+    } catch { /* silent */ }
+    await fetchLiveMessages(convId, token);
+    pollRef.current = setInterval(() => fetchLiveMessages(convId, token), 2500);
+  }, [stopPolling, fetchLiveMessages]);
+
+  const sendLiveMessage = useCallback(async (text, token, convId) => {
+    if (!text.trim() || liveSending || !token || !convId) return;
+    setLiveSending(true);
+    try {
+      const res = await fetch(`${API_BASE}/api/v1/chat/conversations/${convId}/messages`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
+        body: JSON.stringify({ content: text }),
+      });
+      if (res.ok) await fetchLiveMessages(convId, token);
+    } catch { /* silent */ } finally {
+      setLiveSending(false);
+    }
+  }, [liveSending, fetchLiveMessages]);
+
+  const startLiveChat = useCallback(async (token) => {
+    if (!token || switchingToHuman) return;
+    setSwitchingToHuman(true);
+    try {
+      const res = await fetch(`${API_BASE}/api/v1/chat/conversations`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
+        body: JSON.stringify({ message: "Hi, I'd like to speak with a support agent." }),
+      });
+      if (!res.ok) return;
+      const conv = await res.json();
+      await fetch(`${API_BASE}/api/v1/chat/conversations/${conv.id}/request-human`, {
+        method: "POST", headers: { Authorization: `Bearer ${token}` },
+      });
+      setConversations((prev) => [conv, ...prev.filter((c) => c.id !== conv.id)]);
+      await openLiveConversation(conv.id, token);
+    } catch { /* silent */ } finally {
+      setSwitchingToHuman(false);
+    }
+  }, [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]);
+
+  const toggleOpen = useCallback(() => setIsOpen((o) => !o), []);
+  const openView   = useCallback((v) => setView(v), []);
+
+  return (
+    <ChatWidgetContext.Provider value={{
+      isOpen, toggleOpen,
+      view, openView,
+      aiMessages, aiSending, aiError, setAiError, sendAiMessage,
+      conversations, convsLoading, loadConversations,
+      activeConvId, activeConv, liveMessages, liveSending,
+      openLiveConversation, sendLiveMessage,
+      startLiveChat, switchingToHuman,
+    }}>
+      {children}
+    </ChatWidgetContext.Provider>
+  );
+}
+
+export function useChatWidget() {
+  const ctx = useContext(ChatWidgetContext);
+  if (!ctx) throw new Error("useChatWidget must be used within ChatWidgetProvider");
+  return ctx;
+}

web/lib/cartApi.js

@@ -91,3 +91,12 @@ export async function apiCompleteCheckout(token, paymentIntentId) {
 
   return handleResponse(res);
 }
+
+export async function apiCancelCheckout(token, storeId) {
+  const res = await fetch(`${BASE}/checkout/cancel?storeId=${storeId}`, {
+    method: "POST",
+    headers: authHeaders(token),
+  });
+
+  return handleResponse(res);
+}