Merge branch 'dev'

lewisl9029 · Nov 20, 2024 · 10245a7 · 10245a7
2 parents 02fad3d + 7d1ee44
commit 10245a7
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc
@@ -1,11 +1,11 @@
 {
-  // 3
+  // 4
   // This is a JSON with Comments file.
   // It's basically JSON, with the addition of comments, and looser syntax
   // (trailing commas!).
   // Reflame uses this to identify your app.
-  "appId": "01GVH35S71FJP26W72V3K7CB2N", // prod
-  // "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork
+  // "appId": "01GVH35S71FJP26W72V3K7CB2N", // prod
+  "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork
   // "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev
   // This is what shows up in the browser's tab bar.
   "title": "highlight.io",
@@ -25,24 +25,52 @@
   ],
   "environments": {
     "production": {
+      "REACT_APP_FIREBASE_CONFIG_OBJECT": "{    apiKey: 'AIzaSyD7g86A3EzEKmoE7aZ04Re3HZ0B4bWlL68',    authDomain: 'auth.highlight.run',    databaseURL: 'https://highlight-f5c5b.firebaseio.com',    projectId: 'highlight-f5c5b',    storageBucket: 'highlight-f5c5b.appspot.com',    messagingSenderId: '263184175068',    appId: '1:263184175068:web:f8190c20320087d1c6c919',}",
       "REACT_APP_COMMIT_SHA": {
         "type": "expression",
         "value": "Reflame.gitCommitSha"
       },
+      "REACT_APP_PRIVATE_GRAPH_URI": "https://pri.highlight.io",
+      "REACT_APP_ONPREM": "false",
       "REACT_APP_FRONTEND_URI": {
         "type": "expression",
         "value": "window.location.origin"
       },
+      "REACT_APP_FRONTEND_ORG": "1jdkoe52",
+      "REACT_APP_PUBLIC_GRAPH_URI": "https://pub.highlight.run",
+      "REACT_APP_AUTH_MODE": "firebase",
+      "SLACK_CLIENT_ID": "1354469824468.1868913469441",
+      "REACT_APP_STRIPE_API_PK": "pk_live_51Hlqh1Gz4ry65q42eza36EDSeIpFng39KpZVJzPpsYg5AM7h1rpysaCcZQHnC4J5uNmbjXP6rmSRuf9yr6rfGNOB00aZ73tU9f",
+      "CLICKUP_CLIENT_ID": "7IRYQ44K5NKLWWFPBPJII08BW7KS4063",
+      "DISCORD_CLIENT_ID": "1024079182013149185",
+      "REACT_APP_FRONT_INTEGRATION_CLIENT_ID": "e77eb8f15b02423c9525",
+      "HEIGHT_CLIENT_ID": "w8GzB4GI8gGUE2iEAQMY8Wck44gK2ek2i4Q8q4myKQY",
+      "LINEAR_CLIENT_ID": "f60ff43c7376d0aceaa1e111db39e60d",
+      "DEMO_PROJECT_ID": "1344"
     },
     "development": {
+      "REACT_APP_FIREBASE_CONFIG_OBJECT": "{    apiKey: 'AIzaSyD7g86A3EzEKmoE7aZ04Re3HZ0B4bWlL68',    authDomain: 'auth.highlight.run',    databaseURL: 'https://highlight-f5c5b.firebaseio.com',    projectId: 'highlight-f5c5b',    storageBucket: 'highlight-f5c5b.appspot.com',    messagingSenderId: '263184175068',    appId: '1:263184175068:web:f8190c20320087d1c6c919',}",
       "REACT_APP_COMMIT_SHA": {
         "type": "expression",
         "value": "Reflame.gitCommitSha"
       },
+      "REACT_APP_PRIVATE_GRAPH_URI": "https://pri.highlight.io",
+      "REACT_APP_ONPREM": "false",
       "REACT_APP_FRONTEND_URI": {
         "type": "expression",
         "value": "window.location.origin"
       },
+      "REACT_APP_FRONTEND_ORG": "1jdkoe52",
+      "REACT_APP_PUBLIC_GRAPH_URI": "https://pub.highlight.run",
+      "REACT_APP_AUTH_MODE": "firebase",
+      "SLACK_CLIENT_ID": "1354469824468.1868913469441",
+      "REACT_APP_STRIPE_API_PK": "pk_live_51Hlqh1Gz4ry65q42eza36EDSeIpFng39KpZVJzPpsYg5AM7h1rpysaCcZQHnC4J5uNmbjXP6rmSRuf9yr6rfGNOB00aZ73tU9f",
+      "CLICKUP_CLIENT_ID": "7IRYQ44K5NKLWWFPBPJII08BW7KS4063",
+      "DISCORD_CLIENT_ID": "1024079182013149185",
+      "REACT_APP_FRONT_INTEGRATION_CLIENT_ID": "e77eb8f15b02423c9525",
+      "HEIGHT_CLIENT_ID": "w8GzB4GI8gGUE2iEAQMY8Wck44gK2ek2i4Q8q4myKQY",
+      "LINEAR_CLIENT_ID": "f60ff43c7376d0aceaa1e111db39e60d",
+      "DEMO_PROJECT_ID": "1344"
     },
   },
   "defaultEnvironment": "production",
@@ -164,7 +192,7 @@
     "display": "standalone",
     "theme_color": "#5629c6",
     "background_color": "#ffffff"
-  },  
+  },
   "storybookCompatibility": {
     "testStories": true,
   },
@@ -203,7 +231,7 @@
         ],
       },
     },
-    "important":true,
+    "important": true,
   },
   "specifierTransforms": [
     {
@@ -487,4 +515,4 @@
       ],
     },
   },
-}
+}
diff --git a/frontend/src/pages/Auth/SignIn.tsx b/frontend/src/pages/Auth/SignIn.tsx
@@ -16,7 +16,7 @@ import SvgHighlightLogoOnLight from '@icons/HighlightLogoOnLight'
 import { AuthBody, AuthError, AuthFooter, AuthHeader } from '@pages/Auth/Layout'
 import useLocalStorage from '@rehooks/local-storage'
 import { auth } from '@util/auth'
-import firebase from 'firebase/compat/app'
+import type firebase from 'firebase/compat/app'
 import React, { useCallback, useEffect } from 'react'
 import { Link, useLocation, useNavigate } from 'react-router-dom'
 
@@ -142,7 +142,7 @@ export const SignIn: React.FC<Props> = ({ setResolver }) => {
 						<Heading level="h4">
 							{workspaceInvite
 								? `You're invited to join ‘${workspaceInvite.workspace_name}’`
-								: 'Welcome back.'}
+								: 'Welcome back!lj asd asdsadasdsasds!!'}
 						</Heading>
 						{AUTH_MODE !== 'oauth' ? (
 							<Text>