🔨 1.0.4 - Sort Items, Open New Tab

- removed data science files as well - sorted the items to be selected - open directions in new tab
bettersg · Jan 3, 2024 · c78a0a4 · c78a0a4
1 parent 868b2ac
commit c78a0a4
Show file tree

Hide file tree

Showing 93 changed files with 18 additions and 31,778 deletions.
diff --git a/client/components/home/UserInput/Items.tsx b/client/components/home/UserInput/Items.tsx
@@ -25,7 +25,20 @@ const emptyItem: TEmptyItem = {
 
 export const Items = () => {
 	const { items, setUserSelection } = useUserInputs();
-	const { items: itemList, categories } = useSheetyData();
+	const { items: iList, categories } = useSheetyData();
+	const itemList = iList.sort((a, b) => {
+		// Convert to uppercase for case-insensitive comparison
+		const nameA = a.name.toUpperCase();
+		const nameB = b.name.toUpperCase();
+
+		if (nameA < nameB) {
+			return -1;
+		}
+		if (nameA > nameB) {
+			return 1;
+		}
+		return 0;
+	});
 
 	const getValidMethods = useCallback(
 		(itemName: string) => {

diff --git a/client/components/map/FacilityCard.tsx b/client/components/map/FacilityCard.tsx
@@ -103,8 +103,10 @@ export const FacilityCard = ({
 							{/* <span style={{ fontWeight: 800 }}>Address:</span>{" "} */}
 							{facCardDetails.address}
 						</Text>
-						<Link
+						<a
 							href={`https://www.google.com/maps/dir/${address.coordinates.lat},${address.coordinates.long}/${facCardDetails.latitude},${facCardDetails.longitude}`}
+							target="_blank"
+							rel="noopener noreferrer"
 						>
 							<Button
 								bg={COLORS.Button.primary}
@@ -119,7 +121,7 @@ export const FacilityCard = ({
 								<ExternalLinkIcon />
 								<Text>Get directions</Text>
 							</Button>
-						</Link>
+						</a>
 					</VStack>
 				</HStack>
 				<Flex p={2} gap={2} flexDir={"column"}>

diff --git a/data_science/algo/README.txt b/data_science/algo/README.txt
diff --git a/data_science/algo/cleaning.ipynb b/data_science/algo/cleaning.ipynb
diff --git a/data_science/algo/mapping.ipynb b/data_science/algo/mapping.ipynb
diff --git a/data_science/dashboard/README.md b/data_science/dashboard/README.md
diff --git a/data_science/dashboard/__pycache__/prepare.cpython-38.pyc b/data_science/dashboard/__pycache__/prepare.cpython-38.pyc
diff --git a/data_science/dashboard/bin_locations.xlsx b/data_science/dashboard/bin_locations.xlsx
diff --git a/data_science/dashboard/dashboard.py b/data_science/dashboard/dashboard.py
diff --git a/data_science/dashboard/data/collection_method_table.csv b/data_science/dashboard/data/collection_method_table.csv
diff --git a/data_science/dashboard/data/item_table.csv b/data_science/dashboard/data/item_table.csv