Use full url in login link

UniversityOfHelsinkiCS · Apr 27, 2023 · 6cee817 · 6cee817
1 parent 7932b7b
commit 6cee817
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/client/components/NavBar/NavBar.tsx b/src/client/components/NavBar/NavBar.tsx
@@ -25,7 +25,7 @@ import { useTranslation } from 'react-i18next'
 import hyLogo from '../../assets/hy_logo.svg'
 import styles from '../../styles'
 import useLoggedInUser from '../../hooks/useLoggedInUser'
-import { inProduction, PUBLIC_URL } from '../../../config'
+import { inProduction, FULL_URL } from '../../../config'
 
 const NavBar = () => {
   const { t, i18n } = useTranslation()
@@ -72,10 +72,7 @@ const NavBar = () => {
               </Link>
             )}
             {location.pathname === '/public' && (
-              <ExternalLink
-                href={PUBLIC_URL}
-                style={{ textDecoration: 'none' }}
-              >
+              <ExternalLink href={FULL_URL} style={{ textDecoration: 'none' }}>
                 <Button>
                   <LoginOutlined sx={navStyles.icon} /> {t('login')}
                 </Button>

diff --git a/src/config.ts b/src/config.ts
@@ -14,3 +14,10 @@ export const DEFAULT_SURVEY_NAME =
   process.env.DEFAULT_SURVEY_NAME || 'testSurvey'
 
 export const FORM_DATA_KEY = 'curre_local_save'
+
+// eslint-disable-next-line no-nested-ternary
+export const FULL_URL = inProduction
+  ? 'https://curre.helsinki.fi'
+  : inStaging
+  ? 'https://toska-staging.cs.helsinki.fi/kliksutin'
+  : 'http://localhost:3000'