Merge with James(FrontUI)

SWFrontUI/ShopwiseFrontEndUI/.gitignore

@@ -0,0 +1,18 @@
+/WalmartPipeline/walmart_CSVs
+/WalmartPipeline/__pycache__
+/.vscode
+/WalmartPipeline/TaxonomyBrowsing/taxonomy.json
+RecipesDataset.csv
+openapi_key.py
+.env
+/__pycache__
+classified_ingredients.csv
+/kroger_output
+.DS_Store
+node_modules/
+
+# Xcode user-specific files
+xcuserdata/
+*.xcuserstate
+*.xccheckout
+*.moved-aside

SWFrontUI/ShopwiseFrontEndUI/AppToolbar.swift

@@ -5,18 +5,10 @@ struct AppToolbar: ViewModifier {
         content
             .toolbar {
                 ToolbarItem(placement: .topBarTrailing) {
-                    HStack(spacing: 14) {
-                        NavigationLink {
-                            SettingsView()
-                        } label: {
-                            Image(systemName: "gearshape")
-                        }
-
-                        NavigationLink {
-                            ProfileView()
-                        } label: {
-                            Image(systemName: "person.crop.circle")
-                        }
+                    NavigationLink {
+                        ProfileView()
+                    } label: {
+                        Image(systemName: "person.crop.circle")
                     }
                 }
             }

SWFrontUI/ShopwiseFrontEndUI/AuthManager.swift

@@ -1,51 +1,3 @@
-//
-//  AuthManager.swift
-//  ShopwiseFrontEndUI
-//
-//  Created by Nicholas Castellanos on 2/2/26.
-//  Edited by Nicholas Castellanos on 2/24/26
-
-//import SwiftUI
-//import Combine
-//
-//@MainActor
-//final class AuthManager: ObservableObject {
-//    @Published var isSignedIn: Bool = false
-//    @Published var userEmail: String? = nil
-//
-//    func signIn(email: String, password: String) async throws {
-//        guard !email.isEmpty, !password.isEmpty else {
-//            throw AuthError.missingFields
-//        }
-//        self.userEmail = email
-//        self.isSignedIn = true
-//    }
-//
-//    func signUp(name: String, email: String, password: String) async throws {
-//        guard !name.isEmpty, !email.isEmpty, !password.isEmpty else {
-//            throw AuthError.missingFields
-//        }
-//        self.userEmail = email
-//        self.isSignedIn = true
-//    }
-//
-//    func signOut() {
-//        userEmail = nil
-//        isSignedIn = false
-//    }
-//
-//    enum AuthError: LocalizedError {
-//        case missingFields
-//        var errorDescription: String? { "Please fill out all fields." }
-//    }
-//}
-//
-//
-//#Preview {
-//    AuthView()
-//        .environmentObject(AuthManager())
-//}
-
 import Foundation
 import SwiftUI
 import Combine
@@ -69,6 +21,7 @@ final class AuthManager: ObservableObject {
     @Published var isSignedIn: Bool = false
     @Published var userEmail: String? = nil
     @Published var userID: String? = nil
+    @Published var userName: String? = nil
 
     // Tokens
     private(set) var accessToken: String? = nil
@@ -116,6 +69,7 @@ final class AuthManager: ObservableObject {
             self.applySession(session)
             self.userEmail = email
             self.userID = session.user?.id
+            self.userName = session.user?.user_metadata?.name
         }
     }
 
@@ -202,12 +156,14 @@ final class AuthManager: ObservableObject {
             self.userEmail = user.email
             self.isSignedIn = true
             self.userID = user.id
+            self.userName = user.user_metadata?.name
         } catch {
             // token might be expired -> try refresh
             if let refreshed = try? await refreshSession() {
                 self.userEmail = refreshed.user?.email
                 self.isSignedIn = true
                 self.userID = refreshed.user?.id
+                self.userName = refreshed.user?.user_metadata?.name
             } else {
                 clearSession()
             }
@@ -256,6 +212,7 @@ final class AuthManager: ObservableObject {
         self.accessToken = session.access_token
         self.refreshToken = session.refresh_token
         self.userID = session.user?.id
+        self.userName = session.user?.user_metadata?.name
         saveTokensToStorage()
         self.isSignedIn = true
     }
@@ -265,6 +222,7 @@ final class AuthManager: ObservableObject {
         self.refreshToken = nil
         self.userEmail = nil
         self.userID = nil
+        self.userName = nil
         self.isSignedIn = false
         deleteTokensFromStorage()
     }
@@ -365,6 +323,11 @@ struct SupabaseSession: Codable {
 struct SupabaseUser: Codable {
     let id: String?
     let email: String?
+    let user_metadata: UserMetadata?
+}
+
+struct UserMetadata: Codable {
+    let name: String?
 }
 
 struct SupabaseError: Codable {
@@ -425,7 +388,7 @@ extension AuthManager {
     }
 }
 
-//Onboard survey fetch/save 
+//Onboard survey fetch/save
 struct UserPreferencesRow: Codable {
     let user_id: String
     let diet_preferences: [String]

SWFrontUI/ShopwiseFrontEndUI/CartStore.swift

@@ -8,16 +8,22 @@ struct CartLineItem: Identifiable, Hashable {
     let unit: String
     let price: Double
     var quantity: Int
+    let groupId: String?
+    let groupTitle: String?
 
-    init(id: String = String(), name: String, unit: String, price: Double, quantity: Int = 1) {
-        self.id = id
-        self.name = name
-        self.unit = unit
-        self.price = price
-        self.quantity = quantity
+    init(id: String = String(),name: String,unit: String,price: Double, quantity: Int = 1,groupId: String? = nil,groupTitle: String? = nil){
+            self.id = id
+            self.name = name
+            self.unit = unit
+            self.price = price
+            self.quantity = quantity
+            self.groupId = groupId
+            self.groupTitle = groupTitle
     }
 
-    var lineTotal: Double { price * Double(quantity) }
+    var lineTotal: Double{
+        price * Double(quantity)
+    }
 }
 
 final class CartStore: ObservableObject {
@@ -39,6 +45,10 @@ final class CartStore: ObservableObject {
         add(id: ingredient.id, name: ingredient.name, unit: ingredient.unit, price: ingredient.price)
     }
 
+    func add(name: String, unit: String, price: Double) {
+        add(id: name, name: name, unit: unit, price: price)
+    }
+
     func add(id: String, name: String, unit: String, price: Double) {
         if let idx = items.firstIndex(where: { $0.id == id }) {
             items[idx].quantity += 1
@@ -55,6 +65,36 @@ final class CartStore: ObservableObject {
         }
     }
 
+    func add(recipeId: String, recipeTitle: String, name: String, unit: String, price: Double) {
+        let id = "\(recipeId)::\(name)"
+        if let idx = items.firstIndex(where: { $0.id == id }) {
+            items[idx].quantity += 1
+            if items[idx].groupId == nil {
+                items[idx] = CartLineItem(
+                    id: items[idx].id,
+                    name: items[idx].name,
+                    unit: items[idx].unit,
+                    price: items[idx].price,
+                    quantity: items[idx].quantity,
+                    groupId: recipeId,
+                    groupTitle: recipeTitle
+                )
+            }
+        } else {
+            items.append(
+                CartLineItem(
+                    id: id,
+                    name: name,
+                    unit: unit,
+                    price: price,
+                    quantity: 1,
+                    groupId: recipeId,
+                    groupTitle: recipeTitle
+                )
+            )
+        }
+    }
+
     func increment(_ item: CartLineItem) {
         guard let idx = items.firstIndex(of: item) else { return }
         items[idx].quantity += 1