Merge pull request #22 from pesto-students/feat/signup

feat : shop page changes
pesto-students · Feb 16, 2024 · 59f4d68 · 59f4d68
2 parents 262a8d0 + 76602ba
commit 59f4d68
Show file tree

Hide file tree

Showing 53 changed files with 1,199 additions and 590 deletions.
diff --git a/dist/assets/cauliflower-DbjgP0LG.png b/dist/assets/cauliflower-DbjgP0LG.png
diff --git a/dist/assets/chinese_cabbage-hcVsq7jK.png b/dist/assets/chinese_cabbage-hcVsq7jK.png
diff --git a/dist/assets/corn-ERlktb6r.png b/dist/assets/corn-ERlktb6r.png
diff --git a/dist/assets/cucumber-_A1alB3d.png b/dist/assets/cucumber-_A1alB3d.png
diff --git a/dist/assets/eggplant-Im4IoV8j.png b/dist/assets/eggplant-Im4IoV8j.png
diff --git a/dist/assets/green_capsicum-oFNtP4E_.png b/dist/assets/green_capsicum-oFNtP4E_.png
diff --git a/dist/assets/green_chilly-QnvCFJgP.png b/dist/assets/green_chilly-QnvCFJgP.png
diff --git a/dist/assets/index-LvweM-oh.css b/dist/assets/index-LvweM-oh.css
diff --git a/dist/assets/index-iVQZbP4t.css b/dist/assets/index-iVQZbP4t.css
diff --git a/dist/assets/index-kRs4n30u.js b/dist/assets/index-kRs4n30u.js
diff --git a/dist/assets/index-lnPv7wdp.js b/dist/assets/index-lnPv7wdp.js
diff --git a/dist/assets/lettuce-jv9UU6lm.png b/dist/assets/lettuce-jv9UU6lm.png
diff --git a/dist/assets/mango-rLHV99aw.png b/dist/assets/mango-rLHV99aw.png
diff --git a/dist/assets/okra-9qoK7b2G.png b/dist/assets/okra-9qoK7b2G.png
diff --git a/dist/assets/potato-pLRUL5Bh.png b/dist/assets/potato-pLRUL5Bh.png
diff --git a/dist/assets/red_capsicum-K9YI5jxE.png b/dist/assets/red_capsicum-K9YI5jxE.png
diff --git a/dist/assets/red_chilly-HBiLOt0C.png b/dist/assets/red_chilly-HBiLOt0C.png
diff --git a/dist/assets/tomato-zRv9G8g_.png b/dist/assets/tomato-zRv9G8g_.png
diff --git a/dist/index.html b/dist/index.html
@@ -8,9 +8,10 @@
       href="./src/assets/logo-no-background.svg"
     />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <script src="https://checkout.razorpay.com/v1/checkout.js"></script>
     <title>Harvestly</title>
-    <script type="module" crossorigin src="./assets/index-lnPv7wdp.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-LvweM-oh.css">
+    <script type="module" crossorigin src="./assets/index-kRs4n30u.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-iVQZbP4t.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/index.html b/index.html
@@ -8,6 +8,7 @@
       href="./src/assets/logo-no-background.svg"
     />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <script src="https://checkout.razorpay.com/v1/checkout.js"></script>
     <title>Harvestly</title>
   </head>
   <body>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "@material-tailwind/react": "^2.1.8",
     "@react-oauth/google": "^0.12.1",
     "@reduxjs/toolkit": "^2.0.1",
-    "axios": "^1.6.2",
+    "axios": "^1.6.7",
     "js-cookie": "^3.0.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/src/app/App.jsx b/src/app/App.jsx
@@ -1,8 +1,7 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { Routes, Route, Link } from "react-router-dom";
 import Login from "../pages/Login.jsx";
 import Register from "../pages/Register.jsx";
-import Home from "../pages/Home.jsx";
 import NotFound from "../pages/NotFound.jsx";
 import Navbar from "../components/Navbar.jsx";
 import PageFooter from "../components/Footer.jsx";
