back to displaying months

nextjs/src/hooks/localCourse/assignmentHooks.ts

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { localCourseKeys } from "./localCoursesHooks";
+import { localCourseKeys } from "./localCourseKeys";
 import { LocalAssignment } from "@/models/local/assignmnet/localAssignment";
 import { useSuspenseQuery, useSuspenseQueries } from "@tanstack/react-query";
 
@@ -8,7 +8,7 @@ export const useAssignmentNamesQuery = (
   moduleName: string
 ) =>
   useSuspenseQuery({
-    queryKey: localCourseKeys.moduleAssignmentNames(courseName, moduleName),
+    queryKey: localCourseKeys.assignmentNames(courseName, moduleName),
     queryFn: async (): Promise<string[]> => {
       const url = `/api/courses/${courseName}/modules/${moduleName}/assignments`;
       const response = await axios.get(url);

nextjs/src/hooks/localCourse/localCourseKeys.ts

@@ -0,0 +1,55 @@
+export const localCourseKeys = {
+  allCourses: ["all courses"] as const,
+  settings: (courseName: string) =>
+    ["course details", courseName, "settings"] as const,
+  moduleNames: (courseName: string) =>
+    [
+      "course details",
+      courseName,
+      "modules",
+      { type: "names" } as const,
+    ] as const,
+  assignmentNames: (courseName: string, moduleName: string) =>
+    [
+      "course details",
+      courseName,
+      "modules",
+      moduleName,
+      "assignments",
+    ] as const,
+  quizNames: (courseName: string, moduleName: string) =>
+    ["course details", courseName, "modules", moduleName, "quizzes"] as const,
+  pageNames: (courseName: string, moduleName: string) =>
+    ["course details", courseName, "modules", moduleName, "pages"] as const,
+  assignment: (
+    courseName: string,
+    moduleName: string,
+    assignmentName: string
+  ) =>
+    [
+      "course details",
+      courseName,
+      "modules",
+      moduleName,
+      "assignments",
+      assignmentName,
+    ] as const,
+  quiz: (courseName: string, moduleName: string, quizName: string) =>
+    [
+      "course details",
+      courseName,
+      "modules",
+      moduleName,
+      "quizzes",
+      quizName,
+    ] as const,
+  page: (courseName: string, moduleName: string, pageName: string) =>
+    [
+      "course details",
+      courseName,
+      "modules",
+      moduleName,
+      "pages",
+      pageName,
+    ] as const,
+};

nextjs/src/hooks/localCourse/localCoursesHooks.ts

@@ -1,64 +1,13 @@
 import { LocalCourseSettings } from "@/models/local/localCourse";
-import {
-  useSuspenseQuery,
-} from "@tanstack/react-query";
+import { useSuspenseQuery } from "@tanstack/react-query";
 import axios from "axios";
-
-export const localCourseKeys = {
-  allCourses: ["all courses"] as const,
-  settings: (courseName: string) =>
-    ["course details", courseName, "settings"] as const,
-  moduleNames: (courseName: string) =>
-    [
-      "course details",
-      courseName,
-      "modules",
-      { type: "names" } as const,
-    ] as const,
-  moduleAssignmentNames: (courseName: string, moduleName: string) =>
-    [
-      "course details",
-      courseName,
-      "modules",
-      moduleName,
-      "assignments",
-    ] as const,
-  moduleQuizzeNames: (courseName: string, moduleName: string) =>
-    ["course details", courseName, "modules", moduleName, "quizzes"] as const,
-  modulePageNames: (courseName: string, moduleName: string) =>
-    ["course details", courseName, "modules", moduleName, "pages"] as const,
-  assignment: (
-    courseName: string,
-    moduleName: string,
-    assignmentName: string
-  ) =>
-    [
-      "course details",
-      courseName,
-      "modules",
-      moduleName,
-      "assignments",
-      assignmentName,
-    ] as const,
-  quiz: (courseName: string, moduleName: string, quizName: string) =>
-    [
-      "course details",
-      courseName,
-      "modules",
-      moduleName,
-      "quizzes",
-      quizName,
-    ] as const,
-  page: (courseName: string, moduleName: string, pageName: string) =>
-    [
-      "course details",
-      courseName,
-      "modules",
-      moduleName,
-      "pages",
-      pageName,
-    ] as const,
-};
+import { localCourseKeys } from "./localCourseKeys";
+import {
+  useAssignmentNamesQuery,
+  useAssignmentsQueries,
+} from "./assignmentHooks";
+import { usePageNamesQuery, usePagesQueries } from "./pageHooks";
+import { useQuizNamesQuery, useQuizzesQueries } from "./quizHooks";
 
 export const useLocalCourseNamesQuery = () =>
   useSuspenseQuery({
@@ -90,7 +39,33 @@ export const useModuleNamesQuery = (courseName: string) =>
     },
   });
 
+export const useModuleDataQuery = (courseName: string, moduleName: string) => {
+  const { data: assignmentNames } = useAssignmentNamesQuery(
+    courseName,
+    moduleName
+  );
+  const { data: quizNames } = useQuizNamesQuery(courseName, moduleName);
+  const { data: pageNames } = usePageNamesQuery(courseName, moduleName);
 
+  const { data: assignments } = useAssignmentsQueries(
+    courseName,
+    moduleName,
+    assignmentNames
+  );
+  const { data: quizzes } = useQuizzesQueries(
+    courseName,
+    moduleName,
+    quizNames
+  );
+  const { data: pages } = usePagesQueries(courseName, moduleName, pageNames);
+
+  
+  return {
+    assignments,
+    quizzes,
+    pages,
+  };
+};
 
 // export const useUpdateCourseMutation = (courseName: string) => {
 //   const queryClient = useQueryClient();

nextjs/src/hooks/localCourse/pageHooks.ts

@@ -1,11 +1,11 @@
 import { LocalCoursePage } from "@/models/local/page/localCoursePage";
 import { useSuspenseQueries, useSuspenseQuery } from "@tanstack/react-query";
 import axios from "axios";
-import { localCourseKeys } from "./localCoursesHooks";
+import { localCourseKeys } from "./localCourseKeys";
 
 export const usePageNamesQuery = (courseName: string, moduleName: string) =>
   useSuspenseQuery({
-    queryKey: localCourseKeys.modulePageNames(courseName, moduleName),
+    queryKey: localCourseKeys.pageNames(courseName, moduleName),
     queryFn: async (): Promise<string[]> => {
       const url = `/api/courses/${courseName}/modules/${moduleName}/pages`;
       const response = await axios.get(url);

nextjs/src/hooks/localCourse/quizHooks.ts

@@ -1,11 +1,11 @@
 import { LocalQuiz } from "@/models/local/quiz/localQuiz";
 import { useSuspenseQueries, useSuspenseQuery } from "@tanstack/react-query";
 import axios from "axios";
-import { localCourseKeys } from "./localCoursesHooks";
+import { localCourseKeys } from "./localCourseKeys";
 
 export const useQuizNamesQuery = (courseName: string, moduleName: string) =>
   useSuspenseQuery({
-    queryKey: localCourseKeys.moduleQuizzeNames(courseName, moduleName),
+    queryKey: localCourseKeys.quizNames(courseName, moduleName),
     queryFn: async (): Promise<string[]> => {
       const url = `/api/courses/${courseName}/modules/${moduleName}/quizzes`;
       const response = await axios.get(url);