+
+ {a.image ? 
: }
+
+
+ );
+}
diff --git a/src/components/site-nav.tsx b/src/components/site-nav.tsx
deleted file mode 100644
index 0aa7b972..00000000
--- a/src/components/site-nav.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import Link from "next/link";
-import { auth } from "@/lib/auth";
-import { siteSettings } from "@/lib/services/site-settings";
-
-export async function SiteNav() {
- const [hotelName, session] = await Promise.all([
- siteSettings.get("hotel_name", "Atom"),
- auth(),
- ]);
-
- return (
-
- );
-}
diff --git a/src/env.ts b/src/env.ts
index 4694dd09..fd00d38c 100644
--- a/src/env.ts
+++ b/src/env.ts
@@ -8,6 +8,7 @@ const schema = z.object({
DATABASE_URL: z.string().url(),
DATABASE_POOL_SIZE: z.coerce.number().int().positive().default(40),
DATABASE_IDLE_TIMEOUT_MS: z.coerce.number().int().positive().default(300_000),
+ DATABASE_CONNECT_TIMEOUT_MS: z.coerce.number().int().positive().default(10_000),
HOTEL_NAME: z.string().default("Atom"),
// RCON link to the Arcturus emulator (raw-JSON TCP protocol).
RCON_HOST: z.string().default("127.0.0.1"),
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 2bccc7da..3a562031 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -13,7 +13,8 @@ function createPrismaClient(): PrismaClient {
password: decodeURIComponent(url.password),
database: url.pathname.replace(/^\//, ""),
connectionLimit: env.DATABASE_POOL_SIZE,
- connectTimeout: 10_000,
+ connectTimeout: env.DATABASE_CONNECT_TIMEOUT_MS,
+ acquireTimeout: env.DATABASE_CONNECT_TIMEOUT_MS,
idleTimeout: env.DATABASE_IDLE_TIMEOUT_MS,
});
return new PrismaClient({
diff --git a/src/lib/services/site-settings.ts b/src/lib/services/site-settings.ts
index 52b2ffc8..eb8cfe0e 100644
--- a/src/lib/services/site-settings.ts
+++ b/src/lib/services/site-settings.ts
@@ -1,33 +1,50 @@
import { prisma } from "@/lib/prisma";
+// Fallback values used when a setting row is missing OR the DB is unreachable,
+// so the app still renders (e.g. local dev without a DATABASE_URL).
+const DEFAULTS: Record = {
+ hotel_name: "Atom",
+ habbo_imaging_url: "https://www.habbo.com/habbo-imaging/avatarimage",
+ logo_url: "",
+ nitro_client_url: "",
+};
+
/**
* DB-driven CMS config, mirroring AtomCMS's `setting()` / habbo-next's
* `siteSettings`. Loads the whole website_settings table into a key→value map,
- * cached in-process. Booleans are stored as the strings '1' / '0'.
+ * cached in-process, with graceful fallback to DEFAULTS. Booleans are stored as
+ * the strings '1' / '0'.
*/
class SiteSettings {
private cache: Map | null = null;
private async load(): Promise> {
if (this.cache === null) {
- const rows = await prisma.websiteSetting.findMany({
- select: { key: true, value: true },
- });
- this.cache = new Map(rows.map((r) => [r.key, r.value]));
+ try {
+ const rows = await prisma.websiteSetting.findMany({
+ select: { key: true, value: true },
+ });
+ this.cache = new Map(rows.map((r) => [r.key, r.value]));
+ } catch {
+ // DB unavailable — serve defaults without caching so we retry later.
+ return new Map(Object.entries(DEFAULTS));
+ }
}
return this.cache;
}
async get(key: string, fallback: string | null = null): Promise {
const map = await this.load();
- return map.has(key) ? (map.get(key) as string) : fallback;
+ if (map.has(key)) return map.get(key) as string;
+ if (key in DEFAULTS) return DEFAULTS[key] as string;
+ return fallback;
}
async getBool(key: string, fallback = false): Promise {
- const map = await this.load();
- if (!map.has(key)) return fallback;
- const v = (map.get(key) as string).toLowerCase();
- return v === "1" || v === "true";
+ const v = await this.get(key, null);
+ if (v === null) return fallback;
+ const s = v.toLowerCase();
+ return s === "1" || s === "true";
}
/** Invalidate the in-process cache after a settings write. */
{a.title}
diff --git a/src/components/site-footer.tsx b/src/components/site-footer.tsx new file mode 100644 index 00000000..3fb77a6f --- /dev/null +++ b/src/components/site-footer.tsx @@ -0,0 +1,18 @@ +import { siteSettings } from "@/lib/services/site-settings"; + +export async function SiteFooter() { + const hotelName = await siteSettings.get("hotel_name", "Atom"); + const year = new Date().getFullYear(); + + return ( + + ); +} diff --git a/src/components/site-header.tsx b/src/components/site-header.tsx new file mode 100644 index 00000000..6c11325c --- /dev/null +++ b/src/components/site-header.tsx @@ -0,0 +1,88 @@ +import Link from "next/link"; +import { auth } from "@/lib/auth"; +import { prisma } from "@/lib/prisma"; +import { siteSettings } from "@/lib/services/site-settings"; + +export async function SiteHeader() { + const [hotelName, session] = await Promise.all([ + siteSettings.get("hotel_name", "Atom"), + auth(), + ]); + + let credits = 0; + let duckets = 0; + let diamonds = 0; + if (session?.user?.id) { + try { + const id = Number(session.user.id); + const [user, currencies] = await Promise.all([ + prisma.user.findUnique({ where: { id }, select: { credits: true } }), + prisma.usersCurrency.findMany({ where: { userId: id } }), + ]); + credits = user?.credits ?? 0; + for (const c of currencies) { + if (c.type === 0) duckets = c.amount; + if (c.type === 5) diamonds = c.amount; + } + } catch { + // DB unavailable — render the header without live balances. + } + } + + const isStaff = (session?.user?.rank ?? 0) >= 7; + + return ( +
+
+
+ {hotelName}
+
+
+
+ {session?.user ? (
+ <>
+
+
+
+ cr
+ {credits}
+
+
+ d
+ {duckets}
+
+
+ ◆
+ {diamonds}
+
+
+
+ {session.user.name}
+
+
+ ) : (
+
+ Login
+
+ )}
+