diff --git a/apps/nextjs/src/app/[locale]/manage/about/page.tsx b/apps/nextjs/src/app/[locale]/manage/about/page.tsx index 3f49db49c..9577d39a0 100644 --- a/apps/nextjs/src/app/[locale]/manage/about/page.tsx +++ b/apps/nextjs/src/app/[locale]/manage/about/page.tsx @@ -1,4 +1,3 @@ -import { headers } from "next/headers"; import Image from "next/image"; import { Accordion, @@ -41,11 +40,10 @@ import { getScopedI18n } from "@homarr/translation/server"; import { homarrLogoPath } from "~/components/layout/logo/homarr-logo"; import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb"; import { createMetaTitle } from "~/metadata"; -import type { PackageJsonDependencies } from "~/versions/package-reader"; -import { getPackageVersion } from "~/versions/package-reader"; -import type githubContributorsJson from "../../../../../../../static-data/contributors.json"; -import type openCollectiveContributorsJson from "../../../../../../../static-data/opencollective-contributors.json"; -import type crowdinContributorsJson from "../../../../../../../static-data/translators.json"; +import { getDependenciesAsync, getPackageVersion } from "~/versions/package-reader"; +import githubContributors from "@static-data/contributors.json"; +import openCollectiveContributors from "@static-data/opencollective-contributors.json"; +import crowdinContributors from "@static-data/translators.json"; import classes from "./about.module.css"; export async function generateMetadata() { @@ -56,32 +54,10 @@ export async function generateMetadata() { }; } -const getHostAsync = async () => { - if (process.env.HOSTNAME) { - return `${process.env.HOSTNAME}:3000`; - } - - return (await headers()).get("host"); -}; - export default async function AboutPage() { - const baseServerUrl = `http://${await getHostAsync()}`; const t = await getScopedI18n("management.page.about"); const version = getPackageVersion(); - const dependencies = (await fetch(`${baseServerUrl}/api/about/dependencies`).then((res) => - res.json(), - )) as PackageJsonDependencies; - const githubContributors = (await fetch(`${baseServerUrl}/api/about/contributors/github`).then((res) => - res.json(), - )) as typeof githubContributorsJson; - - const crowdinContributors = (await fetch(`${baseServerUrl}/api/about/contributors/crowdin`).then((res) => - res.json(), - )) as typeof crowdinContributorsJson; - - const openCollectiveContributors = (await fetch(`${baseServerUrl}/api/about/contributors/opencollective`).then( - (res) => res.json(), - )) as typeof openCollectiveContributorsJson; + const dependencies = await getDependenciesAsync(); return (
@@ -185,7 +161,7 @@ export default async function AboutPage() { {Object.entries(dependencies) .filter(([, value]) => !value.includes("workspace:")) - .sort(([key1], [key2]) => key1.localeCompare(key2)) + .toSorted(([key1], [key2]) => key1.localeCompare(key2)) .map(([name, version]) => ( void; +}) { + const tError = useScopedI18n("management.error"); + const t = useI18n(); + + useEffect(() => { + console.error(error); + }, [error]); + + return ( +
+ + + {tError("title")} + + {tError("text")} + + {error.digest && ( + + {tError("digest", { digest: error.digest })} + + )} + + +
+ ); +} diff --git a/apps/nextjs/src/app/api/about/contributors/crowdin/route.ts b/apps/nextjs/src/app/api/about/contributors/crowdin/route.ts index a149c082d..d55165906 100644 --- a/apps/nextjs/src/app/api/about/contributors/crowdin/route.ts +++ b/apps/nextjs/src/app/api/about/contributors/crowdin/route.ts @@ -1,6 +1,6 @@ import { NextResponse } from "next/server"; -import crowdinContributors from "../../../../../../../../static-data/translators.json"; +import crowdinContributors from "@static-data/translators.json"; export const GET = () => { return NextResponse.json(crowdinContributors); diff --git a/apps/nextjs/src/app/api/about/contributors/github/route.ts b/apps/nextjs/src/app/api/about/contributors/github/route.ts index a6fc81173..fa93d2881 100644 --- a/apps/nextjs/src/app/api/about/contributors/github/route.ts +++ b/apps/nextjs/src/app/api/about/contributors/github/route.ts @@ -1,6 +1,6 @@ import { NextResponse } from "next/server"; -import githubContributors from "../../../../../../../../static-data/contributors.json"; +import githubContributors from "@static-data/contributors.json"; export const GET = () => { return NextResponse.json(githubContributors); diff --git a/apps/nextjs/src/app/api/about/contributors/opencollective/route.ts b/apps/nextjs/src/app/api/about/contributors/opencollective/route.ts index 369f14a8c..eac1b58c4 100644 --- a/apps/nextjs/src/app/api/about/contributors/opencollective/route.ts +++ b/apps/nextjs/src/app/api/about/contributors/opencollective/route.ts @@ -1,6 +1,6 @@ import { NextResponse } from "next/server"; -import openCollectiveContributors from "../../../../../../../../static-data/opencollective-contributors.json"; +import openCollectiveContributors from "@static-data/opencollective-contributors.json"; export const GET = () => { return NextResponse.json(openCollectiveContributors); diff --git a/apps/nextjs/tsconfig.json b/apps/nextjs/tsconfig.json index 470a11e34..59c34075e 100644 --- a/apps/nextjs/tsconfig.json +++ b/apps/nextjs/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "paths": { "~/*": ["./src/*"], + "@static-data/*": ["../../static-data/*"], "@homarr/node-unifi": ["../../node_modules/@types/node-unifi"] }, "plugins": [ diff --git a/packages/translation/src/lang/en.json b/packages/translation/src/lang/en.json index 50628e908..8b73d45b3 100644 --- a/packages/translation/src/lang/en.json +++ b/packages/translation/src/lang/en.json @@ -4149,6 +4149,11 @@ "title": "Not Found", "text": "Could not find requested resource" }, + "error": { + "title": "This page couldn't load", + "text": "An unexpected error occurred while loading this page. Your navigation is still available — try reloading, or use another section from the sidebar.", + "digest": "Error reference: {digest}" + }, "navbar": { "items": { "home": "Home",