refactoring canvas files

src/app/addCourse/AddCourseToGlobalSettingsForm.tsx

@@ -6,14 +6,12 @@ import { StoragePathSelector } from "@/components/form/StoragePathSelector";
 import TextInput from "@/components/form/TextInput";
 import { Spinner } from "@/components/Spinner";
 import { SuspenseAndErrorHandling } from "@/components/SuspenseAndErrorHandling";
-import { useCourseListInTermQuery } from "@/hooks/canvas/canvasCourseHooks";
-import { useCanvasTermsQuery } from "@/hooks/canvas/canvasHooks";
 import {
   useCreateLocalCourseMutation,
   useLocalCoursesSettingsQuery,
 } from "@/features/local/course/localCoursesHooks";
-import { CanvasCourseModel } from "@/models/canvas/courses/canvasCourseModel";
-import { CanvasEnrollmentTermModel } from "@/models/canvas/enrollmentTerms/canvasEnrollmentTermModel";
+import { CanvasCourseModel } from "@/features/canvas/models/courses/canvasCourseModel";
+import { CanvasEnrollmentTermModel } from "@/features/canvas/models/enrollmentTerms/canvasEnrollmentTermModel";
 import { AssignmentSubmissionType } from "@/features/local/assignments/models/assignmentSubmissionType";
 import { getCourseUrl } from "@/services/urlUtils";
 import { useRouter } from "next/navigation";
@@ -22,6 +20,8 @@ import {
   DayOfWeek,
   LocalCourseSettings,
 } from "@/features/local/course/localCourseSettings";
