organizing env variables and white label stuff

.env

@@ -1,6 +1,8 @@
-VITE_APP_API_URL=https://bxt-dev.api.adaptiveagriculture.ca/v1
+VITE_APP_API_URL=https://api.brandxtech.ca/v1
+VITE_APP_API_STAGING_URL=https://stagingapi.brandxtech.ca/v1
+VITE_APP_API_DEV_URL=https://bxt-dev.api.adaptiveagriculture.ca/v1
 
 #Auth0
 VITE_AUTH0_CLIENT_DOMAIN=brandxtech.auth0.com
-VITE_AUTH0_AUDIENCE=bxt-dev.api.adaptiveagriculture.ca
+VITE_AUTH0_AUDIENCE=api.brandxtech.ca
 VITE_AUTH0_DEV_CLIENT_ID=dzJTpqIeMA4Rwk4xujtwPbAO3TY32bM1

.gitlab-ci.yml

@@ -303,9 +303,6 @@ deploy:development:
     - cat /etc/os-release
     - "echo DEPLOY_TARGET=${DEPLOY_TARGET}"
     - "echo DOCKER_HOST=${DOCKER_HOST}"
-    - "echo \"Dev Key length: ${#DEVELOPMENT_SSH_PRIV_KEY}\""
-    # - "echo \"Staging Key length: ${#STAGING_SSH_PRIV_KEY}\""
-    # - "echo \"$STAGING_SSH_PRIV_KEY\" | tr -d '\r' | ssh-add - > /dev/null"
     - "echo \"$DEVELOPMENT_SSH_PRIV_KEY\" | tr -d '\r' | ssh-add - "
     # - "ssh -Mo StrictHostKeyChecking=no -S deploy-ctrl-socket -fnNTL /var/run/docker.sock:/var/run/docker.sock ${DEPLOY_TARGET}"
     # - "ssh -S deploy-ctrl-socket -O check ${DEPLOY_TARGET}" 

package.json

@@ -5,9 +5,9 @@
   "type": "module",
   "scripts": {
     "start": "vite",
-    "start-local": "VITE_APP_API_URL=http://localhost:50052/v1 VITE_APP_WS_URL=ws://localhost:50052/v1/live VITE_APP_BILLING_URL=http://localhost:50053/v1 VITE_APP_RECLUSE_URL=http://localhost:50054/v1 VITE_APP_GITLAB_URL=http://localhost:50055/v1 vite",
-    "start-dev": "VITE_AUTH0_CLIENT_DOMAIN=brandxtech.auth0.com VITE_AUTH0_AUDIENCE=bxt-dev.api.adaptiveagriculture.ca VITE_AUTH0_DEV_CLIENT_ID=dzJTpqIeMA4Rwk4xujtwPbAO3TY32bM1 vite",
-    "start-staging": "REACT_APP_API_URL=https://stagingapi.brandxtech.ca/v1 REACT_APP_WS_URL=ws://stagingapi.brandxtech.ca/v1/live REACT_APP_AUTH0_CLIENT_DOMAIN=adaptivestaging.us.auth0.com REACT_APP_AUTH0_AUDIENCE=stagingapi.brandxtech.ca react-scripts start",
+    "start-local": "VITE_AUTH0_AUDIENCE=bxt-dev.api.adaptiveagriculture.ca VITE_APP_API_URL=http://localhost:50052/v1 VITE_APP_WS_URL=ws://localhost:50052/v1/live VITE_APP_BILLING_URL=http://localhost:50053/v1 VITE_APP_RECLUSE_URL=http://localhost:50054/v1 VITE_APP_GITLAB_URL=http://localhost:50055/v1 vite",
+    "start-dev": "VITE_APP_API_URL=https://bxt-dev.api.adaptiveagriculture.ca/v1 VITE_AUTH0_CLIENT_DOMAIN=brandxtech.auth0.com VITE_AUTH0_AUDIENCE=bxt-dev.api.adaptiveagriculture.ca VITE_AUTH0_DEV_CLIENT_ID=dzJTpqIeMA4Rwk4xujtwPbAO3TY32bM1 vite",
+    "start-staging": "VITE_APP_API_URL=https://stagingapi.brandxtech.ca/v1 VITE_APP_WS_URL=ws://stagingapi.brandxtech.ca/v1/live VITE_APP_AUTH0_CLIENT_DOMAIN=adaptivestaging.us.auth0.com VITE_APP_AUTH0_AUDIENCE=stagingapi.brandxtech.ca vite",
     "build": "tsc -b && vite build",
     "lint": "eslint .",
     "preview": "vite preview",

src/app/App.tsx

@@ -39,15 +39,20 @@ function App() {
     faviconDocument.href = "BrandXTechnologies/favicon.ico"
   })
 
-  let url: string | undefined = import.meta.env.VITE_AUTH0_CLIENT_DOMAIN;
+  let domain: string | undefined = import.meta.env.VITE_AUTH0_CLIENT_DOMAIN;
   let audience: string | undefined = import.meta.env.VITE_AUTH0_AUDIENCE;
 
   let client_id = import.meta.env.VITE_AUTH0_DEV_CLIENT_ID;
 
+  console.log("Domain: " + domain)
+  console.log("Audience: " + audience)
+  console.log("Client ID: " + client_id)
+  console.log("API URL: " + import.meta.env.VITE_APP_API_URL)
+
   return (
     <AppThemeProvider>
       <Auth0Provider
-        domain={or(url, "")}
+        domain={or(domain, "")}
         clientId={or(client_id, "")}
         authorizationParams={{
           audience: or(audience, ""),

src/navigation/NavigationContainer.tsx

@@ -1,12 +1,11 @@
-import React, { PropsWithChildren } from "react";
 import Router from "./Router";
 
 export default function NavigationContainer() {
 
   return (
-    <React.Fragment>
+    <>
       {/* <NotificationBanner /> */}
       <Router />
-    </React.Fragment>
+    </>
   );
 }

src/providers/pond/pond.tsx

@@ -35,7 +35,7 @@ import DataDogProvider, { useDataDogProxyAPI } from "./datadogProxyAPI";
 
 export const pondURL = (partial: string, demo: boolean = false): string => {
   let url = import.meta.env.VITE_APP_API_URL + (demo ? "/demo" : "") + partial;
-  // console.log(url)
+  // console.log("API URL: "+url)
   // if (isStaging()) url = process.env.REACT_APP_STAGING_API_URL + (demo ? "/demo" : "") + partial;
   return url;
 };

src/services/whiteLabel.ts

@@ -95,10 +95,10 @@ const BXT_WHITE_LABEL: WhiteLabel = {
   // primaryColour: "#0000FF",
   secondaryColour: "yellow",
   // secondaryColour: "#FFFF00",
-  signatureColour: "#272727",
-  // signatureColour: "#005bb0",
+  // signatureColour: "#272727",
+  signatureColour: "#005bb0",
   signatureAccentColour: "#fff",
-  auth0ClientId: import.meta.env.REACT_APP_AUTH0_STAGING_CLIENT_ID,
+  auth0ClientId: import.meta.env.VITE_AUTH0_DEV_CLIENT_ID,
   redirectOnLogout: false,
   logoutRedirectTarget: "",
   darkLogo: BXTDarkLogo,