Merge pull request #32 from leung018/mc-22-restructure-package

Mc-22-restructure-package

src/app/components/mc/editor.test.tsx → src/app/components/editor.test.tsx

@@ -2,14 +2,14 @@ import { fireEvent, render, screen } from '@testing-library/react'
 import {
   QuestionSetRepo,
   LocalStorageQuestionSetRepo,
-} from '../../../repo/question_set'
+} from '../../repo/question_set'
 import {
   QuestionSetEditorAriaLabel,
   QuestionSetEditorUIService,
 } from './editor'
-import { MultipleChoice } from '../../../model/mc'
+import { MultipleChoice } from '../../model/mc'
 import '@testing-library/jest-dom'
-import { QuestionSetBuilderForTest } from '../../../model/question_set'
+import { QuestionSetBuilderForTest } from '../../model/question_set'
 
 class UIServiceInteractor {
   private readonly questionSetRepo: QuestionSetRepo

src/app/components/mc/editor.tsx → src/app/components/editor.tsx

@@ -5,9 +5,9 @@ import {
   QuestionSetRepo,
   LocalStorageQuestionSetRepo,
   AddQuestionSetError,
-} from '../../../repo/question_set'
-import { Question, QuestionSet } from '../../../model/question_set'
-import { MultipleChoiceBuilder, MultipleChoiceError } from '../../../model/mc'
+} from '../../repo/question_set'
+import { Question, QuestionSet } from '../../model/question_set'
+import { MultipleChoiceBuilder, MultipleChoiceError } from '../../model/mc'
 import { useRouter } from 'next/navigation'
 
 export class QuestionSetEditorAriaLabel {

src/app/components/home.test.tsx

@@ -8,7 +8,7 @@ import { HomePageUIService } from './home'
 import { LocalStorageQuestionSetRepo } from '../../repo/question_set'
 
 describe('HomePage', () => {
-  // Detail of testing of the navigation of this page should be in the integration test combine with saving question set
+  // Detail of testing of the navigation of this page should be in larger scope tests like e2e tests
 
   it('should render single question set', () => {
     const { getByText } = renderHomePage({

src/app/components/home.tsx

@@ -75,7 +75,7 @@ function HomePage({
                 <button
                   className="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-700 transition-colors"
                   onClick={() => {
-                    router.push(`/mc/quiz?id=${set.id}`)
+                    router.push(`/quiz?id=${set.id}`)
                   }}
                 >
                   Take Quiz
@@ -91,7 +91,7 @@ function HomePage({
       <button
         className="mt-4 px-4 py-2 bg-indigo-500 text-white rounded hover:bg-indigo-700 transition-colors"
         onClick={() => {
-          router.push('/mc/edit')
+          router.push('/edit')
         }}
       >
         Add New Question Set

src/app/components/mc/quiz.test.tsx → src/app/components/quiz.test.tsx

@@ -1,12 +1,12 @@
-import { MultipleChoiceBuilder } from '../../../model/mc'
+import { MultipleChoiceBuilder } from '../../model/mc'
 import { render, fireEvent } from '@testing-library/react'
 import '@testing-library/jest-dom'
 import { MultipleChoiceQuizUIService } from './quiz'
 import {
   QuestionSetBuilderForTest,
   QuestionSet,
-} from '../../../model/question_set'
-import { LocalStorageQuestionSetRepo } from '../../../repo/question_set'
+} from '../../model/question_set'
+import { LocalStorageQuestionSetRepo } from '../../repo/question_set'
 
 describe('MultipleChoiceQuiz', () => {
   const presetCorrectChoiceMcBuilder = () => {

src/app/components/mc/quiz.tsx → src/app/components/quiz.tsx

@@ -1,13 +1,13 @@
 'use client'
 
 import { useEffect, useState } from 'react'
-import { Question, QuestionSet } from '../../../model/question_set'
+import { Question, QuestionSet } from '../../model/question_set'
 import {
   GetQuestionSetError,
   QuestionSetRepo,
   LocalStorageQuestionSetRepo,
-} from '../../../repo/question_set'
-import LoadingSpinner from '../loading'
+} from '../../repo/question_set'
+import LoadingSpinner from './loading'
 import Error from 'next/error'
 
 export class MultipleChoiceQuizUIService {

src/app/mc/edit/page.tsx → src/app/edit/page.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { QuestionSetEditorUIService } from '../../components/mc/editor'
+import { QuestionSetEditorUIService } from '../components/editor'
 
 export default function QuestionSetEditorPage() {
   return QuestionSetEditorUIService.create().getElement()

src/app/mc/quiz/page.tsx → src/app/quiz/page.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import { notFound, useSearchParams } from 'next/navigation'
-import { MultipleChoiceQuizUIService } from '../../components/mc/quiz'
+import { MultipleChoiceQuizUIService } from '../components/quiz'
 import { Suspense } from 'react'
 
 export default function MultipleChoiceQuizPage() {