From 1418e7f97ca07eb7f6b7e36ac7c24a3099b0b2e2 Mon Sep 17 00:00:00 2001 From: KS Jannette Date: Sun, 29 Mar 2026 01:48:55 -0400 Subject: [PATCH] more --- frontend/src/App.jsx | 5 +++- frontend/src/contexts/AuthContext.jsx | 10 +++++--- frontend/src/reducers/authReducer.jsx | 37 ++++++++++++++++++--------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 47fb0d3..52afc9c 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -1,5 +1,6 @@ import { Routes, Route, Navigate } from "react-router-dom"; import { useAuth } from "./contexts/AuthContext"; +import { useContext } from 'react' import Navbar from "./components/Navbar"; import Login from "./pages/login/Login"; import Signup from "./pages/Signup"; @@ -8,9 +9,11 @@ import Addresses from "./pages/addresses/Addresses"; import Alerts from "./pages/alerts/Alerts"; import AlertHistory from "./pages/alertHistory/AlertHistory"; import Account from "./pages/user_account/Account"; +import { AuthProvider } from "./ShopContext"; +import useAuth from "./ShopContext"; export default function App() { - const { currentUser, isSubscribed } = useAuth(); + const { context } = useContext(ShopContext) if (!currentUser) { return ( diff --git a/frontend/src/contexts/AuthContext.jsx b/frontend/src/contexts/AuthContext.jsx index 81169ef..ce70e46 100644 --- a/frontend/src/contexts/AuthContext.jsx +++ b/frontend/src/contexts/AuthContext.jsx @@ -33,13 +33,15 @@ export const AuthProvider = ({ children }) => { const value = { - user: state.name, - user: state.tier + authUser: state.name, + authUserTier: state.tier, + addAuthUser, + logoutAuthUser }; return {children}; }; -const useAuthContext = () => { +const useAuth = () => { const context = useContext(ShopContext); if (context === undefined) { @@ -49,4 +51,4 @@ const useAuthContext = () => { return context; }; -export default useAuthContext; +export default useAuth; diff --git a/frontend/src/reducers/authReducer.jsx b/frontend/src/reducers/authReducer.jsx index d227086..f29f16f 100644 --- a/frontend/src/reducers/authReducer.jsx +++ b/frontend/src/reducers/authReducer.jsx @@ -1,25 +1,38 @@ import { useReducer } from "react" -const UserAuthContext = createContext(); - export const initialState = { - authUser: null, - AuthTier: null + user: null, + tier: null, }; -const authReducer = (state, action) => { - const { type, payload = "FREE_TIER" } = action +const shopReducer = (state, action) => { + const { name, payload } = action; switch (type) { - case "ADD_AUTH_USER": - console.log("ADD_AUTH_USER", payload); + case "ADD_TO_CART": + console.log("ADD_TO_CART", payload); + return { ...state, - auth: payload + products: payload.products + }; + case "REMOVE_FROM_CART": + console.log("REMOVE_FROM_CART", payload); + + return { + ...state, + products: payload.products + }; + case "UPDATE_PRICE": + console.log("UPDATE_PRICE", payload); + + return { + ...state, + total: payload.total }; default: - throw new Error(`No case for type ${type} found.`); + throw new Error(`No case for type ${type} found in shopReducer.`); } -} +}; -export default shopReducer \ No newline at end of file +export default shopReducer; \ No newline at end of file