diff --git a/apps/web/app/(content)/@title/about/page.tsx b/apps/web/app/(content)/@title/about/page.tsx deleted file mode 100644 index c9aa81119..000000000 --- a/apps/web/app/(content)/@title/about/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import SimpleTitle from '@/components/simple-title' - -export default function AboutTitle(): JSX.Element { - return 因幡神社とは -} diff --git a/apps/web/app/(content)/@title/default.ts b/apps/web/app/(content)/@title/default.ts deleted file mode 100644 index d9416aaab..000000000 --- a/apps/web/app/(content)/@title/default.ts +++ /dev/null @@ -1,3 +0,0 @@ -export default function Default(): null { - return null -} diff --git a/apps/web/app/(content)/@title/kuji/[id]/loading.tsx b/apps/web/app/(content)/@title/kuji/[id]/loading.tsx deleted file mode 100644 index ad853f757..000000000 --- a/apps/web/app/(content)/@title/kuji/[id]/loading.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import Skeleton from '@inaba-jinja/components/skeleton' -import SimpleTitle from '@/components/simple-title' - -export default function KujiTitle(): JSX.Element { - return ( - - - - ) -} diff --git a/apps/web/app/(content)/@title/kuji/[id]/page.tsx b/apps/web/app/(content)/@title/kuji/[id]/page.tsx deleted file mode 100644 index 939ac9a65..000000000 --- a/apps/web/app/(content)/@title/kuji/[id]/page.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import { type Props } from '@/app/(content)/kuji/[id]/page' -import SimpleTitle from '@/components/simple-title' -import { getFortune } from '@/lib/contentful' -import { generateFortuneName } from '@/lib/fortune' - -export default async function KujiTitle({ - params -}: Props): Promise { - const fortune = await getFortune(params.id) - const name = generateFortuneName(fortune) - - return {name} -} diff --git a/apps/web/app/(content)/@title/privacy/page.tsx b/apps/web/app/(content)/@title/privacy/page.tsx deleted file mode 100644 index 80ccf6b89..000000000 --- a/apps/web/app/(content)/@title/privacy/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import SimpleTitle from '@/components/simple-title' - -export default function PrivacyTitle(): JSX.Element { - return プライバシーポリシー -} diff --git a/apps/web/app/(content)/about/layout.tsx b/apps/web/app/(content)/about/layout.tsx index 8b14ac49a..d90be4f80 100644 --- a/apps/web/app/(content)/about/layout.tsx +++ b/apps/web/app/(content)/about/layout.tsx @@ -1,5 +1,6 @@ import { type Metadata } from 'next' import { type ReactNode } from 'react' +import SimpleTitle from '@/components/simple-title' import { title as siteName, twitterAccount } from '@/lib/constants' export const metadata = { @@ -25,6 +26,9 @@ type Props = { export default function AboutLayout({ children }: Props) { return ( -
{children}
+
+ {siteName}とは + {children} +
) } diff --git a/apps/web/app/(content)/kuji/[id]/loading.tsx b/apps/web/app/(content)/kuji/[id]/loading.tsx index 18736bf61..75bf3629f 100644 --- a/apps/web/app/(content)/kuji/[id]/loading.tsx +++ b/apps/web/app/(content)/kuji/[id]/loading.tsx @@ -1,8 +1,13 @@ import Skeleton from '@inaba-jinja/components/skeleton' +import SimpleTitle from '@/components/simple-title' export default function KujiLoading() { return ( <> + + + +
diff --git a/apps/web/app/(content)/kuji/[id]/page.tsx b/apps/web/app/(content)/kuji/[id]/page.tsx index 06c8f467c..01dfd9534 100644 --- a/apps/web/app/(content)/kuji/[id]/page.tsx +++ b/apps/web/app/(content)/kuji/[id]/page.tsx @@ -1,6 +1,7 @@ import { type Metadata } from 'next' import Image from 'next/image' import { notFound } from 'next/navigation' +import SimpleTitle from '@/components/simple-title' import { title as siteName, twitterAccount } from '@/lib/constants' import { type FortuneEntry, getFortune, getFortuneIDs } from '@/lib/contentful' import { generateFortuneName, getImageURL } from '@/lib/fortune' @@ -89,6 +90,8 @@ export default async function Page({ params }: Props) { return ( <> + {name} +
{name} +
-
- {title} +
{children}
diff --git a/apps/web/app/(content)/lottery/page.tsx b/apps/web/app/(content)/lottery/page.tsx index fa466f8f2..0f8524c2b 100644 --- a/apps/web/app/(content)/lottery/page.tsx +++ b/apps/web/app/(content)/lottery/page.tsx @@ -34,7 +34,7 @@ export default function LotteryPage() { const idPromise = getAnyFortuneID() return ( -
+
diff --git a/apps/web/app/(content)/privacy/layout.tsx b/apps/web/app/(content)/privacy/layout.tsx index ed9dcbc1f..d094ff742 100644 --- a/apps/web/app/(content)/privacy/layout.tsx +++ b/apps/web/app/(content)/privacy/layout.tsx @@ -1,5 +1,6 @@ import { type Metadata } from 'next' import { type ReactNode } from 'react' +import SimpleTitle from '@/components/simple-title' import { title as siteName, twitterAccount } from '@/lib/constants' export const metadata = { @@ -25,6 +26,9 @@ type Props = { export default function PrivacyLayout({ children }: Props) { return ( -
{children}
+
+ プライバシーポリシー + {children} +
) } diff --git a/apps/web/app/_components/mobile-menu.tsx b/apps/web/app/_components/mobile-menu.tsx index 6f7ea42bd..abc4faa1a 100644 --- a/apps/web/app/_components/mobile-menu.tsx +++ b/apps/web/app/_components/mobile-menu.tsx @@ -9,12 +9,22 @@ import { DialogTrigger } from '@radix-ui/react-dialog' import Link from 'next/link' +import { twMerge } from 'tailwind-merge' import Logo from '@/components/logo.svg' -export default function MobileMenu() { +type Props = { + className?: string +} + +export default function MobileMenu({ className }: Props) { return ( - + -
- +
+ - {children} +
{children}
-