Reorganize navigation

content/pages/about.md

@@ -1,5 +1,5 @@
 ---
-title: Om
+title: Om Hans Majestet den Gyldne Gris
 date: Fri, 24 Ja
 status: publish
 type: page
@@ -7,8 +7,6 @@ oldPermalink: /about
 postName: about
 ---
 
-# Hans Majestet den Gyldne Gris
-
 ![](/images/14764_366412090564_785760564_10454493_4835923_n_d4f371.jpg)
 
 ## Hans Majestet Grisen ble født 9. april 1859 og er Det Norske Studentersamfundets høyeste beskytter.
@@ -37,6 +35,6 @@ Man har siden den gang mer eller mindre vellykket avholdt Grisefest til ære for
 
 Grisefesten innledes med en seremoni hvor medlemmer av Studentersamfundet som har utmerket seg spesielt, kan bli beæret av Hans Majestet Grisen og slått til ridder av ordenen Den Gyldne Gris. Innehavere av Ordenen kan stige i gradene ved fortsatt iherdig innsats for Det Norske Studentersamfund eller samfunnet for øvrig, etter deres aktive periode i Studentersamfundet er over. Ridderskapet vil alltid stå til disposisjon for tidens aktive studenter når historisk kunnskap og akademisk profesjon trengs.
 
-Tiden går fortere og tallet syv er vel strengt tatt ikke like hellig i det 21. århundre. Grisefesten avholdes nå hvert 4. år.  
+Tiden går fortere og tallet syv er vel strengt tatt ikke like hellig i det 21. århundre. Grisefesten avholdes nå hvert 4. år.
 
 ​

content/pages/bokuglen/index.md

@@ -1,5 +1,5 @@
 ---
-title: Anno 1924
+title: Bokuglen – Anno 1924
 date: Mon, 04 Ma
 status: publish
 type: page

content/pages/den-gyldne-gris-orden/index.md

@@ -1,5 +1,5 @@
 ---
-title: Anno 1859
+title: Den Gyldne Gris' Orden – Anno 1859
 date: Fri, 01 Ma
 status: publish
 type: page

next.config.ts

@@ -33,7 +33,7 @@ const nextConfig: NextConfig = {
       // Squarespace used /section/YYYY/M/D/slug — redirect to flat /section/slug
       { source: '/nyheter/:year/:month/:day/:slug', destination: '/nyheter/:slug', permanent: true },
       { source: '/historierogmyter/:year/:month/:day/:slug', destination: '/historierogmyter/:slug', permanent: true },
-      { source: '/anno-1899/:year/:month/:day/:slug', destination: '/den-hviide-knap/:slug', permanent: true },
+      { source: '/anno-1899/:year/:month/:day/:slug', destination: '/den-hviide-knap/nyheter/:slug', permanent: true },
     ];
   },
 };

src/app/about/page.tsx

@@ -2,7 +2,7 @@ import { notFound } from 'next/navigation';
 import PageLayout from '@/components/PageLayout';
 import { getRootPage } from '@/lib/content';
 
