refactoring files to be located by feature

src/app/addCourse/AddCourseToGlobalSettingsForm.tsx

@@ -22,7 +22,7 @@ import {
 } from "@/hooks/localCourse/storageDirectoryHooks";
 import { CanvasCourseModel } from "@/models/canvas/courses/canvasCourseModel";
 import { CanvasEnrollmentTermModel } from "@/models/canvas/enrollmentTerms/canvasEnrollmentTermModel";
-import { AssignmentSubmissionType } from "@/models/local/assignment/assignmentSubmissionType";
+import { AssignmentSubmissionType } from "@/features/local/assignments/models/assignmentSubmissionType";
 import {
   DayOfWeek,
   LocalCourseSettings,

src/app/api/mcp/[transport]/route.ts

@@ -1,4 +1,4 @@
-import { assignmentMarkdownSerializer } from "@/models/local/assignment/utils/assignmentMarkdownSerializer";
+import { assignmentMarkdownSerializer } from "@/features/local/assignments/models/utils/assignmentMarkdownSerializer";
 import { groupByStartDate } from "@/models/local/utils/timeUtils";
 import { fileStorageService } from "@/services/fileStorage/fileStorageService";
 import { ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";

src/app/course/[courseName]/calendar/day/getStatus.tsx

@@ -2,10 +2,8 @@
 import { CanvasAssignment } from "@/models/canvas/assignments/canvasAssignment";
 import { CanvasPage } from "@/models/canvas/pages/canvasPageModel";
 import { CanvasQuiz } from "@/models/canvas/quizzes/canvasQuizModel";
-import { LocalAssignment } from "@/models/local/assignment/localAssignment";
+import { LocalAssignment } from "@/features/local/assignments/models/localAssignment";
 import { LocalCourseSettings } from "@/models/local/localCourseSettings";
-import { LocalCoursePage } from "@/models/local/page/localCoursePage";
-import { LocalQuiz } from "@/models/local/quiz/localQuiz";
 import {
   dateToMarkdownString,
   getDateFromStringOrThrow,
@@ -13,6 +11,8 @@ import {
 import { markdownToHTMLSafe } from "@/services/htmlMarkdownUtils";
 import { htmlIsCloseEnough } from "@/services/utils/htmlIsCloseEnough";
 import { ReactNode } from "react";
+import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
+import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
 
 export const getStatus = ({
   item,

src/app/course/[courseName]/calendar/day/useTodaysItems.tsx

@@ -2,9 +2,7 @@
 import { useCanvasAssignmentsQuery } from "@/hooks/canvas/canvasAssignmentHooks";
 import { useCanvasPagesQuery } from "@/hooks/canvas/canvasPageHooks";
 import { useCanvasQuizzesQuery } from "@/hooks/canvas/canvasQuizHooks";
-import { LocalAssignment } from "@/models/local/assignment/localAssignment";
-import { LocalCoursePage } from "@/models/local/page/localCoursePage";
-import { LocalQuiz } from "@/models/local/quiz/localQuiz";
+import { LocalAssignment } from "@/features/local/assignments/models/localAssignment";
 import {
   getDateFromStringOrThrow,
   getDateOnlyMarkdownString,
@@ -13,6 +11,8 @@ import { ReactNode } from "react";
 import { useCalendarItemsContext } from "../../context/calendarItemsContext";
 import { getStatus } from "./getStatus";
 import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHooks";
+import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
+import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
 
 export function useTodaysItems(day: string) {
   const { data: settings } = useLocalCourseSettingsQuery();

src/app/course/[courseName]/context/calendarItemsContext.ts

@@ -1,6 +1,6 @@
-import { LocalAssignment } from "@/models/local/assignment/localAssignment";
-import { LocalCoursePage } from "@/models/local/page/localCoursePage";
-import { LocalQuiz } from "@/models/local/quiz/localQuiz";
+import { LocalAssignment } from "@/features/local/assignments/models/localAssignment";
+import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
+import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
 import { createContext, useContext } from "react";
 
 export interface CalendarItemsInterface {

src/app/course/[courseName]/context/drag/useItemDropOnDay.ts

@@ -1,16 +1,13 @@
 "use client";
-import { useUpdateAssignmentMutation } from "@/hooks/localCourse/assignmentHooks";
 import {
   useLecturesSuspenseQuery,
   useLectureUpdateMutation,
 } from "@/hooks/localCourse/lectureHooks";
 import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHooks";
-import { useUpdatePageMutation } from "@/hooks/localCourse/pageHooks";
-import { LocalAssignment } from "@/models/local/assignment/localAssignment";
+import { useUpdatePageMutation } from "@/features/local/pages/pageHooks";
+import { LocalAssignment } from "@/features/local/assignments/models/localAssignment";
 import { Lecture } from "@/models/local/lecture";
 import { getLectureForDay } from "@/models/local/utils/lectureUtils";
-import { LocalCoursePage } from "@/models/local/page/localCoursePage";
-import { LocalQuiz } from "@/models/local/quiz/localQuiz";
 import {
   getDateFromStringOrThrow,
   getDateOnlyMarkdownString,
@@ -21,6 +18,9 @@ import { DraggableItem } from "./draggingContext";
 import { getNewLockDate } from "./getNewLockDate";
 import { useUpdateQuizMutation } from "@/hooks/localCourse/quizHooks";
 import { useCourseContext } from "../courseContext";
+import { useUpdateAssignmentMutation } from "@/features/local/assignments/assignmentHooks";
+import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
+import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
 
 export function useItemDropOnDay({
   setIsDragging,

src/app/course/[courseName]/context/drag/useItemDropOnModule.ts

@@ -1,13 +1,13 @@
 "use client";
-import { useUpdateAssignmentMutation } from "@/hooks/localCourse/assignmentHooks";
-import { useUpdatePageMutation } from "@/hooks/localCourse/pageHooks";
-import { LocalAssignment } from "@/models/local/assignment/localAssignment";
-import { LocalCoursePage } from "@/models/local/page/localCoursePage";
-import { LocalQuiz } from "@/models/local/quiz/localQuiz";
+import { useUpdatePageMutation } from "@/features/local/pages/pageHooks";
+import { LocalAssignment } from "@/features/local/assignments/models/localAssignment";
 import { Dispatch, SetStateAction, useCallback, DragEvent } from "react";
 import { DraggableItem } from "./draggingContext";
 import { useCourseContext } from "../courseContext";
 import { useUpdateQuizMutation } from "@/hooks/localCourse/quizHooks";
+import { useUpdateAssignmentMutation } from "@/features/local/assignments/assignmentHooks";
+import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
+import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
 
 export function useItemDropOnModule({
   setIsDragging,

src/app/course/[courseName]/modules/ExpandableModule.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { usePagesQueries } from "@/hooks/localCourse/pageHooks";
+import { usePagesQueries } from "@/features/local/pages/pageHooks";
 import { IModuleItem } from "@/models/local/IModuleItem";
 import {
   getDateFromString,
@@ -22,9 +22,9 @@ import { useCourseContext } from "../context/courseContext";
 import { Expandable } from "../../../../components/Expandable";
 import { useDragStyleContext } from "../context/drag/dragStyleContext";
 import { useQuizzesQueries } from "@/hooks/localCourse/quizHooks";
-import { useAssignmentNamesQuery } from "@/hooks/localCourse/assignmentHooks";
 import { useTRPC } from "@/services/serverFunctions/trpcClient";
 import { useSuspenseQueries } from "@tanstack/react-query";
+import { useAssignmentNamesQuery } from "@/features/local/assignments/assignmentHooks";
 
 export default function ExpandableModule({
   moduleName,

src/app/course/[courseName]/modules/NewItemForm.tsx

@@ -3,11 +3,10 @@ import ButtonSelect from "@/components/ButtonSelect";
 import SelectInput from "@/components/form/SelectInput";
 import TextInput from "@/components/form/TextInput";
 import { Spinner } from "@/components/Spinner";
-import { useCreateAssignmentMutation } from "@/hooks/localCourse/assignmentHooks";
 import { useModuleNamesQuery } from "@/hooks/localCourse/localCourseModuleHooks";
 import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHooks";
-import { useCreatePageMutation } from "@/hooks/localCourse/pageHooks";
-import { LocalAssignmentGroup } from "@/models/local/assignment/localAssignmentGroup";
+import { useCreatePageMutation } from "@/features/local/pages/pageHooks";
+import { LocalAssignmentGroup } from "@/features/local/assignments/models/localAssignmentGroup";
 
 import React, { useState } from "react";
 import { useCourseContext } from "../context/courseContext";
@@ -17,6 +16,7 @@ import {
   dateToMarkdownString,
   getDateFromStringOrThrow,
 } from "@/models/local/utils/timeUtils";
+import { useCreateAssignmentMutation } from "@/features/local/assignments/assignmentHooks";
 
 export default function NewItemForm({
   moduleName: defaultModuleName,

src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/AssignmentFooterButtons.tsx

@@ -1,16 +1,13 @@
 import { useCourseContext } from "@/app/course/[courseName]/context/courseContext";
 import Modal, { useModal } from "@/components/Modal";
 import { Spinner } from "@/components/Spinner";
+import { useAssignmentQuery, useDeleteAssignmentMutation } from "@/features/local/assignments/assignmentHooks";
 import {
   useCanvasAssignmentsQuery,
   useAddAssignmentToCanvasMutation,
   useDeleteAssignmentFromCanvasMutation,
   useUpdateAssignmentInCanvasMutation,
 } from "@/hooks/canvas/canvasAssignmentHooks";
-import {
-  useAssignmentQuery,
-  useDeleteAssignmentMutation,
-} from "@/hooks/localCourse/assignmentHooks";
 import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHooks";
 import { baseCanvasUrl } from "@/services/canvas/canvasServiceUtils";
 import { getCourseUrl } from "@/services/urlUtils";

src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/AssignmentPreview.tsx

@@ -1,7 +1,7 @@
 import MarkdownDisplay from "@/components/MarkdownDisplay";
-import { LocalAssignment } from "@/models/local/assignment/localAssignment";
-import { rubricItemIsExtraCredit } from "@/models/local/assignment/rubricItem";
-import { assignmentPoints } from "@/models/local/assignment/utils/assignmentPointsUtils";
+import { LocalAssignment } from "@/features/local/assignments/models/localAssignment";
+import { rubricItemIsExtraCredit } from "@/features/local/assignments/models/rubricItem";
+import { assignmentPoints } from "@/features/local/assignments/models/utils/assignmentPointsUtils";
 import { formatHumanReadableDate } from "@/services/utils/dateFormat";
 import React, { Fragment } from "react";
 

src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/EditAssignment.tsx

@@ -1,14 +1,9 @@
 "use client";
 import { MonacoEditor } from "@/components/editor/MonacoEditor";
-import {
-  useAssignmentQuery,
-  useUpdateAssignmentMutation,
-  useUpdateImageSettingsForAssignment,
-} from "@/hooks/localCourse/assignmentHooks";
 import {
   LocalAssignment,
   localAssignmentMarkdown,
-} from "@/models/local/assignment/localAssignment";
+} from "@/features/local/assignments/models/localAssignment";
 import { useEffect, useState } from "react";
 import AssignmentPreview from "./AssignmentPreview";
 import { useCourseContext } from "@/app/course/[courseName]/context/courseContext";
@@ -22,6 +17,11 @@ import EditAssignmentHeader from "./EditAssignmentHeader";
 import { Spinner } from "@/components/Spinner";
 import { getAssignmentHelpString } from "./getAssignmentHelpString";
 import { EditLayout } from "@/components/EditLayout";
+import {
+  useAssignmentQuery,
+  useUpdateAssignmentMutation,
+  useUpdateImageSettingsForAssignment,
+} from "@/features/local/assignments/assignmentHooks";
 
 export default function EditAssignment({
   moduleName,

src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/UpdateAssignmentName.tsx

@@ -5,7 +5,7 @@ import { Spinner } from "@/components/Spinner";
 import {
   useAssignmentQuery,
   useUpdateAssignmentMutation,
-} from "@/hooks/localCourse/assignmentHooks";
+} from "@/features/local/assignments/assignmentHooks";
 import { getModuleItemUrl } from "@/services/urlUtils";
 import { useRouter } from "next/navigation";
 import { useState } from "react";

src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/getAssignmentHelpString.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { AssignmentSubmissionType } from "@/models/local/assignment/assignmentSubmissionType";
+import { AssignmentSubmissionType } from "@/features/local/assignments/models/assignmentSubmissionType";
 import { LocalCourseSettings } from "@/models/local/localCourseSettings";
 
 export function getAssignmentHelpString(settings: LocalCourseSettings) {

src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPage.tsx

@@ -1,10 +1,5 @@
 "use client";
 import { MonacoEditor } from "@/components/editor/MonacoEditor";
-import {
-  usePageQuery,
-  useUpdatePageMutation,
-} from "@/hooks/localCourse/pageHooks";
-import { localPageMarkdownUtils } from "@/models/local/page/localCoursePage";
 import { useEffect, useState } from "react";
 import PagePreview from "./PagePreview";
 import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHooks";
@@ -15,6 +10,11 @@ import { useCourseContext } from "@/app/course/[courseName]/context/courseContex
 import { useAuthoritativeUpdates } from "@/app/course/[courseName]/utils/useAuthoritativeUpdates";
 import EditPageHeader from "./EditPageHeader";
 import { EditLayout } from "@/components/EditLayout";
+import { localPageMarkdownUtils } from "@/features/local/pages/localCoursePageModels";
+import {
+  usePageQuery,
+  useUpdatePageMutation,
+} from "@/features/local/pages/pageHooks";
 
 export default function EditPage({
   moduleName,

src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPageButtons.tsx

@@ -11,7 +11,7 @@ import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHoo
 import {
   useDeletePageMutation,
   usePageQuery,
-} from "@/hooks/localCourse/pageHooks";
+} from "@/features/local/pages/pageHooks";
 import { baseCanvasUrl } from "@/services/canvas/canvasServiceUtils";
 import { getCourseUrl } from "@/services/urlUtils";
 import Link from "next/link";

src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/PagePreview.tsx

@@ -1,9 +1,7 @@
 import MarkdownDisplay from "@/components/MarkdownDisplay";
-import { LocalCoursePage } from "@/models/local/page/localCoursePage";
+import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
 import React from "react";
 
 export default function PagePreview({ page }: { page: LocalCoursePage }) {
-  return (
-    <MarkdownDisplay markdown={page.text} />
-  );
+  return <MarkdownDisplay markdown={page.text} />;
 }

src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/UpdatePageName.tsx

@@ -5,7 +5,7 @@ import { Spinner } from "@/components/Spinner";
 import {
   usePageQuery,
   useUpdatePageMutation,
-} from "@/hooks/localCourse/pageHooks";
+} from "@/features/local/pages/pageHooks";
 import { getModuleItemUrl } from "@/services/urlUtils";
 import { useRouter } from "next/navigation";
 import { useState } from "react";

src/app/course/[courseName]/modules/[moduleName]/quiz/[quizName]/EditQuiz.tsx

@@ -1,6 +1,5 @@
 "use client";
 import { MonacoEditor } from "@/components/editor/MonacoEditor";
-import { quizMarkdownUtils } from "@/models/local/quiz/utils/quizMarkdownUtils";
 import { useEffect, useState } from "react";
 import QuizPreview from "./QuizPreview";
 import { QuizButtons } from "./QuizButton";
@@ -13,11 +12,12 @@ import {
   useUpdateQuizMutation,
 } from "@/hooks/localCourse/quizHooks";
 import { useAuthoritativeUpdates } from "../../../../utils/useAuthoritativeUpdates";
-import { extractLabelValue } from "@/models/local/assignment/utils/markdownUtils";
+import { extractLabelValue } from "@/features/local/assignments/models/utils/markdownUtils";
 import EditQuizHeader from "./EditQuizHeader";
 import { LocalCourseSettings } from "@/models/local/localCourseSettings";
 import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHooks";
 import { EditLayout } from "@/components/EditLayout";
+import { quizMarkdownUtils } from "@/features/local/quizzes/models/utils/quizMarkdownUtils";
 
 const helpString = (settings: LocalCourseSettings) => {
   const groupNames = settings.assignmentGroups.map((g) => g.name).join("\n- ");

src/app/course/[courseName]/modules/[moduleName]/quiz/[quizName]/QuizPreview.tsx

@@ -1,10 +1,7 @@
 import CheckIcon from "@/components/icons/CheckIcon";
 import MarkdownDisplay from "@/components/MarkdownDisplay";
+import { LocalQuizQuestion, QuestionType } from "@/features/local/quizzes/models/localQuizQuestion";
 import { useQuizQuery } from "@/hooks/localCourse/quizHooks";
-import {
-  LocalQuizQuestion,
-  QuestionType,
-} from "@/models/local/quiz/localQuizQuestion";
 import { escapeMatchingText } from "@/services/utils/questionHtmlUtils";
 
 export default function QuizPreview({

src/app/course/[courseName]/settings/AssignmentGroupManagement.tsx

@@ -4,7 +4,7 @@ import {
   useLocalCourseSettingsQuery,
   useUpdateLocalCourseSettingsMutation,
 } from "@/hooks/localCourse/localCoursesHooks";
-import { LocalAssignmentGroup } from "@/models/local/assignment/localAssignmentGroup";
+import { LocalAssignmentGroup } from "@/features/local/assignments/models/localAssignmentGroup";
 import { useEffect, useState } from "react";
 import TextInput from "../../../../components/form/TextInput";
 import { useSetAssignmentGroupsMutation } from "@/hooks/canvas/canvasCourseHooks";

src/app/course/[courseName]/settings/SubmissionDefaults.tsx

@@ -7,7 +7,7 @@ import {
 import {
   AssignmentSubmissionType,
   AssignmentSubmissionTypeList,
-} from "@/models/local/assignment/assignmentSubmissionType";
+} from "@/features/local/assignments/models/assignmentSubmissionType";
 import React, { useEffect, useState } from "react";
 import { settingsBox } from "./sharedSettings";
 

src/features/local/assignments/assignmentHooks.ts

@@ -1,10 +1,6 @@
 "use client";
 import { useTRPC } from "@/services/serverFunctions/trpcClient";
 import { useCourseContext } from "@/app/course/[courseName]/context/courseContext";
-import {
-  useLocalCourseSettingsQuery,
-  useUpdateLocalCourseSettingsMutation,
-} from "./localCoursesHooks";
 import {
   extractImageSources,
   markdownToHtmlNoImages,
@@ -15,6 +11,10 @@ import {
   useQueryClient,
   useSuspenseQuery,
 } from "@tanstack/react-query";
+import {
+  useLocalCourseSettingsQuery,
+  useUpdateLocalCourseSettingsMutation,
+} from "@/hooks/localCourse/localCoursesHooks";
 
 export const useAssignmentQuery = (
   moduleName: string,

src/features/local/assignments/assignmentRouter.ts

@@ -1,8 +1,8 @@
-import publicProcedure from "../procedures/public";
+import publicProcedure from "../../../services/serverFunctions/procedures/public";
 import { z } from "zod";
-import { router } from "../trpcSetup";
+import { router } from "../../../services/serverFunctions/trpcSetup";
 import { fileStorageService } from "@/services/fileStorage/fileStorageService";
-import { zodLocalAssignment } from "@/models/local/assignment/localAssignment";
+import { zodLocalAssignment } from "@/features/local/assignments/models/localAssignment";
 
 export const assignmentRouter = router({
   getAssignment: publicProcedure

src/features/local/assignments/models/localAssignment.ts

@@ -1,4 +1,4 @@
-import { IModuleItem } from "../IModuleItem";
+import { IModuleItem } from "../../../../models/local/IModuleItem";
 import {
   AssignmentSubmissionType,
   zodAssignmentSubmissionType,

src/features/local/assignments/models/utils/assignmentMarkdownParser.ts

@@ -1,7 +1,7 @@
 import {
   verifyDateOrThrow,
   verifyDateStringOrUndefined,
-} from "../../utils/timeUtils";
+} from "../../../../../models/local/utils/timeUtils";
 import { AssignmentSubmissionType } from "../assignmentSubmissionType";
 import { LocalAssignment } from "../localAssignment";
 import { RubricItem } from "../rubricItem";

src/features/local/pages/localCoursePageModels.ts

@@ -1,7 +1,7 @@
+import { IModuleItem } from "@/models/local/IModuleItem";
+import { verifyDateOrThrow } from "@/models/local/utils/timeUtils";
 import { z } from "zod";
-import { extractLabelValue } from "../assignment/utils/markdownUtils";
-import { IModuleItem } from "../IModuleItem";
-import { verifyDateOrThrow } from "../utils/timeUtils";
+import { extractLabelValue } from "../assignments/models/utils/markdownUtils";
 
 export interface LocalCoursePage extends IModuleItem {
   name: string;

src/features/local/pages/pageFileStorageService.ts

@@ -1,11 +1,11 @@
-import {
-  localPageMarkdownUtils,
-  LocalCoursePage,
-} from "@/models/local/page/localCoursePage";
 import { promises as fs } from "fs";
 import path from "path";
-import { courseItemFileStorageService } from "./courseItemFileStorageService";
-import { getCoursePathByName } from "./globalSettingsFileStorageService";
+import { courseItemFileStorageService } from "../../../services/fileStorage/courseItemFileStorageService";
+import { getCoursePathByName } from "../../../services/fileStorage/globalSettingsFileStorageService";
+import {
+  LocalCoursePage,
+  localPageMarkdownUtils,
+} from "@/features/local/pages/localCoursePageModels";
 
 export const pageFileStorageService = {
   getPage: async (courseName: string, moduleName: string, name: string) =>

src/features/local/pages/pageRouter.ts

@@ -1,8 +1,8 @@
-import publicProcedure from "../procedures/public";
+import publicProcedure from "../../../services/serverFunctions/procedures/public";
 import { z } from "zod";
-import { router } from "../trpcSetup";
+import { router } from "../../../services/serverFunctions/trpcSetup";
 import { fileStorageService } from "@/services/fileStorage/fileStorageService";
-import { zodLocalCoursePage } from "@/models/local/page/localCoursePage";
+import { zodLocalCoursePage } from "@/features/local/pages/localCoursePageModels";
 
 export const pageRouter = router({
   getPage: publicProcedure

src/features/local/quizzes/models/localQuiz.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { IModuleItem } from "../IModuleItem";
 import { LocalQuizQuestion, zodLocalQuizQuestion } from "./localQuizQuestion";
 import { quizMarkdownUtils } from "./utils/quizMarkdownUtils";
+import { IModuleItem } from "@/models/local/IModuleItem";
 
 export interface LocalQuiz extends IModuleItem {
   name: string;

src/features/local/quizzes/models/utils/quizMarkdownUtils.ts

@@ -1,7 +1,4 @@
-import {
-  verifyDateOrThrow,
-  verifyDateStringOrUndefined,
-} from "../../utils/timeUtils";
+import { verifyDateOrThrow, verifyDateStringOrUndefined } from "@/models/local/utils/timeUtils";
 import { LocalQuiz } from "../localQuiz";
 import { quizQuestionMarkdownUtils } from "./quizQuestionMarkdownUtils";
 

src/hooks/canvas/canvasAssignmentHooks.ts

@@ -1,7 +1,7 @@
 import { canvasAssignmentService } from "@/services/canvas/canvasAssignmentService";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useLocalCourseSettingsQuery } from "../localCourse/localCoursesHooks";
-import { LocalAssignment } from "@/models/local/assignment/localAssignment";
+import { LocalAssignment } from "@/features/local/assignments/models/localAssignment";
 import { canvasModuleService } from "@/services/canvas/canvasModuleService";
 import {
   useAddCanvasModuleMutation,

src/hooks/canvas/canvasCourseHooks.ts

@@ -1,6 +1,6 @@
 import { CanvasAssignmentGroup } from "@/models/canvas/assignments/canvasAssignmentGroup";
 import { CanvasCourseModel } from "@/models/canvas/courses/canvasCourseModel";
-import { LocalAssignmentGroup } from "@/models/local/assignment/localAssignmentGroup";
+import { LocalAssignmentGroup } from "@/features/local/assignments/models/localAssignmentGroup";
 import { LocalCourseSettings } from "@/models/local/localCourseSettings";
 import { canvasAssignmentGroupService } from "@/services/canvas/canvasAssignmentGroupService";
 import { canvasService } from "@/services/canvas/canvasService";

src/hooks/canvas/canvasPageHooks.ts

@@ -1,4 +1,4 @@
-import { LocalCoursePage } from "@/models/local/page/localCoursePage";
+import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
 import { canvasPageService } from "@/services/canvas/canvasPageService";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useLocalCourseSettingsQuery } from "../localCourse/localCoursesHooks";

src/hooks/canvas/canvasQuizHooks.ts

@@ -1,12 +1,12 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useLocalCourseSettingsQuery } from "../localCourse/localCoursesHooks";
 import { canvasQuizService } from "@/services/canvas/canvasQuizService";
-import { LocalQuiz } from "@/models/local/quiz/localQuiz";
 import {
   useAddCanvasModuleMutation,
   useCanvasModulesQuery,
 } from "./canvasModuleHooks";
 import { canvasModuleService } from "@/services/canvas/canvasModuleService";
+import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
 
 export const canvasQuizKeys = {
   quizzes: (canvasCourseId: number) =>

src/models/local/courseItemTypes.ts

@@ -1,14 +1,14 @@
-import { LocalAssignment } from "./assignment/localAssignment";
-import { LocalCoursePage } from "./page/localCoursePage";
-import { LocalQuiz } from "./quiz/localQuiz";
+import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
+import { LocalAssignment } from "../../features/local/assignments/models/localAssignment";
+import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
 
 export type CourseItemType = "Assignment" | "Quiz" | "Page";
-export type CourseItemReturnType<T extends CourseItemType> = T extends "Assignment"
-  ? LocalAssignment
-  : T extends "Quiz"
-  ? LocalQuiz
-  : LocalCoursePage;
-
+export type CourseItemReturnType<T extends CourseItemType> =
+  T extends "Assignment"
+    ? LocalAssignment
+    : T extends "Quiz"
+    ? LocalQuiz
+    : LocalCoursePage;
 
 export const typeToFolder = {
   Assignment: "assignments",

src/models/local/localCourseSettings.ts

@@ -2,11 +2,11 @@ import { z } from "zod";
 import {
   AssignmentSubmissionType,
   zodAssignmentSubmissionType,
-} from "./assignment/assignmentSubmissionType";
+} from "../../features/local/assignments/models/assignmentSubmissionType";
 import {
   LocalAssignmentGroup,
   zodLocalAssignmentGroup,
-} from "./assignment/localAssignmentGroup";
+} from "../../features/local/assignments/models/localAssignmentGroup";
 import { parse, stringify } from "yaml";
 
 export interface SimpleTimeOnly {

src/models/local/localModules.ts

@@ -1,8 +1,8 @@
-import { LocalAssignment } from "./assignment/localAssignment";
+import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
+import { LocalAssignment } from "../../features/local/assignments/models/localAssignment";
 import { IModuleItem } from "./IModuleItem";
-import { LocalCoursePage } from "./page/localCoursePage";
-import { LocalQuiz } from "./quiz/localQuiz";
 import { getDateFromString } from "./utils/timeUtils";
+import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
 
 export interface LocalModule {
   name: string;

src/models/local/tests/assignmentMarkdown.test.ts

@@ -1,8 +1,8 @@
 import { describe, it, expect } from "vitest";
-import { LocalAssignment } from "../assignment/localAssignment";
-import { AssignmentSubmissionType } from "../assignment/assignmentSubmissionType";
-import { assignmentMarkdownSerializer } from "../assignment/utils/assignmentMarkdownSerializer";
-import { assignmentMarkdownParser } from "../assignment/utils/assignmentMarkdownParser";
+import { LocalAssignment } from "../../../features/local/assignments/models/localAssignment";
+import { AssignmentSubmissionType } from "../../../features/local/assignments/models/assignmentSubmissionType";
+import { assignmentMarkdownSerializer } from "../../../features/local/assignments/models/utils/assignmentMarkdownSerializer";
+import { assignmentMarkdownParser } from "../../../features/local/assignments/models/utils/assignmentMarkdownParser";
 
 describe("AssignmentMarkdownTests", () => {
   it("can parse assignment settings", () => {

src/models/local/tests/quizMarkdown/matchingAnswerErrors.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from "vitest";
-import { quizMarkdownUtils } from "@/models/local/quiz/utils/quizMarkdownUtils";
+import { quizMarkdownUtils } from "@/models/local/models/utils/quizMarkdownUtils";
 
 describe("Matching Answer Error Messages", () => {
   it("can parse matching question", () => {

src/models/local/tests/quizMarkdown/matchingAnswers.test.ts

@@ -1,11 +1,11 @@
 import { describe, it, expect } from "vitest";
-import { QuestionType } from "../../quiz/localQuizQuestion";
-import { quizMarkdownUtils } from "@/models/local/quiz/utils/quizMarkdownUtils";
-import { quizQuestionMarkdownUtils } from "@/models/local/quiz/utils/quizQuestionMarkdownUtils";
+import { QuestionType } from "../../models/localQuizQuestion";
+import { quizMarkdownUtils } from "@/models/local/models/utils/quizMarkdownUtils";
+import { quizQuestionMarkdownUtils } from "@/models/local/models/utils/quizQuestionMarkdownUtils";
 
 describe("MatchingTests", () => {
   it("can parse matching question", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -33,7 +33,7 @@ Match the following terms & definitions
   });
 
   it("can create markdown for matching question", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -65,7 +65,7 @@ Match the following terms & definitions
   });
 
   it("whitespace is optional", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -85,7 +85,7 @@ Match the following terms & definitions
   });
 
   it("can have distractors", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -108,7 +108,7 @@ Match the following terms & definitions
   });
 
   it("can have distractors and be persisted", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -132,7 +132,7 @@ Match the following terms & definitions
     );
   });
   it("can escape - characters", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -149,18 +149,17 @@ Match the following terms & definitions
 
     const quiz = quizMarkdownUtils.parseMarkdown(rawMarkdownQuiz, name);
 
-    
     const firstQuestion = quiz.questions[0];
 
     expect(firstQuestion.answers[0].text).toBe("git add --all");
-    expect(firstQuestion.answers[0].matchedText).toBe("start tracking all files in the current directory and subdirectories");
-
-
+    expect(firstQuestion.answers[0].matchedText).toBe(
+      "start tracking all files in the current directory and subdirectories"
+    );
 
     const quizMarkdown = quizMarkdownUtils.toMarkdown(quiz);
 
     expect(quizMarkdown).toContain(
-      "^ git add \-\-all - start tracking all files in the current directory and subdirectories"
+      "^ git add --all - start tracking all files in the current directory and subdirectories"
     );
   });
 });

src/models/local/tests/quizMarkdown/multipleAnswers.test.ts

@@ -1,8 +1,8 @@
 import { describe, it, expect } from "vitest";
-import { LocalQuiz } from "../../quiz/localQuiz";
-import { QuestionType } from "../../quiz/localQuizQuestion";
-import { quizMarkdownUtils } from "@/models/local/quiz/utils/quizMarkdownUtils";
-import { quizQuestionMarkdownUtils } from "@/models/local/quiz/utils/quizQuestionMarkdownUtils";
+import { LocalQuiz } from "../../models/localQuiz";
+import { QuestionType } from "../../models/localQuizQuestion";
+import { quizMarkdownUtils } from "@/models/local/models/utils/quizMarkdownUtils";
+import { quizQuestionMarkdownUtils } from "@/models/local/models/utils/quizQuestionMarkdownUtils";
 
 describe("MultipleAnswersTests", () => {
   it("quiz markdown includes multiple answer question", () => {
@@ -41,7 +41,7 @@ oneline question
   });
 
   it("can parse question with multiple answers", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -79,7 +79,7 @@ Which events are triggered when the user clicks on an input field?
   });
 
   it("can parse question with multiple answers without a space in false answers", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -102,10 +102,10 @@ Which events are triggered when the user clicks on an input field?
     expect(firstQuestion.answers.length).toBe(2);
     expect(firstQuestion.answers[0].correct).toBe(true);
     expect(firstQuestion.answers[1].correct).toBe(false);
-  });  
-  
+  });
+
   it("can parse question with multiple answers without a space in false answers other example", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false

src/models/local/tests/quizMarkdown/multipleChoice.test.ts

@@ -1,8 +1,8 @@
 import { describe, it, expect } from "vitest";
-import { LocalQuiz } from "../../quiz/localQuiz";
-import { QuestionType } from "../../quiz/localQuizQuestion";
-import { quizMarkdownUtils } from "@/models/local/quiz/utils/quizMarkdownUtils";
-import { quizQuestionMarkdownUtils } from "@/models/local/quiz/utils/quizQuestionMarkdownUtils";
+import { LocalQuiz } from "../../models/localQuiz";
+import { QuestionType } from "../../models/localQuizQuestion";
+import { quizMarkdownUtils } from "@/models/local/models/utils/quizMarkdownUtils";
+import { quizQuestionMarkdownUtils } from "@/models/local/models/utils/quizQuestionMarkdownUtils";
 
 describe("MultipleChoiceTests", () => {
   it("quiz markdown includes multiple choice question", () => {

src/models/local/tests/quizMarkdown/quizDeterministicChecks.test.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect } from "vitest";
-import { LocalQuiz } from "../../quiz/localQuiz";
-import { quizMarkdownUtils } from "../../quiz/utils/quizMarkdownUtils";
-import { QuestionType } from "@/models/local/quiz/localQuizQuestion";
+import { LocalQuiz } from "../../models/localQuiz";
+import { quizMarkdownUtils } from "../../models/utils/quizMarkdownUtils";
+import { QuestionType } from "@/models/local/models/localQuizQuestion";
 
 // Test suite for deterministic checks on LocalQuiz
 describe("QuizDeterministicChecks", () => {

src/models/local/tests/quizMarkdown/quizMarkdown.test.ts

@@ -1,8 +1,8 @@
 import { describe, it, expect } from "vitest";
-import { LocalQuiz } from "../../quiz/localQuiz";
-import { quizMarkdownUtils } from "../../quiz/utils/quizMarkdownUtils";
-import { QuestionType } from "@/models/local/quiz/localQuizQuestion";
-import { quizQuestionMarkdownUtils } from "@/models/local/quiz/utils/quizQuestionMarkdownUtils";
+import { LocalQuiz } from "../../models/localQuiz";
+import { quizMarkdownUtils } from "../../models/utils/quizMarkdownUtils";
+import { QuestionType } from "@/models/local/models/localQuizQuestion";
+import { quizQuestionMarkdownUtils } from "@/models/local/models/utils/quizQuestionMarkdownUtils";
 import { markdownToHtmlNoImages } from "@/services/htmlMarkdownUtils";
 
 // Test suite for QuizMarkdown
@@ -281,5 +281,4 @@ b) false
     expect(quizHtml).toContain("<mi>x</mi>");
     expect(quizHtml).not.toContain("x_2");
   });
-
 });

src/models/local/tests/quizMarkdown/testAnswer.test.ts

@@ -1,12 +1,15 @@
-import { getAnswers, getQuestionType } from "@/services/canvas/canvasQuizService";
-import { QuestionType, zodQuestionType } from "../../quiz/localQuizQuestion";
-import { quizMarkdownUtils } from "../../quiz/utils/quizMarkdownUtils";
-import { quizQuestionMarkdownUtils } from "../../quiz/utils/quizQuestionMarkdownUtils";
+import {
+  getAnswers,
+  getQuestionType,
+} from "@/services/canvas/canvasQuizService";
+import { QuestionType, zodQuestionType } from "../../models/localQuizQuestion";
+import { quizMarkdownUtils } from "../../models/utils/quizMarkdownUtils";
+import { quizQuestionMarkdownUtils } from "../../models/utils/quizQuestionMarkdownUtils";
 import { describe, it, expect } from "vitest";
 
 describe("TextAnswerTests", () => {
   it("can parse essay", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -31,7 +34,7 @@ essay
   });
 
   it("can parse short answer", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -56,8 +59,7 @@ short answer
   });
 
   it("short answer to markdown is correct", () => {
-
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -85,8 +87,7 @@ short_answer`;
   });
 
   it("short_answer= to markdown is correct", () => {
-
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -118,7 +119,7 @@ short_answer=`;
   });
 
   it("essay question to markdown is correct", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -146,7 +147,7 @@ essay`;
   });
 
   it("Can parse short answer with auto graded answers", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -166,14 +167,16 @@ short_answer=
 
     const quiz = quizMarkdownUtils.parseMarkdown(rawMarkdownQuiz, name);
     const firstQuestion = quiz.questions[0];
-    expect(firstQuestion.questionType).toBe(QuestionType.SHORT_ANSWER_WITH_ANSWERS)
+    expect(firstQuestion.questionType).toBe(
+      QuestionType.SHORT_ANSWER_WITH_ANSWERS
+    );
     expect(firstQuestion.answers.length).toBe(2);
     expect(firstQuestion.answers[0].text).toBe("test");
     expect(firstQuestion.answers[1].text).toBe("other");
   });
 
   it("Can parse short answer with auto graded answers", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -193,18 +196,22 @@ short_answer=
 
     const quiz = quizMarkdownUtils.parseMarkdown(rawMarkdownQuiz, name);
     const firstQuestion = quiz.questions[0];
-    expect(firstQuestion.questionType).toBe(QuestionType.SHORT_ANSWER_WITH_ANSWERS)
+    expect(firstQuestion.questionType).toBe(
+      QuestionType.SHORT_ANSWER_WITH_ANSWERS
+    );
     expect(firstQuestion.answers.length).toBe(2);
     expect(firstQuestion.answers[0].text).toBe("test");
     expect(firstQuestion.answers[1].text).toBe("other");
   });
 
   it("Has short_answer= type at the same position in types and zod types", () => {
-    expect(Object.values(zodQuestionType.Enum)).toEqual(Object.values(QuestionType));
+    expect(Object.values(zodQuestionType.Enum)).toEqual(
+      Object.values(QuestionType)
+    );
   });
 
   it("Associates short_answer= questions with short_answer_question canvas question type", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -228,7 +235,7 @@ short_answer=
   });
 
   it("Includes answer_text in answers sent to canvas", () => {
-    const name = "Test Quiz"
+    const name = "Test Quiz";
     const rawMarkdownQuiz = `
 ShuffleAnswers: true
 OneQuestionAtATime: false
@@ -246,27 +253,26 @@ Which events are triggered when the user clicks on an input field?
 short_answer=
 `;
 
-  const quiz = quizMarkdownUtils.parseMarkdown(rawMarkdownQuiz, name);
-  const firstQuestion = quiz.questions[0];
-  const answers = getAnswers(firstQuestion, {
-    name: "",
-    assignmentGroups: [],
-    daysOfWeek: [],
-    canvasId: 0,
-    startDate: "",
-    endDate: "",
-    defaultDueTime: {
-      hour: 0,
-      minute: 0
-    },
-    defaultAssignmentSubmissionTypes: [],
-    defaultFileUploadTypes: [],
-    holidays: [],
-    assets: []
-  })
-  expect(answers).toHaveLength(2);
-  const firstAnswer = answers[0];
-  expect(firstAnswer).toHaveProperty("answer_text");
+    const quiz = quizMarkdownUtils.parseMarkdown(rawMarkdownQuiz, name);
+    const firstQuestion = quiz.questions[0];
+    const answers = getAnswers(firstQuestion, {
+      name: "",
+      assignmentGroups: [],
+      daysOfWeek: [],
+      canvasId: 0,
+      startDate: "",
+      endDate: "",
+      defaultDueTime: {
+        hour: 0,
+        minute: 0,
+      },
+      defaultAssignmentSubmissionTypes: [],
+      defaultFileUploadTypes: [],
+      holidays: [],
+      assets: [],
+    });
+    expect(answers).toHaveLength(2);
+    const firstAnswer = answers[0];
+    expect(firstAnswer).toHaveProperty("answer_text");
   });
-
 });

src/models/local/tests/rubricMarkdown.test.ts

@@ -1,6 +1,9 @@
 import { describe, it, expect } from "vitest";
-import { RubricItem, rubricItemIsExtraCredit } from "../assignment/rubricItem";
-import { assignmentMarkdownParser } from "../assignment/utils/assignmentMarkdownParser";
+import {
+  RubricItem,
+  rubricItemIsExtraCredit,
+} from "../../../features/local/assignments/models/rubricItem";
+import { assignmentMarkdownParser } from "../../../features/local/assignments/models/utils/assignmentMarkdownParser";
 
 describe("RubricMarkdownTests", () => {
   it("can parse one item", () => {

src/models/local/tests/testSemesterImport.test.ts

@@ -1,12 +1,12 @@
 import { describe, it, expect } from "vitest";
-import { LocalAssignment } from "../assignment/localAssignment";
+import { LocalAssignment } from "../../../features/local/assignments/models/localAssignment";
 import {
   prepAssignmentForNewSemester,
   prepLectureForNewSemester,
   prepPageForNewSemester,
   prepQuizForNewSemester,
 } from "../utils/semesterTransferUtils";
-import { LocalQuiz } from "../quiz/localQuiz";
+import { LocalQuiz } from "../models/localQuiz";
 import { LocalCoursePage } from "../page/localCoursePage";
 import { Lecture } from "../lecture";
 

src/models/local/utils/semesterTransferUtils.ts

@@ -1,12 +1,8 @@
-
-import { LocalAssignment } from "../assignment/localAssignment";
+import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
+import { LocalAssignment } from "../../../features/local/assignments/models/localAssignment";
 import { Lecture } from "../lecture";
-import { LocalCoursePage } from "../page/localCoursePage";
-import { LocalQuiz } from "../quiz/localQuiz";
-import {
-  dateToMarkdownString,
-  getDateFromStringOrThrow,
-} from "./timeUtils";
+import { dateToMarkdownString, getDateFromStringOrThrow } from "./timeUtils";
+import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
 
 export const prepAssignmentForNewSemester = (
   assignment: LocalAssignment,

src/services/canvas/canvasAssignmentGroupService.ts

@@ -1,16 +1,14 @@
 import { canvasApi, paginatedRequest } from "./canvasServiceUtils";
 import { axiosClient } from "../axiosUtils";
 import { CanvasAssignmentGroup } from "@/models/canvas/assignments/canvasAssignmentGroup";
-import { LocalAssignmentGroup } from "@/models/local/assignment/localAssignmentGroup";
+import { LocalAssignmentGroup } from "@/features/local/assignments/models/localAssignmentGroup";
 import { rateLimitAwareDelete } from "./canvasWebRequestor";
 
 export const canvasAssignmentGroupService = {
   async getAll(courseId: number): Promise<CanvasAssignmentGroup[]> {
     console.log("Requesting assignment groups");
     const url = `${canvasApi}/courses/${courseId}/assignment_groups`;
-    const assignmentGroups = await paginatedRequest<
-      CanvasAssignmentGroup[]
-    >({
+    const assignmentGroups = await paginatedRequest<CanvasAssignmentGroup[]>({
       url,
     });
     return assignmentGroups.flatMap((groupList) => groupList);
@@ -40,7 +38,9 @@ export const canvasAssignmentGroupService = {
     canvasCourseId: number,
     localAssignmentGroup: LocalAssignmentGroup
   ): Promise<void> {
-    console.log(`Updating assignment group: ${localAssignmentGroup.name}, ${localAssignmentGroup.canvasId}`);
+    console.log(
+      `Updating assignment group: ${localAssignmentGroup.name}, ${localAssignmentGroup.canvasId}`
+    );
     if (!localAssignmentGroup.canvasId) {
       throw new Error("Cannot update assignment group if canvas ID is null");
     }

src/services/canvas/canvasAssignmentService.ts

@@ -1,10 +1,10 @@
 import { CanvasAssignment } from "@/models/canvas/assignments/canvasAssignment";
 import { canvasApi, paginatedRequest } from "./canvasServiceUtils";
-import { LocalAssignment } from "@/models/local/assignment/localAssignment";
+import { LocalAssignment } from "@/features/local/assignments/models/localAssignment";
 import { axiosClient } from "../axiosUtils";
 import { markdownToHTMLSafe } from "../htmlMarkdownUtils";
 import { CanvasRubricCreationResponse } from "@/models/canvas/assignments/canvasRubricCreationResponse";
-import { assignmentPoints } from "@/models/local/assignment/utils/assignmentPointsUtils";
+import { assignmentPoints } from "@/features/local/assignments/models/utils/assignmentPointsUtils";
 import { getDateFromString } from "@/models/local/utils/timeUtils";
 import { getRubricCriterion } from "./canvasRubricUtils";
 import { LocalCourseSettings } from "@/models/local/localCourseSettings";

src/services/canvas/canvasPageService.ts

@@ -1,5 +1,5 @@
 import { CanvasPage } from "@/models/canvas/pages/canvasPageModel";
-import { LocalCoursePage } from "@/models/local/page/localCoursePage";
+import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
 import { canvasApi, paginatedRequest } from "./canvasServiceUtils";
 import { markdownToHTMLSafe } from "../htmlMarkdownUtils";
 import { axiosClient } from "../axiosUtils";
@@ -10,21 +10,21 @@ export const canvasPageService = {
   async getAll(courseId: number): Promise<CanvasPage[]> {
     console.log("requesting pages");
     try {
-    const url = `${canvasApi}/courses/${courseId}/pages`;
-    const pages = await paginatedRequest<CanvasPage[]>({
-      url,
-    });
-    return pages.flatMap((pageList) => pageList);
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } catch (error: any) {
-    if (error?.response?.status === 403) {
-      console.log(
-        "Canvas API error: 403 Forbidden for pages. Returning empty array."
-      );
-      return [];
+      const url = `${canvasApi}/courses/${courseId}/pages`;
+      const pages = await paginatedRequest<CanvasPage[]>({
+        url,
+      });
+      return pages.flatMap((pageList) => pageList);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (error: any) {
+      if (error?.response?.status === 403) {
+        console.log(
+          "Canvas API error: 403 Forbidden for pages. Returning empty array."
+        );
+        return [];
+      }
+      throw error;
     }
-    throw error;
-  }
   },
 
   async create(

src/services/canvas/canvasQuizService.ts

@@ -1,17 +1,14 @@
 import { CanvasQuiz } from "@/models/canvas/quizzes/canvasQuizModel";
 import { axiosClient } from "../axiosUtils";
 import { canvasApi, paginatedRequest } from "./canvasServiceUtils";
-import { LocalQuiz } from "@/models/local/quiz/localQuiz";
 import { markdownToHTMLSafe } from "../htmlMarkdownUtils";
 import { getDateFromStringOrThrow } from "@/models/local/utils/timeUtils";
 import { canvasAssignmentService } from "./canvasAssignmentService";
-import {
-  LocalQuizQuestion,
-  QuestionType,
-} from "@/models/local/quiz/localQuizQuestion";
 import { CanvasQuizQuestion } from "@/models/canvas/quizzes/canvasQuizQuestionModel";
 import { LocalCourseSettings } from "@/models/local/localCourseSettings";
 import { escapeMatchingText } from "../utils/questionHtmlUtils";
+import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
+import { LocalQuizQuestion, QuestionType } from "@/features/local/quizzes/models/localQuizQuestion";
 
 export const getAnswers = (
   question: LocalQuizQuestion,

src/services/canvas/canvasRubricUtils.ts

@@ -1,22 +1,21 @@
-import { RubricItem } from "@/models/local/assignment/rubricItem";
+import { RubricItem } from "@/features/local/assignments/models/rubricItem";
 
 export const getRubricCriterion = (rubric: RubricItem[]) => {
   const criterion = rubric
-  .map((rubricItem) => ({
-    description: rubricItem.label,
-    points: rubricItem.points,
-    ratings: {
-      0: { description: "Full Marks", points: rubricItem.points },
-      1: { description: "No Marks", points: 0 },
-    },
-  }))
-  .reduce((acc, item, index) => {
-    return {
-      ...acc,
-      [index]: item,
-    };
-  }, {} as { [key: number]: { description: string; points: number; ratings: { [key: number]: { description: string; points: number } } } });
+    .map((rubricItem) => ({
+      description: rubricItem.label,
+      points: rubricItem.points,
+      ratings: {
+        0: { description: "Full Marks", points: rubricItem.points },
+        1: { description: "No Marks", points: 0 },
+      },
+    }))
+    .reduce((acc, item, index) => {
+      return {
+        ...acc,
+        [index]: item,
+      };
+    }, {} as { [key: number]: { description: string; points: number; ratings: { [key: number]: { description: string; points: number } } } });
 
-  return criterion
-
-}
+  return criterion;
+};

src/services/canvas/rubric.test.ts

@@ -1,21 +1,21 @@
-import { RubricItem } from "@/models/local/assignment/rubricItem";
+import { RubricItem } from "@/features/local/assignments/models/rubricItem";
 import { describe, expect, it } from "vitest";
 import { getRubricCriterion } from "./canvasRubricUtils";
-import { assignmentPoints } from "@/models/local/assignment/utils/assignmentPointsUtils";
+import { assignmentPoints } from "@/features/local/assignments/models/utils/assignmentPointsUtils";
 
-describe("can prepare rubric for canvas", () =>{
-  it("can parse normal rubric into criterion", () =>{
+describe("can prepare rubric for canvas", () => {
+  it("can parse normal rubric into criterion", () => {
     const rubric: RubricItem[] = [
       {
         label: "first",
-        points: 1
+        points: 1,
       },
       {
         label: "second",
-        points: 2
+        points: 2,
       },
-    ]
-    const criterion = getRubricCriterion(rubric)
+    ];
+    const criterion = getRubricCriterion(rubric);
 
     expect(criterion).toStrictEqual({
       0: {
@@ -24,7 +24,7 @@ describe("can prepare rubric for canvas", () =>{
         ratings: {
           0: { description: "Full Marks", points: 1 },
           1: { description: "No Marks", points: 0 },
-        }
+        },
       },
       1: {
         description: "second",
@@ -32,24 +32,23 @@ describe("can prepare rubric for canvas", () =>{
         ratings: {
           0: { description: "Full Marks", points: 2 },
           1: { description: "No Marks", points: 0 },
-        }
-      }
-    })
-  })
+        },
+      },
+    });
+  });
 
-
-  it("can parse negative rubric into criterion", () =>{
+  it("can parse negative rubric into criterion", () => {
     const rubric: RubricItem[] = [
       {
         label: "first",
-        points: 1
+        points: 1,
       },
       {
         label: "second",
-        points: -2
+        points: -2,
       },
-    ]
-    const criterion = getRubricCriterion(rubric)
+    ];
+    const criterion = getRubricCriterion(rubric);
 
     expect(criterion).toStrictEqual({
       0: {
@@ -58,7 +57,7 @@ describe("can prepare rubric for canvas", () =>{
         ratings: {
           0: { description: "Full Marks", points: 1 },
           1: { description: "No Marks", points: 0 },
-        }
+        },
       },
       1: {
         description: "second",
@@ -66,28 +65,27 @@ describe("can prepare rubric for canvas", () =>{
         ratings: {
           0: { description: "Full Marks", points: -2 },
           1: { description: "No Marks", points: 0 },
-        }
-      }
-    })
-  })
+        },
+      },
+    });
+  });
 
-
-  it("negative rubric items do not contribute to the total", () =>{
+  it("negative rubric items do not contribute to the total", () => {
     const rubric: RubricItem[] = [
       {
         label: "first",
-        points: 1
+        points: 1,
       },
       {
         label: "second",
-        points: -2
+        points: -2,
       },
       {
         label: "second",
-        points: 3
+        points: 3,
       },
-    ]
-    const points = assignmentPoints(rubric)
-    expect(points).toBe(4)
-  })
-})
+    ];
+    const points = assignmentPoints(rubric);
+    expect(points).toBe(4);
+  });
+});

src/services/fileStorage/assignmentsFileStorageService.ts

@@ -1,8 +1,8 @@
 import {
   localAssignmentMarkdown,
   LocalAssignment,
-} from "@/models/local/assignment/localAssignment";
-import { assignmentMarkdownSerializer } from "@/models/local/assignment/utils/assignmentMarkdownSerializer";
+} from "@/features/local/assignments/models/localAssignment";
+import { assignmentMarkdownSerializer } from "@/features/local/assignments/models/utils/assignmentMarkdownSerializer";
 import path from "path";
 import { directoryOrFileExists } from "./utils/fileSystemUtils";
 import { promises as fs } from "fs";

src/services/fileStorage/courseItemFileStorageService.ts

@@ -4,23 +4,20 @@ import fs from "fs/promises";
 import {
   LocalAssignment,
   localAssignmentMarkdown,
-} from "@/models/local/assignment/localAssignment";
-import {
-  LocalQuiz,
-  localQuizMarkdownUtils,
-} from "@/models/local/quiz/localQuiz";
-import {
-  LocalCoursePage,
-  localPageMarkdownUtils,
-} from "@/models/local/page/localCoursePage";
-import { assignmentMarkdownSerializer } from "@/models/local/assignment/utils/assignmentMarkdownSerializer";
-import { quizMarkdownUtils } from "@/models/local/quiz/utils/quizMarkdownUtils";
+} from "@/features/local/assignments/models/localAssignment";
+import { assignmentMarkdownSerializer } from "@/features/local/assignments/models/utils/assignmentMarkdownSerializer";
 import {
   CourseItemReturnType,
   CourseItemType,
   typeToFolder,
 } from "@/models/local/courseItemTypes";
 import { getCoursePathByName } from "./globalSettingsFileStorageService";
+import {
+  localPageMarkdownUtils,
+  LocalCoursePage,
+} from "@/features/local/pages/localCoursePageModels";
+import { LocalQuiz, localQuizMarkdownUtils } from "@/features/local/quizzes/models/localQuiz";
+import { quizMarkdownUtils } from "@/features/local/quizzes/models/utils/quizMarkdownUtils";
 
 const getItemFileNames = async (
   courseName: string,

src/services/fileStorage/fileStorageService.ts

@@ -3,7 +3,7 @@ import path from "path";
 import { basePath, directoryOrFileExists } from "./utils/fileSystemUtils";
 import { assignmentsFileStorageService } from "./assignmentsFileStorageService";
 import { quizFileStorageService } from "./quizFileStorageService";
-import { pageFileStorageService } from "./pageFileStorageService";
+import { pageFileStorageService } from "../../features/local/pages/pageFileStorageService";
 import { moduleFileStorageService } from "./moduleFileStorageService";
 import { settingsFileStorageService } from "./settingsFileStorageService";
 import { getCoursePathByName } from "./globalSettingsFileStorageService";

src/services/fileStorage/globalSettingsFileStorageService.ts

@@ -46,11 +46,4 @@ export const updateGlobalSettings = async (globalSettings: GlobalSettings) => {
     zodGlobalSettings.parse(globalSettings)
   );
   await fs.writeFile(SETTINGS_FILE_PATH, globalSettingsString, "utf-8");
-
-  // await Promise.all(
-  //   globalSettings.courses.map(async (course) => {
-  //     const coursePath = await getCoursePathByName(course.name);
-  //     await fs.mkdir(coursePath, { recursive: true });
-  //   })
-  // );
 };

src/services/fileStorage/quizFileStorageService.ts

@@ -1,9 +1,9 @@
-import { LocalQuiz } from "@/models/local/quiz/localQuiz";
-import { quizMarkdownUtils } from "@/models/local/quiz/utils/quizMarkdownUtils";
 import path from "path";
 import { promises as fs } from "fs";
 import { courseItemFileStorageService } from "./courseItemFileStorageService";
 import { getCoursePathByName } from "./globalSettingsFileStorageService";
+import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
+import { quizMarkdownUtils } from "@/features/local/quizzes/models/utils/quizMarkdownUtils";
 
 export const quizFileStorageService = {
   getQuiz: async (courseName: string, moduleName: string, quizName: string) =>

src/services/fileStorage/settingsFileStorageService.ts

@@ -5,7 +5,7 @@ import {
 import { promises as fs } from "fs";
 import path from "path";
 import { basePath, directoryOrFileExists } from "./utils/fileSystemUtils";
-import { AssignmentSubmissionType } from "@/models/local/assignment/assignmentSubmissionType";
+import { AssignmentSubmissionType } from "@/features/local/assignments/models/assignmentSubmissionType";
 import {
   getCoursePathByName,
   getGlobalSettings,

src/services/fileStorage/utils/lectureUtils.ts

@@ -1,5 +1,5 @@
 import { getWeekNumber } from "@/app/course/[courseName]/calendar/calendarMonthUtils";
-import { extractLabelValue } from "@/models/local/assignment/utils/markdownUtils";
+import { extractLabelValue } from "@/features/local/assignments/models/utils/markdownUtils";
 import { Lecture } from "@/models/local/lecture";
 import { getDateFromStringOrThrow } from "@/models/local/utils/timeUtils";
 

src/services/serverFunctions/router/app.ts

@@ -1,12 +1,12 @@
 import { createTrpcContext } from "../context";
 import { createCallerFactory, router } from "../trpcSetup";
-import { assignmentRouter } from "./assignmentRouter";
+import { assignmentRouter } from "../../../features/local/assignments/assignmentRouter";
 import { canvasFileRouter } from "./canvasFileRouter";
 import { directoriesRouter } from "./directoriesRouter";
 import { globalSettingsRouter } from "./globalSettingsRouter";
 import { lectureRouter } from "./lectureRouter";
 import { moduleRouter } from "./moduleRouter";
-import { pageRouter } from "./pageRouter";
+import { pageRouter } from "../../../features/local/pages/pageRouter";
 import { quizRouter } from "./quizRouter";
 import { settingsRouter } from "./settingsRouter";
 

src/services/serverFunctions/router/quizRouter.ts

@@ -2,7 +2,7 @@ import publicProcedure from "../procedures/public";
 import { z } from "zod";
 import { router } from "../trpcSetup";
 import { fileStorageService } from "@/services/fileStorage/fileStorageService";
-import { zodLocalQuiz } from "@/models/local/quiz/localQuiz";
+import { zodLocalQuiz } from "@/features/local/quizzes/models/localQuiz";
 
 export const quizRouter = router({
   getQuiz: publicProcedure