Skip to content

fix: ini site dynamic #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shunkakinoki merged 21 commits into from
Oct 28, 2024
Merged

fix: ini site dynamic #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
76af7cc
fix: ini site dynamic
shunkakinoki Oct 26, 2024
e589f34
feat: ini dynamic connection
shunkakinoki Oct 27, 2024
58aedfd
chore: update
shunkakinoki Oct 27, 2024
a8863e5
feat: update
shunkakinoki Oct 27, 2024
d4e270d
chore: update
shunkakinoki Oct 27, 2024
9a46f14
chore: update
shunkakinoki Oct 27, 2024
00207f4
chore: update
shunkakinoki Oct 27, 2024
402354c
chore: update
shunkakinoki Oct 27, 2024
f8cf976
chore: udpate
shunkakinoki Oct 27, 2024
23f5828
chore: update
shunkakinoki Oct 27, 2024
36fc782
chore: update
shunkakinoki Oct 27, 2024
6178d88
chore: update
shunkakinoki Oct 27, 2024
13d7913
feat: update
shunkakinoki Oct 27, 2024
f53bcb7
feat: ini app update
shunkakinoki Oct 27, 2024
8d2bae4
feat: update
shunkakinoki Oct 27, 2024
db3a285
chore: update
shunkakinoki Oct 27, 2024
2e6ff6b
feat: ini metadata server connection
shunkakinoki Oct 27, 2024
bd500f3
feat: update
shunkakinoki Oct 27, 2024
fc64b41
feat: update
shunkakinoki Oct 27, 2024
2a30dfd
chore: update
shunkakinoki Oct 28, 2024
b9169df
chore: update
shunkakinoki Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 52 additions & 4 deletions app/[locale]/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
import { getCachedOpenGraphData } from "@/services/ogs";
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { connection } from "next/server";
import { Suspense } from "react";