-export const metadata = { title: 'Om' };
+export const metadata = { title: 'Om Hans Majestet den Gyldne Gris' };
 
 export default async function AboutPage() {
   const page = await getRootPage('about');

src/app/bokuglen/[slug]/page.tsx

@@ -1,6 +1,7 @@
 import { notFound } from 'next/navigation';
 import PageLayout from '@/components/PageLayout';
 import { getSectionPage, getPageSlugs } from '@/lib/content';
+import { BOKUGLEN_LINKS } from '@/lib/nav';
 
 export async function generateStaticParams() {
   return getPageSlugs('bokuglen').map((slug) => ({ slug }));
@@ -16,14 +17,6 @@ export async function generateMetadata({
   return { title: page?.title ?? slug };
 }
 
-const SECTION_LINKS = [
-  { label: 'Anno 1924', href: '/bokuglen' },
-  { label: 'Bokuglens historie', href: '/bokuglen/bokuglens-historie' },
-  { label: 'Presensliste', href: '/bokuglen/bupresensliste' },
-  { label: 'Matrikkel', href: '/bokuglen/bumatrikkel' },
-  { label: 'Statutter', href: '/bokuglen/bustatutter' },
-];
-
 export default async function BokuglenSubPage({
   params,
 }: {
@@ -34,7 +27,7 @@ export default async function BokuglenSubPage({
   if (!page) notFound();
 
   return (
-    <PageLayout title={page.title} sectionNav={SECTION_LINKS}>
+    <PageLayout title={page.title} sectionNav={BOKUGLEN_LINKS}>
       <div dangerouslySetInnerHTML={{ __html: page.contentHtml }} />
     </PageLayout>
   );

src/app/bokuglen/page.tsx

@@ -1,23 +1,16 @@
 import { notFound } from 'next/navigation';
 import PageLayout from '@/components/PageLayout';
 import { getSectionPage } from '@/lib/content';
+import { BOKUGLEN_LINKS } from '@/lib/nav';
 
 export const metadata = { title: 'Bokuglen' };
 
-const SECTION_LINKS = [
-  { label: 'Bokuglen', href: '/bokuglen' },
-  { label: 'Bokuglens historie', href: '/bokuglen/bokuglens-historie' },
-  { label: 'Presensliste', href: '/bokuglen/bupresensliste' },
-  { label: 'Matrikkel', href: '/bokuglen/bumatrikkel' },
-  { label: 'Statutter', href: '/bokuglen/bustatutter' },
-];
-
 export default async function BokuglenIndex() {
   const page = await getSectionPage('bokuglen', '');
   if (!page) notFound();
 
   return (
-    <PageLayout title={page.title} sectionNav={SECTION_LINKS}>
+    <PageLayout title={page.title} sectionNav={BOKUGLEN_LINKS}>
       <div dangerouslySetInnerHTML={{ __html: page.contentHtml }} />
     </PageLayout>
   );

src/app/den-gyldne-gris-orden/[slug]/page.tsx

@@ -1,6 +1,7 @@
 import { notFound } from 'next/navigation';
 import PageLayout from '@/components/PageLayout';
 import { getSectionPage, getPageSlugs } from '@/lib/content';
+import { DGG_LINKS } from '@/lib/nav';
 
 export async function generateStaticParams() {
   return getPageSlugs('den-gyldne-gris-orden').map((slug) => ({ slug }));
@@ -16,14 +17,6 @@ export async function generateMetadata({
   return { title: page?.title ?? slug };
 }
 
-const SECTION_LINKS = [
-  { label: 'Anno 1859', href: '/den-gyldne-gris-orden' },
-  { label: 'Presensliste', href: '/den-gyldne-gris-orden/presensliste' },
-  { label: 'Statutter', href: '/den-gyldne-gris-orden/statutter' },
-  { label: 'Embedsverk', href: '/den-gyldne-gris-orden/hoff' },
-  { label: 'Matrikkel', href: '/den-gyldne-gris-orden/matrikkel' },
-];
-
 export default async function DGGSubPage({
   params,
 }: {
@@ -34,7 +27,7 @@ export default async function DGGSubPage({
   if (!page) notFound();
 
   return (
-    <PageLayout title={page.title} sectionNav={SECTION_LINKS}>
+    <PageLayout title={page.title} sectionNav={DGG_LINKS}>
       <div dangerouslySetInnerHTML={{ __html: page.contentHtml }} />
     </PageLayout>
   );

src/app/den-gyldne-gris-orden/page.tsx

@@ -1,23 +1,16 @@
 import { notFound } from 'next/navigation';
 import PageLayout from '@/components/PageLayout';
 import { getSectionPage } from '@/lib/content';
+import { DGG_LINKS } from '@/lib/nav';
 
 export const metadata = { title: "Den Gyldne Gris' Orden" };
 
-const SECTION_LINKS = [
-  { label: 'Anno 1859', href: '/den-gyldne-gris-orden' },
-  { label: 'Presensliste', href: '/den-gyldne-gris-orden/presensliste' },
-  { label: 'Statutter', href: '/den-gyldne-gris-orden/statutter' },
-  { label: 'Embedsverk', href: '/den-gyldne-gris-orden/hoff' },
-  { label: 'Matrikkel', href: '/den-gyldne-gris-orden/matrikkel' },
-];
-
 export default async function DGGIndex() {
   const page = await getSectionPage('den-gyldne-gris-orden', '');
   if (!page) notFound();
 
   return (
-    <PageLayout title={page.title} sectionNav={SECTION_LINKS}>
+    <PageLayout title={page.title} sectionNav={DGG_LINKS}>
       <div dangerouslySetInnerHTML={{ __html: page.contentHtml }} />
     </PageLayout>
   );

src/app/den-hviide-knap/[slug]/page.tsx

@@ -1,11 +1,10 @@
 import { notFound } from 'next/navigation';
 import PageLayout from '@/components/PageLayout';
-import { getPostBySlug, getPostSlugs, getSectionPage, getPageSlugs } from '@/lib/content';
+import { getSectionPage, getPageSlugs } from '@/lib/content';
+import { DHK_LINKS } from '@/lib/nav';
 
 export async function generateStaticParams() {
-  const postSlugs = getPostSlugs('den-hviide-knap').map((slug) => ({ slug }));
-  const pageSlugs = getPageSlugs('den-hviide-knap').map((slug) => ({ slug }));
-  return [...postSlugs, ...pageSlugs];
+  return getPageSlugs('den-hviide-knap').map((slug) => ({ slug }));
 }
 
 export async function generateMetadata({
@@ -15,48 +14,21 @@ export async function generateMetadata({
 }) {
   const { slug } = await params;
   const page = await getSectionPage('den-hviide-knap', slug);
-  if (page) return { title: page.title };
-  const post = await getPostBySlug('den-hviide-knap', slug);
-  return { title: post?.title ?? slug };
+  return { title: page?.title ?? slug };
 }
 
-const SECTION_LINKS = [
-  { label: 'Knappenytt', href: '/den-hviide-knap' },
-  { label: 'Historie', href: '/den-hviide-knap/dhkhistorie' },
-  { label: 'Presensliste', href: '/den-hviide-knap/dhkpresensliste' },
-  { label: 'Matrikkel', href: '/den-hviide-knap/dhkmatrikkel' },
-  { label: 'Statutter', href: '/den-hviide-knap/dhkstatutter' },
-  { label: 'Studentteateret 175 år', href: '/den-hviide-knap/studentteateret-175-r' },
-];
-
-export default async function DHKSlugPage({
+export default async function DHKSubPage({
   params,
 }: {
   params: Promise<{ slug: string }>;
 }) {
   const { slug } = await params;
-
   const page = await getSectionPage('den-hviide-knap', slug);
-  if (page) {
-    return (
-      <PageLayout title={page.title} sectionNav={SECTION_LINKS}>
-        <div dangerouslySetInnerHTML={{ __html: page.contentHtml }} />
-      </PageLayout>
-    );
-  }
+  if (!page) notFound();
 
-  const post = await getPostBySlug('den-hviide-knap', slug);
-  if (post) {
-    return (
-      <PageLayout
-        title={post.title}
-        meta={`${post.date}${post.author ? ` · ${post.author}` : ''}`}
-        backLink={{ label: 'Knappenytt', href: '/den-hviide-knap' }}
-      >
-        <div dangerouslySetInnerHTML={{ __html: post.contentHtml }} />
-      </PageLayout>
-    );
-  }
-
-  notFound();
+  return (
+    <PageLayout title={page.title} sectionNav={DHK_LINKS}>
+      <div dangerouslySetInnerHTML={{ __html: page.contentHtml }} />
+    </PageLayout>
+  );
 }

src/app/den-hviide-knap/nyheter/[slug]/page.tsx

@@ -0,0 +1,37 @@
+import { notFound } from 'next/navigation';
+import PageLayout from '@/components/PageLayout';
+import { getPostBySlug, getPostSlugs } from '@/lib/content';
+
+export async function generateStaticParams() {
+  return getPostSlugs('den-hviide-knap').map((slug) => ({ slug }));
+}
+
+export async function generateMetadata({
+  params,
+}: {
+  params: Promise<{ slug: string }>;
+}) {
+  const { slug } = await params;
+  const post = await getPostBySlug('den-hviide-knap', slug);
+  return { title: post?.title ?? slug };
+}
+
+export default async function DHKNyheterPost({
+  params,
+}: {
+  params: Promise<{ slug: string }>;
+}) {
+  const { slug } = await params;
+  const post = await getPostBySlug('den-hviide-knap', slug);
+  if (!post) notFound();
+
+  return (
+    <PageLayout
+      title={post.title}
+      meta={`${post.date}${post.author ? ` · ${post.author}` : ''}`}
+      backLink={{ label: 'Knappenytt', href: '/den-hviide-knap' }}
+    >
+      <div dangerouslySetInnerHTML={{ __html: post.contentHtml }} />
+    </PageLayout>
+  );
+}

src/app/den-hviide-knap/page.tsx

@@ -1,30 +1,23 @@
 import Link from 'next/link';
 import SectionNav from '@/components/SectionNav';
 import { getPostsBySection } from '@/lib/content';
+import { DHK_LINKS } from '@/lib/nav';
 
 export const metadata = { title: 'Den Hviide Knap – Knappenytt' };
 
-const SECTION_LINKS = [
-  { label: 'Knappenytt', href: '/den-hviide-knap' },
-  { label: 'Historie', href: '/den-hviide-knap/dhkhistorie' },
-  { label: 'Presensliste', href: '/den-hviide-knap/dhkpresensliste' },
-  { label: 'Matrikkel', href: '/den-hviide-knap/dhkmatrikkel' },
-  { label: 'Statutter', href: '/den-hviide-knap/dhkstatutter' },
-  { label: 'Studentteateret 175 år', href: '/den-hviide-knap/studentteateret-175-r' },
-];
-
 export default function DHKIndex() {
   const posts = getPostsBySection('den-hviide-knap');
   return (
     <>
-      <SectionNav links={SECTION_LINKS} />
+      <SectionNav links={DHK_LINKS} />
       <div className="page-content">
-        <h1 className="page-content__title">Den Hviide Knap – Knappenytt</h1>
+        <h1 className="page-content__title">Den Hviide Knap – Anno 1899</h1>
+        <h2>Knappenytt</h2>
         <ul className="post-list">
           {posts.map((post) => (
             <li key={post.slug}>
               <p className="post-list__title">
-                <Link href={`/anno-1899/${post.slug}`}>{post.title}</Link>
+                <Link href={`/den-hviide-knap/nyheter/${post.slug}`}>{post.title}</Link>
               </p>
               <p className="post-list__meta">
                 {post.date}

src/app/grisefestene/[slug]/page.tsx

@@ -1,6 +1,7 @@
 import { notFound } from 'next/navigation';
 import PageLayout from '@/components/PageLayout';
 import { getSectionPage, getPageSlugs } from '@/lib/content';
+import { GRISEFESTENE_LINKS } from '@/lib/nav';
 
 export async function generateStaticParams() {
   return getPageSlugs('grisefestene').map((slug) => ({ slug }));
@@ -16,13 +17,6 @@ export async function generateMetadata({
   return { title: page?.title ?? slug };
 }
 
-const SECTION_LINKS = [
-  { label: 'Grisefestene', href: '/grisefestene' },
-  { label: 'Grisefest 2004', href: '/grisefestene/grisefest2004' },
-  { label: 'Grisefest 2009', href: '/grisefestene/grisefest-2009' },
-  { label: 'Grisefesten 2013', href: '/grisefestene/grisefesten-2013' },
-];
-
 export default async function GrisefesteneSubPage({
   params,
 }: {
@@ -33,7 +27,7 @@ export default async function GrisefesteneSubPage({
   if (!page) notFound();
 
   return (
-    <PageLayout title={page.title} sectionNav={SECTION_LINKS}>
+    <PageLayout title={page.title} sectionNav={GRISEFESTENE_LINKS}>
       <div dangerouslySetInnerHTML={{ __html: page.contentHtml }} />
     </PageLayout>
   );

src/app/grisefestene/page.tsx

@@ -1,22 +1,16 @@
 import { notFound } from 'next/navigation';
 import PageLayout from '@/components/PageLayout';
 import { getSectionPage } from '@/lib/content';
+import { GRISEFESTENE_LINKS } from '@/lib/nav';
 
 export const metadata = { title: 'Grisefestene' };
 
-const SECTION_LINKS = [
-  { label: 'Grisefestene', href: '/grisefestene' },
-  { label: 'Grisefest 2004', href: '/grisefestene/grisefest2004' },
-  { label: 'Grisefest 2009', href: '/grisefestene/grisefest-2009' },
-  { label: 'Grisefesten 2013', href: '/grisefestene/grisefesten-2013' },
-];
-
 export default async function GrisefesteneIndex() {
   const page = await getSectionPage('grisefestene', '');
   if (!page) notFound();
 
   return (
-    <PageLayout title={page.title} sectionNav={SECTION_LINKS}>
+    <PageLayout title={page.title} sectionNav={GRISEFESTENE_LINKS}>
       <div dangerouslySetInnerHTML={{ __html: page.contentHtml }} />
     </PageLayout>
   );

src/components/Nav.tsx

@@ -1,85 +1,17 @@
-import Link from "next/link";
-
-type NavItem =
-  | { label: string; href: string }
-  | {
-      label: string;
-      href?: string;
-      children: { label: string; href: string }[];
-    };
-
-const NAV: NavItem[] = [
-  { label: "Nyheter", href: "/" },
-  { label: "Historier og myter", href: "/historierogmyter" },
-  { label: "Om", href: "/about" },
-  { label: "Grisefestene", href: "/grisefestene" },
-  {
-    label: "Den Gyldne Gris' Orden",
-    href: "/den-gyldne-gris-orden",
-    children: [
-      { label: "Anno 1859", href: "/den-gyldne-gris-orden" },
-      { label: "Presensliste", href: "/den-gyldne-gris-orden/presensliste" },
-      { label: "Statutter", href: "/den-gyldne-gris-orden/statutter" },
-      { label: "Embedsverk", href: "/den-gyldne-gris-orden/hoff" },
-      { label: "Matrikkel", href: "/den-gyldne-gris-orden/matrikkel" },
-    ],
-  },
-  {
-    label: "Den Hviide Knap",
-    href: "/den-hviide-knap",
-    children: [
-      { label: "Knappenytt", href: "/den-hviide-knap" },
-      { label: "Historie", href: "/den-hviide-knap/dhkhistorie" },
-      { label: "Presensliste", href: "/den-hviide-knap/dhkpresensliste" },
-      { label: "Matrikkel", href: "/den-hviide-knap/dhkmatrikkel" },
-      { label: "Statutter", href: "/den-hviide-knap/dhkstatutter" },
-    ],
-  },
-  {
-    label: "Bokuglen",
-    href: "/bokuglen",
-    children: [
-      { label: "Bokuglen", href: "/bokuglen" },
-      { label: "Bokuglens historie", href: "/bokuglen/bokuglens-historie" },
-      { label: "Presensliste", href: "/bokuglen/bupresensliste" },
-      { label: "Matrikkel", href: "/bokuglen/bumatrikkel" },
-      { label: "Statutter", href: "/bokuglen/bustatutter" },
-    ],
-  },
-  {
-    label: "Det Norske Studentersamfund",
-    href: "https://studentersamfundet.no",
-    children: [
-      { label: "Chateau Neuf", href: "/chateau-neuf" },
-      {
-        label: "Det Norske Studentersamfund",
-        href: "https://studentersamfundet.no",
-      },
-    ],
-  },
-];
+import Link from 'next/link';
+import { NAV } from '@/lib/nav';
 
 export default function Nav() {
   return (
     <nav className="main-nav">
       <ul className="main-nav__list">
         {NAV.map((item) =>
-          "href" in item ? (
-            <li key={item.href} className="main-nav__item">
-              <Link href={item.href} className="main-nav__link">
-                {item.label}
-              </Link>
-            </li>
-          ) : (
+          'children' in item ? (
             <li key={item.label} className="main-nav__item">
               {item.href ? (
-                <Link href={item.href} className="main-nav__link">
-                  {item.label}
-                </Link>
+                <Link href={item.href} className="main-nav__link">{item.label}</Link>
               ) : (
-                <span className="main-nav__link" style={{ cursor: "default" }}>
-                  {item.label}
-                </span>
+                <span className="main-nav__link" style={{ cursor: 'default' }}>{item.label}</span>
               )}
               <ul className="main-nav__dropdown">
                 {item.children.map((child) => (
@@ -89,7 +21,13 @@ export default function Nav() {
                 ))}
               </ul>
             </li>
-          ),
+          ) : (
+            <li key={item.href} className="main-nav__item">
+              <Link href={item.href} className="main-nav__link">
+                {item.label}
+              </Link>
+            </li>
+          )
         )}
       </ul>
     </nav>

src/lib/nav.ts

@@ -0,0 +1,67 @@
+export type NavLink = { label: string; href: string };
+
+export type NavItem =
+  | NavLink
+  | { label: string; href?: string; children: NavLink[] };
+
+export const DGG_LINKS: NavLink[] = [
+  { label: 'Anno 1859', href: '/den-gyldne-gris-orden' },
+  { label: 'Presensliste', href: '/den-gyldne-gris-orden/presensliste' },
+  { label: 'Statutter', href: '/den-gyldne-gris-orden/statutter' },
+  { label: 'Embedsverk', href: '/den-gyldne-gris-orden/hoff' },
+  { label: 'Matrikkel', href: '/den-gyldne-gris-orden/matrikkel' },
+];
+
+export const DHK_LINKS: NavLink[] = [
+  { label: 'Knappenytt', href: '/den-hviide-knap' },
+  { label: 'Historie', href: '/den-hviide-knap/dhkhistorie' },
+  { label: 'Presensliste', href: '/den-hviide-knap/dhkpresensliste' },
+  { label: 'Matrikkel', href: '/den-hviide-knap/dhkmatrikkel' },
+  { label: 'Statutter', href: '/den-hviide-knap/dhkstatutter' },
+  { label: 'Studentteateret 175 år', href: '/den-hviide-knap/studentteateret-175-r' },
+];
+
+export const GRISEFESTENE_LINKS: NavLink[] = [
+  { label: 'Grisefestene', href: '/grisefestene' },
+  { label: 'Grisefest 2004', href: '/grisefestene/grisefest2004' },
+  { label: 'Grisefest 2009', href: '/grisefestene/grisefest-2009' },
+  { label: 'Grisefesten 2013', href: '/grisefestene/grisefesten-2013' },
+];
+
+export const BOKUGLEN_LINKS: NavLink[] = [
+  { label: 'Bokuglen', href: '/bokuglen' },
+  { label: 'Bokuglens historie', href: '/bokuglen/bokuglens-historie' },
+  { label: 'Presensliste', href: '/bokuglen/bupresensliste' },
+  { label: 'Matrikkel', href: '/bokuglen/bumatrikkel' },
+  { label: 'Statutter', href: '/bokuglen/bustatutter' },
+];
+
+export const NAV: NavItem[] = [
+  { label: 'Nyheter', href: '/' },
+  { label: 'Historier og myter', href: '/historierogmyter' },
+  { label: 'Om', href: '/about' },
+  { label: 'Grisefestene', href: '/grisefestene' },
+  {
+    label: "Den Gyldne Gris' Orden",
+    href: '/den-gyldne-gris-orden',
+    children: DGG_LINKS,
+  },
+  {
+    label: 'Den Hviide Knap',
+    href: '/den-hviide-knap',
+    children: DHK_LINKS,
+  },
+  {
+    label: 'Bokuglen',
+    href: '/bokuglen',
+    children: BOKUGLEN_LINKS,
+  },
+  {
+    label: 'Det Norske Studentersamfund',
+    href: 'https://studentersamfundet.no',
+    children: [
+      { label: 'Chateau Neuf', href: '/chateau-neuf' },
+      { label: 'Det Norske Studentersamfund', href: 'https://studentersamfundet.no' },
+    ],
+  },
+];