New nav and move some information around

Author: razzeee

src/components/ChaosColloquia.tsx

@@ -268,12 +268,6 @@ const HomeDe = ({
                 Pressemitteilung: Eröffnung osna.social
               </a>
             </li>
-            <li>
-              <a href={`${lang}/chaostalks`}>chaOStalks</a>
-            </li>
-            <li>
-              <a href={`${lang}/chaos-colloquia`}>Chaos Colloquia</a>
-            </li>
             {/* <!--
 		<li><a href="https://codingchaos.chaostreff-osnabrueck.de/">codingchaOS</a></li>
 		--> */}
@@ -456,12 +450,6 @@ const HomeEn = ({
                 Press release: Opening of osna.social (German)
               </a>
             </li>
-            <li>
-              <a href={`${lang}/chaostalks`}>chaOStalks</a>
-            </li>
-            <li>
-              <a href={`${lang}/chaos-colloquia`}>Chaos Colloquia</a>
-            </li>
             {/* <!--
 			<li><a href="https://codingchaos.chaostreff-osnabrueck.de">codingchaOS</a></li>
 		--> */}

src/components/Chaostalks.tsx

@@ -12,12 +12,24 @@ export const ui = {
     "nav.site-notice": "Site Notice",
     "nav.privacy-policy": "Privacy Policy",
     "nav.legal-notice": "Legal Notice",
+    "nav.contact": "Contact",
+    "nav.club": "Club",
+    "nav.faq": "FAQ",
+    "nav.hackspace": "Hackspace",
+    "nav.news": "News",
+    "nav.about": "About",
   },
   de: {
     "nav.home": "Startseite",
     "nav.donate": "Spenden",
     "nav.site-notice": "Site Notice",
     "nav.privacy-policy": "Datenschutzerklärung",
     "nav.legal-notice": "Impressum",
+    "nav.contact": "Kontakt",
+    "nav.club": "Verein",
+    "nav.faq": "FAQ",
+    "nav.hackspace": "Hackspace",
+    "nav.news": "Neuigkeiten",
+    "nav.about": "Über uns",
   },
 } as const;

src/components/Home.tsx

@@ -29,8 +29,15 @@ const t = useTranslations(lang);
             />
           </header>
         </a>
+        <nav class="flex flex-col sm:flex-row gap-3 py-8">
+          <a href={`/${lang}`}>{t("nav.news")}</a>
+          <a href={`/${lang}/about`}>{t("nav.about")}</a>
+          <a href={`/${lang}/hackspace`}>{t("nav.hackspace")}</a>
+          <a href={`/${lang}/club`}>{t("nav.club")}</a>
+          <a href={`/${lang}/donate`}>{t("nav.donate")}</a>
+        </nav>
         <main
-          class="flex flex-col gap-8 md:max-w-2xl row-start-2 items-center sm:items-start"
+          class="flex flex-col gap-8 md:max-w-2xl row-start-2 items-center sm:items-start prose prose-invert"
         >
           <slot />
         </main>
@@ -49,9 +56,8 @@ const t = useTranslations(lang);
             <a href={`/${lang}/legal-notice`}>
               {t("nav.legal-notice")}
             </a>
-            <a href={`/${lang}/donate`}>
-              {t("nav.donate")}
-            </a>
+            <a href={`/${lang}/faq`}>{t("nav.faq")}</a>
+            <a href={`/${lang}/contact`}>{t("nav.contact")}</a>
           </div>
 
           <div class="flex gap-6 justify-center">