From a3c4562e2a7c9caa6baa8c22f5dc76a836cb8c2e Mon Sep 17 00:00:00 2001 From: John Darragh Date: Mon, 14 Oct 2024 16:53:38 -0700 Subject: [PATCH] Fix order of declarations in Constants.js --- .github/workflows/deployFullstackToDockerHub.yaml | 1 + .github/workflows/deployWebAPIOnlyToDockerHub.yaml | 3 ++- client/src/helpers/Constants.js | 14 +++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deployFullstackToDockerHub.yaml b/.github/workflows/deployFullstackToDockerHub.yaml index 32a7823be..ffd371bbd 100644 --- a/.github/workflows/deployFullstackToDockerHub.yaml +++ b/.github/workflows/deployFullstackToDockerHub.yaml @@ -1,4 +1,5 @@ # build and push a docker image from the latest push to "develop" branch +# this script is not currently used, as the web app is running on Heroku on: push: branches: diff --git a/.github/workflows/deployWebAPIOnlyToDockerHub.yaml b/.github/workflows/deployWebAPIOnlyToDockerHub.yaml index 392daf660..8a1471479 100644 --- a/.github/workflows/deployWebAPIOnlyToDockerHub.yaml +++ b/.github/workflows/deployWebAPIOnlyToDockerHub.yaml @@ -1,4 +1,6 @@ # build and push a docker image from the latest push to "develop" branch +# this script is not currently used, as the web app is running on Heroku + on: push: branches: @@ -25,4 +27,3 @@ jobs: tag_with_sha: true add_git_labels: true labels: description="Food Oasis",maintained="foodoasis+hub@hackforla.org" - diff --git a/client/src/helpers/Constants.js b/client/src/helpers/Constants.js index 40c3eb8e4..5f2159b67 100644 --- a/client/src/helpers/Constants.js +++ b/client/src/helpers/Constants.js @@ -44,6 +44,13 @@ export const MAPBOX_ACCESS_TOKEN = requiredEnvVar( // Begin Tenant-Specific Constants +const TENANT_SUBDOMAINS = { + 1: ["la."], + 3: ["hi.", "hawaii"], + 5: ["mck.", "mckinney."], + 6: ["sb."], +}; + function getTenantId() { if (process.env.NODE_ENV === "development") { return Number(optionalEnvVar("REACT_APP_TENANT_ID")) || 1; @@ -59,13 +66,6 @@ function getTenantId() { export const TENANT_ID = getTenantId(); -const TENANT_SUBDOMAINS = { - 1: ["la."], - 3: ["hi.", "hawaii"], - 5: ["mck.", "mckinney."], - 6: ["sb."], -}; - const TENANT_NAMES = { 1: "Los Angeles", 3: "Hawaii",