Merge branch 'release-1.0.96'

Author: entrotech

client/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "foodoasis-client",
   "description": "React Client for Food Oasis",
-  "version": "1.0.94",
+  "version": "1.0.96",
   "author": "Hack for LA",
   "license": "GPL-2.0",
   "private": true,
@@ -30,7 +30,7 @@
     "@turf/bbox": "^7.2.0",
     "@types/mapbox-gl": "^3.4.0",
     "@types/node": "^22.9.1",
-    "axios": "^1.8.2",
+    "axios": "^1.12.0",
     "dayjs": "^1.11.7",
     "debounce-fn": "^5.0.0",
     "formik": "^2.2.9",
@@ -81,7 +81,7 @@
     "prettier": "^2.4.1",
     "ts-jest": "^29.2.5",
     "typescript": "^5.0.0",
-    "vite": "^6.3.4",
+    "vite": "^6.4.1",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^5.0.1"
   },

client/package.json

@@ -116,6 +116,15 @@ function openTimeFilterReducer(state, action) {
   }
 }
 
+function foodTypeFilterReducer(state, action) {
+  switch (action.type) {
+    case "FOOD_TYPE_FILTER_UPDATED":
+      return action.foodTypeFilter;
+    default:
+      return state;
+  }
+}
+
 function listPanelReducer(state, action) {
   switch (action.type) {
     case "TOGGLE_LIST_PANEL":
@@ -171,6 +180,7 @@ export function appReducer(state, action) {
     filterPanel: filterPanelReducer(state.filterPanel, action),
     orgNameFilter: orgNameFilterReducer(state.orgNameFilter, action),
     openTimeFilter: openTimeFilterReducer(state.openTimeFilter, action),
+    foodTypeFilter: foodTypeFilterReducer(state.foodTypeFilter, action),
     listPanel: listPanelReducer(state.listPanel, action),
     isListPanelVisible: isListPanelVisibleReducer(
       state.isListPanelVisible,
@@ -193,6 +203,7 @@ export function getInitialState() {
     filterPanel: false,
     orgNameFilter: "",
     openTimeFilter: { radio: "Show All", day: "", time: "" },
+    foodTypeFilter: [],
     listPanel: true,
     isListPanelVisible: false,
     position: "0",
@@ -284,6 +295,11 @@ export function useOpenTimeFilter() {
   return openTimeFilter;
 }
 
+export function useFoodTypeFilter() {
+  const { foodTypeFilter } = useAppState();
+  return foodTypeFilter;
+}
+
 export function useListPanel() {
   const { listPanel } = useAppState();
   return listPanel;

client/src/appReducer.jsx

@@ -76,7 +76,7 @@ const LoginForm = () => {
         <Formik
           validateOnBlur={false}
           initialValues={{
-            email: email || "",
+            email: email ?? "",
             password: "",
           }}
           validationSchema={validationSchema}

client/src/components/Account/Login.tsx

@@ -1,6 +1,7 @@
 import { Container } from "@mui/material";
+import { PropsWithChildren } from "react";
 
-export const PageWrapper = ({ children }) => {
+export const PageWrapper = ({ children }: PropsWithChildren<{}>) => {
   return (
     <Container
       component="main"