Revert package-lock.json to ensure ci (Nix build & cache) successful

Add Dockerfile, docker compose, and update Nix config for deployment

.direnv/bin/nix-direnv-reload

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+if [[ ! -d "/Users/ms/Development/personal/imphnen-frontend-service" ]]; then
+  echo "Cannot find source directory; Did you move it?"
+  echo "(Looking for "/Users/ms/Development/personal/imphnen-frontend-service")"
+  echo 'Cannot force reload with this script - use "direnv reload" manually and then try again'
+  exit 1
+fi
+
+# rebuild the cache forcefully
+_nix_direnv_force_reload=1 direnv exec "/Users/ms/Development/personal/imphnen-frontend-service" true
+
+# Update the mtime for .envrc.
+# This will cause direnv to reload again - but without re-building.
+touch "/Users/ms/Development/personal/imphnen-frontend-service/.envrc"
+
+# Also update the timestamp of whatever profile_rc we have.
+# This makes sure that we know we are up to date.
+touch -r "/Users/ms/Development/personal/imphnen-frontend-service/.envrc" "/Users/ms/Development/personal/imphnen-frontend-service/.direnv"/*.rc

.env.example

@@ -1,3 +0,0 @@
-
-VITE_SUPABASE_URL=https://your-project-id.supabase.co
-VITE_SUPABASE_ANON_KEY=your-anon-key-here

.envrc

@@ -0,0 +1 @@
+use flake

.github/workflows/deploy-backoffice.yml

@@ -1,44 +0,0 @@
-name: Deploy Backoffice
-
-on:
-  push:
-    branches:
-      - develop
-    paths:
-      - 'apps/backoffice/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY
-
-concurrency:
-  group: deploy-vps
-  cancel-in-progress: false
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Deploy via SSH
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          port: ${{ secrets.SSH_PORT }}
-          command_timeout: 30m
-          script: |
-            set -e
-            if [ ! -d ~/imphnen-frontend-service-backoffice ]; then
-              git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service-backoffice
-            else
-              cd ~/imphnen-frontend-service-backoffice && git fetch origin && git reset --hard origin/develop && git pull
-            fi
-            cat > ~/imphnen-frontend-service-backoffice/apps/backoffice/.env << EOF
-            VITE_API_URL=${{ secrets.VITE_API_URL }}
-            VITE_SUPABASE_URL=${{ secrets.VITE_SUPABASE_URL }}
-            VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
-            EOF
-            docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml down || true
-            DOCKER_BUILDKIT=1 docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml build --progress=plain
-            docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml up -d
-            docker image prune -af

.github/workflows/deploy-dimentorin.yml

@@ -1,44 +0,0 @@
-name: Deploy Dimentorin
-
-on:
-  push:
-    branches:
-      - develop
-    paths:
-      - 'apps/dimentorin/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY
-
-concurrency:
-  group: deploy-vps
-  cancel-in-progress: false
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Deploy via SSH
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          port: ${{ secrets.SSH_PORT }}
-          command_timeout: 30m
-          script: |
-            set -e
-            if [ ! -d ~/imphnen-frontend-service-dimentorin ]; then
-              git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service-dimentorin
-            else
-              cd ~/imphnen-frontend-service-dimentorin && git fetch origin && git reset --hard origin/develop && git pull
-            fi
-            cat > ~/imphnen-frontend-service-dimentorin/apps/dimentorin/.env << EOF
-            VITE_API_URL=${{ secrets.VITE_API_URL }}
-            VITE_SUPABASE_URL=${{ secrets.VITE_SUPABASE_URL }}
-            VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
-            EOF
-            docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml down || true
-            DOCKER_BUILDKIT=1 docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml build --progress=plain
-            docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml up -d
-            docker image prune -af

.github/workflows/deploy-gacha.yml

@@ -1,44 +0,0 @@
-name: Deploy Gacha
-
-on:
-  push:
-    branches:
-      - develop
-    paths:
-      - 'apps/gacha/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY
-
-concurrency:
-  group: deploy-vps
-  cancel-in-progress: false
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Deploy via SSH
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          port: ${{ secrets.SSH_PORT }}
-          command_timeout: 30m
-          script: |
-            set -e
-            if [ ! -d ~/imphnen-frontend-service-gacha ]; then
-              git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service-gacha
-            else
-              cd ~/imphnen-frontend-service-gacha && git fetch origin && git reset --hard origin/develop && git pull
-            fi
-            cat > ~/imphnen-frontend-service-gacha/apps/gacha/.env << EOF
-            VITE_API_URL=${{ secrets.VITE_API_URL }}
-            VITE_SUPABASE_URL=${{ secrets.VITE_SUPABASE_URL }}
-            VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
-            EOF
-            docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml down || true
-            DOCKER_BUILDKIT=1 docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml build --progress=plain
-            docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml up -d
-            docker image prune -af

.github/workflows/deploy-hackathon.yml

@@ -1,45 +0,0 @@
-name: Deploy Hackathon
-
-on:
-  push:
-    branches:
-      - develop
-    paths:
-      - 'apps/hackathon/**' # Auto deploy when changes pushed to apps/hackathon
-
-concurrency:
-  group: deploy-vps
-  cancel-in-progress: false
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Deploy via SSH
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          port: ${{ secrets.SSH_PORT }}
-          command_timeout: 30m
-          script: |
-            set -e
-            if [ ! -d ~/imphnen-frontend-service-hackathon ]; then
-              git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service-hackathon
-            else
-              cd ~/imphnen-frontend-service-hackathon && git fetch origin && git reset --hard origin/develop && git pull
-            fi
-            cat > ~/imphnen-frontend-service-hackathon/.env.local << EOF
-            VITE_API_URL=${{ secrets.VITE_API_URL }}
-            VITE_SUPABASE_URL=${{ secrets.VITE_SUPABASE_URL }}
-            VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
-            EOF
-            docker compose -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml down || true
-            docker builder prune -af || true
-            DOCKER_BUILDKIT=1 docker compose --env-file ~/imphnen-frontend-service-hackathon/.env.local -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml build --progress=plain
-            docker compose -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml up -d
-            docker image prune -af

.github/workflows/deploy-landing.yml

@@ -1,44 +0,0 @@
-name: Deploy Landing
-
-on:
-  push:
-    branches:
-      - develop
-    paths:
-      - 'apps/landing/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY
-
-concurrency:
-  group: deploy-vps
-  cancel-in-progress: false
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Deploy via SSH
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          port: ${{ secrets.SSH_PORT }}
-          command_timeout: 30m
-          script: |
-            set -e
-            if [ ! -d ~/imphnen-frontend-service ]; then
-              git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service
-            else
-              cd ~/imphnen-frontend-service && git fetch origin && git reset --hard origin/develop && git pull
-            fi
-            cat > ~/imphnen-frontend-service/apps/landing/.env << EOF
-            NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }}
-            NEXT_PUBLIC_SUPABASE_URL=${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}
-            NEXT_PUBLIC_SUPABASE_ANON_KEY=${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}
-            EOF
-            docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml down || true
-            DOCKER_BUILDKIT=1 docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml build --progress=plain
-            docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml up -d
-            docker image prune -af

.github/workflows/nix-build.yml

@@ -0,0 +1,40 @@
+name: Nix Build & Cache
+
+on:
+  push:
+    branches: ['develop']
+  pull_request:
+    branches: ['develop']
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+
+      - name: Setup Cachix
+        uses: cachix/cachix-action@v15
+        with:
+          name: msdqn
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+
+      - name: Build all packages
+        run: |
+          nix build .#landing -o result-landing
+          nix build .#backoffice -o result-backoffice
+          nix build .#gacha -o result-gacha
+          nix build .#dimentorin -o result-dimentorin
+          nix build .#hackathon -o result-hackathon
+          nix build .#infra -o result-infra
+
+      - name: Show build outputs
+        run: |
+          echo "Landing: $(readlink result-landing)"
+          echo "Backoffice: $(readlink result-backoffice)"
+          echo "Gacha: $(readlink result-gacha)"
+          echo "Dimentorin: $(readlink result-dimentorin)"
+          echo "Hackathon: $(readlink result-hackathon)"
+          echo "Infra: $(readlink result-infra)"

README.md

@@ -10,6 +10,7 @@ This repository is a **monorepo** for all frontend services of IMPHNEN. The mono
 2. **Backoffice** - Application for <a href="https://gacha.imphnen.dev/" target="_blank">Internal Management Website</a>.
 3. **Dimentorin** - Application for <a href="https://dimentorin.imphnen.dev/" target="_blank">Mentoring Service</a>.
 4. **Landing Page** - Application for <a href="https://imphnen.dev/" target="_blank">Landing Page</a>.
+5. **QR Campaign** - Application for QR Campaign Management.
 
 ## How to install
 
@@ -54,6 +55,10 @@ Use the following commands to run in development mode:
   ```sh
   npm run landing:dev
   ```
+- **QR Campaign**:
+  ```sh
+  npm run qrcampaign:dev
+  ```
 
 ### Build
 
@@ -75,6 +80,10 @@ Use the following commands to build the applications:
   ```sh
   npm run landing:build
   ```
+- **QR Campaign**:
+  ```sh
+  npm run qrcampaign:build
+  ```
 
 ### Production
 
@@ -96,6 +105,10 @@ Use the following commands to run the applications in production mode:
   ```sh
   npm run landing:prod
   ```
+- **QR Campaign**:
+  ```sh
+  npm run qrcampaign:prod
+  ```
 
 ### Storybook
 

apps/backoffice/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" data-theme="light">
   <head>
     <meta charset="utf-8" />
     <title>Backoffice</title>

apps/backoffice/src/app/(protected)/hackathon-dashboard/page.tsx

@@ -1,7 +1,35 @@
 import { BackofficeWrapper } from '@imphnen-frontend-service/ui/organisms';
 import { FC, ReactElement } from 'react';
+import { useQuery } from '@tanstack/react-query';
+import {
+  getAdminUsers,
+  getAdminTeams,
+  getAdminSubmissions,
+} from '@imphnen-frontend-service/service';
 
 export const HackathonDashboardPage: FC = (): ReactElement => {
+  // Fetch total participants
+  const { data: usersData } = useQuery({
+    queryKey: ['admin-users-count'],
+    queryFn: () => getAdminUsers({ page: 1, per_page: 1 }),
+  });
+
+  // Fetch total teams
+  const { data: teamsData } = useQuery({
+    queryKey: ['admin-teams-count'],
+    queryFn: () => getAdminTeams({ page: 1, per_page: 1 }),
+  });
+
+  // Fetch total submissions
+  const { data: submissionsData } = useQuery({
+    queryKey: ['admin-submissions-count'],
+    queryFn: () => getAdminSubmissions({ page: 1, per_page: 1 }),
+  });
+
+  const totalParticipants = usersData?.meta?.total_data ?? '??';
+  const totalTeams = teamsData?.meta?.total_data ?? '??';
+  const totalSubmissions = submissionsData?.meta?.total_data ?? '??';
+
   return (
     <BackofficeWrapper title="IMPHNEN x Kolosal.ai Hackathon 2025">
       <h1 className="mb-8 text-p1 font-semibold text-neutral-700">Dashboard</h1>
@@ -10,18 +38,22 @@ export const HackathonDashboardPage: FC = (): ReactElement => {
         {/* Participant */}
         <div className="bg-white px-6 py-4 rounded-md shadow">
           <h3 className="text-primary-500 text-p2 font-semibold mb-2.5">
-            1261
+            {totalParticipants}
           </h3>
           <p className="text-neutral-400 text-p3">Total Participants</p>
         </div>
         {/* Team */}
         <div className="bg-white px-6 py-4 rounded-md shadow">
-          <h3 className="text-primary-500 text-p2 font-semibold mb-2.5">206</h3>
+          <h3 className="text-primary-500 text-p2 font-semibold mb-2.5">
+            {totalTeams}
+          </h3>
           <p className="text-neutral-400 text-p3">Total Teams</p>
         </div>
         {/* Project Submitted */}
         <div className="bg-white px-6 py-4 rounded-md shadow">
-          <h3 className="text-primary-500 text-p2 font-semibold mb-2.5">0</h3>
+          <h3 className="text-primary-500 text-p2 font-semibold mb-2.5">
+            {totalSubmissions}
+          </h3>
           <p className="text-neutral-400 text-p3">Total Project Submitted</p>
         </div>
       </section>

apps/backoffice/src/app/(protected)/hackathon-submissions/_components/submission-modal.tsx

