task-b complate

src/app/api/assets/[id]/assign/route.ts

@@ -1,31 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { PERMISSIONS } from '@/lib/auth/rbac';
-import { AuthError } from '@/lib/auth/session';
-import { assignAsset, parseAssignmentPayload, requireAssetAccess } from '../../_lib';
-
-type Params = { params: Promise<{ id: string }> };
-
-export async function POST(request: NextRequest, { params }: Params) {
-  try {
-    const { id } = await params;
-    const { organization, session } = await requireAssetAccess(PERMISSIONS.assetAssign);
-    const payload = parseAssignmentPayload(await request.json());
-
-    await assignAsset(organization.id, id, session.user.id, payload);
-
-    return NextResponse.json({
-      success: true,
-      message: 'Asset assigned successfully'
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    if (error instanceof Error) {
-      return NextResponse.json({ message: error.message }, { status: 400 });
-    }
-
-    return NextResponse.json({ message: 'Unable to assign asset' }, { status: 500 });
-  }
-}

src/app/api/assets/[id]/movements/route.ts

@@ -1,27 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { PERMISSIONS } from '@/lib/auth/rbac';
-import { AuthError } from '@/lib/auth/session';
-import { getAssetMovements, requireAssetAccess } from '../../_lib';
-
-type Params = { params: Promise<{ id: string }> };
-
-export async function GET(_request: NextRequest, { params }: Params) {
-  try {
-    const { id } = await params;
-    const { organization } = await requireAssetAccess(PERMISSIONS.assetRead);
-    const movements = await getAssetMovements(organization.id, id);
-
-    return NextResponse.json({
-      success: true,
-      time: new Date().toISOString(),
-      message: 'Asset movements loaded successfully',
-      movements
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    return NextResponse.json({ message: 'Unable to load asset movements' }, { status: 500 });
-  }
-}

src/app/api/assets/[id]/repair/route.ts

@@ -1,31 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { PERMISSIONS } from '@/lib/auth/rbac';
-import { AuthError } from '@/lib/auth/session';
-import { parseRepairPayload, repairAsset, requireAssetAccess } from '../../_lib';
-
-type Params = { params: Promise<{ id: string }> };
-
-export async function POST(request: NextRequest, { params }: Params) {
-  try {
-    const { id } = await params;
-    const { organization, session } = await requireAssetAccess(PERMISSIONS.assetRepair);
-    const payload = parseRepairPayload(await request.json());
-
-    await repairAsset(organization.id, id, session.user.id, payload);
-
-    return NextResponse.json({
-      success: true,
-      message: 'Asset repair recorded successfully'
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    if (error instanceof Error) {
-      return NextResponse.json({ message: error.message }, { status: 400 });
-    }
-
-    return NextResponse.json({ message: 'Unable to record repair' }, { status: 500 });
-  }
-}

src/app/api/assets/[id]/return/route.ts

@@ -1,31 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { PERMISSIONS } from '@/lib/auth/rbac';
-import { AuthError } from '@/lib/auth/session';
-import { parseReturnPayload, requireAssetAccess, returnAsset } from '../../_lib';
-
-type Params = { params: Promise<{ id: string }> };
-
-export async function POST(request: NextRequest, { params }: Params) {
-  try {
-    const { id } = await params;
-    const { organization, session } = await requireAssetAccess(PERMISSIONS.assetReturn);
-    const payload = parseReturnPayload(await request.json());
-
-    await returnAsset(organization.id, id, session.user.id, payload);
-
-    return NextResponse.json({
-      success: true,
-      message: 'Asset returned successfully'
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    if (error instanceof Error) {
-      return NextResponse.json({ message: error.message }, { status: 400 });
-    }
-
-    return NextResponse.json({ message: 'Unable to return asset' }, { status: 500 });
-  }
-}

src/app/api/assets/[id]/route.ts

@@ -1,88 +0,0 @@
-import { and, eq } from 'drizzle-orm';
-import { NextRequest, NextResponse } from 'next/server';
-import { assets } from '@/db/schema';
-import { PERMISSIONS } from '@/lib/auth/rbac';
-import { AuthError } from '@/lib/auth/session';
-import { db } from '@/lib/db';
-import {
-  getAssetById,
-  getAssetMovements,
-  getAssetRepairs,
-  parseAssetPayload,
-  requireAssetAccess,
-  updateAsset
-} from '../_lib';
-
-type Params = { params: Promise<{ id: string }> };
-
-export async function GET(_request: NextRequest, { params }: Params) {
-  try {
-    const { id } = await params;
-    const { organization } = await requireAssetAccess(PERMISSIONS.assetRead);
-    const [asset, movements, repairs] = await Promise.all([
-      getAssetById(organization.id, id),
-      getAssetMovements(organization.id, id),
-      getAssetRepairs(organization.id, id)
-    ]);
-
-    return NextResponse.json({
-      success: true,
-      time: new Date().toISOString(),
-      message: 'Asset loaded successfully',
-      asset,
-      movements,
-      repairs
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    return NextResponse.json({ message: 'Unable to load asset' }, { status: 500 });
-  }
-}
-
-export async function PUT(request: NextRequest, { params }: Params) {
-  try {
-    const { id } = await params;
-    const { organization, session } = await requireAssetAccess(PERMISSIONS.assetUpdate);
-    const payload = parseAssetPayload(await request.json());
-
-    await updateAsset(organization.id, id, session.user.id, payload);
-
-    return NextResponse.json({
-      success: true,
-      message: 'Asset updated successfully'
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    if (error instanceof Error) {
-      return NextResponse.json({ message: error.message }, { status: 400 });
-    }
-
-    return NextResponse.json({ message: 'Unable to update asset' }, { status: 500 });
-  }
-}
-
-export async function DELETE(_request: NextRequest, { params }: Params) {
-  try {
-    const { id } = await params;
-    const { organization } = await requireAssetAccess(PERMISSIONS.assetUpdate);
-
-    await db.delete(assets).where(and(eq(assets.id, id), eq(assets.organizationId, organization.id)));
-
-    return NextResponse.json({
-      success: true,
-      message: 'Asset deleted successfully'
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    return NextResponse.json({ message: 'Unable to delete asset' }, { status: 500 });
-  }
-}

src/app/api/assets/[id]/transfer/route.ts

@@ -1,31 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { PERMISSIONS } from '@/lib/auth/rbac';
-import { AuthError } from '@/lib/auth/session';
-import { parseTransferPayload, requireAssetAccess, transferAsset } from '../../_lib';
-
-type Params = { params: Promise<{ id: string }> };
-
-export async function POST(request: NextRequest, { params }: Params) {
-  try {
-    const { id } = await params;
-    const { organization, session } = await requireAssetAccess(PERMISSIONS.assetTransfer);
-    const payload = parseTransferPayload(await request.json());
-
-    await transferAsset(organization.id, id, session.user.id, payload);
-
-    return NextResponse.json({
-      success: true,
-      message: 'Asset transferred successfully'
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    if (error instanceof Error) {
-      return NextResponse.json({ message: error.message }, { status: 400 });
-    }
-
-    return NextResponse.json({ message: 'Unable to transfer asset' }, { status: 500 });
-  }
-}

src/app/api/assets/_lib.ts

@@ -1,926 +0,0 @@
-import { and, asc, desc, eq, isNull, sql } from 'drizzle-orm';
-import { z } from 'zod';
-import {
-  assetAssignments,
-  assetMovements,
-  assetRepairs,
-  assets,
-  departments,
-  employees,
-  locations,
-  organizations,
-  sites,
-  users
-} from '@/db/schema';
-import { AuthError, requireOrganizationAccess } from '@/lib/auth/session';
-import { db } from '@/lib/db';
-import type {
-  Asset,
-  AssetAssignmentPayload,
-  AssetFilters,
-  AssetMutationPayload,
-  AssetOptionsResponse,
-  AssetRepair,
-  AssetRepairPayload,
-  AssetReturnPayload,
-  AssetTransferPayload,
-  AssetMovement
-} from '@/features/assets/api/types';
-
-const assetSchema = z.object({
-  assetCode: z.string().min(1),
-  assetName: z.string().min(1),
-  assetType: z.enum(['hardware', 'software']),
-  assetCategory: z.string().min(1),
-  brand: z.string().optional().or(z.literal('')),
-  model: z.string().optional().or(z.literal('')),
-  specification: z.string().optional().or(z.literal('')),
-  serialNumber: z.string().optional().or(z.literal('')),
-  siteId: z.string().optional().nullable(),
-  departmentId: z.string().optional().nullable(),
-  locationId: z.string().optional().nullable(),
-  currentEmployeeId: z.string().optional().nullable(),
-  custodianTeam: z.string().optional().or(z.literal('')),
-  purchaseDate: z.string().optional().nullable(),
-  warrantyExpiryDate: z.string().optional().nullable(),
-  eosDate: z.string().optional().nullable(),
-  eolDate: z.string().optional().nullable(),
-  eopDate: z.string().optional().nullable(),
-  status: z.enum(['AVAILABLE', 'ASSIGNED', 'IN_REPAIR', 'LOST', 'RETIRED']),
-  assetCondition: z.enum(['NORMAL', 'DAMAGED']),
-  dispositionStatus: z.enum([
-    'NONE',
-    'WAITING_REPAIR',
-    'WAITING_WRITE_OFF',
-    'WRITE_OFF_COMPLETED'
-  ]),
-  notes: z.string().optional().or(z.literal(''))
-});
-
-const assignmentSchema = z.object({
-  employeeId: z.string().min(1),
-  departmentId: z.string().optional().nullable(),
-  locationId: z.string().optional().nullable(),
-  siteId: z.string().optional().nullable(),
-  assignDate: z.string().min(1),
-  documentAttachment: z.string().min(1),
-  reason: z.string().optional().or(z.literal(''))
-});
-
-const transferSchema = z.object({
-  newEmployeeId: z.string().optional().nullable(),
-  newDepartmentId: z.string().optional().nullable(),
-  newLocationId: z.string().optional().nullable(),
-  newSiteId: z.string().optional().nullable(),
-  newAssetCode: z.string().optional().or(z.literal('')),
-  transferDate: z.string().min(1),
-  referenceDocument: z.string().min(1),
-  reason: z.string().optional().or(z.literal(''))
-});
-
-const returnSchema = z.object({
-  returnDate: z.string().min(1),
-  assetCondition: z.enum(['NORMAL', 'DAMAGED']),
-  remark: z.string().min(1)
-});
-
-const repairSchema = z.object({
-  repairDate: z.string().optional().nullable(),
-  vendor: z.string().optional().or(z.literal('')),
-  problem: z.string().min(1),
-  resolution: z.string().optional().or(z.literal('')),
-  cost: z.number().nullable().optional(),
-  markAsRepair: z.boolean().optional().default(true)
-});
-
-function asDate(value?: string | null) {
-  if (!value) {
-    return null;
-  }
-
-  const date = new Date(value);
-  return Number.isNaN(date.getTime()) ? null : date;
-}
-
-function iso(value: Date | string | null) {
-  if (!value) {
-    return null;
-  }
-
-  return value instanceof Date ? value.toISOString() : new Date(value).toISOString();
-}
-
-function sanitizeText(value?: string | null) {
-  return value && value.trim().length > 0 ? value.trim() : null;
-}
-
-type AssetRow = {
-  id: string;
-  organizationId: string;
-  assetUid: string;
-  assetCode: string;
-  assetName: string;
-  companyName: string | null;
-  assetType: string;
-  assetCategory: string;
-  brand: string | null;
-  model: string | null;
-  specification: string | null;
-  serialNumber: string | null;
-  siteId: string | null;
-  siteName: string | null;
-  departmentId: string | null;
-  departmentName: string | null;
-  locationId: string | null;
-  locationName: string | null;
-  currentEmployeeId: string | null;
-  currentEmployeeName: string | null;
-  custodianTeam: string | null;
-  purchaseDate: Date | null;
-  warrantyExpiryDate: Date | null;
-  eosDate: Date | null;
-  eolDate: Date | null;
-  eopDate: Date | null;
-  status: string;
-  assetCondition: string;
-  dispositionStatus: string;
-  notes: string | null;
-  createdAt: Date;
-  updatedAt: Date;
-};
-
-function formatAsset(row: AssetRow): Asset {
-  return {
-    id: row.id,
-    organizationId: row.organizationId,
-    assetUid: row.assetUid,
-    assetCode: row.assetCode,
-    assetName: row.assetName,
-    companyName: row.companyName,
-    assetType: row.assetType === 'software' ? 'software' : 'hardware',
-    assetCategory: row.assetCategory,
-    brand: row.brand,
-    model: row.model,
-    specification: row.specification,
-    serialNumber: row.serialNumber,
-    siteId: row.siteId,
-    siteName: row.siteName,
-    departmentId: row.departmentId,
-    departmentName: row.departmentName,
-    locationId: row.locationId,
-    locationName: row.locationName,
-    currentEmployeeId: row.currentEmployeeId,
-    currentEmployeeName: row.currentEmployeeName,
-    custodianTeam: row.custodianTeam,
-    purchaseDate: iso(row.purchaseDate),
-    warrantyExpiryDate: iso(row.warrantyExpiryDate),
-    eosDate: iso(row.eosDate),
-    eolDate: iso(row.eolDate),
-    eopDate: iso(row.eopDate),
-    status: (['AVAILABLE', 'ASSIGNED', 'IN_REPAIR', 'LOST', 'RETIRED'] as const).includes(
-      row.status as Asset['status']
-    )
-      ? (row.status as Asset['status'])
-      : 'AVAILABLE',
-    assetCondition: (['NORMAL', 'DAMAGED'] as const).includes(row.assetCondition as Asset['assetCondition'])
-      ? (row.assetCondition as Asset['assetCondition'])
-      : 'NORMAL',
-    dispositionStatus: (
-      ['NONE', 'WAITING_REPAIR', 'WAITING_WRITE_OFF', 'WRITE_OFF_COMPLETED'] as const
-    ).includes(row.dispositionStatus as Asset['dispositionStatus'])
-      ? (row.dispositionStatus as Asset['dispositionStatus'])
-      : 'NONE',
-    notes: row.notes,
-    createdAt: row.createdAt.toISOString(),
-    updatedAt: row.updatedAt.toISOString()
-  };
-}
-
-export async function requireAssetAccess(permission: string) {
-  return requireOrganizationAccess({ permission });
-}
-
-export function parseAssetPayload(body: unknown): AssetMutationPayload {
-  const parsed = assetSchema.safeParse(body);
-
-  if (!parsed.success) {
-    throw new Error('Invalid asset payload');
-  }
-
-  return parsed.data;
-}
-
-export function parseAssignmentPayload(body: unknown): AssetAssignmentPayload {
-  const parsed = assignmentSchema.safeParse(body);
-
-  if (!parsed.success) {
-    throw new Error('Invalid assignment payload');
-  }
-
-  return parsed.data;
-}
-
-export function parseTransferPayload(body: unknown): AssetTransferPayload {
-  const parsed = transferSchema.safeParse(body);
-
-  if (!parsed.success) {
-    throw new Error('Invalid transfer payload');
-  }
-
-  return parsed.data;
-}
-
-export function parseReturnPayload(body: unknown): AssetReturnPayload {
-  const parsed = returnSchema.safeParse(body);
-
-  if (!parsed.success) {
-    throw new Error('Invalid return payload');
-  }
-
-  return parsed.data;
-}
-
-export function parseRepairPayload(body: unknown): AssetRepairPayload {
-  const parsed = repairSchema.safeParse(body);
-
-  if (!parsed.success) {
-    throw new Error('Invalid repair payload');
-  }
-
-  return parsed.data;
-}
-
-async function getBaseAssetRows(organizationId: string) {
-  const rows = await db
-    .select({
-      id: assets.id,
-      organizationId: assets.organizationId,
-      assetUid: assets.assetUid,
-      assetCode: assets.assetCode,
-      assetName: assets.assetName,
-      companyName: organizations.name,
-      assetType: assets.assetType,
-      assetCategory: assets.assetCategory,
-      brand: assets.brand,
-      model: assets.model,
-      specification: assets.specification,
-      serialNumber: assets.serialNumber,
-      siteId: assets.siteId,
-      siteName: sites.name,
-      departmentId: assets.departmentId,
-      departmentName: departments.name,
-      locationId: assets.locationId,
-      locationName: locations.name,
-      currentEmployeeId: assets.currentEmployeeId,
-      currentEmployeeName: employees.name,
-      custodianTeam: assets.custodianTeam,
-      purchaseDate: assets.purchaseDate,
-      warrantyExpiryDate: assets.warrantyExpiryDate,
-      eosDate: assets.eosDate,
-      eolDate: assets.eolDate,
-      eopDate: assets.eopDate,
-      status: assets.status,
-      assetCondition: assets.assetCondition,
-      dispositionStatus: assets.dispositionStatus,
-      notes: assets.notes,
-      createdAt: assets.createdAt,
-      updatedAt: assets.updatedAt
-    })
-    .from(assets)
-    .innerJoin(organizations, eq(organizations.id, assets.organizationId))
-    .leftJoin(sites, eq(sites.id, assets.siteId))
-    .leftJoin(departments, eq(departments.id, assets.departmentId))
-    .leftJoin(locations, eq(locations.id, assets.locationId))
-    .leftJoin(employees, eq(employees.id, assets.currentEmployeeId))
-    .where(eq(assets.organizationId, organizationId));
-
-  return rows as AssetRow[];
-}
-
-export async function listAssetsForOrganization(organizationId: string, filters: AssetFilters) {
-  let rows = await getBaseAssetRows(organizationId);
-
-  if (filters.search) {
-    const search = filters.search.toLowerCase();
-    rows = rows.filter((row) =>
-      [
-        row.assetUid,
-        row.assetCode,
-        row.assetName,
-        row.assetCategory,
-        row.companyName,
-        row.brand,
-        row.model,
-        row.serialNumber
-      ]
-        .filter(Boolean)
-        .some((value) => String(value).toLowerCase().includes(search))
-    );
-  }
-
-  if (filters.status) {
-    const selected = filters.status
-      .split(/[.,]/)
-      .map((value) => value.trim())
-      .filter(Boolean);
-    rows = rows.filter((row) => selected.includes(row.status));
-  }
-
-  if (filters.assetType) {
-    const selected = filters.assetType
-      .split(/[.,]/)
-      .map((value) => value.trim())
-      .filter(Boolean);
-    rows = rows.filter((row) => selected.includes(row.assetType));
-  }
-
-  if (filters.assetCondition) {
-    const selected = filters.assetCondition
-      .split(/[.,]/)
-      .map((value) => value.trim())
-      .filter(Boolean);
-    rows = rows.filter((row) => selected.includes(row.assetCondition));
-  }
-
-  if (filters.dispositionStatus) {
-    const selected = filters.dispositionStatus
-      .split(/[.,]/)
-      .map((value) => value.trim())
-      .filter(Boolean);
-    rows = rows.filter((row) => selected.includes(row.dispositionStatus));
-  }
-
-  if (filters.sort) {
-    try {
-      const [primary] = JSON.parse(filters.sort) as Array<{ id: string; desc: boolean }>;
-      if (primary) {
-        rows = rows.toSorted((a, b) => {
-          const left = String((a as Record<string, unknown>)[primary.id] ?? '');
-          const right = String((b as Record<string, unknown>)[primary.id] ?? '');
-          return primary.desc ? right.localeCompare(left) : left.localeCompare(right);
-        });
-      }
-    } catch {
-      rows = rows.toSorted((a, b) => a.assetCode.localeCompare(b.assetCode));
-    }
-  } else {
-    rows = rows.toSorted((a, b) => a.assetCode.localeCompare(b.assetCode));
-  }
-
-  const page = filters.page ?? 1;
-  const limit = filters.limit ?? 10;
-  const offset = (page - 1) * limit;
-
-  return {
-    total: rows.length,
-    offset,
-    limit,
-    assets: rows.slice(offset, offset + limit).map(formatAsset)
-  };
-}
-
-export async function getAssetById(organizationId: string, assetId: string) {
-  const rows = await getBaseAssetRows(organizationId);
-  const asset = rows.find((row) => row.id === assetId);
-
-  if (!asset) {
-    throw new AuthError('Asset not found', 404);
-  }
-
-  return formatAsset(asset);
-}
-
-export async function getAssetRepairs(organizationId: string, assetId: string) {
-  const rows = await db.query.assetRepairs.findMany({
-    where: and(eq(assetRepairs.organizationId, organizationId), eq(assetRepairs.assetId, assetId)),
-    orderBy: desc(assetRepairs.repairDate)
-  });
-
-  return rows.map<AssetRepair>((row) => ({
-    id: row.id,
-    assetId: row.assetId,
-    repairDate: row.repairDate.toISOString(),
-    vendor: row.vendor,
-    problem: row.problem,
-    resolution: row.resolution,
-    cost: row.cost ? Number(row.cost) : null
-  }));
-}
-
-export async function getAssetMovements(organizationId: string, assetId?: string) {
-  const conditions = [eq(assetMovements.organizationId, organizationId)];
-  if (assetId) {
-    conditions.push(eq(assetMovements.assetId, assetId));
-  }
-
-  const rows = await db
-    .select({
-      id: assetMovements.id,
-      assetId: assetMovements.assetId,
-      assetUid: assets.assetUid,
-      assetCode: assets.assetCode,
-      assetName: assets.assetName,
-      eventType: assetMovements.eventType,
-      eventDate: assetMovements.eventDate,
-      reason: assetMovements.reason,
-      referenceDocument: assetMovements.referenceDocument,
-      performedByName: users.name,
-      metadata: assetMovements.metadata
-    })
-    .from(assetMovements)
-    .innerJoin(assets, eq(assets.id, assetMovements.assetId))
-    .leftJoin(users, eq(users.id, assetMovements.performedByUserId))
-    .where(and(...conditions))
-    .orderBy(desc(assetMovements.eventDate));
-
-    return rows.map<AssetMovement>((row) => ({
-    id: row.id,
-    assetId: row.assetId,
-    assetUid: row.assetUid,
-    assetCode: row.assetCode,
-    assetName: row.assetName,
-    eventType: row.eventType as AssetMovement['eventType'],
-    eventDate: row.eventDate.toISOString(),
-    reason: row.reason,
-    referenceDocument: row.referenceDocument,
-    performedByName: row.performedByName,
-    metadata: (row.metadata as Record<string, unknown> | null) ?? null
-  }));
-}
-
-export async function getAssetOptions(organizationId: string): Promise<AssetOptionsResponse> {
-  const [siteRows, departmentRows, locationRows, employeeRows] = await Promise.all([
-    db.select().from(sites).where(eq(sites.organizationId, organizationId)).orderBy(asc(sites.name)),
-    db
-      .select()
-      .from(departments)
-      .where(eq(departments.organizationId, organizationId))
-      .orderBy(asc(departments.name)),
-    listLocations(organizationId),
-    listEmployees(organizationId)
-  ]);
-
-  return {
-    success: true,
-    time: new Date().toISOString(),
-    message: 'Asset options loaded successfully',
-    sites: siteRows.map((row) => ({
-      id: row.id,
-      organizationId: row.organizationId,
-      code: row.code,
-      name: row.name
-    })),
-    departments: departmentRows.map((row) => ({
-      id: row.id,
-      organizationId: row.organizationId,
-      code: row.code,
-      name: row.name
-    })),
-    locations: locationRows,
-    employees: employeeRows
-  };
-}
-
-async function listLocations(organizationId: string) {
-  const rows = await db
-    .select({
-      id: locations.id,
-      organizationId: locations.organizationId,
-      siteId: locations.siteId,
-      siteName: sites.name,
-      building: locations.building,
-      floor: locations.floor,
-      area: locations.area,
-      name: locations.name
-    })
-    .from(locations)
-    .leftJoin(sites, eq(sites.id, locations.siteId))
-    .where(eq(locations.organizationId, organizationId))
-    .orderBy(asc(locations.name));
-
-  return rows;
-}
-
-async function listEmployees(organizationId: string) {
-  const rows = await db
-    .select({
-      id: employees.id,
-      organizationId: employees.organizationId,
-      employeeNo: employees.employeeNo,
-      name: employees.name,
-      departmentId: employees.departmentId,
-      departmentName: departments.name,
-      siteId: employees.siteId,
-      siteName: sites.name,
-      status: employees.status
-    })
-    .from(employees)
-    .leftJoin(departments, eq(departments.id, employees.departmentId))
-    .leftJoin(sites, eq(sites.id, employees.siteId))
-    .where(eq(employees.organizationId, organizationId))
-    .orderBy(asc(employees.name));
-
-  return rows;
-}
-
-async function buildAssetUid() {
-  const result = await db.select({ count: sql<number>`count(*)::int` }).from(assets);
-  const nextValue = (result[0]?.count ?? 0) + 1;
-  return `AST-${String(nextValue).padStart(6, '0')}`;
-}
-
-function buildSnapshot(asset: Asset) {
-  return {
-    assetCode: asset.assetCode,
-    assetName: asset.assetName,
-    siteId: asset.siteId,
-    departmentId: asset.departmentId,
-    locationId: asset.locationId,
-    currentEmployeeId: asset.currentEmployeeId,
-    status: asset.status,
-    assetCondition: asset.assetCondition,
-    dispositionStatus: asset.dispositionStatus
-  };
-}
-
-async function insertMovement(tx: Pick<typeof db, 'insert'>, values: {
-  assetId: string;
-  organizationId: string;
-  eventType: string;
-  performedByUserId: string;
-  reason?: string | null;
-  referenceDocument?: string | null;
-  snapshotBefore?: Record<string, unknown> | null;
-  snapshotAfter?: Record<string, unknown> | null;
-  metadata?: Record<string, unknown> | null;
-  eventDate?: Date;
-}) {
-  await tx.insert(assetMovements).values({
-    id: crypto.randomUUID(),
-    assetId: values.assetId,
-    organizationId: values.organizationId,
-    eventType: values.eventType,
-    eventDate: values.eventDate ?? new Date(),
-    reason: values.reason ?? null,
-    referenceDocument: values.referenceDocument ?? null,
-    performedByUserId: values.performedByUserId,
-    snapshotBefore: values.snapshotBefore ?? null,
-    snapshotAfter: values.snapshotAfter ?? null,
-    metadata: values.metadata ?? null
-  });
-}
-
-export async function createAsset(organizationId: string, performedByUserId: string, payload: AssetMutationPayload) {
-  const assetId = crypto.randomUUID();
-  const assetUid = await buildAssetUid();
-
-  await db.transaction(async (tx) => {
-    await tx.insert(assets).values({
-      id: assetId,
-      organizationId,
-      assetUid,
-      assetCode: payload.assetCode,
-      assetName: payload.assetName,
-      assetType: payload.assetType,
-      assetCategory: payload.assetCategory,
-      brand: sanitizeText(payload.brand),
-      model: sanitizeText(payload.model),
-      specification: sanitizeText(payload.specification),
-      serialNumber: sanitizeText(payload.serialNumber),
-      siteId: payload.siteId ?? null,
-      departmentId: payload.departmentId ?? null,
-      locationId: payload.locationId ?? null,
-      currentEmployeeId: payload.currentEmployeeId ?? null,
-      custodianTeam: sanitizeText(payload.custodianTeam),
-      purchaseDate: asDate(payload.purchaseDate),
-      warrantyExpiryDate: asDate(payload.warrantyExpiryDate),
-      eosDate: asDate(payload.eosDate),
-      eolDate: asDate(payload.eolDate),
-      eopDate: asDate(payload.eopDate),
-      status: payload.status,
-      assetCondition: payload.assetCondition,
-      dispositionStatus: payload.dispositionStatus,
-      notes: sanitizeText(payload.notes)
-    });
-
-    await insertMovement(tx, {
-      assetId,
-      organizationId,
-      eventType: 'CREATE',
-      performedByUserId,
-      snapshotAfter: {
-        assetCode: payload.assetCode,
-        assetName: payload.assetName,
-        status: payload.status,
-        assetCondition: payload.assetCondition,
-        dispositionStatus: payload.dispositionStatus,
-        assetUid
-      }
-    });
-  });
-
-  return assetId;
-}
-
-export async function updateAsset(
-  organizationId: string,
-  assetId: string,
-  performedByUserId: string,
-  payload: AssetMutationPayload
-) {
-  const currentAsset = await getAssetById(organizationId, assetId);
-
-  await db.transaction(async (tx) => {
-    await tx
-      .update(assets)
-      .set({
-        assetCode: payload.assetCode,
-        assetName: payload.assetName,
-        assetType: payload.assetType,
-        assetCategory: payload.assetCategory,
-        brand: sanitizeText(payload.brand),
-        model: sanitizeText(payload.model),
-        specification: sanitizeText(payload.specification),
-        serialNumber: sanitizeText(payload.serialNumber),
-        siteId: payload.siteId ?? null,
-        departmentId: payload.departmentId ?? null,
-        locationId: payload.locationId ?? null,
-        currentEmployeeId: payload.currentEmployeeId ?? null,
-        custodianTeam: sanitizeText(payload.custodianTeam),
-        purchaseDate: asDate(payload.purchaseDate),
-        warrantyExpiryDate: asDate(payload.warrantyExpiryDate),
-        eosDate: asDate(payload.eosDate),
-        eolDate: asDate(payload.eolDate),
-        eopDate: asDate(payload.eopDate),
-        status: payload.status,
-        assetCondition: payload.assetCondition,
-        dispositionStatus: payload.dispositionStatus,
-        notes: sanitizeText(payload.notes),
-        updatedAt: new Date()
-      })
-      .where(and(eq(assets.id, assetId), eq(assets.organizationId, organizationId)));
-
-    const updatedAsset = await getAssetById(organizationId, assetId);
-
-    await insertMovement(tx, {
-      assetId,
-      organizationId,
-      eventType: 'UPDATE',
-      performedByUserId,
-      snapshotBefore: buildSnapshot(currentAsset),
-      snapshotAfter: buildSnapshot(updatedAsset)
-    });
-  });
-}
-
-export async function assignAsset(
-  organizationId: string,
-  assetId: string,
-  performedByUserId: string,
-  payload: AssetAssignmentPayload
-) {
-  const currentAsset = await getAssetById(organizationId, assetId);
-
-  await db.transaction(async (tx) => {
-    await tx.insert(assetAssignments).values({
-      id: crypto.randomUUID(),
-      assetId,
-      organizationId,
-      employeeId: payload.employeeId,
-      departmentId: payload.departmentId ?? currentAsset.departmentId,
-      locationId: payload.locationId ?? currentAsset.locationId,
-      siteId: payload.siteId ?? currentAsset.siteId,
-      assignedAt: asDate(payload.assignDate) ?? new Date(),
-      documentAttachment: sanitizeText(payload.documentAttachment),
-      assignedByUserId: performedByUserId
-    });
-
-    await tx
-      .update(assets)
-      .set({
-        currentEmployeeId: payload.employeeId,
-        departmentId: payload.departmentId ?? currentAsset.departmentId,
-        locationId: payload.locationId ?? currentAsset.locationId,
-        siteId: payload.siteId ?? currentAsset.siteId,
-        status: 'ASSIGNED',
-        dispositionStatus: 'NONE',
-        updatedAt: new Date()
-      })
-      .where(and(eq(assets.id, assetId), eq(assets.organizationId, organizationId)));
-
-    const updatedAsset = await getAssetById(organizationId, assetId);
-
-    await insertMovement(tx, {
-      assetId,
-      organizationId,
-      eventType: 'ASSIGN',
-      performedByUserId,
-      reason: payload.reason ?? null,
-      referenceDocument: payload.documentAttachment,
-      eventDate: asDate(payload.assignDate) ?? new Date(),
-      snapshotBefore: buildSnapshot(currentAsset),
-      snapshotAfter: buildSnapshot(updatedAsset),
-      metadata: {
-        employeeId: payload.employeeId,
-        departmentId: payload.departmentId ?? null,
-        locationId: payload.locationId ?? null,
-        siteId: payload.siteId ?? null,
-        documentAttachment: payload.documentAttachment
-      }
-    });
-  });
-}
-
-export async function transferAsset(
-  organizationId: string,
-  assetId: string,
-  performedByUserId: string,
-  payload: AssetTransferPayload
-) {
-  const currentAsset = await getAssetById(organizationId, assetId);
-  const transferEventDate = asDate(payload.transferDate) ?? new Date();
-  const nextAssetCode = sanitizeText(payload.newAssetCode) ?? currentAsset.assetCode;
-  const nextEmployeeId = payload.newEmployeeId ?? currentAsset.currentEmployeeId;
-  const nextDepartmentId = payload.newDepartmentId ?? currentAsset.departmentId;
-  const nextLocationId = payload.newLocationId ?? currentAsset.locationId;
-  const nextSiteId = payload.newSiteId ?? currentAsset.siteId;
-
-  await db.transaction(async (tx) => {
-    await tx
-      .update(assetAssignments)
-      .set({
-        returnedAt: transferEventDate,
-        returnedByUserId: performedByUserId,
-        updatedAt: new Date()
-      })
-      .where(
-        and(
-          eq(assetAssignments.assetId, assetId),
-          eq(assetAssignments.organizationId, organizationId),
-          isNull(assetAssignments.returnedAt)
-        )
-      );
-
-    if (nextEmployeeId) {
-      await tx.insert(assetAssignments).values({
-        id: crypto.randomUUID(),
-        assetId,
-        organizationId,
-        employeeId: nextEmployeeId,
-        departmentId: nextDepartmentId,
-        locationId: nextLocationId,
-        siteId: nextSiteId,
-        assignedAt: transferEventDate,
-        documentAttachment: sanitizeText(payload.referenceDocument),
-        assignedByUserId: performedByUserId
-      });
-    }
-
-    await tx
-      .update(assets)
-      .set({
-        currentEmployeeId: nextEmployeeId,
-        departmentId: nextDepartmentId,
-        locationId: nextLocationId,
-        siteId: nextSiteId,
-        assetCode: nextAssetCode,
-        status: nextEmployeeId ? 'ASSIGNED' : 'AVAILABLE',
-        updatedAt: new Date()
-      })
-      .where(and(eq(assets.id, assetId), eq(assets.organizationId, organizationId)));
-
-    const updatedAsset = await getAssetById(organizationId, assetId);
-
-    await insertMovement(tx, {
-      assetId,
-      organizationId,
-      eventType: 'TRANSFER',
-      performedByUserId,
-      reason: payload.reason ?? null,
-      referenceDocument: payload.referenceDocument,
-      eventDate: transferEventDate,
-      snapshotBefore: buildSnapshot(currentAsset),
-      snapshotAfter: buildSnapshot(updatedAsset),
-      metadata: {
-        oldEmployeeId: currentAsset.currentEmployeeId,
-        newEmployeeId: nextEmployeeId,
-        oldDepartmentId: currentAsset.departmentId,
-        newDepartmentId: nextDepartmentId,
-        oldLocationId: currentAsset.locationId,
-        newLocationId: nextLocationId,
-        oldSiteId: currentAsset.siteId,
-        newSiteId: nextSiteId,
-        oldAssetCode: currentAsset.assetCode,
-        newAssetCode: nextAssetCode
-      }
-    });
-  });
-}
-
-export async function returnAsset(
-  organizationId: string,
-  assetId: string,
-  performedByUserId: string,
-  payload: AssetReturnPayload
-) {
-  const currentAsset = await getAssetById(organizationId, assetId);
-  const returnEventDate = asDate(payload.returnDate) ?? new Date();
-  const nextDispositionStatus = payload.assetCondition === 'DAMAGED' ? 'WAITING_REPAIR' : 'NONE';
-
-  await db.transaction(async (tx) => {
-    await tx
-      .update(assetAssignments)
-      .set({
-        returnedAt: returnEventDate,
-        returnedByUserId: performedByUserId,
-        updatedAt: new Date()
-      })
-      .where(
-        and(
-          eq(assetAssignments.assetId, assetId),
-          eq(assetAssignments.organizationId, organizationId),
-          isNull(assetAssignments.returnedAt)
-        )
-      );
-
-    await tx
-      .update(assets)
-      .set({
-        currentEmployeeId: null,
-        status: 'AVAILABLE',
-        assetCondition: payload.assetCondition,
-        dispositionStatus: nextDispositionStatus,
-        updatedAt: new Date()
-      })
-      .where(and(eq(assets.id, assetId), eq(assets.organizationId, organizationId)));
-
-    const updatedAsset = await getAssetById(organizationId, assetId);
-
-    await insertMovement(tx, {
-      assetId,
-      organizationId,
-      eventType: 'RETURN',
-      performedByUserId,
-      reason: payload.remark,
-      eventDate: returnEventDate,
-      snapshotBefore: buildSnapshot(currentAsset),
-      snapshotAfter: buildSnapshot(updatedAsset),
-      metadata: {
-        assetCondition: payload.assetCondition,
-        dispositionStatus: nextDispositionStatus
-      }
-    });
-  });
-}
-
-export async function repairAsset(
-  organizationId: string,
-  assetId: string,
-  performedByUserId: string,
-  payload: AssetRepairPayload
-) {
-  const currentAsset = await getAssetById(organizationId, assetId);
-
-  await db.transaction(async (tx) => {
-    await tx.insert(assetRepairs).values({
-      id: crypto.randomUUID(),
-      assetId,
-      organizationId,
-      repairDate: asDate(payload.repairDate) ?? new Date(),
-      vendor: sanitizeText(payload.vendor),
-      problem: payload.problem,
-      resolution: sanitizeText(payload.resolution),
-      cost: payload.cost != null ? String(payload.cost) : null,
-      createdByUserId: performedByUserId
-    });
-
-    if (payload.markAsRepair ?? true) {
-      await tx
-        .update(assets)
-        .set({
-          status: 'IN_REPAIR',
-          dispositionStatus: 'WAITING_REPAIR',
-          updatedAt: new Date()
-        })
-        .where(and(eq(assets.id, assetId), eq(assets.organizationId, organizationId)));
-    }
-
-    const updatedAsset = await getAssetById(organizationId, assetId);
-
-    await insertMovement(tx, {
-      assetId,
-      organizationId,
-      eventType: 'REPAIR',
-      performedByUserId,
-      eventDate: asDate(payload.repairDate) ?? new Date(),
-      snapshotBefore: buildSnapshot(currentAsset),
-      snapshotAfter: buildSnapshot(updatedAsset),
-      metadata: {
-        vendor: payload.vendor ?? null,
-        problem: payload.problem,
-        resolution: payload.resolution ?? null,
-        cost: payload.cost ?? null
-      }
-    });
-  });
-}

src/app/api/assets/dashboard/summary/route.ts

@@ -1,65 +0,0 @@
-import { startOfMonth } from 'date-fns';
-import { NextResponse } from 'next/server';
-import { PERMISSIONS } from '@/lib/auth/rbac';
-import { AuthError } from '@/lib/auth/session';
-import {
-  getAssetMovements,
-  listAssetsForOrganization,
-  requireAssetAccess
-} from '../../_lib';
-
-export async function GET() {
-  try {
-    const { organization } = await requireAssetAccess(PERMISSIONS.assetRead);
-    const [result, movements] = await Promise.all([
-      listAssetsForOrganization(organization.id, {
-        page: 1,
-        limit: 10000
-      }),
-      getAssetMovements(organization.id)
-    ]);
-
-    const monthStart = startOfMonth(new Date());
-
-    const summary = result.assets.reduce(
-      (acc, asset) => {
-        acc.cards.totalAssets += 1;
-        if (asset.status === 'ASSIGNED') acc.cards.assignedAssets += 1;
-        if (asset.status === 'AVAILABLE') acc.cards.inStockAssets += 1;
-        if (!asset.currentEmployeeId) acc.cards.withoutUser += 1;
-        if (!asset.locationId) acc.cards.withoutLocation += 1;
-
-        return acc;
-      },
-      {
-        cards: {
-          totalAssets: 0,
-          assignedAssets: 0,
-          inStockAssets: 0,
-          transferThisMonth: 0,
-          withoutUser: 0,
-          withoutLocation: 0
-        }
-      }
-    );
-
-    summary.cards.transferThisMonth = movements.filter((movement) => {
-      return (
-        movement.eventType === 'TRANSFER' && new Date(movement.eventDate).getTime() >= monthStart.getTime()
-      );
-    }).length;
-
-    return NextResponse.json({
-      success: true,
-      time: new Date().toISOString(),
-      message: 'Asset dashboard summary loaded successfully',
-      ...summary
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    return NextResponse.json({ message: 'Unable to load dashboard summary' }, { status: 500 });
-  }
-}

src/app/api/assets/history/route.ts

@@ -1,24 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { PERMISSIONS } from '@/lib/auth/rbac';
-import { AuthError } from '@/lib/auth/session';
-import { getAssetMovements, requireAssetAccess } from '../_lib';
-
-export async function GET(_request: NextRequest) {
-  try {
-    const { organization } = await requireAssetAccess(PERMISSIONS.assetRead);
-    const movements = await getAssetMovements(organization.id);
-
-    return NextResponse.json({
-      success: true,
-      time: new Date().toISOString(),
-      message: 'Asset history loaded successfully',
-      movements
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    return NextResponse.json({ message: 'Unable to load asset history' }, { status: 500 });
-  }
-}

src/app/api/assets/options/route.ts

@@ -1,19 +0,0 @@
-import { NextResponse } from 'next/server';
-import { PERMISSIONS } from '@/lib/auth/rbac';
-import { AuthError } from '@/lib/auth/session';
-import { getAssetOptions, requireAssetAccess } from '../_lib';
-
-export async function GET() {
-  try {
-    const { organization } = await requireAssetAccess(PERMISSIONS.assetRead);
-    const response = await getAssetOptions(organization.id);
-
-    return NextResponse.json(response);
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    return NextResponse.json({ message: 'Unable to load asset options' }, { status: 500 });
-  }
-}

src/app/api/assets/route.ts

@@ -1,70 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import {
-  createAsset,
-  listAssetsForOrganization,
-  parseAssetPayload,
-  requireAssetAccess
-} from './_lib';
-import { AuthError } from '@/lib/auth/session';
-import { PERMISSIONS } from '@/lib/auth/rbac';
-
-export async function GET(request: NextRequest) {
-  try {
-    const { organization } = await requireAssetAccess(PERMISSIONS.assetRead);
-    const { searchParams } = request.nextUrl;
-
-    const result = await listAssetsForOrganization(organization.id, {
-      page: Number(searchParams.get('page') ?? 1),
-      limit: Number(searchParams.get('limit') ?? 10),
-      search: searchParams.get('search') ?? undefined,
-      status: searchParams.get('status') ?? undefined,
-      assetCondition: searchParams.get('assetCondition') ?? undefined,
-      dispositionStatus: searchParams.get('dispositionStatus') ?? undefined,
-      assetType: searchParams.get('assetType') ?? undefined,
-      sort: searchParams.get('sort') ?? undefined
-    });
-
-    return NextResponse.json({
-      success: true,
-      time: new Date().toISOString(),
-      message: 'Assets loaded successfully',
-      total_assets: result.total,
-      offset: result.offset,
-      limit: result.limit,
-      assets: result.assets
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    return NextResponse.json({ message: 'Unable to load assets' }, { status: 500 });
-  }
-}
-
-export async function POST(request: NextRequest) {
-  try {
-    const { organization, session } = await requireAssetAccess(PERMISSIONS.assetCreate);
-    const payload = parseAssetPayload(await request.json());
-    const id = await createAsset(organization.id, session.user.id, payload);
-
-    return NextResponse.json(
-      {
-        success: true,
-        message: 'Asset created successfully',
-        id
-      },
-      { status: 201 }
-    );
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    if (error instanceof Error) {
-      return NextResponse.json({ message: error.message }, { status: 400 });
-    }
-
-    return NextResponse.json({ message: 'Unable to create asset' }, { status: 500 });
-  }
-}

src/app/api/example/products/route.ts

@@ -1,79 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { exampleProducts } from '@/features/example-dashboard/data';
-
-function parseCategories(value: string | null) {
-  if (!value) return [];
-  return value
-    .split(/[.,]/)
-    .map((item) => item.trim())
-    .filter(Boolean);
-}
-
-function sortProducts(
-  items: typeof exampleProducts,
-  sort: string | null
-) {
-  const defaultSorted = items.toSorted((a, b) => a.name.localeCompare(b.name));
-
-  if (!sort) {
-    return defaultSorted;
-  }
-
-  try {
-    const parsed = JSON.parse(sort) as Array<{ id: keyof (typeof exampleProducts)[number]; desc: boolean }>;
-    const [primarySort] = parsed;
-
-    if (!primarySort?.id) {
-      return defaultSorted;
-    }
-
-    const sorted = items.toSorted((left, right) => {
-      const a = left[primarySort.id];
-      const b = right[primarySort.id];
-
-      if (typeof a === 'number' && typeof b === 'number') {
-        return a - b;
-      }
-
-      return String(a).localeCompare(String(b));
-    });
-
-    return primarySort.desc ? sorted.toReversed() : sorted;
-  } catch {
-    return defaultSorted;
-  }
-}
-
-export async function GET(request: NextRequest) {
-  const { searchParams } = request.nextUrl;
-  const page = Number(searchParams.get('page') ?? 1);
-  const limit = Number(searchParams.get('limit') ?? 10);
-  const categories = parseCategories(searchParams.get('categories'));
-  const search = searchParams.get('search')?.trim().toLowerCase();
-  const sort = searchParams.get('sort');
-
-  const filtered = exampleProducts.filter((product) => {
-    const matchesCategory = categories.length ? categories.includes(product.category) : true;
-    const matchesSearch = search
-      ? [product.name, product.description, product.category].some((value) =>
-          value.toLowerCase().includes(search)
-        )
-      : true;
-
-    return matchesCategory && matchesSearch;
-  });
-
-  const sorted = sortProducts(filtered, sort);
-  const offset = (page - 1) * limit;
-  const products = sorted.slice(offset, offset + limit);
-
-  return NextResponse.json({
-    success: true,
-    time: new Date().toISOString(),
-    message: 'Example products loaded successfully',
-    total_products: sorted.length,
-    offset,
-    limit,
-    products
-  });
-}

src/app/api/example/users/route.ts

@@ -1,86 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { exampleUsers } from '@/features/example-dashboard/data';
-
-function parseRoles(value: string | null) {
-  if (!value) return [];
-  return value
-    .split(/[.,]/)
-    .map((item) => item.trim())
-    .filter(Boolean);
-}
-
-function sortUsers(
-  items: typeof exampleUsers,
-  sort: string | null
-) {
-  const defaultSorted = items.toSorted((a, b) => a.name.localeCompare(b.name));
-
-  if (!sort) {
-    return defaultSorted;
-  }
-
-  try {
-    const parsed = JSON.parse(sort) as Array<{ id: string; desc: boolean }>;
-    const [primarySort] = parsed;
-
-    if (!primarySort?.id) {
-      return defaultSorted;
-    }
-
-    const sorted = items.toSorted((left, right) => {
-      const a =
-        primarySort.id === 'role'
-          ? `${left.systemRole}:${left.activeMembershipRole ?? ''}`
-          : primarySort.id === 'organizations'
-            ? left.organizations.map((organization) => organization.name).join(', ')
-            : left.name;
-      const b =
-        primarySort.id === 'role'
-          ? `${right.systemRole}:${right.activeMembershipRole ?? ''}`
-          : primarySort.id === 'organizations'
-            ? right.organizations.map((organization) => organization.name).join(', ')
-            : right.name;
-
-      return a.localeCompare(b);
-    });
-
-    return primarySort.desc ? sorted.toReversed() : sorted;
-  } catch {
-    return defaultSorted;
-  }
-}
-
-export async function GET(request: NextRequest) {
-  const { searchParams } = request.nextUrl;
-  const page = Number(searchParams.get('page') ?? 1);
-  const limit = Number(searchParams.get('limit') ?? 10);
-  const roles = parseRoles(searchParams.get('roles'));
-  const search = searchParams.get('search')?.trim().toLowerCase();
-  const sort = searchParams.get('sort');
-
-  const filtered = exampleUsers.filter((user) => {
-    const matchesSearch = search
-      ? [user.name, user.email].some((value) => value.toLowerCase().includes(search))
-      : true;
-    const matchesRole = roles.length
-      ? roles.includes(user.systemRole) ||
-        user.memberships.some((membership) => roles.includes(membership.membershipRole))
-      : true;
-
-    return matchesSearch && matchesRole;
-  });
-
-  const sorted = sortUsers(filtered, sort);
-  const offset = (page - 1) * limit;
-  const users = sorted.slice(offset, offset + limit);
-
-  return NextResponse.json({
-    success: true,
-    time: new Date().toISOString(),
-    message: 'Example users loaded successfully',
-    total_users: sorted.length,
-    offset,
-    limit,
-    users
-  });
-}

src/app/api/foundation/master-options/route.ts

@@ -0,0 +1,60 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { listMasterOptions } from '@/features/foundation/master-options/service';
+import { PERMISSIONS } from '@/lib/auth/rbac';
+import { AuthError, requireOrganizationAccess } from '@/lib/auth/session';
+
+export async function GET(request: NextRequest) {
+  try {
+    const { organization } = await requireOrganizationAccess({
+      permission: PERMISSIONS.organizationManage
+    });
+    const { searchParams } = request.nextUrl;
+    const page = Number(searchParams.get('page') ?? 1);
+    const limit = Number(searchParams.get('limit') ?? 10);
+    const search = searchParams.get('search') ?? undefined;
+    const category = searchParams.get('category') ?? undefined;
+    const sort = searchParams.get('sort') ?? undefined;
+    const result = await listMasterOptions({
+      organizationId: organization.id,
+      page,
+      limit,
+      search,
+      category,
+      sort
+    });
+    const offset = (page - 1) * limit;
+
+    return NextResponse.json({
+      success: true,
+      time: new Date().toISOString(),
+      message: 'Master options loaded successfully',
+      total_items: result.totalItems,
+      offset,
+      limit,
+      items: result.items.map((item) => ({
+        id: item.id,
+        organization_id: item.organizationId,
+        category: item.category,
+        code: item.code,
+        label: item.label,
+        value: item.value,
+        parent_id: item.parentId,
+        parent_label: item.parentLabel,
+        sort_order: item.sortOrder,
+        is_active: item.isActive,
+        deleted_at: item.deletedAt,
+        updated_at: item.updatedAt
+      }))
+    });
+  } catch (error) {
+    if (error instanceof AuthError) {
+      return NextResponse.json({ message: error.message }, { status: error.status });
+    }
+
+    if (error instanceof Error) {
+      return NextResponse.json({ message: error.message }, { status: 400 });
+    }
+
+    return NextResponse.json({ message: 'Unable to load master options' }, { status: 500 });
+  }
+}

src/app/api/master-data/[entity]/[id]/route.ts

@@ -1,58 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { AuthError } from '@/lib/auth/session';
-import {
-  assertMasterDataEntity,
-  deleteMasterData,
-  parseMasterDataPayload,
-  requireMasterDataAccess,
-  updateMasterData
-} from '../../_lib';
-
-type Params = { params: Promise<{ entity: string; id: string }> };
-
-export async function PUT(request: NextRequest, { params }: Params) {
-  try {
-    const { entity: rawEntity, id } = await params;
-    const entity = assertMasterDataEntity(rawEntity);
-    const { organization } = await requireMasterDataAccess();
-    const payload = parseMasterDataPayload(entity, await request.json());
-
-    await updateMasterData(entity, organization.id, id, payload);
-
-    return NextResponse.json({
-      success: true,
-      message: `${entity} updated successfully`
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    if (error instanceof Error) {
-      return NextResponse.json({ message: error.message }, { status: 400 });
-    }
-
-    return NextResponse.json({ message: 'Unable to update master data' }, { status: 500 });
-  }
-}
-
-export async function DELETE(_request: NextRequest, { params }: Params) {
-  try {
-    const { entity: rawEntity, id } = await params;
-    const entity = assertMasterDataEntity(rawEntity);
-    const { organization } = await requireMasterDataAccess();
-
-    await deleteMasterData(entity, organization.id, id);
-
-    return NextResponse.json({
-      success: true,
-      message: `${entity} deleted successfully`
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    return NextResponse.json({ message: 'Unable to delete master data' }, { status: 500 });
-  }
-}

src/app/api/master-data/[entity]/route.ts

@@ -1,62 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { AuthError } from '@/lib/auth/session';
-import {
-  assertMasterDataEntity,
-  createMasterData,
-  listMasterData,
-  parseMasterDataPayload,
-  requireMasterDataAccess
-} from '../_lib';
-
-type Params = { params: Promise<{ entity: string }> };
-
-export async function GET(_request: NextRequest, { params }: Params) {
-  try {
-    const { entity: rawEntity } = await params;
-    const entity = assertMasterDataEntity(rawEntity);
-    const { organization } = await requireMasterDataAccess();
-    const items = await listMasterData(entity, organization.id);
-
-    return NextResponse.json({
-      success: true,
-      time: new Date().toISOString(),
-      message: `${entity} loaded successfully`,
-      items
-    });
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    return NextResponse.json({ message: 'Unable to load master data' }, { status: 500 });
-  }
-}
-
-export async function POST(request: NextRequest, { params }: Params) {
-  try {
-    const { entity: rawEntity } = await params;
-    const entity = assertMasterDataEntity(rawEntity);
-    const { organization } = await requireMasterDataAccess();
-    const payload = parseMasterDataPayload(entity, await request.json());
-    const id = await createMasterData(entity, organization.id, payload);
-
-    return NextResponse.json(
-      {
-        success: true,
-        message: `${entity} created successfully`,
-        id
-      },
-      { status: 201 }
-    );
-  } catch (error) {
-    if (error instanceof AuthError) {
-      return NextResponse.json({ message: error.message }, { status: error.status });
-    }
-
-    if (error instanceof Error) {
-      return NextResponse.json({ message: error.message }, { status: 400 });
-    }
-
-    return NextResponse.json({ message: 'Unable to create master data' }, { status: 500 });
-  }
-}

src/app/api/master-data/_lib.ts

@@ -1,275 +0,0 @@
-import { and, eq } from 'drizzle-orm';
-import { z } from 'zod';
-import { departments, employees, locations, sites } from '@/db/schema';
-import { PERMISSIONS } from '@/lib/auth/rbac';
-import { requireOrganizationAccess } from '@/lib/auth/session';
-import { db } from '@/lib/db';
-import type {
-  Department,
-  Employee,
-  Location,
-  MasterDataEntity,
-  MasterDataMutationPayload,
-  Site
-} from '@/features/assets/api/types';
-
-const masterDataEntities = ['sites', 'departments', 'locations', 'employees'] as const;
-
-const entitySchemaMap = {
-  sites: z.object({
-    code: z.string().min(1),
-    name: z.string().min(1)
-  }),
-  departments: z.object({
-    code: z.string().min(1),
-    name: z.string().min(1)
-  }),
-  locations: z.object({
-    name: z.string().min(1),
-    siteId: z.string().optional().nullable(),
-    building: z.string().optional(),
-    floor: z.string().optional(),
-    area: z.string().optional()
-  }),
-  employees: z.object({
-    employeeNo: z.string().min(1),
-    name: z.string().min(1),
-    departmentId: z.string().optional().nullable(),
-    siteId: z.string().optional().nullable(),
-    status: z.string().default('active')
-  })
-} as const;
-
-export async function requireMasterDataAccess() {
-  return requireOrganizationAccess({ permission: PERMISSIONS.masterDataManage });
-}
-
-export function assertMasterDataEntity(entity: string): MasterDataEntity {
-  if ((masterDataEntities as readonly string[]).includes(entity)) {
-    return entity as MasterDataEntity;
-  }
-
-  throw new Error('Invalid master data entity');
-}
-
-export function parseMasterDataPayload(
-  entity: MasterDataEntity,
-  body: unknown
-): MasterDataMutationPayload {
-  const schema = entitySchemaMap[entity];
-  const parsed = schema.safeParse(body);
-
-  if (!parsed.success) {
-    throw new Error('Invalid master data payload');
-  }
-
-  return parsed.data;
-}
-
-export async function listMasterData(entity: MasterDataEntity, organizationId: string) {
-  switch (entity) {
-    case 'sites': {
-      const rows = await db.query.sites.findMany({
-        where: eq(sites.organizationId, organizationId)
-      });
-
-      return rows.map<Site>((row) => ({
-        id: row.id,
-        organizationId: row.organizationId,
-        code: row.code,
-        name: row.name
-      }));
-    }
-    case 'departments': {
-      const rows = await db.query.departments.findMany({
-        where: eq(departments.organizationId, organizationId)
-      });
-
-      return rows.map<Department>((row) => ({
-        id: row.id,
-        organizationId: row.organizationId,
-        code: row.code,
-        name: row.name
-      }));
-    }
-    case 'locations': {
-      const rows = await db
-        .select({
-          id: locations.id,
-          organizationId: locations.organizationId,
-          siteId: locations.siteId,
-          siteName: sites.name,
-          building: locations.building,
-          floor: locations.floor,
-          area: locations.area,
-          name: locations.name
-        })
-        .from(locations)
-        .leftJoin(sites, eq(sites.id, locations.siteId))
-        .where(eq(locations.organizationId, organizationId));
-
-      return rows.map<Location>((row) => ({
-        id: row.id,
-        organizationId: row.organizationId,
-        siteId: row.siteId,
-        siteName: row.siteName,
-        building: row.building,
-        floor: row.floor,
-        area: row.area,
-        name: row.name
-      }));
-    }
-    case 'employees': {
-      const rows = await db
-        .select({
-          id: employees.id,
-          organizationId: employees.organizationId,
-          employeeNo: employees.employeeNo,
-          name: employees.name,
-          departmentId: employees.departmentId,
-          departmentName: departments.name,
-          siteId: employees.siteId,
-          siteName: sites.name,
-          status: employees.status
-        })
-        .from(employees)
-        .leftJoin(departments, eq(departments.id, employees.departmentId))
-        .leftJoin(sites, eq(sites.id, employees.siteId))
-        .where(eq(employees.organizationId, organizationId));
-
-      return rows.map<Employee>((row) => ({
-        id: row.id,
-        organizationId: row.organizationId,
-        employeeNo: row.employeeNo,
-        name: row.name,
-        departmentId: row.departmentId,
-        departmentName: row.departmentName,
-        siteId: row.siteId,
-        siteName: row.siteName,
-        status: row.status
-      }));
-    }
-  }
-}
-
-export async function createMasterData(
-  entity: MasterDataEntity,
-  organizationId: string,
-  payload: MasterDataMutationPayload
-) {
-  const id = crypto.randomUUID();
-
-  switch (entity) {
-    case 'sites':
-      await db.insert(sites).values({
-        id,
-        organizationId,
-        code: payload.code!,
-        name: payload.name
-      });
-      break;
-    case 'departments':
-      await db.insert(departments).values({
-        id,
-        organizationId,
-        code: payload.code!,
-        name: payload.name
-      });
-      break;
-    case 'locations':
-      await db.insert(locations).values({
-        id,
-        organizationId,
-        siteId: payload.siteId ?? null,
-        building: payload.building ?? null,
-        floor: payload.floor ?? null,
-        area: payload.area ?? null,
-        name: payload.name
-      });
-      break;
-    case 'employees':
-      await db.insert(employees).values({
-        id,
-        organizationId,
-        employeeNo: payload.employeeNo!,
-        name: payload.name,
-        departmentId: payload.departmentId ?? null,
-        siteId: payload.siteId ?? null,
-        status: payload.status ?? 'active'
-      });
-      break;
-  }
-
-  return id;
-}
-
-export async function updateMasterData(
-  entity: MasterDataEntity,
-  organizationId: string,
-  id: string,
-  payload: MasterDataMutationPayload
-) {
-  switch (entity) {
-    case 'sites':
-      await db
-        .update(sites)
-        .set({ code: payload.code!, name: payload.name, updatedAt: new Date() })
-        .where(and(eq(sites.id, id), eq(sites.organizationId, organizationId)));
-      break;
-    case 'departments':
-      await db
-        .update(departments)
-        .set({ code: payload.code!, name: payload.name, updatedAt: new Date() })
-        .where(and(eq(departments.id, id), eq(departments.organizationId, organizationId)));
-      break;
-    case 'locations':
-      await db
-        .update(locations)
-        .set({
-          siteId: payload.siteId ?? null,
-          building: payload.building ?? null,
-          floor: payload.floor ?? null,
-          area: payload.area ?? null,
-          name: payload.name,
-          updatedAt: new Date()
-        })
-        .where(and(eq(locations.id, id), eq(locations.organizationId, organizationId)));
-      break;
-    case 'employees':
-      await db
-        .update(employees)
-        .set({
-          employeeNo: payload.employeeNo!,
-          name: payload.name,
-          departmentId: payload.departmentId ?? null,
-          siteId: payload.siteId ?? null,
-          status: payload.status ?? 'active',
-          updatedAt: new Date()
-        })
-        .where(and(eq(employees.id, id), eq(employees.organizationId, organizationId)));
-      break;
-  }
-}
-
-export async function deleteMasterData(entity: MasterDataEntity, organizationId: string, id: string) {
-  switch (entity) {
-    case 'sites':
-      await db.delete(sites).where(and(eq(sites.id, id), eq(sites.organizationId, organizationId)));
-      break;
-    case 'departments':
-      await db
-        .delete(departments)
-        .where(and(eq(departments.id, id), eq(departments.organizationId, organizationId)));
-      break;
-    case 'locations':
-      await db
-        .delete(locations)
-        .where(and(eq(locations.id, id), eq(locations.organizationId, organizationId)));
-      break;
-    case 'employees':
-      await db
-        .delete(employees)
-        .where(and(eq(employees.id, id), eq(employees.organizationId, organizationId)));
-      break;
-  }
-}

src/app/dashboard/crm/settings/master-options/page.tsx

@@ -1,21 +1,37 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
+import { auth } from '@/auth';
 import PageContainer from '@/components/layout/page-container';
-import { crmReferenceQueryOptions } from '@/features/crm/api/queries';
-import { MasterOptionsPage } from '@/features/crm/components/settings-page';
-import { getQueryClient } from '@/lib/query-client';
+import MasterOptionsListingPage from '@/features/foundation/master-options/components/master-options-listing';
+import { PERMISSIONS } from '@/lib/auth/rbac';
+import { searchParamsCache } from '@/lib/searchparams';
+import type { SearchParams } from 'nuqs/server';
 
-export default function MasterOptionsRoute() {
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(crmReferenceQueryOptions());
+type PageProps = {
+  searchParams: Promise<SearchParams>;
+};
+
+export default async function MasterOptionsRoute(props: PageProps) {
+  const searchParams = await props.searchParams;
+  const session = await auth();
+  const canManageOptions =
+    session?.user?.systemRole === 'super_admin' ||
+    (!!session?.user?.activeOrganizationId &&
+      (session.user.activeMembershipRole === 'admin' ||
+        session.user.activePermissions.includes(PERMISSIONS.organizationManage)));
+
+  searchParamsCache.parse(searchParams);
 
   return (
     <PageContainer
       pageTitle='Master Options'
-      pageDescription='Mock UI สำหรับ status options, product types, payment term, currency และ tax rate'
+      pageDescription='Organization-scoped CRM option registry for statuses, product types, payment terms, currency, and branch abstractions.'
+      access={canManageOptions}
+      accessFallback={
+        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
+          You do not have access to master option management.
+        </div>
+      }
     >
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        <MasterOptionsPage />
-      </HydrationBoundary>
+      <MasterOptionsListingPage />
     </PageContainer>
   );
 }

src/app/dashboard/elements/icons/page.tsx

@@ -1,9 +1,9 @@
 import IconsViewPage from '@/features/elements/components/icons-view-page';
 
 export const metadata = {
-  title: 'Example Dashboard: Icons'
+  title: 'Dashboard : Icons'
 };
 
-export default function ExampleIconsPage() {
+export default function page() {
   return <IconsViewPage />;
 }

src/app/dashboard/exclusive/page.tsx

@@ -19,8 +19,8 @@ export default async function ExclusivePage() {
             <AlertDescription>
               <div className='mb-1 text-lg font-semibold'>Pro Plan Required</div>
               <div className='text-muted-foreground'>
-                This page is only available to workspaces on the <span className='font-semibold'>Pro</span>{' '}
-                plan.
+                This page is only available to workspaces on the{' '}
+                <span className='font-semibold'>Pro</span> plan.
                 <br />
                 Upgrade your workspace later through the app-owned{' '}
                 <Link className='underline' href='/dashboard/billing'>

src/app/dashboard/layout.tsx

@@ -1,26 +1,37 @@
-import type { ReactNode } from 'react';
+import KBar from '@/components/kbar';
 import AppSidebar from '@/components/layout/app-sidebar';
 import Header from '@/components/layout/header';
 import { InfoSidebar } from '@/components/layout/info-sidebar';
-import KBar from '@/components/kbar';
 import { InfobarProvider } from '@/components/ui/infobar';
 import { SidebarInset, SidebarProvider } from '@/components/ui/sidebar';
+import type { Metadata } from 'next';
+import { cookies } from 'next/headers';
 
-export default function DashboardLayout({ children }: { children: ReactNode }) {
+export const metadata: Metadata = {
+  title: 'Next Shadcn Dashboard Starter',
+  description: 'Basic dashboard with Next.js and Shadcn',
+  robots: {
+    index: false,
+    follow: false
+  }
+};
+
+export default async function DashboardLayout({ children }: { children: React.ReactNode }) {
+  // Persisting the sidebar state in the cookie.
+  const cookieStore = await cookies();
+  const defaultOpen = cookieStore.get('sidebar_state')?.value === 'true';
   return (
     <KBar>
-      <InfobarProvider defaultOpen={false}>
-        <SidebarProvider defaultOpen>
-          <AppSidebar />
-          <SidebarInset>
-            <Header />
-            <div className='flex flex-1 overflow-hidden'>
-              <div className='flex min-w-0 flex-1 flex-col'>{children}</div>
-              <InfoSidebar side='right' />
-            </div>
-          </SidebarInset>
-        </SidebarProvider>
-      </InfobarProvider>
+      <SidebarProvider defaultOpen={defaultOpen}>
+        <AppSidebar />
+        <SidebarInset>
+          <Header />
+          <InfobarProvider defaultOpen={false}>
+            {children}
+            <InfoSidebar side='right' />
+          </InfobarProvider>
+        </SidebarInset>
+      </SidebarProvider>
     </KBar>
   );
 }

src/app/dashboard/page.tsx

@@ -1,5 +1,5 @@
-import { redirect } from 'next/navigation';
+import OverViewPage from '@/features/overview/components/overview';
 
-export default function DashboardIndexPage() {
-  redirect('/dashboard/crm');
+export default function DashboardPage() {
+  return <OverViewPage />;
 }

src/app/dashboard/product/page.tsx

@@ -0,0 +1,51 @@
+import { auth } from '@/auth';
+import PageContainer from '@/components/layout/page-container';
+import { buttonVariants } from '@/components/ui/button';
+import ProductListingPage from '@/features/products/components/product-listing';
+import { searchParamsCache } from '@/lib/searchparams';
+import { cn } from '@/lib/utils';
+import { Icons } from '@/components/icons';
+import Link from 'next/link';
+import { SearchParams } from 'nuqs/server';
+import { productInfoContent } from '@/config/infoconfig';
+
+export const metadata = {
+  title: 'Dashboard: Products'
+};
+
+type pageProps = {
+  searchParams: Promise<SearchParams>;
+};
+
+export default async function Page(props: pageProps) {
+  const searchParams = await props.searchParams;
+  const session = await auth();
+  const hasActiveOrganization = !!session?.user?.activeOrganizationId;
+  searchParamsCache.parse(searchParams);
+
+  return (
+    <PageContainer
+      pageTitle='Products'
+      pageDescription='Manage products (React Query + nuqs table pattern.)'
+      infoContent={productInfoContent}
+      access={hasActiveOrganization}
+      accessFallback={
+        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
+          Select an active workspace before managing products.
+        </div>
+      }
+      pageHeaderAction={
+        hasActiveOrganization ? (
+          <Link
+            href='/dashboard/product/new'
+            className={cn(buttonVariants(), 'text-xs md:text-sm')}
+          >
+            <Icons.add className='mr-2 h-4 w-4' /> Add New
+          </Link>
+        ) : null
+      }
+    >
+      <ProductListingPage canPrefetch={hasActiveOrganization} />
+    </PageContainer>
+  );
+}

src/app/dashboard/react-query/page.tsx

@@ -1,23 +1,27 @@
 import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { Suspense } from 'react';
-import PageContainer from '@/components/layout/page-container';
 import { getQueryClient } from '@/lib/query-client';
 import { pokemonOptions } from '@/features/react-query-demo/api/queries';
 import { PokemonInfo } from '@/features/react-query-demo/components/pokemon-info';
+import PageContainer from '@/components/layout/page-container';
+import { Suspense } from 'react';
 import { PokemonSkeleton } from '@/features/react-query-demo/components/pokemon-skeleton';
+import { reactQueryInfoContent } from '@/features/react-query-demo/info-content';
 
 export const metadata = {
-  title: 'Example Dashboard: React Query'
+  title: 'Dashboard: React Query'
 };
 
-export default function ExampleReactQueryPage() {
+export default function ReactQueryPage() {
   const queryClient = getQueryClient();
+
+  // Prefetch on the server — data is ready before client JS loads
   void queryClient.prefetchQuery(pokemonOptions(25));
 
   return (
     <PageContainer
       pageTitle='React Query'
-      pageDescription='Server prefetch + hydration + suspense query pattern in a public example route.'
+      pageDescription='Server prefetch + client hydration + suspense query pattern.'
+      infoContent={reactQueryInfoContent}
     >
       <HydrationBoundary state={dehydrate(queryClient)}>
         <Suspense fallback={<PokemonSkeleton />}>

src/app/dashboard/users/page.tsx

@@ -1,47 +1,44 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
+import { auth } from '@/auth';
 import PageContainer from '@/components/layout/page-container';
-import { getQueryClient } from '@/lib/query-client';
+import UserListingPage from '@/features/users/components/user-listing';
 import { searchParamsCache } from '@/lib/searchparams';
 import type { SearchParams } from 'nuqs/server';
-import { exampleUsersQueryOptions } from '@/features/example-dashboard/api';
-import { ExampleUserTable } from '@/features/example-dashboard/components/example-user-table';
+import { usersInfoContent } from '@/features/users/info-content';
+import { UserFormSheetTrigger } from '@/features/users/components/user-form-sheet';
+
+export const metadata = {
+  title: 'Dashboard: Users'
+};
 
 type PageProps = {
   searchParams: Promise<SearchParams>;
 };
 
-export const metadata = {
-  title: 'Example Dashboard: Users'
-};
-
-export default async function ExampleUsersPage(props: PageProps) {
+export default async function UsersPage(props: PageProps) {
   const searchParams = await props.searchParams;
+  const session = await auth();
+  const canManageUsers =
+    session?.user?.systemRole === 'super_admin' ||
+    (!!session?.user?.activeOrganizationId &&
+      (session.user.activeMembershipRole === 'admin' ||
+        session.user.activePermissions.includes('users:manage')));
+
   searchParamsCache.parse(searchParams);
 
-  const page = searchParamsCache.get('page');
-  const search = searchParamsCache.get('name');
-  const pageLimit = searchParamsCache.get('perPage');
-  const roles = searchParamsCache.get('role');
-  const sort = searchParamsCache.get('sort');
-  const filters = {
-    page,
-    limit: pageLimit,
-    ...(search && { search }),
-    ...(roles && { roles }),
-    ...(sort && { sort })
-  };
-
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(exampleUsersQueryOptions(filters));
-
   return (
     <PageContainer
       pageTitle='Users'
-      pageDescription='Public demo of the organization-aware user listing pattern without requiring auth.'
+      pageDescription='Manage users (React Query + nuqs table pattern.)'
+      infoContent={usersInfoContent}
+      access={canManageUsers}
+      accessFallback={
+        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
+          You do not have access to user management.
+        </div>
+      }
+      pageHeaderAction={canManageUsers ? <UserFormSheetTrigger /> : null}
     >
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        <ExampleUserTable />
-      </HydrationBoundary>
+      <UserListingPage />
     </PageContainer>
   );
 }

src/app/example/dashboard/assets/[assetId]/assign/page.tsx

@@ -1,30 +0,0 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import { assetByIdQueryOptions, assetOptionsQueryOptions } from '@/features/assets/api/queries';
-import { AssetActionForm } from '@/features/assets/components/asset-action-form';
-import { getQueryClient } from '@/lib/query-client';
-
-type PageProps = {
-  params: Promise<{ assetId: string }>;
-};
-
-export default async function AssetAssignPage({ params }: PageProps) {
-  const { assetId } = await params;
-  const session = await auth();
-  const canAssign =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('asset:assign');
-
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(assetByIdQueryOptions(assetId));
-  void queryClient.prefetchQuery(assetOptionsQueryOptions());
-
-  return (
-    <PageContainer pageTitle='Asset Assignment' pageDescription='Assign this asset to an employee.' access={!!canAssign}>
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        <AssetActionForm action='assign' assetId={assetId} />
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/[assetId]/edit/page.tsx

@@ -1,35 +0,0 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import { assetByIdQueryOptions, assetOptionsQueryOptions } from '@/features/assets/api/queries';
-import AssetForm from '@/features/assets/components/asset-form';
-import { getQueryClient } from '@/lib/query-client';
-
-type PageProps = {
-  params: Promise<{ assetId: string }>;
-};
-
-export default async function EditAssetPage({ params }: PageProps) {
-  const { assetId } = await params;
-  const session = await auth();
-  const canUpdate =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('asset:update');
-  const queryClient = getQueryClient();
-  const assetQuery = assetByIdQueryOptions(assetId);
-  void queryClient.prefetchQuery(assetQuery);
-  void queryClient.prefetchQuery(assetOptionsQueryOptions());
-  const assetData = await queryClient.ensureQueryData(assetQuery);
-
-  return (
-    <PageContainer
-      pageTitle='Edit Asset'
-      pageDescription='Update asset information.'
-      access={!!canUpdate}
-    >
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        <AssetForm initialData={assetData.asset} pageTitle='Edit Asset' />
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/[assetId]/page.tsx

@@ -1,32 +0,0 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import { assetByIdQueryOptions } from '@/features/assets/api/queries';
-import { AssetDetailView } from '@/features/assets/components/asset-detail-view';
-import { getQueryClient } from '@/lib/query-client';
-
-type PageProps = {
-  params: Promise<{ assetId: string }>;
-};
-
-export default async function AssetDetailPage({ params }: PageProps) {
-  const { assetId } = await params;
-  const session = await auth();
-  const canRead =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('asset:read');
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(assetByIdQueryOptions(assetId));
-
-  return (
-    <PageContainer
-      pageTitle='Asset Detail'
-      pageDescription='View asset details and history.'
-      access={!!canRead}
-    >
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        <AssetDetailView assetId={assetId} />
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/[assetId]/return/page.tsx

@@ -1,29 +0,0 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import { assetByIdQueryOptions } from '@/features/assets/api/queries';
-import { AssetActionForm } from '@/features/assets/components/asset-action-form';
-import { getQueryClient } from '@/lib/query-client';
-
-type PageProps = {
-  params: Promise<{ assetId: string }>;
-};
-
-export default async function AssetReturnPage({ params }: PageProps) {
-  const { assetId } = await params;
-  const session = await auth();
-  const canReturn =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('asset:return');
-
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(assetByIdQueryOptions(assetId));
-
-  return (
-    <PageContainer pageTitle='Asset Return' pageDescription='Return this asset back into available stock.' access={!!canReturn}>
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        <AssetActionForm action='return' assetId={assetId} />
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/[assetId]/transfer/page.tsx

@@ -1,30 +0,0 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import { assetByIdQueryOptions, assetOptionsQueryOptions } from '@/features/assets/api/queries';
-import { AssetActionForm } from '@/features/assets/components/asset-action-form';
-import { getQueryClient } from '@/lib/query-client';
-
-type PageProps = {
-  params: Promise<{ assetId: string }>;
-};
-
-export default async function AssetTransferPage({ params }: PageProps) {
-  const { assetId } = await params;
-  const session = await auth();
-  const canTransfer =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('asset:transfer');
-
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(assetByIdQueryOptions(assetId));
-  void queryClient.prefetchQuery(assetOptionsQueryOptions());
-
-  return (
-    <PageContainer pageTitle='Asset Transfer' pageDescription='Transfer this asset to another owner or location.' access={!!canTransfer}>
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        <AssetActionForm action='transfer' assetId={assetId} />
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/assign/page.tsx

@@ -1,54 +0,0 @@
-import { redirect } from 'next/navigation';
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import { assetByIdQueryOptions, assetOptionsQueryOptions } from '@/features/assets/api/queries';
-import { AssetActionForm } from '@/features/assets/components/asset-action-form';
-import { getQueryClient } from '@/lib/query-client';
-import type { SearchParams } from 'nuqs/server';
-
-type PageProps = {
-  searchParams: Promise<SearchParams>;
-};
-
-export default async function AssignAssetPage({ searchParams }: PageProps) {
-  const params = await searchParams;
-  const assetId = typeof params.assetId === 'string' ? params.assetId : '';
-
-  if (assetId) {
-    redirect(`/dashboard/assets/${assetId}/assign`);
-  }
-
-  const session = await auth();
-  const canAssign =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('asset:assign');
-
-  if (!assetId) {
-    return (
-      <PageContainer pageTitle='Assign Asset'>
-        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-          Select an asset to assign.
-        </div>
-      </PageContainer>
-    );
-  }
-
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(assetByIdQueryOptions(assetId));
-  void queryClient.prefetchQuery(assetOptionsQueryOptions());
-
-  return (
-    <PageContainer pageTitle='Assign Asset' pageDescription='Assign an asset to an employee.'>
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        {canAssign ? (
-          <AssetActionForm action='assign' assetId={assetId} />
-        ) : (
-          <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-            You do not have access to assign assets.
-          </div>
-        )}
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/history/page.tsx

@@ -1,27 +0,0 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import { assetHistoryQueryOptions } from '@/features/assets/api/queries';
-import { AssetHistoryView } from '@/features/assets/components/asset-history-view';
-import { getQueryClient } from '@/lib/query-client';
-
-export default async function AssetHistoryPage() {
-  const session = await auth();
-  const canRead =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('asset:read');
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(assetHistoryQueryOptions());
-
-  return (
-    <PageContainer
-      pageTitle='Asset History'
-      pageDescription='Track all asset lifecycle movements.'
-      access={!!canRead}
-    >
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        <AssetHistoryView />
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/new/page.tsx

@@ -1,40 +0,0 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import AssetForm from '@/features/assets/components/asset-form';
-import { assetOptionsQueryOptions } from '@/features/assets/api/queries';
-import { getQueryClient } from '@/lib/query-client';
-
-export const metadata = {
-  title: 'Dashboard: New Asset'
-};
-
-export default async function NewAssetPage() {
-  const session = await auth();
-  const hasActiveOrganization = !!session?.user?.activeOrganizationId;
-  const canCreate =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('asset:create');
-  const queryClient = getQueryClient();
-
-  if (canCreate && hasActiveOrganization) {
-    void queryClient.prefetchQuery(assetOptionsQueryOptions());
-  }
-
-  return (
-    <PageContainer
-      pageTitle='Create Asset'
-      pageDescription='Register a new IT asset.'
-      access={!!canCreate && hasActiveOrganization}
-      accessFallback={
-        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-          Select an active workspace with asset-create access before creating assets.
-        </div>
-      }
-    >
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        <AssetForm initialData={null} pageTitle='Create Asset' />
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/page.tsx

@@ -1,48 +0,0 @@
-import Link from 'next/link';
-import { SearchParams } from 'nuqs/server';
-import { auth } from '@/auth';
-import { Icons } from '@/components/icons';
-import PageContainer from '@/components/layout/page-container';
-import { buttonVariants } from '@/components/ui/button';
-import AssetListingPage from '@/features/assets/components/asset-listing';
-import { searchParamsCache } from '@/lib/searchparams';
-import { cn } from '@/lib/utils';
-
-export const metadata = {
-  title: 'Dashboard: Assets'
-};
-
-type PageProps = {
-  searchParams: Promise<SearchParams>;
-};
-
-export default async function AssetsPage(props: PageProps) {
-  const searchParams = await props.searchParams;
-  const session = await auth();
-  const canReadAssets =
-    session?.user?.systemRole === 'super_admin' || session?.user?.activePermissions.includes('asset:read');
-
-  searchParamsCache.parse(searchParams);
-
-  return (
-    <PageContainer
-      pageTitle='Asset List'
-      pageDescription='Canonical Phase 1 asset register with search, filters, sorting, and pagination.'
-      access={!!canReadAssets}
-      accessFallback={
-        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-          You do not have access to asset management.
-        </div>
-      }
-      pageHeaderAction={
-        session?.user?.activePermissions.includes('asset:create') || session?.user?.systemRole === 'super_admin' ? (
-          <Link href='/dashboard/assets/new' className={cn(buttonVariants(), 'text-xs md:text-sm')}>
-            <Icons.add className='mr-2 h-4 w-4' /> Add Asset
-          </Link>
-        ) : null
-      }
-    >
-      <AssetListingPage />
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/repair/page.tsx

@@ -1,48 +0,0 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import { assetByIdQueryOptions, assetOptionsQueryOptions } from '@/features/assets/api/queries';
-import { AssetActionForm } from '@/features/assets/components/asset-action-form';
-import { getQueryClient } from '@/lib/query-client';
-import type { SearchParams } from 'nuqs/server';
-
-type PageProps = {
-  searchParams: Promise<SearchParams>;
-};
-
-export default async function RepairAssetPage({ searchParams }: PageProps) {
-  const params = await searchParams;
-  const assetId = typeof params.assetId === 'string' ? params.assetId : '';
-  const session = await auth();
-  const canRepair =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('asset:repair');
-
-  if (!assetId) {
-    return (
-      <PageContainer pageTitle='Repair Asset'>
-        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-          Select an asset to repair.
-        </div>
-      </PageContainer>
-    );
-  }
-
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(assetByIdQueryOptions(assetId));
-  void queryClient.prefetchQuery(assetOptionsQueryOptions());
-
-  return (
-    <PageContainer pageTitle='Repair Asset' pageDescription='Record repair history for an asset.'>
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        {canRepair ? (
-          <AssetActionForm action='repair' assetId={assetId} />
-        ) : (
-          <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-            You do not have access to repair assets.
-          </div>
-        )}
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/return/page.tsx

@@ -1,54 +0,0 @@
-import { redirect } from 'next/navigation';
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import { assetByIdQueryOptions, assetOptionsQueryOptions } from '@/features/assets/api/queries';
-import { AssetActionForm } from '@/features/assets/components/asset-action-form';
-import { getQueryClient } from '@/lib/query-client';
-import type { SearchParams } from 'nuqs/server';
-
-type PageProps = {
-  searchParams: Promise<SearchParams>;
-};
-
-export default async function ReturnAssetPage({ searchParams }: PageProps) {
-  const params = await searchParams;
-  const assetId = typeof params.assetId === 'string' ? params.assetId : '';
-
-  if (assetId) {
-    redirect(`/dashboard/assets/${assetId}/return`);
-  }
-
-  const session = await auth();
-  const canReturn =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('asset:return');
-
-  if (!assetId) {
-    return (
-      <PageContainer pageTitle='Return Asset'>
-        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-          Select an asset to return.
-        </div>
-      </PageContainer>
-    );
-  }
-
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(assetByIdQueryOptions(assetId));
-  void queryClient.prefetchQuery(assetOptionsQueryOptions());
-
-  return (
-    <PageContainer pageTitle='Return Asset' pageDescription='Return an asset back to stock or retirement flow.'>
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        {canReturn ? (
-          <AssetActionForm action='return' assetId={assetId} />
-        ) : (
-          <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-            You do not have access to return assets.
-          </div>
-        )}
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/settings/[entity]/page.tsx

@@ -1,33 +0,0 @@
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import { MasterDataManager } from '@/features/assets/components/master-data-manager';
-import { masterDataLabels } from '@/features/assets/constants';
-import type { MasterDataEntity } from '@/features/assets/api/types';
-
-type PageProps = {
-  params: Promise<{ entity: string }>;
-};
-
-export default async function AssetSettingsEntityPage({ params }: PageProps) {
-  const { entity: rawEntity } = await params;
-  const entity = (['sites', 'departments', 'locations', 'employees'] as const).includes(
-    rawEntity as MasterDataEntity
-  )
-    ? (rawEntity as MasterDataEntity)
-    : 'sites';
-  const session = await auth();
-  const canManage =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('master_data:manage');
-  const title = masterDataLabels[entity] ?? 'Master Data';
-
-  return (
-    <PageContainer
-      pageTitle={title}
-      pageDescription={`Manage ${title.toLowerCase()} for the active company.`}
-      access={!!canManage}
-    >
-      <MasterDataManager entity={entity} />
-    </PageContainer>
-  );
-}

src/app/example/dashboard/assets/transfer/page.tsx

@@ -1,54 +0,0 @@
-import { redirect } from 'next/navigation';
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { auth } from '@/auth';
-import PageContainer from '@/components/layout/page-container';
-import { assetByIdQueryOptions, assetOptionsQueryOptions } from '@/features/assets/api/queries';
-import { AssetActionForm } from '@/features/assets/components/asset-action-form';
-import { getQueryClient } from '@/lib/query-client';
-import type { SearchParams } from 'nuqs/server';
-
-type PageProps = {
-  searchParams: Promise<SearchParams>;
-};
-
-export default async function TransferAssetPage({ searchParams }: PageProps) {
-  const params = await searchParams;
-  const assetId = typeof params.assetId === 'string' ? params.assetId : '';
-
-  if (assetId) {
-    redirect(`/dashboard/assets/${assetId}/transfer`);
-  }
-
-  const session = await auth();
-  const canTransfer =
-    session?.user?.systemRole === 'super_admin' ||
-    session?.user?.activePermissions.includes('asset:transfer');
-
-  if (!assetId) {
-    return (
-      <PageContainer pageTitle='Transfer Asset'>
-        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-          Select an asset to transfer.
-        </div>
-      </PageContainer>
-    );
-  }
-
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(assetByIdQueryOptions(assetId));
-  void queryClient.prefetchQuery(assetOptionsQueryOptions());
-
-  return (
-    <PageContainer pageTitle='Transfer Asset' pageDescription='Transfer an asset to a new owner or location.'>
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        {canTransfer ? (
-          <AssetActionForm action='transfer' assetId={assetId} />
-        ) : (
-          <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-            You do not have access to transfer assets.
-          </div>
-        )}
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/layout.tsx

@@ -1,14 +0,0 @@
-import { ExampleDashboardShell } from '@/features/example-dashboard/components/example-shell';
-
-export const metadata = {
-  title: 'Example Dashboard',
-  description: 'Public showcase routes for the template starter.'
-};
-
-export default function ExampleDashboardLayout({
-  children
-}: {
-  children: React.ReactNode;
-}) {
-  return <ExampleDashboardShell>{children}</ExampleDashboardShell>;
-}

src/app/example/dashboard/overview/page.tsx

@@ -1,9 +0,0 @@
-import OverViewPage from '@/features/overview/components/overview';
-
-export const metadata = {
-  title: 'Example Dashboard: Overview'
-};
-
-export default function ExampleOverviewPage() {
-  return <OverViewPage />;
-}

src/app/example/dashboard/page.tsx

@@ -1,5 +0,0 @@
-import { redirect } from 'next/navigation';
-
-export default function ExampleDashboardIndexPage() {
-  redirect('/example/dashboard/overview');
-}

src/app/example/dashboard/product/page.tsx

@@ -1,47 +0,0 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import PageContainer from '@/components/layout/page-container';
-import { getQueryClient } from '@/lib/query-client';
-import { searchParamsCache } from '@/lib/searchparams';
-import type { SearchParams } from 'nuqs/server';
-import { exampleProductsQueryOptions } from '@/features/example-dashboard/api';
-import { ExampleProductTable } from '@/features/example-dashboard/components/example-product-table';
-
-type PageProps = {
-  searchParams: Promise<SearchParams>;
-};
-
-export const metadata = {
-  title: 'Example Dashboard: Products'
-};
-
-export default async function ExampleProductsPage(props: PageProps) {
-  const searchParams = await props.searchParams;
-  searchParamsCache.parse(searchParams);
-
-  const page = searchParamsCache.get('page');
-  const search = searchParamsCache.get('name');
-  const pageLimit = searchParamsCache.get('perPage');
-  const categories = searchParamsCache.get('category');
-  const sort = searchParamsCache.get('sort');
-  const filters = {
-    page,
-    limit: pageLimit,
-    ...(search && { search }),
-    ...(categories && { categories }),
-    ...(sort && { sort })
-  };
-
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(exampleProductsQueryOptions(filters));
-
-  return (
-    <PageContainer
-      pageTitle='Products'
-      pageDescription='Public demo of the table + filter + React Query pattern used by the template.'
-    >
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        <ExampleProductTable />
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/users/page.tsx

@@ -1,47 +0,0 @@
-import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import PageContainer from '@/components/layout/page-container';
-import { getQueryClient } from '@/lib/query-client';
-import { searchParamsCache } from '@/lib/searchparams';
-import type { SearchParams } from 'nuqs/server';
-import { exampleUsersQueryOptions } from '@/features/example-dashboard/api';
-import { ExampleUserTable } from '@/features/example-dashboard/components/example-user-table';
-
-type PageProps = {
-  searchParams: Promise<SearchParams>;
-};
-
-export const metadata = {
-  title: 'Example Dashboard: Users'
-};
-
-export default async function ExampleUsersPage(props: PageProps) {
-  const searchParams = await props.searchParams;
-  searchParamsCache.parse(searchParams);
-
-  const page = searchParamsCache.get('page');
-  const search = searchParamsCache.get('name');
-  const pageLimit = searchParamsCache.get('perPage');
-  const roles = searchParamsCache.get('role');
-  const sort = searchParamsCache.get('sort');
-  const filters = {
-    page,
-    limit: pageLimit,
-    ...(search && { search }),
-    ...(roles && { roles }),
-    ...(sort && { sort })
-  };
-
-  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(exampleUsersQueryOptions(filters));
-
-  return (
-    <PageContainer
-      pageTitle='Users'
-      pageDescription='Public demo of the organization-aware user listing pattern without requiring auth.'
-    >
-      <HydrationBoundary state={dehydrate(queryClient)}>
-        <ExampleUserTable />
-      </HydrationBoundary>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/workspaces/page.tsx

@@ -1,194 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-import PageContainer from '@/components/layout/page-container';
-import { Button } from '@/components/ui/button';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
-import { Input } from '@/components/ui/input';
-import { workspacesInfoContent } from '@/config/infoconfig';
-import { useSession } from 'next-auth/react';
-import { useRouter } from 'next/navigation';
-import { toast } from 'sonner';
-
-type OrganizationSummary = {
-  id: string;
-  name: string;
-  slug: string;
-  plan: string;
-  imageUrl: string | null;
-  role: string;
-  canManageUsers: boolean;
-};
-
-export default function WorkspacesPage() {
-  const { data: session, status, update } = useSession();
-  const router = useRouter();
-  const [workspaceName, setWorkspaceName] = useState('');
-  const [isCreating, setIsCreating] = useState(false);
-  const [organizations, setOrganizations] = useState<OrganizationSummary[]>([]);
-  const [isLoadingOrganizations, setIsLoadingOrganizations] = useState(false);
-
-  const canManageOrganizations = session?.user?.systemRole === 'super_admin';
-
-  useEffect(() => {
-    if (!canManageOrganizations) {
-      setOrganizations([]);
-      return;
-    }
-
-    let cancelled = false;
-
-    async function loadOrganizations() {
-      setIsLoadingOrganizations(true);
-
-      try {
-        const response = await fetch('/api/organizations');
-        const data = (await response.json()) as {
-          organizations?: OrganizationSummary[];
-          message?: string;
-        };
-
-        if (!response.ok) {
-          throw new Error(data.message ?? 'Unable to load organizations');
-        }
-
-        if (!cancelled) {
-          setOrganizations(data.organizations ?? []);
-        }
-      } catch (error) {
-        if (!cancelled) {
-          toast.error(error instanceof Error ? error.message : 'Unable to load organizations');
-        }
-      } finally {
-        if (!cancelled) {
-          setIsLoadingOrganizations(false);
-        }
-      }
-    }
-
-    void loadOrganizations();
-
-    return () => {
-      cancelled = true;
-    };
-  }, [canManageOrganizations, session?.user?.activeOrganizationId]);
-
-  const createWorkspace = async () => {
-    if (!workspaceName.trim()) {
-      toast.error('Workspace name is required');
-      return;
-    }
-
-    setIsCreating(true);
-
-    try {
-      const response = await fetch('/api/organizations', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ name: workspaceName })
-      });
-
-      if (!response.ok) {
-        const data = (await response.json().catch(() => null)) as { message?: string } | null;
-        throw new Error(data?.message ?? 'Unable to create workspace');
-      }
-
-      setWorkspaceName('');
-      await update();
-      router.refresh();
-      toast.success('Workspace created');
-    } catch (error) {
-      toast.error(error instanceof Error ? error.message : 'Unable to create workspace');
-    } finally {
-      setIsCreating(false);
-    }
-  };
-
-  return (
-    <PageContainer
-      pageTitle='Workspaces'
-      pageDescription='Manage your app-owned workspaces and switch your active organization.'
-      infoContent={workspacesInfoContent}
-      isLoading={status === 'loading' || (canManageOrganizations && isLoadingOrganizations)}
-      access={canManageOrganizations}
-      accessFallback={
-        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-          Only super admins can manage workspaces.
-        </div>
-      }
-    >
-      <div className='grid gap-6 xl:grid-cols-[1.2fr_0.8fr]'>
-        <Card>
-          <CardHeader>
-            <CardTitle>Your workspaces</CardTitle>
-            <CardDescription>
-              The active workspace controls organization-scoped product data and access checks.
-            </CardDescription>
-          </CardHeader>
-          <CardContent className='space-y-3'>
-            {organizations.length ? (
-              organizations.map((organization) => {
-                const isActive = organization.id === session?.user?.activeOrganizationId;
-
-                return (
-                  <button
-                    key={organization.id}
-                    type='button'
-                    onClick={() => router.push('/dashboard/workspaces/team')}
-                    aria-label={`Open workspace ${organization.name}`}
-                    className={`w-full rounded-lg border p-4 text-left transition ${
-                      isActive ? 'border-primary bg-primary/5' : 'hover:bg-accent'
-                    }`}
-                  >
-                    <div className='flex items-center justify-between gap-4'>
-                      <div>
-                        <div className='font-semibold'>{organization.name}</div>
-                        <div className='text-muted-foreground text-sm'>
-                          Role: {organization.role} | Plan: {organization.plan}
-                        </div>
-                      </div>
-                      <div className='text-xs font-medium uppercase'>
-                        {isActive ? 'Active' : 'Open'}
-                      </div>
-                    </div>
-                  </button>
-                );
-              })
-            ) : (
-              <div className='text-muted-foreground rounded-lg border border-dashed p-6 text-sm'>
-                No workspace found yet. Create your first workspace to unlock organization-scoped
-                product management.
-              </div>
-            )}
-          </CardContent>
-        </Card>
-
-        <Card>
-          <CardHeader>
-            <CardTitle>Create workspace</CardTitle>
-            <CardDescription>
-              This flow is limited to super admins in the organization RBAC model.
-            </CardDescription>
-          </CardHeader>
-          <CardContent className='space-y-4'>
-            <div className='space-y-2'>
-              <label htmlFor='workspace-name' className='text-sm font-medium'>
-                Workspace name
-              </label>
-              <Input
-                id='workspace-name'
-                value={workspaceName}
-                onChange={(event) => setWorkspaceName(event.target.value)}
-                placeholder='Acme Studio'
-                disabled={isCreating}
-              />
-            </div>
-            <Button className='w-full' isLoading={isCreating} onClick={createWorkspace}>
-              Create workspace
-            </Button>
-          </CardContent>
-        </Card>
-      </div>
-    </PageContainer>
-  );
-}

src/app/example/dashboard/workspaces/team/[[...rest]]/page.tsx

@@ -1,55 +0,0 @@
-'use client';
-
-import PageContainer from '@/components/layout/page-container';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
-import { teamInfoContent } from '@/config/infoconfig';
-import { useSession } from 'next-auth/react';
-
-export default function TeamPage() {
-  const { data: session, status } = useSession();
-  const activeOrganization = session?.user?.organizations.find(
-    (organization) => organization.id === session?.user?.activeOrganizationId
-  );
-  const canManageTeam =
-    session?.user?.systemRole === 'super_admin' ||
-    (session?.user?.activeOrganizationId &&
-      (session.user.activeMembershipRole === 'admin' ||
-        session.user.activePermissions.includes('users:manage')));
-
-  return (
-    <PageContainer
-      pageTitle='Team Management'
-      pageDescription='App-owned team and role management is scaffolded here for the Auth.js migration.'
-      infoContent={teamInfoContent}
-      isLoading={status === 'loading'}
-      access={!!activeOrganization && !!canManageTeam}
-      accessFallback={
-        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center'>
-          Select a workspace where you are an admin to manage team settings.
-        </div>
-      }
-    >
-      <Card>
-        <CardHeader>
-          <CardTitle>{activeOrganization?.name}</CardTitle>
-          <CardDescription>
-            This placeholder keeps the route alive while the full membership CRUD flow is still
-            being migrated off Clerk Organizations.
-          </CardDescription>
-        </CardHeader>
-        <CardContent className='space-y-4 text-sm'>
-          <div className='rounded-lg border p-4'>
-            <div className='font-medium'>Current role</div>
-            <div className='text-muted-foreground mt-1'>
-              {session?.user?.activeMembershipRole ?? 'member'}
-            </div>
-          </div>
-          <div className='rounded-lg border border-dashed p-4 text-muted-foreground'>
-            Next iteration can add invites, membership edits, and permission management against the
-            `memberships` table introduced in this migration.
-          </div>
-        </CardContent>
-      </Card>
-    </PageContainer>
-  );
-}

src/app/layout.tsx

@@ -6,14 +6,13 @@ import ThemeProvider from '@/components/themes/theme-provider';
 import { cn } from '@/lib/utils';
 import type { Metadata, Viewport } from 'next';
 import { cookies } from 'next/headers';
-import Script from 'next/script';
 import NextTopLoader from 'nextjs-toploader';
 import { NuqsAdapter } from 'nuqs/adapters/next/app';
 import '../styles/globals.css';
 
 const META_THEME_COLORS = {
-  light: '#ffffff',
-  dark: '#09090b'
+  light: '#f9fbfa',
+  dark: '#001e2b'
 };
 
 export const metadata: Metadata = {
@@ -34,16 +33,18 @@ export default async function RootLayout({ children }: { children: React.ReactNo
   return (
     <html lang='en' suppressHydrationWarning data-theme={themeToApply}>
       <head>
-        <Script id='theme-color-init' strategy='beforeInteractive'>
-          {`
-            try {
-              // Keep the browser chrome color in sync before hydration.
-              if (localStorage.theme === 'dark' || ((!('theme' in localStorage) || localStorage.theme === 'system') && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
-                document.querySelector('meta[name="theme-color"]')?.setAttribute('content', '${META_THEME_COLORS.dark}')
-              }
-            } catch (_) {}
-          `}
-        </Script>
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `
+              try {
+                // Set meta theme color
+                if (localStorage.theme === 'dark' || ((!('theme' in localStorage) || localStorage.theme === 'system') && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
+                  document.querySelector('meta[name="theme-color"]')?.setAttribute('content', '${META_THEME_COLORS.dark}')
+                }
+              } catch (_) {}
+            `
+          }}
+        />
       </head>
       <body
         className={cn(

src/app/page.tsx

@@ -1,5 +1,12 @@
-import { redirect } from "next/navigation";
+import { auth } from '@/auth';
+import { redirect } from 'next/navigation';
 
-export default function Page() {
-  redirect("/dashboard");
+export default async function Page() {
+  const session = await auth();
+
+  if (!session?.user?.id) {
+    return redirect('/auth/sign-in');
+  } else {
+    redirect('/dashboard');
+  }
 }

src/app/setup/page.tsx

@@ -1,9 +0,0 @@
-import { SetupWizard } from '@/features/setup/components/setup-wizard';
-
-export const metadata = {
-  title: 'Setup Wizard'
-};
-
-export default function SetupPage() {
-  return <SetupWizard />;
-}