From a4521847c0902b3c414dec77bf9978c3af2da0da Mon Sep 17 00:00:00 2001
From: Dominik Borbuliak <borbuliak.dominik@gmail.com>
Date: Sun, 15 Dec 2024 16:12:25 +0100
Subject: [PATCH 1/6] fix: Fixed attempt lists

---
 quizeek/src/db/queries/quiz-attempt.ts | 56 +++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 9 deletions(-)

diff --git a/quizeek/src/db/queries/quiz-attempt.ts b/quizeek/src/db/queries/quiz-attempt.ts
index 5299351..fc4c929 100644
--- a/quizeek/src/db/queries/quiz-attempt.ts
+++ b/quizeek/src/db/queries/quiz-attempt.ts
@@ -1,6 +1,16 @@
 import { auth } from '@/auth';
 import { handleError } from '@/utils';
-import { and, eq, getTableColumns, lt, ne, sql } from 'drizzle-orm';
+import {
+  and,
+  eq,
+  getTableColumns,
+  isNotNull,
+  lt,
+  ne,
+  or,
+  sql,
+} from 'drizzle-orm';
+import { DateTime, Duration } from 'luxon';
 
 import { db } from '..';
 import { quizes } from '../schema/quiz';
@@ -27,15 +37,29 @@ export const getMyQuizAttempts = async (
         and(
           eq(quizes.id, quizId),
           eq(quizAttempts.userId, session?.user.id ?? ''),
-          lt(
-            sql`DATETIME(quiz_attempt.date, '+' || quiz.time_limit_seconds || ' seconds')`,
-            sql`CURRENT_TIMESTAMP`
+          or(
+            lt(
+              sql`DATETIME(quiz_attempt.date, '+' || quiz.time_limit_seconds || ' seconds')`,
+              sql`CURRENT_TIMESTAMP`
+            ),
+            isNotNull(quizAttempts.score)
           )
         )
       )
       .orderBy(sql`${quizAttempts.timestamp} desc`);
 
-    return myQuizAttempts;
+    // adding 1hr because of drizzle sqlite timestamp bug
+    return myQuizAttempts.map((a) => ({
+      ...a,
+      timestamp:
+        DateTime.fromSQL(a.timestamp)
+          .plus(
+            Duration.fromObject({
+              hour: 1,
+            })
+          )
+          .toSQL() ?? a.timestamp,
+    }));
   } catch (error) {
     throw handleError(error);
   }
@@ -59,15 +83,29 @@ export const getOtherQuizAttempts = async (
         and(
           eq(quizes.id, quizId),
           ne(quizAttempts.userId, session?.user.id ?? ''),
-          lt(
-            sql`DATETIME(quiz_attempt.date, '+' || quiz.time_limit_seconds || ' seconds')`,
-            sql`CURRENT_TIMESTAMP`
+          or(
+            lt(
+              sql`DATETIME(quiz_attempt.date, '+' || quiz.time_limit_seconds || ' seconds')`,
+              sql`CURRENT_TIMESTAMP`
+            ),
+            isNotNull(quizAttempts.score)
           )
         )
       )
       .orderBy(sql`${quizAttempts.timestamp} desc`);
 
-    return otherQuizAttempts;
+    // adding 1hr because of drizzle sqlite timestamp bug
+    return otherQuizAttempts.map((a) => ({
+      ...a,
+      timestamp:
+        DateTime.fromSQL(a.timestamp)
+          .plus(
+            Duration.fromObject({
+              hour: 1,
+            })
+          )
+          .toSQL() ?? a.timestamp,
+    }));
   } catch (error) {
     throw handleError(error);
   }

From e0d769eb2bb3ad110afa36c3084ade237eb63cbc Mon Sep 17 00:00:00 2001
From: Dominik Borbuliak <borbuliak.dominik@gmail.com>
Date: Sun, 15 Dec 2024 16:15:18 +0100
Subject: [PATCH 2/6] fix: Fixed question bubble overflow

---
 quizeek/src/components/quiz/question/question-bubble.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quizeek/src/components/quiz/question/question-bubble.tsx b/quizeek/src/components/quiz/question/question-bubble.tsx
index 7357eef..84dfe0f 100644
--- a/quizeek/src/components/quiz/question/question-bubble.tsx
+++ b/quizeek/src/components/quiz/question/question-bubble.tsx
@@ -42,7 +42,7 @@ export const QuestionBubble = <TQuestion extends QuestionBubbleType>({
         transition,
       }}
       className={cn(
-        'rounded-full border w-6 h-6 text-center hover:bg-primary cursor-pointer overflow-x-auto text-foreground',
+        'rounded-full border w-6 h-6 text-center hover:bg-primary cursor-pointer text-foreground',
         currentQuestion === question.id && 'bg-primary dark:text-black'
       )}
       onMouseUp={onClick}

From 8bc3f2badb5e2098f428ac360716aa40599b4612 Mon Sep 17 00:00:00 2001
From: Dominik Borbuliak <borbuliak.dominik@gmail.com>
Date: Sun, 15 Dec 2024 16:18:01 +0100
Subject: [PATCH 3/6] feat: Improved finish button in quiz attempt

---
 .../src/components/quiz/attempt/quiz-attempt-save-dialog.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quizeek/src/components/quiz/attempt/quiz-attempt-save-dialog.tsx b/quizeek/src/components/quiz/attempt/quiz-attempt-save-dialog.tsx