// -----------------------------------------------------------------------------
Expand All @@ -34,8 +35,22 @@ import { Suspense } from "react";
export async function generateMetadata({
params,
}: { params: Promise<{ slug: string }> }): Promise<Metadata> {
// ---------------------------------------------------------------------------
// Server
// ---------------------------------------------------------------------------

await connection();

// ---------------------------------------------------------------------------
// Services
// ---------------------------------------------------------------------------

const page = await getCachedPage((await params).slug);

// ---------------------------------------------------------------------------
// Return
// ---------------------------------------------------------------------------

return {
//@ts-ignore
title: page.properties?.Name?.title[0]?.plain_text,
Expand All @@ -49,20 +64,53 @@ export async function generateMetadata({
// -----------------------------------------------------------------------------

// biome-ignore lint/style/noDefaultExport: <explanation>
// biome-ignore lint/suspicious/useAwait: <explanation>
export default async function SlugPage({
params,
}: { params: Promise<{ locale: string; slug: string }> }) {
// ---------------------------------------------------------------------------
// Services
// Render
// ---------------------------------------------------------------------------

return (
<Suspense fallback={null}>
<SlugInnerPage params={params} />
</Suspense>
);
}

// -----------------------------------------------------------------------------
// InnerPage
// -----------------------------------------------------------------------------

async function SlugInnerPage({
params,
}: { params: Promise<{ locale: string; slug: string }> }) {
// ---------------------------------------------------------------------------
// Server
// ---------------------------------------------------------------------------

await connection();

// ---------------------------------------------------------------------------
// Validation
// ---------------------------------------------------------------------------

// Omit the slug to get the valid uuid
const pageId = extractValidUUID((await params).slug);

// ---------------------------------------------------------------------------
// Not Found
// ---------------------------------------------------------------------------

if (!pageId) {
notFound();
return notFound();
}

// ---------------------------------------------------------------------------
// Services
// ---------------------------------------------------------------------------

// Get the page
const page = await getCachedPage(pageId);

Expand Down Expand Up @@ -148,13 +196,13 @@ export default async function SlugPage({
page.parent.database_id ===
"badf29d8-7d2f-4e03-b2c5-451a627d8618" && (
<div className="flex flex-col gap-4 md:gap-8">
<Suspense>
<Suspense fallback={null}>
<Check
// @ts-ignore
dateStart={page.properties.Date.date.start}
/>
</Suspense>
<Suspense>
<Suspense fallback={null}>
<Mind
// @ts-ignore
dateStart={page.properties.Date.date.start}
Expand Down
11 changes: 9 additions & 2 deletions app/[locale]/about/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import { Life } from "@/sections/life";
import type { Metadata } from "next";
import { getTranslations, setRequestLocale } from "next-intl/server";
import { connection } from "next/server";
import SlugPage from "../[slug]/page";

// -----------------------------------------------------------------------------
Expand All @@ -34,6 +35,12 @@ const aboutSlugs = {
export async function generateMetadata({
params,
}: { params: Promise<{ locale: string }> }): Promise<Metadata> {
// ---------------------------------------------------------------------------
// Server
// ---------------------------------------------------------------------------

await connection();

// ---------------------------------------------------------------------------
// i18n
// ---------------------------------------------------------------------------
Expand All @@ -51,12 +58,12 @@ export async function generateMetadata({
}

// -----------------------------------------------------------------------------
// Page
// Page
// -----------------------------------------------------------------------------

// biome-ignore lint/style/noDefaultExport: <explanation>
// biome-ignore lint/suspicious/useAwait: <explanation>
export default async function AboutPage({
export default async function AboutInnerPage({
params,
}: { params: Promise<{ locale: string }> }) {
// ---------------------------------------------------------------------------
Expand Down
38 changes: 37 additions & 1 deletion app/[locale]/blog/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import {
} from "@tanstack/react-query";
import type { Metadata } from "next";
import { getTranslations, setRequestLocale } from "next-intl/server";
import { connection } from "next/server";
import { Suspense } from "react";

// -----------------------------------------------------------------------------
// Metadata
Expand All @@ -29,6 +31,12 @@ import { getTranslations, setRequestLocale } from "next-intl/server";
export async function generateMetadata({
params,
}: { params: Promise<{ locale: string }> }): Promise<Metadata> {
// ---------------------------------------------------------------------------
// Server
// ---------------------------------------------------------------------------

await connection();

// ---------------------------------------------------------------------------
// i18n
// ---------------------------------------------------------------------------
Expand All @@ -54,14 +62,38 @@ export async function generateMetadata({
export default async function BlogPage({
params,
}: { params: Promise<{ locale: string }> }) {
// ---------------------------------------------------------------------------
// Render
// ---------------------------------------------------------------------------

return (
<Suspense fallback={null}>
<BlogInnerPage params={params} />
</Suspense>
);
}

// -----------------------------------------------------------------------------
// Inner Page
// -----------------------------------------------------------------------------

async function BlogInnerPage({
params,
}: { params: Promise<{ locale: string }> }) {
// ---------------------------------------------------------------------------
// Server
// ---------------------------------------------------------------------------

await connection();

// ---------------------------------------------------------------------------
// i18n
// ---------------------------------------------------------------------------

setRequestLocale((await params).locale);

// ---------------------------------------------------------------------------
// Actions
// Query
// ---------------------------------------------------------------------------

const queryClient = new QueryClient();
Expand All @@ -73,6 +105,10 @@ export default async function BlogPage({
initialPageParam: undefined,
});

// ---------------------------------------------------------------------------
// Actions
// ---------------------------------------------------------------------------

const initialData = await getBlogAction((await params).locale);

// ---------------------------------------------------------------------------
Expand Down
7 changes: 7 additions & 0 deletions app/[locale]/cause/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import type { Metadata } from "next";
import { getTranslations, setRequestLocale } from "next-intl/server";
import { connection } from "next/server";
import SlugPage from "../[slug]/page";

// -----------------------------------------------------------------------------
Expand All @@ -33,6 +34,12 @@ const causeSlugs = {
export async function generateMetadata({
params,
}: { params: Promise<{ locale: string }> }): Promise<Metadata> {
// ---------------------------------------------------------------------------
// Server
// ---------------------------------------------------------------------------

await connection();

// ---------------------------------------------------------------------------
// i18n
// ---------------------------------------------------------------------------
Expand Down
14 changes: 13 additions & 1 deletion app/[locale]/clock/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import { Clock } from "@/sections/clock";
import type { Metadata } from "next";
import { getTranslations, setRequestLocale } from "next-intl/server";
import { connection } from "next/server";
import { Suspense } from "react";

// -----------------------------------------------------------------------------
// Metadata
Expand All @@ -23,6 +25,12 @@ import { getTranslations, setRequestLocale } from "next-intl/server";
export async function generateMetadata({
params,
}: { params: Promise<{ locale: string }> }): Promise<Metadata> {
// ---------------------------------------------------------------------------
// Server
// ---------------------------------------------------------------------------

await connection();

// ---------------------------------------------------------------------------
// i18n
// ---------------------------------------------------------------------------
Expand Down Expand Up @@ -57,5 +65,9 @@ export default async function ClockPage({
// Render
// ---------------------------------------------------------------------------

return <Clock />;
return (
<Suspense fallback={null}>
<Clock />
</Suspense>
);
}
7 changes: 7 additions & 0 deletions app/[locale]/dashboard/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import { Dashboard } from "@/sections/dashboard";
import type { Metadata } from "next";
import { getTranslations, setRequestLocale } from "next-intl/server";
import { connection } from "next/server";

// -----------------------------------------------------------------------------
// Metadata
Expand All @@ -23,6 +24,12 @@ import { getTranslations, setRequestLocale } from "next-intl/server";
export async function generateMetadata({
params,
}: { params: Promise<{ locale: string }> }): Promise<Metadata> {
// ---------------------------------------------------------------------------
// Server
// ---------------------------------------------------------------------------

await connection();

// ---------------------------------------------------------------------------
// i18n
// ---------------------------------------------------------------------------
Expand Down
7 changes: 4 additions & 3 deletions app/[locale]/[...rest]/page.tsx → app/[locale]/error.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import { notFound } from "next/navigation";
"use client";

// -----------------------------------------------------------------------------
// Page
// -----------------------------------------------------------------------------

// biome-ignore lint/style/noDefaultExport: <explanation>
export default function CatchAllPage() {
// biome-ignore lint/suspicious/useAwait: <explanation>
export default async function ErrorPage() {
// ---------------------------------------------------------------------------
// Render
// ---------------------------------------------------------------------------

notFound();
return null;
}
7 changes: 7 additions & 0 deletions app/[locale]/history/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import { History } from "@/sections/history";
import type { Metadata } from "next";
import { getTranslations, setRequestLocale } from "next-intl/server";
import { connection } from "next/server";

// -----------------------------------------------------------------------------
// Metadata
Expand All @@ -23,6 +24,12 @@ import { getTranslations, setRequestLocale } from "next-intl/server";
export async function generateMetadata({
params,
}: { params: Promise<{ locale: string }> }): Promise<Metadata> {
// ---------------------------------------------------------------------------
// Server
// ---------------------------------------------------------------------------

await connection();

// ---------------------------------------------------------------------------
// i18n
// ---------------------------------------------------------------------------
Expand Down
36 changes: 35 additions & 1 deletion app/[locale]/journal/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import {
} from "@tanstack/react-query";
import type { Metadata } from "next";
import { getTranslations } from "next-intl/server";
import { connection } from "next/server";
import { Suspense } from "react";

// -----------------------------------------------------------------------------
// Metadata
Expand All @@ -29,6 +31,12 @@ import { getTranslations } from "next-intl/server";
export async function generateMetadata({
params,
}: { params: Promise<{ locale: string }> }): Promise<Metadata> {
// ---------------------------------------------------------------------------
// Server
// ---------------------------------------------------------------------------

await connection();

// ---------------------------------------------------------------------------
// i18n
// ---------------------------------------------------------------------------
Expand All @@ -53,7 +61,29 @@ export async function generateMetadata({
// biome-ignore lint/suspicious/useAwait: <explanation>
export default async function JournalPage() {
// ---------------------------------------------------------------------------
// Actions
// Render
// ---------------------------------------------------------------------------

return (
<Suspense fallback={null}>
<JournalInnerPage />
</Suspense>
);
}

// -----------------------------------------------------------------------------
// Inner Page
// -----------------------------------------------------------------------------

async function JournalInnerPage() {
// ---------------------------------------------------------------------------
// Server
// ---------------------------------------------------------------------------

await connection();

// ---------------------------------------------------------------------------
// Query
// ---------------------------------------------------------------------------

const queryClient = new QueryClient();
Expand All @@ -64,6 +94,10 @@ export default async function JournalPage() {
initialPageParam: undefined,
});

// ---------------------------------------------------------------------------
// Actions
// ---------------------------------------------------------------------------

const initialData = await getJournalAction();

// ---------------------------------------------------------------------------
Expand Down
Loading