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

prod build
pesto-students · Feb 16, 2024 · e7bc389 · e7bc389
2 parents 59f4d68 + 4441e86
commit e7bc389
Show file tree

Hide file tree

Showing 16 changed files with 481 additions and 653 deletions.
diff --git a/dist/assets/index--jeBJAky.css b/dist/assets/index--jeBJAky.css
diff --git a/dist/assets/index-kRs4n30u.js → dist/assets/index-CehNDEYs.js b/dist/assets/index-kRs4n30u.js → dist/assets/index-CehNDEYs.js
diff --git a/dist/assets/index-iVQZbP4t.css b/dist/assets/index-iVQZbP4t.css
diff --git a/dist/index.html b/dist/index.html
@@ -10,8 +10,8 @@
     <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-kRs4n30u.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-iVQZbP4t.css">
+    <script type="module" crossorigin src="./assets/index-CehNDEYs.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index--jeBJAky.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/src/app/reducers/productSlice.js b/src/app/reducers/productSlice.js
@@ -0,0 +1,272 @@
+import { createSlice } from "@reduxjs/toolkit";
+import apple from "../../assets/products/apple.png";
+import cauliflower from "../../assets/products/cauliflower.png";
+import chinese_cabbage from "../../assets/products/chinese_cabbage.png";
+import corn from "../../assets/products/corn.png";
+import cucumber from "../../assets/products/cucumber.png";
+import eggplant from "../../assets/products/eggplant.png";
+import green_capsicum from "../../assets/products/green_capsicum.png";
+import green_chilly from "../../assets/products/green_chilly.png";
+import lettuce from "../../assets/products/lettuce.png";
+import mango from "../../assets/products/mango.png";
+import okra from "../../assets/products/okra.png";
+import potato from "../../assets/products/potato.png";
+import red_capsicum from "../../assets/products/red_capsicum.png";
+import red_chilly from "../../assets/products/red_chilly.png";
+import tomato from "../../assets/products/tomato.png";
+
+const initialState = {
+  products: [
+    {
+      description: "200g cheese block",
+      id: 1,
+      image:
+        "https://res.cloudinary.com/dbfn5lnvx/image/upload/q_auto/v1607769454/react-tutorial/products/final/cheese.png",
+      name: "Cheese",
+      price: 50,
+      stockStatus: 256,
+      price_id: "price_1HuavSGuhXEITAut56IgndJf",
+      isWishlist: false,
+      category: "dairy",
+      discount: 0,
+    },
+    {
+      description: "200ml milk bottle",
+      id: 2,
+      image:
+        "https://res.cloudinary.com/dbfn5lnvx/image/upload/q_auto/v1607769454/react-tutorial/products/final/milk.png",
+      name: "Milk",
+      price: 20,
+      stockStatus: 256,
+      price_id: "price_1HxVriGuhXEITAutt5KUKo2V",
+      isWishlist: false,
+      category: "dairy",
+      discount: 0,
+    },
+    {
+      description: "1kg tomato",
+      id: 3,
+      image: tomato,
+      name: "Tomato",
+      price: 20,
+      stockStatus: 256,
+      price_id: "price_1HxW4YGuhXEITAutgcWugXH7",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 10,
+    },
+    {
+      description: "500g pineapple",
+      id: 4,
+      image:
+        "https://res.cloudinary.com/dbfn5lnvx/image/upload/q_auto/v1607769454/react-tutorial/products/final/pineapple.png",
+      name: "Pineapple",
+      price: 40,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJ",
+      isWishlist: false,
+      category: "fruits",
+      discount: 0,
+    },
+    {
+      description: "250g cauliflower",
+      id: 5,
+      image: cauliflower,
+      name: "Cauliflower",
+      price: 21,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJc",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 0,
+    },
+    {
+      description: "500g chinese cabbage",
+      id: 6,
+      image: chinese_cabbage,
+      name: "Chinese Cabbage",
+      price: 30,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJcc",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 0,
+    },
+    {
+      description: "200g sweet corn",
+      id: 7,
+      image: corn,
+      name: "Sweet Corn",
+      price: 20,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJsc",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 15,
+    },
+    {
+      description: "1 piece green cucumber",
+      id: 8,
+      image: cucumber,
+      name: "Green Cucumber",
+      price: 40,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJgc",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 0,
+    },
+    {
+      description: "250g eggplant",
+      id: 9,
+      image: eggplant,
+      name: "Eggplant",
+      price: 35,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJegg",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 0,
+    },
+    {
+      description: "250g green capsicum",
+      id: 10,
+      image: green_capsicum,
+      name: "Green Capsicum",
+      price: 60,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJcap",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 30,
+    },
+    {
+      description: "250g green chilly",
+      id: 11,
+      image: green_chilly,
+      name: "Green Chilly",
+      price: 20,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJgchilly",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 5,
+    },
+    {
+      description: "250g lettuce",
+      id: 12,
+      image: lettuce,
+      name: "Lettuce",
+      price: 75,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJlett",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 0,
+    },
+    {
+      description: "1kg red mango",
+      id: 13,
+      image: mango,
+      name: "Red Mango",
+      price: 250,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJmango",
+      isWishlist: false,
+      category: "fruits",
+      discount: 20,
+    },
+    {
+      description: "500g Ladies Finger",
+      id: 14,
+      image: okra,
+      name: "Ladies Finger (Okra)",
+      price: 45,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJokra",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 0,
+    },
+    {
+      description: "1kg potato",
+      id: 15,
+      image: potato,
+      name: "Potato",
+      price: 60,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJpotato",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 10,
+    },
+    {
+      description: "250g red capsicum",
+      id: 16,
+      image: green_capsicum,
+      name: "Green Capsicum",
+      price: 60,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJ",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 30,
+    },
+    {
+      description: "250g green capsicum",
+      id: 17,
+      image: red_capsicum,
+      name: "Red Capsicum",
+      price: 70,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJredcap",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 15,
+    },
+    {
+      description: "250g Kashmiri red chilly",
+      id: 18,
+      image: red_chilly,
+      name: "Kashmiri Red Chilly",
+      price: 80,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJkash",
+      isWishlist: false,
+      category: "vegetables",
+      discount: 0,
+    },
+    {
+      description: "250g green apple",
+      id: 19,
+      image: apple,
+      name: "Green Apple",
+      price: 100,
+      stockStatus: 256,
+      price_id: "price_1HxW59GuhXEITAutCwoYZoOJkash",
+      isWishlist: false,
+      category: "fruits",
+      discount: 10,
+    },
+  ],
+};
+
+const productsSlice = createSlice({
+  name: "products",
+  initialState,
+  reducers: {
+    toggleProductWishlist: (state, action) => {
+      const val = state.products.findIndex(
+        (product) => product.id === action.payload.id
+      );
+      state.products[val] = {
+        ...state.products[val],
+        isWishlist: !state.products[val]["isWishlist"],
+      };
+    },
+  },
+});
+
+export const { toggleProductWishlist } = productsSlice.actions;
+
+export default productsSlice.reducer;
diff --git a/src/app/reducers/wishlistSlice.js b/src/app/reducers/wishlistSlice.js
@@ -13,12 +13,9 @@ const wishlistSlice = createSlice({
         (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 });
+        state.wishlist.push({ ...action.payload, isWishlist: true});
       }
     },
     removeProductWishlist: (state, action) => {

diff --git a/src/app/store.js b/src/app/store.js
@@ -2,11 +2,14 @@ import { configureStore } from "@reduxjs/toolkit";
 import cartReducer from "./reducers/cartSlice";
 import authReducer from "./reducers/authSlice";
 import wishlistReducer from "./reducers/wishlistSlice";
+import productsReducer from "./reducers/productSlice";
+
 const store = configureStore({
   reducer: {
     auth: authReducer,
     cart: cartReducer,
     wishlist: wishlistReducer,
+    products: productsReducer
   },
 });
 

diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
@@ -35,8 +35,6 @@ export default function Navbar() {
     dispatch(logout());
     navigate("/login");
   };
-  const paths = ["/shop", "/products", "/products/:id", "/wishlist"];
-
   useEffect(() => {
     if (path === "/shop") {
       setIsSearchbarAllowed(true);
@@ -53,6 +51,11 @@ export default function Navbar() {
       setIsWishlistAllowed(true);
       setIsCartAllowed(false);
       setIsAvatarAllowed(true);
+    } else if (path.includes("/products/")) {
+      setIsSearchbarAllowed(false);
+      setIsWishlistAllowed(true);
+      setIsCartAllowed(true);
+      setIsAvatarAllowed(true);
     } else {
       setIsSearchbarAllowed(false);
       setIsWishlistAllowed(false);