index a401fb4..caac869 100644
--- a/quizeek/src/components/quiz/attempt/quiz-attempt-save-dialog.tsx
+++ b/quizeek/src/components/quiz/attempt/quiz-attempt-save-dialog.tsx
@@ -21,7 +21,7 @@ export const QuizAttemptSaveDialog = ({
 }: QuizAttemptSaveDialogProps) => {
   return (
     <Dialog>
-      <DialogTrigger asChild className="float-right">
+      <DialogTrigger asChild className="float-right mt-2 w-full md:w-fit">
         <Button type="button">Finish</Button>
       </DialogTrigger>
       <DialogContent>

From 663ba82b10c772e0228fb678c628136e19cf350a Mon Sep 17 00:00:00 2001
From: Dominik Borbuliak <borbuliak.dominik@gmail.com>
Date: Sun, 15 Dec 2024 17:43:30 +0100
Subject: [PATCH 4/6] feat: Added quiz view

---
 .../[quizId]/attempt/[attemptId]/page.tsx     |  7 ++-
 .../quiz/[quizId]/view/[attemptId]/page.tsx   | 36 ++++++++++-
 .../quiz/question/choice/choice.tsx           | 34 ++++++++++-
 .../question/choice/multi-choice-list.tsx     | 13 +++-
 .../quiz/question/choice/multi-choice.tsx     | 25 +++++++-
 .../question/choice/single-choice-list.tsx    | 15 ++++-
 .../quiz/question/choice/single-choice.tsx    | 26 +++++++-
 .../quiz/question/question-list.tsx           | 15 ++++-
 .../src/components/quiz/question/question.tsx | 17 ++++--
 quizeek/src/components/quiz/quiz-attempt.tsx  | 54 ++++++++++++-----
 quizeek/src/db/queries/quiz-attempt.ts        | 50 +++++++++++++++-
 quizeek/src/db/queries/quiz.ts                | 60 ++++++++++++++++++-
 quizeek/src/db/schema/answer.ts               |  8 ++-
 quizeek/src/db/schema/choice.ts               |  6 +-
 quizeek/src/db/schema/quiz-attempt.ts         | 11 +++-
 15 files changed, 327 insertions(+), 50 deletions(-)

diff --git a/quizeek/src/app/(app)/auth/quiz/[quizId]/attempt/[attemptId]/page.tsx b/quizeek/src/app/(app)/auth/quiz/[quizId]/attempt/[attemptId]/page.tsx
index 44de31b..58893a6 100644
--- a/quizeek/src/app/(app)/auth/quiz/[quizId]/attempt/[attemptId]/page.tsx
+++ b/quizeek/src/app/(app)/auth/quiz/[quizId]/attempt/[attemptId]/page.tsx
@@ -1,5 +1,8 @@
 import { QuizAttempt } from '@/components/quiz/quiz-attempt';
-import { getQuizAttemptById, getQuizWithQuestionsById } from '@/db/queries';
+import {
+  getQuizAttemptById,
+  getQuizWithPublicQuestionsById,
+} from '@/db/queries';
 import { notFound, redirect } from 'next/navigation';
 import React from 'react';
 
@@ -17,7 +20,7 @@ const Page = async ({ params }: AttemptPageProps) => {
     notFound();
   }
 
-  const quiz = await getQuizWithQuestionsById(routeParams.quizId);
+  const quiz = await getQuizWithPublicQuestionsById(routeParams.quizId);
   const attempt = await getQuizAttemptById(routeParams.attemptId);
 
   if (!quiz || !attempt) {
diff --git a/quizeek/src/app/(app)/auth/quiz/[quizId]/view/[attemptId]/page.tsx b/quizeek/src/app/(app)/auth/quiz/[quizId]/view/[attemptId]/page.tsx
index 3e44a7d..bc52f70 100644
--- a/quizeek/src/app/(app)/auth/quiz/[quizId]/view/[attemptId]/page.tsx
+++ b/quizeek/src/app/(app)/auth/quiz/[quizId]/view/[attemptId]/page.tsx
@@ -1,5 +1,37 @@
-const Page = async () => {
-  return <p>Quiz view</p>;
+import { QuizAttempt } from '@/components/quiz/quiz-attempt';
+import {
+  getQuizAttemptWithAnswers,
+  getQuizWithQuestionsById,
+} from '@/db/queries';
+import { notFound } from 'next/navigation';
+
+type PageProps = {
+  params?: Promise<{
+    quizId?: string;
+    attemptId?: string;
+  }>;
+};
+
+const Page = async ({ params }: PageProps) => {
+  const routeParams = await params;
+
+  if (!routeParams?.quizId || !routeParams.attemptId) {
+    notFound();
+  }
+
+  const quiz = await getQuizWithQuestionsById(routeParams.quizId);
+  const attempt = await getQuizAttemptWithAnswers(routeParams.attemptId);
+
+  if (!quiz || !attempt) {
+    return notFound();
+  }
+
+  return (
+    <>
+      <h1 className="text-xl font-bold">{quiz.title}</h1>
+      <QuizAttempt quiz={quiz} attempt={attempt} />
+    </>
+  );
 };
 
 export default Page;
diff --git a/quizeek/src/components/quiz/question/choice/choice.tsx b/quizeek/src/components/quiz/question/choice/choice.tsx
index 28577eb..aa41e43 100644
--- a/quizeek/src/components/quiz/question/choice/choice.tsx
+++ b/quizeek/src/components/quiz/question/choice/choice.tsx
@@ -1,11 +1,39 @@
 import { Card } from '@/components/ui/card';
+import { cn } from '@/lib/utils';
 import { PropsWithChildren } from 'react';
 
-export type ChoiceProps = PropsWithChildren;
+export type ChoiceProps = {
+  enableHiglighting: boolean;
+  isCorrect: boolean;
+  wasSelected: boolean;
+} & PropsWithChildren;
 
-export const Choice = ({ children }: ChoiceProps) => {
+export const Choice = ({
+  enableHiglighting,
+  isCorrect,
+  wasSelected,
+  children,
+  ...props
+}: ChoiceProps) => {
   return (
-    <Card className="w-full py-0 px-3 rounded-md hover:bg-secondary flex items-center gap-2 mb-2 last:mb-0">
+    <Card
+      className={cn(
+        'w-full py-0 px-3 rounded-md hover:bg-secondary flex items-center gap-2 mb-2 last:mb-0',
+        enableHiglighting &&
+          wasSelected &&
+          isCorrect &&
+          'border-2 dark:border-green-600 border-green-400',
+        enableHiglighting &&
+          wasSelected &&
+          !isCorrect &&
+          'border-2 dark:border-red-600 border-red-400',
+        enableHiglighting &&
+          !wasSelected &&
+          isCorrect &&
+          'border-2 dark:border-yellow-600 border-yellow-400'
+      )}
+      {...props}
+    >
       {children}
     </Card>
   );
diff --git a/quizeek/src/components/quiz/question/choice/multi-choice-list.tsx b/quizeek/src/components/quiz/question/choice/multi-choice-list.tsx
index e9a0de8..022acaa 100644
--- a/quizeek/src/components/quiz/question/choice/multi-choice-list.tsx
+++ b/quizeek/src/components/quiz/question/choice/multi-choice-list.tsx
@@ -1,16 +1,22 @@
 import { ScrollArea } from '@/components/ui/scroll-area';
 import { Choice, PublicChoice } from '@/db/schema/choice';
+import {
+  type QuizAttempt as QuizAttemptType,
+  QuizAttemptWithAnswers,
+} from '@/db/schema/quiz-attempt';
 
 import { MultiChoice } from './multi-choice';
 
 export type MultiChoiceListProps = {
   questionId: string;
   choices: (Choice | PublicChoice)[];
+  attempt: QuizAttemptType | QuizAttemptWithAnswers;
 };
 
 export const MultiChoiceList = ({
   questionId,
   choices,
+  attempt,
 }: MultiChoiceListProps) => {
   return (
     <ScrollArea
@@ -18,7 +24,12 @@ export const MultiChoiceList = ({
       className="mt-4 flex flex-col max-h-[40vh] overflow-y-auto pr-4"
     >
       {choices.map((choice) => (
-        <MultiChoice key={choice.id} choice={choice} questionId={questionId} />
+        <MultiChoice
+          key={choice.id}
+          choice={choice}
+          questionId={questionId}
+          attempt={attempt}
+        />
       ))}
     </ScrollArea>
   );
diff --git a/quizeek/src/components/quiz/question/choice/multi-choice.tsx b/quizeek/src/components/quiz/question/choice/multi-choice.tsx
index 62c9f70..7981a85 100644
--- a/quizeek/src/components/quiz/question/choice/multi-choice.tsx
+++ b/quizeek/src/components/quiz/question/choice/multi-choice.tsx
@@ -2,6 +2,10 @@ import { Checkbox } from '@/components/ui/checkbox';
 import { FormControl, FormField, FormItem } from '@/components/ui/form';
 import { Label } from '@/components/ui/label';
 import { Choice as ChoiceType, PublicChoice } from '@/db/schema/choice';
+import {
+  type QuizAttempt as QuizAttemptType,
+  QuizAttemptWithAnswers,
+} from '@/db/schema/quiz-attempt';
 import { useFormContext } from 'react-hook-form';
 
 import { Choice } from './choice';
@@ -9,13 +13,29 @@ import { Choice } from './choice';
 export type MultiChoiceProps = {
   questionId: string;
   choice: ChoiceType | PublicChoice;
+  attempt: QuizAttemptType | QuizAttemptWithAnswers;
 };
 
-export const MultiChoice = ({ questionId, choice }: MultiChoiceProps) => {
+export const MultiChoice = ({
+  questionId,
+  choice,
+  attempt,
+}: MultiChoiceProps) => {
   const form = useFormContext();
 
+  const enableHiglighting =
+    attempt.type === 'with_answers' && choice.type === 'private';
+  const wasSelected =
+    enableHiglighting &&
+    !!attempt.answers.find((a) => a.choiceId === choice.id);
+  const isCorrect = enableHiglighting && choice.isCorrect;
+
   return (
-    <Choice>
+    <Choice
+      enableHiglighting={enableHiglighting}
+      wasSelected={wasSelected}
+      isCorrect={isCorrect}
+    >
       <FormField
         control={form.control}
         name={questionId}
@@ -30,6 +50,7 @@ export const MultiChoice = ({ questionId, choice }: MultiChoiceProps) => {
             <FormControl>
               <Checkbox
                 id={choice.id}
+                disabled={attempt.type === 'with_answers'}
                 {...field}
                 checked={field.value?.includes(choice.id)}
                 onCheckedChange={(checked) => {
diff --git a/quizeek/src/components/quiz/question/choice/single-choice-list.tsx b/quizeek/src/components/quiz/question/choice/single-choice-list.tsx
index cf0030d..698560a 100644
--- a/quizeek/src/components/quiz/question/choice/single-choice-list.tsx
+++ b/quizeek/src/components/quiz/question/choice/single-choice-list.tsx
@@ -2,6 +2,10 @@ import { FormControl, FormField, FormItem } from '@/components/ui/form';
 import { RadioGroup } from '@/components/ui/radio-group';
 import { ScrollArea } from '@/components/ui/scroll-area';
 import { Choice, PublicChoice } from '@/db/schema/choice';
+import {
+  type QuizAttempt as QuizAttemptType,
+  QuizAttemptWithAnswers,
+} from '@/db/schema/quiz-attempt';
 import { useFormContext } from 'react-hook-form';
 
 import { SingleChoice } from './single-choice';
@@ -9,11 +13,13 @@ import { SingleChoice } from './single-choice';
 export type SingleChoiceListProps = {
   questionId: string;
   choices: (Choice | PublicChoice)[];
+  attempt: QuizAttemptType | QuizAttemptWithAnswers;
 };
 
 export const SingleChoiceList = ({
   questionId,
   choices,
+  attempt,
 }: SingleChoiceListProps) => {
   const form = useFormContext();
 
@@ -30,10 +36,15 @@ export const SingleChoiceList = ({
             <FormControl>
               <RadioGroup
                 onValueChange={(v) => field.onChange([v])}
-                defaultValue={field.value}
+                value={field.value?.[0]}
+                defaultValue={field.value?.[0]}
               >
                 {choices.map((choice) => (
-                  <SingleChoice key={choice.id} choice={choice} />
+                  <SingleChoice
+                    key={choice.id}
+                    choice={choice}
+                    attempt={attempt}
+                  />
                 ))}
               </RadioGroup>
             </FormControl>
diff --git a/quizeek/src/components/quiz/question/choice/single-choice.tsx b/quizeek/src/components/quiz/question/choice/single-choice.tsx
index 41bdda7..32b9c20 100644
--- a/quizeek/src/components/quiz/question/choice/single-choice.tsx
+++ b/quizeek/src/components/quiz/question/choice/single-choice.tsx
@@ -2,18 +2,38 @@ import { FormControl } from '@/components/ui/form';
 import { Label } from '@/components/ui/label';
 import { RadioGroupItem } from '@/components/ui/radio-group';
 import { Choice as ChoiceType, PublicChoice } from '@/db/schema/choice';
+import {
+  type QuizAttempt as QuizAttemptType,
+  QuizAttemptWithAnswers,
+} from '@/db/schema/quiz-attempt';
 
 import { Choice } from './choice';
 
 export type SingleChoiceProps = {
   choice: ChoiceType | PublicChoice;
+  attempt: QuizAttemptType | QuizAttemptWithAnswers;
 };
 
-export const SingleChoice = ({ choice }: SingleChoiceProps) => {
+export const SingleChoice = ({ choice, attempt }: SingleChoiceProps) => {
+  const enableHiglighting =
+    attempt.type === 'with_answers' && choice.type === 'private';
+  const wasSelected =
+    enableHiglighting &&
+    !!attempt.answers.find((a) => a.choiceId === choice.id);
+  const isCorrect = enableHiglighting && choice.isCorrect;
+
   return (
-    <Choice>
+    <Choice
+      enableHiglighting={enableHiglighting}
+      wasSelected={wasSelected}
+      isCorrect={isCorrect}
+    >
       <FormControl>
-        <RadioGroupItem value={choice.id} id={choice.id} />
+        <RadioGroupItem
+          value={choice.id}
+          id={choice.id}
+          disabled={attempt.type === 'with_answers'}
+        />
       </FormControl>
       <Label htmlFor={choice.id} className="block w-full h-full p-3 leading-4">
         {choice.text}
diff --git a/quizeek/src/components/quiz/question/question-list.tsx b/quizeek/src/components/quiz/question/question-list.tsx
index 9328e88..d5e0aad 100644
--- a/quizeek/src/components/quiz/question/question-list.tsx
+++ b/quizeek/src/components/quiz/question/question-list.tsx
@@ -8,7 +8,14 @@ import {
   CarouselNext,
   CarouselPrevious,
 } from '@/components/ui/carousel';
-import { type QuestionWithPublicChoices } from '@/db/schema/question';
+import {
+  QuestionWithChoices,
+  type QuestionWithPublicChoices,
+} from '@/db/schema/question';
+import {
+  type QuizAttempt as QuizAttemptType,
+  QuizAttemptWithAnswers,
+} from '@/db/schema/quiz-attempt';
 import { cn } from '@/lib/utils';
 import { useState } from 'react';
 
@@ -16,7 +23,8 @@ import { Question as QuestionComponent } from './question';
 import { QuestionBubbleList } from './question-bubble-list';
 
 export type QuestionListProps = {
-  questions: QuestionWithPublicChoices[];
+  attempt: QuizAttemptType | QuizAttemptWithAnswers;
+  questions: QuestionWithPublicChoices[] | QuestionWithChoices[];
   draggableBubbles: boolean;
   className?: string;
 };
@@ -25,6 +33,7 @@ export const QuestionList = ({
   questions,
   draggableBubbles,
   className,
+  attempt,
 }: QuestionListProps) => {
   const [carouselApi, setCarouselApi] = useState<CarouselApi>();
   const [currentQuestion, setCurrentQuestion] = useState<string>(
@@ -52,7 +61,7 @@ export const QuestionList = ({
       <CarouselContent>
         {questions.map((question) => (
           <CarouselItem key={question.id}>
-            <QuestionComponent question={question} />
+            <QuestionComponent question={question} attempt={attempt} />
           </CarouselItem>
         ))}
       </CarouselContent>
diff --git a/quizeek/src/components/quiz/question/question.tsx b/quizeek/src/components/quiz/question/question.tsx
index f4c9bca..87ac24e 100644
--- a/quizeek/src/components/quiz/question/question.tsx
+++ b/quizeek/src/components/quiz/question/question.tsx
@@ -1,15 +1,22 @@
 import { Card, CardContent } from '@/components/ui/card';
-import { type QuestionWithPublicChoices } from '@/db/schema/question';
+import {
+  QuestionWithChoices,
+  type QuestionWithPublicChoices,
+} from '@/db/schema/question';
+import {
+  type QuizAttempt as QuizAttemptType,
+  QuizAttemptWithAnswers,
+} from '@/db/schema/quiz-attempt';
 
 import { MultiChoiceList } from './choice/multi-choice-list';
 import { SingleChoiceList } from './choice/single-choice-list';
 import { QuestionDescription } from './question-description';
-
 type QuestionProps = {
-  question: QuestionWithPublicChoices;
+  question: QuestionWithPublicChoices | QuestionWithChoices;
+  attempt: QuizAttemptType | QuizAttemptWithAnswers;
 };
 
-export const Question = ({ question }: QuestionProps) => {
+export const Question = ({ question, attempt }: QuestionProps) => {
   return (
     <div className="p-1 h-full">
       <Card className="h-full">
@@ -21,12 +28,14 @@ export const Question = ({ question }: QuestionProps) => {
             <MultiChoiceList
               questionId={question.id}
               choices={question.choices}
+              attempt={attempt}
             />
           )}
           {question.type === 'single_choice' && (
             <SingleChoiceList
               questionId={question.id}
               choices={question.choices}
+              attempt={attempt}
             />
           )}
         </CardContent>
diff --git a/quizeek/src/components/quiz/quiz-attempt.tsx b/quizeek/src/components/quiz/quiz-attempt.tsx
index 810e1c1..1497fec 100644
--- a/quizeek/src/components/quiz/quiz-attempt.tsx
+++ b/quizeek/src/components/quiz/quiz-attempt.tsx
@@ -1,11 +1,12 @@
 'use client';
 
 import { Form } from '@/components/ui/form';
-import { QuizWithPublicQuestions } from '@/db/schema/quiz';
+import { QuizWithPublicQuestions, QuizWithQuestions } from '@/db/schema/quiz';
 import {
   QuizAttemptResponse,
   quizAttemptResponseSchema,
   type QuizAttempt as QuizAttemptType,
+  QuizAttemptWithAnswers,
 } from '@/db/schema/quiz-attempt';
 import { useSaveQuizAttemptMutation } from '@/hooks';
 import { useQuizTimer } from '@/hooks/quiz-timer';
@@ -19,8 +20,8 @@ import { QuizAttemptSaveDialog } from './attempt/quiz-attempt-save-dialog';
 import { QuestionList } from './question/question-list';
 
 type QuizAttemptProps = {
-  quiz: QuizWithPublicQuestions;
-  attempt: QuizAttemptType;
+  quiz: QuizWithPublicQuestions | QuizWithQuestions;
+  attempt: QuizAttemptType | QuizAttemptWithAnswers;
 };
 
 export const QuizAttempt = ({ quiz, attempt }: QuizAttemptProps) => {
@@ -32,15 +33,31 @@ export const QuizAttempt = ({ quiz, attempt }: QuizAttemptProps) => {
     attemptTimestamp: attempt.timestamp,
   });
 
+  const getDefaultValues = () => {
+    if (attempt.type === 'base') {
+      return {
+        ...quiz.questions.reduce((acc, question) => {
+          acc[question.id] = [];
+          return acc;
+        }, {} as QuizAttemptResponse),
+      };
+    }
+
+    return {
+      ...attempt.answers.reduce((acc, answer) => {
+        acc[answer.choice.questionId] = [
+          ...(acc[answer.choice.questionId] ?? []),
+          answer.choiceId,
+        ];
+        return acc;
+      }, {} as QuizAttemptResponse),
+    };
+  };
+
   const formRef = useRef<HTMLFormElement | null>(null);
   const form = useForm<QuizAttemptResponse>({
     resolver: zodResolver(quizAttemptResponseSchema),
-    defaultValues: {
-      ...quiz.questions.reduce((acc, question) => {
-        acc[question.id] = [];
-        return acc;
-      }, {} as QuizAttemptResponse),
-    },
+    defaultValues: getDefaultValues(),
   });
 
   const onSubmit = async (data: QuizAttemptResponse): Promise<void> => {
@@ -59,25 +76,30 @@ export const QuizAttempt = ({ quiz, attempt }: QuizAttemptProps) => {
   };
 
   useEffect(() => {
-    if (isTimerUp) {
+    if (isTimerUp && attempt.type === 'base') {
       formRef.current?.requestSubmit();
     }
-  }, [isTimerUp]);
+  }, [isTimerUp, attempt]);
 
   return (
     <>
-      <h2 className="w-full text-center font-bold">{timer}</h2>
+      <h2 className="w-full text-center font-bold">
+        {attempt.type === 'base' ? timer : `${attempt.score}pts`}
+      </h2>
       <Form {...form}>
         <form onSubmit={form.handleSubmit(onSubmit)} ref={formRef}>
           <QuestionList
+            attempt={attempt}
             questions={quiz.questions}
             className="mt-10"
             draggableBubbles={false}
           />
-          <QuizAttemptSaveDialog
-            onConfirm={() => formRef.current?.requestSubmit()}
-            isPending={saveQuizAttempt.isPending}
-          ></QuizAttemptSaveDialog>
+          {attempt.type === 'base' && (
+            <QuizAttemptSaveDialog
+              onConfirm={() => formRef.current?.requestSubmit()}
+              isPending={saveQuizAttempt.isPending}
+            />
+          )}
         </form>
       </Form>
     </>
diff --git a/quizeek/src/db/queries/quiz-attempt.ts b/quizeek/src/db/queries/quiz-attempt.ts
index fc4c929..b58456d 100644
--- a/quizeek/src/db/queries/quiz-attempt.ts
+++ b/quizeek/src/db/queries/quiz-attempt.ts
@@ -1,4 +1,5 @@
 import { auth } from '@/auth';
+import { InvalidSessionError } from '@/models';
 import { handleError } from '@/utils';
 import {
   and,
@@ -17,6 +18,7 @@ import { quizes } from '../schema/quiz';
 import {
   QuizAttempt,
   quizAttempts,
+  QuizAttemptWithAnswers,
   QuizAttemptWithUser,
 } from '../schema/quiz-attempt';
 import { users } from '../schema/user';
@@ -51,6 +53,7 @@ export const getMyQuizAttempts = async (
     // adding 1hr because of drizzle sqlite timestamp bug
     return myQuizAttempts.map((a) => ({
       ...a,
+      type: 'base',
       timestamp:
         DateTime.fromSQL(a.timestamp)
           .plus(
@@ -97,6 +100,7 @@ export const getOtherQuizAttempts = async (
     // adding 1hr because of drizzle sqlite timestamp bug
     return otherQuizAttempts.map((a) => ({
       ...a,
+      type: 'base',
       timestamp:
         DateTime.fromSQL(a.timestamp)
           .plus(
@@ -119,8 +123,48 @@ export const getQuizAttemptById = async (
       where: eq(quizAttempts.id, attemptId),
     });
 
-    return quizAttempt;
-  } catch {
-    throw new Error('Failed to load quiz attempt.');
+    return quizAttempt ? { ...quizAttempt, type: 'base' } : quizAttempt;
+  } catch (error) {
+    throw handleError(error);
+  }
+};
+
+export const getQuizAttemptWithAnswers = async (
+  attemptId: string
+): Promise<QuizAttemptWithAnswers> => {
+  try {
+    const session = await auth();
+
+    const quizAttempt = await db.query.quizAttempts.findFirst({
+      where: and(
+        eq(quizAttempts.id, attemptId),
+        eq(quizAttempts.userId, session?.user.id ?? '')
+      ),
+      with: {
+        answers: {
+          with: {
+            choice: true,
+          },
+        },
+      },
+    });
+
+    if (!quizAttempt) {
+      throw new InvalidSessionError('Attempt does not belong to the user');
+    }
+
+    return {
+      ...quizAttempt,
+      type: 'with_answers',
+      answers: quizAttempt.answers.map((a) => ({
+        ...a,
+        choice: {
+          ...a.choice,
+          type: 'private',
+        },
+      })),
+    };
+  } catch (error) {
+    throw handleError(error);
   }
 };
diff --git a/quizeek/src/db/queries/quiz.ts b/quizeek/src/db/queries/quiz.ts
index 76d8360..417d5fa 100644
--- a/quizeek/src/db/queries/quiz.ts
+++ b/quizeek/src/db/queries/quiz.ts
@@ -6,10 +6,12 @@ import { handleError } from '@/utils';
 import { and, eq, getTableColumns, like, or } from 'drizzle-orm';
 
 import { db } from '..';
+import { Choice, PublicChoice } from '../schema/choice';
 import {
   EditableQuiz,
   quizes,
   QuizWithPublicQuestions,
+  QuizWithQuestions,
   QuizWithUser,
 } from '../schema/quiz';
 import { quizAttempts } from '../schema/quiz-attempt';
@@ -51,7 +53,7 @@ export const getQuizById = async (
   }
 };
 
-export const getQuizWithQuestionsById = async (
+export const getQuizWithPublicQuestionsById = async (
   quizId: string
 ): Promise<QuizWithPublicQuestions | undefined> => {
   try {
@@ -72,7 +74,50 @@ export const getQuizWithQuestionsById = async (
       },
     });
 
-    return quiz;
+    return !quiz
+      ? quiz
+      : {
+          ...quiz,
+          questions: quiz.questions.map((q) => ({
+            ...q,
+            choices: q.choices.map((c) => ({
+              ...c,
+              type: 'public',
+            })) as PublicChoice[],
+          })),
+        };
+  } catch {
+    throw new Error('Failed to load quiz.');
+  }
+};
+
+export const getQuizWithQuestionsById = async (
+  quizId: string
+): Promise<QuizWithQuestions | undefined> => {
+  try {
+    const quiz = await db.query.quizes.findFirst({
+      where: eq(quizes.id, quizId),
+      with: {
+        questions: {
+          with: {
+            choices: true,
+          },
+        },
+      },
+    });
+
+    return !quiz
+      ? quiz
+      : {
+          ...quiz,
+          questions: quiz.questions.map((q) => ({
+            ...q,
+            choices: q.choices.map((c) => ({
+              ...c,
+              type: 'private',
+            })) as Choice[],
+          })),
+        };
   } catch {
     throw new Error('Failed to load quiz.');
   }
@@ -158,7 +203,16 @@ export const getEditableQuiz = async (id: string): Promise<EditableQuiz> => {
       throw new InvalidSessionError('User is not creator of the quiz');
     }
 
-    return dbQuiz;
+    return {
+      ...dbQuiz,
+      questions: dbQuiz.questions.map((q) => ({
+        ...q,
+        choices: q.choices.map((c) => ({
+          ...c,
+          type: 'private',
+        })) as Choice[],
+      })),
+    };
   } catch (error) {
     throw handleError(error);
   }
diff --git a/quizeek/src/db/schema/answer.ts b/quizeek/src/db/schema/answer.ts
index a3619bb..4da9307 100644
--- a/quizeek/src/db/schema/answer.ts
+++ b/quizeek/src/db/schema/answer.ts
@@ -1,8 +1,8 @@
-import { relations } from 'drizzle-orm';
+import { InferSelectModel, relations } from 'drizzle-orm';
 import { sqliteTable, text } from 'drizzle-orm/sqlite-core';
 import { v7 as uuid } from 'uuid';
 
-import { choices } from './choice';
+import { Choice, choices } from './choice';
 import { quizAttempts } from './quiz-attempt';
 
 export const answers = sqliteTable('answer', {
@@ -21,3 +21,7 @@ export const answersRelations = relations(answers, ({ one }) => ({
     references: [choices.id],
   }),
 }));
+
+type Answer = InferSelectModel<typeof answers>;
+
+export type AnswerWithChoice = Answer & { choice: Choice };
diff --git a/quizeek/src/db/schema/choice.ts b/quizeek/src/db/schema/choice.ts
index 13a924a..c7df85f 100644
--- a/quizeek/src/db/schema/choice.ts
+++ b/quizeek/src/db/schema/choice.ts
@@ -21,6 +21,8 @@ export const choicesRelations = relations(choices, ({ one, many }) => ({
   answers: many(answers),
 }));
 
-export type Choice = InferSelectModel<typeof choices>;
+export type Choice = InferSelectModel<typeof choices> & { type: 'private' };
 
-export type PublicChoice = Omit<Choice, 'points' | 'isCorrect'>;
+export type PublicChoice = Omit<Choice, 'points' | 'isCorrect'> & {
+  type: 'public';
+};
diff --git a/quizeek/src/db/schema/quiz-attempt.ts b/quizeek/src/db/schema/quiz-attempt.ts
index fda194e..6d1143b 100644
--- a/quizeek/src/db/schema/quiz-attempt.ts
+++ b/quizeek/src/db/schema/quiz-attempt.ts
@@ -3,7 +3,7 @@ import { integer, sqliteTable, text } from 'drizzle-orm/sqlite-core';
 import { v7 as uuid } from 'uuid';
 import { z } from 'zod';
 
-import { answers } from './answer';
+import { answers, AnswerWithChoice } from './answer';
 import { quizes } from './quiz';
 import { User, users } from './user';
 
@@ -32,7 +32,9 @@ export const quizAttemptsRelations = relations(
   })
 );
 
-export type QuizAttempt = InferSelectModel<typeof quizAttempts>;
+export type QuizAttempt = InferSelectModel<typeof quizAttempts> & {
+  type: 'base';
+};
 
 export type QuizAttemptWithUser = QuizAttempt & { user: User };
 
@@ -41,3 +43,8 @@ export const quizAttemptResponseSchema = z.record(
   z.array(z.string())
 );
 export type QuizAttemptResponse = z.infer<typeof quizAttemptResponseSchema>;
+
+export type QuizAttemptWithAnswers = Omit<QuizAttempt, 'type'> & {
+  answers: AnswerWithChoice[];
+  type: 'with_answers';
+};

From 09f7d14edb6d168ef0df995ab2f9386a871a32d2 Mon Sep 17 00:00:00 2001
From: Dominik Borbuliak <borbuliak.dominik@gmail.com>
Date: Sun, 15 Dec 2024 18:00:18 +0100
Subject: [PATCH 5/6] refactor: Remove unnecessary files

---
 quizeek/src/components/profile/update-user-form.tsx        | 2 +-
 .../src/components/quiz/detail/quiz-activate-dialog.tsx    | 2 +-
 .../src/components/quiz/detail/quiz-detail-my-attempts.tsx | 2 +-
 .../components/quiz/detail/quiz-detail-other-attempts.tsx  | 2 +-
 .../src/components/quiz/question/question-bubble-list.tsx  | 2 +-
 quizeek/src/components/quiz/question/question-bubble.tsx   | 2 +-
 quizeek/src/components/quiz/quiz-attempt.tsx               | 2 +-
 quizeek/src/components/quiz/quiz-form/quiz-form.tsx        | 5 ++---
 quizeek/src/db/queries/answer.ts                           | 0
 quizeek/src/db/queries/choice.ts                           | 0
 quizeek/src/db/queries/index.ts                            | 4 ----
 quizeek/src/db/queries/question.ts                         | 0
 quizeek/src/db/queries/user.ts                             | 0
 quizeek/src/hooks/answer.ts                                | 0
 quizeek/src/hooks/choice.ts                                | 0
 quizeek/src/hooks/index.ts                                 | 4 +---
 quizeek/src/hooks/question.ts                              | 0
 quizeek/src/hooks/quiz-attempt.ts                          | 2 +-
 quizeek/src/hooks/quiz.ts                                  | 7 +++++--
 quizeek/src/server-actions/answer/index.ts                 | 1 -
 quizeek/src/server-actions/choice/index.ts                 | 1 -
 quizeek/src/server-actions/index.ts                        | 5 +----
 quizeek/src/server-actions/question/index.ts               | 1 -
 quizeek/src/server-actions/quiz/index.ts                   | 1 +
 quizeek/src/utils/index.ts                                 | 2 ++
 25 files changed, 20 insertions(+), 27 deletions(-)
 delete mode 100644 quizeek/src/db/queries/answer.ts
 delete mode 100644 quizeek/src/db/queries/choice.ts
 delete mode 100644 quizeek/src/db/queries/question.ts
 delete mode 100644 quizeek/src/db/queries/user.ts
 delete mode 100644 quizeek/src/hooks/answer.ts
 delete mode 100644 quizeek/src/hooks/choice.ts
 delete mode 100644 quizeek/src/hooks/question.ts
 delete mode 100644 quizeek/src/server-actions/answer/index.ts
 delete mode 100644 quizeek/src/server-actions/choice/index.ts
 delete mode 100644 quizeek/src/server-actions/question/index.ts

diff --git a/quizeek/src/components/profile/update-user-form.tsx b/quizeek/src/components/profile/update-user-form.tsx
index ba1f778..f16ff7c 100644
--- a/quizeek/src/components/profile/update-user-form.tsx
+++ b/quizeek/src/components/profile/update-user-form.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import { UpdateUser, updateUserSchema } from '@/db/schema/user';
-import { useUpdateUserMutation } from '@/hooks/user';
+import { useUpdateUserMutation } from '@/hooks';
 import { cn } from '@/lib/utils';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { SessionContextValue } from 'next-auth/react';
diff --git a/quizeek/src/components/quiz/detail/quiz-activate-dialog.tsx b/quizeek/src/components/quiz/detail/quiz-activate-dialog.tsx
index d8e7b88..183f5af 100644
--- a/quizeek/src/components/quiz/detail/quiz-activate-dialog.tsx
+++ b/quizeek/src/components/quiz/detail/quiz-activate-dialog.tsx
@@ -9,7 +9,7 @@ import {
   DialogTrigger,
 } from '@/components/ui/dialog';
 import { QuizWithUser } from '@/db/schema/quiz';
-import { useActivateQuizMutation } from '@/hooks/quiz';
+import { useActivateQuizMutation } from '@/hooks';
 import React from 'react';
 import { toast } from 'sonner';
 
diff --git a/quizeek/src/components/quiz/detail/quiz-detail-my-attempts.tsx b/quizeek/src/components/quiz/detail/quiz-detail-my-attempts.tsx
index f1956b8..c5457f9 100644
--- a/quizeek/src/components/quiz/detail/quiz-detail-my-attempts.tsx
+++ b/quizeek/src/components/quiz/detail/quiz-detail-my-attempts.tsx
@@ -1,7 +1,7 @@
 import { Card, CardContent, CardTitle } from '@/components/ui/card';
 import { getMyQuizAttempts } from '@/db/queries';
 import { QuizWithUser } from '@/db/schema/quiz';
-import { toLocalDateTimeString } from '@/utils/date';
+import { toLocalDateTimeString } from '@/utils';
 import { SquareArrowRight } from 'lucide-react';
 import Link from 'next/link';
 import React from 'react';
diff --git a/quizeek/src/components/quiz/detail/quiz-detail-other-attempts.tsx b/quizeek/src/components/quiz/detail/quiz-detail-other-attempts.tsx
index 8ebe820..7d15047 100644
--- a/quizeek/src/components/quiz/detail/quiz-detail-other-attempts.tsx
+++ b/quizeek/src/components/quiz/detail/quiz-detail-other-attempts.tsx
@@ -1,7 +1,7 @@
 import { Card, CardContent, CardTitle } from '@/components/ui/card';
 import { getOtherQuizAttempts } from '@/db/queries';
 import { QuizWithUser } from '@/db/schema/quiz';
-import { toLocalDateTimeString } from '@/utils/date';
+import { toLocalDateTimeString } from '@/utils';
 import { CircleUserRound } from 'lucide-react';
 import Image from 'next/image';
 import React from 'react';
diff --git a/quizeek/src/components/quiz/question/question-bubble-list.tsx b/quizeek/src/components/quiz/question/question-bubble-list.tsx
index 2988f18..1b026f8 100644
--- a/quizeek/src/components/quiz/question/question-bubble-list.tsx
+++ b/quizeek/src/components/quiz/question/question-bubble-list.tsx
@@ -1,5 +1,5 @@
 import { CarouselApi } from '@/components/ui/carousel';
-import { QuestionBubbleType } from '@/models/question';
+import { QuestionBubbleType } from '@/models';
 import { DndContext, DragEndEvent } from '@dnd-kit/core';
 import { arrayMove, SortableContext } from '@dnd-kit/sortable';
 import { Dispatch, PropsWithChildren, SetStateAction } from 'react';
diff --git a/quizeek/src/components/quiz/question/question-bubble.tsx b/quizeek/src/components/quiz/question/question-bubble.tsx
index 84dfe0f..209831c 100644
--- a/quizeek/src/components/quiz/question/question-bubble.tsx
+++ b/quizeek/src/components/quiz/question/question-bubble.tsx
@@ -1,6 +1,6 @@
 import { CarouselApi } from '@/components/ui/carousel';
 import { cn } from '@/lib/utils';
-import { QuestionBubbleType } from '@/models/question';
+import { QuestionBubbleType } from '@/models';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import { Dispatch, SetStateAction } from 'react';
diff --git a/quizeek/src/components/quiz/quiz-attempt.tsx b/quizeek/src/components/quiz/quiz-attempt.tsx
index 1497fec..03ca38b 100644
--- a/quizeek/src/components/quiz/quiz-attempt.tsx
+++ b/quizeek/src/components/quiz/quiz-attempt.tsx
@@ -9,7 +9,7 @@ import {
   QuizAttemptWithAnswers,
 } from '@/db/schema/quiz-attempt';
 import { useSaveQuizAttemptMutation } from '@/hooks';
-import { useQuizTimer } from '@/hooks/quiz-timer';
+import { useQuizTimer } from '@/hooks';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useRouter } from 'next/navigation';
 import { useEffect, useRef } from 'react';
diff --git a/quizeek/src/components/quiz/quiz-form/quiz-form.tsx b/quizeek/src/components/quiz/quiz-form/quiz-form.tsx
index 83621b1..35a6e75 100644
--- a/quizeek/src/components/quiz/quiz-form/quiz-form.tsx
+++ b/quizeek/src/components/quiz/quiz-form/quiz-form.tsx
@@ -13,9 +13,8 @@ import {
   QuizForm as QuizFormData,
   quizFormSchema,
 } from '@/db/schema/quiz';
-import { useSubmitQuizFormMutation } from '@/hooks/quiz';
-import { toQuizDuration } from '@/utils';
-import { useUploadThing } from '@/utils/uploadthing';
+import { useSubmitQuizFormMutation } from '@/hooks';
+import { toQuizDuration, useUploadThing } from '@/utils';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { redirect } from 'next/navigation';
 import React, { useState } from 'react';
diff --git a/quizeek/src/db/queries/answer.ts b/quizeek/src/db/queries/answer.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/quizeek/src/db/queries/choice.ts b/quizeek/src/db/queries/choice.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/quizeek/src/db/queries/index.ts b/quizeek/src/db/queries/index.ts
index f9fc950..417056f 100644
--- a/quizeek/src/db/queries/index.ts
+++ b/quizeek/src/db/queries/index.ts
@@ -1,6 +1,2 @@
-// export * from './answer';
-// export * from './choice';
-// export * from './question';
-// export * from './user';
 export * from './quiz';
 export * from './quiz-attempt';
diff --git a/quizeek/src/db/queries/question.ts b/quizeek/src/db/queries/question.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/quizeek/src/db/queries/user.ts b/quizeek/src/db/queries/user.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/quizeek/src/hooks/answer.ts b/quizeek/src/hooks/answer.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/quizeek/src/hooks/choice.ts b/quizeek/src/hooks/choice.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/quizeek/src/hooks/index.ts b/quizeek/src/hooks/index.ts
index 46c99e1..95d66fb 100644
--- a/quizeek/src/hooks/index.ts
+++ b/quizeek/src/hooks/index.ts
@@ -1,6 +1,4 @@
-// export * from './answer';
-// export * from './choice';
-// export * from './question';
+export * from './quiz-timer';
 export * from './quiz-attempt';
 export * from './quiz';
 export * from './user';
diff --git a/quizeek/src/hooks/question.ts b/quizeek/src/hooks/question.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/quizeek/src/hooks/quiz-attempt.ts b/quizeek/src/hooks/quiz-attempt.ts
index 30aea2c..6bd3372 100644
--- a/quizeek/src/hooks/quiz-attempt.ts
+++ b/quizeek/src/hooks/quiz-attempt.ts
@@ -1,7 +1,7 @@
 import {
   createQuizAttemptAction,
   saveQuizAttemptAction,
-} from '@/server-actions/quiz-attempt';
+} from '@/server-actions';
 import { useMutation } from '@tanstack/react-query';
 
 export const useCreateQuizAttemptMutation = () =>
diff --git a/quizeek/src/hooks/quiz.ts b/quizeek/src/hooks/quiz.ts
index 81fbbc8..9ad65d2 100644
--- a/quizeek/src/hooks/quiz.ts
+++ b/quizeek/src/hooks/quiz.ts
@@ -1,6 +1,9 @@
 import { SubmitQuizFormMutationType } from '@/models';
-import { activateQuizAction, submitQuizFormAction } from '@/server-actions';
-import { deleteQuizAction } from '@/server-actions/quiz/delete-quiz-action';
+import {
+  activateQuizAction,
+  deleteQuizAction,
+  submitQuizFormAction,
+} from '@/server-actions';
 import { useMutation } from '@tanstack/react-query';
 
 export const useSubmitQuizFormMutation = () =>
diff --git a/quizeek/src/server-actions/answer/index.ts b/quizeek/src/server-actions/answer/index.ts
deleted file mode 100644
index 44da958..0000000
--- a/quizeek/src/server-actions/answer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-// TODO: Export `export * from ...;`
diff --git a/quizeek/src/server-actions/choice/index.ts b/quizeek/src/server-actions/choice/index.ts
deleted file mode 100644
index 44da958..0000000
--- a/quizeek/src/server-actions/choice/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-// TODO: Export `export * from ...;`
diff --git a/quizeek/src/server-actions/index.ts b/quizeek/src/server-actions/index.ts
index d838761..5ae5075 100644
--- a/quizeek/src/server-actions/index.ts
+++ b/quizeek/src/server-actions/index.ts
@@ -1,6 +1,3 @@
 export * from './user';
 export * from './quiz';
-// export * from './answer';
-// export * from './choice';
-// export * from './question';
-// export * from './quiz-attempt';
+export * from './quiz-attempt';
diff --git a/quizeek/src/server-actions/question/index.ts b/quizeek/src/server-actions/question/index.ts
deleted file mode 100644
index 44da958..0000000
--- a/quizeek/src/server-actions/question/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-// TODO: Export `export * from ...;`
diff --git a/quizeek/src/server-actions/quiz/index.ts b/quizeek/src/server-actions/quiz/index.ts
index 9e3b293..07cdd83 100644
--- a/quizeek/src/server-actions/quiz/index.ts
+++ b/quizeek/src/server-actions/quiz/index.ts
@@ -1,2 +1,3 @@
 export * from './submit-quiz-form-action';
 export * from './activate-quiz-action';
+export * from './delete-quiz-action';
diff --git a/quizeek/src/utils/index.ts b/quizeek/src/utils/index.ts
index db6e52c..fbcc791 100644
--- a/quizeek/src/utils/index.ts
+++ b/quizeek/src/utils/index.ts
@@ -1,3 +1,5 @@
 export * from './error';
 export * from './string';
 export * from './number';
+export * from './date';
+export * from './uploadthing';

From 6f3ca552ec036f31215ffe04ad8fea2fd71923cb Mon Sep 17 00:00:00 2001
From: Dominik Borbuliak <borbuliak.dominik@gmail.com>
Date: Sun, 15 Dec 2024 18:15:55 +0100
Subject: [PATCH 6/6] fix: Fixed error build

---
 quizeek/src/components/quiz/quiz-form/quiz-form.tsx | 3 ++-
 quizeek/src/utils/index.ts                          | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/quizeek/src/components/quiz/quiz-form/quiz-form.tsx b/quizeek/src/components/quiz/quiz-form/quiz-form.tsx
index 35a6e75..d4c2d38 100644
--- a/quizeek/src/components/quiz/quiz-form/quiz-form.tsx
+++ b/quizeek/src/components/quiz/quiz-form/quiz-form.tsx
@@ -14,7 +14,8 @@ import {
   quizFormSchema,
 } from '@/db/schema/quiz';
 import { useSubmitQuizFormMutation } from '@/hooks';
-import { toQuizDuration, useUploadThing } from '@/utils';
+import { toQuizDuration } from '@/utils';
+import { useUploadThing } from '@/utils/uploadthing';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { redirect } from 'next/navigation';
 import React, { useState } from 'react';
diff --git a/quizeek/src/utils/index.ts b/quizeek/src/utils/index.ts
index fbcc791..969d8f7 100644
--- a/quizeek/src/utils/index.ts
+++ b/quizeek/src/utils/index.ts
@@ -2,4 +2,3 @@ export * from './error';
 export * from './string';
 export * from './number';
 export * from './date';
-export * from './uploadthing';