Merge pull request #33 from kucc1997/fix-archives

fix: make archive years dynamic and unify upload dir usage

Author: abhiyandhakal

src/app/api/papers/post.ts

@@ -4,9 +4,10 @@ import { eq } from "drizzle-orm";
 import { customAlphabet } from "nanoid";
 import path from "path";
 import { writeFile, mkdir } from "fs/promises";
+import { getUploadDir, getUploadPublicBasePath } from "@/lib/upload-path";
 
-// Get upload directory from environment variable or use default
-const UPLOAD_DIR = process.env.UPLOAD_DIR || "public/uploads";
+const UPLOAD_DIR = getUploadDir();
+const UPLOAD_PUBLIC_BASE = getUploadPublicBasePath();
 
 export default async function POST(req: Request) {
   const formData = await req.formData();
@@ -40,7 +41,7 @@ export default async function POST(req: Request) {
       title: data.title,
       abstract: data.abstract,
       keywords: data.keywords,
-      fileUrl: `/uploads/papers/${paperID}.pdf`,
+      fileUrl: `${UPLOAD_PUBLIC_BASE}/papers/${paperID}.pdf`,
       themeId: data.theme,
       trackType: data.trackType,
       authorId: authorFromDb[0].id,

src/app/api/registration/route.ts

@@ -5,9 +5,10 @@ import { customAlphabet } from "nanoid"
 import path from "path"
 import { writeFile, mkdir } from "fs/promises"
 import { sendRegistrationEmail } from "@/lib/mail"
+import { getUploadDir, getUploadPublicBasePath } from "@/lib/upload-path"
 
-// Get upload directory from environment variable or use default
-const UPLOAD_DIR = process.env.UPLOAD_DIR || "public/uploads"
+const UPLOAD_DIR = getUploadDir()
+const UPLOAD_PUBLIC_BASE = getUploadPublicBasePath()
 
 // Create a custom nanoid generator for registration IDs
 const generateRegistrationId = customAlphabet('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', 8)
@@ -94,7 +95,7 @@ export async function POST(req: Request) {
 			paperSubmission,
 			dietaryRestrictions: dietaryRestrictions || null,
 			specialRequirements: specialRequirements || null,
-			paymentVoucherPath: `/uploads/vouchers/${registrationId}.${fileExtension}`,
+			paymentVoucherPath: `${UPLOAD_PUBLIC_BASE}/vouchers/${registrationId}.${fileExtension}`,
 			status: "pending"
 		}).returning()
 
@@ -136,4 +137,3 @@ export async function GET() {
 	const allRegs = await db.select().from(registrations);
 	return NextResponse.json({ success: true, data: allRegs });
 }
-

src/app/api/upload/route.ts

@@ -1,7 +1,11 @@
-import { writeFile } from "fs/promises";
+import { mkdir, writeFile } from "fs/promises";
 import { NextRequest, NextResponse } from "next/server";
 import path from "path";
 import { auth } from "@/auth";
+import { getUploadDir, getUploadPublicBasePath } from "@/lib/upload-path";
+
+const UPLOAD_DIR = getUploadDir();
+const UPLOAD_PUBLIC_BASE = getUploadPublicBasePath();
 
 export async function POST(request: NextRequest) {
   try {
@@ -45,15 +49,13 @@ export async function POST(request: NextRequest) {
 
     const buffer = Buffer.from(await file.arrayBuffer());
     const filename = `${Date.now()}-${file.name.replace(/\s+/g, "-")}`;
-    const filepath = path.join(
-      process.cwd(),
-      "public/uploads/archive",
-      filename
-    );
+    const uploadDir = path.join(process.cwd(), UPLOAD_DIR, "archive");
+    const filepath = path.join(uploadDir, filename);
 
+    await mkdir(uploadDir, { recursive: true });
     await writeFile(filepath, buffer);
 
-    return NextResponse.json({ url: `/uploads/archive/${filename}` });
+    return NextResponse.json({ url: `${UPLOAD_PUBLIC_BASE}/archive/${filename}` });
   } catch (error) {
     console.error("Upload error:", error);
     return NextResponse.json(

src/app/archive/2025/page.tsx src/app/archive/[year]/page.tsxsrc/app/archive/2025/page.tsx renamed to src/app/archive/[year]/page.tsx

@@ -1,21 +1,45 @@
 import Link from "next/link";
 import Image from "next/image";
-import { db, archiveYears, archiveCategories, archiveContent, archivePapers } from "@/db/schema";
+import {
+  db,
+  archiveYears,
+  archiveCategories,
+  archiveContent,
+  archivePapers,
+} from "@/db/schema";
 import { eq, and } from "drizzle-orm";
 import { notFound } from "next/navigation";
 
-export const dynamic = 'force-dynamic';
+export const dynamic = "force-dynamic";
+
+export default async function ArchiveYearPage({
+  params,
+}: {
+  params: Promise<{ year: string }>;
+}) {
+  const { year: yearStr } = await params;
+  const yearNumber = Number.parseInt(yearStr, 10);
+
+  if (Number.isNaN(yearNumber)) {
+    notFound();
+  }
+
+  const yearData = await db
+    .select()
+    .from(archiveYears)
+    .where(eq(archiveYears.year, yearNumber))
+    .limit(1);
 
-export default async function Archive2025Page() {
-  const yearData = await db.select().from(archiveYears).where(eq(archiveYears.year, 2025)).limit(1);
-  
   if (yearData.length === 0) {
     notFound();
   }
 
   const year = yearData[0];
-  const categories = await db.select().from(archiveCategories).orderBy(archiveCategories.displayOrder);
-  
+  const categories = await db
+    .select()
+    .from(archiveCategories)
+    .orderBy(archiveCategories.displayOrder);
+
   const contentByCategory = new Map<string, typeof archiveContent.$inferSelect[]>();
   for (const category of categories) {
     const content = await db
@@ -35,17 +59,17 @@ export default async function Archive2025Page() {
     .select()
     .from(archivePapers)
     .where(
-      and(
-        eq(archivePapers.yearId, year.id),
-        eq(archivePapers.isAccepted, true)
-      )
+      and(eq(archivePapers.yearId, year.id), eq(archivePapers.isAccepted, true))
     );
 
   return (
     <div className="container mx-auto px-4 py-16">
       <div className="max-w-6xl mx-auto">
         <div className="mb-8">
-          <Link href="/archive" className="text-sm text-muted-foreground hover:text-foreground">
+          <Link
+            href="/archive"
+            className="text-sm text-muted-foreground hover:text-foreground"
+          >
             ← Back to Archives
           </Link>
         </div>
@@ -69,9 +93,7 @@ export default async function Archive2025Page() {
             {year.eventDate && <span>{year.eventDate}</span>}
             {year.location && <span>• {year.location}</span>}
           </div>
-          {year.description && (
-            <p className="text-lg">{year.description}</p>
-          )}
+          {year.description && <p className="text-lg">{year.description}</p>}
         </div>
 
         <div className="space-y-12">
@@ -85,7 +107,9 @@ export default async function Archive2025Page() {
                 {papers.map((paper) => (
                   <div key={paper.id} className="border rounded-lg p-6">
                     <h3 className="text-xl font-semibold mb-2">{paper.title}</h3>
-                    <p className="text-sm text-muted-foreground mb-2">by {paper.authors}</p>
+                    <p className="text-sm text-muted-foreground mb-2">
+                      by {paper.authors}
+                    </p>
                     {paper.trackType && (
                       <span className="inline-block text-xs px-2 py-1 rounded bg-muted mb-3">
                         {paper.trackType}
@@ -110,8 +134,8 @@ export default async function Archive2025Page() {
 
           {categories.map((category) => {
             const items = contentByCategory.get(category.id) || [];
-            if (items.length === 0 && category.slug !== 'abstract-book') return null;
-            if (category.slug === 'papers') return null;
+            if (items.length === 0 && category.slug !== "abstract-book") return null;
+            if (category.slug === "papers") return null;
 
             return (
               <section key={category.id} id={category.slug}>

src/lib/upload-path.ts

@@ -0,0 +1,18 @@
+const DEFAULT_UPLOAD_DIR = "public/uploads";
+
+export function getUploadDir() {
+  return process.env.UPLOAD_DIR?.trim() || DEFAULT_UPLOAD_DIR;
+}
+
+export function getUploadPublicBasePath() {
+  const normalized = getUploadDir()
+    .replace(/\\/g, "/")
+    .replace(/^\.?\//, "")
+    .replace(/\/+$/, "");
+
+  if (!normalized.startsWith("public/")) {
+    return "/uploads";
+  }
+
+  return `/${normalized.slice("public/".length)}`;
+}