Merge branch 'GREG-271-favicon-ntnu-and-loginpage' into 'master'

Add favicon for ntnu and loginpage

See merge request !332

frontend/src/components/page/page.tsx

@@ -19,6 +19,9 @@ switch (appInst) {
   case 'uio':
     faviconPath = 'favicons/uio.svg'
     break
+  case 'ntnu':
+    faviconPath = 'favicons/ntnu.ico'
+    break
   default:
     faviconPath = 'favicons/uio.svg'
 }

frontend/src/routes/frontpage/components/loginpage.tsx

@@ -4,40 +4,43 @@ import { Container, Typography } from '@mui/material'
 import LoginBox from 'components/loginBox'
 import { instNameUpperCaser } from 'utils'
 import { appInst } from 'appConfig'
+import Page from 'components/page'
 
 export default function LoginPage() {
   const { t } = useTranslation(['frontpage'])
 
   return (
-    <Container
-      maxWidth="md"
-      sx={{
-        display: 'flex',
-        flexDirection: 'column',
-        marginTop: '4rem',
-        marginBottom: '10rem',
-      }}
-    >
-      <Container>
-        <Typography variant="h1" sx={{ paddingBottom: '1rem' }}>
-          {t('header')}
-        </Typography>
-        <Typography variant="body1" sx={{ paddingBottom: '2rem' }}>
-          {t('description', { inst: instNameUpperCaser(appInst) })}
-        </Typography>
-      </Container>
-
+    <Page>
       <Container
+        maxWidth="md"
         sx={{
           display: 'flex',
-          justifyContent: 'space-between',
-          flexDirection: { xs: 'column', md: 'row' },
-          alignItems: 'center',
+          flexDirection: 'column',
+          marginTop: '4rem',
+          marginBottom: '10rem',
         }}
       >
-        <LoginBox header={t('sponsor')} info={t('sponsorInfo')} />
-        <LoginBox header={t('guest')} info={t('guestInfo')} />
+        <Container>
+          <Typography variant="h1" sx={{ paddingBottom: '1rem' }}>
+            {t('header')}
+          </Typography>
+          <Typography variant="body1" sx={{ paddingBottom: '2rem' }}>
+            {t('description', { inst: instNameUpperCaser(appInst) })}
+          </Typography>
+        </Container>
+
+        <Container
+          sx={{
+            display: 'flex',
+            justifyContent: 'space-between',
+            flexDirection: { xs: 'column', md: 'row' },
+            alignItems: 'center',
+          }}
+        >
+          <LoginBox header={t('sponsor')} info={t('sponsorInfo')} />
+          <LoginBox header={t('guest')} info={t('guestInfo')} />
+        </Container>
       </Container>
-    </Container>
+    </Page>
   )
 }