starting to resurect tests

nextjs/src/app/course/[courseName]/CourseSettingsLink.tsx

@@ -3,22 +3,16 @@
 import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHooks";
 import Link from "next/link";
 import { useCourseContext } from "./context/courseContext";
+import { getCourseSettingsUrl } from "@/services/urlUtils";
 
 export default function CourseSettingsLink() {
-  const {courseName} = useCourseContext();
+  const { courseName } = useCourseContext();
   const { data: settings } = useLocalCourseSettingsQuery();
   return (
     <div>
       {settings.name}
 
-      <Link
-        href={
-          "/course/" +
-          encodeURIComponent(courseName) +
-          "/settings"
-        }
-        shallow={true}
-      >
+      <Link href={getCourseSettingsUrl(courseName)} shallow={true}>
         Course Settings
       </Link>
     </div>

nextjs/src/app/course/[courseName]/calendar/Day.tsx

@@ -9,7 +9,8 @@ import { useCourseContext } from "../context/courseContext";
 import Link from "next/link";
 import { IModuleItem } from "@/models/local/IModuleItem";
 import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHooks";
-import {  getDayOfWeek } from "@/models/local/localCourse";
+import { getDayOfWeek } from "@/models/local/localCourse";
+import { getModuleItemUrl } from "@/services/urlUtils";
 
 export default function Day({ day, month }: { day: string; month: number }) {
   const dayAsDate = getDateFromStringOrThrow(
@@ -32,13 +33,11 @@ export default function Day({ day, month }: { day: string; month: number }) {
   const classIsToday = settings.daysOfWeek.includes(getDayOfWeek(dayAsDate));
 
   const todayClass = classIsToday ? " bg-slate-900 " : " ";
-  const monthClass = isInSameMonth ? " border border-slate-600 " : " "
+  const monthClass = isInSameMonth ? " border border-slate-600 " : " ";
 
   return (
     <div
-      className={
-        " rounded-lg p-2 pb-4 m-1 " + todayClass + monthClass
-      }
+      className={" rounded-lg p-2 pb-4 m-1 " + todayClass + monthClass}
       onDrop={(e) => itemDrop(e, day)}
       onDragOver={(e) => e.preventDefault()}
     >
@@ -135,14 +134,7 @@ function DraggableListItem({
       }}
     >
       <Link
-        href={
-          "/course/" +
-          encodeURIComponent(courseName) +
-          "/modules/" +
-          encodeURIComponent(moduleName) +
-          `/${type}/` +
-          encodeURIComponent(item.name)
-        }
+        href={getModuleItemUrl(courseName, moduleName, type, item.name)}
         shallow={true}
       >
         {item.name}

nextjs/src/app/course/[courseName]/calendar/DayItemsInModule.tsx

@@ -1,218 +0,0 @@
-"use client";
-import React, { useMemo } from "react";
-import { useCourseContext } from "../context/courseContext";
-import { getDateFromStringOrThrow } from "@/models/local/timeUtils";
-import Link from "next/link";
-import {
-  usePageNamesQuery,
-  usePagesQueries,
-} from "@/hooks/localCourse/pageHooks";
-import {
-  useQuizNamesQuery,
-  useQuizzesQueries,
-} from "@/hooks/localCourse/quizHooks";
-import {
-  useAssignmentNamesQuery,
-  useAssignmentsQueries,
-} from "@/hooks/localCourse/assignmentHooks";
-
-export default function DayItemsInModule({
-  day,
-  moduleName,
-}: {
-  day: string;
-  moduleName: string;
-}) {
-  return (
-    <ul className="list-disc ms-4">
-      <Assignments moduleName={moduleName} day={day} />
-      <Quizzes moduleName={moduleName} day={day} />
-      <Pages moduleName={moduleName} day={day} />
-    </ul>
-  );
-}
-
-function Pages({ moduleName, day }: { moduleName: string; day: string }) {
-  const { courseName } = useCourseContext();
-  const { data: pageNames } = usePageNamesQuery(moduleName);
-  const { data: pages } = usePagesQueries(moduleName, pageNames);
-  const todaysPages = useMemo(
-    () =>
-      pages.filter((p) => {
-        const dueDate = getDateFromStringOrThrow(
-          p.dueAt,
-          "due at for page in day"
-        );
-        const dayAsDate = getDateFromStringOrThrow(
-          day,
-          "in pages in DayItemsInModule"
-        );
-        return (
-          dueDate.getFullYear() === dayAsDate.getFullYear() &&
-          dueDate.getMonth() === dayAsDate.getMonth() &&
-          dueDate.getDate() === dayAsDate.getDate()
-        );
-      }),
-    [day, pages]
-  );
-  return (
-    <>
-      {todaysPages.map((p) => (
-        <li
-          key={p.name}
-          role="button"
-          draggable="true"
-          onDragStart={(e) => {
-            e.dataTransfer.setData(
-              "draggableItem",
-              JSON.stringify({
-                type: "page",
-                item: p,
-                sourceModuleName: moduleName,
-              })
-            );
-          }}
-        >
-          <Link
-            href={
-              "/course/" +
-              encodeURIComponent(courseName) +
-              "/modules/" +
-              encodeURIComponent(moduleName) +
-              "/page/" +
-              encodeURIComponent(p.name)
-            }
-            shallow={true}
-          >
-            {p.name}
-          </Link>
-        </li>
-      ))}
-    </>
-  );
-}
-
-function Quizzes({ moduleName, day }: { moduleName: string; day: string }) {
-  const { data: quizNames } = useQuizNamesQuery(moduleName);
-  const { data: quizzes } = useQuizzesQueries(moduleName, quizNames);
-  const { courseName } = useCourseContext();
-
-  const todaysQuizzes = useMemo(
-    () =>
-      quizzes.filter((q) => {
-        const dueDate = getDateFromStringOrThrow(
-          q.dueAt,
-          "due at for quiz in day"
-        );
-        const dayAsDate = getDateFromStringOrThrow(
-          day,
-          "in quizzes in DayItemsInModule"
-        );
-        return (
-          dueDate.getFullYear() === dayAsDate.getFullYear() &&
-          dueDate.getMonth() === dayAsDate.getMonth() &&
-          dueDate.getDate() === dayAsDate.getDate()
-        );
-      }),
-    [day, quizzes]
-  );
-  return (
-    <>
-      {todaysQuizzes.map((q) => (
-        <li
-          key={q.name}
-          role="button"
-          draggable="true"
-          onDragStart={(e) => {
-            e.dataTransfer.setData(
-              "draggableItem",
-              JSON.stringify({
-                type: "quiz",
-                item: q,
-                sourceModuleName: moduleName,
-              })
-            );
-          }}
-          onDragEnd={(e) => e.preventDefault()}
-        >
-          <Link
-            href={
-              "/course/" +
-              encodeURIComponent(courseName) +
-              "/modules/" +
-              encodeURIComponent(moduleName) +
-              "/quiz/" +
-              encodeURIComponent(q.name)
-            }
-            shallow={true}
-          >
-            {q.name}
-          </Link>
-        </li>
-      ))}
-    </>
-  );
-}
-
-function Assignments({ moduleName, day }: { moduleName: string; day: string }) {
-  const { data: assignmentNames } = useAssignmentNamesQuery(moduleName);
-  const { courseName } = useCourseContext();
-  const { data: assignments } = useAssignmentsQueries(
-    moduleName,
-    assignmentNames
-  );
-  const todaysAssignments = useMemo(
-    () =>
-      assignments.filter((a) => {
-        const dueDate = getDateFromStringOrThrow(
-          a.dueAt,
-          "due at for assignment in day"
-        );
-        const dayAsDate = getDateFromStringOrThrow(
-          day,
-          "in assignment in DayItemsInModule"
-        );
-        return (
-          dueDate.getFullYear() === dayAsDate.getFullYear() &&
-          dueDate.getMonth() === dayAsDate.getMonth() &&
-          dueDate.getDate() === dayAsDate.getDate()
-        );
-      }),
-    [assignments, day]
-  );
-  return (
-    <>
-      {todaysAssignments.map((a) => (
-        <li
-          key={a.name}
-          role="button"
-          draggable="true"
-          onDragStart={(e) => {
-            e.dataTransfer.setData(
-              "draggableItem",
-              JSON.stringify({
-                type: "assignment",
-                item: a,
-                sourceModuleName: moduleName,
-              })
-            );
-          }}
-        >
-          <Link
-            href={
-              "/course/" +
-              encodeURIComponent(courseName) +
-              "/modules/" +
-              encodeURIComponent(moduleName) +
-              "/assignment/" +
-              encodeURIComponent(a.name)
-            }
-            shallow={true}
-          >
-            {a.name}
-          </Link>
-        </li>
-      ))}
-    </>
-  );
-}