@@ -14,21 +13,28 @@ import Checkout from "../pages/Checkout.jsx";
 import ProductDetail from "../pages/ProductDetail.jsx";
 
 export default function App() {
+  // const [isLoggedIn, setIsLoggedIn] = useState(false)
+  const isLoggedIn = sessionStorage.getItem("token");
+
+  useEffect(() => {}, [isLoggedIn]);
   return (
     <>
       <div className="overflow-y-scroll border-5 border-gray-800 rounded-lg bg-white flex flex-col m-auto overflow-x-hidden">
         <Navbar />
         <main>
           <Routes>
-            <Route path="/" element={<Landing/>}></Route>
-            <Route path="home" element={<Home />} />
+            <Route path="/" element={<Landing />}></Route>
             <Route path="login" element={<Login />} />
             <Route path="register" element={<Register />} />
-            <Route path="shop" element={<Shop />} />
-            <Route path="products/:id" element={<ProductDetail />} />
-            <Route path="cart" element={<Cart />} />
-            <Route path="wishlist" element={<Wishlist />} />
-            <Route path="checkout" element={<Checkout/>}/>
+            {isLoggedIn ? (
+              <>
+                <Route path="shop" element={<Shop />} />
+                <Route path="products/:id" element={<ProductDetail />} />
+                <Route path="cart" element={<Cart />} />
+                <Route path="wishlist" element={<Wishlist />} />
+                <Route path="checkout" element={<Checkout />} />
+              </>
+            ) : null}
             <Route path="*" element={<NotFound />} />
           </Routes>
         </main>

diff --git a/src/app/reducers/cartSlice.js b/src/app/reducers/cartSlice.js
@@ -9,8 +9,6 @@ const cartSlice = createSlice({
   initialState,
   reducers: {
     addProduct: (state, action) => {
-      console.log("State", state);
-      console.log("Action", action);
       const existingProduct = state.cart.find(
         (product) => product.id === action.payload.id
       );
@@ -29,10 +27,7 @@ const cartSlice = createSlice({
       if (existingProduct.quantity > 1) {
         existingProduct.quantity--;
       } else if (existingProduct.quantity === 1) {
-        // console.log("State",state);
-        console.log("existing product ", existingProduct.quantity);
         const index = state.cart.findIndex((item) => item === existingProduct);
-        console.log(index);
         state.cart.splice(index, 1);
       }
     },

diff --git a/src/app/reducers/wishlistSlice.js b/src/app/reducers/wishlistSlice.js
@@ -0,0 +1,36 @@
+import { createSlice } from "@reduxjs/toolkit";
+
+const initialState = {
+  wishlist: [],
+};
+
+const wishlistSlice = createSlice({
+  name: "wishlist",
+  initialState,
+  reducers: {
+    addProductWishlist: (state, action) => {
+      const existingProduct = state.wishlist.find(
+        (product) => product.id === action.payload.id
+      );
+      if (existingProduct) {
+        // immer makes this immutable
+        // existingProduct.quantity++;
+        return;
+      } else {
+        // immer makes this immutable
+        state.wishlist.push({ ...action.payload, isWishlist: true });
+      }
+    },
+    removeProductWishlist: (state, action) => {
+      const index = state.wishlist.findIndex(
+        (product) => product.id === action.payload.id
+      );
+      state.wishlist.splice(index, 1);
+    },
+  },
+});
+
+export const { addProductWishlist, removeProductWishlist } =
+  wishlistSlice.actions;
+
+export default wishlistSlice.reducer;
diff --git a/src/app/store.js b/src/app/store.js
@@ -1,11 +1,12 @@
 import { configureStore } from "@reduxjs/toolkit";
 import cartReducer from "./reducers/cartSlice";
 import authReducer from "./reducers/authSlice";
-
+import wishlistReducer from "./reducers/wishlistSlice";
 const store = configureStore({
   reducer: {
     auth: authReducer,
     cart: cartReducer,
+    wishlist: wishlistReducer,
   },
 });
 

diff --git a/src/assets/products/cauliflower.png b/src/assets/products/cauliflower.png
diff --git a/src/assets/products/chinese_cabbage.png b/src/assets/products/chinese_cabbage.png
diff --git a/src/assets/products/corn.png b/src/assets/products/corn.png
diff --git a/src/assets/products/cucumber.png b/src/assets/products/cucumber.png
diff --git a/src/assets/products/eggplant.png b/src/assets/products/eggplant.png
diff --git a/src/assets/products/green_capsicum.png b/src/assets/products/green_capsicum.png
diff --git a/src/assets/products/green_chilly.png b/src/assets/products/green_chilly.png
diff --git a/src/assets/products/lettuce.png b/src/assets/products/lettuce.png
diff --git a/src/assets/products/mango.png b/src/assets/products/mango.png
diff --git a/src/assets/products/okra.png b/src/assets/products/okra.png
diff --git a/src/assets/products/potato.png b/src/assets/products/potato.png
diff --git a/src/assets/products/red_capsicum.png b/src/assets/products/red_capsicum.png
diff --git a/src/assets/products/red_chilly.png b/src/assets/products/red_chilly.png
diff --git a/src/assets/products/tomato.png b/src/assets/products/tomato.png