From 37e7814861e2f49a34f6033f76b78abce376b622 Mon Sep 17 00:00:00 2001 From: rvpjosue-wq Date: Sat, 15 Nov 2025 19:57:39 -0500 Subject: [PATCH 1/2] initial commit --- package.json | 3 +++ src/CartItem.jsx | 21 +++++++++++++++++---- src/CartSlice.jsx | 21 ++++++++++++++++++--- src/ProductList.jsx | 32 ++++++++++++++++++++++++++++++++ vite.config.js | 2 +- 5 files changed, 71 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index b7d4c1d1d4..2ae98f8c6f 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,13 @@ { "name": "shoppingcart", + "homepage": "https://github.com/rvpjosue-wq/e-plantShopping.git", "private": true, "version": "0.0.0", "type": "module", "scripts": { "dev": "vite", + "predeploy": "npm run build", +"deploy": "gh-pages -d dist", "build": "vite build", "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", "preview": "vite build; vite preview --host" diff --git a/src/CartItem.jsx b/src/CartItem.jsx index e06317433f..92d3f9a8fe 100644 --- a/src/CartItem.jsx +++ b/src/CartItem.jsx @@ -7,29 +7,42 @@ const CartItem = ({ onContinueShopping }) => { const cart = useSelector(state => state.cart.items); const dispatch = useDispatch(); + // Calculate total amount for all products in the cart // Calculate total amount for all products in the cart const calculateTotalAmount = () => { - + let totalCost = 0; + cart.forEach((item) => { + let itemCost = Number(item.cost.replace(/[^0-9.-]+/g,"")); + totalCost += itemCost * item.quantity; + }) + return totalCost; }; const handleContinueShopping = (e) => { - + dispatch((e) => onContinueShopping(e)); }; - + const handleCheckoutShopping = (e) => { + console.log('Checkout'); + alert('Functionality to be added for future reference'); + }; const handleIncrement = (item) => { + dispatch(incrementItem(item)) }; const handleDecrement = (item) => { - + dispatch(decrementItem(item)) }; const handleRemove = (item) => { + dispatch(removeItem(item)) }; // Calculate total cost based on quantity for an item const calculateTotalCost = (item) => { + let itemCost = Number(item.cost.replace(/[^0-9.-]+/g,"")); + return itemCost * item.quantity; }; return ( diff --git a/src/CartSlice.jsx b/src/CartSlice.jsx index 32b8761ed0..983f45f214 100644 --- a/src/CartSlice.jsx +++ b/src/CartSlice.jsx @@ -7,13 +7,28 @@ export const CartSlice = createSlice({ }, reducers: { addItem: (state, action) => { - - }, + const { name, image, cost } = action.payload; // Destructure product details from the action payload + // Check if the item already exists in the cart by comparing names + const existingItem = state.items.find(item => item.name === name); + if (existingItem) { + // If item already exists in the cart, increase its quantity + existingItem.quantity++; + } else { + // If item does not exist, add it to the cart with quantity 1 + state.items.push({ name, image, cost, quantity: 1 }); + } + }, removeItem: (state, action) => { + state.items = state.items.filter(item => item.name !== action.payload); }, updateQuantity: (state, action) => { - + const { name, quantity } = action.payload; // Destructure the product name and new quantity from the action payload + // Find the item in the cart that matches the given name + const itemToUpdate = state.items.find(item => item.name === name); + if (itemToUpdate) { + itemToUpdate.quantity = quantity; // If the item is found, update its quantity to the new value + } }, }, }); diff --git a/src/ProductList.jsx b/src/ProductList.jsx index 7682c04fc4..0948106a57 100644 --- a/src/ProductList.jsx +++ b/src/ProductList.jsx @@ -1,10 +1,14 @@ import React, { useState, useEffect } from 'react'; import './ProductList.css' import CartItem from './CartItem'; +import { createSlice } from "@reduxjs/toolkit"; function ProductList({ onHomeClick }) { const [showCart, setShowCart] = useState(false); const [showPlants, setShowPlants] = useState(false); // State to control the visibility of the About Us page + const calculateTotalQuantity = () => { + return CartItems ? CartItems.reduce((total, item) => total + item.quantity, 0) : 0; + }; const plantsArray = [ { category: "Air Purifying Plants", @@ -274,6 +278,34 @@ function ProductList({ onHomeClick }) { {!showCart ? (
+ {plantsArray.map((category, index) => ( // Loop through each category in plantsArray +
{/* Unique key for each category div */} +

+
{category.category}
{/* Display the category name */} +

+
{/* Container for the list of plant cards */} + {category.plants.map((plant, plantIndex) => ( // Loop through each plant in the current category +
{/* Unique key for each plant card */} + {plant.name} +
{plant.name}
{/* Display plant name */} + {/* Display other plant details like description and cost */} +
{plant.description}
{/* Display plant description */} +
${plant.cost}
{/* Display plant cost */} + +
+ ))} +
+
+))}
diff --git a/vite.config.js b/vite.config.js index 4d190ae430..beeaed5cdc 100644 --- a/vite.config.js +++ b/vite.config.js @@ -3,6 +3,6 @@ import react from '@vitejs/plugin-react' // https://vitejs.dev/config/ export default defineConfig({ - base: "/shoppingreact", + base: "/e-plantShopping", plugins: [react()], }) From 80894f3a717bf6172282a7612b8b2fdbfbe14169 Mon Sep 17 00:00:00 2001 From: rvpjosue-wq Date: Sat, 15 Nov 2025 20:24:34 -0500 Subject: [PATCH 2/2] initial commit --- package-lock.json | 235 +++++++++++++++++++++++++++++++++----------- package.json | 4 +- src/CartItem.jsx | 140 ++++++++++++++------------ src/CartSlice.jsx | 45 +++++---- src/ProductList.jsx | 121 ++++++++++++----------- 5 files changed, 340 insertions(+), 205 deletions(-) diff --git a/package-lock.json b/package-lock.json index af7843d848..3e89598b75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "eslint-plugin-react": "^7.34.1", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.6", - "gh-pages": "^6.1.1", + "gh-pages": "^6.3.0", "vite": "^5.2.0" } }, @@ -1364,24 +1364,13 @@ } }, "node_modules/array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==", - "dev": true, - "dependencies": { - "array-uniq": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true, + "license": "MIT", "engines": { - "node": ">=0.10.0" + "node": ">=8" } }, "node_modules/array.prototype.findlast": { @@ -1524,6 +1513,19 @@ "concat-map": "0.0.1" } }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/browserslist": { "version": "4.23.0", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", @@ -1634,12 +1636,13 @@ "dev": true }, "node_modules/commander": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", - "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz", + "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==", "dev": true, + "license": "MIT", "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/commondir": { @@ -1788,6 +1791,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -2336,6 +2352,36 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, + "node_modules/fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -2395,6 +2441,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/find-cache-dir": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", @@ -2573,18 +2632,19 @@ } }, "node_modules/gh-pages": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.1.1.tgz", - "integrity": "sha512-upnohfjBwN5hBP9w2dPE7HO5JJTHzSGMV1JrLrHvNuqmjoYHg6TBrCcnEoorjG/e0ejbuvnwyKMdTyM40PEByw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.3.0.tgz", + "integrity": "sha512-Ot5lU6jK0Eb+sszG8pciXdjMXdBJ5wODvgjR+imihTqsUWF2K6dJ9HST55lgqcs8wWcw6o6wAsUzfcYRhJPXbA==", "dev": true, + "license": "MIT", "dependencies": { "async": "^3.2.4", - "commander": "^11.0.0", + "commander": "^13.0.0", "email-addresses": "^5.0.0", "filenamify": "^4.3.0", "find-cache-dir": "^3.3.1", "fs-extra": "^11.1.1", - "globby": "^6.1.0" + "globby": "^11.1.0" }, "bin": { "gh-pages": "bin/gh-pages.js", @@ -2651,19 +2711,24 @@ } }, "node_modules/globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, + "license": "MIT", "dependencies": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" }, "engines": { - "node": ">=0.10.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/gopd": { @@ -3029,6 +3094,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/is-number-object": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", @@ -3370,6 +3445,30 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -3639,40 +3738,33 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "dev": true }, - "node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", - "dev": true, - "dependencies": { - "pinkie": "^2.0.0" + "node": ">=8.6" }, - "engines": { - "node": ">=0.10.0" + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, "node_modules/pkg-dir": { @@ -4178,6 +4270,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/source-map-js": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", @@ -4337,6 +4439,19 @@ "node": ">=4" } }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, "node_modules/trim-repeated": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", diff --git a/package.json b/package.json index 2ae98f8c6f..633e251663 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "dev": "vite", "predeploy": "npm run build", -"deploy": "gh-pages -d dist", + "deploy": "gh-pages -d dist", "build": "vite build", "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", "preview": "vite build; vite preview --host" @@ -26,7 +26,7 @@ "eslint-plugin-react": "^7.34.1", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.6", - "gh-pages": "^6.1.1", + "gh-pages": "^6.3.0", "vite": "^5.2.0" } } diff --git a/src/CartItem.jsx b/src/CartItem.jsx index 92d3f9a8fe..6bc678cc67 100644 --- a/src/CartItem.jsx +++ b/src/CartItem.jsx @@ -3,79 +3,89 @@ import { useSelector, useDispatch } from 'react-redux'; import { removeItem, updateQuantity } from './CartSlice'; import './CartItem.css'; -const CartItem = ({ onContinueShopping }) => { - const cart = useSelector(state => state.cart.items); - const dispatch = useDispatch(); +const CartItem = ({ onRemove, onContinueShopping }) => { + const cart = useSelector(state => state.cart.items); + const dispatch = useDispatch(); - // Calculate total amount for all products in the cart - // Calculate total amount for all products in the cart - const calculateTotalAmount = () => { - let totalCost = 0; - cart.forEach((item) => { - let itemCost = Number(item.cost.replace(/[^0-9.-]+/g,"")); - totalCost += itemCost * item.quantity; - }) - return totalCost; - }; + // Calculate total amount for all products in the cart + const calculateTotalAmount = () => { + return cart.reduce((accumulator, currentValue) => accumulator + (parseInt(currentValue.cost.replace("$", "")) * currentValue.quantity), 0) + }; - const handleContinueShopping = (e) => { - dispatch((e) => onContinueShopping(e)); - }; + // Calculate total cost based on quantity for an item + const calculateTotalCost = (item) => { + const cost = item.cost.replace("$", "") + return parseInt(cost) * item.quantity + }; - const handleCheckoutShopping = (e) => { - console.log('Checkout'); - alert('Functionality to be added for future reference'); - }; + const handleContinueShopping = (e) => { + onContinueShopping(e) + }; - const handleIncrement = (item) => { - dispatch(incrementItem(item)) - }; + const handleCheckout = (e) => { + alert("Checkout") + } - const handleDecrement = (item) => { - dispatch(decrementItem(item)) - }; + const handleIncrement = (item) => { + let product = cart.find((product) => product.name == item.name) + if (product) { + dispatch(updateQuantity({ + name: product.name, + quantity: product.quantity + 1 + })) + } + }; - const handleRemove = (item) => { - dispatch(removeItem(item)) - }; + const handleDecrement = (item) => { + let product = cart.find((product) => product.name == item.name) + if (product) { + if (product.quantity === 1) { + handleRemove(item) + } else { + dispatch(updateQuantity({ + name: product.name, + quantity: product.quantity - 1 + })) + } + } + }; - // Calculate total cost based on quantity for an item - const calculateTotalCost = (item) => { - let itemCost = Number(item.cost.replace(/[^0-9.-]+/g,"")); - return itemCost * item.quantity; - }; + const handleRemove = (item) => { + dispatch(removeItem(item.name)) + onRemove(item.name) + }; - return ( -
-

Total Cart Amount: ${calculateTotalAmount()}

-
- {cart.map(item => ( -
- {item.name} -
-
{item.name}
-
{item.cost}
-
- - {item.quantity} - -
-
Total: ${calculateTotalCost(item)}
- + return ( +
+

Total Cart Amount: ${calculateTotalAmount()}

+
+ { + cart.map(item => ( +
+ {item.name} +
+
{item.name}
+
{item.cost}
+
+ + {item.quantity} + +
+
Total: ${calculateTotalCost(item)}
+ +
+
+ )) + }
-
- ))} -
-
-
- -
- -
-
- ); +
+
+ +
+ +
+
+ ); }; -export default CartItem; - - +export default CartItem; \ No newline at end of file diff --git a/src/CartSlice.jsx b/src/CartSlice.jsx index 983f45f214..e2cdebf431 100644 --- a/src/CartSlice.jsx +++ b/src/CartSlice.jsx @@ -6,33 +6,32 @@ export const CartSlice = createSlice({ items: [], // Initialize items as an empty array }, reducers: { - addItem: (state, action) => { - const { name, image, cost } = action.payload; // Destructure product details from the action payload - // Check if the item already exists in the cart by comparing names - const existingItem = state.items.find(item => item.name === name); - if (existingItem) { - // If item already exists in the cart, increase its quantity - existingItem.quantity++; - } else { - // If item does not exist, add it to the cart with quantity 1 - state.items.push({ name, image, cost, quantity: 1 }); - } - }, - removeItem: (state, action) => { - state.items = state.items.filter(item => item.name !== action.payload); + "addItem": (state, action) => { + const product = action.payload; + const existingItem = state.items.find((item) => item.name === product.name); + if (existingItem) { + existingItem.quantity++; + } else { + state.items.push({ + ...product, + quantity: 1 + }); + } }, - updateQuantity: (state, action) => { - - const { name, quantity } = action.payload; // Destructure the product name and new quantity from the action payload - // Find the item in the cart that matches the given name - const itemToUpdate = state.items.find(item => item.name === name); - if (itemToUpdate) { - itemToUpdate.quantity = quantity; // If the item is found, update its quantity to the new value - } + "removeItem": (state, action) => { + const name=action.payload + state.items = state.items.filter((item) => item.name !== name); + }, + "updateQuantity": (state, action) => { + const { name, quantity } = action.payload; + const itemToUpdate = state.items.find(item => item.name === name); + if (itemToUpdate) { + itemToUpdate.quantity = quantity; + } }, }, }); export const { addItem, removeItem, updateQuantity } = CartSlice.actions; -export default CartSlice.reducer; +export default CartSlice.reducer; \ No newline at end of file diff --git a/src/ProductList.jsx b/src/ProductList.jsx index 0948106a57..f2b7a385f5 100644 --- a/src/ProductList.jsx +++ b/src/ProductList.jsx @@ -1,14 +1,15 @@ import React, { useState, useEffect } from 'react'; import './ProductList.css' import CartItem from './CartItem'; -import { createSlice } from "@reduxjs/toolkit"; -function ProductList({ onHomeClick }) { +import { addItem } from './CartSlice'; +import { useDispatch, useSelector } from 'react-redux'; +function ProductList() { const [showCart, setShowCart] = useState(false); - const [showPlants, setShowPlants] = useState(false); // State to control the visibility of the About Us page + const [, setShowPlants] = useState(false); + const [addedToCart, setAddedToCart] = useState({}); + const cart = useSelector(state => state.cart.items); + const dispatch = useDispatch() - const calculateTotalQuantity = () => { - return CartItems ? CartItems.reduce((total, item) => total + item.quantity, 0) : 0; - }; const plantsArray = [ { category: "Air Purifying Plants", @@ -217,7 +218,7 @@ function ProductList({ onHomeClick }) { } ]; const styleObj = { - backgroundColor: '#4CAF50', + backgroundColor: '#ff0000', color: '#fff!important', padding: '15px', display: 'flex', @@ -236,33 +237,42 @@ function ProductList({ onHomeClick }) { fontSize: '30px', textDecoration: 'none', } - - const handleHomeClick = (e) => { - e.preventDefault(); - onHomeClick(); - }; - const handleCartClick = (e) => { e.preventDefault(); - setShowCart(true); // Set showCart to true when cart icon is clicked + setShowPlants(false); + setShowCart(true); }; const handlePlantsClick = (e) => { e.preventDefault(); - setShowPlants(true); // Set showAboutUs to true when "About Us" link is clicked - setShowCart(false); // Hide the cart when navigating to About Us + setShowPlants(true); + setShowCart(false); }; - const handleContinueShopping = (e) => { e.preventDefault(); + setShowPlants(true); setShowCart(false); }; + const handleAddToCart = (product) => { + dispatch(addItem(product)); + setAddedToCart((prevState) => ({ + ...prevState, + [product.name]: true, + })); + }; + const handleRemove = (name) => { + setAddedToCart((prevState) => { + delete prevState[name] + return prevState + }) + } + return (
- {!showCart ? ( -
- {plantsArray.map((category, index) => ( // Loop through each category in plantsArray -
{/* Unique key for each category div */} -

-
{category.category}
{/* Display the category name */} -

-
{/* Container for the list of plant cards */} - {category.plants.map((plant, plantIndex) => ( // Loop through each plant in the current category -
{/* Unique key for each plant card */} - {plant.name} -
{plant.name}
{/* Display plant name */} - {/* Display other plant details like description and cost */} -
{plant.description}
{/* Display plant description */} -
${plant.cost}
{/* Display plant cost */} - -
- ))} -
-
-))} - + { + !showCart ? ( +
+ {plantsArray.map((category, index) => ( +
+

{category.category}

+
+ { + category.plants.map((plant, plantIndex) => ( +
+
{plant.name}
+ {plant.name} +
{plant.cost}
+
{plant.description}
+ +
+ )) + } +
+
+ ))} -
- ) : ( - - )} +
+ ) : ( + + ) + }
); } -export default ProductList; +export default ProductList; \ No newline at end of file