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 b7d4c1d1d4..bebf32a8c8 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,8 @@ "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" @@ -23,7 +25,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 e06317433f..542b9955dd 100644 --- a/src/CartItem.jsx +++ b/src/CartItem.jsx @@ -1,68 +1,109 @@ import React from 'react'; import { useSelector, useDispatch } from 'react-redux'; -import { removeItem, updateQuantity } from './CartSlice'; +import { addItem, removeItem, updateQuantity } from './CartSlice'; import './CartItem.css'; const CartItem = ({ onContinueShopping }) => { const cart = useSelector(state => state.cart.items); const dispatch = useDispatch(); - // Calculate total amount for all products in the cart - const calculateTotalAmount = () => { - - }; + // Calculate total amount for all products + const calculateTotalAmount = () => + cart.reduce( + (total, item) => total + parseFloat(item.cost.substring(1)) * item.quantity, + 0 + ).toFixed(2); + + // Calculate total quantity of items in cart + const calculateTotalQuantity = () => + cart.reduce((total, item) => total + item.quantity, 0); const handleContinueShopping = (e) => { - + if (onContinueShopping) onContinueShopping(e); }; - - const handleIncrement = (item) => { + dispatch(updateQuantity({ name: item.name, quantity: item.quantity + 1 })); }; const handleDecrement = (item) => { - + if (item.quantity > 1) { + dispatch(updateQuantity({ name: item.name, quantity: item.quantity - 1 })); + } else { + dispatch(removeItem(item.name)); + } }; const handleRemove = (item) => { + dispatch(removeItem(item.name)); }; - // Calculate total cost based on quantity for an item - const calculateTotalCost = (item) => { + // Optional: add item to cart (Task 4) + const handleAddItem = (item) => { + dispatch(addItem(item)); + }; + + const calculateTotalCost = (item) => + (parseFloat(item.cost.substring(1)) * item.quantity).toFixed(2); + + const handleCheckoutShopping = () => { + alert('Functionality to be added for future reference'); }; return (
-

Total Cart Amount: ${calculateTotalAmount()}

+

Total Items in Cart: {calculateTotalQuantity()}

+

Total Cart Amount: ${calculateTotalAmount()}

+
- {cart.map(item => ( + {cart.map((item) => (
{item.name}
{item.name}
{item.cost}
- + {item.quantity} - + +
+
+ Total: ${calculateTotalCost(item)} +
+
+ +
-
Total: ${calculateTotalCost(item)}
-
))}
-
+ +
+ Grand Total: ${calculateTotalAmount()} +
+
- -
- + +
); }; export default CartItem; - - diff --git a/src/CartSlice.jsx b/src/CartSlice.jsx index 32b8761ed0..c96d19524a 100644 --- a/src/CartSlice.jsx +++ b/src/CartSlice.jsx @@ -1,23 +1,50 @@ -import { createSlice } from '@reduxjs/toolkit'; +import { createSlice } from "@reduxjs/toolkit"; -export const CartSlice = createSlice({ - name: 'cart', - initialState: { - items: [], // Initialize items as an empty array - }, +const initialState = { + items: [] // array of { name, image, cost, quantity } +}; + +const cartSlice = createSlice({ + name: "cart", + initialState, reducers: { + // Add item to cart or increase its quantity addItem: (state, action) => { - + const { name, image, cost } = action.payload; + const existingItem = state.items.find((item) => item.name === name); + + if (existingItem) { + existingItem.quantity++; + } else { + state.items.push({ name, image, cost, quantity: 1 }); + } }, + + // Remove item from cart by name removeItem: (state, action) => { + state.items = state.items.filter( + (item) => item.name !== action.payload + ); }, + + // Update item quantity directly updateQuantity: (state, action) => { + const { name, quantity } = action.payload; + const itemToUpdate = state.items.find((item) => item.name === name); - + if (itemToUpdate) { + itemToUpdate.quantity = quantity; + } }, - }, + + // Optional: clear cart completely + clearCart: (state) => { + state.items = []; + } + } }); -export const { addItem, removeItem, updateQuantity } = CartSlice.actions; +export const { addItem, removeItem, updateQuantity, clearCart } = + cartSlice.actions; -export default CartSlice.reducer; +export default cartSlice.reducer; diff --git a/src/ProductList.css b/src/ProductList.css index 52f9c7a84f..7995122e54 100644 --- a/src/ProductList.css +++ b/src/ProductList.css @@ -1,252 +1,206 @@ /* Reset some default styles */ body, h1, ul { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } -/* Set a background color */ +/* General */ body { - font-family: Arial, sans-serif; - background-color: #f0f0f0; + font-family: Arial, sans-serif; + background-color: #f0f0f0; } /* Navbar */ .navbar { - background-color: #4CAF50; - color: #fff!important; - padding: 15px; - display: flex; - justify-content: space-between; - align-items: center; - font-size: 20px; + background-color: #4CAF50; + color: #fff !important; + padding: 15px; + display: flex; + justify-content: space-between; + align-items: center; + font-size: 20px; } .navbar .ul { - display: flex; - justify-content: space-between; - align-items: center; - width: 1100px; + display: flex; + justify-content: space-between; + align-items: center; + width: 1100px; } .navbar li { - margin-right: 30px; + margin-right: 30px; } .navbar .ul div a { - color: white; - font-size: 30px; - text-decoration: none; - + color: white; + font-size: 30px; + text-decoration: none; +} + +/* Category Section */ +.plantname_heading { + display: flex; + align-items: center; + justify-content: center; + margin-top: 30px; +} + +.plant_heading { + width: 400px; + text-align: center; + margin: 20px; + border: 1px solid #050404; + border-left: none; + border-right: none; + font-size: 24px; + font-weight: bold; + color: #2e7d32; } /* Product Grid */ .product-grid { - display:flex; - flex-direction: column; - width: 100vw; - align-items: center; - justify-content: center; + display: flex; + flex-direction: column; + width: 100%; + align-items: center; + justify-content: center; + padding: 20px; } + .product-list { - display: flex; - flex-wrap: wrap; - gap: 50px; - /* background-color: pink; */ - /* justify-content: space-between; */ - padding: 20px; - width: 100%; - align-items: center; - justify-content: center; + display: flex; + flex-wrap: wrap; + gap: 30px; + padding: 20px; + width: 100%; + align-items: center; + justify-content: center; } /* Product Card */ .product-card { - flex: 0 0 calc(33.33% - 20px); /* Adjust width for 3 cards per row with 20px gap */ - max-width: calc(26.33% - 20px); /* Adjust max-width for 3 cards per row with 20px gap */ + flex: 0 0 calc(45% - 20px); /* Make cards take ~45% width when two per row */ + max-width: calc(45% - 20px); margin-bottom: 20px; padding: 20px; background-color: #fff; border: 1px solid #ccc; - border-radius: 5px; + border-radius: 8px; text-align: center; position: relative; - gap: 20px; } -/* Pseudo-classes - Hover effect on product button */ +/* Adjust layout for larger screens with 3 cards */ +@media (min-width: 1200px) { + .product-card { + flex: 0 0 calc(30% - 20px); + max-width: calc(30% - 20px); + } +} + +/* Adjust for smaller screens */ +@media (max-width: 768px) { + .product-card { + flex: 1 1 calc(90% - 20px); /* Full width on mobile */ + max-width: calc(90% - 20px); + } +} + + .product-card:hover { - transform: scale(1.05); - transition: transform 0.3s ease-in-out; - z-index: 1; + transform: scale(1.05); + z-index: 1; } .product-title { - font-weight: bold; - margin-bottom: 10px; + font-weight: bold; + margin: 10px 0; + font-size: 18px; } -.product-price { - color: #e74c3c; - font-size: 1.2rem; - margin-bottom: 10px; +.product-description { + font-size: 14px; + color: #555; + margin: 10px 0; + min-height: 40px; +} + +.product-cost { + color: #4CAF50; + font-size: 1.2rem; + font-weight: bold; + margin-bottom: 10px; } .product-image { - max-width: 100%; - height: 200px; /* Adjust height for better consistency */ + width: 100%; + height: 180px; + object-fit: cover; + border-radius: 6px; } +/* Buttons */ .product-button { - background-color: #e74c3c; - color: #fff; - border: none; - padding: 10px 20px; - cursor: pointer; - transition: background-color 0.3s ease-in-out; - margin-top: 10px; + background-color: #4CAF50; + border: none; + color: white; + padding: 10px 20px; + cursor: pointer; + font-size: 15px; + border-radius: 5px; + transition: background-color 0.3s ease-in-out; } .product-button:hover { - background-color: #c0392b; -} - -/* Pseudo-elements - Sale badge */ -.product-card::before { - content: "SALE"; - background-color: #e74c3c; - color: #fff; - position: absolute; - top: 0; - right: 0; - padding: 5px 10px; - border-radius: 0 0 0 5px; -} -.tag_home_link{ - display: flex; - /* background-color: red; */ - flex-direction: column; - align-items: center; - justify-content: center; - margin-left: 50px; - color: white; - text-decoration: none; - font-size: 20px; -} -.tag_home_link h3{ - font-size: 30px; -} -.tag a{ - text-decoration: none; -} -.tag { - width: 400px; - display: flex; - align-items: center; - justify-content: center; + background-color: #45a049; } -.tag img { - height: 70px; - width: 70px; - border-radius: 70%; - +.product-button.added-to-cart { + background-color: grey; + cursor: not-allowed; } -.luxury { - display: flex; - align-items: center; - justify-content: center; - width: 650px; - font-size: 19px; -} -.cart{ - color: white; - display: flex; -} -.cart_quantity_count{ - margin-top: 16px; - /* background-color: red; */ - margin-left: 27px; - position: absolute; - font-size: 29px; - -} -.plantname_heading{ - display: flex; - align-items: center; - justify-content: center; - /* background-color: yellow; */ -} -.plant_heading{ - width: 400px; - text-align: center; - margin: 20px; - border: 1px solid rgb(5, 4, 4); - border-left: none; - border-right: none; - - +/* Cart Indicator */ +.cart { + color: white; + display: flex; + position: relative; } -/* Add Media Query for responsiveness */ -@media (max-width: 768px) { - .product-card { - flex: 1 1 calc(50% - 20px); /* Adjust width for 2 cards per row with 20px gap on smaller screens */ - max-width: calc(50% - 20px); /* Adjust max-width for 2 cards per row with 20px gap on smaller screens */ - } + +.cart_quantity_count { + position: absolute; + top: -5px; + right: -10px; + background: red; + color: white; + font-size: 14px; + padding: 2px 6px; + border-radius: 50%; } -/* ProductList.css */ -.product-button { - background-color: #4CAF50; /* Green */ - border: none; - color: white; - padding: 10px 20px; - text-align: center; - text-decoration: none; - display: inline-block; - font-size: 16px; - margin: 4px 2px; - transition-duration: 0.4s; - cursor: pointer; +/* Responsiveness */ +@media (max-width: 1200px) { + .product-card { + flex: 1 1 calc(33.33% - 20px); + max-width: calc(33.33% - 20px); } - - .product-button:hover { - background-color: #45a049; +} + +@media (max-width: 768px) { + .product-card { + flex: 1 1 calc(50% - 20px); + max-width: calc(50% - 20px); } - - .product-button.added-to-cart { - background-color: grey; /* Grey when product is added */ + + .navbar { + flex-direction: column; + align-items: center; } - @media (max-width: 1200px) { - .product-card { - flex: 1 1 calc(33.33% - 20px); /* Adjust width for 3 cards per row with 20px gap on medium screens */ - max-width: calc(33.33% - 20px); /* Adjust max-width for 3 cards per row with 20px gap on medium screens */ - } + + .ul { + flex-direction: column; + gap: 10px; } - - @media (max-width: 768px) { - .product-card { - flex: 1 1 calc(50% - 20px); /* Adjust width for 2 cards per row with 20px gap on small screens */ - max-width: calc(50% - 20px); /* Adjust max-width for 2 cards per row with 20px gap on small screens */ - } - .navbar { - flex-direction: column; /* Change flex direction to stack items vertically */ - align-items: center; /* Align items to the center of the container */ - } - - .tag { - margin-bottom: 20px; /* Add margin bottom for spacing */ - text-align: center; /* Align text to the center */ - } - - .ul { - display: flex; /* Set display to flex */ - flex-direction: column; /* Change flex direction to stack items vertically */ - gap: 10px; /* Add gap between items */ - } - - .ul div { - text-align: center; /* Align text to the center */ - } - } \ No newline at end of file +} diff --git a/src/ProductList.jsx b/src/ProductList.jsx index 7682c04fc4..ef908abaea 100644 --- a/src/ProductList.jsx +++ b/src/ProductList.jsx @@ -1,287 +1,71 @@ -import React, { useState, useEffect } from 'react'; -import './ProductList.css' -import CartItem from './CartItem'; -function ProductList({ onHomeClick }) { - const [showCart, setShowCart] = useState(false); - const [showPlants, setShowPlants] = useState(false); // State to control the visibility of the About Us page +import React, { useState } from "react"; +import { useDispatch, useSelector } from "react-redux"; +import { addItem } from "./CartSlice"; +import "./ProductList.css"; - const plantsArray = [ - { - category: "Air Purifying Plants", - plants: [ - { - name: "Snake Plant", - image: "https://cdn.pixabay.com/photo/2021/01/22/06/04/snake-plant-5939187_1280.jpg", - description: "Produces oxygen at night, improving air quality.", - cost: "$15" - }, - { - name: "Spider Plant", - image: "https://cdn.pixabay.com/photo/2018/07/11/06/47/chlorophytum-3530413_1280.jpg", - description: "Filters formaldehyde and xylene from the air.", - cost: "$12" - }, - { - name: "Peace Lily", - image: "https://cdn.pixabay.com/photo/2019/06/12/14/14/peace-lilies-4269365_1280.jpg", - description: "Removes mold spores and purifies the air.", - cost: "$18" - }, - { - name: "Boston Fern", - image: "https://cdn.pixabay.com/photo/2020/04/30/19/52/boston-fern-5114414_1280.jpg", - description: "Adds humidity to the air and removes toxins.", - cost: "$20" - }, - { - name: "Rubber Plant", - image: "https://cdn.pixabay.com/photo/2020/02/15/11/49/flower-4850729_1280.jpg", - description: "Easy to care for and effective at removing toxins.", - cost: "$17" - }, - { - name: "Aloe Vera", - image: "https://cdn.pixabay.com/photo/2018/04/02/07/42/leaf-3283175_1280.jpg", - description: "Purifies the air and has healing properties for skin.", - cost: "$14" - } - ] - }, - { - category: "Aromatic Fragrant Plants", - plants: [ - { - name: "Lavender", - image: "https://images.unsplash.com/photo-1611909023032-2d6b3134ecba?q=80&w=1074&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D", - description: "Calming scent, used in aromatherapy.", - cost: "$20" - }, - { - name: "Jasmine", - image: "https://images.unsplash.com/photo-1592729645009-b96d1e63d14b?q=80&w=1170&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D", - description: "Sweet fragrance, promotes relaxation.", - cost: "$18" - }, - { - name: "Rosemary", - image: "https://cdn.pixabay.com/photo/2019/10/11/07/12/rosemary-4541241_1280.jpg", - description: "Invigorating scent, often used in cooking.", - cost: "$15" - }, - { - name: "Mint", - image: "https://cdn.pixabay.com/photo/2016/01/07/18/16/mint-1126282_1280.jpg", - description: "Refreshing aroma, used in teas and cooking.", - cost: "$12" - }, - { - name: "Lemon Balm", - image: "https://cdn.pixabay.com/photo/2019/09/16/07/41/balm-4480134_1280.jpg", - description: "Citrusy scent, relieves stress and promotes sleep.", - cost: "$14" - }, - { - name: "Hyacinth", - image: "https://cdn.pixabay.com/photo/2019/04/07/20/20/hyacinth-4110726_1280.jpg", - description: "Hyacinth is a beautiful flowering plant known for its fragrant.", - cost: "$22" - } - ] - }, - { - category: "Insect Repellent Plants", - plants: [ - { - name: "oregano", - image: "https://cdn.pixabay.com/photo/2015/05/30/21/20/oregano-790702_1280.jpg", - description: "The oregano plants contains compounds that can deter certain insects.", - cost: "$10" - }, - { - name: "Marigold", - image: "https://cdn.pixabay.com/photo/2022/02/22/05/45/marigold-7028063_1280.jpg", - description: "Natural insect repellent, also adds color to the garden.", - cost: "$8" - }, - { - name: "Geraniums", - image: "https://cdn.pixabay.com/photo/2012/04/26/21/51/flowerpot-43270_1280.jpg", - description: "Known for their insect-repelling properties while adding a pleasant scent.", - cost: "$20" - }, - { - name: "Basil", - image: "https://cdn.pixabay.com/photo/2016/07/24/20/48/tulsi-1539181_1280.jpg", - description: "Repels flies and mosquitoes, also used in cooking.", - cost: "$9" - }, - { - name: "Lavender", - image: "https://images.unsplash.com/photo-1611909023032-2d6b3134ecba?q=80&w=1074&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D", - description: "Calming scent, used in aromatherapy.", - cost: "$20" - }, - { - name: "Catnip", - image: "https://cdn.pixabay.com/photo/2015/07/02/21/55/cat-829681_1280.jpg", - description: "Repels mosquitoes and attracts cats.", - cost: "$13" - } - ] - }, - { - category: "Medicinal Plants", - plants: [ - { - name: "Aloe Vera", - image: "https://cdn.pixabay.com/photo/2018/04/02/07/42/leaf-3283175_1280.jpg", - description: "Soothing gel used for skin ailments.", - cost: "$14" - }, - { - name: "Echinacea", - image: "https://cdn.pixabay.com/photo/2014/12/05/03/53/echinacea-557477_1280.jpg", - description: "Boosts immune system, helps fight colds.", - cost: "$16" - }, - { - name: "Peppermint", - image: "https://cdn.pixabay.com/photo/2017/07/12/12/23/peppermint-2496773_1280.jpg", - description: "Relieves digestive issues and headaches.", - cost: "$13" - }, - { - name: "Lemon Balm", - image: "https://cdn.pixabay.com/photo/2019/09/16/07/41/balm-4480134_1280.jpg", - description: "Calms nerves and promotes relaxation.", - cost: "$14" - }, - { - name: "Chamomile", - image: "https://cdn.pixabay.com/photo/2016/08/19/19/48/flowers-1606041_1280.jpg", - description: "Soothes anxiety and promotes sleep.", - cost: "$15" - }, - { - name: "Calendula", - image: "https://cdn.pixabay.com/photo/2019/07/15/18/28/flowers-4340127_1280.jpg", - description: "Heals wounds and soothes skin irritations.", - cost: "$12" - } - ] - }, - { - category: "Low Maintenance Plants", - plants: [ - { - name: "ZZ Plant", - image: "https://images.unsplash.com/photo-1632207691143-643e2a9a9361?q=80&w=464&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D", - description: "Thrives in low light and requires minimal watering.", - cost: "$25" - }, - { - name: "Pothos", - image: "https://cdn.pixabay.com/photo/2018/11/15/10/32/plants-3816945_1280.jpg", - description: "Tolerates neglect and can grow in various conditions.", - cost: "$10" - }, - { - name: "Snake Plant", - image: "https://cdn.pixabay.com/photo/2021/01/22/06/04/snake-plant-5939187_1280.jpg", - description: "Needs infrequent watering and is resilient to most pests.", - cost: "$15" - }, - { - name: "Cast Iron Plant", - image: "https://cdn.pixabay.com/photo/2017/02/16/18/04/cast-iron-plant-2072008_1280.jpg", - description: "Hardy plant that tolerates low light and neglect.", - cost: "$20" - }, - { - name: "Succulents", - image: "https://cdn.pixabay.com/photo/2016/11/21/16/05/cacti-1846147_1280.jpg", - description: "Drought-tolerant plants with unique shapes and colors.", - cost: "$18" - }, - { - name: "Aglaonema", - image: "https://cdn.pixabay.com/photo/2014/10/10/04/27/aglaonema-482915_1280.jpg", - description: "Requires minimal care and adds color to indoor spaces.", - cost: "$22" - } - ] - } - ]; - const styleObj = { - backgroundColor: '#4CAF50', - color: '#fff!important', - padding: '15px', - display: 'flex', - justifyContent: 'space-between', - alignIems: 'center', - fontSize: '20px', - } - const styleObjUl = { - display: 'flex', - justifyContent: 'space-between', - alignItems: 'center', - width: '1100px', - } - const styleA = { - color: 'white', - fontSize: '30px', - textDecoration: 'none', - } +const ProductList = () => { + const dispatch = useDispatch(); + const cartItems = useSelector((state) => state.cart.items); // Get cart items from Redux + const [addedToCart, setAddedToCart] = useState({}); - const handleHomeClick = (e) => { - e.preventDefault(); - onHomeClick(); - }; + // Function to calculate total quantity of items in cart + const calculateTotalQuantity = () => { + return cartItems ? cartItems.reduce((total, item) => total + item.quantity, 0) : 0; + }; - const handleCartClick = (e) => { - e.preventDefault(); - setShowCart(true); // Set showCart to true when cart icon is clicked - }; - 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 - }; + // Handle Add to Cart + const handleAddToCart = (product) => { + dispatch(addItem(product)); + setAddedToCart((prev) => ({ ...prev, [product.name]: true })); + }; - const handleContinueShopping = (e) => { - e.preventDefault(); - setShowCart(false); - }; - return ( -
-
-
-
- - handleHomeClick(e)}> -
-

Paradise Nursery

- Where Green Meets Serenity -
- -
+ // Example plantsArray already in your file + const plantsArray = [ + { + category: "Indoor Plants", + plants: [ + { name: "Snake Plant", image: "/snake.png", description: "Improves air quality", cost: "$15" }, + { name: "Spider Plant", image: "/spider.png", description: "Removes toxins", cost: "$12" }, + ], + }, + { + category: "Aromatic Fragrant Plants", + plants: [ + { name: "Lavender", image: "/lavender.png", description: "Calming scent", cost: "$20" }, + { name: "Jasmine", image: "/jasmine.png", description: "Promotes relaxation", cost: "$18" }, + ], + }, + ]; -
-
-
handlePlantsClick(e)} style={styleA}>Plants
-
handleCartClick(e)} style={styleA}>

-
-
- {!showCart ? ( -
+ return ( +
+

Total Items in Cart: {calculateTotalQuantity()}

+ {plantsArray.map((category, index) => ( +
+

{category.category}

+
+ {category.plants.map((plant, idx) => ( +
+ {plant.name} +
{plant.name}
+
{plant.description}
+
{plant.cost}
-
- ) : ( - - )} + +
+ ))} +
- ); -} + ))} +
+ ); +}; export default ProductList; diff --git a/src/store.js b/src/store.js index 54d0d6d66e..b53f9b63e3 100644 --- a/src/store.js +++ b/src/store.js @@ -1,8 +1,16 @@ +// store.js import { configureStore } from '@reduxjs/toolkit'; import cartReducer from './CartSlice'; - const store = configureStore({ - reducer: { - cart: cartReducer, - }, + +// Configure Redux store +const store = configureStore({ + reducer: { + // 'cart' slice is managed by cartReducer + cart: cartReducer, + }, + // Optional: add middleware or devTools configuration if needed + // middleware: (getDefaultMiddleware) => getDefaultMiddleware(), + // devTools: process.env.NODE_ENV !== 'production', }); -export default store + +export default store; 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()], })