starting to move over settings

nextjs/src/hooks/canvas/canvasAssignmentHooks.ts

@@ -22,7 +22,7 @@ export const canvasAssignmentKeys = {
 };
 
 export const useCanvasAssignmentsQuery = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
 
   return useSuspenseQuery({
     queryKey: canvasAssignmentKeys.assignments(settings.canvasId),
@@ -31,7 +31,7 @@ export const useCanvasAssignmentsQuery = () => {
 };
 
 // export const useCanvasAssignmentsQuery = () => {
-//   const { data: settings } = useLocalCourseSettingsQuery();
+//   const [settings] = useLocalCourseSettingsQuery();
 //   const { data: allAssignments } = useInnerCanvasAssignmentsQuery();
 
 //   return useSuspenseQueries({
@@ -47,7 +47,7 @@ export const useCanvasAssignmentsQuery = () => {
 // };
 
 export const useAddAssignmentToCanvasMutation = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   const { data: canvasModules } = useCanvasModulesQuery();
   const addModule = useAddCanvasModuleMutation();
   const queryClient = useQueryClient();
@@ -90,7 +90,7 @@ export const useAddAssignmentToCanvasMutation = () => {
 };
 
 export const useUpdateAssignmentInCanvasMutation = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   const queryClient = useQueryClient();
 
   return useMutation({
@@ -120,7 +120,7 @@ export const useUpdateAssignmentInCanvasMutation = () => {
 };
 
 export const useDeleteAssignmentFromCanvasMutation = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async ({

nextjs/src/hooks/canvas/canvasModuleHooks.ts

@@ -11,7 +11,7 @@ export const canvasCourseModuleKeys = {
 };
 
 export const useCanvasModulesQuery = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   return useSuspenseQuery({
     queryKey: canvasCourseModuleKeys.modules(settings.canvasId),
     queryFn: async () =>
@@ -20,7 +20,7 @@ export const useCanvasModulesQuery = () => {
 };
 
 export const useAddCanvasModuleMutation = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async (moduleName: string) =>

nextjs/src/hooks/canvas/canvasPageHooks.ts

@@ -21,7 +21,7 @@ export const canvasPageKeys = {
 };
 
 export const useCanvasPagesQuery = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   return useSuspenseQuery({
     queryKey: canvasPageKeys.pagesInCourse(settings.canvasId),
     queryFn: async () => await canvasPageService.getAll(settings.canvasId),
@@ -29,7 +29,7 @@ export const useCanvasPagesQuery = () => {
 };
 
 export const useCreateCanvasPageMutation = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   const queryClient = useQueryClient();
   const { data: canvasModules } = useCanvasModulesQuery();
   const addModule = useAddCanvasModuleMutation();
@@ -69,7 +69,7 @@ export const useCreateCanvasPageMutation = () => {
 };
 
 export const useUpdateCanvasPageMutation = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async ({
@@ -88,7 +88,7 @@ export const useUpdateCanvasPageMutation = () => {
 };
 
 export const useDeleteCanvasPageMutation = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async (canvasPageId: number) =>

nextjs/src/hooks/canvas/canvasQuizHooks.ts

@@ -6,7 +6,10 @@ import {
 import { useLocalCourseSettingsQuery } from "../localCourse/localCoursesHooks";
 import { canvasQuizService } from "@/services/canvas/canvasQuizService";
 import { LocalQuiz } from "@/models/local/quiz/localQuiz";
-import { useAddCanvasModuleMutation, useCanvasModulesQuery } from "./canvasModuleHooks";
+import {
+  useAddCanvasModuleMutation,
+  useCanvasModulesQuery,
+} from "./canvasModuleHooks";
 import { canvasModuleService } from "@/services/canvas/canvasModuleService";
 
 export const canvasQuizKeys = {
@@ -15,7 +18,7 @@ export const canvasQuizKeys = {
 };
 
 export const useCanvasQuizzesQuery = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
 
   return useSuspenseQuery({
     queryKey: canvasQuizKeys.quizzes(settings.canvasId),
@@ -24,7 +27,7 @@ export const useCanvasQuizzesQuery = () => {
 };
 
 export const useAddQuizToCanvasMutation = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   const queryClient = useQueryClient();
   const { data: canvasModules } = useCanvasModulesQuery();
   const addModule = useAddCanvasModuleMutation();
@@ -68,7 +71,7 @@ export const useAddQuizToCanvasMutation = () => {
 };
 
 export const useDeleteQuizFromCanvasMutation = () => {
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async (canvasQuizId: number) => {

nextjs/src/hooks/localCourse/lectureHooks.ts

@@ -26,7 +26,7 @@ import { useLocalCourseSettingsQuery } from "./localCoursesHooks";
 
 export const useLectureUpdateMutation = () => {
   const { courseName } = useCourseContext();
-  const { data: settings } = useLocalCourseSettingsQuery();
+  const [settings] = useLocalCourseSettingsQuery();
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async ({

nextjs/src/hooks/localCourse/localCoursesHooks.ts

@@ -9,33 +9,35 @@ import { localCourseKeys } from "./localCourseKeys";
 import { useCourseContext } from "@/app/course/[courseName]/context/courseContext";
 import {
   createCourseOnServer,
-  getAllCoursesSettingsFromServer,
   updateCourseSettingsOnServer,
 } from "./localCoursesServerActions";
+import { trpc } from "@/services/trpc/utils";
 
 export const useLocalCoursesSettingsQuery = () =>
-  useSuspenseQuery({
-    queryKey: localCourseKeys.allCoursesSettings,
-    queryFn: async () => {
-      return await getAllCoursesSettingsFromServer();
-    },
-  });
+  trpc.settings.allCoursesSettings.useSuspenseQuery();
+// useSuspenseQuery({
+//   queryKey: localCourseKeys.allCoursesSettings,
+//   queryFn: async () => {
+//     return await getAllCoursesSettingsFromServer();
+//   },
+// });
 
 export const useLocalCourseSettingsQuery = () => {
   const { courseName } = useCourseContext();
   // const { data: settingsList } = useLocalCoursesSettingsQuery();
-  return useSuspenseQuery({
-    queryKey: localCourseKeys.settings(courseName),
-    queryFn: async () => {
-      const settingsList = await getAllCoursesSettingsFromServer();
-      const s = settingsList.find((s) => s.name === courseName);
-      if (!s) {
-        console.log(courseName, settingsList);
-        throw Error("Could not find settings for course " + courseName);
-      }
-      return s;
-    },
-  });
+  return trpc.settings.courseSettings.useSuspenseQuery({ courseName });
+  // return useSuspenseQuery({
+  //   queryKey: localCourseKeys.settings(courseName),
+  //   queryFn: async () => {
+  //     const settingsList = await getAllCoursesSettingsFromServer();
+  //     const s = settingsList.find((s) => s.name === courseName);
+  //     if (!s) {
+  //       console.log(courseName, settingsList);
+  //       throw Error("Could not find settings for course " + courseName);
+  //     }
+  //     return s;
+  //   },
+  // });
 };
 
 export const useCreateLocalCourseMutation = () => {