merge: resolve conflicts and sync develop changes

Author: yevheniidatsenko

frontend/actions/quiz.ts

@@ -52,7 +52,6 @@ function calculateIntegrityScore(violations: ViolationEvent[]): number {
   return Math.max(0, 100 - penalty);
 }
 
-
 async function getQuizQuestionIds(quizId: string): Promise<string[]> {
   const rows = await db
     .select({ id: quizQuestions.id })
@@ -270,7 +269,8 @@ export async function initializeQuizCache(
     const { getOrCreateQuizAnswersCache, clearVerifiedQuestions } =
       await import('@/lib/quiz/quiz-answers-redis');
 
-    const { resolveRequestIdentifier } = await import('@/lib/quiz/resolve-identifier');
+    const { resolveRequestIdentifier } =
+      await import('@/lib/quiz/resolve-identifier');
     const { headers } = await import('next/headers');
     const headersList = await headers();
     const identifier = resolveRequestIdentifier(headersList);

frontend/app/[locale]/achievements-demo/page.tsx

@@ -13,7 +13,7 @@ export default function AchievementsDemoPage() {
     uniqueQuizzes: 4,
     totalPoints: 80,
     topLeaderboard: false,
-    hasStarredRepo: true,  // demo: show star_gazer as earned
+    hasStarredRepo: true, // demo: show star_gazer as earned
     sponsorCount: 0,
     hasNightOwl: false,
   });

frontend/app/[locale]/admin/page.tsx

@@ -1,5 +1,5 @@
-import { Metadata } from 'next';
 import { FileQuestion, MessageSquare, ShoppingBag } from 'lucide-react';
+import { Metadata } from 'next';
 
 import { Link } from '@/i18n/routing';
 

frontend/app/[locale]/admin/quiz/[id]/page.tsx

@@ -2,6 +2,9 @@ import { Metadata } from 'next';
 import { notFound } from 'next/navigation';
 
 import { QuizEditorList } from '@/components/admin/quiz/QuizEditorList';
+import { QuizMetadataEditor } from '@/components/admin/quiz/QuizMetadataEditor';
+import { QuizStatusControls } from '@/components/admin/quiz/QuizStatusControls';
+import { UploadMoreQuestions } from '@/components/admin/quiz/UploadMoreQuestions';
 import { getAdminQuizFull } from '@/db/queries/quizzes/admin-quiz';
 import { Link } from '@/i18n/routing';
 import { issueCsrfToken } from '@/lib/security/csrf';
@@ -23,7 +26,16 @@ export default async function AdminQuizEditPage({
   const title =
     quiz.translations.en?.title ?? quiz.translations.uk?.title ?? quiz.slug;
 
+  const isDraft = quiz.status === 'draft';
+
   const csrfToken = issueCsrfToken('admin:quiz:question:update');
+  const csrfTokenDelete = isDraft
+    ? issueCsrfToken('admin:quiz:question:delete')
+    : undefined;
+  const csrfTokenAddQuestions = isDraft
+    ? issueCsrfToken('admin:quiz:questions:add')
+    : undefined;
+  const csrfTokenUpdate = issueCsrfToken('admin:quiz:update');
 
   return (
     <div className="mx-auto max-w-5xl px-6 py-8">
@@ -38,15 +50,62 @@ export default async function AdminQuizEditPage({
 
       <div className="mb-6">
         <h1 className="text-foreground text-2xl font-bold">{title}</h1>
-        <p className="text-muted-foreground mt-1 text-sm">
-          {quiz.questions.length} questions &middot; slug: {quiz.slug}
-        </p>
+        <div className="mt-1 flex items-center gap-3">
+          <span className="text-muted-foreground text-sm">
+            {quiz.questions.length} questions &middot; slug: {quiz.slug}
+          </span>
+          <span
+            className={`inline-flex rounded-full px-2 py-0.5 text-xs font-medium ${
+              isDraft
+                ? 'bg-amber-500/10 text-amber-500'
+                : 'bg-emerald-500/10 text-emerald-500'
+            }`}
+          >
+            {isDraft ? 'Draft' : 'Ready'}
+          </span>
+          <span
+            className={`inline-flex rounded-full px-2 py-0.5 text-xs font-medium ${
+              quiz.isActive
+                ? 'bg-emerald-500/10 text-emerald-500'
+                : 'bg-muted text-muted-foreground'
+            }`}
+          >
+            {quiz.isActive ? 'Active' : 'Inactive'}
+          </span>
+        </div>
+      </div>
+      <div className="mb-6">
+        <QuizStatusControls
+          quizId={quiz.id}
+          status={quiz.status}
+          isActive={quiz.isActive}
+          csrfToken={csrfTokenUpdate}
+        />
       </div>
+      <div className="mb-6">
+        <QuizMetadataEditor
+          quizId={quiz.id}
+          translations={quiz.translations}
+          timeLimitSeconds={quiz.timeLimitSeconds}
+          csrfToken={csrfTokenUpdate}
+        />
+      </div>
+
+      {isDraft && csrfTokenAddQuestions && (
+        <div className="mb-6">
+          <UploadMoreQuestions
+            quizId={quiz.id}
+            csrfToken={csrfTokenAddQuestions}
+          />
+        </div>
+      )}
 
       <QuizEditorList
         questions={quiz.questions}
         quizId={quiz.id}
         csrfToken={csrfToken}
+        csrfTokenDelete={csrfTokenDelete}
+        isDraft={isDraft}
       />
     </div>
   );

frontend/app/[locale]/admin/quiz/new/page.tsx

@@ -0,0 +1,37 @@
+import { Metadata } from 'next';
+
+import { CreateQuizForm } from '@/components/admin/quiz/CreateQuizForm';
+import { getAdminCategoryList } from '@/db/queries/categories/admin-categories';
+import { Link } from '@/i18n/routing';
+import { issueCsrfToken } from '@/lib/security/csrf';
+
+export const metadata: Metadata = {
+  title: 'New Quiz | DevLovers',
+};
+
+export default async function AdminQuizNewPage() {
+  const categories = await getAdminCategoryList();
+  const csrfTokenQuiz = issueCsrfToken('admin:quiz:create');
+  const csrfTokenCategory = issueCsrfToken('admin:category:create');
+
+  return (
+    <div className="mx-auto max-w-5xl px-6 py-8">
+      <div className="mb-6">
+        <Link
+          href="/admin/quiz"
+          className="text-muted-foreground hover:text-foreground text-sm transition-colors"
+        >
+          &larr; Back to quizzes
+        </Link>
+      </div>
+
+      <h1 className="text-foreground mb-6 text-2xl font-bold">New Quiz</h1>
+
+      <CreateQuizForm
+        categories={categories}
+        csrfTokenQuiz={csrfTokenQuiz}
+        csrfTokenCategory={csrfTokenCategory}
+      />
+    </div>
+  );
+}

frontend/app/[locale]/admin/quiz/page.tsx

@@ -2,23 +2,36 @@ import { Metadata } from 'next';
 
 import { QuizListTable } from '@/components/admin/quiz/QuizListTable';
 import { getAdminQuizList } from '@/db/queries/quizzes/admin-quiz';
+import { Link } from '@/i18n/routing';
+import { issueCsrfToken } from '@/lib/security/csrf';
 
 export const metadata: Metadata = {
   title: 'Quiz Admin | DevLovers',
 };
 
 export default async function AdminQuizPage() {
   const quizzes = await getAdminQuizList();
+  const csrfTokenDelete = issueCsrfToken('admin:quiz:delete');
 
   return (
     <div className="mx-auto max-w-5xl px-6 py-8">
-      <h1 className="text-foreground text-2xl font-bold">Quizzes</h1>
-      <p className="text-muted-foreground mt-1 text-sm">
-        Manage quiz content, questions, and answers
-      </p>
+      <div className="flex items-center justify-between">
+        <div>
+          <h1 className="text-foreground text-2xl font-bold">Quizzes</h1>
+          <p className="text-muted-foreground mt-1 text-sm">
+            Manage quiz content, questions, and answers
+          </p>
+        </div>
+        <Link
+          href="/admin/quiz/new"
+          className="bg-foreground text-background hover:bg-foreground/90 inline-flex items-center rounded-md px-4 py-2 text-sm font-medium transition-colors"
+        >
+          + New Quiz
+        </Link>
+      </div>
 
       <div className="mt-6">
-        <QuizListTable quizzes={quizzes} />
+        <QuizListTable quizzes={quizzes} csrfTokenDelete={csrfTokenDelete} />
       </div>
     </div>
   );