From 0b7b030d98e43af939bd94d810661837e8e77eb6 Mon Sep 17 00:00:00 2001
From: Kevin Deng <sxzz@sxzz.moe>
Date: Thu, 20 Aug 2026 21:19:59 +0900
Subject: [PATCH] Consolidate route-aware footer layout (#32)

---
 app/app.vue                 | 32 ++++++++++++++++++++++++---
 app/components/AppShell.vue | 43 -------------------------------------
 app/layouts/default.vue     |  5 -----
 app/layouts/plain.vue       |  5 -----
 app/pages/char/[key].vue    |  2 +-
 5 files changed, 30 insertions(+), 57 deletions(-)
 delete mode 100644 app/components/AppShell.vue
 delete mode 100644 app/layouts/default.vue
 delete mode 100644 app/layouts/plain.vue

diff --git a/app/app.vue b/app/app.vue
index f5034a0..c8b1c27 100644
--- a/app/app.vue
+++ b/app/app.vue
@@ -2,8 +2,12 @@
 import { RESTORE_SCRIPT, useStyle } from '~/composables/style.ts'
 
 const { t, meta } = useT()
+const route = useRoute()
 const style = useStyle()
 
+const isHome = computed(() => route.name === 'index')
+const showFooter = computed(() => route.name !== 'about')
+
 // Picks the reader's language once the client is running; the prerendered
 // HTML is always the default locale
 useLocaleChoice()
@@ -34,7 +38,29 @@ useHead({
 </script>
 
 <template>
-  <NuxtLayout>
-    <NuxtPage />
-  </NuxtLayout>
+  <div class="min-h-screen flex flex-col">
+    <AppHeader />
+
+    <div class="mx-auto max-w-6xl w-full flex flex-1 flex-col px-4 sm:px-6">
+      <main class="flex-1">
+        <NuxtPage />
+      </main>
+
+      <footer
+        v-if="showFooter"
+        class="mt-16 border-t border-rule"
+        :class="isHome ? 'py-8' : 'py-6'"
+      >
+        <template v-if="isHome">
+          <h2 class="mb-3 eyebrow">{{ t('footer.sources') }}</h2>
+          <DataSources />
+        </template>
+        <p class="text-xs text-mute" :class="{ 'mt-4': isHome }">
+          <NuxtLink to="/about" class="focus-ring rule-link">{{
+            t('footer.detail')
+          }}</NuxtLink>
+        </p>
+      </footer>
+    </div>
+  </div>
 </template>
diff --git a/app/components/AppShell.vue b/app/components/AppShell.vue
deleted file mode 100644
index 94ccb76..0000000
--- a/app/components/AppShell.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<script setup lang="ts">
-withDefaults(
-  defineProps<{
-    /** Show the attribution table in the footer. */
-    sources?: boolean
-  }>(),
-  { sources: false },
-)
-
-const { t } = useT()
-</script>
-
-<template>
-  <!-- The nav sits outside the reading column so it can span the viewport
-       while it is stuck to the top; everything else shares one measure. -->
-  <div class="min-h-screen flex flex-col">
-    <AppHeader />
-
-    <div class="mx-auto max-w-6xl w-full flex flex-1 flex-col px-4 sm:px-6">
-      <main class="flex-1">
-        <slot />
-      </main>
-
-      <!-- The sources belong where the whole list is on show. A single
-           character's page is about that character, so it only points at
-           /about. -->
-      <footer
-        class="mt-16 border-t border-rule"
-        :class="sources ? 'py-8' : 'py-6'"
-      >
-        <template v-if="sources">
-          <h2 class="mb-3 eyebrow">{{ t('footer.sources') }}</h2>
-          <DataSources />
-        </template>
-        <p class="text-xs text-mute" :class="{ 'mt-4': sources }">
-          <NuxtLink to="/about" class="rule-link focus-ring">{{
-            t('footer.detail')
-          }}</NuxtLink>
-        </p>
-      </footer>
-    </div>
-  </div>
-</template>
diff --git a/app/layouts/default.vue b/app/layouts/default.vue
deleted file mode 100644
index 7f2b732..0000000
--- a/app/layouts/default.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <AppShell sources>
-    <slot />
-  </AppShell>
-</template>
diff --git a/app/layouts/plain.vue b/app/layouts/plain.vue
deleted file mode 100644
index 35642b3..0000000
--- a/app/layouts/plain.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <AppShell>
-    <slot />
-  </AppShell>
-</template>
diff --git a/app/pages/char/[key].vue b/app/pages/char/[key].vue
index 7916b4b..90e9950 100644
--- a/app/pages/char/[key].vue
+++ b/app/pages/char/[key].vue
@@ -18,7 +18,7 @@ import { listPlace } from '~/utils/list-place.ts'
 
 // char-alias sends the regional forms -- /char/国, /char/著 -- to the row they
 // belong to, so only a character naming no row at all reaches the 404 below.
-definePageMeta({ layout: 'plain', middleware: 'char-alias' })
+definePageMeta({ middleware: 'char-alias' })
 
 const route = useRoute()
 const { t, list } = useT()
-- 
2.51.2