From 80113e6ed2b714ae661a81e1909de90bbd8ef73c Mon Sep 17 00:00:00 2001 From: Joseph Hansen Date: Fri, 13 Sep 2024 21:08:13 -0500 Subject: [PATCH 1/5] Enums properly defined and nothing broke --- client-app/constants/Enums.js | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 client-app/constants/Enums.js diff --git a/client-app/constants/Enums.js b/client-app/constants/Enums.js new file mode 100644 index 00000000..c5914828 --- /dev/null +++ b/client-app/constants/Enums.js @@ -0,0 +1,9 @@ +const ItemStatus = Object.freeze ({ + DONATED: 'Donated', + IN_STORAGE: 'In storage facility', + REFURBISHED: 'Refurbished', + SOLD: 'Item sold', + RECEIVED: 'Received' +}); + +export default ItemStatus; \ No newline at end of file From 8daf6518df363c19f55986b8a8aee8afdc9bebe1 Mon Sep 17 00:00:00 2001 From: Joseph Hansen Date: Sat, 14 Sep 2024 19:20:27 -0500 Subject: [PATCH 2/5] DonatedItemsList.js is updated with enum values --- client-app/src/Components/DonatedItemsList.js | 23 ++++++++++--------- client-app/src/constants/Enums.js | 9 ++++++++ 2 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 client-app/src/constants/Enums.js diff --git a/client-app/src/Components/DonatedItemsList.js b/client-app/src/Components/DonatedItemsList.js index be07050a..fdbbbf01 100644 --- a/client-app/src/Components/DonatedItemsList.js +++ b/client-app/src/Components/DonatedItemsList.js @@ -3,6 +3,7 @@ import { Link, useNavigate } from 'react-router-dom'; import { FaSearch, FaPlus } from 'react-icons/fa'; import Barcode from 'react-barcode'; import Modal from 'react-modal'; +import ItemStatus from '../constants/Enums.js'; import '../css/AdminHeader.css'; import '../css/DonatedItemsList.css'; import html2canvas from 'html2canvas'; @@ -25,7 +26,7 @@ function DonatedItemsList() { item.donor.toLowerCase().includes(searchInput.toLowerCase()) || item.date.includes(searchInput) || item.program.toLowerCase().includes(searchInput.toLowerCase()) || - item.status.toLowerCase().includes(searchInput.toLowerCase()) + Object.values(ItemStatus).includes(item.status) && item.status.toLowerCase().includes(searchInput.toLowerCase()) ); setFilteredItems(filtered); }; @@ -95,11 +96,11 @@ function DonatedItemsList() { // Sample data for demonstration const [donatedItems, setDonatedItems] = useState([ - { id: 811253, name: 'Bicycle', donor: 'Mary', date: '2024-02-25', program: 'Not Assigned', status: 'Donated' }, - { id: 811249, name: 'Computer', donor: 'James', date: '2024-02-06', program: 'Not Assigned', status: 'In Storage Facility' }, - { id: 811247, name: 'Computer', donor: 'Vivian', date: '2024-01-26', program: 'Not Assigned', status: 'Refurbished' }, - { id: 811246, name: 'Bicycle', donor: 'Elizabeth', date: '2024-01-21', program: 'Not Assigned', status: 'Item Sold' }, - { id: 811240, name: 'Bicycle', donor: 'Peter', date: '2024-01-13', program: 'Not Assigned', status: 'Received' } + { id: 811253, name: 'Bicycle', donor: 'Mary', date: '2024-02-25', program: 'Not Assigned', status: ItemStatus.DONATED }, + { id: 811249, name: 'Computer', donor: 'James', date: '2024-02-06', program: 'Not Assigned', status: ItemStatus.IN_STORAGE }, + { id: 811247, name: 'Computer', donor: 'Vivian', date: '2024-01-26', program: 'Not Assigned', status: ItemStatus.REFURBISHED }, + { id: 811246, name: 'Bicycle', donor: 'Elizabeth', date: '2024-01-21', program: 'Not Assigned', status: ItemStatus.SOLD }, + { id: 811240, name: 'Bicycle', donor: 'Peter', date: '2024-01-13', program: 'Not Assigned', status: ItemStatus.RECEIVED } // Add more items here... ]); const downloadBarcode = (id) => { @@ -173,11 +174,11 @@ function DonatedItemsList() { - - - - - + + + + + diff --git a/client-app/src/constants/Enums.js b/client-app/src/constants/Enums.js new file mode 100644 index 00000000..b0c806eb --- /dev/null +++ b/client-app/src/constants/Enums.js @@ -0,0 +1,9 @@ +const ItemStatus = Object.freeze ({ + DONATED: 'Donated', + IN_STORAGE: 'In Storage Facility', + REFURBISHED: 'Refurbished', + SOLD: 'Item Sold', + RECEIVED: 'Received' +}); + +export default ItemStatus; \ No newline at end of file From e789e820e4c056f66717ffa71e5234213b42500f Mon Sep 17 00:00:00 2001 From: Joseph Hansen Date: Sat, 14 Sep 2024 19:49:39 -0500 Subject: [PATCH 3/5] Changed StatusDisplayPage.js to work with enums. Commented out code I wasn't sure if it needed editing. --- .../src/Components/StatusDisplayPage.js | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/client-app/src/Components/StatusDisplayPage.js b/client-app/src/Components/StatusDisplayPage.js index 85fdd85c..84dfc062 100644 --- a/client-app/src/Components/StatusDisplayPage.js +++ b/client-app/src/Components/StatusDisplayPage.js @@ -1,5 +1,6 @@ import React, { useState, useEffect } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; +import ItemStatus from '../constants/Enums'; import '../css/StatusDisplayPage.css'; const StatusDisplayPage = () => { @@ -12,13 +13,14 @@ const StatusDisplayPage = () => { email: '', phone: '', address: '', - status: { + /*status: { donated: false, inStorageFacility: false, refurbished: false, received: false, sold: false - }, + },*/ + status: null, image: null }); @@ -31,13 +33,14 @@ const StatusDisplayPage = () => { email: 'donor@example.com', phone: '123-456-7890', address: '123 Main St', - status: { + /*status: { donated: true, inStorageFacility: true, refurbished: true, received: true, sold: true - } + }*/ + status: null }; setDonorInfo(dummyData); }, []); @@ -100,7 +103,9 @@ const StatusDisplayPage = () => { Donated @@ -110,7 +115,9 @@ const StatusDisplayPage = () => { In Storage Facility @@ -120,7 +127,9 @@ const StatusDisplayPage = () => { Refurbished @@ -130,7 +139,9 @@ const StatusDisplayPage = () => { Received @@ -140,7 +151,9 @@ const StatusDisplayPage = () => { Sold From d5f4c648d4723f4401379fd1a7b269d1b3917052 Mon Sep 17 00:00:00 2001 From: Joseph Hansen Date: Sat, 14 Sep 2024 20:25:33 -0500 Subject: [PATCH 4/5] Fixing the mistake within the StatusDisplayPage.js, previous version did not allow for bubble selection. --- .../src/Components/StatusDisplayPage.js | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/client-app/src/Components/StatusDisplayPage.js b/client-app/src/Components/StatusDisplayPage.js index 84dfc062..124654c4 100644 --- a/client-app/src/Components/StatusDisplayPage.js +++ b/client-app/src/Components/StatusDisplayPage.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; -import ItemStatus from '../constants/Enums'; +//import ItemStatus from '../constants/Enums'; import '../css/StatusDisplayPage.css'; const StatusDisplayPage = () => { @@ -13,14 +13,14 @@ const StatusDisplayPage = () => { email: '', phone: '', address: '', - /*status: { + status: { donated: false, inStorageFacility: false, refurbished: false, received: false, sold: false - },*/ - status: null, + }, + //status: null, image: null }); @@ -33,14 +33,14 @@ const StatusDisplayPage = () => { email: 'donor@example.com', phone: '123-456-7890', address: '123 Main St', - /*status: { + status: { donated: true, inStorageFacility: true, refurbished: true, received: true, sold: true - }*/ - status: null + } + //status: null }; setDonorInfo(dummyData); }, []); @@ -103,9 +103,9 @@ const StatusDisplayPage = () => { Donated @@ -115,9 +115,9 @@ const StatusDisplayPage = () => { In Storage Facility @@ -127,9 +127,9 @@ const StatusDisplayPage = () => { Refurbished @@ -139,9 +139,9 @@ const StatusDisplayPage = () => { Received @@ -151,9 +151,9 @@ const StatusDisplayPage = () => { Sold From 1e2dec76450be16597f3fe61b95c0e383f52ed0c Mon Sep 17 00:00:00 2001 From: Joseph Hansen Date: Sat, 21 Sep 2024 01:53:37 -0500 Subject: [PATCH 5/5] Updated for comments --- client-app/constants/Enums.js | 9 ------- .../src/Components/StatusDisplayPage.js | 24 +++++-------------- 2 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 client-app/constants/Enums.js diff --git a/client-app/constants/Enums.js b/client-app/constants/Enums.js deleted file mode 100644 index c5914828..00000000 --- a/client-app/constants/Enums.js +++ /dev/null @@ -1,9 +0,0 @@ -const ItemStatus = Object.freeze ({ - DONATED: 'Donated', - IN_STORAGE: 'In storage facility', - REFURBISHED: 'Refurbished', - SOLD: 'Item sold', - RECEIVED: 'Received' -}); - -export default ItemStatus; \ No newline at end of file diff --git a/client-app/src/Components/StatusDisplayPage.js b/client-app/src/Components/StatusDisplayPage.js index 124654c4..ff743f8c 100644 --- a/client-app/src/Components/StatusDisplayPage.js +++ b/client-app/src/Components/StatusDisplayPage.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; -//import ItemStatus from '../constants/Enums'; +import ItemStatus from '../constants/Enums'; import '../css/StatusDisplayPage.css'; const StatusDisplayPage = () => { @@ -20,7 +20,6 @@ const StatusDisplayPage = () => { received: false, sold: false }, - //status: null, image: null }); @@ -40,7 +39,6 @@ const StatusDisplayPage = () => { received: true, sold: true } - //status: null }; setDonorInfo(dummyData); }, []); @@ -103,60 +101,50 @@ const StatusDisplayPage = () => { - Donated + {ItemStatus.DONATED}