From 1c2c82bb917d0563385b01e67079d1f0b2d8c9ad Mon Sep 17 00:00:00 2001 From: John Darragh Date: Fri, 3 Jan 2025 17:45:14 -0800 Subject: [PATCH 01/14] Bug where widget included app header (#2314) --- client/src/Routes.jsx | 6 +++++- .../components/FoodSeeker/SearchResults/layouts/Desktop.jsx | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/client/src/Routes.jsx b/client/src/Routes.jsx index 5a9fe8893..be3461136 100644 --- a/client/src/Routes.jsx +++ b/client/src/Routes.jsx @@ -7,6 +7,9 @@ import { Navigate, Outlet, Route, Routes } from "react-router-dom"; import Fallback from "./components/Fallback"; import PrivateRoute from "./components/PrivateRoute"; import Toast from "components/UI/Toast"; +import { + useWidget, +} from "./appReducer"; const VerificationAdmin = lazy(() => import("components/Admin/VerificationAdmin") @@ -196,6 +199,7 @@ export default function AppRoutes() { } function AppWrapper() { + const isWidget = useWidget(); return ( -
+ {isWidget ? null :
} diff --git a/client/src/components/FoodSeeker/SearchResults/layouts/Desktop.jsx b/client/src/components/FoodSeeker/SearchResults/layouts/Desktop.jsx index 44eeaab9c..08a774b89 100644 --- a/client/src/components/FoodSeeker/SearchResults/layouts/Desktop.jsx +++ b/client/src/components/FoodSeeker/SearchResults/layouts/Desktop.jsx @@ -3,6 +3,7 @@ import { useFilterPanel, useListPanel, useAppDispatch, + useWidget } from "../../../../appReducer"; import DrawerLeftArrowButton from "../../../../icons/DrawerLeftArrowButton"; import DrawerRightArrowButton from "../../../../icons/DrawerRightArrowButton"; @@ -10,6 +11,7 @@ import DrawerRightArrowButton from "../../../../icons/DrawerRightArrowButton"; const DesktopLayout = ({ filters, list, map }) => { const isFilterPanelOpen = useFilterPanel(); const isListPanelOpen = useListPanel(); + const isWidget = useWidget(); const dispatch = useAppDispatch(); const toggleDrawer = (event) => { @@ -51,7 +53,7 @@ const DesktopLayout = ({ filters, list, map }) => { width: "524px", transition: "left .5s ease-in-out", left: isListPanelOpen ? leftPostion : "-524px", - top: "120px", + top: isWidget ? "62px": "126px", height: "calc(100% - 120px)", zIndex: 3, background: "white", From a6d03b58209e4f64ce6e702439c17d10f6e42613 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 17:48:33 -0800 Subject: [PATCH 02/14] Bump nanoid from 3.3.7 to 3.3.8 in /client (#2310) Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- client/package-lock.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 08a28c636..898f19a04 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "foodoasis-client", - "version": "1.0.88", + "version": "1.0.89", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "foodoasis-client", - "version": "1.0.88", + "version": "1.0.89", "license": "GPL-2.0", "dependencies": { "@emotion/react": "^11.10.5", @@ -7709,7 +7709,9 @@ "license": "MIT" }, "node_modules/nanoid": { - "version": "3.3.7", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { @@ -7717,7 +7719,6 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, From 5f8e1e32efe0ca131035b208eb7f4e6e7d28e3c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 17:48:47 -0800 Subject: [PATCH 03/14] Bump axios from 1.6.7 to 1.7.8 (#2298) Bumps [axios](https://github.com/axios/axios) from 1.6.7 to 1.7.8. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.6.7...v1.7.8) --- updated-dependencies: - dependency-name: axios dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- client/package-lock.json | 5 +++-- package-lock.json | 19 ++++++++++--------- server/package-lock.json | 7 +++---- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 898f19a04..dd0bdefc3 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -4623,8 +4623,9 @@ "license": "MIT" }, "node_modules/axios": { - "version": "1.7.4", - "license": "MIT", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz", + "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", diff --git a/package-lock.json b/package-lock.json index 6604bf716..790a98247 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2564,12 +2564,12 @@ "dev": true }, "node_modules/axios": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", - "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz", + "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==", "dev": true, "dependencies": { - "follow-redirects": "^1.15.4", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -13531,7 +13531,8 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==", - "dev": true + "dev": true, + "requires": {} }, "@octokit/plugin-rest-endpoint-methods": { "version": "5.13.0", @@ -14203,12 +14204,12 @@ "dev": true }, "axios": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", - "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz", + "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==", "dev": true, "requires": { - "follow-redirects": "^1.15.4", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" }, diff --git a/server/package-lock.json b/server/package-lock.json index 654ebd25a..e9efc466b 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -4865,10 +4865,9 @@ } }, "node_modules/axios": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", - "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", - "license": "MIT", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz", + "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", From d1b39a0948e70c4087c42532b81a5b813d427df8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 17:49:13 -0800 Subject: [PATCH 04/14] Bump path-to-regexp and express in /server (#2308) Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) to 0.1.12 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together. Updates `path-to-regexp` from 0.1.10 to 0.1.12 - [Release notes](https://github.com/pillarjs/path-to-regexp/releases) - [Changelog](https://github.com/pillarjs/path-to-regexp/blob/master/History.md) - [Commits](https://github.com/pillarjs/path-to-regexp/compare/v0.1.10...v0.1.12) Updates `express` from 4.21.1 to 4.21.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.2/History.md) - [Commits](https://github.com/expressjs/express/compare/4.21.1...4.21.2) --- updated-dependencies: - dependency-name: path-to-regexp dependency-type: indirect - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- server/package-lock.json | 24 ++++++++++++++---------- server/package.json | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index e9efc466b..56221027d 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "foodoasis-web-api", - "version": "1.0.88", + "version": "1.0.89", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "foodoasis-web-api", - "version": "1.0.88", + "version": "1.0.89", "license": "GPL-2.0", "dependencies": { "@aws-sdk/client-location": "^3.621.0", @@ -26,7 +26,7 @@ "csv-stringify": "^6.5.1", "dayjs": "^1.11.7", "dotenv": "^16.4.5", - "express": "^4.21.1", + "express": "^4.21.2", "express-pino-logger": "^7.0.0", "json-2-csv": "^3.17.1", "jsonwebtoken": "^9.0.2", @@ -6967,9 +6967,9 @@ } }, "node_modules/express": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", - "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -6990,7 +6990,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -7005,6 +7005,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express-pino-logger": { @@ -10577,9 +10581,9 @@ "dev": true }, "node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" }, "node_modules/path-type": { "version": "4.0.0", diff --git a/server/package.json b/server/package.json index a5b9d91d5..fb4f552f3 100644 --- a/server/package.json +++ b/server/package.json @@ -44,7 +44,7 @@ "csv-stringify": "^6.5.1", "dayjs": "^1.11.7", "dotenv": "^16.4.5", - "express": "^4.21.1", + "express": "^4.21.2", "express-pino-logger": "^7.0.0", "json-2-csv": "^3.17.1", "jsonwebtoken": "^9.0.2", From 440de5d05b1e9e1a5574b3e2257182f0513f2e47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 18:18:29 -0800 Subject: [PATCH 05/14] Bump nanoid and mocha in /server (#2309) Removes [nanoid](https://github.com/ai/nanoid). It's no longer used after updating ancestor dependency [mocha](https://github.com/mochajs/mocha). These dependencies need to be updated together. Removes `nanoid` Updates `mocha` from 10.2.0 to 10.8.2 - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/main/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v10.2.0...v10.8.2) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect - dependency-name: mocha dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- server/package-lock.json | 167 +++++++++++++++------------------------ server/package.json | 2 +- 2 files changed, 66 insertions(+), 103 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index 56221027d..ff156a313 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -31,7 +31,7 @@ "json-2-csv": "^3.17.1", "jsonwebtoken": "^9.0.2", "massive": "^6.10.2", - "mocha": "^10.0.0", + "mocha": "^10.8.2", "multer": "^1.4.5-lts.1", "node-pg-migrate": "^6.2.1", "nodemailer": "^6.9.9", @@ -4621,9 +4621,9 @@ } }, "node_modules/ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", "engines": { "node": ">=6" } @@ -5899,11 +5899,11 @@ "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==" }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -6035,9 +6035,9 @@ } }, "node_modules/diff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", - "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "engines": { "node": ">=0.3.1" } @@ -9716,31 +9716,30 @@ } }, "node_modules/mocha": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", - "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", - "dependencies": { - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.3", - "debug": "4.3.4", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "7.2.0", - "he": "1.2.0", - "js-yaml": "4.1.0", - "log-symbols": "4.1.0", - "minimatch": "5.0.1", - "ms": "2.1.3", - "nanoid": "3.3.3", - "serialize-javascript": "6.0.0", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "workerpool": "6.2.1", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", + "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", + "dependencies": { + "ansi-colors": "^4.1.3", + "browser-stdout": "^1.3.1", + "chokidar": "^3.5.3", + "debug": "^4.3.5", + "diff": "^5.2.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^8.1.0", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^5.1.6", + "ms": "^2.1.3", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^6.5.1", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.9", + "yargs-unparser": "^2.0.0" }, "bin": { "_mocha": "bin/_mocha", @@ -9748,10 +9747,6 @@ }, "engines": { "node": ">= 14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" } }, "node_modules/mocha/node_modules/argparse": { @@ -9759,6 +9754,14 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, + "node_modules/mocha/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/mocha/node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -9801,35 +9804,24 @@ } }, "node_modules/mocha/node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "minimatch": "^5.0.1", + "once": "^1.3.0" }, "engines": { - "node": "*" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/mocha/node_modules/glob/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/mocha/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -9872,9 +9864,9 @@ } }, "node_modules/mocha/node_modules/minimatch": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", - "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -9882,19 +9874,6 @@ "node": ">=10" } }, - "node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/mocha/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, "node_modules/mocha/node_modules/p-locate": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", @@ -9954,9 +9933,9 @@ } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/multer": { "version": "1.4.5-lts.1", @@ -9980,17 +9959,6 @@ "resolved": "https://registry.npmjs.org/murmurhash/-/murmurhash-1.0.0.tgz", "integrity": "sha512-u/NfpXS+viMWAupgU6IkwAVWkVnpvzS+D9bDxNuNRUoQ0BRMZ1DK/dPH6Qrknn7RxMHVQBpYBQQigUt7of6RiQ==" }, - "node_modules/nanoid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", - "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -11624,15 +11592,10 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/send/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dependencies": { "randombytes": "^2.1.0" } @@ -12940,9 +12903,9 @@ } }, "node_modules/workerpool": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", - "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==" + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==" }, "node_modules/wrap-ansi": { "version": "7.0.0", @@ -13055,9 +13018,9 @@ } }, "node_modules/yargs-parser": { - "version": "20.2.4", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", - "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "engines": { "node": ">=10" } diff --git a/server/package.json b/server/package.json index fb4f552f3..bd9c4b186 100644 --- a/server/package.json +++ b/server/package.json @@ -49,7 +49,7 @@ "json-2-csv": "^3.17.1", "jsonwebtoken": "^9.0.2", "massive": "^6.10.2", - "mocha": "^10.0.0", + "mocha": "^10.8.2", "multer": "^1.4.5-lts.1", "node-pg-migrate": "^6.2.1", "nodemailer": "^6.9.9", From 32fb39313a9c0182f76573db9a3c4c3e99ce0f2a Mon Sep 17 00:00:00 2001 From: Daniel Garcia <124107401+danvgar@users.noreply.github.com> Date: Mon, 30 Dec 2024 19:08:24 -0800 Subject: [PATCH 06/14] Removed scrollbar for all browser types /* Internet Explorer, Edge: */ -ms-overflow-style: none; /* Firefox: */ scrollbar-width: none; /* Safari, Chrome */ ::-webkit-scrollbar { display: none; } --- .../FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx b/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx index 355420218..8cd92f297 100644 --- a/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx +++ b/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx @@ -185,10 +185,14 @@ const ResultsMap = ({ stakeholders, categoryIds, toggleCategory, loading }) => { display="inline-flex" alignItems="flex-start" sx={{ - overflow: "auto", + overflowX: "auto", + overflowY: "hidden", gap: "0.5rem", padding: isMobile ? "0 0 0.3rem 0.75rem" : "0 0 0.3rem 2.25rem", scrollbarWidth: "none", + "&::-webkit-scrollbar": { + display: "none", + }, top: 0, left: isMobile ? 0 From 677b3921a0df1002af9f245baa1b6ca904b31a25 Mon Sep 17 00:00:00 2001 From: Hannah Zulueta Date: Mon, 6 Jan 2025 20:01:15 -0800 Subject: [PATCH 07/14] Fix scroll width bug --- .../FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx b/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx index 8cd92f297..50483d21f 100644 --- a/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx +++ b/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx @@ -198,6 +198,7 @@ const ResultsMap = ({ stakeholders, categoryIds, toggleCategory, loading }) => { ? 0 : `${listPanelLeftPostion + filterPanelLeftPostion}px`, transition: isMobile ? undefined : "left .5s ease-in-out", + maxWidth: isMobile ? "100vw": `calc(100vw - ${listPanelLeftPostion + filterPanelLeftPostion}px)`, }} > Date: Mon, 13 Jan 2025 19:55:23 -0800 Subject: [PATCH 08/14] Return null for empty values --- .../SearchResults/StakeholderDetails/StakeholderDetails.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/components/FoodSeeker/SearchResults/StakeholderDetails/StakeholderDetails.jsx b/client/src/components/FoodSeeker/SearchResults/StakeholderDetails/StakeholderDetails.jsx index 027966e2e..eb07d454d 100644 --- a/client/src/components/FoodSeeker/SearchResults/StakeholderDetails/StakeholderDetails.jsx +++ b/client/src/components/FoodSeeker/SearchResults/StakeholderDetails/StakeholderDetails.jsx @@ -766,7 +766,8 @@ function normalizeSocialLink({ value, socialMedia }) { value === "N/A" || value === "n/a" || value === "n / a" || - value === "N / A" + value === "N / A" || + !value ) { return null; } From 6da23190f8a05caa3fbe6add2f02d1e4d5a63ca0 Mon Sep 17 00:00:00 2001 From: Whitney Gould <78887901+whitneywind@users.noreply.github.com> Date: Thu, 16 Jan 2025 15:38:42 -0800 Subject: [PATCH 09/14] button component for correct zoom #2299 (#2311) * custom buttom component for correct manual zoom * adjusts for open or closed panel and for tablet size * zoom buttons with IconButton components --- .../SearchResults/ResultsMap/ResultsMap.jsx | 86 ++++++++++++++++++- 1 file changed, 82 insertions(+), 4 deletions(-) diff --git a/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx b/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx index 50483d21f..aacf19047 100644 --- a/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx +++ b/client/src/components/FoodSeeker/SearchResults/ResultsMap/ResultsMap.jsx @@ -7,13 +7,15 @@ import { useCallback, useEffect, useState } from "react"; // recommendation from Mapbox team // https://github.com/mapbox/mapbox-gl-js/issues/10173 See comment by IvanDreamer on Mar 22 // for craco.config.js contents -import { Grid } from "@mui/material"; +import { Grid, Box, IconButton } from "@mui/material"; +import AddIcon from '@mui/icons-material/AddRounded'; +import RemoveIcon from '@mui/icons-material/RemoveRounded'; import { MAPBOX_STYLE } from "constants/map"; import { MAPBOX_ACCESS_TOKEN, DEFAULT_VIEWPORT } from "helpers/Constants"; import useBreakpoints from "hooks/useBreakpoints"; import useFeatureFlag from "hooks/useFeatureFlag"; import 'mapbox-gl/dist/mapbox-gl.css'; -import Map, { Layer, Marker, NavigationControl, Source } from "react-map-gl"; +import Map, { Layer, Marker, Source } from "react-map-gl"; import { useLocation, useNavigate } from "react-router-dom"; import * as analytics from "services/analytics"; import { @@ -43,7 +45,7 @@ const ResultsMap = ({ stakeholders, categoryIds, toggleCategory, loading }) => { const selectedOrganization = useSelectedOrganization(); const navigate = useNavigate(); const location = useLocation(); - const { isMobile } = useBreakpoints(); + const { isMobile, isTablet } = useBreakpoints(); const isListPanelOpen = useListPanel(); const isFilterPanelOpen = useFilterPanel(); const { mapRef, flyTo } = useMapbox(); @@ -71,6 +73,7 @@ const ResultsMap = ({ stakeholders, categoryIds, toggleCategory, loading }) => { const onMouseEnter = useCallback(() => setCursor("pointer"), []); const onMouseLeave = useCallback(() => setCursor("auto"), []); const [interactiveLayerIds, setInteractiveLayerIds] = useState(["nonexist"]); + const [currMap, setCurrMap] = useState(null); useEffect(() => { analytics.postEvent("showMap"); @@ -84,8 +87,10 @@ const ResultsMap = ({ stakeholders, categoryIds, toggleCategory, loading }) => { })); }, [searchCoordinates, longitude, latitude, isMobile]); + const onLoad = useCallback(async () => { const map = mapRef.current.getMap(); + setCurrMap(map); await loadMarkerIcons(map); setMarkersLoaded(true); setInteractiveLayerIds([MARKERS_LAYER_ID]); @@ -134,6 +139,79 @@ const ResultsMap = ({ stakeholders, categoryIds, toggleCategory, loading }) => { const listPanelLeftPostion = isListPanelOpen ? 524 : 0; const filterPanelLeftPostion = isFilterPanelOpen ? 340 : 0; + const CustomNavigationControl = () => { + if (!currMap) return; + const zoom = currMap.getZoom(); + const currentCenter = currMap.getCenter(); + + const handleZoomIn = () => { + const longOffset = 0.0399 * Math.pow(2, 11 - zoom); + const newCenter = { + lng: !isTablet && isListPanelOpen ? currentCenter.lng + longOffset : currentCenter.lng, + lat: selectedOrganization ? selectedOrganization.latitude : currentCenter.lat + }; + + currMap.easeTo({ + center: isListPanelOpen ? newCenter : currentCenter, + zoom: zoom + 1, + duration: 500, + }) + }; + + const handleZoomOut = () => { + const zoomOutOffset = 0.0399 * Math.pow(2, 12 - zoom); + const newCenter = { + lng: currentCenter.lng - zoomOutOffset, + lat: currentCenter.lat + }; + + currMap.easeTo({ + center: isListPanelOpen ? newCenter : currentCenter, + zoom: zoom - 1, + duration: 500, + }) + }; + + const buttonStyles = { + color: "#313131", + borderBottom: "1px solid rgba(0, 0, 0, 0.1)", + borderRadius: 0, + width: "28px", + height: "28px", + '&:hover': { + backgroundColor: "#f5f5f5", + }, + '&:active': { + backgroundColor: "#e0e0e0", + }, + }; + + return ( + + + + + + + + + ); +}; + return (
{ onMouseLeave={onMouseLeave} > {!isMobile && ( - + )} {startIconCoordinates && ( Date: Thu, 16 Jan 2025 15:44:04 -0800 Subject: [PATCH 10/14] Add LA fire warning (#2320) --- client/{.prettierrc.js => .prettierrc.cjs} | 0 client/src/App.jsx | 38 +++++++++++++++++----- 2 files changed, 29 insertions(+), 9 deletions(-) rename client/{.prettierrc.js => .prettierrc.cjs} (100%) diff --git a/client/.prettierrc.js b/client/.prettierrc.cjs similarity index 100% rename from client/.prettierrc.js rename to client/.prettierrc.cjs diff --git a/client/src/App.jsx b/client/src/App.jsx index 267efe0cb..65bac828d 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -1,5 +1,5 @@ -import { useEffect } from "react"; -import { CssBaseline } from "@mui/material"; +import { useEffect, useState } from "react"; +import { CssBaseline, Alert, Snackbar, Stack } from "@mui/material"; import SurveySnackbar from "./components/UI/SurveySnackbar"; import { SiteProvider } from "./contexts/siteContext"; import { ToasterProvider } from "contexts/toasterContext"; @@ -21,13 +21,6 @@ function App() { analytics.postEvent("visitAppComponent"); }, []); - // const [snackbarOpen, setSnackbarOpen] = useState(false); - // const [snackbarMessage, setSnackbarMessage] = useState(""); - - // const handleCloseSnackbar = () => { - // setSnackbarOpen(false); - // }; - return ( @@ -43,6 +36,8 @@ function App() { /> + + {hasUserFeedbackSuveyFeatureFlag && } @@ -57,3 +52,28 @@ function App() { } export default App; + +function LAFireWarning() { + const [snackbarOpen, setSnackbarOpen] = useState(true); + + return ( + + setSnackbarOpen(false)} + anchorOrigin={{ + vertical: "bottom", + horizontal: "right", + }} + > + setSnackbarOpen(false)} + severity="warning" + sx={{ width: "100%" }} + > + Due to the LA Fires (Jan 2025), some information may be out-of-date. + + + + ); +} From d2be0a7bc3f03d5e2016c40936be676704a5ab10 Mon Sep 17 00:00:00 2001 From: John Darragh Date: Thu, 16 Jan 2025 15:58:41 -0800 Subject: [PATCH 11/14] Fix bug in displaying widget footer logos (#2322) --- client/src/components/Layout/WidgetFooter.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/components/Layout/WidgetFooter.jsx b/client/src/components/Layout/WidgetFooter.jsx index 172d3358b..c7c45838b 100644 --- a/client/src/components/Layout/WidgetFooter.jsx +++ b/client/src/components/Layout/WidgetFooter.jsx @@ -50,8 +50,9 @@ function WidgetFooterSection(props) { > {captionText} + {maintainers.map((maintainer) => { - const logoMaintainerPath = maintainer.path?.default; + const logoMaintainerPath = maintainer.path; const imageType = logoMaintainerPath ? logoMaintainerPath.split(".").pop() : "unknown"; @@ -134,7 +135,7 @@ function WidgetFooterSection(props) { {logoPath ? ( Date: Thu, 16 Jan 2025 16:16:15 -0800 Subject: [PATCH 12/14] Downgrade Ubuntu to 22.04, since latest doesn't support Heroku (#2324) --- .github/workflows/deployFullstackToDockerHub.yaml | 2 +- .github/workflows/deployWebAPIOnlyToDockerHub.yaml | 2 +- .github/workflows/developToHeroku.yml | 2 +- .github/workflows/mainToHeroku.yml | 2 +- .github/workflows/viteToHeroku.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deployFullstackToDockerHub.yaml b/.github/workflows/deployFullstackToDockerHub.yaml index ffd371bbd..c0130847d 100644 --- a/.github/workflows/deployFullstackToDockerHub.yaml +++ b/.github/workflows/deployFullstackToDockerHub.yaml @@ -10,7 +10,7 @@ on: - published jobs: fullstack: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 name: Build and push Full-Stack Container to Docker Hub steps: - name: Checkout repo diff --git a/.github/workflows/deployWebAPIOnlyToDockerHub.yaml b/.github/workflows/deployWebAPIOnlyToDockerHub.yaml index 8a1471479..81e8651cb 100644 --- a/.github/workflows/deployWebAPIOnlyToDockerHub.yaml +++ b/.github/workflows/deployWebAPIOnlyToDockerHub.yaml @@ -11,7 +11,7 @@ on: - published jobs: webapi: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 name: Build and push Web API Container to Docker Hub steps: - name: Checkout repo diff --git a/.github/workflows/developToHeroku.yml b/.github/workflows/developToHeroku.yml index 3ac7c3167..d88dfd836 100644 --- a/.github/workflows/developToHeroku.yml +++ b/.github/workflows/developToHeroku.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: akhileshns/heroku-deploy@v3.12.14 # This is the action diff --git a/.github/workflows/mainToHeroku.yml b/.github/workflows/mainToHeroku.yml index 1d1a588db..c37f6233b 100644 --- a/.github/workflows/mainToHeroku.yml +++ b/.github/workflows/mainToHeroku.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: akhileshns/heroku-deploy@v3.12.14 # This is the action diff --git a/.github/workflows/viteToHeroku.yml b/.github/workflows/viteToHeroku.yml index af58019b2..2b22d310d 100644 --- a/.github/workflows/viteToHeroku.yml +++ b/.github/workflows/viteToHeroku.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: akhileshns/heroku-deploy@v3.12.14 # This is the action From 0959ddd6bc28f0d1e494d23fdc3a75cedff4580f Mon Sep 17 00:00:00 2001 From: John Darragh Date: Thu, 16 Jan 2025 17:09:48 -0800 Subject: [PATCH 13/14] 2317 fire warning (#2325) * Add LA Fire warning * Implement temporary warning message --- client/src/App.jsx | 31 ++----------------- client/src/components/FoodSeeker/Home.jsx | 5 +++ client/src/components/Layout/Header.jsx | 10 ++++-- client/src/components/Layout/WidgetFooter.jsx | 21 ++++++++----- client/src/hooks/useLocationHook.js | 4 ++- 5 files changed, 31 insertions(+), 40 deletions(-) diff --git a/client/src/App.jsx b/client/src/App.jsx index 65bac828d..cfdabf6ca 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -1,5 +1,5 @@ -import { useEffect, useState } from "react"; -import { CssBaseline, Alert, Snackbar, Stack } from "@mui/material"; +import { useEffect } from "react"; +import { CssBaseline } from "@mui/material"; import SurveySnackbar from "./components/UI/SurveySnackbar"; import { SiteProvider } from "./contexts/siteContext"; import { ToasterProvider } from "contexts/toasterContext"; @@ -36,8 +36,6 @@ function App() { /> - - {hasUserFeedbackSuveyFeatureFlag && } @@ -52,28 +50,3 @@ function App() { } export default App; - -function LAFireWarning() { - const [snackbarOpen, setSnackbarOpen] = useState(true); - - return ( - - setSnackbarOpen(false)} - anchorOrigin={{ - vertical: "bottom", - horizontal: "right", - }} - > - setSnackbarOpen(false)} - severity="warning" - sx={{ width: "100%" }} - > - Due to the LA Fires (Jan 2025), some information may be out-of-date. - - - - ); -} diff --git a/client/src/components/FoodSeeker/Home.jsx b/client/src/components/FoodSeeker/Home.jsx index 50043c964..bf01f54e1 100644 --- a/client/src/components/FoodSeeker/Home.jsx +++ b/client/src/components/FoodSeeker/Home.jsx @@ -1,5 +1,6 @@ import { LocationOn } from "@mui/icons-material"; import { + Alert, Box, Button, CircularProgress, @@ -226,6 +227,10 @@ const Home = () => {
)} + + Due to the LA Fires (Jan 2025), some information may be + out-of-date. + + {isMapPage ? ( + + Due to the LA Fires (Jan 2025), some information may be + out-of-date. + + ) : null} {captionText} - + {maintainers.map((maintainer) => { const logoMaintainerPath = maintainer.path; const imageType = logoMaintainerPath @@ -194,12 +194,17 @@ function WidgetFooter() { boxShadow: "none", })} > - +
+ + + Due to the LA Fires (Jan 2025), some information may be out-of-date. + +
{ setIsHomePage(location.pathname === "/"); setIsAuthPage(match && match.isExact ? true : false); + setIsMapPage(location.pathname.toLowerCase().includes("organizations")); }, [location, match]); - return { isHomePage, isAuthPage }; + return { isHomePage, isAuthPage, isMapPage }; } From 3a4cfeb3ddc83e64b723b9944c71f3d7cc8c98ff Mon Sep 17 00:00:00 2001 From: John Darragh Date: Thu, 16 Jan 2025 17:14:37 -0800 Subject: [PATCH 14/14] Bumped release number to 1.0.90 --- client/package.json | 2 +- server/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/package.json b/client/package.json index 6aacc6b12..23c9d1d4b 100644 --- a/client/package.json +++ b/client/package.json @@ -1,7 +1,7 @@ { "name": "foodoasis-client", "description": "React Client for Food Oasis", - "version": "1.0.89", + "version": "1.0.90", "author": "Hack for LA", "license": "GPL-2.0", "private": true, diff --git a/server/package.json b/server/package.json index bd9c4b186..175e14eed 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "foodoasis-web-api", - "version": "1.0.89", + "version": "1.0.90", "author": "Hack for LA", "description": "Web API Server for Food Oasis", "main": "server.js",