+import { useCourseListInTermQuery } from "@/features/canvas/hooks/canvasCourseHooks";
+import { useCanvasTermsQuery } from "@/features/canvas/hooks/canvasHooks";
 
 const sampleCompose = `services:
   canvas_manager:

src/app/course/[courseName]/CourseNavigation.tsx

@@ -1,22 +1,10 @@
 "use client";
 import { Spinner } from "@/components/Spinner";
-import {
-  canvasAssignmentKeys,
-  useCanvasAssignmentsQuery,
-} from "@/hooks/canvas/canvasAssignmentHooks";
-import { canvasCourseKeys } from "@/hooks/canvas/canvasCourseHooks";
-import {
-  canvasCourseModuleKeys,
-  useCanvasModulesQuery,
-} from "@/hooks/canvas/canvasModuleHooks";
-import {
-  canvasPageKeys,
-  useCanvasPagesQuery,
-} from "@/hooks/canvas/canvasPageHooks";
-import {
-  canvasQuizKeys,
-  useCanvasQuizzesQuery,
-} from "@/hooks/canvas/canvasQuizHooks";
+import { useCanvasAssignmentsQuery, canvasAssignmentKeys } from "@/features/canvas/hooks/canvasAssignmentHooks";
+import { canvasCourseKeys } from "@/features/canvas/hooks/canvasCourseHooks";
+import { useCanvasModulesQuery, canvasCourseModuleKeys } from "@/features/canvas/hooks/canvasModuleHooks";
+import { useCanvasPagesQuery, canvasPageKeys } from "@/features/canvas/hooks/canvasPageHooks";
+import { useCanvasQuizzesQuery, canvasQuizKeys } from "@/features/canvas/hooks/canvasQuizHooks";
 import { useLocalCourseSettingsQuery } from "@/features/local/course/localCoursesHooks";
 import { useQueryClient } from "@tanstack/react-query";
 import Link from "next/link";

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

@@ -1,7 +1,7 @@
 "use client";
-import { CanvasAssignment } from "@/models/canvas/assignments/canvasAssignment";
-import { CanvasPage } from "@/models/canvas/pages/canvasPageModel";
-import { CanvasQuiz } from "@/models/canvas/quizzes/canvasQuizModel";
+import { CanvasAssignment } from "@/features/canvas/models/assignments/canvasAssignment";
+import { CanvasPage } from "@/features/canvas/models/pages/canvasPageModel";
+import { CanvasQuiz } from "@/features/canvas/models/quizzes/canvasQuizModel";
 import { LocalAssignment } from "@/features/local/assignments/models/localAssignment";
 import {
   dateToMarkdownString,

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

@@ -1,7 +1,5 @@
 "use client";
-import { useCanvasAssignmentsQuery } from "@/hooks/canvas/canvasAssignmentHooks";
-import { useCanvasPagesQuery } from "@/hooks/canvas/canvasPageHooks";
-import { useCanvasQuizzesQuery } from "@/hooks/canvas/canvasQuizHooks";
+
 import { LocalAssignment } from "@/features/local/assignments/models/localAssignment";
 import {
   getDateFromStringOrThrow,
@@ -13,6 +11,9 @@ import { getStatus } from "./getStatus";
 import { useLocalCourseSettingsQuery } from "@/features/local/course/localCoursesHooks";
 import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels";
 import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz";
+import { useCanvasAssignmentsQuery } from "@/features/canvas/hooks/canvasAssignmentHooks";
+import { useCanvasPagesQuery } from "@/features/canvas/hooks/canvasPageHooks";
+import { useCanvasQuizzesQuery } from "@/features/canvas/hooks/canvasQuizHooks";
 
 export function useTodaysItems(day: string) {
   const { data: settings } = useLocalCourseSettingsQuery();

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

@@ -2,9 +2,9 @@
 import CheckIcon from "@/components/icons/CheckIcon";
 import { Spinner } from "@/components/Spinner";
 import {
-  useAddCanvasModuleMutation,
   useCanvasModulesQuery,
-} from "@/hooks/canvas/canvasModuleHooks";
+  useAddCanvasModuleMutation,
+} from "@/features/canvas/hooks/canvasModuleHooks";
 
 export function ModuleCanvasStatus({ moduleName }: { moduleName: string }) {
   const { data: canvasModules } = useCanvasModulesQuery();

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

@@ -1,18 +1,18 @@
 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";
+} from "@/features/canvas/hooks/canvasAssignmentHooks";
+import { baseCanvasUrl } from "@/features/canvas/services/canvasServiceUtils";
+import {
+  useAssignmentQuery,
+  useDeleteAssignmentMutation,
+} from "@/features/local/assignments/assignmentHooks";
 import { useLocalCourseSettingsQuery } from "@/features/local/course/localCoursesHooks";
-import { baseCanvasUrl } from "@/services/canvas/canvasServiceUtils";
 import { getCourseUrl } from "@/services/urlUtils";
 import Link from "next/link";
 import { useRouter } from "next/navigation";

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

@@ -4,15 +4,15 @@ import { Spinner } from "@/components/Spinner";
 import {
   useCanvasPagesQuery,
   useCreateCanvasPageMutation,
-  useDeleteCanvasPageMutation,
   useUpdateCanvasPageMutation,
-} from "@/hooks/canvas/canvasPageHooks";
+  useDeleteCanvasPageMutation,
+} from "@/features/canvas/hooks/canvasPageHooks";
+import { baseCanvasUrl } from "@/features/canvas/services/canvasServiceUtils";
 import { useLocalCourseSettingsQuery } from "@/features/local/course/localCoursesHooks";
 import {
   useDeletePageMutation,
   usePageQuery,
 } from "@/features/local/pages/pageHooks";
-import { baseCanvasUrl } from "@/services/canvas/canvasServiceUtils";
 import { getCourseUrl } from "@/services/urlUtils";
 import Link from "next/link";
 import { useRouter } from "next/navigation";

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

@@ -5,13 +5,13 @@ import {
   useCanvasQuizzesQuery,
   useAddQuizToCanvasMutation,
   useDeleteQuizFromCanvasMutation,
-} from "@/hooks/canvas/canvasQuizHooks";
+} from "@/features/canvas/hooks/canvasQuizHooks";
+import { baseCanvasUrl } from "@/features/canvas/services/canvasServiceUtils";
 import { useLocalCourseSettingsQuery } from "@/features/local/course/localCoursesHooks";
 import {
   useDeleteQuizMutation,
   useQuizQuery,
 } from "@/features/local/quizzes/quizHooks";
-import { baseCanvasUrl } from "@/services/canvas/canvasServiceUtils";
 import { getCourseUrl } from "@/services/urlUtils";
 import Link from "next/link";
 import { useRouter } from "next/navigation";

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

@@ -7,11 +7,11 @@ import {
 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";
 import { settingsBox } from "./sharedSettings";
 import { Spinner } from "@/components/Spinner";
-import { baseCanvasUrl } from "@/services/canvas/canvasServiceUtils";
 import MeatballIcon from "./MeatballIcon";
+import { useSetAssignmentGroupsMutation } from "@/features/canvas/hooks/canvasCourseHooks";
+import { baseCanvasUrl } from "@/features/canvas/services/canvasServiceUtils";
 
 export default function AssignmentGroupManagement() {
   const { data: settings, isPending } = useLocalCourseSettingsQuery();

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

@@ -1,8 +1,8 @@
 "use client";
 import { useLocalCourseSettingsQuery } from "@/features/local/course/localCoursesHooks";
 import { settingsBox } from "./sharedSettings";
-import { useCourseStudentsQuery } from "@/hooks/canvas/canvasCourseHooks";
 import { Spinner } from "@/components/Spinner";
+import { useCourseStudentsQuery } from "@/features/canvas/hooks/canvasCourseHooks";
 
 export default function GithubClassroomList() {
   const { data: settings } = useLocalCourseSettingsQuery();

src/app/course/[courseName]/settings/canvasNavigation.tsx/CanvasNavigationManagement.tsx

@@ -1,8 +1,10 @@
 import React, { useState } from "react";
-import { useCanvasTabsQuery } from "@/hooks/canvas/canvasNavigationHooks";
-import { useUpdateCanvasTabMutation } from "@/hooks/canvas/canvasNavigationHooks";
 import { Spinner } from "@/components/Spinner";
 import { NavTabListItem } from "./NavTabListItem";
+import {
+  useCanvasTabsQuery,
+  useUpdateCanvasTabMutation,
+} from "@/features/canvas/hooks/canvasNavigationHooks";
 
 export const CanvasNavigationManagement = () => {
   const { data: tabs, isLoading, isError } = useCanvasTabsQuery();

src/app/course/[courseName]/settings/canvasNavigation.tsx/NavTabListItem.tsx

@@ -1,6 +1,6 @@
 import { Spinner } from "@/components/Spinner";
-import { useUpdateCanvasTabMutation } from "@/hooks/canvas/canvasNavigationHooks";
-import { CanvasCourseTab } from "@/services/canvas/canvasNavigationService";
+import { useUpdateCanvasTabMutation } from "@/features/canvas/hooks/canvasNavigationHooks";
+import { CanvasCourseTab } from "@/features/canvas/services/canvasNavigationService";
 import React, { FC } from "react";
 
 export const NavTabListItem: FC<{