From a25a2d0c201e76ea4d3502f5dce1088f0317c7d9 Mon Sep 17 00:00:00 2001
From: Jonas Braathen <jonas.braathen@usit.uio.no>
Date: Mon, 20 Sep 2021 21:22:21 +0200
Subject: [PATCH] Change title and description, make app title link to the
 front page

---
 frontend/public/locales/en/common.json    |  4 ++--
 frontend/public/locales/nb/common.json    |  4 ++--
 frontend/public/locales/nn/common.json    |  4 ++--
 frontend/src/routes/components/header.tsx | 21 ++++++++++++---------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/frontend/public/locales/en/common.json b/frontend/public/locales/en/common.json
index 23b623dc..713a15ba 100644
--- a/frontend/public/locales/en/common.json
+++ b/frontend/public/locales/en/common.json
@@ -8,8 +8,8 @@
   },
   "fnr": "National identity number",
   "header": {
-    "applicationTitleShort": "GREG",
-    "applicationTitleLong": "Guest Registration",
+    "applicationTitle": "Guest Registration",
+    "applicationDescription": "Registration service for guests",
     "selectLanguage": "Select language"
   },
   "loading": "Loading...",
diff --git a/frontend/public/locales/nb/common.json b/frontend/public/locales/nb/common.json
index d916c491..57d358c0 100644
--- a/frontend/public/locales/nb/common.json
+++ b/frontend/public/locales/nb/common.json
@@ -8,8 +8,8 @@
   },
   "fnr": "Fødselsnummer",
   "header":{
-    "applicationTitleShort": "GREG",
-    "applicationTitleLong": "Gjesteregistrering",
+    "applicationTitle": "Gjesteregistrering",
+    "applicationDescription": "Registreringstjeneste for gjester",
     "selectLanguage": "Velg språk"
   },
   "loading": "Laster...",
diff --git a/frontend/public/locales/nn/common.json b/frontend/public/locales/nn/common.json
index db11f21e..2e76d48d 100644
--- a/frontend/public/locales/nn/common.json
+++ b/frontend/public/locales/nn/common.json
@@ -9,8 +9,8 @@
   },
   "fnr": "National identity number",
   "header":{
-    "applicationTitleShort": "GREG",
-    "applicationTitleLong": "Gjesteregistrering",
+    "applicationTitle": "Gjesteregistrering",
+    "applicationDescription": "Registreringsteneste for gjester",
     "selectLanguage": "Velg språk"
   },
   "loading": "Lastar...",
diff --git a/frontend/src/routes/components/header.tsx b/frontend/src/routes/components/header.tsx
index 0a4f62cb..bb96b6b8 100644
--- a/frontend/src/routes/components/header.tsx
+++ b/frontend/src/routes/components/header.tsx
@@ -1,10 +1,10 @@
 import React from 'react'
+import { Link } from 'react-router-dom'
 import styled from 'styled-components/macro'
 import { useTranslation } from 'react-i18next'
 import LogoBar from '../../components/logobars/LogoBar'
 import LanguageSelector from '../../components/languageselector'
 
-
 const MainWrapper = styled.div`
   color: ${({ theme }) => theme.page.headerColor};
   background-color: ${({ theme }) => theme.page.headerBackgroundColor};
@@ -14,8 +14,9 @@ const Main = styled.div`
   display: flex;
   justify-content: space-between;
   margin: 0 auto;
-  max-width: ${props => props.theme.appMaxWidth};
-  padding: ${props => `0.5rem ${props.theme.horizontalPadding} 1rem ${props.theme.horizontalPadding}`};
+  max-width: ${(props) => props.theme.appMaxWidth};
+  padding: ${(props) =>
+    `0.5rem ${props.theme.horizontalPadding} 1rem ${props.theme.horizontalPadding}`};
 `
 
 const Menu = styled.ul`
@@ -33,15 +34,15 @@ const TitleBox = styled.div`
   padding-left: 3rem;
 `
 
-const ShortTitle = styled.div`
+const Title = styled.div`
   font-size: 2rem;
 `
 
-const LongTitle = styled.div`
+const Description = styled.div`
   font-size: 1rem;
 `
 
-function Header() {
+const Header = () => {
   const { t } = useTranslation('common')
 
   return (
@@ -50,12 +51,14 @@ function Header() {
       <MainWrapper>
         <Main>
           <TitleBox>
-            <ShortTitle>{t('header.applicationTitleShort')}</ShortTitle>
-            <LongTitle>{t('header.applicationTitleLong')}</LongTitle>
+            <Link to="/">
+              <Title>{t('header.applicationTitle')}</Title>
+            </Link>
+            <Description>{t('header.applicationDescription')}</Description>
           </TitleBox>
           <Menu>
             <MenuItem>
-              <LanguageSelector/>
+              <LanguageSelector />
             </MenuItem>
           </Menu>
         </Main>
-- 
GitLab