Bumped version to 1.0.80

hackforla · Mar 18, 2024 · fdadfdd · fdadfdd
2 parents d1924f9 + 34ab951
commit fdadfdd
Show file tree

Hide file tree

Showing 43 changed files with 1,482 additions and 235 deletions.
diff --git a/.github/workflows/mainToHeroku.yml b/.github/workflows/mainToHeroku.yml
@@ -9,8 +9,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: akhileshns/heroku-deploy@v3.8.9 # This is the action
+      - uses: actions/checkout@v3
+      - uses: akhileshns/heroku-deploy@v3.12.14 # This is the action
         with:
           heroku_api_key: ${{secrets.HEROKU_API_KEY}}
           heroku_app_name: "foodoasis" #Must be unique in Heroku

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "foodoasis-client",
   "description": "React Client for Food Oasis",
-  "version": "1.0.79",
+  "version": "1.0.80",
   "author": "Hack for LA",
   "license": "GPL-2.0",
   "private": true,
@@ -25,17 +25,19 @@
     "@mui/material": "^5.11.1",
     "@mui/x-data-grid": "^5.17.20",
     "@mui/x-date-pickers": "^6.8.0",
+    "@types/mapbox-gl": "^3.1.0",
     "axios": "^1.6.7",
     "dayjs": "^1.11.7",
     "debounce-fn": "^5.0.0",
     "formik": "^2.2.9",
     "js-file-download": "^0.4.12",
+    "mapbox-gl": "^3.2.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-draggable": "^4.4.6",
     "react-gtm-module": "^2.0.11",
     "react-helmet-async": "^1.3.0",
-    "react-map-gl": "^6.1.17",
+    "react-map-gl": "^7.1.7",
     "react-router-dom": "^6.10.0",
     "react-scripts": "^5.0.1",
     "react-virtuoso": "^4.1.0",

diff --git a/client/src/App.js b/client/src/App.js
@@ -61,6 +61,7 @@ const About = lazy(() => import("./components/About"));
 const Faq = lazy(() => import("./components/Faq"));
 const Contact = lazy(() => import("./components/StaticPages/Contact"));
 const MuiDemo = lazy(() => import("./components/MuiDemo/MuiDemo"));
+const Features = lazy(() => import("./components/Admin/Features"));
 
 function App() {
   useEffect(() => {
@@ -170,7 +171,6 @@ function App() {
                             </div>
                           }
                         />
-
                         <Route
                           path="verificationdashboard"
                           element={
@@ -276,6 +276,22 @@ function App() {
                             </PrivateRoute>
                           }
                         />
+                        <Route
+                          path="features"
+                          element={
+                            <PrivateRoute roles={["isAdmin"]}>
+                              <div
+                                style={{
+                                  flexBasis: "90%",
+                                  paddingTop: "1em",
+                                  paddingBottom: "1em",
+                                }}
+                              >
+                                <Features />
+                              </div>
+                            </PrivateRoute>
+                          }
+                        />
                         <Route
                           path="securityadmindashboard"
                           element={

diff --git a/client/src/appReducer.js b/client/src/appReducer.js
@@ -109,6 +109,15 @@ function noKnownEligibilityRequirementsFilterReducer(state, action) {
   }
 }
 
+function listPanelReducer(state, action) {
+  switch (action.type) {
+    case "TOGGLE_LIST_PANEL":
+      return action.listPanel;
+    default:
+      return state;
+  }
+}
+
 export function appReducer(state, action) {
   return {
     defaultCoordinate: defaultCoordinatesReducer(
@@ -137,6 +146,7 @@ export function appReducer(state, action) {
         state.noKnownEligibilityRequirementsFilter,
         action
       ),
+    listPanel: listPanelReducer(state.listPanel, action),
   };
 }
 
@@ -152,6 +162,7 @@ export function getInitialState() {
     filterPanel: false,
     openTimeFilter: { radio: "Show All", day: "", time: "" },
     noKnownEligibilityRequirementsFilter: false,
+    listPanel: true,
   };
 }
 
@@ -234,3 +245,8 @@ export function useNoKnownEligibilityRequirementsFilter() {
   const { noKnownEligibilityRequirementsFilter } = useAppState();
   return noKnownEligibilityRequirementsFilter;
 }
+
+export function useListPanel() {
+  const { listPanel } = useAppState();
+  return listPanel;
+}