diff --git a/.vscode/settings.json b/.vscode/settings.json index e8f66e4..ee4bfab 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,5 +7,6 @@ ["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"] ], "i18n-ally.localesPaths": ["messages"], - "i18n-ally.keystyle": "nested" + "i18n-ally.keystyle": "nested", + "codeQL.githubDatabase.download": "never" } diff --git a/messages/en.json b/messages/en.json index 84a30fd..9450e53 100644 --- a/messages/en.json +++ b/messages/en.json @@ -15,11 +15,17 @@ "profile": "Profile", "signIn": "Sign in", "links": "Links", + "utilities": "Utilities", + "haveYouFoundA": "Have you found a", + "utilitiesDescription": "Feel free to send a to DevOps or use the #dev-public channel on Slack! You can also report errors or suggest improvements on GitHub.", + "openingHours": "Opening hours", + "allWeekdays": "Mon-Fri", "socialMedia": "Social media", - "visitOurSlack": "Visit our Slack", - "visitOurFacebook": "Visit our Facebook", - "visitOurGithub": "Visit our Github", - "visitOurInstagram": "Visit our Instagram", + "sendAnEmail": "Send an email", + "visitSlack": "Visit Slack", + "visitFacebook": "Visit Facebook", + "visitGithub": "Visit Github", + "visitInstagram": "Visit our Instagram", "NTNUIDI": "NTNU Department of Computer Science", "NTNUIDIURL": "https://www.ntnu.edu/idi", "NTNUKiD": "The working life network KID", diff --git a/messages/no.json b/messages/no.json index 4ec19cb..3d581eb 100644 --- a/messages/no.json +++ b/messages/no.json @@ -15,11 +15,17 @@ "profile": "Profil", "signIn": "Logg inn", "links": "Lenker", + "utilities": "Verktøy", + "haveYouFoundA": "Har du funnet en", + "utilitiesDescription": "Send gjerne en til DevOps eller bruk #dev-public kanalen på Slack! Du kan også rapportere feil eller gi oss forslag til forbedringer på GitHub.", + "openingHours": "Åpningstider", + "allWeekdays": "Mandag - Fredag", "socialMedia": "Sosiale medier", - "visitOurSlack": "Besøk vår Slack", - "visitOurFacebook": "Besøk vår Facebook", - "visitOurGithub": "Besøk vår Github", - "visitOurInstagram": "Besøk vår Instagram", + "sendAnEmail": "Send en e-post", + "visitSlack": "Besøk Slack", + "visitFacebook": "Besøk Facebook", + "visitGithub": "Besøk Github", + "visitInstagram": "Besøk Instagram", "NTNUIDI": "NTNU Institutt for datateknologi og informatikk", "NTNUIDIURL": "https://www.ntnu.no/idi", "copyright": "Opphavsrett", diff --git a/src/components/layout/Footer.tsx b/src/components/layout/Footer.tsx index 1176b77..f74850b 100644 --- a/src/components/layout/Footer.tsx +++ b/src/components/layout/Footer.tsx @@ -1,3 +1,4 @@ +import { Bug, Mail } from 'lucide-react'; import { useTranslations } from 'next-intl'; import ExternalLink from 'next/link'; @@ -22,10 +23,17 @@ function Footer() {

+ {t('openingHours')}: +
+ {t('allWeekdays')}, 10:15-18:00 +
+

-
-

{t('links')}

- -

{t('socialMedia')}

-
+
+

{t('links')}

+ +
+
+

{t('utilities')}

+

+ +
+ {t('haveYouFoundA')} ? +
+ {t.rich('utilitiesDescription', { + MailLink: () => ( + + ), + SlackLink: (children) => ( + + ), + GithubLink: (children) => ( + + ), + })} +

+
diff --git a/src/components/layout/LogoLink.tsx b/src/components/layout/LogoLink.tsx index e0f0347..f9f984e 100644 --- a/src/components/layout/LogoLink.tsx +++ b/src/components/layout/LogoLink.tsx @@ -22,8 +22,8 @@ function LogoLink({ size='none' > - - + + HACKERSPACE diff --git a/src/components/layout/Main.tsx b/src/components/layout/Main.tsx index ab64cdb..138d57d 100644 --- a/src/components/layout/Main.tsx +++ b/src/components/layout/Main.tsx @@ -11,7 +11,10 @@ type Props = { function Main({ children, mainClassName, className }: Props) { return (