@@ -0,0 +1,249 @@
+import { FC } from 'react';
+import { Button } from '@imphnen-frontend-service/ui/atoms';
+import {
+  CloseOutlined,
+  LinkOutlined,
+  ProjectOutlined,
+  FileImageOutlined,
+} from '@ant-design/icons';
+import { TAdminSubmissionItem } from '@imphnen-frontend-service/service';
+import { cn } from '@imphnen-frontend-service/utils';
+
+interface SubmissionModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  submission: TAdminSubmissionItem;
+}
+
+const SubmissionModal: FC<SubmissionModalProps> = ({
+  isOpen,
+  onClose,
+  submission,
+}) => {
+  if (!isOpen) return null;
+
+  const getStatusColor = (status: string) => {
+    switch (status) {
+      case 'submitted':
+        return 'bg-success-50 border-success-200 text-success-800';
+      case 'pending':
+        return 'bg-orange-50 border-orange-200 text-orange-800';
+      case 'approved':
+        return 'bg-blue-50 border-blue-200 text-blue-800';
+      case 'rejected':
+        return 'bg-error-50 border-error-200 text-error-800';
+      default:
+        return 'bg-neutral-50 border-neutral-200 text-neutral-800';
+    }
+  };
+
+  return (
+    <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4">
+      <div className="bg-white rounded-lg shadow-xl w-full max-w-3xl max-h-[90vh] overflow-y-auto">
+        {/* Header */}
+        <div className="flex items-center justify-between p-6 border-b border-neutral-200">
+          <div className="flex items-center gap-3">
+            <div className="w-10 h-10 rounded-full bg-success-100 flex items-center justify-center">
+              <ProjectOutlined className="text-success-600 text-lg" />
+            </div>
+            <div>
+              <h2 className="text-xl font-semibold text-neutral-900">
+                {submission.project_name}
+              </h2>
+              <p className="text-sm text-neutral-500">
+                Team ID: {submission.team_id} • Submitted{' '}
+                {new Date(submission.submitted_at).toLocaleDateString('en-US', {
+                  year: 'numeric',
+                  month: 'long',
+                  day: 'numeric',
+                })}
+              </p>
+            </div>
+          </div>
+          <button
+            onClick={onClose}
+            className="text-neutral-400 hover:text-neutral-600 transition-colors cursor-pointer"
+          >
+            <CloseOutlined className="text-xl" />
+          </button>
+        </div>
+
+        {/* Content */}
+        <div className="p-6 space-y-6">
+          {/* Submission Status */}
+          <div
+            className={cn(
+              'flex items-center gap-3 p-4 border rounded-lg',
+              getStatusColor(submission.status)
+            )}
+          >
+            <div
+              className={cn(
+                'w-3 h-3 rounded-full',
+                submission.status === 'submitted' && 'bg-success-500',
+                submission.status === 'pending' && 'bg-orange-500',
+                submission.status === 'approved' && 'bg-blue-500',
+                submission.status === 'rejected' && 'bg-error-500'
+              )}
+            ></div>
+            <div>
+              <p className="text-sm font-medium">
+                Status:{' '}
+                {submission.status.charAt(0).toUpperCase() +
+                  submission.status.slice(1)}
+              </p>
+              <p className="text-xs">Submitted by: {submission.submitted_by}</p>
+            </div>
+          </div>
+
+          {/* Project Description */}
+          <div>
+            <h3 className="text-sm font-medium text-neutral-700 mb-2">
+              Project Description
+            </h3>
+            <p className="text-sm text-neutral-600 leading-relaxed">
+              {submission.description}
+            </p>
+          </div>
+
+          {/* Project Links */}
+          <div className="space-y-3">
+            <h3 className="text-sm font-medium text-neutral-700">
+              Project Links
+            </h3>
+
+            {/* Repository URL */}
+            <div className="flex items-start gap-3 p-3 bg-neutral-50 rounded-lg">
+              <LinkOutlined className="text-primary-500 mt-1" />
+              <div className="flex-1 min-w-0">
+                <p className="text-xs font-medium text-neutral-600 mb-1">
+                  Repository
+                </p>
+                <a
+                  href={submission.repository_url}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="text-sm text-primary-600 hover:text-primary-700 hover:underline break-all"
+                >
+                  {submission.repository_url}
+                </a>
+              </div>
+            </div>
+
+            {/* Demo URL */}
+            {submission.demo_url && (
+              <div className="flex items-start gap-3 p-3 bg-neutral-50 rounded-lg">
+                <LinkOutlined className="text-primary-500 mt-1" />
+                <div className="flex-1 min-w-0">
+                  <p className="text-xs font-medium text-neutral-600 mb-1">
+                    Live Demo
+                  </p>
+                  <a
+                    href={submission.demo_url}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="text-sm text-primary-600 hover:text-primary-700 hover:underline break-all"
+                  >
+                    {submission.demo_url}
+                  </a>
+                </div>
+              </div>
+            )}
+
+            {/* Presentation URL */}
+            {submission.presentation_url && (
+              <div className="flex items-start gap-3 p-3 bg-neutral-50 rounded-lg">
+                <LinkOutlined className="text-primary-500 mt-1" />
+                <div className="flex-1 min-w-0">
+                  <p className="text-xs font-medium text-neutral-600 mb-1">
+                    Presentation
+                  </p>
+                  <a
+                    href={submission.presentation_url}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="text-sm text-primary-600 hover:text-primary-700 hover:underline break-all"
+                  >
+                    {submission.presentation_url}
+                  </a>
+                </div>
+              </div>
+            )}
+          </div>
+
+          {/* Screenshots */}
+          {submission.screenshots && submission.screenshots.length > 0 && (
+            <div className="space-y-3">
+              <h3 className="text-sm font-medium text-neutral-700 flex items-center gap-2">
+                <FileImageOutlined className="text-primary-500" />
+                Screenshots ({submission.screenshots.length})
+              </h3>
+              <div className="grid grid-cols-2 gap-3">
+                {submission.screenshots.map((screenshot, index) => (
+                  <a
+                    key={index}
+                    href={screenshot}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="block rounded-lg overflow-hidden border border-neutral-200 hover:border-primary-300 transition-colors"
+                  >
+                    <img
+                      src={screenshot}
+                      alt={`Screenshot ${index + 1}`}
+                      className="w-full h-40 object-cover"
+                    />
+                  </a>
+                ))}
+              </div>
+            </div>
+          )}
+
+          {/* Metadata */}
+          <div className="grid grid-cols-2 gap-4 pt-4 border-t border-neutral-200">
+            <div>
+              <p className="text-xs text-neutral-500 mb-1">Created</p>
+              <p className="text-sm text-neutral-900">
+                {new Date(submission.created_at).toLocaleDateString('en-US', {
+                  year: 'numeric',
+                  month: 'short',
+                  day: 'numeric',
+                  hour: '2-digit',
+                  minute: '2-digit',
+                })}
+              </p>
+            </div>
+            <div>
+              <p className="text-xs text-neutral-500 mb-1">Last Updated</p>
+              <p className="text-sm text-neutral-900">
+                {new Date(submission.updated_at).toLocaleDateString('en-US', {
+                  year: 'numeric',
+                  month: 'short',
+                  day: 'numeric',
+                  hour: '2-digit',
+                  minute: '2-digit',
+                })}
+              </p>
+            </div>
+          </div>
+        </div>
+
+        {/* Footer */}
+        <div className="flex items-center justify-end gap-3 p-6 border-t border-neutral-200 bg-neutral-50">
+          <Button variant="secondary" onClick={onClose}>
+            Close
+          </Button>
+          {/* <Button
+            variant="primary"
+            onClick={() => {
+              console.log('Edit submission:', submission.id);
+            }}
+          >
+            Edit Status
+          </Button> */}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default SubmissionModal;

apps/backoffice/src/app/(protected)/hackathon-submissions/page.tsx

@@ -1,128 +1,375 @@
-import { FC, ReactElement, useState } from 'react';
+import {
+  FC,
+  ReactElement,
+  useState,
+  useEffect,
+  useMemo,
+  useCallback,
+} from 'react';
+import SubmissionModal from './_components/submission-modal';
 import {
   BackofficeWrapper,
   DataTable,
 } from '@imphnen-frontend-service/ui/organisms';
-import {
+import { ColumnDef } from '@tanstack/react-table';
-  ColumnDef,
-  getCoreRowModel,
-  getPaginationRowModel,
-  PaginationState,
-  RowSelectionState,
-  useReactTable,
-} from '@tanstack/react-table';
 import { Button } from '@imphnen-frontend-service/ui/atoms';
 import { cn } from '@imphnen-frontend-service/utils';
-import { EditOutlined } from '@ant-design/icons';
+import {
+  SearchOutlined,
+  FilterOutlined,
+  LoadingOutlined,
+  EyeOutlined,
+} from '@ant-design/icons';
+import { useQuery } from '@tanstack/react-query';
+import {
+  getAdminSubmissions,
+  TAdminSubmissionItem,
+} from '@imphnen-frontend-service/service';
+import { useSearchParams } from 'react-router-dom';
 
-export const HackathonUsersPage: FC = (): ReactElement => {
+type SubmissionType = TAdminSubmissionItem;
-  const [rowSelection, setRowSelection] = useState<RowSelectionState>({});
+
-  const [pagination, setPagination] = useState<PaginationState>({
+export const HackathonSubmissionsPage: FC = (): ReactElement => {
-    pageIndex: 0,
+  const [searchParams, setSearchParams] = useSearchParams();
-    pageSize: 9,
+  const currentPage = Math.max(
+    1,
+    parseInt(searchParams.get('page') || '1', 10)
+  );
+  const searchQuery = searchParams.get('search') || '';
+  const perPage = parseInt(searchParams.get('per_page') || '10', 10);
+  const statusFilter = searchParams.get('status') || 'all';
+
+  const [showSubmissionModal, setShowSubmissionModal] = useState(false);
+  const [selectedSubmission, setSelectedSubmission] =
+    useState<SubmissionType | null>(null);
+  const [globalFilter, setGlobalFilter] = useState(searchQuery);
+
+  // Fetch submissions from API
+  const {
+    data: submissionsResponse,
+    isLoading,
+    isFetching,
+  } = useQuery({
+    queryKey: [
+      'admin-submissions',
+      currentPage,
+      perPage,
+      statusFilter,
+      searchQuery,
+    ],
+    queryFn: () =>
+      getAdminSubmissions({
+        page: currentPage,
+        per_page: perPage,
+        status: statusFilter !== 'all' ? statusFilter : undefined,
+        search: searchQuery || undefined,
+      }),
+    staleTime: 30000, // 30 seconds cache
+    gcTime: 5 * 60 * 1000, // 5 minutes
   });
 
-  const mockData: any[] = Array.from({ length: 90 }, (_, i) => ({
+  const totalData = submissionsResponse?.meta?.total_data || 0;
-    id: i + 1,
+  const totalPages = submissionsResponse?.meta?.total_page || 1;
-    project_name: `Project ${i + 1}`,
-    repository_url: `https://github.com/user/repo${i + 1}`,
-    demo_url: `https://demo.example.com/project${i + 1}`,
-    presentation_url: `https://slides.example.com/project${i + 1}`,
-  }));
 
-  type UserStatus = 'active' | 'inactive';
+  // Handle page change
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      const params = new URLSearchParams();
+      params.set('page', newPage.toString());
+      if (perPage !== 10) params.set('per_page', perPage.toString());
+      if (searchQuery) params.set('search', searchQuery);
+      if (statusFilter !== 'all') params.set('status', statusFilter);
+      setSearchParams(params);
+      window.scrollTo({ top: 0, behavior: 'smooth' });
+    },
+    [setSearchParams, perPage, searchQuery, statusFilter]
+  );
 
-  interface SubmissionType {
+  // Validate page number
-    id: number;
+  useEffect(() => {
-    project_name: string;
+    if (!isLoading && totalPages > 0 && currentPage > totalPages) {
-    repository_url: string;
+      setSearchParams({ page: totalPages.toString() });
-    demo_url: string;
+    }
-    presentation_url: string;
+  }, [currentPage, totalPages, setSearchParams, isLoading]);
-  }
 
-  const columns: ColumnDef<SubmissionType>[] = [
+  // Sync globalFilter with URL
-    {
+  useEffect(() => {
-      header: 'Project Name',
+    setGlobalFilter(searchQuery);
-      accessorKey: 'project_name',
+  }, [searchQuery]);
-    },
-    {
-      header: 'Repository URL',
-      accessorKey: 'repository_url',
-    },
-    {
-      header: 'Demo URL',
-      accessorKey: 'demo_url',
-    },
-    {
-      header: 'Presentation URL',
-      accessorKey: 'presentation_url',
-    },
-    {
-      header: 'Action',
-      meta: { cellClassName: cn('w-72') },
-      cell: ({ row }) => (
-        <Button
-          variant="primary"
-          size="sm"
-          className="flex items-center gap-2 w-max"
-          onClick={() => {
-            // View detail logic
-          }}
-        >
-          <EditOutlined className="text-base" /> View & Manage
-        </Button>
-      ),
-    },
-  ];
 
-  const table = useReactTable({
+  // Handle search
-    data: mockData,
+  const handleSearch = useCallback(() => {
-    columns,
+    const params = new URLSearchParams();
-    state: {
+    params.set('page', '1');
-      pagination,
+    if (perPage !== 10) params.set('per_page', perPage.toString());
-      rowSelection,
+    if (globalFilter.trim()) {
+      params.set('search', globalFilter.trim());
+    }
+    if (statusFilter !== 'all') params.set('status', statusFilter);
+    setSearchParams(params);
+  }, [globalFilter, setSearchParams, perPage, statusFilter]);
+
+  const handleSearchKeyPress = useCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === 'Enter') {
+        handleSearch();
+      }
     },
-    enableRowSelection: true,
+    [handleSearch]
-    onRowSelectionChange: setRowSelection,
+  );
-    getCoreRowModel: getCoreRowModel(),
+
-    getPaginationRowModel: getPaginationRowModel(),
+  // Handle per page change
-    onPaginationChange: setPagination,
+  const handlePerPageChange = useCallback(
-    pageCount: Math.ceil(mockData.length / pagination.pageSize),
+    (newPerPage: number) => {
-    manualPagination: false,
+      const params = new URLSearchParams();
-  });
+      params.set('page', '1');
+      params.set('per_page', newPerPage.toString());
+      if (searchQuery) params.set('search', searchQuery);
+      if (statusFilter !== 'all') params.set('status', statusFilter);
+      setSearchParams(params);
+    },
+    [setSearchParams, searchQuery, statusFilter]
+  );
+
+  // Handle status filter change
+  // const handleStatusFilterChange = useCallback(
+  //   (newStatus: string) => {
+  //     const params = new URLSearchParams();
+  //     params.set('page', '1');
+  //     if (perPage !== 10) params.set('per_page', perPage.toString());
+  //     if (searchQuery) params.set('search', searchQuery);
+  //     if (newStatus !== 'all') params.set('status', newStatus);
+  //     setSearchParams(params);
+  //   },
+  //   [setSearchParams, perPage, searchQuery]
+  // );
+
+  // Handle modal
+  const handleShowSubmissionModal = useCallback(
+    (submission: SubmissionType) => {
+      setSelectedSubmission(submission);
+      setShowSubmissionModal(true);
+    },
+    []
+  );
+
+  const handleCloseSubmissionModal = useCallback(() => {
+    setShowSubmissionModal(false);
+    setSelectedSubmission(null);
+  }, []);
+
+  // Get submissions data
+  const filteredData = useMemo(() => {
+    return submissionsResponse?.data || [];
+  }, [submissionsResponse]);
+
+  // Memoize columns
+  const columns: ColumnDef<SubmissionType>[] = useMemo(
+    () => [
+      {
+        accessorKey: 'project_name',
+        header: 'Project Name',
+        cell: ({ row }) => (
+          <span className="font-medium text-neutral-900">
+            {row.original.project_name}
+          </span>
+        ),
+        enableSorting: true,
+      },
+      {
+        accessorKey: 'team_id',
+        header: 'Team ID',
+        cell: ({ row }) => (
+          <span className="text-sm text-neutral-700 font-mono">
+            {row.original.team_id}
+          </span>
+        ),
+        enableSorting: false,
+      },
+      {
+        accessorKey: 'status',
+        header: 'Status',
+        cell: ({ row }) => {
+          const status = row.original.status;
+          return (
+            <span
+              className={cn(
+                'inline-flex items-center gap-1 px-2 py-1 rounded-2xl text-xs font-medium',
+                status === 'submitted'
+                  ? 'bg-success-100 text-success-800'
+                  : status === 'pending'
+                  ? 'bg-orange-100 text-orange-800'
+                  : 'bg-neutral-100 text-neutral-700'
+              )}
+            >
+              {status.charAt(0).toUpperCase() + status.slice(1)}
+            </span>
+          );
+        },
+        enableSorting: true,
+      },
+      {
+        accessorKey: 'submitted_at',
+        header: 'Submitted',
+        cell: ({ row }) => (
+          <span className="text-neutral-900 text-sm">
+            {new Date(row.original.submitted_at).toLocaleDateString('en-US', {
+              year: 'numeric',
+              month: 'short',
+              day: 'numeric',
+            })}
+          </span>
+        ),
+        enableSorting: true,
+        sortingFn: 'datetime',
+      },
+      {
+        id: 'actions',
+        header: 'Actions',
+        meta: { cellClassName: cn('w-48') },
+        cell: ({ row }) => (
+          <Button
+            variant="primary"
+            size="sm"
+            className="flex items-center gap-2 text-sm px-4 py-2"
+            onClick={() => handleShowSubmissionModal(row.original)}
+          >
+            <EyeOutlined className="text-sm" />
+            View
+          </Button>
+        ),
+        enableSorting: false,
+      },
+    ],
+    [handleShowSubmissionModal]
+  );
 
   return (
     <BackofficeWrapper title="IMPHNEN x Kolosal.ai Hackathon 2025">
       <h1 className="mb-8 text-p1 font-semibold text-neutral-700">
-        Project Submission
+        Project Submissions
       </h1>
-      {/* Filters and actions */}
       <section className="bg-white rounded-md shadow p-8 flex flex-col gap-6">
-        <div className="flex flex-wrap gap-3 items-center">
+        <div className="flex flex-wrap gap-3 items-center justify-between">
-          <input
+          <div className="flex flex-wrap gap-3 items-center">
-            type="text"
+            {/* Search bar */}
-            className="border border-neutral-200 rounded-md px-3 py-2 text-label1 w-full sm:w-64"
+            <div className="relative">
-            placeholder="Search name or email"
+              <SearchOutlined className="absolute left-3 top-1/2 transform -translate-y-1/2 text-neutral-400 text-sm" />
-          />
+              <input
-          <select className="border border-neutral-200 rounded-md px-3 py-2 text-label1 w-full sm:w-40">
+                type="text"
-            <option value="all">All Status</option>
+                className="border border-neutral-200 rounded-lg pl-10 pr-4 py-2.5 text-sm w-full sm:w-80 focus:border-primary-500 focus:outline-none"
-            <option value="active">Active</option>
+                placeholder="Search by project name..."
-            <option value="suspended">Suspended</option>
+                value={globalFilter}
-          </select>
+                onChange={(e) => setGlobalFilter(e.target.value)}
-          <select className="border border-neutral-200 rounded-md px-3 py-2 text-label1 w-full sm:w-40">
+                onKeyPress={handleSearchKeyPress}
-            <option value="all">All City</option>
+              />
-            <option value="jakarta">Jakarta</option>
+            </div>
-            <option value="bandung">Bandung</option>
+
-          </select>
+            {/* Per Page Dropdown */}
+            <div className="relative">
+              <select
+                className="border border-neutral-200 rounded-lg px-4 py-2.5 text-sm w-28 focus:border-primary-500 focus:outline-none appearance-none bg-white cursor-pointer"
+                value={perPage}
+                onChange={(e) =>
+                  handlePerPageChange(parseInt(e.target.value, 10))
+                }
+              >
+                <option value={10}>10 / page</option>
+                <option value={20}>20 / page</option>
+                <option value={50}>50 / page</option>
+                <option value={100}>100 / page</option>
+              </select>
+            </div>
+
+            {/* Status Filter */}
+            {/* <div className="relative">
+              <FilterOutlined className="absolute left-3 top-1/2 transform -translate-y-1/2 text-neutral-400 text-sm pointer-events-none z-10" />
+              <select
+                className="border border-neutral-200 rounded-lg pl-10 pr-10 py-2.5 text-sm w-full sm:w-40 focus:border-primary-500 focus:outline-none appearance-none bg-white cursor-pointer"
+                value={statusFilter}
+                onChange={(e) => handleStatusFilterChange(e.target.value)}
+              >
+                <option value="all">All Status</option>
+                <option value="submitted">Submitted</option>
+                <option value="pending">Pending</option>
+                <option value="approved">Approved</option>
+                <option value="rejected">Rejected</option>
+              </select>
+            </div> */}
+          </div>
         </div>
 
-        {/* Table */}
+        {/* Active filters */}
-        <DataTable data={mockData} columns={columns} table={table} />
+        {/* {statusFilter !== 'all' && (
+          <div className="flex flex-wrap gap-2 items-center">
+            <span className="text-sm text-neutral-600">Active filters:</span>
+            <span className="inline-flex items-center gap-1 px-2 py-1 bg-info-100 text-info-800 rounded-2xl text-sm">
+              Status: {statusFilter}
+              <button
+                onClick={() => handleStatusFilterChange('all')}
+                className="text-info-600 hover:text-info-800 cursor-pointer"
+              >
+                ✕
+              </button>
+            </span>
+            <Button
+              variant="secondary"
+              size="sm"
+              onClick={() => {
+                handleStatusFilterChange('all');
+                setGlobalFilter('');
+              }}
+              className="text-sm text-neutral-600"
+            >
+              Clear All
+            </Button>
+          </div>
+        )} */}
+
+        {/* Loading & results */}
+        {isLoading ? (
+          <div className="flex items-center justify-center py-12">
+            <LoadingOutlined className="text-3xl text-primary-500 animate-spin" />
+            <span className="ml-3 text-neutral-600">
+              Loading submissions...
+            </span>
+          </div>
+        ) : filteredData.length > 0 ? (
+          <>
+            <div className="text-sm text-neutral-600">
+              Showing {filteredData.length} of {totalData} submissions (Page{' '}
+              {currentPage} of {totalPages})
+              {isFetching && (
+                <span className="ml-2 text-primary-500">(Updating...)</span>
+              )}
+            </div>
+            <DataTable
+              data={filteredData}
+              columns={columns}
+              pageSize={perPage}
+              manualPagination={true}
+              pageCount={totalPages}
+              currentPage={currentPage}
+              onPageChange={handlePageChange}
+            />
+          </>
+        ) : (
+          <div className="text-center py-12 text-neutral-500">
+            No submissions found. Try adjusting your filters.
+          </div>
+        )}
       </section>
 
-      {/* Modals extracted into shared backoffice components */}
+      {/* Submission Modal */}
+      {selectedSubmission && (
+        <SubmissionModal
+          isOpen={showSubmissionModal}
+          onClose={handleCloseSubmissionModal}
+          submission={selectedSubmission}
+        />
+      )}
     </BackofficeWrapper>
   );
 };
 
-export default HackathonUsersPage;
+export default HackathonSubmissionsPage;

apps/backoffice/src/app/(protected)/hackathon-teams/_components/modal-team-detail-new.tsx

@@ -1,63 +1,24 @@
 import { FC, useState, useEffect, useMemo, useRef } from 'react';
 import { Button } from '@imphnen-frontend-service/ui/atoms';
-import { cn } from '@imphnen-frontend-service/utils';
-import TeamBannerPlaceholder from './team-banner-placeholder';
 import { CityFilterSelect } from '../../../../components/city-filter-select';
+import TeamBannerPlaceholder from './team-banner-placeholder';
+import { cn } from '@imphnen-frontend-service/utils';
+import { TAdminTeamItem } from '@imphnen-frontend-service/service';
 import {
   TeamOutlined,
-  CalendarOutlined,
-  SaveOutlined,
   CloseOutlined,
-  ExclamationOutlined,
-  UserOutlined,
   DeleteOutlined,
+  SaveOutlined,
+  CalendarOutlined,
+  CrownOutlined,
+  ExclamationOutlined,
+  UploadOutlined,
+  CameraOutlined,
   EyeOutlined,
   EyeInvisibleOutlined,
-  CrownOutlined,
-  CheckCircleOutlined,
-  ClockCircleOutlined,
-  CloseCircleOutlined,
-  CameraOutlined,
-  UploadOutlined,
 } from '@ant-design/icons';
 
-interface TeamMember {
+type TeamType = TAdminTeamItem;
-  id: string;
-  joined_at: string;
-  role: 'leader' | 'member';
-  status: 'pending' | 'accepted' | 'rejected';
-  team_id: string;
-  user: {
-    avatar?: string;
-    bio?: string;
-    created_at: string;
-    email: string;
-    fullname: string;
-    id: string;
-    is_active: boolean;
-    location: string;
-    phone_number?: string;
-    skills: string[];
-    updated_at: string;
-  };
-  user_id: string;
-}
-
-interface TeamType {
-  id: string;
-  name: string;
-  description?: string;
-  city: string;
-  banner?: string;
-  logo?: string;
-  visibility: 'public' | 'private';
-  member_count: number;
-  has_submission: boolean;
-  created_at: string;
-  updated_at: string;
-  leader_id: string;
-  members: TeamMember[];
-}
 
 interface ModalProps {
   isOpen: boolean;
@@ -68,7 +29,6 @@ interface ModalProps {
 const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
   const [formData, setFormData] = useState<TeamType | null>(null);
   const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
-  const [activeTab, setActiveTab] = useState<'details' | 'members'>('details');
   const [showLogoMenu, setShowLogoMenu] = useState(false);
   const logoInputRef = useRef<HTMLInputElement>(null);
   const bannerInputRef = useRef<HTMLInputElement>(null);
@@ -77,24 +37,19 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
   useEffect(() => {
     if (isOpen) {
       if (team) {
-        // Edit existing team
         setFormData({ ...team });
       } else {
-        // Create new team
         setFormData({
-          id: '', // Will be generated by backend
+          id: '',
           name: '',
           description: '',
           city: '',
-          banner: undefined,
+          banner: null,
-          logo: undefined,
+          logo: null,
           visibility: 'public',
-          member_count: 1,
-          has_submission: false,
           created_at: new Date().toISOString(),
           updated_at: new Date().toISOString(),
           leader_id: '',
-          members: [],
         });
       }
     }
@@ -102,8 +57,7 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
 
   // Check if form has changes
   const hasChanges = useMemo(() => {
-    if (!formData) return false;
+    if (!formData || !team) return !!formData;
-    if (!team) return true; // New team always has changes
     return (
       formData.name !== team.name ||
       formData.description !== team.description ||
@@ -117,37 +71,28 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
   // Check if required fields are filled
   const isFormValid = useMemo(() => {
     if (!formData) return false;
-    return formData.name.trim() !== '' && formData.city.trim() !== '';
+    return (
+      formData.name.trim() !== '' &&
+      formData.city.trim() !== '' &&
+      formData.description.trim() !== ''
+    );
   }, [formData]);
 
   const canSave = hasChanges && isFormValid;
 
-  // Get leader and other members
-  const leader = team?.members.find((m) => m.role === 'leader');
-  const acceptedMembers =
-    team?.members.filter((m) => m.status === 'accepted') || [];
-  const pendingMembers =
-    team?.members.filter((m) => m.status === 'pending') || [];
-
   if (!isOpen || !formData) return null;
 
-  const handleInputChange = (
+  const handleInputChange = (field: keyof TeamType, value: string | null) => {
-    field: keyof TeamType,
-    value: string | boolean | 'public' | 'private' | undefined
-  ) => {
     setFormData((prev) => (prev ? { ...prev, [field]: value } : null));
   };
 
   const handleSave = () => {
-    if (!formData) return;
-
     console.log('Saving team:', formData);
     onClose();
   };
 
   const handleDelete = () => {
     if (!team) return;
-
     console.log('Deleting team:', team.id);
     setShowDeleteConfirm(false);
     onClose();
@@ -155,56 +100,45 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
 
   const handleLogoUpload = (event: React.ChangeEvent<HTMLInputElement>) => {
     const file = event.target.files?.[0];
-    if (file) {
+    if (!file) return;
-      if (!file.type.startsWith('image/')) {
+
-        alert('Please select an image file');
+    if (!file.type.startsWith('image/')) {
-        return;
+      alert('Please select an image file');
-      }
+      return;
-      if (file.size > 5 * 1024 * 1024) {
-        alert('Image size must be less than 5MB');
-        return;
-      }
-      const reader = new FileReader();
-      reader.onload = (e) => {
-        const logoUrl = e.target?.result as string;
-        handleInputChange('logo', logoUrl);
-        setShowLogoMenu(false);
-      };
-      reader.readAsDataURL(file);
     }
+    if (file.size > 5 * 1024 * 1024) {
+      alert('Image size must be less than 5MB');
+      return;
+    }
+
+    const reader = new FileReader();
+    reader.onload = (e) => {
+      const logoUrl = e.target?.result as string;
+      handleInputChange('logo', logoUrl);
+      setShowLogoMenu(false);
+    };
+    reader.readAsDataURL(file);
   };
 
   const handleBannerUpload = (event: React.ChangeEvent<HTMLInputElement>) => {
     const file = event.target.files?.[0];
-    if (file) {
+    if (!file) return;
-      if (!file.type.startsWith('image/')) {
+
-        alert('Please select an image file');
+    if (!file.type.startsWith('image/')) {
-        return;
+      alert('Please select an image file');
-      }
+      return;
-      if (file.size > 5 * 1024 * 1024) {
+    }
-        alert('Image size must be less than 5MB');
+    if (file.size > 5 * 1024 * 1024) {
-        return;
+      alert('Image size must be less than 5MB');
-      }
+      return;
-      const reader = new FileReader();
-      reader.onload = (e) => {
-        const bannerUrl = e.target?.result as string;
-        handleInputChange('banner', bannerUrl);
-      };
-      reader.readAsDataURL(file);
     }
-  };
 
-  const handleRemoveLogo = () => {
+    const reader = new FileReader();
-    handleInputChange('logo', undefined);
+    reader.onload = (e) => {
-    setShowLogoMenu(false);
+      const bannerUrl = e.target?.result as string;
-  };
+      handleInputChange('banner', bannerUrl);
-
+    };
-  const handleRemoveBanner = () => {
+    reader.readAsDataURL(file);
-    handleInputChange('banner', undefined);
-  };
-
-  const triggerLogoUpload = () => {
-    logoInputRef.current?.click();
   };
 
   return (
@@ -240,7 +174,6 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
 
         {/* Content */}
         <div className="p-6 space-y-6" onClick={() => setShowLogoMenu(false)}>
-          {/* Hidden File Inputs */}
           <input
             type="file"
             ref={logoInputRef}
@@ -256,21 +189,20 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
             className="hidden"
           />
 
-          {/* Interactive Banner Section */}
+          {/* Banner Section */}
           <div className="space-y-2">
             <label className="block text-sm font-medium text-neutral-700">
-              Team Banner
+              Team Banner{' '}
-              <span className="text-xs text-neutral-500 ml-2">
+              <span className="text-xs text-neutral-500">
                 (3:1 aspect ratio recommended)
               </span>
             </label>
             <div className="relative group">
               <TeamBannerPlaceholder
-                banner={formData.banner}
+                banner={formData.banner || undefined}
                 teamName={formData.name || 'Team Name'}
                 className="rounded-lg border border-neutral-200 transition-all group-hover:border-primary-300"
               />
-              {/* Banner Action Buttons */}
               <div className="absolute inset-0 bg-black/40 rounded-lg opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-3">
                 <Button
                   variant="primary"
@@ -290,21 +222,20 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
                     size="sm"
                     onClick={(e) => {
                       e.stopPropagation();
-                      handleRemoveBanner();
+                      handleInputChange('banner', null);
                     }}
                     className="bg-white/90 hover:bg-white text-red-600 border-transparent shadow-sm hover:text-red-700 gap-2"
                   >
                     <DeleteOutlined className="text-sm" />
-                    Delete Banner
+                    Delete
                   </Button>
                 )}
               </div>
             </div>
           </div>
 
-          {/* Team Logo & Name Row */}
+          {/* Logo & Name */}
           <div className="grid grid-cols-12 gap-4 items-start">
-            {/* Interactive Team Logo */}
             <div className="col-span-2">
               <label className="block text-sm font-medium text-neutral-700 mb-2">
                 Logo
@@ -321,7 +252,6 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
                     <TeamOutlined className="text-neutral-400 text-xl" />
                   )}
                 </div>
-                {/* Logo Hover Overlay - Full circle */}
                 <button
                   onClick={(e) => {
                     e.stopPropagation();
@@ -331,14 +261,12 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
                 >
                   <CameraOutlined className="text-white text-lg" />
                 </button>
-
-                {/* Logo Menu Dropdown */}
                 {showLogoMenu && (
                   <div className="absolute top-full left-0 mt-2 bg-white rounded-lg shadow-lg border border-neutral-200 py-2 min-w-[140px] z-10">
                     <button
                       onClick={(e) => {
                         e.stopPropagation();
-                        triggerLogoUpload();
+                        logoInputRef.current?.click();
                       }}
                       className="w-full px-4 py-2 text-left text-sm text-neutral-700 hover:bg-neutral-50 flex items-center gap-2 cursor-pointer"
                     >
@@ -349,7 +277,8 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
                       <button
                         onClick={(e) => {
                           e.stopPropagation();
-                          handleRemoveLogo();
+                          handleInputChange('logo', null);
+                          setShowLogoMenu(false);
                         }}
                         className="w-full px-4 py-2 text-left text-sm text-red-600 hover:bg-red-50 flex items-center gap-2 cursor-pointer"
                       >
@@ -362,7 +291,6 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
               </div>
             </div>
 
-            {/* Team Name */}
             <div className="col-span-10 space-y-2">
               <label className="block text-sm font-medium text-neutral-700">
                 Team Name <span className="text-danger-500">*</span>
@@ -374,22 +302,19 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
                 value={formData.name}
                 onChange={(e) => handleInputChange('name', e.target.value)}
               />
-              <p className="text-xs text-neutral-500">
-                Click logo to upload or change team logo (circular format)
-              </p>
             </div>
           </div>
 
-          {/* Team Description */}
+          {/* Description */}
           <div className="space-y-2">
             <label className="block text-sm font-medium text-neutral-700">
-              Description
+              Description <span className="text-danger-500">*</span>
             </label>
             <textarea
               className="w-full border border-neutral-200 rounded-lg px-3 py-2 text-sm focus:border-primary-500 focus:outline-none resize-none"
-              placeholder="Enter team description (optional)"
+              placeholder="Enter team description"
               rows={3}
-              value={formData.description || ''}
+              value={formData.description}
               onChange={(e) => handleInputChange('description', e.target.value)}
             />
           </div>
@@ -424,7 +349,7 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
                   value="public"
                   checked={formData.visibility === 'public'}
                   onChange={(e) =>
-                    handleInputChange('visibility', e.target.value as 'public')
+                    handleInputChange('visibility', e.target.value)
                   }
                   className="text-primary-600"
                 />
@@ -438,7 +363,7 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
                   value="private"
                   checked={formData.visibility === 'private'}
                   onChange={(e) =>
-                    handleInputChange('visibility', e.target.value as 'private')
+                    handleInputChange('visibility', e.target.value)
                   }
                   className="text-primary-600"
                 />
@@ -448,288 +373,57 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
             </div>
           </div>
 
-          {/* Team Information (Read-only for existing teams) */}
+          {/* Team Details */}
           {team && (
-            <div className="grid grid-cols-2 gap-4">
+            <div className="space-y-4 border-t border-neutral-200 pt-4">
               <div className="space-y-2">
                 <label className="block text-sm font-medium text-neutral-700">
-                  Members
+                  Team Leader ID
                 </label>
-                <div className="flex items-center gap-2 p-3 bg-neutral-50 rounded-lg">
+                <div className="p-3 bg-neutral-50 rounded-lg flex items-center gap-3">
-                  <UserOutlined className="text-neutral-500" />
+                  <CrownOutlined className="text-yellow-600 text-lg" />
-                  <span className="text-sm text-neutral-700">
+                  <span className="text-sm text-neutral-700 font-mono">
-                    {team.member_count} member
+                    {team.leader_id}
-                    {team.member_count !== 1 ? 's' : ''}
                   </span>
                 </div>
               </div>
 
-              <div className="space-y-2">
+              <div className="grid grid-cols-2 gap-4">
-                <label className="block text-sm font-medium text-neutral-700">
+                <div className="space-y-2">
-                  Submission Status
+                  <label className="block text-sm font-medium text-neutral-700">
-                </label>
+                    Created
-                <div className="flex items-center gap-2 p-3 bg-neutral-50 rounded-lg">
+                  </label>
-                  <div
+                  <div className="flex items-center gap-2 p-3 bg-neutral-50 rounded-lg">
-                    className={cn(
+                    <CalendarOutlined className="text-neutral-500" />
-                      'w-2 h-2 rounded-full',
+                    <span className="text-sm text-neutral-700">
-                      team.has_submission ? 'bg-success-500' : 'bg-danger-500'
+                      {new Date(team.created_at).toLocaleDateString('en-US', {
-                    )}
+                        year: 'numeric',
-                  />
+                        month: 'long',
-                  <span
+                        day: 'numeric',
-                    className={cn(
+                        hour: '2-digit',
-                      'text-sm font-medium',
+                        minute: '2-digit',
-                      team.has_submission
+                      })}
-                        ? 'text-success-700'
+                    </span>
-                        : 'text-danger-700'
+                  </div>
-                    )}
-                  >
-                    {team.has_submission ? 'Submitted' : 'Not Submitted'}
-                  </span>
                 </div>
-              </div>
-            </div>
-          )}
 
-          {/* Tabs for Details and Members */}
+                <div className="space-y-2">
-          {team && (
+                  <label className="block text-sm font-medium text-neutral-700">
-            <div>
+                    Last Updated
-              <div className="flex border-b border-neutral-200">
+                  </label>
-                <button
+                  <div className="flex items-center gap-2 p-3 bg-neutral-50 rounded-lg">
-                  className={cn(
+                    <CalendarOutlined className="text-neutral-500" />
-                    'px-4 py-2 text-sm font-medium border-b-2 transition-colors cursor-pointer',
+                    <span className="text-sm text-neutral-700">
-                    activeTab === 'details'
+                      {new Date(team.updated_at).toLocaleDateString('en-US', {
-                      ? 'border-primary-500 text-primary-600'
+                        year: 'numeric',
-                      : 'border-transparent text-neutral-500 hover:text-neutral-700'
+                        month: 'long',
-                  )}
+                        day: 'numeric',
-                  onClick={() => setActiveTab('details')}
+                        hour: '2-digit',
-                >
+                        minute: '2-digit',
-                  Team Details
+                      })}
-                </button>
+                    </span>
-                <button
-                  className={cn(
-                    'px-4 py-2 text-sm font-medium border-b-2 transition-colors cursor-pointer',
-                    activeTab === 'members'
-                      ? 'border-primary-500 text-primary-600'
-                      : 'border-transparent text-neutral-500 hover:text-neutral-700'
-                  )}
-                  onClick={() => setActiveTab('members')}
-                >
-                  Members ({team.member_count})
-                </button>
-              </div>
-
-              <div className="pt-4">
-                {activeTab === 'details' && (
-                  <div className="space-y-4">
-                    {/* Leader Information */}
-                    {leader && (
-                      <div className="space-y-2">
-                        <label className="block text-sm font-medium text-neutral-700">
-                          Team Leader
-                        </label>
-                        <div className="p-3 bg-neutral-50 rounded-lg">
-                          <div className="flex items-center gap-3">
-                            <div className="w-10 h-10 rounded-full bg-neutral-200 flex items-center justify-center overflow-hidden">
-                              {leader.user.avatar ? (
-                                <img
-                                  src={leader.user.avatar}
-                                  alt={leader.user.fullname}
-                                  className="w-full h-full object-cover"
-                                />
-                              ) : (
-                                <CrownOutlined className="text-yellow-600 text-sm" />
-                              )}
-                            </div>
-                            <div>
-                              <p className="text-sm font-medium text-neutral-900">
-                                {leader.user.fullname}
-                              </p>
-                              <p className="text-xs text-neutral-500">
-                                {leader.user.email}
-                              </p>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    )}
-
-                    {/* Timestamps */}
-                    <div className="grid grid-cols-2 gap-4">
-                      <div className="space-y-2">
-                        <label className="block text-sm font-medium text-neutral-700">
-                          Created
-                        </label>
-                        <div className="flex items-center gap-2 p-3 bg-neutral-50 rounded-lg">
-                          <CalendarOutlined className="text-neutral-500" />
-                          <span className="text-sm text-neutral-700">
-                            {new Date(team.created_at).toLocaleDateString(
-                              'en-US',
-                              {
-                                year: 'numeric',
-                                month: 'long',
-                                day: 'numeric',
-                                hour: '2-digit',
-                                minute: '2-digit',
-                              }
-                            )}
-                          </span>
-                        </div>
-                      </div>
-
-                      <div className="space-y-2">
-                        <label className="block text-sm font-medium text-neutral-700">
-                          Last Updated
-                        </label>
-                        <div className="flex items-center gap-2 p-3 bg-neutral-50 rounded-lg">
-                          <CalendarOutlined className="text-neutral-500" />
-                          <span className="text-sm text-neutral-700">
-                            {new Date(team.updated_at).toLocaleDateString(
-                              'en-US',
-                              {
-                                year: 'numeric',
-                                month: 'long',
-                                day: 'numeric',
-                                hour: '2-digit',
-                                minute: '2-digit',
-                              }
-                            )}
-                          </span>
-                        </div>
-                      </div>
-                    </div>
                   </div>
-                )}
+                </div>
-
-                {activeTab === 'members' && (
-                  <div className="space-y-4">
-                    {/* Accepted Members */}
-                    <div>
-                      <h4 className="text-sm font-medium text-neutral-700 mb-3">
-                        Active Members ({acceptedMembers.length})
-                      </h4>
-                      <div className="space-y-2">
-                        {acceptedMembers.map((member) => (
-                          <div
-                            key={member.id}
-                            className="flex items-center gap-3 p-3 bg-neutral-50 rounded-lg"
-                          >
-                            <div className="w-10 h-10 rounded-full bg-neutral-200 flex items-center justify-center overflow-hidden">
-                              {member.user.avatar ? (
-                                <img
-                                  src={member.user.avatar}
-                                  alt={member.user.fullname}
-                                  className="w-full h-full object-cover"
-                                />
-                              ) : (
-                                <UserOutlined className="text-neutral-500" />
-                              )}
-                            </div>
-                            <div className="flex-1 min-w-0">
-                              <div className="flex items-center gap-2">
-                                <p className="text-sm font-medium text-neutral-900">
-                                  {member.user.fullname}
-                                </p>
-                                {member.role === 'leader' && (
-                                  <CrownOutlined className="text-yellow-600 text-xs" />
-                                )}
-                              </div>
-                              <p className="text-xs text-neutral-500">
-                                {member.user.email}
-                              </p>
-                              {member.user.skills.length > 0 && (
-                                <div className="flex flex-wrap gap-1 mt-1">
-                                  {member.user.skills
-                                    .slice(0, 2)
-                                    .map((skill, idx) => (
-                                      <span
-                                        key={idx}
-                                        className="px-1 py-0.5 bg-primary-100 text-primary-700 text-xs rounded"
-                                      >
-                                        {skill}
-                                      </span>
-                                    ))}
-                                  {member.user.skills.length > 2 && (
-                                    <span className="text-xs text-neutral-400">
-                                      +{member.user.skills.length - 2}
-                                    </span>
-                                  )}
-                                </div>
-                              )}
-                            </div>
-                            <div className="text-xs text-neutral-500">
-                              Joined{' '}
-                              {new Date(member.joined_at).toLocaleDateString()}
-                            </div>
-                          </div>
-                        ))}
-                      </div>
-                    </div>
-
-                    {/* Pending Members */}
-                    {pendingMembers.length > 0 && (
-                      <div>
-                        <h4 className="text-sm font-medium text-neutral-700 mb-3">
-                          Pending Members ({pendingMembers.length})
-                        </h4>
-                        <div className="space-y-2">
-                          {pendingMembers.map((member) => (
-                            <div
-                              key={member.id}
-                              className="flex items-center gap-3 p-3 bg-orange-50 border border-orange-200 rounded-lg"
-                            >
-                              <div className="w-10 h-10 rounded-full bg-neutral-200 flex items-center justify-center overflow-hidden">
-                                {member.user.avatar ? (
-                                  <img
-                                    src={member.user.avatar}
-                                    alt={member.user.fullname}
-                                    className="w-full h-full object-cover"
-                                  />
-                                ) : (
-                                  <UserOutlined className="text-neutral-500" />
-                                )}
-                              </div>
-                              <div className="flex-1 min-w-0">
-                                <div className="flex items-center gap-2">
-                                  <p className="text-sm font-medium text-neutral-900">
-                                    {member.user.fullname}
-                                  </p>
-                                  <ClockCircleOutlined className="text-orange-600 text-xs" />
-                                </div>
-                                <p className="text-xs text-neutral-500">
-                                  {member.user.email}
-                                </p>
-                              </div>
-                              <div className="flex gap-2">
-                                <Button
-                                  variant="primary"
-                                  size="sm"
-                                  className="flex items-center gap-1"
-                                  onClick={() =>
-                                    console.log('Accept member:', member.id)
-                                  }
-                                >
-                                  <CheckCircleOutlined className="text-xs" />
-                                  Accept
-                                </Button>
-                                <Button
-                                  variant="secondary"
-                                  size="sm"
-                                  className="flex items-center gap-1"
-                                  onClick={() =>
-                                    console.log('Reject member:', member.id)
-                                  }
-                                >
-                                  <CloseCircleOutlined className="text-xs" />
-                                  Reject
-                                </Button>
-                              </div>
-                            </div>
-                          ))}
-                        </div>
-                      </div>
-                    )}
-                  </div>
-                )}
               </div>
             </div>
           )}
@@ -772,46 +466,44 @@ const ModalTeamDetail: FC<ModalProps> = ({ isOpen, onClose, team }) => {
       {/* Delete Confirmation Modal */}
       {showDeleteConfirm && (
         <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-60 p-4">
-          <div className="bg-white rounded-lg shadow-xl w-full max-w-md">
+          <div className="bg-white rounded-lg shadow-xl w-full max-w-md p-6">
-            <div className="p-6">
+            <div className="flex items-center gap-4 mb-4">
-              <div className="flex items-center gap-4 mb-4">
+              <div className="w-12 h-12 rounded-full bg-danger-100 flex items-center justify-center">
-                <div className="w-12 h-12 rounded-full bg-danger-100 flex items-center justify-center">
+                <ExclamationOutlined className="text-danger-600 text-xl" />
-                  <ExclamationOutlined className="text-danger-600 text-xl" />
-                </div>
-                <div>
-                  <h3 className="text-lg font-semibold text-neutral-900">
-                    Delete Team
-                  </h3>
-                  <p className="text-sm text-neutral-500">
-                    This action cannot be undone.
-                  </p>
-                </div>
               </div>
-
+              <div>
-              <p className="text-sm text-neutral-700 mb-6">
+                <h3 className="text-lg font-semibold text-neutral-900">
-                Are you sure you want to delete "{team?.name}"? This will
-                permanently remove the team and all associated data.
-              </p>
-
-              <div className="flex items-center gap-3 justify-end">
-                <Button
-                  variant="secondary"
-                  size="md"
-                  onClick={() => setShowDeleteConfirm(false)}
-                >
-                  Cancel
-                </Button>
-                <Button
-                  variant="danger"
-                  size="md"
-                  onClick={handleDelete}
-                  className="flex items-center gap-2"
-                >
-                  <DeleteOutlined />
                   Delete Team
-                </Button>
+                </h3>
+                <p className="text-sm text-neutral-500">
+                  This action cannot be undone.
+                </p>
               </div>
             </div>
+
+            <p className="text-sm text-neutral-700 mb-6">
+              Are you sure you want to delete "{team?.name}"? This will
+              permanently remove the team and all associated data.
+            </p>
+
+            <div className="flex items-center gap-3 justify-end">
+              <Button
+                variant="secondary"
+                size="md"
+                onClick={() => setShowDeleteConfirm(false)}
+              >
+                Cancel
+              </Button>
+              <Button
+                variant="danger"
+                size="md"
+                onClick={handleDelete}
+                className="flex items-center gap-2"
+              >
+                <DeleteOutlined />
+                Delete Team
+              </Button>
+            </div>
           </div>
         </div>
       )}

apps/backoffice/src/app/(protected)/hackathon-teams/_components/submission-modal.tsx

@@ -1,216 +0,0 @@
-import { FC } from 'react';
-import { Button } from '@imphnen-frontend-service/ui/atoms';
-import {
-  CloseOutlined,
-  LinkOutlined,
-  ProjectOutlined,
-} from '@ant-design/icons';
-
-interface SubmissionModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  teamId: string;
-  teamName: string;
-}
-
-const SubmissionModal: FC<SubmissionModalProps> = ({
-  isOpen,
-  onClose,
-  teamId,
-  teamName,
-}) => {
-  if (!isOpen) return null;
-
-  // Mock submission data
-  const mockSubmission = {
-    id: `submission-${teamId}`,
-    project_name: `${teamName} Project`,
-    repository_url: `https://github.com/${teamName
-      .toLowerCase()
-      .replace(/\s+/g, '-')}/hackathon-project`,
-    demo_url: `https://${teamName
-      .toLowerCase()
-      .replace(/\s+/g, '-')}.vercel.app`,
-    presentation_url: `https://docs.google.com/presentation/d/${teamId}/edit`,
-    submitted_at: new Date().toISOString(),
-    status: 'submitted',
-    description:
-      'An innovative solution built during the IMPHNEN x Kolosal.ai Hackathon 2025.',
-  };
-
-  return (
-    <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4">
-      <div className="bg-white rounded-lg shadow-xl w-full max-w-3xl max-h-[90vh] overflow-y-auto">
-        {/* Header */}
-        <div className="flex items-center justify-between p-6 border-b border-neutral-200">
-          <div className="flex items-center gap-3">
-            <div className="w-10 h-10 rounded-full bg-success-100 flex items-center justify-center">
-              <ProjectOutlined className="text-success-600 text-lg" />
-            </div>
-            <div>
-              <h2 className="text-xl font-semibold text-neutral-900">
-                Project Submission
-              </h2>
-              <p className="text-sm text-neutral-500">
-                {teamName} - Hackathon Submission Details
-              </p>
-            </div>
-          </div>
-          <button
-            className="p-2 hover:bg-neutral-100 rounded-lg transition-colors cursor-pointer"
-            onClick={onClose}
-          >
-            <CloseOutlined className="text-neutral-400 text-lg" />
-          </button>
-        </div>
-
-        {/* Content */}
-        <div className="p-6 space-y-6">
-          {/* Submission Status */}
-          <div className="flex items-center gap-3 p-4 bg-success-50 border border-success-200 rounded-lg">
-            <div className="w-3 h-3 rounded-full bg-success-500"></div>
-            <div>
-              <p className="text-sm font-medium text-success-800">
-                Submission Completed
-              </p>
-              <p className="text-xs text-success-600">
-                Submitted on{' '}
-                {new Date(mockSubmission.submitted_at).toLocaleDateString(
-                  'en-UK',
-                  {
-                    year: 'numeric',
-                    month: 'long',
-                    day: 'numeric',
-                    hour: '2-digit',
-                    minute: '2-digit',
-                  }
-                )}
-              </p>
-            </div>
-          </div>
-
-          {/* Project Information */}
-          <div className="grid gap-6">
-            <div className="space-y-2">
-              <label className="block text-sm font-medium text-neutral-700">
-                Project Name
-              </label>
-              <p className="text-sm text-neutral-900 p-3 bg-neutral-50 rounded-lg">
-                {mockSubmission.project_name}
-              </p>
-            </div>
-
-            <div className="space-y-2">
-              <label className="block text-sm font-medium text-neutral-700">
-                Project Description
-              </label>
-              <p className="text-sm text-neutral-900 p-3 bg-neutral-50 rounded-lg">
-                {mockSubmission.description}
-              </p>
-            </div>
-
-            {/* Links Section */}
-            <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-              <div className="space-y-2">
-                <label className="block text-sm font-medium text-neutral-700">
-                  Repository
-                </label>
-                <div className="flex items-center gap-2 p-3 bg-neutral-50 rounded-lg">
-                  <span className="text-sm text-neutral-700 flex-1 truncate">
-                    {mockSubmission.repository_url}
-                  </span>
-                  <Button
-                    variant="secondary"
-                    size="sm"
-                    className="shrink-0"
-                    onClick={() =>
-                      window.open(mockSubmission.repository_url, '_blank')
-                    }
-                  >
-                    <LinkOutlined className="text-xs" />
-                  </Button>
-                </div>
-              </div>
-
-              <div className="space-y-2">
-                <label className="block text-sm font-medium text-neutral-700">
-                  Live Demo
-                </label>
-                <div className="flex items-center gap-2 p-3 bg-neutral-50 rounded-lg">
-                  <span className="text-sm text-neutral-700 flex-1 truncate">
-                    {mockSubmission.demo_url}
-                  </span>
-                  <Button
-                    variant="secondary"
-                    size="sm"
-                    className="shrink-0"
-                    onClick={() =>
-                      window.open(mockSubmission.demo_url, '_blank')
-                    }
-                  >
-                    <LinkOutlined className="text-xs" />
-                  </Button>
-                </div>
-              </div>
-            </div>
-
-            <div className="space-y-2">
-              <label className="block text-sm font-medium text-neutral-700">
-                Presentation
-              </label>
-              <div className="flex items-center gap-2 p-3 bg-neutral-50 rounded-lg">
-                <span className="text-sm text-neutral-700 flex-1 truncate">
-                  {mockSubmission.presentation_url}
-                </span>
-                <Button
-                  variant="secondary"
-                  size="sm"
-                  className="shrink-0"
-                  onClick={() =>
-                    window.open(mockSubmission.presentation_url, '_blank')
-                  }
-                >
-                  <LinkOutlined className="text-xs" />
-                </Button>
-              </div>
-            </div>
-          </div>
-
-          {/* Action Note */}
-          <div className="p-4 bg-info-50 border border-info-200 rounded-lg">
-            <p className="text-sm text-info-800">
-              <strong>Note:</strong> This is a submission preview. The team has
-              successfully submitted their project. You can review the
-              submission details and access the project links above.
-            </p>
-          </div>
-        </div>
-
-        {/* Footer */}
-        <div className="flex items-center justify-end p-6 border-t border-neutral-200">
-          <div className="flex items-center gap-3">
-            <Button variant="secondary" size="md" onClick={onClose}>
-              Close
-            </Button>
-            <Button
-              variant="primary"
-              size="md"
-              onClick={() => {
-                // Navigate to hackathon-submissions page
-                console.log('Navigate to full submissions page');
-                // You can implement navigation here
-                onClose();
-              }}
-              className="flex items-center gap-2"
-            >
-              <ProjectOutlined />
-              View All Submissions
-            </Button>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default SubmissionModal;

apps/backoffice/src/app/(protected)/hackathon-teams/page.tsx

@@ -1,8 +1,13 @@
-import { FC, ReactElement, useState, useMemo, useCallback } from 'react';
+import {
+  FC,
+  ReactElement,
+  useState,
+  useEffect,
+  useMemo,
+  useCallback,
+} from 'react';
 import ModalTeamDetail from './_components/modal-team-detail-new';
-import SubmissionModal from './_components/submission-modal';
 import { CityFilterSelect } from '../../../components/city-filter-select';
-import INDONESIAN_CITIES from '../../../constants/cities';
 import {
   BackofficeWrapper,
   DataTable,
@@ -16,205 +21,119 @@ import {
   SearchOutlined,
   FilterOutlined,
   PlusOutlined,
-  UserOutlined,
+  LoadingOutlined,
-  ArrowRightOutlined,
 } from '@ant-design/icons';
+import { useQuery } from '@tanstack/react-query';
+import {
+  getAdminTeams,
+  TAdminTeamItem,
+} from '@imphnen-frontend-service/service';
+import { useSearchParams } from 'react-router-dom';
 
-// Define interface outside component
+type TeamType = TAdminTeamItem;
-interface TeamMember {
-  id: string;
-  joined_at: string;
-  role: 'leader' | 'member';
-  status: 'pending' | 'accepted' | 'rejected';
-  team_id: string;
-  user: {
-    avatar?: string;
-    bio?: string;
-    created_at: string;
-    email: string;
-    fullname: string;
-    id: string;
-    is_active: boolean;
-    location: string;
-    phone_number?: string;
-    skills: string[];
-    updated_at: string;
-  };
-  user_id: string;
-}
-
-interface TeamType {
-  id: string;
-  name: string;
-  description?: string;
-  city: string;
-  banner?: string;
-  logo?: string;
-  visibility: 'public' | 'private';
-  member_count: number;
-  has_submission: boolean;
-  created_at: string;
-  updated_at: string;
-  leader_id: string;
-  members: TeamMember[];
-}
-
-// Move mock data outside component to prevent recreation
-// Sample data for popular cities from the INDONESIAN_CITIES constant
-const cities = INDONESIAN_CITIES.slice(0, 20); // Use first 20 cities for variety
-const teamNames = [
-  'Innovators',
-  'Hackers',
-  'Builders',
-  'Creators',
-  'Pioneers',
-  'Developers',
-  'Engineers',
-  'Coders',
-  'Tech Stars',
-  'Digital Wizards',
-];
-
-const descriptions = [
-  'Building innovative solutions for modern problems with cutting-edge technology',
-  'Passionate developers creating the next generation of web applications',
-  'Focused on sustainable tech solutions that make a positive impact',
-  'Experienced team working on scalable fintech innovations',
-  'Creative minds developing user-centric mobile applications',
-  'Full-stack developers building comprehensive business solutions',
-  'AI enthusiasts creating intelligent automation tools',
-  'Open source advocates building community-driven platforms',
-];
-
-const skills = [
-  'Frontend Developer',
-  'Backend Developer',
-  'Full Stack Developer',
-  'DevOps Engineer',
-  'UI/UX Designer',
-  'Product Manager',
-  'Data Scientist',
-  'Mobile Developer',
-];
-
-const generateMembers = (
-  count: number,
-  teamId: string,
-  leaderId: string
-): TeamMember[] => {
-  return Array.from({ length: count }, (_, i) => {
-    const isLeader = i === 0;
-    const memberId = isLeader ? leaderId : `user-${teamId}-${i}`;
-
-    return {
-      id: `member-${teamId}-${i}`,
-      joined_at: new Date(
-        Date.now() - (count - i) * 86400000 * Math.random() * 5
-      ).toISOString(),
-      role: isLeader ? 'leader' : 'member',
-      status: Math.random() > 0.8 ? 'pending' : 'accepted',
-      team_id: teamId,
-      user: {
-        id: memberId,
-        avatar:
-          Math.random() > 0.6
-            ? `https://ui-avatars.com/api/?name=${encodeURIComponent(
-                `User ${i}`
-              )}`
-            : undefined,
-        bio:
-          Math.random() > 0.5
-            ? `Passionate ${skills[
-                Math.floor(Math.random() * skills.length)
-              ].toLowerCase()} with ${
-                Math.floor(Math.random() * 8) + 1
-              }+ years experience`
-            : undefined,
-        created_at: new Date(
-          Date.now() - Math.random() * 365 * 86400000
-        ).toISOString(),
-        email: `user${i}.team${teamId}@example.com`,
-        fullname: `${
-          ['Ahmad', 'Sofia', 'Budi', 'Sari', 'Rizki', 'Maya', 'Andi', 'Dina'][
-            Math.floor(Math.random() * 8)
-          ]
-        } ${
-          [
-            'Wijuana',
-            'Santoso',
-            'Pratama',
-            'Dewi',
-            'Nugroho',
-            'Sari',
-            'Putra',
-            'Lestari',
-          ][Math.floor(Math.random() * 8)]
-        }`,
-        is_active: true,
-        location: cities[Math.floor(Math.random() * cities.length)],
-        phone_number:
-          Math.random() > 0.7
-            ? `+62${Math.floor(Math.random() * 9000000000) + 1000000000}`
-            : undefined,
-        skills: skills.slice(0, Math.floor(Math.random() * 3) + 1),
-        updated_at: new Date().toISOString(),
-      },
-      user_id: memberId,
-    };
-  });
-};
-
-const mockData: TeamType[] = Array.from({ length: 50 }, (_, i) => {
-  const teamId = `team-${String(i + 1).padStart(3, '0')}`;
-  const memberCount = Math.floor(Math.random() * 5) + 1; // 1-5 members
-  const leaderId = `leader-${teamId}`;
-  const members = generateMembers(memberCount, teamId, leaderId);
-
-  return {
-    id: teamId,
-    name: `Team ${teamNames[i % teamNames.length]} ${
-      Math.floor(i / teamNames.length) + 1
-    }`,
-    description:
-      i % 4 === 0 ? undefined : descriptions[i % descriptions.length],
-    city: cities[i % cities.length],
-    banner:
-      i % 3 === 0 ? undefined : `https://picsum.photos/600/200?random=${i}`, // 3:1 aspect ratio
-    logo:
-      i % 4 === 0
-        ? undefined
-        : `https://ui-avatars.com/api/?name=${encodeURIComponent(
-            teamNames[i % teamNames.length]
-          )}&background=random&size=120`,
-    visibility: i % 4 === 0 ? 'private' : 'public',
-    member_count: memberCount,
-    has_submission: i % 3 !== 0,
-    created_at: new Date(
-      Date.now() - i * 86400000 * (Math.random() * 15 + 1)
-    ).toISOString(),
-    updated_at: new Date().toISOString(),
-    leader_id: leaderId,
-    members: members,
-  };
-});
 
 export const HackathonTeamsPage: FC = (): ReactElement => {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const currentPage = Math.max(
+    1,
+    parseInt(searchParams.get('page') || '1', 10)
+  );
+  const searchQuery = searchParams.get('search') || '';
+  const perPage = parseInt(searchParams.get('per_page') || '10', 10);
   const [showDetailModal, setShowDetailModal] = useState(false);
   const [showNewTeamModal, setShowNewTeamModal] = useState(false);
-  const [showSubmissionModal, setShowSubmissionModal] = useState(false);
   const [selectedTeam, setSelectedTeam] = useState<TeamType | null>(null);
-  const [selectedSubmissionTeam, setSelectedSubmissionTeam] =
+  useState<TeamType | null>(null);
-    useState<TeamType | null>(null);
+  const [globalFilter, setGlobalFilter] = useState(searchQuery);
-  const [globalFilter, setGlobalFilter] = useState('');
 
   // Advanced filtering states
   const [visibilityFilter, setVisibilityFilter] = useState('all');
   const [cityFilter, setCityFilter] = useState('all');
-  const [submissionFilter, setSubmissionFilter] = useState('all');
-  const [memberCountFilter, setMemberCountFilter] = useState('all');
 
-  // Constants
+  // Fetch teams from API
-  const pageSize = 10;
+  const {
+    data: teamsResponse,
+    isLoading,
+    isFetching,
+  } = useQuery({
+    queryKey: [
+      'admin-teams',
+      currentPage,
+      perPage,
+      cityFilter,
+      visibilityFilter,
+      searchQuery,
+    ],
+    queryFn: () =>
+      getAdminTeams({
+        page: currentPage,
+        per_page: perPage,
+        search: searchQuery || undefined,
+      }),
+    staleTime: 30000, // 30 seconds cache
+    gcTime: 5 * 60 * 1000, // 5 minutes
+  });
+
+  const totalData = teamsResponse?.meta?.total_data || 0;
+  const totalPages = teamsResponse?.meta?.total_page || 1;
+
+  // Handle page change - update URL query params
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      const params = new URLSearchParams();
+      params.set('page', newPage.toString());
+      if (perPage !== 10) params.set('per_page', perPage.toString());
+      if (searchQuery) params.set('search', searchQuery);
+      setSearchParams(params);
+      window.scrollTo({ top: 0, behavior: 'smooth' });
+    },
+    [setSearchParams, perPage, searchQuery]
+  );
+
+  // Validate page number doesn't exceed total pages
+  useEffect(() => {
+    if (!isLoading && totalPages > 0 && currentPage > totalPages) {
+      setSearchParams({ page: totalPages.toString() });
+    }
+  }, [currentPage, totalPages, setSearchParams, isLoading]);
+
+  // Sync globalFilter with URL search param on mount
+  useEffect(() => {
+    setGlobalFilter(searchQuery);
+  }, [searchQuery]);
+
+  // Handle search teams
+  const handleSearch = useCallback(() => {
+    const params = new URLSearchParams();
+    params.set('page', '1');
+    if (perPage !== 10) params.set('per_page', perPage.toString());
+    if (globalFilter.trim()) {
+      params.set('search', globalFilter.trim());
+    }
+    setSearchParams(params);
+  }, [globalFilter, setSearchParams, perPage]);
+
+  // Handle Enter key press in search input
+  const handleSearchKeyPress = useCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === 'Enter') {
+        handleSearch();
+      }
+    },
+    [handleSearch]
+  );
+
+  // Handle per page change
+  const handlePerPageChange = useCallback(
+    (newPerPage: number) => {
+      const params = new URLSearchParams();
+      params.set('page', '1');
+      params.set('per_page', newPerPage.toString());
+      if (searchQuery) params.set('search', searchQuery);
+      setSearchParams(params);
+    },
+    [setSearchParams, searchQuery]
+  );
 
   // Memoize the callback to prevent recreation
   const handleShowDetailModal = useCallback((team: TeamType) => {
@@ -235,67 +154,10 @@ export const HackathonTeamsPage: FC = (): ReactElement => {
     setShowNewTeamModal(false);
   }, []);
 
-  const handleShowSubmissionModal = useCallback((team: TeamType) => {
+  // Get teams data from API response
-    setSelectedSubmissionTeam(team);
-    setShowSubmissionModal(true);
-  }, []);
-
-  const handleCloseSubmissionModal = useCallback(() => {
-    setShowSubmissionModal(false);
-    setSelectedSubmissionTeam(null);
-  }, []);
-
-  // Filter data based on current filter states
   const filteredData = useMemo(() => {
-    return mockData.filter((team) => {
+    return teamsResponse?.data || [];
-      // Global search filter
+  }, [teamsResponse]);
-      if (globalFilter) {
-        const searchTerm = globalFilter.toLowerCase();
-        const leaderName =
-          team.members.find((m) => m.role === 'leader')?.user.fullname || '';
-        const memberNames = team.members.map((m) => m.user.fullname).join(' ');
-
-        if (
-          !team.name.toLowerCase().includes(searchTerm) &&
-          !team.city.toLowerCase().includes(searchTerm) &&
-          !leaderName.toLowerCase().includes(searchTerm) &&
-          !memberNames.toLowerCase().includes(searchTerm)
-        ) {
-          return false;
-        }
-      }
-
-      // Visibility filter
-      if (visibilityFilter !== 'all' && team.visibility !== visibilityFilter) {
-        return false;
-      }
-
-      // City filter
-      if (cityFilter !== 'all' && team.city !== cityFilter) {
-        return false;
-      }
-
-      // Submission filter
-      if (submissionFilter !== 'all') {
-        const hasSubmission = submissionFilter === 'submitted';
-        if (team.has_submission !== hasSubmission) return false;
-      }
-
-      // Member count filter
-      if (memberCountFilter !== 'all') {
-        const count = parseInt(memberCountFilter);
-        if (team.member_count !== count) return false;
-      }
-
-      return true;
-    });
-  }, [
-    globalFilter,
-    visibilityFilter,
-    cityFilter,
-    submissionFilter,
-    memberCountFilter,
-  ]);
 
   // Memoize columns to prevent recreation on every render
   const columns: ColumnDef<TeamType>[] = useMemo(
@@ -319,9 +181,12 @@ export const HackathonTeamsPage: FC = (): ReactElement => {
                   <TeamOutlined className="text-neutral-400 text-lg" />
                 )}
               </div>
-              {/* Team Name & Description */}
+              {/* Team Name */}
               <div className="min-w-0 flex-1">
-                <p className="font-medium text-neutral-900 truncate">
+                <p
+                  className="font-medium text-neutral-900 truncate max-w-sm"
+                  title={team.name}
+                >
                   {team.name}
                 </p>
               </div>
@@ -359,81 +224,15 @@ export const HackathonTeamsPage: FC = (): ReactElement => {
         enableSorting: true,
       },
       {
-        accessorKey: 'member_count',
+        id: 'leader',
-        header: 'Members',
+        header: 'Leader ID',
         cell: ({ row }) => (
-          <div className="flex items-center gap-2">
+          <div className="text-sm text-neutral-700 font-mono">
-            <UserOutlined className="text-neutral-400 text-sm" />
+            {row.original.leader_id}
-            <span className="text-sm text-neutral-700">
-              {row.original.member_count}
-            </span>
           </div>
         ),
-        enableSorting: true,
-      },
-      {
-        id: 'leader',
-        header: 'Leader',
-        cell: ({ row }) => {
-          const leader = row.original.members.find(
-            (m) => m.role === 'leader'
-          )?.user;
-          return leader ? (
-            <div>
-              <div className="text-sm font-medium text-neutral-900">
-                {leader.fullname}
-              </div>
-              <div className="text-xs text-neutral-500">{leader.email}</div>
-            </div>
-          ) : (
-            <span className="text-neutral-400 italic">No leader</span>
-          );
-        },
         enableSorting: false,
       },
-      {
-        accessorKey: 'has_submission',
-        header: 'Submission',
-        cell: ({ row }) => {
-          const hasSubmission = row.original.has_submission;
-          return (
-            <div className="flex items-center gap-2">
-              <div
-                className={cn(
-                  'w-2 h-2 rounded-full',
-                  hasSubmission ? 'bg-success-500' : 'bg-danger-500'
-                )}
-              />
-              <div className="flex flex-col">
-                <span
-                  className={cn(
-                    'text-sm font-medium',
-                    hasSubmission ? 'text-success-700' : 'text-danger-700'
-                  )}
-                >
-                  {hasSubmission ? 'Submitted' : 'Not Submitted'}
-                </span>
-                {hasSubmission && (
-                  <button
-                    className="text-xs text-primary-600 hover:text-primary-800 text-left cursor-pointer"
-                    onClick={() => handleShowSubmissionModal(row.original)}
-                  >
-                    View Submission <ArrowRightOutlined />
-                  </button>
-                )}
-              </div>
-            </div>
-          );
-        },
-        enableSorting: true,
-        sortingFn: (rowA, rowB) => {
-          const aSubmission = rowA.original.has_submission;
-          const bSubmission = rowB.original.has_submission;
-          if (aSubmission && !bSubmission) return -1;
-          if (!aSubmission && bSubmission) return 1;
-          return 0;
-        },
-      },
       {
         accessorKey: 'created_at',
         header: 'Created',
@@ -469,7 +268,7 @@ export const HackathonTeamsPage: FC = (): ReactElement => {
         enableSorting: false,
       },
     ],
-    [handleShowDetailModal, handleShowSubmissionModal]
+    [handleShowDetailModal]
   );
 
   return (
@@ -488,14 +287,31 @@ export const HackathonTeamsPage: FC = (): ReactElement => {
               <input
                 type="text"
                 className="border border-neutral-200 rounded-lg pl-10 pr-4 py-2.5 text-sm w-full sm:w-80 focus:border-primary-500 focus:outline-none"
-                placeholder="Search teams by name, city, or leader..."
+                placeholder="Search teams by name or city..."
                 value={globalFilter}
                 onChange={(e) => setGlobalFilter(e.target.value)}
+                onKeyPress={handleSearchKeyPress}
               />
             </div>
 
-            {/* Visibility Filter */}
+            {/* Per Page Dropdown */}
             <div className="relative">
+              <select
+                className="border border-neutral-200 rounded-lg px-4 py-2.5 text-sm w-28 focus:border-primary-500 focus:outline-none appearance-none bg-white cursor-pointer"
+                value={perPage}
+                onChange={(e) =>
+                  handlePerPageChange(parseInt(e.target.value, 10))
+                }
+              >
+                <option value={10}>10 / page</option>
+                <option value={20}>20 / page</option>
+                <option value={50}>50 / page</option>
+                <option value={100}>100 / page</option>
+              </select>
+            </div>
+
+            {/* Visibility Filter */}
+            {/* <div className="relative">
               <FilterOutlined className="absolute left-3 top-1/2 transform -translate-y-1/2 text-neutral-400 text-sm pointer-events-none z-10" />
               <select
                 className="border border-neutral-200 rounded-lg pl-10 pr-10 py-2.5 text-sm w-full sm:w-40 focus:border-primary-500 focus:outline-none appearance-none bg-white cursor-pointer"
@@ -506,47 +322,16 @@ export const HackathonTeamsPage: FC = (): ReactElement => {
                 <option value="public">Public</option>
                 <option value="private">Private</option>
               </select>
-            </div>
+            </div> */}
 
             {/* City Filter */}
-            <CityFilterSelect
+            {/* <CityFilterSelect
               value={cityFilter}
               onChange={setCityFilter}
               className="w-full sm:w-44"
               placeholder="Search cities..."
               allOptionLabel="All Cities"
-            />
+            /> */}
-
-            {/* Member Count Filter */}
-            <div className="relative">
-              <FilterOutlined className="absolute left-3 top-1/2 transform -translate-y-1/2 text-neutral-400 text-sm pointer-events-none z-10" />
-              <select
-                className="border border-neutral-200 rounded-lg pl-10 pr-10 py-2.5 text-sm w-full sm:w-55 focus:border-primary-500 focus:outline-none appearance-none bg-white cursor-pointer"
-                value={memberCountFilter}
-                onChange={(e) => setMemberCountFilter(e.target.value)}
-              >
-                <option value="all">All Member Count</option>
-                <option value="1">1 Member</option>
-                <option value="2">2 Members</option>
-                <option value="3">3 Members</option>
-                <option value="4">4 Members</option>
-                <option value="5">5 Members</option>
-              </select>
-            </div>
-
-            {/* Submission Filter */}
-            <div className="relative">
-              <FilterOutlined className="absolute left-3 top-1/2 transform -translate-y-1/2 text-neutral-400 text-sm pointer-events-none z-10" />
-              <select
-                className="border border-neutral-200 rounded-lg pl-10 pr-10 py-2.5 text-sm w-full sm:w-44 focus:border-primary-500 focus:outline-none appearance-none bg-white cursor-pointer"
-                value={submissionFilter}
-                onChange={(e) => setSubmissionFilter(e.target.value)}
-              >
-                <option value="all">All Submissions</option>
-                <option value="submitted">Submitted</option>
-                <option value="not_submitted">Not Submitted</option>
-              </select>
-            </div>
           </div>
 
           {/* Right side - Add Team Button */}
@@ -564,10 +349,7 @@ export const HackathonTeamsPage: FC = (): ReactElement => {
         </div>
 
         {/* Active filters display */}
-        {(visibilityFilter !== 'all' ||
+        {(visibilityFilter !== 'all' || cityFilter !== 'all') && (
-          cityFilter !== 'all' ||
-          submissionFilter !== 'all' ||
-          memberCountFilter !== 'all') && (
           <div className="flex flex-wrap gap-2 items-center">
             <span className="text-sm text-neutral-600">Active filters:</span>
 
@@ -597,32 +379,6 @@ export const HackathonTeamsPage: FC = (): ReactElement => {
               </span>
             )}
 
-            {/* Member count filter badge */}
-            {memberCountFilter !== 'all' && (
-              <span className="inline-flex items-center gap-1 px-2 py-1 bg-blue-100 text-blue-800 rounded-2xl text-sm">
-                Members: {memberCountFilter}
-                <button
-                  onClick={() => setMemberCountFilter('all')}
-                  className="text-blue-600 hover:text-blue-800 cursor-pointer"
-                >
-                  ✕
-                </button>
-              </span>
-            )}
-
-            {/* Submission filter badge */}
-            {submissionFilter !== 'all' && (
-              <span className="inline-flex items-center gap-1 px-2 py-1 bg-purple-100 text-purple-800 rounded-2xl text-sm">
-                Submission: {submissionFilter}
-                <button
-                  onClick={() => setSubmissionFilter('all')}
-                  className="text-purple-600 hover:text-purple-800 cursor-pointer"
-                >
-                  ✕
-                </button>
-              </span>
-            )}
-
             {/* Clear all filters */}
             <Button
               variant="secondary"
@@ -630,8 +386,6 @@ export const HackathonTeamsPage: FC = (): ReactElement => {
               onClick={() => {
                 setVisibilityFilter('all');
                 setCityFilter('all');
-                setSubmissionFilter('all');
-                setMemberCountFilter('all');
                 setGlobalFilter('');
               }}
               className="text-sm text-neutral-600"
@@ -641,17 +395,36 @@ export const HackathonTeamsPage: FC = (): ReactElement => {
           </div>
         )}
 
-        {/* Pagination-aware results display */}
+        {/* Loading & results display */}
-        {filteredData.length > 0 && (
+        {isLoading ? (
-          <div className="text-sm text-neutral-600">
+          <div className="flex items-center justify-center py-12">
-            Showing {Math.min(pageSize, filteredData.length)} of{' '}
+            <LoadingOutlined className="text-3xl text-primary-500 animate-spin" />
-            {filteredData.length} teams
+            <span className="ml-3 text-neutral-600">Loading teams...</span>
-            {filteredData.length > pageSize}
+          </div>
+        ) : filteredData.length > 0 ? (
+          <>
+            <div className="text-sm text-neutral-600">
+              Showing {filteredData.length} of {totalData} teams (Page{' '}
+              {currentPage} of {totalPages})
+              {isFetching && (
+                <span className="ml-2 text-primary-500">(Updating...)</span>
+              )}
+            </div>
+            <DataTable
+              data={filteredData}
+              columns={columns}
+              pageSize={perPage}
+              manualPagination={true}
+              pageCount={totalPages}
+              currentPage={currentPage}
+              onPageChange={handlePageChange}
+            />
+          </>
+        ) : (
+          <div className="text-center py-12 text-neutral-500">
+            No teams found. Try adjusting your filters.
           </div>
         )}
-
-        {/* Table */}
-        <DataTable data={filteredData} columns={columns} pageSize={10} />
       </section>
 
       {/* Modals component */}
@@ -667,16 +440,6 @@ export const HackathonTeamsPage: FC = (): ReactElement => {
         onClose={handleCloseNewTeamModal}
         team={null} // null indicates creating new team
       />
-
-      {/* Submission Modal */}
-      {selectedSubmissionTeam && (
-        <SubmissionModal
-          isOpen={showSubmissionModal}
-          onClose={handleCloseSubmissionModal}
-          teamId={selectedSubmissionTeam.id}
-          teamName={selectedSubmissionTeam.name}
-        />
-      )}
     </BackofficeWrapper>
   );
 };

apps/backoffice/src/app/(protected)/hackathon-users/_components/modal-user-detail.tsx

@@ -15,10 +15,10 @@ import {
 
 interface UserType {
   id: string;
-  avatar?: string;
+  avatar?: string | null;
   fullname: string;
   bio?: string;
-  location: string;
+  location: string | null;
   is_active: boolean;
   skills: string[];
   created_at: string;
@@ -77,7 +77,7 @@ const ModalUserDetail: FC<ModalProps> = ({ isOpen, onClose, user }) => {
   // Check if required fields are filled
   const isFormValid = useMemo(() => {
     if (!formData) return false;
-    return formData.fullname.trim() !== '' && formData.location.trim() !== '';
+    return formData.fullname?.trim() !== '' && formData.location?.trim() !== '';
   }, [formData]);
 
   const canSave = hasChanges && isFormValid;
@@ -259,13 +259,13 @@ const ModalUserDetail: FC<ModalProps> = ({ isOpen, onClose, user }) => {
               </div>
             </div>
             <button
-              className="p-2 hover:bg-neutral-100 rounded-lg transition-colors"
+              className="p-2 hover:bg-neutral-100 rounded-lg transition-colors cursor-pointer"
               onClick={() => {
                 setShowAvatarMenu(false);
                 handleCancel();
               }}
             >
-              <CloseOutlined className="text-neutral-400 text-lg cursor-pointer" />
+              <CloseOutlined className="text-neutral-400 text-lg" />
             </button>
           </div>
 
@@ -294,13 +294,15 @@ const ModalUserDetail: FC<ModalProps> = ({ isOpen, onClose, user }) => {
                           }
                           className={cn(
                             'w-full border rounded-lg px-3 py-2 text-sm focus:border-primary-500 focus:outline-none',
-                            formData.fullname.trim() === ''
+                            !formData.fullname ||
+                              formData.fullname.trim() === ''
                               ? 'border-red-300 bg-red-50'
                               : 'border-neutral-300'
                           )}
                           placeholder="Enter full name"
                         />
-                        {formData.fullname.trim() === '' && (
+                        {(!formData.fullname ||
+                          formData.fullname.trim() === '') && (
                           <p className="text-red-500 text-xs mt-1">
                             Full name is required
                           </p>
@@ -316,13 +318,14 @@ const ModalUserDetail: FC<ModalProps> = ({ isOpen, onClose, user }) => {
                           Location <span className="text-red-500">*</span>
                         </label>
                         <select
-                          value={formData.location}
+                          value={formData.location || ''}
                           onChange={(e) =>
                             handleInputChange('location', e.target.value)
                           }
                           className={cn(
                             'w-full border rounded-lg px-3 py-2 text-sm focus:border-primary-500 focus:outline-none bg-white',
-                            formData.location.trim() === ''
+                            !formData.location ||
+                              formData.location.trim() === ''
                               ? 'border-red-300 bg-red-50'
                               : 'border-neutral-300'
                           )}
@@ -334,7 +337,8 @@ const ModalUserDetail: FC<ModalProps> = ({ isOpen, onClose, user }) => {
                           <option value="Medan">Medan</option>
                           <option value="Yogyakarta">Yogyakarta</option>
                         </select>
-                        {formData.location.trim() === '' && (
+                        {(!formData.location ||
+                          formData.location.trim() === '') && (
                           <p className="text-red-500 text-xs mt-1">
                             Location is required
                           </p>

apps/backoffice/src/app/(protected)/hackathon-users/page.tsx

@@ -1,4 +1,11 @@
-import { FC, ReactElement, useState, useMemo, useCallback } from 'react';
+import {
+  FC,
+  ReactElement,
+  useState,
+  useEffect,
+  useMemo,
+  useCallback,
+} from 'react';
 import ModalUserDetail from './_components/modal-user-detail';
 import {
   BackofficeWrapper,
@@ -13,23 +20,19 @@ import {
   SearchOutlined,
   FilterOutlined,
   PlusOutlined,
+  LoadingOutlined,
 } from '@ant-design/icons';
 import { CityFilterSelect } from '../../../components/city-filter-select';
+import { useQuery } from '@tanstack/react-query';
+import {
+  getAdminUsers,
+  TAdminUserItem,
+} from '@imphnen-frontend-service/service';
+import { useSearchParams } from 'react-router-dom';
 
-// Define interface outside component
+type UserType = TAdminUserItem;
-interface UserType {
-  id: string; // UUID
-  avatar?: string;
-  fullname: string;
-  bio?: string;
-  location: string;
-  is_active: boolean; // admin can deactivate
-  skills: string[]; // Frontend Developer, Backend Developer, etc.
-  created_at: string;
-  updated_at: string;
-}
 
-// Move mock data outside component to prevent recreation
+// Skills options for filter
 const skillsOptions = [
   'Frontend Developer',
   'Backend Developer',
@@ -41,59 +44,108 @@ const skillsOptions = [
   'Mobile Developer',
 ];
 
-const locations = ['Jakarta', 'Bandung', 'Surabaya', 'Medan', 'Yogyakarta'];
-const bios = [
-  'Passionate developer with 5+ years experience',
-  'Tech enthusiast and problem solver',
-  'Building scalable solutions for modern problems',
-  'Creative designer with technical background',
-  'Data-driven decision maker',
-];
-
-const mockData: UserType[] = Array.from({ length: 50 }, (_, i) => {
-  const randomSkillsCount = Math.floor(Math.random() * 3) + 1; // 1-3 skills
-  const randomSkills = skillsOptions
-    .sort(() => 0.5 - Math.random())
-    .slice(0, randomSkillsCount);
-
-  return {
-    id: `24db9e4d-ca4c-46aa-ac36-8ef04bbe01${String(i).padStart(2, '0')}`,
-    avatar:
-      i % 4 === 0
-        ? `https://ui-avatars.com/api/?name=${encodeURIComponent(
-            i % 3 === 0 ? 'Ahmad Wijuana' : 'Sofia Wijuana'
-          )}&background=random`
-        : undefined,
-    fullname:
-      i % 3 === 0
-        ? 'Ahmad Wijuana'
-        : i % 3 === 1
-        ? 'Sofia Wijuana'
-        : 'Budi Santoso',
-    bio: i % 4 === 0 ? bios[i % bios.length] : undefined,
-    location: locations[i % locations.length],
-    is_active: i % 7 !== 0, // More realistic distribution
-    skills: randomSkills,
-    created_at: new Date(
-      Date.now() - i * 86400000 * (Math.random() * 30 + 1)
-    ).toISOString(), // Random within last 30-60 days
-    updated_at: new Date().toISOString(),
-  };
-});
-
 export const HackathonUsersPage: FC = (): ReactElement => {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const currentPage = Math.max(
+    1,
+    parseInt(searchParams.get('page') || '1', 10)
+  );
+  const searchQuery = searchParams.get('search') || '';
+  const perPage = parseInt(searchParams.get('per_page') || '10', 10);
   const [showDetailModal, setShowDetailModal] = useState(false);
   const [showNewUserModal, setShowNewUserModal] = useState(false);
   const [selectedUser, setSelectedUser] = useState<UserType | null>(null);
-  const [globalFilter, setGlobalFilter] = useState('');
+  const [globalFilter, setGlobalFilter] = useState(searchQuery);
 
   // Advanced filtering states
   const [statusFilter, setStatusFilter] = useState('all');
   const [cityFilter, setCityFilter] = useState('all');
   const [skillsFilter, setSkillsFilter] = useState<string[]>([]);
 
-  // Constants
+  // Fetch users from API
-  const pageSize = 10;
+  const {
+    data: usersResponse,
+    isLoading,
+    isFetching,
+  } = useQuery({
+    queryKey: [
+      'admin-users',
+      currentPage,
+      perPage,
+      cityFilter,
+      statusFilter,
+      searchQuery,
+    ],
+    queryFn: () =>
+      getAdminUsers({
+        page: currentPage,
+        per_page: perPage,
+        search: searchQuery || undefined,
+      }),
+    staleTime: 30000, // 30 seconds cache
+    gcTime: 5 * 60 * 1000, // 5 minutes
+  });
+
+  const totalData = usersResponse?.meta?.total_data || 0;
+  const totalPages = usersResponse?.meta?.total_page || 1;
+
+  // Handle page change - update URL query params
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      const params = new URLSearchParams();
+      params.set('page', newPage.toString());
+      if (perPage !== 10) params.set('per_page', perPage.toString());
+      if (searchQuery) params.set('search', searchQuery);
+      setSearchParams(params);
+      window.scrollTo({ top: 0, behavior: 'smooth' });
+    },
+    [setSearchParams, perPage, searchQuery]
+  );
+
+  // Validate page number doesn't exceed total pages
+  useEffect(() => {
+    if (!isLoading && totalPages > 0 && currentPage > totalPages) {
+      setSearchParams({ page: totalPages.toString() });
+    }
+  }, [currentPage, totalPages, setSearchParams, isLoading]);
+
+  // Sync globalFilter with URL search param on mount
+  useEffect(() => {
+    setGlobalFilter(searchQuery);
+  }, [searchQuery]);
+
+  // Handle search users
+  const handleSearch = useCallback(() => {
+    const params = new URLSearchParams();
+    params.set('page', '1');
+    if (perPage !== 10) params.set('per_page', perPage.toString());
+    if (globalFilter.trim()) {
+      params.set('search', globalFilter.trim());
+    }
+    setSearchParams(params);
+  }, [globalFilter, setSearchParams, perPage]);
+
+  // Handle Enter key press in search input
+  const handleSearchKeyPress = useCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === 'Enter') {
+        handleSearch();
+      }
+    },
+    [handleSearch]
+  );
+
+  // Handle per page change
+  const handlePerPageChange = useCallback(
+    (newPerPage: number) => {
+      const params = new URLSearchParams();
+      params.set('page', '1');
+      params.set('per_page', newPerPage.toString());
+      if (searchQuery) params.set('search', searchQuery);
+      setSearchParams(params);
+    },
+    [setSearchParams, searchQuery]
+  );
 
   // Memoize the callback to prevent recreation
   const handleShowDetailModal = useCallback((user: UserType) => {
@@ -116,29 +168,26 @@ export const HackathonUsersPage: FC = (): ReactElement => {
 
   // Filter data based on current filter states
   const filteredData = useMemo(() => {
-    return mockData.filter((user) => {
+    const usersData = usersResponse?.data || [];
+    return usersData.filter((user: UserType) => {
       // Status filter
       if (statusFilter !== 'all') {
         const isActive = statusFilter === 'active';
         if (user.is_active !== isActive) return false;
       }
 
-      // City filter
-      if (cityFilter !== 'all' && user.location !== cityFilter) {
-        return false;
-      }
-
       // Skills filter
       if (skillsFilter.length > 0) {
+        const userSkills = user.skills || [];
         const hasMatchingSkill = skillsFilter.some((skill) =>
-          user.skills.includes(skill)
+          userSkills.includes(skill)
         );
         if (!hasMatchingSkill) return false;
       }
 
       return true;
     });
-  }, [statusFilter, cityFilter, skillsFilter]);
+  }, [usersResponse, statusFilter, skillsFilter]);
 
   // Memoize columns to prevent recreation on every render
   const columns: ColumnDef<UserType>[] = useMemo(
@@ -173,23 +222,32 @@ export const HackathonUsersPage: FC = (): ReactElement => {
       {
         accessorKey: 'skills',
         header: 'Skills',
-        cell: ({ row }) => (
+        cell: ({ row }) => {
-          <div className="flex flex-wrap gap-1 max-w-xs">
+          const skills = row.original.skills || [];
-            {row.original.skills.slice(0, 2).map((skill, index) => (
+          return (
-              <span
+            <div className="flex flex-wrap gap-1 max-w-xs">
-                key={index}
+              {skills.length > 0 ? (
-                className="inline-flex items-center px-2 py-1 rounded-2xl text-xs font-medium bg-success-100 text-success-800"
+                <>
-              >
+                  {skills.slice(0, 2).map((skill, index) => (
-                {skill.replace(' Developer', '').replace(' Engineer', '')}
+                    <span
-              </span>
+                      key={index}
-            ))}
+                      className="inline-flex items-center px-2 py-1 rounded-2xl text-xs font-medium bg-success-100 text-success-800"
-            {row.original.skills.length > 2 && (
+                    >
-              <span className="inline-flex items-center px-2 py-1 rounded-2xl text-xs font-medium bg-success-200 text-success-700">
+                      {skill.replace(' Developer', '').replace(' Engineer', '')}
-                +{row.original.skills.length - 2}
+                    </span>
-              </span>
+                  ))}
-            )}
+                  {skills.length > 2 && (
-          </div>
+                    <span className="inline-flex items-center px-2 py-1 rounded-2xl text-xs font-medium bg-success-200 text-success-700">
-        ),
+                      +{skills.length - 2}
+                    </span>
+                  )}
+                </>
+              ) : (
+                <span className="text-neutral-400">-</span>
+              )}
+            </div>
+          );
+        },
         enableSorting: false,
       },
       {
@@ -260,7 +318,7 @@ export const HackathonUsersPage: FC = (): ReactElement => {
               <EditOutlined className="text-sm" />
               Manage
             </Button>
-            <Button
+            {/* <Button
               variant="secondary"
               size="sm"
               className="text-sm px-4 py-2"
@@ -270,7 +328,7 @@ export const HackathonUsersPage: FC = (): ReactElement => {
               }}
             >
               {row.original.is_active ? 'Deactivate' : 'Activate'}
-            </Button>
+            </Button> */}
           </div>
         ),
         enableSorting: false,
@@ -298,11 +356,28 @@ export const HackathonUsersPage: FC = (): ReactElement => {
                 placeholder="Search users by name or location..."
                 value={globalFilter}
                 onChange={(e) => setGlobalFilter(e.target.value)}
+                onKeyPress={handleSearchKeyPress}
               />
             </div>
 
-            {/* Status Filter */}
+            {/* Per Page Dropdown */}
             <div className="relative">
+              <select
+                className="border border-neutral-200 rounded-lg px-4 py-2.5 text-sm w-28 focus:border-primary-500 focus:outline-none appearance-none bg-white cursor-pointer"
+                value={perPage}
+                onChange={(e) =>
+                  handlePerPageChange(parseInt(e.target.value, 10))
+                }
+              >
+                <option value={10}>10 / page</option>
+                <option value={20}>20 / page</option>
+                <option value={50}>50 / page</option>
+                <option value={100}>100 / page</option>
+              </select>
+            </div>
+
+            {/* Status Filter */}
+            {/* <div className="relative">
               <FilterOutlined className="absolute left-3 top-1/2 transform -translate-y-1/2 text-neutral-400 text-sm pointer-events-none z-10" />
               <select
                 className="border border-neutral-200 rounded-lg pl-10 pr-10 py-2.5 text-sm w-full sm:w-36 focus:border-primary-500 focus:outline-none appearance-none bg-white cursor-pointer"
@@ -313,10 +388,10 @@ export const HackathonUsersPage: FC = (): ReactElement => {
                 <option value="active">Active</option>
                 <option value="inactive">Inactive</option>
               </select>
-            </div>
+            </div> */}
 
             {/* City Filter */}
-            <CityFilterSelect
+            {/* <CityFilterSelect
               value={cityFilter}
               onChange={setCityFilter}
               className="w-full sm:w-44"
@@ -333,10 +408,10 @@ export const HackathonUsersPage: FC = (): ReactElement => {
                   ✕
                 </button>
               </span>
-            )}
+            )} */}
 
             {/* Skills Filter with Icon */}
-            <div className="relative">
+            {/* <div className="relative">
               <FilterOutlined className="absolute left-3 top-1/2 transform -translate-y-1/2 text-neutral-400 text-sm pointer-events-none z-10" />
               <select
                 className="border border-neutral-200 rounded-lg pl-10 pr-10 py-2.5 text-sm w-full sm:w-44 focus:border-primary-500 focus:outline-none appearance-none bg-white cursor-pointer"
@@ -361,7 +436,7 @@ export const HackathonUsersPage: FC = (): ReactElement => {
                   </option>
                 ))}
               </select>
-            </div>
+            </div> */}
           </div>
 
           {/* Right side - Add User Button */}
@@ -446,17 +521,36 @@ export const HackathonUsersPage: FC = (): ReactElement => {
           </div>
         )}
 
-        {/* Pagination-aware results display */}
+        {/* Loading & results display */}
-        {filteredData.length > 0 && (
+        {isLoading ? (
-          <div className="text-sm text-neutral-600">
+          <div className="flex items-center justify-center py-12">
-            Showing {Math.min(pageSize, filteredData.length)} of{' '}
+            <LoadingOutlined className="text-3xl text-primary-500 animate-spin" />
-            {filteredData.length} users
+            <span className="ml-3 text-neutral-600">Loading users...</span>
-            {filteredData.length > pageSize}
+          </div>
+        ) : filteredData.length > 0 ? (
+          <>
+            <div className="text-sm text-neutral-600">
+              Showing {filteredData.length} of {totalData} users (Page{' '}
+              {currentPage} of {totalPages})
+              {isFetching && (
+                <span className="ml-2 text-primary-500">(Updating...)</span>
+              )}
+            </div>
+            <DataTable
+              data={filteredData}
+              columns={columns}
+              pageSize={perPage}
+              manualPagination={true}
+              pageCount={totalPages}
+              currentPage={currentPage}
+              onPageChange={handlePageChange}
+            />
+          </>
+        ) : (
+          <div className="text-center py-12 text-neutral-500">
+            No users found. Try adjusting your filters.
           </div>
         )}
-
-        {/* Table */}
-        <DataTable data={filteredData} columns={columns} pageSize={10} />
       </section>
 
       {/* Modals component */}

apps/backoffice/src/app/(protected)/layout.tsx

@@ -23,7 +23,7 @@ export const AppLayout: FC = (): ReactElement => {
             {/* Mobile menu button (shown on small screens) */}
             <button
               type="button"
-              className="lg:hidden p-2 rounded-md hover:bg-gray-100 text-gray-700"
+              className="lg:hidden p-2 rounded-md hover:bg-gray-100 text-gray-700 cursor-pointer"
               onClick={() => setMobileSidebarOpen(true)}
               aria-label="Open sidebar"
             >

apps/backoffice/src/app/(public)/auth/login/_hooks/use-login.ts

@@ -2,22 +2,39 @@ import { useForm } from 'react-hook-form';
 import {
   authLoginSchema,
   TLoginRequest,
+  useBackofficeLogin,
 } from '@imphnen-frontend-service/service';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { useSession } from '@imphnen-frontend-service/utils';
+import { useNavigate } from 'react-router';
+import { toast } from 'sonner';
 
 export const useLogin = () => {
+  const navigate = useNavigate();
+  const loginMutation = useBackofficeLogin();
+
   const form = useForm<TLoginRequest>({
     resolver: zodResolver(authLoginSchema),
     mode: 'all',
+    defaultValues: {
+      email: '',
+      password: '',
+    },
   });
 
-  const { signIn } = useSession();
+  const onSubmit = form.handleSubmit(async (data) => {
-
+    try {
-  const onSubmit = form.handleSubmit((data) => signIn(data));
+      await loginMutation.mutateAsync(data);
+      toast.success('Login berhasil!');
+      navigate('/hackathon-dashboard');
+    } catch (error) {
+      console.error('[Backoffice Login] Error:', error);
+      toast.error((error as Error).message || 'Login gagal');
+    }
+  });
 
   return {
     form,
     onSubmit,
+    isLoading: loginMutation.isPending,
   };
 };

apps/backoffice/src/app/(public)/auth/login/page.tsx

@@ -4,7 +4,7 @@ import { useLogin } from './_hooks/use-login';
 import { ControlledInputField } from '@imphnen-frontend-service/ui/organisms';
 
 export const Components: FC = (): ReactElement => {
-  const { form, onSubmit } = useLogin();
+  const { form, onSubmit, isLoading } = useLogin();
 
   return (
     <div className="flex justify-center items-center min-h-screen">
@@ -22,6 +22,7 @@ export const Components: FC = (): ReactElement => {
             name="email"
             size="lg"
             className="w-full"
+            disabled={isLoading}
           />
           <ControlledInputField
             control={form.control}
@@ -31,10 +32,11 @@ export const Components: FC = (): ReactElement => {
             name="password"
             size="lg"
             className="w-full"
+            disabled={isLoading}
           />
           <Button
             disabled={
-              form.formState.isSubmitting ||
+              isLoading ||
               form.formState.isValidating ||
               !form.formState.isValid
             }
@@ -42,7 +44,7 @@ export const Components: FC = (): ReactElement => {
             size="md"
             className="w-full"
           >
-            Login
+            {isLoading ? 'Loading...' : 'Login'}
           </Button>
         </form>
       </div>

apps/backoffice/src/app/404.tsx

@@ -0,0 +1,23 @@
+import { Link } from 'react-router-dom';
+
+export default function NotFoundPage() {
+  return (
+    <div className="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-gray-950">
+      <div className="text-center">
+        <h1 className="text-9xl font-bold text-gray-200 mb-4">404</h1>
+        <h2 className="text-3xl font-semibold text-gray-900 dark:text-gray-300 mb-4">
+          Page Not Found
+        </h2>
+        <p className="text-gray-600 dark:text-gray-400 mb-8">
+          The page you are looking for doesn't exist or has been moved.
+        </p>
+        <Link
+          to="/hackathon-dashboard"
+          className="inline-block px-6 py-3 bg-primary-600 text-white rounded-lg hover:bg-primary-700 transition-colors"
+        >
+          Go Back Home
+        </Link>
+      </div>
+    </div>
+  );
+}

apps/backoffice/src/app/error.tsx

@@ -0,0 +1,29 @@
+import { useRouteError, isRouteErrorResponse } from 'react-router-dom';
+
+export default function ErrorPage() {
+  const error = useRouteError();
+  let errorMessage: string;
+
+  if (isRouteErrorResponse(error)) {
+    errorMessage = error.statusText;
+  } else if (error instanceof Error) {
+    errorMessage = error.message;
+  } else if (typeof error === 'string') {
+    errorMessage = error;
+  } else {
+    console.error(error);
+    errorMessage = 'Unknown error';
+  }
+
+  return (
+    <div className="min-h-screen flex items-center justify-center bg-gray-50">
+      <div className="text-center">
+        <h1 className="text-6xl font-bold text-red-600 mb-4">Oops!</h1>
+        <p className="text-xl text-gray-700 mb-2">
+          Sorry, an unexpected error has occurred.
+        </p>
+        <p className="text-gray-500 italic">{errorMessage}</p>
+      </div>
+    </div>
+  );
+}

apps/backoffice/src/middleware.ts

@@ -84,11 +84,11 @@ export const middleware = async ({ request }: LoaderFunctionArgs) => {
     session?.role?.permissions?.map?.((perm) => perm?.name) ?? [];
 
   if (mappingPublicRoutes.includes(pathname)) {
-    if (token) return redirect('/dashboard');
+    if (token) return redirect('/hackathon-dashboard');
     return null;
   }
 
-  // if (!session) return redirect('/auth/login');
+  if (!session) return redirect('/auth/login');
 
   const matchedRoute = mappingRoutePermissions.find(
     (route) => route.path === pathname
@@ -100,7 +100,7 @@ export const middleware = async ({ request }: LoaderFunctionArgs) => {
       matchedRoute.permissions.some((perm) => userPermissions.includes(perm));
 
     if (!hasPermission) {
-      return '/dashboard';
+      return '/hackathon-dashboard';
     }
   }
 

apps/backoffice/vite.config.ts

@@ -8,7 +8,7 @@ export default defineConfig(() => ({
   root: __dirname,
   cacheDir: '../../node_modules/.vite/apps/backoffice',
   server: {
-    port: 3000,
+    port: 3003,
     host: 'localhost',
   },
   preview: {

apps/hackathon/index.html

@@ -18,6 +18,9 @@
       type="image/svg+xml"
       href="/images/imphnen-logo-simple.svg"
     />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;600;700&display=swap" rel="stylesheet" />
     <link rel="stylesheet" href="/src/index.css" />
     <meta property="og:type" content="website" />
     <meta property="og:url" content="https://hackathon.imphnen.dev/" />

apps/hackathon/src/app/certificate/[certId]/page.tsx

@@ -0,0 +1,470 @@
+import { FC, ReactElement, useState, useEffect, useRef } from 'react';
+import { useParams, useNavigate } from 'react-router';
+import { Button } from '@imphnen-frontend-service/ui/atoms';
+import { decodeCertificateId } from '../../../utils/certificate';
+import {
+  useCertificatePublicData,
+  useAuthStore,
+} from '@imphnen-frontend-service/service';
+import QRCode from 'qrcode';
+import html2canvas from 'html2canvas';
+
+interface DecodedCert {
+  teamId: string;
+  submissionId: string;
+  userId: string;
+}
+
+const CertificatePage: FC = (): ReactElement => {
+  const { certId } = useParams<{ certId: string }>();
+  const navigate = useNavigate();
+  const { session } = useAuthStore();
+  const [decodedInfo, setDecodedInfo] = useState<DecodedCert | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const teamNameRef = useRef<HTMLHeadingElement>(null);
+  const userNameRef = useRef<HTMLHeadingElement>(null);
+  const [teamNameFontSize, setTeamNameFontSize] = useState('2.25rem');
+  const [userNameFontSize, setUserNameFontSize] = useState('2.25rem');
+  const [qrCodeUrl, setQrCodeUrl] = useState<string>('');
+  const certificateRef = useRef<HTMLDivElement>(null);
+  const [isGenerating, setIsGenerating] = useState(false);
+  const [certificateImage, setCertificateImage] = useState<string>('');
+  const [showTemplate, setShowTemplate] = useState(true);
+
+  useEffect(() => {
+    if (certId) {
+      decodeCertificateId(certId)
+        .then(setDecodedInfo)
+        .catch(() => {
+          setError('Invalid certificate ID');
+        });
+    }
+  }, [certId]);
+
+  // Fetch certificate data using the new endpoint
+  const { data: certificateData, isLoading: isLoadingCertificate } =
+    useCertificatePublicData(decodedInfo?.userId || '', !!decodedInfo?.userId);
+
+  // Generate QR Code
+  useEffect(() => {
+    if (certId) {
+      // Use encodeURIComponent to properly encode the certId for the URL
+      const encodedCertId = encodeURIComponent(certId);
+      const certificateUrl = `${window.location.origin}/certificate/${encodedCertId}`;
+      QRCode.toDataURL(certificateUrl, {
+        width: 200,
+        margin: 1,
+        color: {
+          dark: '#000000',
+          light: '#ffffff',
+        },
+      })
+        .then(setQrCodeUrl)
+        .catch((err) => console.error('QR Code generation failed:', err));
+    }
+  }, [certId]);
+
+  const certificate = certificateData?.data;
+  const team = certificate?.team;
+  const submission = certificate?.submission;
+  const certificateUser = certificate?.user;
+
+  const isLoading = (!decodedInfo && !error) || isLoadingCertificate;
+
+  // Certificate name from the user data
+  const certificateName = certificateUser?.fullname;
+
+  // Check if current user is viewing their own certificate (team member)
+  const isTeamMember = session?.user?.id === decodedInfo?.userId;
+
+  // Dynamic font sizing: shrink by 2px if height exceeds 80px
+  useEffect(() => {
+    const adjustFontSize = (
+      element: HTMLElement | null,
+      maxHeight: number,
+      startSize: number,
+      setter: (size: string) => void
+    ) => {
+      if (!element) return;
+
+      let currentSize = startSize;
+      element.style.fontSize = `${currentSize}px`;
+
+      while (element.offsetHeight > maxHeight && currentSize > 1) {
+        currentSize -= 2;
+        element.style.fontSize = `${currentSize}px`;
+      }
+
+      setter(`${currentSize}px`);
+    };
+
+    const timer = setTimeout(() => {
+      adjustFontSize(teamNameRef.current, 80, 20, setTeamNameFontSize);
+      adjustFontSize(userNameRef.current, 80, 36, setUserNameFontSize);
+    }, 0);
+
+    return () => clearTimeout(timer);
+  }, [team?.name, certificateName]);
+
+  // Generate certificate canvas screenshot
+  useEffect(() => {
+    const generateCertificate = async () => {
+      if (!certificateRef.current || !team || !submission || !qrCodeUrl) return;
+
+      setIsGenerating(true);
+      try {
+        // Wait longer for fonts and images to load properly
+        await new Promise((resolve) => setTimeout(resolve, 1500));
+
+        const canvas = await html2canvas(certificateRef.current, {
+          scale: 4,
+          useCORS: true,
+          backgroundColor: '#ffffff',
+          logging: false,
+          width: 1000,
+          height: (1000 * 2480) / 3508,
+          allowTaint: true,
+          imageTimeout: 0,
+          removeContainer: true,
+        });
+
+        const imageUrl = canvas.toDataURL('image/png', 1.0);
+        setCertificateImage(imageUrl);
+        setShowTemplate(false);
+      } catch (error) {
+        console.error('Failed to generate certificate:', error);
+      } finally {
+        setIsGenerating(false);
+      }
+    };
+
+    generateCertificate();
+  }, [team, submission, qrCodeUrl]);
+
+  // Download certificate
+  const handleDownloadCertificate = () => {
+    if (!certificateImage) return;
+
+    const link = document.createElement('a');
+    link.href = certificateImage;
+    link.download = `certificate-${team?.name || 'hackathon'}.png`;
+    link.click();
+  };
+
+  // Print certificate
+  const handlePrintCertificate = () => {
+    if (!certificateImage) return;
+
+    const printWindow = window.open('', '_blank');
+    if (printWindow) {
+      printWindow.document.write(`
+        <html>
+          <head>
+            <title>Certificate - ${team?.name}</title>
+            <style>
+              body { margin: 0; display: flex; justify-content: center; align-items: center; min-height: 100vh; }
+              img { max-width: 100%; height: auto; }
+              @media print {
+                @page { size: A4 landscape; margin: 0; }
+                body { margin: 0; }
+                img { width: 100%; height: auto; }
+              }
+            </style>
+          </head>
+          <body>
+            <img src="${certificateImage}" />
+          </body>
+        </html>
+      `);
+      printWindow.document.close();
+      printWindow.onload = () => {
+        printWindow.print();
+      };
+    }
+  };
+
+  if (error || !certId) {
+    return (
+      <div className="flex flex-col items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
+        <div className="text-6xl mb-4">❌</div>
+        <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-4">
+          Invalid Certificate
+        </h2>
+        <p className="text-gray-600 dark:text-gray-400 mb-6">
+          {error || 'The certificate ID is invalid or malformed.'}
+        </p>
+        <Button onClick={() => navigate('/')}>Back to Home</Button>
+      </div>
+    );
+  }
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
+        <div className="text-center">
+          <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600 mx-auto mb-4"></div>
+          <div className="text-gray-600 dark:text-gray-400">
+            Loading certificate...
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (!certificateUser) {
+    return (
+      <div className="flex flex-col items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
+        <div className="text-6xl mb-4">📄</div>
+        <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-4">
+          Certificate Not Found
+        </h2>
+        <p className="text-gray-600 dark:text-gray-400 mb-6">
+          The user associated with this certificate could not be found.
+        </p>
+        <Button onClick={() => navigate('/')}>Back to Home</Button>
+      </div>
+    );
+  }
+
+  return (
+    <div className="min-h-screen bg-gray-50 dark:bg-gray-950">
+      {/* Print Styles */}
+      <style>{`
+        @media print {
+          @page {
+            size: A4 landscape;
+            margin: 0;
+          }
+          body {
+            margin: 0;
+            padding: 0;
+          }
+          body * {
+            visibility: hidden;
+          }
+          #certificate-wrapper {
+            visibility: visible;
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            background: white;
+          }
+          #certificate, #certificate * {
+            visibility: visible;
+          }
+          #certificate {
+            position: relative;
+            max-width: 100%;
+            page-break-after: avoid;
+          }
+          .no-print {
+            display: none !important;
+          }
+        }
+
+        /* Mobile responsive - zoom out to fit */
+        @media (max-width: 768px) {
+          #certificate-container {
+            transform-origin: top center;
+          }
+        }
+      `}</style>
+
+      {/* Header */}
+      <div className="bg-white dark:bg-gray-900 border-b dark:border-gray-700 no-print">
+        <div className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
+          <div className="flex items-center justify-between">
+            <div>
+              <h1 className="text-3xl font-bold text-gray-900 dark:text-white">
+                Certificate
+              </h1>
+              <p className="text-gray-600 dark:text-gray-400 mt-1">
+                {team?.name}
+              </p>
+            </div>
+            {team && isTeamMember && (
+              <Button
+                variant="secondary"
+                onClick={() => navigate(`/teams/${team.id}/submission`)}
+              >
+                Back to Submission
+              </Button>
+            )}
+          </div>
+        </div>
+      </div>
+
+      {/* Certificate Content */}
+      <div
+        className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-12"
+        id="certificate-wrapper"
+      >
+        {/* Hidden Template for Canvas Generation */}
+        <div
+          className={showTemplate ? 'block' : 'hidden'}
+          style={{ position: 'absolute', left: '-9999px' }}
+        >
+          <div
+            ref={certificateRef}
+            id="certificate-template"
+            style={{
+              position: 'relative',
+              backgroundImage: 'url(/images/blank_cert.svg)',
+              backgroundSize: 'cover',
+              backgroundPosition: 'center',
+              width: '1000px',
+              height: `${(1000 * 2480) / 3508}px`,
+            }}
+          >
+            {/* Team Name - positioned in middle between "Diberikan Kepada" and "Telah Berpartisipasi" */}
+            <div
+              style={{
+                position: 'absolute',
+                top: '41%',
+                left: '3.5%',
+                width: '55%',
+              }}
+            >
+              <h3
+                ref={teamNameRef}
+                style={{
+                  fontFamily: 'Poppins, sans-serif',
+                  fontWeight: 'bold',
+                  color: '#59bef5',
+                  textAlign: 'left',
+                  fontSize: '32px',
+                  lineHeight: '1.2',
+                  wordBreak: 'break-word',
+                  margin: 0,
+                }}
+              >
+                {team?.name}
+              </h3>
+            </div>
+
+            {/* User Name - positioned below team name */}
+            <div
+              style={{
+                position: 'absolute',
+                top: '45%',
+                left: '3.5%',
+                width: '55%',
+              }}
+            >
+              <h3
+                ref={userNameRef}
+                style={{
+                  fontFamily: 'Poppins, sans-serif',
+                  fontWeight: 'bold',
+                  color: '#59bef5',
+                  textAlign: 'left',
+                  fontSize: '40px',
+                  lineHeight: '1.2',
+                  wordBreak: 'break-word',
+                  margin: 0,
+                }}
+              >
+                {certificateName || 'N/A'}
+              </h3>
+            </div>
+
+            {/* QR Code - positioned in the white box area */}
+            <div
+              style={{
+                position: 'absolute',
+                top: '33%',
+                right: '9.3%',
+                width: '190px',
+                height: '190px',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+              }}
+            >
+              {qrCodeUrl && (
+                <img
+                  src={qrCodeUrl}
+                  alt="Certificate QR Code"
+                  style={{ width: '190px', height: '190px', display: 'block' }}
+                />
+              )}
+            </div>
+          </div>
+        </div>
+
+        {/* Display Certificate Image */}
+        <div className="bg-white dark:bg-gray-900 rounded-lg shadow-xl dark:shadow-gray-950/50 overflow-hidden p-2">
+          {isGenerating && (
+            <div className="flex items-center justify-center p-12">
+              <div className="text-center">
+                <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600 mx-auto mb-4"></div>
+                <div className="text-gray-600 dark:text-gray-400">
+                  Generating certificate...
+                </div>
+              </div>
+            </div>
+          )}
+
+          {certificateImage && !isGenerating && (
+            <img
+              src={certificateImage}
+              alt="Certificate"
+              className="w-full h-auto"
+              style={{ maxWidth: '100%', height: 'auto' }}
+            />
+          )}
+
+          {/* Actions */}
+          {isTeamMember && (
+            <div className="bg-gray-50 dark:bg-gray-900 p-6 grid grid-cols-2 xl:grid-cols-3 gap-3 justify-center no-print">
+              <Button
+                variant="secondary"
+                onClick={handleDownloadCertificate}
+                className="flex items-center gap-2"
+                disabled={isGenerating}
+              >
+                {isGenerating ? '⏳ Generating...' : '📥 Download'}
+              </Button>
+              <Button
+                variant="secondary"
+                onClick={handlePrintCertificate}
+                className="flex items-center gap-2"
+                disabled={isGenerating}
+              >
+                {isGenerating ? '⏳ Generating...' : '🖨️ Print'}
+              </Button>
+              {team && (
+                <Button
+                  onClick={() => navigate(`/teams/${team.id}/submission`)}
+                  variant="secondary"
+                  className="col-span-2 flex items-center gap-2 xl:col-span-1"
+                >
+                  View Submission
+                </Button>
+              )}
+            </div>
+          )}
+        </div>
+
+        {/* Info Box */}
+        <div className="mt-8 bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-lg p-6 no-print">
+          <h3 className="font-bold text-blue-900 dark:text-blue-100 mb-2">
+            Certificate Information
+          </h3>
+          <p className="text-sm text-blue-800 dark:text-blue-200">
+            This certificate is a digital record of your hackathon participation
+            and project submission. You can print or save this page as a PDF for
+            your records.
+          </p>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default CertificatePage;

apps/hackathon/src/app/certificate/winner/[certId]/page.tsx

@@ -0,0 +1,605 @@
+import { FC, ReactElement, useEffect, useMemo, useRef, useState } from 'react';
+import { useNavigate, useParams } from 'react-router';
+import { Button } from '@imphnen-frontend-service/ui/atoms';
+import { Icon } from '@iconify/react';
+import { decodeWinnerCertificateId } from '../../../../utils/certificate';
+import {
+  useAuthStore,
+  useMyTeams,
+  useTeamById,
+  useTeamSubmission,
+  useWinners,
+} from '@imphnen-frontend-service/service';
+import QRCode from 'qrcode';
+import html2canvas from 'html2canvas';
+
+type WinnerEntry = {
+  team_id: string;
+  rank: number;
+  team?: {
+    id: string;
+    name: string;
+  };
+};
+
+const formatOrdinalRank = (rank: number): string => {
+  const mod100 = rank % 100;
+  if (mod100 >= 11 && mod100 <= 13) return `${rank}th`;
+
+  switch (rank % 10) {
+    case 1:
+      return `${rank}st`;
+    case 2:
+      return `${rank}nd`;
+    case 3:
+      return `${rank}rd`;
+    default:
+      return `${rank}th`;
+  }
+};
+
+// Keep the template size aligned with the SVG native size (842x595) using an integer multiplier.
+// This reduces sub-pixel scaling artifacts (blur) on thin lines when rasterizing with html2canvas.
+const CERT_WIDTH = 842 * 2;
+const CERT_HEIGHT = 595 * 2;
+
+// Balance between output sharpness and file size.
+// Output resolution will be (CERT_WIDTH * EXPORT_SCALE) x (CERT_HEIGHT * EXPORT_SCALE).
+const EXPORT_SCALE = 2;
+
+// The original layout was tuned around a ~1000px-wide template.
+// We keep the same visual proportions by scaling fixed pixel values.
+const LAYOUT_BASE_WIDTH = 1000;
+const LAYOUT_SCALE = CERT_WIDTH / LAYOUT_BASE_WIDTH;
+const s = (px: number) => Math.round(px * LAYOUT_SCALE);
+
+const CertificateWinnerPage: FC = (): ReactElement => {
+  const { certId } = useParams<{ certId: string }>();
+  const navigate = useNavigate();
+  const { session } = useAuthStore();
+  const { data: myTeamsData } = useMyTeams();
+  const {
+    data: winnersResponse,
+    isLoading: isLoadingWinners,
+    isError: isWinnersError,
+  } = useWinners();
+
+  const [decodedTeamId, setDecodedTeamId] = useState<string>('');
+  const [error, setError] = useState<string | null>(null);
+
+  const [qrCodeUrl, setQrCodeUrl] = useState<string>('');
+  const certificateRef = useRef<HTMLDivElement>(null);
+  const [isGenerating, setIsGenerating] = useState(false);
+  const [certificateImage, setCertificateImage] = useState<string>('');
+  const [showTemplate, setShowTemplate] = useState(true);
+
+  useEffect(() => {
+    if (!certId) return;
+
+    decodeWinnerCertificateId(certId)
+      .then((decoded) => setDecodedTeamId(decoded.teamId))
+      .catch(() => setError('Invalid certificate ID'));
+  }, [certId]);
+
+  const winners = useMemo(
+    () => (winnersResponse?.data || []) as WinnerEntry[],
+    [winnersResponse?.data]
+  );
+  const winnerEntry = useMemo(() => {
+    if (!decodedTeamId) return undefined;
+    return winners.find((w) => w.team_id === decodedTeamId);
+  }, [decodedTeamId, winners]);
+
+  const rankLabel = useMemo(() => {
+    if (!winnerEntry?.rank) return '';
+    return formatOrdinalRank(winnerEntry.rank);
+  }, [winnerEntry?.rank]);
+
+  const { data: teamData, isLoading: isLoadingTeam } = useTeamById(
+    decodedTeamId,
+    !!decodedTeamId
+  );
+
+  const { data: submissionData, isLoading: isLoadingSubmission } =
+    useTeamSubmission(decodedTeamId, !!decodedTeamId);
+
+  const team = teamData?.data;
+  const submission = submissionData?.data;
+  const submissionName = submission?.project_name || '(Submission unavailable)';
+
+  const memberNames = useMemo(() => {
+    const members = team?.members || [];
+    return members
+      .map((m) => m.user?.fullname)
+      .filter((name): name is string => !!name);
+  }, [team?.members]);
+
+  const isWinnerTeam = !!winnerEntry;
+  const isTeamMember =
+    !!session?.user?.id &&
+    !!decodedTeamId &&
+    (myTeamsData?.data || []).some(
+      (t) => (t as { id?: string } | null | undefined)?.id === decodedTeamId
+    );
+
+  // Generate QR Code (public link)
+  useEffect(() => {
+    if (!certId) return;
+
+    const encodedCertId = encodeURIComponent(certId);
+    const certificateUrl = `${window.location.origin}/certificate/winner/${encodedCertId}`;
+
+    QRCode.toDataURL(certificateUrl, {
+      width: s(200),
+      margin: 1,
+      color: {
+        dark: '#000000',
+        light: '#ffffff',
+      },
+    })
+      .then(setQrCodeUrl)
+      .catch((err) => console.error('QR Code generation failed:', err));
+  }, [certId]);
+
+  // Generate certificate canvas screenshot
+  useEffect(() => {
+    const generateCertificate = async () => {
+      if (!certificateRef.current) return;
+      if (!team?.name) return;
+      if (!qrCodeUrl) return;
+      if (!winnerEntry?.rank) return;
+      if (isLoadingSubmission) return;
+
+      setIsGenerating(true);
+      try {
+        setShowTemplate(true);
+        await new Promise((resolve) => setTimeout(resolve, 1500));
+
+        const canvas = await html2canvas(certificateRef.current, {
+          scale: EXPORT_SCALE,
+          useCORS: true,
+          backgroundColor: '#ffffff',
+          logging: false,
+          width: CERT_WIDTH,
+          height: CERT_HEIGHT,
+          allowTaint: true,
+          imageTimeout: 0,
+          removeContainer: true,
+        });
+
+        const imageUrl = canvas.toDataURL('image/png', 1.0);
+        setCertificateImage(imageUrl);
+        setShowTemplate(false);
+      } catch (e) {
+        console.error('Failed to generate certificate:', e);
+      } finally {
+        setIsGenerating(false);
+      }
+    };
+
+    generateCertificate();
+  }, [
+    team?.name,
+    memberNames,
+    qrCodeUrl,
+    winnerEntry?.rank,
+    isLoadingSubmission,
+    submissionName,
+  ]);
+
+  const handleDownloadCertificate = () => {
+    if (!certificateImage) return;
+
+    const link = document.createElement('a');
+    link.href = certificateImage;
+    link.download = `winner-certificate-${team?.name || 'hackathon'}.png`;
+    link.click();
+  };
+
+  const handlePrintCertificate = () => {
+    if (!certificateImage) return;
+
+    const printWindow = window.open('', '_blank');
+    if (!printWindow) return;
+
+    printWindow.document.write(`
+      <html>
+        <head>
+          <title>Certificate - ${team?.name}</title>
+          <style>
+            body { margin: 0; display: flex; justify-content: center; align-items: center; min-height: 100vh; }
+            img { max-width: 100%; height: auto; }
+            @media print {
+              @page { size: A4 landscape; margin: 0; }
+              body { margin: 0; }
+              img { width: 100%; height: auto; }
+            }
+          </style>
+        </head>
+        <body>
+          <img src="${certificateImage}" />
+        </body>
+      </html>
+    `);
+    printWindow.document.close();
+    printWindow.onload = () => {
+      printWindow.print();
+    };
+  };
+
+  if (error || !certId) {
+    return (
+      <div className="flex flex-col items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
+        <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-4">
+          Invalid Certificate
+        </h2>
+        <p className="text-gray-600 dark:text-gray-400 mb-6">
+          {error || 'The certificate ID is invalid or malformed.'}
+        </p>
+        <Button onClick={() => navigate('/')}>Back to Home</Button>
+      </div>
+    );
+  }
+
+  if (!decodedTeamId || isLoadingTeam) {
+    return (
+      <div className="flex items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
+        <div className="text-center">
+          <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600 mx-auto mb-4"></div>
+          <div className="text-gray-600 dark:text-gray-400">
+            Loading certificate...
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (isLoadingWinners) {
+    return (
+      <div className="flex items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
+        <div className="text-center">
+          <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600 mx-auto mb-4"></div>
+          <div className="text-gray-600 dark:text-gray-400">
+            Loading winners...
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (isWinnersError) {
+    return (
+      <div className="flex flex-col items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
+        <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-4">
+          Unable to Load Winners
+        </h2>
+        <p className="text-gray-600 dark:text-gray-400 mb-6">
+          Please try again later.
+        </p>
+        <Button onClick={() => navigate('/')}>Back to Home</Button>
+      </div>
+    );
+  }
+
+  if (!isWinnerTeam) {
+    return (
+      <div className="flex flex-col items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
+        <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-4">
+          Certificate Not Found
+        </h2>
+        <p className="text-gray-600 dark:text-gray-400 mb-6">
+          This team is not listed as a hackathon winner.
+        </p>
+        <Button onClick={() => navigate('/')}>Back to Home</Button>
+      </div>
+    );
+  }
+
+  if (!team?.name) {
+    return (
+      <div className="flex flex-col items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
+        <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-4">
+          Team Not Found
+        </h2>
+        <p className="text-gray-600 dark:text-gray-400 mb-6">
+          The team associated with this certificate could not be loaded.
+        </p>
+        <Button onClick={() => navigate('/')}>Back to Home</Button>
+      </div>
+    );
+  }
+
+  return (
+    <div className="min-h-screen bg-gray-50 dark:bg-gray-950">
+      {/* Header */}
+      <div className="bg-white dark:bg-gray-900 border-b dark:border-gray-700 no-print">
+        <div className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
+          <div className="flex items-center justify-between">
+            <div>
+              <h1 className="text-3xl font-bold text-gray-900 dark:text-white">
+                Winner Certificate
+              </h1>
+              <p className="text-gray-600 dark:text-gray-400 mt-1">
+                {team.name}
+              </p>
+            </div>
+            {isTeamMember && (
+              <Button
+                variant="secondary"
+                onClick={() => navigate('/dashboard')}
+              >
+                Back to Dashboard
+              </Button>
+            )}
+          </div>
+        </div>
+      </div>
+
+      <div
+        className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-12"
+        id="certificate-wrapper"
+      >
+        {/* Hidden Template for Canvas Generation */}
+        <div
+          className={showTemplate ? 'block' : 'hidden'}
+          style={{ position: 'absolute', left: '-9999px' }}
+        >
+          <div
+            ref={certificateRef}
+            id="certificate-template"
+            style={{
+              position: 'relative',
+              backgroundImage: 'url(/images/blank_winner_cert.svg)',
+              backgroundSize: '100% 100%',
+              backgroundRepeat: 'no-repeat',
+              backgroundPosition: 'center',
+              width: `${CERT_WIDTH}px`,
+              height: `${CERT_HEIGHT}px`,
+            }}
+          >
+            <style>{`
+              #winner-members li::marker {
+                color: #59bef5;
+              }
+            `}</style>
+
+            {/* Team Name */}
+            <div
+              style={{
+                position: 'absolute',
+                top: '35%',
+                left: '3.5%',
+                width: '55%',
+              }}
+            >
+              <h3
+                style={{
+                  fontFamily: 'Poppins, sans-serif',
+                  fontWeight: 'bold',
+                  color: '#59bef5',
+                  textAlign: 'left',
+                  fontSize: `${s(28)}px`,
+                  lineHeight: '1.2',
+                  wordBreak: 'break-word',
+                  margin: 0,
+                }}
+              >
+                {team.name}
+              </h3>
+            </div>
+
+            {/* Members list */}
+            <div
+              style={{
+                position: 'absolute',
+                top: '40.5%',
+                left: '3.5%',
+                width: '55%',
+              }}
+            >
+              <ul
+                id="winner-members"
+                style={{
+                  margin: 0,
+                  fontFamily: 'Poppins, sans-serif',
+                  fontSize: `${s(18)}px`,
+                  lineHeight: '1.35',
+                  color: '#59bef5',
+                }}
+              >
+                {(memberNames.length
+                  ? memberNames
+                  : ['(Members unavailable)']
+                ).map((name) => (
+                  <li key={name}>• {name}</li>
+                ))}
+              </ul>
+            </div>
+
+            {/* Award text */}
+            <div
+              style={{
+                position: 'absolute',
+                top: '60%',
+                left: '3.5%',
+                width: '60%',
+              }}
+            >
+              <p
+                style={{
+                  margin: 0,
+                  fontFamily: 'Poppins, sans-serif',
+                  fontSize: `${s(18)}px`,
+                  lineHeight: '1.35',
+                  color: '#6B6B6B',
+                }}
+              >
+                Diberikan sebagai penghargaan atas pencapaian meraih
+                <br />
+                <b>JUARA {winnerEntry.rank}</b> pada Hackathon IMPHNEN x
+                Kolosal.ai
+                <br />
+                <span>
+                  dengan nama project: <b>{submissionName}</b>
+                </span>
+              </p>
+            </div>
+
+            {/* Rank badge */}
+            {!!rankLabel && (
+              <div
+                style={{
+                  position: 'absolute',
+                  top: '8%',
+                  right: '8.5%',
+                  width: `${s(190)}px`,
+                  display: 'flex',
+                  justifyContent: 'center',
+                }}
+              >
+                <div
+                  style={{
+                    display: 'inline-flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    padding: `${s(6)}px ${s(16)}px`,
+                    textAlign: 'center',
+                    fontFamily: 'Poppins, sans-serif',
+                    fontWeight: 700,
+                    color: '#78350F',
+                    fontSize: `${s(24)}px`,
+                    lineHeight: '1',
+                  }}
+                >
+                  {rankLabel}
+                </div>
+              </div>
+            )}
+
+            {/* QR Code (same placement as existing certificate page) */}
+            <div
+              style={{
+                position: 'absolute',
+                top: '33%',
+                right: '9.3%',
+                width: `${s(190)}px`,
+                height: `${s(190)}px`,
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+              }}
+            >
+              {qrCodeUrl && (
+                <img
+                  src={qrCodeUrl}
+                  alt="Certificate QR Code"
+                  style={{
+                    width: `${s(190)}px`,
+                    height: `${s(190)}px`,
+                    display: 'block',
+                  }}
+                />
+              )}
+            </div>
+          </div>
+        </div>
+
+        {/* Display Certificate Image */}
+        <div className="bg-white dark:bg-gray-900 rounded-lg shadow-xl dark:shadow-gray-950/50 overflow-hidden p-2">
+          {isGenerating && (
+            <div className="flex items-center justify-center p-12">
+              <div className="text-center">
+                <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600 mx-auto mb-4"></div>
+                <div className="text-gray-600 dark:text-gray-400">
+                  Generating certificate...
+                </div>
+              </div>
+            </div>
+          )}
+
+          {certificateImage && !isGenerating && (
+            <img
+              src={certificateImage}
+              alt="Winner Certificate"
+              className="w-full h-auto"
+              style={{ maxWidth: '100%', height: 'auto' }}
+            />
+          )}
+
+          {/* Actions */}
+          {isTeamMember && (
+            <div className="bg-gray-50 dark:bg-gray-900 p-6 grid grid-cols-2 xl:grid-cols-3 gap-3 justify-center no-print">
+              <Button
+                variant="secondary"
+                onClick={handleDownloadCertificate}
+                className="flex items-center gap-2"
+                disabled={isGenerating}
+              >
+                {isGenerating ? (
+                  <>
+                    <Icon
+                      icon="svg-spinners:ring-resize"
+                      width="18"
+                      height="18"
+                    />
+                    Generating...
+                  </>
+                ) : (
+                  <>
+                    <Icon
+                      icon="heroicons:arrow-down-tray"
+                      width="18"
+                      height="18"
+                    />
+                    Download
+                  </>
+                )}
+              </Button>
+              <Button
+                variant="secondary"
+                onClick={handlePrintCertificate}
+                className="flex items-center gap-2"
+                disabled={isGenerating}
+              >
+                {isGenerating ? (
+                  <>
+                    <Icon
+                      icon="svg-spinners:ring-resize"
+                      width="18"
+                      height="18"
+                    />
+                    Generating...
+                  </>
+                ) : (
+                  <>
+                    <Icon icon="mdi:printer" width="18" height="18" />
+                    Print
+                  </>
+                )}
+              </Button>
+              <Button
+                onClick={() => navigate('/dashboard')}
+                variant="secondary"
+                className="col-span-2 flex items-center gap-2 xl:col-span-1"
+              >
+                Back to Dashboard
+              </Button>
+            </div>
+          )}
+        </div>
+
+        {/* Info Box */}
+        <div className="mt-8 bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-lg p-6 no-print">
+          <h3 className="font-bold text-blue-900 dark:text-blue-100 mb-2">
+            Certificate Information
+          </h3>
+          <p className="text-sm text-blue-800 dark:text-blue-200">
+            This certificate is a digital record of your hackathon achievement.
+          </p>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default CertificateWinnerPage;

apps/hackathon/src/app/dashboard/page.tsx

@@ -1,19 +1,24 @@
-import { FC, ReactElement, useEffect, useState } from 'react';
+import { FC, ReactElement, useEffect, useMemo, useState } from 'react';
-import { Link } from 'react-router';
+import { Link, useNavigate } from 'react-router';
 import {
   useMyTeams,
   useMyInvitations,
   useRespondToInvitation,
   useAuthStore,
+  useWinners,
 } from '@imphnen-frontend-service/service';
 import { toast } from 'sonner';
 import { Button } from '@imphnen-frontend-service/ui/atoms';
 import { Icon } from '@iconify/react';
 import ProfilePage from '../profile/page';
+import { encodeWinnerCertificateId } from '../../utils/certificate';
 
 // Team features deadline: 2025-11-30 23:59:00 WIB (UTC+7)
 const TEAM_FEATURES_DEADLINE = new Date('2025-11-30T16:59:00Z');
 
+// Submission deadline: 2025-12-07 23:59:00 WIB (UTC+7)
+const SUBMISSION_DEADLINE = new Date('2025-12-07T16:59:00Z');
+
 type Invitation = {
   id: string;
   team: {
@@ -36,10 +41,48 @@ type Invitation = {
 
 const DashboardPage: FC = (): ReactElement => {
   const { session } = useAuthStore();
+  const navigate = useNavigate();
   const [showProfileModal, setShowProfileModal] = useState(false);
+  const [timeLeft, setTimeLeft] = useState<{
+    days: number;
+    hours: number;
+    minutes: number;
+    seconds: number;
+  } | null>(null);
 
   // Check if team features are closed
   const isTeamFeaturesClosed = new Date() >= TEAM_FEATURES_DEADLINE;
+
+  // Check if submission deadline passed
+  const isSubmissionDeadlinePassed = new Date() >= SUBMISSION_DEADLINE;
+
+  // Countdown timer
+  useEffect(() => {
+    if (isSubmissionDeadlinePassed) return;
+
+    const calculateTimeLeft = () => {
+      const now = new Date();
+      const difference = SUBMISSION_DEADLINE.getTime() - now.getTime();
+
+      if (difference <= 0) {
+        setTimeLeft(null);
+        return;
+      }
+
+      const days = Math.floor(difference / (1000 * 60 * 60 * 24));
+      const hours = Math.floor((difference / (1000 * 60 * 60)) % 24);
+      const minutes = Math.floor((difference / 1000 / 60) % 60);
+      const seconds = Math.floor((difference / 1000) % 60);
+
+      setTimeLeft({ days, hours, minutes, seconds });
+    };
+
+    calculateTimeLeft();
+    const timer = setInterval(calculateTimeLeft, 1000);
+
+    return () => clearInterval(timer);
+  }, [isSubmissionDeadlinePassed]);
+
   // Lock background scroll when profile modal is open
   useEffect(() => {
     if (showProfileModal) {
@@ -51,6 +94,7 @@ const DashboardPage: FC = (): ReactElement => {
     }
   }, [showProfileModal]);
   const { data: teamsData } = useMyTeams();
+  const { data: winnersResponse } = useWinners();
   const { data: invitationsData } = useMyInvitations();
   const { mutateAsync: respondToInvitation } = useRespondToInvitation();
 
@@ -59,6 +103,13 @@ const DashboardPage: FC = (): ReactElement => {
   const invitations: Invitation[] = (invitationsData?.data ||
     []) as Invitation[];
 
+  const winnerEntry = useMemo(() => {
+    const team = (myTeams[0] as { id?: string } | null | undefined) || null;
+    const winners = winnersResponse?.data || [];
+    if (!team?.id) return null;
+    return winners.find((w) => w.team_id === team.id) || null;
+  }, [myTeams, winnersResponse?.data]);
+
   const handleAcceptInvitation = async (invitationId: string) => {
     try {
       await respondToInvitation({ invitationId, action: 'accept' });
@@ -94,6 +145,88 @@ const DashboardPage: FC = (): ReactElement => {
           )}
         </div>
 
+        {/* Winner Banner */}
+        {winnerEntry && myTeams.length > 0 && (
+          <div className="mb-8 bg-amber-50 dark:bg-amber-900/20 border-2 border-amber-400 dark:border-amber-500 rounded-lg p-6">
+            <div className="flex items-center justify-between flex-wrap gap-4">
+              <div className="flex items-center space-x-3 flex-1 min-w-0">
+                <span className="text-4xl shrink-0">🏆</span>
+                <div className="min-w-0">
+                  <h3 className="font-bold text-amber-900 dark:text-amber-100 text-lg">
+                    Selamat! Tim Anda meraih JUARA {winnerEntry.rank}
+                  </h3>
+                  <p className="text-amber-700 dark:text-amber-300 text-sm">
+                    Anda dapat generate sertifikat penghargaan dan
+                    membagikannya.
+                  </p>
+                </div>
+              </div>
+              <button
+                onClick={async () => {
+                  const team = myTeams[0] as { id?: string } | null | undefined;
+                  if (!team?.id) return;
+                  const certId = await encodeWinnerCertificateId(team.id);
+                  navigate(`/certificate/winner/${encodeURIComponent(certId)}`);
+                }}
+                className="shrink-0 px-6 py-2 bg-amber-600 hover:bg-amber-700 dark:bg-amber-600 dark:hover:bg-amber-700 text-white font-medium rounded-lg transition-colors cursor-pointer"
+              >
+                Generate Sertifikat Juara
+              </button>
+            </div>
+          </div>
+        )}
+
+        {/* Countdown Timer */}
+        {timeLeft && !isSubmissionDeadlinePassed && (
+          <div className="mb-8 bg-blue-50 dark:bg-blue-900/20 border-2 border-blue-500 rounded-lg p-6">
+            <div className="flex items-start space-x-3">
+              <span className="text-3xl">⏰</span>
+              <div className="flex-1">
+                <h3 className="font-bold text-blue-900 dark:text-blue-100 text-lg">
+                  Submission Deadline
+                </h3>
+                <p className="text-blue-800 dark:text-blue-200 mt-2 text-sm font-sans">
+                  Project submissions close on December 7, 2025 at 23:59 WIB
+                </p>
+                <div className="mt-4 grid grid-cols-4 gap-4">
+                  <div className="bg-white dark:bg-gray-800 rounded-lg p-3 text-center">
+                    <div className="text-2xl font-bold text-blue-600 dark:text-blue-400">
+                      {timeLeft.days}
+                    </div>
+                    <div className="text-xs text-gray-600 dark:text-gray-400 mt-1">
+                      Days
+                    </div>
+                  </div>
+                  <div className="bg-white dark:bg-gray-800 rounded-lg p-3 text-center">
+                    <div className="text-2xl font-bold text-blue-600 dark:text-blue-400">
+                      {timeLeft.hours.toString().padStart(2, '0')}
+                    </div>
+                    <div className="text-xs text-gray-600 dark:text-gray-400 mt-1">
+                      Hours
+                    </div>
+                  </div>
+                  <div className="bg-white dark:bg-gray-800 rounded-lg p-3 text-center">
+                    <div className="text-2xl font-bold text-blue-600 dark:text-blue-400">
+                      {timeLeft.minutes.toString().padStart(2, '0')}
+                    </div>
+                    <div className="text-xs text-gray-600 dark:text-gray-400 mt-1">
+                      Minutes
+                    </div>
+                  </div>
+                  <div className="bg-white dark:bg-gray-800 rounded-lg p-3 text-center">
+                    <div className="text-2xl font-bold text-blue-600 dark:text-blue-400">
+                      {timeLeft.seconds.toString().padStart(2, '0')}
+                    </div>
+                    <div className="text-xs text-gray-600 dark:text-gray-400 mt-1">
+                      Seconds
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        )}
+
         {invitations.length > 0 && (
           <div className="mb-8 bg-primary-50 dark:bg-blue-900/20 border border-primary-200 dark:border-blue-800 rounded-lg p-6">
             <h2 className="text-xl font-bold text-gray-900 dark:text-white mb-4">
@@ -103,7 +236,8 @@ const DashboardPage: FC = (): ReactElement => {
               <div className="mb-4 bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-800 rounded-lg p-3">
                 <p className="text-sm text-amber-700 dark:text-amber-300 flex items-center gap-2">
                   <Icon icon="mdi:clock-alert" className="text-lg shrink-0" />
-                  Team features are closed. You can no longer accept invitations.
+                  Team features are closed. You can no longer accept
+                  invitations.
                 </p>
               </div>
             )}
@@ -172,7 +306,10 @@ const DashboardPage: FC = (): ReactElement => {
                         />
                       ) : (
                         <div className="w-16 h-16 rounded-full bg-gray-200 dark:bg-gray-700 flex items-center justify-center shrink-0">
-                          <Icon icon="mdi:account-group" className="text-gray-500 dark:text-gray-400 text-2xl" />
+                          <Icon
+                            icon="mdi:account-group"
+                            className="text-gray-500 dark:text-gray-400 text-2xl"
+                          />
                         </div>
                       )}
                       <div className="flex-1 min-w-0">
@@ -182,19 +319,33 @@ const DashboardPage: FC = (): ReactElement => {
                         <div className="text-sm text-gray-600 dark:text-gray-400 flex items-center gap-3 font-sans mt-2">
                           {team.has_submission && (
                             <span className="inline-flex items-center gap-1 px-2 py-0.5 rounded text-xs font-medium bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 shrink-0">
-                              <Icon icon="mdi:check-circle" className="text-sm" />
+                              <Icon
+                                icon="mdi:check-circle"
+                                className="text-sm"
+                              />
                               Submitted
                             </span>
                           )}
                           {team.city && (
                             <span className="flex items-center gap-1 truncate">
-                              <Icon icon="mdi:map-marker" className="shrink-0" />
+                              <Icon
+                                icon="mdi:map-marker"
+                                className="shrink-0"
+                              />
                               <span className="truncate">{team.city}</span>
                             </span>
                           )}
                           <span className="flex items-center gap-1 shrink-0">
                             <Icon icon="mdi:account-group" />
-                            {team.member_count || team.members?.length || 0} member{(team.member_count || team.members?.length || 0) !== 1 ? 's' : ''}
+                            {team.member_count ||
+                              team.members?.length ||
+                              0}{' '}
+                            member
+                            {(team.member_count ||
+                              team.members?.length ||
+                              0) !== 1
+                              ? 's'
+                              : ''}
                           </span>
                         </div>
                       </div>

apps/hackathon/src/app/layout.tsx

@@ -52,6 +52,12 @@ export default function RootLayout() {
         return;
       }
 
+      // Certificate page - allow public access
+      if (pathname.startsWith('/certificate/')) {
+        setIsChecking(false);
+        return;
+      }
+
       // Require authentication for all other routes
       if (!session) {
         navigate('/auth/login', { replace: true });

apps/hackathon/src/app/page.tsx

@@ -554,7 +554,7 @@ export default function HomePage() {
             {/* Judge 2 */}
             <div className="flex flex-col justify-between bg-white dark:bg-gray-800 rounded-xl px-4 py-8 shadow-lg text-center">
               <h3 className="text-p3 font-bold mb-1 dark:text-white">
-                Anka Tama
+                Muhammad Alif Ramadhan
               </h3>
               <div>
                 <p className="text-primary-500 font-semibold mb-1">Admin</p>

apps/hackathon/src/app/teams/[teamId]/submission/page.tsx

@@ -1,11 +1,13 @@
 import { FC, ReactElement } from 'react';
 import { Button } from '@imphnen-frontend-service/ui/atoms';
 import { useNavigate, useParams } from 'react-router';
-import { useTeamById, useTeamSubmission } from '@imphnen-frontend-service/service';
+import { useTeamById, useTeamSubmission, useAuthStore } from '@imphnen-frontend-service/service';
+import { encodeCertificateId } from '../../../../utils/certificate';
 
 const SubmissionViewPage: FC = (): ReactElement => {
   const { teamId } = useParams<{ teamId: string }>();
   const navigate = useNavigate();
+  const { session } = useAuthStore();
 
   const { data: teamData } = useTeamById(teamId || '');
   const { data: submissionData, isLoading } = useTeamSubmission(teamId || '', !!teamId);
@@ -15,18 +17,18 @@ const SubmissionViewPage: FC = (): ReactElement => {
 
   if (isLoading) {
     return (
-      <div className="flex items-center justify-center min-h-screen bg-gray-50 dark:bg-neutral-950">
+      <div className="flex items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
-        <div className="text-gray-600 dark:text-neutral-400">Loading submission...</div>
+        <div className="text-gray-600 dark:text-gray-400">Loading submission...</div>
       </div>
     );
   }
 
   if (!submission) {
     return (
-      <div className="flex flex-col items-center justify-center min-h-screen bg-gray-50 dark:bg-neutral-950">
+      <div className="flex flex-col items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
         <div className="text-6xl mb-4">📄</div>
         <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-4">No Submission Yet</h2>
-        <p className="text-gray-600 dark:text-neutral-400 mb-4">Your team hasn't submitted a project</p>
+        <p className="text-gray-600 dark:text-gray-400 mb-4">Your team hasn't submitted a project</p>
         <Button onClick={() => navigate(`/teams/${teamId}`)}>Back to Team</Button>
       </div>
     );
@@ -43,13 +45,13 @@ const SubmissionViewPage: FC = (): ReactElement => {
     : 'Not submitted';
 
   return (
-    <div className="min-h-screen bg-gray-50 dark:bg-neutral-950">
+    <div className="min-h-screen bg-gray-50 dark:bg-gray-950">
-      <div className="bg-white dark:bg-neutral-900 border-b dark:border-neutral-700">
+      <div className="bg-white dark:bg-gray-900 border-b dark:border-gray-700">
         <div className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
           <div className="flex items-center justify-between">
             <div>
               <h1 className="text-3xl font-bold text-gray-900 dark:text-white">Project Submission</h1>
-              <p className="text-gray-600 dark:text-neutral-400 mt-1">{team?.name}</p>
+              <p className="text-gray-600 dark:text-gray-400 mt-1">{team?.name}</p>
             </div>
             <Button variant="secondary" onClick={() => navigate(`/teams/${teamId}`)}>
               Back to Team
@@ -101,9 +103,41 @@ const SubmissionViewPage: FC = (): ReactElement => {
           </div>
         )}
 
-        <div className="bg-white dark:bg-neutral-900 rounded-lg shadow-md dark:shadow-neutral-950/50 overflow-hidden">
+        {/* Certificate Banner - Only show when submission is submitted */}
+        {submission.status === 'submitted' && (
+          <div className="bg-amber-50 dark:bg-amber-900/20 border-2 border-amber-400 dark:border-amber-500 rounded-lg p-6 mb-6">
+            <div className="flex items-center justify-between flex-wrap gap-4">
+              <div className="flex items-center space-x-3 flex-1 min-w-0">
+                <span className="text-4xl shrink-0">🏆</span>
+                <div className="min-w-0">
+                  <h3 className="font-bold text-amber-900 dark:text-amber-100 text-lg">
+                    View Your Certificate
+                  </h3>
+                  <p className="text-amber-700 dark:text-amber-300 text-sm">
+                    Congratulations! Your personalized certificate is ready to download and share.
+                  </p>
+                </div>
+              </div>
+              <button
+                onClick={async () => {
+                  const certId = await encodeCertificateId(
+                    teamId || '',
+                    submission.id,
+                    session?.user?.id || ''
+                  );
+                  navigate(`/certificate/${encodeURIComponent(certId)}`);
+                }}
+                className="shrink-0 px-6 py-2 bg-amber-600 hover:bg-amber-700 dark:bg-amber-600 dark:hover:bg-amber-700 text-white font-medium rounded-lg transition-colors"
+              >
+                Get Certificate
+              </button>
+            </div>
+          </div>
+        )}
+
+        <div className="bg-white dark:bg-gray-900 rounded-lg shadow-md dark:shadow-gray-950/50 overflow-hidden">
           {/* Project Header */}
-          <div className="bg-gradient-to-r from-blue-600 to-blue-800 text-white p-8">
+          <div className="bg-linear-to-r from-blue-600 to-blue-800 text-white p-8">
             <h2 className="text-3xl font-bold mb-2">{submission.project_name}</h2>
             <p className="text-blue-100">Team: {team?.name}</p>
           </div>
@@ -113,8 +147,8 @@ const SubmissionViewPage: FC = (): ReactElement => {
             {/* Description */}
             <div>
               <h3 className="text-lg font-bold text-gray-900 dark:text-white mb-3">Project Description</h3>
-              <div className="bg-gray-50 dark:bg-neutral-800 rounded-lg p-4">
+              <div className="bg-gray-50 dark:bg-gray-800 rounded-lg p-4">
-                <p className="text-gray-700 dark:text-neutral-300 whitespace-pre-wrap">{submission.description}</p>
+                <p className="text-gray-700 dark:text-gray-300 whitespace-pre-wrap">{submission.description}</p>
               </div>
             </div>
 
@@ -170,7 +204,7 @@ const SubmissionViewPage: FC = (): ReactElement => {
                       <img
                         src={url}
                         alt={`Screenshot ${index + 1}`}
-                        className="w-full h-48 object-cover rounded-lg border-2 border-gray-200 dark:border-neutral-700 hover:border-blue-500 dark:hover:border-primary-500 transition-colors cursor-pointer"
+                        className="w-full h-48 object-cover rounded-lg border-2 border-gray-200 dark:border-gray-700 hover:border-blue-500 dark:hover:border-primary-500 transition-colors cursor-pointer"
                       />
                     </a>
                   ))}
@@ -179,11 +213,11 @@ const SubmissionViewPage: FC = (): ReactElement => {
             )}
 
             {/* Submission Info */}
-            <div className="bg-gray-50 dark:bg-neutral-800 rounded-lg p-4 border-t-4 border-blue-600 dark:border-primary-500">
+            <div className="bg-gray-50 dark:bg-gray-800 rounded-lg p-4 border-t-4 border-blue-600 dark:border-primary-500">
               <h3 className="text-sm font-bold text-gray-900 dark:text-white mb-2">Submission Information</h3>
               <div className="grid gap-2 text-sm">
                 <div className="flex justify-between">
-                  <span className="text-gray-600 dark:text-neutral-400">Status:</span>
+                  <span className="text-gray-600 dark:text-gray-400">Status:</span>
                   <span className={`font-medium ${
                     submission.status === 'submitted'
                       ? 'text-green-600 dark:text-green-400'
@@ -199,11 +233,11 @@ const SubmissionViewPage: FC = (): ReactElement => {
                   </span>
                 </div>
                 <div className="flex justify-between">
-                  <span className="text-gray-600 dark:text-neutral-400">Submitted:</span>
+                  <span className="text-gray-600 dark:text-gray-400">Submitted:</span>
                   <span className="font-medium text-gray-900 dark:text-white">{submittedDate}</span>
                 </div>
                 <div className="flex justify-between">
-                  <span className="text-gray-600 dark:text-neutral-400">Submission ID:</span>
+                  <span className="text-gray-600 dark:text-gray-400">Submission ID:</span>
                   <span className="font-medium text-gray-900 dark:text-white font-mono text-xs">
                     {submission.id}
                   </span>

apps/hackathon/src/app/teams/[teamId]/submit/page.tsx

@@ -1,4 +1,4 @@
-import { FC, ReactElement, useState } from 'react';
+import { FC, ReactElement, useState, useEffect } from 'react';
 import { ControlledInputField } from '@imphnen-frontend-service/ui/organisms';
 import { Button, Textarea } from '@imphnen-frontend-service/ui/atoms';
 import { useNavigate, useParams } from 'react-router';
@@ -14,10 +14,14 @@ import {
 } from '@imphnen-frontend-service/service';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { toast } from 'sonner';
+import { Icon } from '@iconify/react';
 
 const MIN_TEAM_MEMBERS = 2; // Minimum members required to submit (including leader)
 const MAX_FILE_SIZE = 2 * 1024 * 1024; // 2MB
 
+// Submission deadline: 2025-12-07 23:59:00 WIB (UTC+7)
+const SUBMISSION_DEADLINE = new Date('2025-12-07T16:59:00Z');
+
 const SubmitProjectPage: FC = (): ReactElement => {
   const { teamId } = useParams<{ teamId: string }>();
   const navigate = useNavigate();
@@ -25,6 +29,42 @@ const SubmitProjectPage: FC = (): ReactElement => {
   const [showConfirmModal, setShowConfirmModal] = useState(false);
   const [confirmText, setConfirmText] = useState('');
   const [screenshots, setScreenshots] = useState<string[]>([]);
+  const [timeLeft, setTimeLeft] = useState<{
+    days: number;
+    hours: number;
+    minutes: number;
+    seconds: number;
+  } | null>(null);
+
+  // Check if deadline passed
+  const isDeadlinePassed = new Date() >= SUBMISSION_DEADLINE;
+
+  // Countdown timer
+  useEffect(() => {
+    if (isDeadlinePassed) return;
+
+    const calculateTimeLeft = () => {
+      const now = new Date();
+      const difference = SUBMISSION_DEADLINE.getTime() - now.getTime();
+
+      if (difference <= 0) {
+        setTimeLeft(null);
+        return;
+      }
+
+      const days = Math.floor(difference / (1000 * 60 * 60 * 24));
+      const hours = Math.floor((difference / (1000 * 60 * 60)) % 24);
+      const minutes = Math.floor((difference / 1000 / 60) % 60);
+      const seconds = Math.floor((difference / 1000) % 60);
+
+      setTimeLeft({ days, hours, minutes, seconds });
+    };
+
+    calculateTimeLeft();
+    const timer = setInterval(calculateTimeLeft, 1000);
+
+    return () => clearInterval(timer);
+  }, [isDeadlinePassed]);
 
   const { data: teamData } = useTeamById(teamId || '');
   const { data: submissionData } = useTeamSubmission(teamId || '', !!teamId);
@@ -85,6 +125,50 @@ const SubmitProjectPage: FC = (): ReactElement => {
     );
   }
 
+  // Show deadline passed screen
+  if (isDeadlinePassed) {
+    return (
+      <div className="flex justify-center items-center min-h-screen bg-gray-50 dark:bg-gray-950 p-4">
+        <div className="bg-white dark:bg-gray-900 w-full max-w-md p-8 rounded-2xl shadow-lg border border-gray-200 dark:border-gray-700 text-center">
+          <div className="mb-6">
+            <div className="mx-auto w-16 h-16 bg-red-100 dark:bg-red-900/30 rounded-full flex items-center justify-center mb-4">
+              <Icon
+                icon="mdi:clock-alert"
+                className="text-3xl text-red-600 dark:text-red-400"
+              />
+            </div>
+            <h2 className="text-3xl font-bold text-gray-900 dark:text-white mb-2">
+              Submission Closed
+            </h2>
+            <p className="text-gray-600 dark:text-gray-400">
+              Project submissions are no longer accepted.
+            </p>
+          </div>
+
+          <div className="space-y-4">
+            <p className="text-sm text-gray-600 dark:text-gray-400">
+              The submission deadline was December 7, 2025 at 23:59 WIB.
+            </p>
+
+            <button
+              onClick={() => navigate(`/teams/${teamId}`)}
+              className="w-full py-3 bg-primary-600 text-white rounded-lg font-semibold hover:bg-primary-700 transition-colors cursor-pointer"
+            >
+              Back to Team
+            </button>
+
+            <button
+              onClick={() => navigate('/dashboard')}
+              className="w-full py-3 text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-white transition-colors cursor-pointer"
+            >
+              Back to Dashboard
+            </button>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
   const handleScreenshotUpload = async (
     e: React.ChangeEvent<HTMLInputElement>
   ) => {
@@ -138,6 +222,57 @@ const SubmitProjectPage: FC = (): ReactElement => {
       </div>
 
       <div className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
+        {/* Countdown Timer */}
+        {timeLeft && (
+          <div className="bg-blue-50 dark:bg-blue-900/20 border-2 border-blue-500 rounded-lg p-6 mb-6">
+            <div className="flex items-start space-x-3">
+              <span className="text-3xl">⏰</span>
+              <div className="flex-1">
+                <h3 className="font-bold text-blue-900 dark:text-blue-100 text-lg">
+                  Submission Deadline
+                </h3>
+                <p className="text-blue-800 dark:text-blue-200 mt-2 text-sm font-sans">
+                  Submissions close on December 7, 2025 at 23:59 WIB
+                </p>
+                <div className="mt-4 grid grid-cols-4 gap-4">
+                  <div className="bg-white dark:bg-gray-800 rounded-lg p-3 text-center">
+                    <div className="text-2xl font-bold text-blue-600 dark:text-blue-400">
+                      {timeLeft.days}
+                    </div>
+                    <div className="text-xs text-gray-600 dark:text-gray-400 mt-1">
+                      Days
+                    </div>
+                  </div>
+                  <div className="bg-white dark:bg-gray-800 rounded-lg p-3 text-center">
+                    <div className="text-2xl font-bold text-blue-600 dark:text-blue-400">
+                      {timeLeft.hours.toString().padStart(2, '0')}
+                    </div>
+                    <div className="text-xs text-gray-600 dark:text-gray-400 mt-1">
+                      Hours
+                    </div>
+                  </div>
+                  <div className="bg-white dark:bg-gray-800 rounded-lg p-3 text-center">
+                    <div className="text-2xl font-bold text-blue-600 dark:text-blue-400">
+                      {timeLeft.minutes.toString().padStart(2, '0')}
+                    </div>
+                    <div className="text-xs text-gray-600 dark:text-gray-400 mt-1">
+                      Minutes
+                    </div>
+                  </div>
+                  <div className="bg-white dark:bg-gray-800 rounded-lg p-3 text-center">
+                    <div className="text-2xl font-bold text-blue-600 dark:text-blue-400">
+                      {timeLeft.seconds.toString().padStart(2, '0')}
+                    </div>
+                    <div className="text-xs text-gray-600 dark:text-gray-400 mt-1">
+                      Seconds
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        )}
+
         {/* Minimum Members Warning */}
         {!hasEnoughMembers && (
           <div className="bg-amber-50 dark:bg-amber-900/20 border-2 border-amber-500 rounded-lg p-6 mb-6">
@@ -200,6 +335,9 @@ const SubmitProjectPage: FC = (): ReactElement => {
               <label className="block text-[15px] font-medium text-gray-700 dark:text-gray-300">
                 Project Description <span className="text-red-500">*</span>
               </label>
+              <p className="text-sm text-gray-500 dark:text-gray-400 mb-2">
+                Describe your project, its features, and what problem it solves. You can also paste your demo video link here.
+              </p>
               <Controller
                 control={form.control}
                 name="description"
@@ -207,7 +345,7 @@ const SubmitProjectPage: FC = (): ReactElement => {
                   <div>
                     <Textarea
                       {...field}
-                      placeholder="Describe your project, its features, and what problem it solves..."
+                      placeholder="Describe your project, its features, and what problem it solves... You can paste your demo video link (YouTube, Loom, etc.) here as well."
                       rows={6}
                       className="w-full"
                       size="lg"

apps/hackathon/src/app/winners/page.tsx

@@ -0,0 +1,318 @@
+import { FC, ReactElement } from 'react';
+import { useNavigate } from 'react-router';
+import { useWinners } from '@imphnen-frontend-service/service';
+
+const WinnerPage: FC = (): ReactElement => {
+  const navigate = useNavigate();
+  const { data, isLoading, error } = useWinners();
+
+  const winners = data?.data ?? [];
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
+        <div className="text-center">
+          <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600 mx-auto mb-4"></div>
+          <div className="text-gray-600 dark:text-gray-400">
+            Loading winners...
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (error) {
+    return (
+      <div className="flex flex-col items-center justify-center min-h-screen bg-gray-50 dark:bg-gray-950">
+        <div className="text-6xl mb-4">⚠️</div>
+        <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-4">
+          Error Loading Winners
+        </h2>
+        <p className="text-gray-600 dark:text-gray-400 mb-6">
+          Unable to load winners at this time. Please try again later.
+        </p>
+      </div>
+    );
+  }
+
+  // Sort winners by rank
+  const sortedWinners = [...winners].sort((a, b) => a.rank - b.rank);
+
+  // Medal emojis for top 3
+  const getMedalEmoji = (rank: number) => {
+    switch (rank) {
+      case 1:
+        return '🥇';
+      case 2:
+        return '🥈';
+      case 3:
+        return '🥉';
+      default:
+        return '🏆';
+    }
+  };
+
+  // Get rank color
+  const getRankColor = (rank: number) => {
+    switch (rank) {
+      case 1:
+        return 'from-yellow-400 to-yellow-600';
+      case 2:
+        return 'from-gray-300 to-gray-500';
+      case 3:
+        return 'from-amber-600 to-amber-800';
+      default:
+        return 'from-blue-500 to-blue-700';
+    }
+  };
+
+  return (
+    <div className="min-h-screen bg-gray-50 dark:bg-gray-950">
+      {/* Header */}
+      <div className="bg-white dark:bg-gray-900 border-b dark:border-gray-700">
+        <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
+          <div className="text-center">
+            <div className="text-6xl mb-4">🏆</div>
+            <h1 className="text-4xl font-bold text-gray-900 dark:text-white mb-2">
+              Hackathon Winners
+            </h1>
+            <p className="text-gray-600 dark:text-gray-400">
+              Congratulations to all the winning teams!
+            </p>
+          </div>
+        </div>
+      </div>
+
+      {/* Winners List */}
+      <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
+        {winners.length === 0 ? (
+          <div className="text-center py-16">
+            <div className="text-6xl mb-4">🎯</div>
+            <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-4">
+              No Winners Announced Yet
+            </h2>
+            <p className="text-gray-600 dark:text-gray-400">
+              Winners will be announced here once the hackathon concludes.
+            </p>
+          </div>
+        ) : (
+          <div className="space-y-8">
+            {/* Top 3 Winners - Mobile View */}
+            <div className="md:hidden space-y-6">
+              {[1, 2, 3].map((position) => {
+                const winner = sortedWinners[position - 1];
+
+                if(!winner) return null;
+
+                return (
+                  <div
+                    key={winner.id}
+                    className={`bg-white dark:bg-gray-800 rounded-lg p-3 shadow-lg ${
+                      getRankColor(winner.rank).includes('yellow')
+                        ? 'border-4 border-yellow-400 dark:border-yellow-600'
+                        : getRankColor(winner.rank).includes('gray')
+                        ? 'border-4 border-gray-400 dark:border-gray-600'
+                        : 'border-4 border-amber-600 dark:border-amber-500'
+                    }}`}
+                  >
+                    <div className="flex items-center gap-4">
+                      <div
+                        className={`aspect-square p-1 rounded-full bg-linear-to-br ${getRankColor(
+                          winner.rank
+                        )} flex items-center justify-center text-white font-bold text-2xl`}
+                      >
+                        <div className="text-4xl">
+                          {getMedalEmoji(winner.rank)}
+                        </div>
+                      </div>
+
+                      {winner.team.logo && (
+                        <img
+                          src={winner.team.logo}
+                          alt={`${winner.team.name} logo`}
+                          className="w-20 h-20 rounded-full object-cover border-3 border-white dark:border-gray-700 shadow-lg"
+                        />
+                      )}
+
+                      <div className="flex-1">
+                        <h2 className="text-xl font-bold text-gray-900 dark:text-white">
+                          {winner.team.name}
+                        </h2>
+                        <p className="text-sm text-gray-600 dark:text-gray-400">
+                          {winner.team.city}
+                        </p>
+                      </div>
+                    </div>
+                  </div>
+                );
+              })}
+            </div>
+
+            {/* Top 3 Winners - Tablet/Desktop Podium View */}
+            <div className="hidden md:flex gap-8 items-end justify-center w-full">
+              {[2, 1, 3].map((position) => {
+                const winner = sortedWinners[position - 1];
+                if(!winner) return null;
+                return (
+                  <div
+                    key={winner.id}
+                    className="w-full max-w-xs flex flex-col items-center space-y-4"
+                  >
+                    <div className="text-5xl">{getMedalEmoji(winner.rank)}</div>
+
+                    {/* Team Logo */}
+                    {winner.team.logo && (
+                      <img
+                        src={winner.team.logo}
+                        alt={`${winner.team.name} logo`}
+                        className="w-24 h-24 rounded-full object-cover border-4 border-white dark:border-gray-700 shadow-lg"
+                      />
+                    )}
+
+                    <div className="text-center px-2">
+                      <h2 className="text-2xl font-bold text-gray-900 dark:text-white">
+                        {winner.team.name}
+                      </h2>
+                      <p className="text-sm text-gray-600 dark:text-gray-400 mt-1">
+                        {winner.team.city}
+                      </p>
+                    </div>
+
+                    {/* Podium */}
+                    <div
+                      className={`${
+                        winner.rank === 1
+                          ? 'h-42 bg-yellow-500'
+                          : winner.rank === 2
+                          ? 'h-32 bg-gray-400'
+                          : 'h-16 bg-amber-600'
+                      } w-full flex items-end justify-center rounded-t-lg shadow-lg`}
+                    >
+                      <div className="text-white font-bold text-3xl pb-4">
+                        #{winner.rank}
+                      </div>
+                    </div>
+                  </div>
+                );
+              })}
+            </div>
+
+            {/* Ranks 4-23: Prize Winners */}
+            {sortedWinners.filter((w) => w.rank >= 4 && w.rank <= 23).length >
+              0 && (
+              <div className="mt-12">
+                <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-6 text-center">
+                  Favorite
+                </h2>
+                <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                  {sortedWinners
+                    .filter((w) => w.rank >= 4 && w.rank <= 23)
+                    .map((winner) => (
+                      <div
+                        key={winner.id}
+                        className="bg-white dark:bg-gray-800 border-2 border-gray-400 dark:border-gray-600 rounded-lg p-4 hover:shadow-lg transition-shadow"
+                      >
+                        <div className="flex items-center gap-4">
+                          <div className="shrink-0">
+                            <div className="w-12 h-12 rounded-full bg-linear-to-br from-gray-400 to-gray-600 flex items-center justify-center text-white font-bold text-lg">
+                              #{winner.rank}
+                            </div>
+                          </div>
+
+                          {winner.team.logo && (
+                            <img
+                              src={winner.team.logo}
+                              alt={`${winner.team.name} logo`}
+                              className="w-16 h-16 rounded-full object-cover border-2 border-gray-200 dark:border-gray-700"
+                            />
+                          )}
+
+                          <div className="flex-1 min-w-0">
+                            <h3 className="font-bold text-gray-900 dark:text-white truncate">
+                              {winner.team.name}
+                            </h3>
+                            <p className="text-sm text-gray-600 dark:text-gray-400">
+                              {winner.team.city}
+                            </p>
+                            <div className="flex items-center gap-1 mt-1">
+                              <span className="text-xs bg-yellow-100 dark:bg-yellow-900/30 text-yellow-800 dark:text-yellow-300 px-2 py-1 rounded-full">
+                                🎁 Prize Winner
+                              </span>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    ))}
+                </div>
+              </div>
+            )}
+
+            {/* Rank 24+: Remaining Participants */}
+            {sortedWinners.filter((w) => w.rank >= 24).length > 0 && (
+              <div className="mt-12">
+                <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-6 text-center">
+                  All Participants
+                </h2>
+                <div className="bg-white dark:bg-gray-800 rounded-lg shadow-md overflow-hidden">
+                  <div className="divide-y divide-gray-200 dark:divide-gray-700">
+                    {sortedWinners
+                      .filter((w) => w.rank >= 24)
+                      .map((participant) => (
+                        <div
+                          key={participant.id}
+                          className="p-4 hover:bg-gray-50 dark:hover:bg-gray-700/50 transition-colors"
+                        >
+                          <div className="flex items-center gap-4">
+                            <div className="shrink-0 w-10 text-center">
+                              <span className="text-sm font-semibold text-gray-600 dark:text-gray-400">
+                                #{participant.rank}
+                              </span>
+                            </div>
+
+                            {participant.team.logo && (
+                              <img
+                                src={participant.team.logo}
+                                alt={`${participant.team.name} logo`}
+                                className="w-12 h-12 rounded-full object-cover border-2 border-gray-200 dark:border-gray-700"
+                              />
+                            )}
+
+                            <div className="flex-1 min-w-0">
+                              <h3 className="font-semibold text-gray-900 dark:text-white">
+                                {participant.team.name}
+                              </h3>
+                              <p className="text-sm text-gray-600 dark:text-gray-400">
+                                {participant.team.city}
+                              </p>
+                            </div>
+                          </div>
+                        </div>
+                      ))}
+                  </div>
+                </div>
+              </div>
+            )}
+          </div>
+        )}
+      </div>
+
+      {/* Footer Info */}
+      {winners.length > 0 && (
+        <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 pb-8">
+          <div className="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-lg p-6">
+            <h3 className="font-bold text-blue-900 dark:text-blue-100 mb-2">
+              Congratulations! 🎉
+            </h3>
+            <p className="text-sm text-blue-800 dark:text-blue-200">
+              Thank you to all participants for making this hackathon a success.
+              Every project and idea contributed to an incredible showcase of
+              innovation and creativity.
+            </p>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default WinnerPage;

apps/hackathon/src/utils/aesclient.ts

@@ -0,0 +1,86 @@
+const enc = new TextEncoder();
+const dec = new TextDecoder();
+
+function randBytes(len: number): Uint8Array {
+  const b = new Uint8Array(len);
+  crypto.getRandomValues(b);
+  return b;
+}
+
+function bufToBase64(buf: ArrayBuffer): string {
+  const bytes = new Uint8Array(buf);
+  let s = '';
+  for (let i = 0; i < bytes.length; i++) s += String.fromCharCode(bytes[i]);
+  return btoa(s);
+}
+
+function base64ToBuf(b64: string): ArrayBuffer {
+  const s = atob(b64);
+  const arr = new Uint8Array(s.length);
+  for (let i = 0; i < s.length; i++) arr[i] = s.charCodeAt(i);
+  return arr.buffer;
+}
+
+async function deriveKeyFromPassphrase(passphrase: string, salt: Uint8Array, iterations = 100_000) {
+  const passKey = await crypto.subtle.importKey(
+    'raw',
+    enc.encode(passphrase),
+    { name: 'PBKDF2' },
+    false,
+    ['deriveKey']
+  );
+
+  return crypto.subtle.deriveKey(
+    {
+      name: 'PBKDF2',
+      salt,
+      iterations,
+      hash: 'SHA-256'
+    },
+    passKey,
+    { name: 'AES-GCM', length: 256 },
+    false,
+    ['encrypt', 'decrypt']
+  );
+}
+
+/**
+ * Encrypts plaintext with passphrase -> returns base64(salt||iv||ciphertext)
+ */
+export async function encryptText(plaintext: string, passphrase: string) {
+  const salt = randBytes(16); // 128-bit salt
+  const iv = randBytes(12);   // 96-bit IV recommended for GCM
+  const key = await deriveKeyFromPassphrase(passphrase, salt);
+
+  const cipher = await crypto.subtle.encrypt(
+    { name: 'AES-GCM', iv },
+    key,
+    enc.encode(plaintext)
+  );
+
+  // concat salt + iv + ciphertext
+  const out = new Uint8Array(salt.length + iv.length + cipher.byteLength);
+  out.set(salt, 0);
+  out.set(iv, salt.length);
+  out.set(new Uint8Array(cipher), salt.length + iv.length);
+
+  return bufToBase64(out.buffer);
+}
+
+/**
+ * Decrypts base64(salt||iv||ciphertext) with passphrase -> plaintext
+ */
+export async function decryptText(b64combined: string, passphrase: string) {
+  const combined = new Uint8Array(base64ToBuf(b64combined));
+  const salt = combined.slice(0, 16);
+  const iv = combined.slice(16, 28);
+  const cipher = combined.slice(28);
+
+  const key = await deriveKeyFromPassphrase(passphrase, salt);
+  const plainBuf = await crypto.subtle.decrypt(
+    { name: 'AES-GCM', iv },
+    key,
+    cipher
+  );
+  return dec.decode(plainBuf);
+}

apps/hackathon/src/utils/certificate.ts

@@ -0,0 +1,83 @@
+import { decryptText, encryptText } from "./aesclient";
+
+const SECRET_KEY = 'imphnen-hackathon-2025';
+
+/**
+ * Encode teamId, submissionId, and userId into a certificate ID
+ * Uses AES encryption for secure encoding
+ * @param teamId - The team ID
+ * @param submissionId - The submission ID
+ * @param userId - The user ID (team member)
+ * @returns Encoded certificate ID
+ */
+export const encodeCertificateId = async (teamId: string, submissionId: string, userId: string): Promise<string> => {
+  const combined = `${teamId}::${submissionId}::${userId}`;
+  return encryptText(combined, SECRET_KEY);
+};
+
+/**
+ * Encode winner certificate ID (team-based)
+ * @param teamId - Winner team ID
+ * @returns Encoded winner certificate ID
+ */
+export const encodeWinnerCertificateId = async (teamId: string): Promise<string> => {
+  const combined = `winner::${teamId}`;
+  return encryptText(combined, SECRET_KEY);
+};
+
+/**
+ * Decode certificate ID back to teamId, submissionId, and userId
+ * @param certId - The encoded certificate ID
+ * @returns Object containing teamId, submissionId, and userId
+ */
+export const decodeCertificateId = async (certId: string): Promise<{ teamId: string; submissionId: string; userId: string }> => {
+  try {
+    const decoded = await decryptText(certId, SECRET_KEY);
+    const parts = decoded.split('::');
+
+    // Handle both old format (teamId::submissionId) and new format (teamId::submissionId::userId)
+    if (parts.length === 2) {
+      const [teamId, submissionId] = parts;
+      return { teamId, submissionId, userId: '' };
+    } else if (parts.length === 3) {
+      const [teamId, submissionId, userId] = parts;
+      return { teamId, submissionId, userId };
+    }
+
+    throw new Error('Invalid certificate format');
+  } catch {
+    throw new Error('Invalid certificate ID');
+  }
+};
+
+/**
+ * Decode winner certificate ID back to teamId
+ * @param certId - The encoded winner certificate ID
+ * @returns Object containing teamId
+ */
+export const decodeWinnerCertificateId = async (certId: string): Promise<{ teamId: string }> => {
+  try {
+    const decoded = await decryptText(certId, SECRET_KEY);
+    const parts = decoded.split('::');
+
+    // winner::teamId
+    if (parts.length === 2 && parts[0] === 'winner') {
+      return { teamId: parts[1] };
+    }
+
+    throw new Error('Invalid winner certificate format');
+  } catch {
+    throw new Error('Invalid certificate ID');
+  }
+};
+
+/**
+ * For development: Create a certId using created_at timestamp
+ * @param teamId - The team ID
+ * @param createdAt - The creation timestamp
+ * @returns Encoded certificate ID
+ */
+export const encodeCertificateIdWithTimestamp = (teamId: string, createdAt: string): string => {
+  const combined = `${teamId}::${createdAt}`;
+  return Buffer.from(combined).toString('base64');
+};

apps/infra/eslint.config.mjs

@@ -0,0 +1,3 @@
+import baseConfig from '../../eslint.config.mjs';
+
+export default [...baseConfig];

apps/infra/index.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>IMPHNEN Infrastructure</title>
+    <base href="/" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" type="image/x-icon" href="/logos/simple.svg" />
+    <link rel="stylesheet" href="/src/index.css" />
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>

apps/infra/postcss.config.mjs

@@ -0,0 +1,9 @@
+import { join } from 'path';
+
+export default {
+  plugins: {
+    '@tailwindcss/postcss': {
+      base: join(import.meta.dirname, '../../'),
+    },
+  },
+};

apps/infra/project.json

@@ -0,0 +1,8 @@
+{
+  "name": "infra",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "apps/infra/src",
+  "projectType": "application",
+  "tags": [],
+  "targets": {}
+}

apps/infra/src/app/App.tsx

@@ -0,0 +1,235 @@
+const apps = [
+  { name: 'Landing', domain: 'imphnen.dev', type: 'Next.js', color: 'blue' },
+  { name: 'Gacha', domain: 'gacha.imphnen.dev', type: 'Vite', color: 'green' },
+  { name: 'Backoffice', domain: 'backoffice.imphnen.dev', type: 'Vite', color: 'green' },
+  { name: 'Dimentorin', domain: 'dimentorin.imphnen.dev', type: 'Vite', color: 'green' },
+  { name: 'Hackathon', domain: 'hackathon.imphnen.dev', type: 'Vite', color: 'green' },
+  { name: 'Infra', domain: 'infra.imphnen.dev', type: 'Vite', color: 'green' },
+];
+
+const techStack = [
+  { category: 'OS', items: ['NixOS 24.11'] },
+  { category: 'Web Server', items: ['Nginx'] },
+  { category: 'SSL', items: ['Let\'s Encrypt (ACME)'] },
+  { category: 'Build', items: ['Nix Flakes', 'Nx Monorepo'] },
+  { category: 'Frontend', items: ['React', 'Next.js', 'Vite', 'TailwindCSS'] },
+  { category: 'Secrets', items: ['sops-nix'] },
+];
+
+export default function App() {
+  return (
+    <div className="min-h-screen bg-[#0a0a0a]">
+      {/* Header */}
+      <header className="border-b border-zinc-800 bg-[#0a0a0a]/80 backdrop-blur-sm sticky top-0 z-50">
+        <div className="container mx-auto px-6 py-4">
+          <div className="flex items-center justify-between">
+            <div className="flex items-center gap-3">
+              <div className="w-8 h-8 bg-blue-500 rounded-lg flex items-center justify-center font-bold">
+                I
+              </div>
+              <span className="text-xl font-semibold">IMPHNEN Infrastructure</span>
+            </div>
+            <a
+              href="https://github.com/IMPHNEN"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="text-zinc-400 hover:text-white transition-colors"
+            >
+              GitHub
+            </a>
+          </div>
+        </div>
+      </header>
+
+      <main className="container mx-auto px-6 py-12">
+        {/* Hero */}
+        <section className="text-center mb-16">
+          <h1 className="text-4xl md:text-5xl font-bold mb-4">
+            Infrastructure Overview
+          </h1>
+          <p className="text-zinc-400 text-lg max-w-2xl mx-auto">
+            Declarative NixOS infrastructure powering IMPHNEN's frontend applications
+            on Hetzner Cloud.
+          </p>
+        </section>
+
+        {/* Architecture Diagram */}
+        <section className="mb-16">
+          <h2 className="text-2xl font-semibold mb-6">Architecture</h2>
+          <div className="card bg-[#141414] border-zinc-800 p-8">
+            <div className="flex flex-col items-center gap-6">
+              {/* Internet */}
+              <div className="flex items-center gap-2 text-zinc-400">
+                <span className="text-2xl">🌐</span>
+                <span>Internet</span>
+              </div>
+              <div className="w-px h-8 bg-zinc-700" />
+
+              {/* Cloudflare */}
+              <div className="card bg-orange-500/10 border-orange-500/30 px-6 py-3">
+                <span className="badge badge-orange">Cloudflare</span>
+                <p className="text-sm text-zinc-400 mt-1">DNS + CDN + DDoS Protection</p>
+              </div>
+              <div className="w-px h-8 bg-zinc-700" />
+
+              {/* Hetzner VPS */}
+              <div className="card bg-[#1a1a1a] border-zinc-700 w-full max-w-3xl">
+                <div className="text-center mb-4">
+                  <span className="badge badge-purple">Hetzner Cloud VPS</span>
+                  <p className="text-sm text-zinc-400 mt-1">NixOS | 167.235.70.37</p>
+                </div>
+
+                {/* Nginx */}
+                <div className="card bg-green-500/10 border-green-500/30 mb-4">
+                  <div className="text-center">
+                    <span className="badge badge-green">Nginx</span>
+                    <p className="text-sm text-zinc-400 mt-1">Reverse Proxy + Static Files + SSL Termination</p>
+                  </div>
+                </div>
+
+                {/* Apps Grid */}
+                <div className="grid grid-cols-2 md:grid-cols-3 gap-3">
+                  {apps.map((app) => (
+                    <div
+                      key={app.name}
+                      className="card bg-[#0a0a0a] border-zinc-800 text-center p-3"
+                    >
+                      <p className="font-medium text-sm">{app.name}</p>
+                      <p className="text-xs text-zinc-500">{app.domain}</p>
+                      <span className={`badge badge-${app.color} mt-2 text-xs`}>
+                        {app.type}
+                      </span>
+                    </div>
+                  ))}
+                </div>
+              </div>
+            </div>
+          </div>
+        </section>
+
+        {/* Deployed Apps */}
+        <section className="mb-16">
+          <h2 className="text-2xl font-semibold mb-6">Deployed Applications</h2>
+          <div className="grid md:grid-cols-2 lg:grid-cols-3 gap-4">
+            {apps.map((app) => (
+              <a
+                key={app.name}
+                href={`https://${app.domain}`}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="card bg-[#141414] border-zinc-800 hover:border-zinc-600 transition-colors group"
+              >
+                <div className="flex items-start justify-between">
+                  <div>
+                    <h3 className="font-semibold group-hover:text-blue-400 transition-colors">
+                      {app.name}
+                    </h3>
+                    <p className="text-sm text-zinc-500">{app.domain}</p>
+                  </div>
+                  <span className={`badge badge-${app.color}`}>{app.type}</span>
+                </div>
+              </a>
+            ))}
+          </div>
+        </section>
+
+        {/* Tech Stack */}
+        <section className="mb-16">
+          <h2 className="text-2xl font-semibold mb-6">Technology Stack</h2>
+          <div className="grid md:grid-cols-2 lg:grid-cols-3 gap-4">
+            {techStack.map((tech) => (
+              <div key={tech.category} className="card bg-[#141414] border-zinc-800">
+                <h3 className="text-sm text-zinc-500 uppercase tracking-wider mb-2">
+                  {tech.category}
+                </h3>
+                <div className="flex flex-wrap gap-2">
+                  {tech.items.map((item) => (
+                    <span key={item} className="badge badge-blue">
+                      {item}
+                    </span>
+                  ))}
+                </div>
+              </div>
+            ))}
+          </div>
+        </section>
+
+        {/* Deployment Flow */}
+        <section className="mb-16">
+          <h2 className="text-2xl font-semibold mb-6">Deployment Flow</h2>
+          <div className="card bg-[#141414] border-zinc-800">
+            <div className="flex flex-col md:flex-row items-center justify-between gap-4">
+              <div className="text-center">
+                <div className="w-12 h-12 bg-zinc-800 rounded-full flex items-center justify-center mx-auto mb-2">
+                  <span>1</span>
+                </div>
+                <p className="text-sm font-medium">Push to GitHub</p>
+                <p className="text-xs text-zinc-500">develop branch</p>
+              </div>
+              <div className="hidden md:block text-zinc-600">→</div>
+              <div className="text-center">
+                <div className="w-12 h-12 bg-zinc-800 rounded-full flex items-center justify-center mx-auto mb-2">
+                  <span>2</span>
+                </div>
+                <p className="text-sm font-medium">Update Flake</p>
+                <p className="text-xs text-zinc-500">nix flake update</p>
+              </div>
+              <div className="hidden md:block text-zinc-600">→</div>
+              <div className="text-center">
+                <div className="w-12 h-12 bg-zinc-800 rounded-full flex items-center justify-center mx-auto mb-2">
+                  <span>3</span>
+                </div>
+                <p className="text-sm font-medium">Remote Build</p>
+                <p className="text-xs text-zinc-500">nixos-rebuild</p>
+              </div>
+              <div className="hidden md:block text-zinc-600">→</div>
+              <div className="text-center">
+                <div className="w-12 h-12 bg-blue-500 rounded-full flex items-center justify-center mx-auto mb-2">
+                  <span>✓</span>
+                </div>
+                <p className="text-sm font-medium">Live</p>
+                <p className="text-xs text-zinc-500">Zero downtime</p>
+              </div>
+            </div>
+          </div>
+        </section>
+
+        {/* Repositories */}
+        <section>
+          <h2 className="text-2xl font-semibold mb-6">Repositories</h2>
+          <div className="grid md:grid-cols-2 gap-4">
+            <a
+              href="https://github.com/IMPHNEN/imphnen-frontend-service"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="card bg-[#141414] border-zinc-800 hover:border-zinc-600 transition-colors"
+            >
+              <h3 className="font-semibold mb-1">imphnen-frontend-service</h3>
+              <p className="text-sm text-zinc-400">
+                Nx monorepo containing all frontend applications
+              </p>
+            </a>
+            <a
+              href="https://github.com/IMPHNEN/imphnen-infrastructure"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="card bg-[#141414] border-zinc-800 hover:border-zinc-600 transition-colors"
+            >
+              <h3 className="font-semibold mb-1">imphnen-infrastructure</h3>
+              <p className="text-sm text-zinc-400">
+                NixOS flake configuration for server deployment
+              </p>
+            </a>
+          </div>
+        </section>
+      </main>
+
+      {/* Footer */}
+      <footer className="border-t border-zinc-800 mt-16">
+        <div className="container mx-auto px-6 py-8 text-center text-zinc-500 text-sm">
+          <p>IMPHNEN Infrastructure &copy; {new Date().getFullYear()}</p>
+        </div>
+      </footer>
+    </div>
+  );
+}

apps/infra/src/index.css

@@ -0,0 +1,58 @@
+@import 'tailwindcss';
+
+@theme {
+  --color-primary: #3b82f6;
+  --color-primary-hover: #2563eb;
+}
+
+@layer base {
+  * {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+  }
+
+  body {
+    font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+    background-color: #0a0a0a;
+    color: #ffffff;
+    line-height: 1.6;
+  }
+}
+
+@layer components {
+  .card {
+    background: #141414;
+    border: 1px solid #27272a;
+    border-radius: 12px;
+    padding: 1.5rem;
+  }
+
+  .badge {
+    display: inline-block;
+    padding: 0.25rem 0.75rem;
+    border-radius: 9999px;
+    font-size: 0.75rem;
+    font-weight: 500;
+  }
+
+  .badge-blue {
+    background: rgba(59, 130, 246, 0.2);
+    color: #60a5fa;
+  }
+
+  .badge-green {
+    background: rgba(34, 197, 94, 0.2);
+    color: #4ade80;
+  }
+
+  .badge-purple {
+    background: rgba(168, 85, 247, 0.2);
+    color: #c084fc;
+  }
+
+  .badge-orange {
+    background: rgba(249, 115, 22, 0.2);
+    color: #fb923c;
+  }
+}

apps/infra/src/main.tsx

@@ -0,0 +1,14 @@
+import { createRoot } from 'react-dom/client';
+import { StrictMode } from 'react';
+import App from './app/App';
+import './index.css';
+
+const rootElement = document.getElementById('root');
+
+if (!rootElement) throw new Error('Failed to find the root element');
+
+createRoot(rootElement).render(
+  <StrictMode>
+    <App />
+  </StrictMode>
+);

apps/infra/tsconfig.app.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["node", "vite/client"]
+  },
+  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx"],
+  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
+}