=> {
+ try {
+ await fs.access(directoryPath);
+ return true;
+ } catch {
+ return false;
+ }
+};
\ No newline at end of file
diff --git a/nextjs-pages/src/services/htmlMarkdownUtils.ts b/nextjs-pages/src/services/htmlMarkdownUtils.ts
new file mode 100644
index 0000000..cd22c54
--- /dev/null
+++ b/nextjs-pages/src/services/htmlMarkdownUtils.ts
@@ -0,0 +1,10 @@
+"use client";
+import { marked } from "marked";
+import * as DOMPurify from "isomorphic-dompurify";
+
+export function markdownToHTMLSafe(markdownString: string) {
+ const clean = DOMPurify.sanitize(
+ marked.parse(markdownString, { async: false, pedantic: false, gfm: true })
+ );
+ return clean;
+}
diff --git a/nextjs-pages/src/services/tests/courseDifferenceChanges.test.ts b/nextjs-pages/src/services/tests/courseDifferenceChanges.test.ts
new file mode 100644
index 0000000..adfc604
--- /dev/null
+++ b/nextjs-pages/src/services/tests/courseDifferenceChanges.test.ts
@@ -0,0 +1,587 @@
+import { describe, it, expect } from "vitest";
+import { LocalCourse } from "@/models/local/localCourse";
+import { CourseDifferences } from "../fileStorage/utils/courseDifferences";
+import { AssignmentSubmissionType } from "@/models/local/assignment/assignmentSubmissionType";
+
+describe("CourseDifferencesChangesTests", () => {
+ it("can detect new settings", () => {
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "Test Course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: "07/09/2024 23:59:00",
+ endDate: "07/09/2024 23:59:00",
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ settings: {
+ ...oldCourse.settings,
+ name: "new course name",
+ },
+ };
+
+ const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
+
+ expect(differences.modules).toHaveLength(0);
+ expect(differences.settings).not.toBeNull();
+ expect(differences.settings?.name).toBe("new course name");
+ });
+
+ it("can detect new module", () => {
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "Test Course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: "07/09/2024 23:59:00",
+ endDate: "07/09/2024 23:59:00",
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "new module",
+ assignments: [],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
+
+ expect(differences.modules).not.toBeNull();
+ expect(differences.modules).toHaveLength(1);
+ expect(differences.modules?.[0].name).toBe("new module");
+ });
+
+ it("can detect changed assignment", () => {
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "Test Course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: "07/09/2024 23:59:00",
+ endDate: "07/09/2024 23:59:00",
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "new module",
+ assignments: [
+ {
+ name: "test assignment",
+ description: "",
+ dueAt: "07/09/2024 23:59:00",
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ ],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "new module",
+ assignments: [
+ {
+ name: "test assignment",
+ description: "new description",
+ dueAt: "07/09/2024 23:59:00",
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ ],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
+
+ expect(differences.modules).not.toBeNull();
+ expect(differences.modules).toHaveLength(1);
+ expect(differences.modules?.[0].assignments?.[0].description).toBe(
+ "new description"
+ );
+ });
+
+ it("can properly ignore unchanged modules", () => {
+ const commonDate = "07/09/2024 23:59:00";
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "Test Course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: commonDate,
+ endDate: commonDate,
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "new module",
+ assignments: [
+ {
+ name: "test assignment",
+ description: "",
+ dueAt: commonDate,
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ ],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ };
+
+ const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
+
+ expect(differences.modules).toHaveLength(0);
+ });
+
+ it("only changed assignment represented", () => {
+ const commonDate = "07/09/2024 23:59:00";
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "Test Course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: commonDate,
+ endDate: commonDate,
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "new module",
+ assignments: [
+ {
+ name: "test assignment",
+ description: "",
+ dueAt: commonDate,
+ submissionTypes: [AssignmentSubmissionType.ONLINE_UPLOAD],
+ allowedFileUploadExtensions: [],
+ rubric: [{ points: 1, label: "rubric" }],
+ },
+ {
+ name: "test assignment 2",
+ description: "",
+ dueAt: commonDate,
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ ],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "new module",
+ assignments: [
+ {
+ name: "test assignment",
+ description: "",
+ dueAt: commonDate,
+ submissionTypes: [AssignmentSubmissionType.ONLINE_UPLOAD],
+ allowedFileUploadExtensions: [],
+ rubric: [{ points: 1, label: "rubric" }],
+ },
+ {
+ name: "test assignment 2 with a new name",
+ description: "",
+ dueAt: commonDate,
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ ],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
+
+ expect(differences.modules).toHaveLength(1);
+ expect(differences.modules?.[0].assignments).toHaveLength(1);
+ expect(differences.modules?.[0].assignments?.[0].name).toBe(
+ "test assignment 2 with a new name"
+ );
+ });
+
+ it("identical quizzes ignored", () => {
+ const commonDate = "07/09/2024 23:59:00";
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "Test Course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: commonDate,
+ endDate: commonDate,
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "new module",
+ assignments: [],
+ quizzes: [
+ {
+ name: "Test Quiz",
+ description: "this is my description",
+ dueAt: commonDate,
+ shuffleAnswers: true,
+ showCorrectAnswers: false,
+ oneQuestionAtATime: false,
+ allowedAttempts: -1,
+ questions: [],
+ },
+ ],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ };
+
+ const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
+
+ expect(differences.modules).toHaveLength(0);
+ });
+
+ it("can detect different quiz", () => {
+ const commonDate = "07/09/2024 23:59:00";
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "Test Course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: commonDate,
+ endDate: commonDate,
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "new module",
+ assignments: [],
+ quizzes: [
+ {
+ name: "Test Quiz",
+ description: "this is my description",
+ dueAt: commonDate,
+ shuffleAnswers: true,
+ showCorrectAnswers: false,
+ oneQuestionAtATime: false,
+ allowedAttempts: -1,
+ questions: [],
+ },
+ ],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "new module",
+ assignments: [],
+ quizzes: [
+ {
+ name: "Test Quiz",
+ description: "this is my description",
+ dueAt: commonDate,
+ shuffleAnswers: true,
+ showCorrectAnswers: false,
+ oneQuestionAtATime: false,
+ allowedAttempts: -1,
+ questions: [],
+ lockAt: "12/31/9999 23:59:59",
+ },
+ ],
+ pages: [],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
+
+ expect(differences.modules).toHaveLength(1);
+ expect(differences.modules?.[0].quizzes).toHaveLength(1);
+ expect(differences.modules?.[0].quizzes?.[0].lockAt).toBe(
+ "12/31/9999 23:59:59"
+ );
+ });
+
+ it("can detect only different quiz when other quizzes stay", () => {
+ const commonDate = "07/09/2024 23:59:00";
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "Test Course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: commonDate,
+ endDate: commonDate,
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "new module",
+ assignments: [],
+ quizzes: [
+ {
+ name: "Test Quiz",
+ description: "this is my description",
+ dueAt: commonDate,
+ shuffleAnswers: true,
+ showCorrectAnswers: false,
+ oneQuestionAtATime: false,
+ allowedAttempts: -1,
+ questions: [],
+ },
+ ],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "new module",
+ assignments: [],
+ quizzes: [
+ {
+ name: "Test Quiz",
+ description: "this is my description",
+ dueAt: commonDate,
+ shuffleAnswers: true,
+ showCorrectAnswers: false,
+ oneQuestionAtATime: false,
+ allowedAttempts: -1,
+ questions: [],
+ },
+ {
+ name: "Test Quiz 2",
+ description: "this is my description",
+ dueAt: commonDate,
+ shuffleAnswers: true,
+ showCorrectAnswers: false,
+ oneQuestionAtATime: false,
+ allowedAttempts: -1,
+ questions: [],
+ },
+ ],
+ pages: [],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
+
+ expect(differences.modules).toHaveLength(1);
+ expect(differences.modules?.[0].quizzes).toHaveLength(1);
+ expect(differences.modules?.[0].quizzes?.[0].name).toBe("Test Quiz 2");
+ });
+
+ it("same pages not detected", () => {
+ const commonDate = "07/09/2024 23:59:00";
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "Test Course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: commonDate,
+ endDate: commonDate,
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "new module",
+ assignments: [],
+ quizzes: [],
+ pages: [
+ {
+ name: "test page",
+ text: "test description",
+ dueAt: commonDate,
+ },
+ ],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ };
+
+ const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
+
+ expect(differences.modules).toHaveLength(0);
+ });
+
+ it("different page detected", () => {
+ const commonDate = "07/09/2024 23:59:00";
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "Test Course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: commonDate,
+ endDate: commonDate,
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "new module",
+ assignments: [],
+ quizzes: [],
+ pages: [
+ {
+ name: "test page",
+ text: "test description",
+ dueAt: commonDate,
+ },
+ ],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "new module",
+ assignments: [],
+ quizzes: [],
+ pages: [
+ {
+ name: "test page",
+ text: "test description changed",
+ dueAt: commonDate,
+ },
+ ],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
+
+ expect(differences.modules).toHaveLength(1);
+ expect(differences.modules?.[0].pages).toHaveLength(1);
+ expect(differences.modules?.[0].pages?.[0].text).toBe(
+ "test description changed"
+ );
+ });
+
+ it("different page detected but not same page", () => {
+ const commonDate = "07/09/2024 23:59:00";
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "Test Course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: commonDate,
+ endDate: commonDate,
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "new module",
+ assignments: [],
+ quizzes: [],
+ pages: [
+ {
+ name: "test page",
+ text: "test description",
+ dueAt: commonDate,
+ },
+ ],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "new module",
+ assignments: [],
+ quizzes: [],
+ pages: [
+ {
+ name: "test page",
+ text: "test description",
+ dueAt: commonDate,
+ },
+ {
+ name: "test page 2",
+ text: "test description",
+ dueAt: commonDate,
+ },
+ ],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
+
+ expect(differences.modules).toHaveLength(1);
+ expect(differences.modules?.[0].pages).toHaveLength(1);
+ expect(differences.modules?.[0].pages?.[0].name).toBe("test page 2");
+ });
+});
diff --git a/nextjs-pages/src/services/tests/courseDifferencesDeletions.test.ts b/nextjs-pages/src/services/tests/courseDifferencesDeletions.test.ts
new file mode 100644
index 0000000..d816fbf
--- /dev/null
+++ b/nextjs-pages/src/services/tests/courseDifferencesDeletions.test.ts
@@ -0,0 +1,451 @@
+import { describe, it, expect } from "vitest";
+import { LocalCourse } from "@/models/local/localCourse";
+import { CourseDifferences } from "../fileStorage/utils/courseDifferences";
+
+describe("CourseDifferencesDeletionsTests", () => {
+ it("same module does not get deleted", () => {
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "test course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: "07/09/2024 23:59:00",
+ endDate: "07/09/2024 23:59:00",
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "test module",
+ assignments: [],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "test module",
+ assignments: [],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getDeletedChanges(
+ newCourse,
+ oldCourse
+ );
+
+ expect(differences.namesOfModulesToDeleteCompletely).toHaveLength(0);
+ });
+
+ it("changed module - old one gets deleted", () => {
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "test course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: "07/09/2024 23:59:00",
+ endDate: "07/09/2024 23:59:00",
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "test module",
+ assignments: [],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "test module 2",
+ assignments: [],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getDeletedChanges(
+ newCourse,
+ oldCourse
+ );
+
+ expect(differences.namesOfModulesToDeleteCompletely).toHaveLength(1);
+ expect(differences.namesOfModulesToDeleteCompletely[0]).toBe("test module");
+ });
+
+ it("new assignment name gets deleted", () => {
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "test course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: "07/09/2024 23:59:00",
+ endDate: "07/09/2024 23:59:00",
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "test module",
+ assignments: [
+ {
+ name: "test assignment",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ ],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "test module",
+ assignments: [
+ {
+ name: "test assignment changed name",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ ],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getDeletedChanges(
+ newCourse,
+ oldCourse
+ );
+
+ expect(differences.namesOfModulesToDeleteCompletely).toHaveLength(0);
+ expect(differences.deleteContentsOfModule).toHaveLength(1);
+ expect(differences.deleteContentsOfModule[0].assignments).toHaveLength(1);
+ expect(differences.deleteContentsOfModule[0].assignments[0].name).toBe(
+ "test assignment"
+ );
+ });
+
+ it("assignments with changed descriptions do not get deleted", () => {
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "test course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: "07/09/2024 23:59:00",
+ endDate: "07/09/2024 23:59:00",
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "test module",
+ assignments: [
+ {
+ name: "test assignment",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ ],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "test module",
+ assignments: [
+ {
+ name: "test assignment",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ ],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getDeletedChanges(
+ newCourse,
+ oldCourse
+ );
+
+ expect(differences.deleteContentsOfModule).toHaveLength(0);
+ });
+
+ it("can detect changed and unchanged assignments", () => {
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "test course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: "07/09/2024 23:59:00",
+ endDate: "07/09/2024 23:59:00",
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "test module",
+ assignments: [
+ {
+ name: "test assignment",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ {
+ name: "test assignment 2",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ ],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "test module",
+ assignments: [
+ {
+ name: "test assignment",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ {
+ name: "test assignment 2 changed",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ submissionTypes: [],
+ allowedFileUploadExtensions: [],
+ rubric: [],
+ },
+ ],
+ quizzes: [],
+ pages: [],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getDeletedChanges(
+ newCourse,
+ oldCourse
+ );
+
+ expect(differences.deleteContentsOfModule).toHaveLength(1);
+ expect(differences.deleteContentsOfModule[0].assignments).toHaveLength(1);
+ expect(differences.deleteContentsOfModule[0].assignments[0].name).toBe(
+ "test assignment 2"
+ );
+ });
+
+ it("changed quizzes get deleted", () => {
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "test course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: "07/09/2024 23:59:00",
+ endDate: "07/09/2024 23:59:00",
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "test module",
+ assignments: [],
+ quizzes: [
+ {
+ name: "Test Quiz",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ shuffleAnswers: false,
+ showCorrectAnswers: false,
+ oneQuestionAtATime: false,
+ allowedAttempts: 0,
+ questions: [],
+ },
+ {
+ name: "Test Quiz 2",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ shuffleAnswers: false,
+ showCorrectAnswers: false,
+ oneQuestionAtATime: false,
+ allowedAttempts: 0,
+ questions: [],
+ },
+ ],
+ pages: [],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "test module",
+ assignments: [],
+ quizzes: [
+ {
+ name: "Test Quiz",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ shuffleAnswers: false,
+ showCorrectAnswers: false,
+ oneQuestionAtATime: false,
+ allowedAttempts: 0,
+ questions: [],
+ },
+ {
+ name: "Test Quiz 3",
+ description: "test description",
+ dueAt: "07/09/2024 23:59:00",
+ shuffleAnswers: false,
+ showCorrectAnswers: false,
+ oneQuestionAtATime: false,
+ allowedAttempts: 0,
+ questions: [],
+ },
+ ],
+ pages: [],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getDeletedChanges(
+ newCourse,
+ oldCourse
+ );
+
+ expect(differences.deleteContentsOfModule).toHaveLength(1);
+ expect(differences.deleteContentsOfModule[0].quizzes).toHaveLength(1);
+ expect(differences.deleteContentsOfModule[0].quizzes[0].name).toBe(
+ "Test Quiz 2"
+ );
+ });
+
+ it("changed pages get deleted", () => {
+ const oldCourse: LocalCourse = {
+ settings: {
+ name: "test course",
+ assignmentGroups: [],
+ daysOfWeek: [],
+ startDate: "07/09/2024 23:59:00",
+ endDate: "07/09/2024 23:59:00",
+ defaultDueTime: {
+ hour: 23,
+ minute: 59,
+ },
+ },
+ modules: [
+ {
+ name: "test module",
+ assignments: [],
+ quizzes: [],
+ pages: [
+ {
+ name: "Test Page",
+ text: "test contents",
+ dueAt: "07/09/2024 23:59:00",
+ },
+ {
+ name: "Test Page 2",
+ text: "test contents",
+ dueAt: "07/09/2024 23:59:00",
+ },
+ ],
+ },
+ ],
+ };
+ const newCourse: LocalCourse = {
+ ...oldCourse,
+ modules: [
+ {
+ name: "test module",
+ assignments: [],
+ quizzes: [],
+ pages: [
+ {
+ name: "Test Page",
+ text: "test contents",
+ dueAt: "07/09/2024 23:59:00",
+ },
+ {
+ name: "Test Page 3",
+ text: "test contents",
+ dueAt: "07/09/2024 23:59:00",
+ },
+ ],
+ },
+ ],
+ };
+
+ const differences = CourseDifferences.getDeletedChanges(
+ newCourse,
+ oldCourse
+ );
+
+ expect(differences.deleteContentsOfModule).toHaveLength(1);
+ expect(differences.deleteContentsOfModule[0].pages).toHaveLength(1);
+ expect(differences.deleteContentsOfModule[0].pages[0].name).toBe(
+ "Test Page 2"
+ );
+ });
+});
diff --git a/nextjs-pages/src/services/tests/fileStorage.test.ts b/nextjs-pages/src/services/tests/fileStorage.test.ts
new file mode 100644
index 0000000..1143b16
--- /dev/null
+++ b/nextjs-pages/src/services/tests/fileStorage.test.ts
@@ -0,0 +1,293 @@
+// import path from "path";
+// import { describe, it, expect, beforeEach } from "vitest";
+// import fs from "fs";
+// import { DayOfWeek, LocalCourse } from "@/models/local/localCourse";
+// import { AssignmentSubmissionType } from "@/models/local/assignmnet/assignmentSubmissionType";
+// import { QuestionType } from "@/models/local/quiz/localQuizQuestion";
+// import { fileStorageService } from "../fileStorage/fileStorageService";
+
+// describe("FileStorageTests", () => {
+// beforeEach(() => {
+// const storageDirectory = process.env.STORAGE_DIRECTORY ?? "/tmp/canvasManagerTests";
+// if (fs.existsSync(storageDirectory)) {
+// fs.rmdirSync(storageDirectory, { recursive: true });
+// }
+// fs.mkdirSync(storageDirectory, { recursive: true });
+// });
+
+// it("empty course can be saved and loaded", async () => {
+// const testCourse: LocalCourse = {
+// settings: {
+// name: "test empty course",
+// assignmentGroups: [],
+// daysOfWeek: [],
+// startDate: "07/09/2024 23:59:00",
+// endDate: "07/09/2024 23:59:00",
+// defaultDueTime: { hour: 1, minute: 59 },
+// },
+// modules: [],
+// };
+
+// await fileStorageService.saveCourseAsync(testCourse);
+
+// const loadedCourses = await fileStorageService.loadSavedCourses();
+// const loadedCourse = loadedCourses.find(
+// (c) => c.settings.name === testCourse.settings.name
+// );
+
+// expect(loadedCourse).toEqual(testCourse);
+// });
+
+// it("course settings can be saved and loaded", async () => {
+// const testCourse: LocalCourse = {
+// settings: {
+// assignmentGroups: [],
+// name: "Test Course with settings",
+// daysOfWeek: [DayOfWeek.Monday, DayOfWeek.Wednesday],
+// startDate: "07/09/2024 23:59:00",
+// endDate: "07/09/2024 23:59:00",
+// defaultDueTime: { hour: 1, minute: 59 },
+// },
+// modules: [],
+// };
+
+// await fileStorageService.saveCourseAsync(testCourse);
+
+// const loadedCourses = await fileStorageService.loadSavedCourses();
+// const loadedCourse = loadedCourses.find(
+// (c) => c.settings.name === testCourse.settings.name
+// );
+
+// expect(loadedCourse?.settings).toEqual(testCourse.settings);
+// });
+
+// it("empty course modules can be saved and loaded", async () => {
+// const testCourse: LocalCourse = {
+// settings: {
+// name: "Test Course with modules",
+// assignmentGroups: [],
+// daysOfWeek: [],
+// startDate: "07/09/2024 23:59:00",
+// endDate: "07/09/2024 23:59:00",
+// defaultDueTime: { hour: 1, minute: 59 },
+// },
+// modules: [
+// {
+// name: "test module 1",
+// assignments: [],
+// quizzes: [],
+// pages: [],
+// },
+// ],
+// };
+
+// await fileStorageService.saveCourseAsync(testCourse);
+
+// const loadedCourses = await fileStorageService.loadSavedCourses();
+// const loadedCourse = loadedCourses.find(
+// (c) => c.settings.name === testCourse.settings.name
+// );
+
+// expect(loadedCourse?.modules).toEqual(testCourse.modules);
+// });
+
+// it("course modules with assignments can be saved and loaded", async () => {
+// const testCourse: LocalCourse = {
+// settings: {
+// name: "Test Course with modules and assignments",
+// assignmentGroups: [],
+// daysOfWeek: [],
+// startDate: "07/09/2024 23:59:00",
+// endDate: "07/09/2024 23:59:00",
+// defaultDueTime: { hour: 1, minute: 59 },
+// },
+// modules: [
+// {
+// name: "test module 1 with assignments",
+// assignments: [
+// {
+// name: "test assignment",
+// description: "here is the description",
+// dueAt: "07/09/2024 23:59:00",
+// lockAt: "07/09/2024 23:59:00",
+// submissionTypes: [AssignmentSubmissionType.ONLINE_UPLOAD],
+// localAssignmentGroupName: "Final Project",
+// rubric: [
+// { points: 4, label: "do task 1" },
+// { points: 2, label: "do task 2" },
+// ],
+// allowedFileUploadExtensions: [],
+// },
+// ],
+// quizzes: [],
+// pages: [],
+// },
+// ],
+// };
+
+// await fileStorageService.saveCourseAsync(testCourse);
+
+// const loadedCourses = await fileStorageService.loadSavedCourses();
+// const loadedCourse = loadedCourses.find(
+// (c) => c.settings.name === testCourse.settings.name
+// );
+
+// expect(loadedCourse?.modules[0].assignments).toEqual(
+// testCourse.modules[0].assignments
+// );
+// });
+
+// it("course modules with quizzes can be saved and loaded", async () => {
+// const testCourse: LocalCourse = {
+// settings: {
+// name: "Test Course with modules and quiz",
+// assignmentGroups: [],
+// daysOfWeek: [],
+// startDate: "07/09/2024 23:59:00",
+// endDate: "07/09/2024 23:59:00",
+// defaultDueTime: { hour: 1, minute: 59 },
+// },
+// modules: [
+// {
+// name: "test module 1 with quiz",
+// assignments: [],
+// quizzes: [
+// {
+// name: "Test Quiz",
+// description: "quiz description",
+// lockAt: "07/09/2024 12:05:00",
+// dueAt: "07/09/2024 12:05:00",
+// shuffleAnswers: true,
+// oneQuestionAtATime: true,
+// localAssignmentGroupName: "Assignments",
+// questions: [
+// {
+// text: "test essay",
+// questionType: QuestionType.ESSAY,
+// points: 1,
+// answers: [],
+// matchDistractors: [],
+// },
+// ],
+// showCorrectAnswers: false,
+// allowedAttempts: 0,
+// },
+// ],
+// pages: [],
+// },
+// ],
+// };
+
+// await fileStorageService.saveCourseAsync(testCourse);
+
+// const loadedCourses = await fileStorageService.loadSavedCourses();
+// const loadedCourse = loadedCourses.find(
+// (c) => c.settings.name === testCourse.settings.name
+// );
+
+// expect(loadedCourse?.modules[0].quizzes).toEqual(
+// testCourse.modules[0].quizzes
+// );
+// });
+
+// it("markdown storage fully populated does not lose data", async () => {
+// const testCourse: LocalCourse = {
+// settings: {
+// name: "Test Course with lots of data",
+// assignmentGroups: [],
+// daysOfWeek: [DayOfWeek.Monday, DayOfWeek.Wednesday],
+// startDate: "07/09/2024 23:59:00",
+// endDate: "07/09/2024 23:59:00",
+// defaultDueTime: { hour: 1, minute: 59 },
+// },
+// modules: [
+// {
+// name: "new test module",
+// assignments: [
+// {
+// name: "test assignment",
+// description: "here is the description",
+// dueAt: "07/09/2024 23:59:00",
+// lockAt: "07/09/2024 23:59:00",
+// submissionTypes: [AssignmentSubmissionType.ONLINE_UPLOAD],
+// localAssignmentGroupName: "Final Project",
+// rubric: [
+// { points: 4, label: "do task 1" },
+// { points: 2, label: "do task 2" },
+// ],
+// allowedFileUploadExtensions: [],
+// },
+// ],
+// quizzes: [
+// {
+// name: "Test Quiz",
+// description: "quiz description",
+// lockAt: "07/09/2024 23:59:00",
+// dueAt: "07/09/2024 23:59:00",
+// shuffleAnswers: true,
+// oneQuestionAtATime: false,
+// localAssignmentGroupName: "someId",
+// allowedAttempts: -1,
+// questions: [
+// {
+// text: "test short answer",
+// questionType: QuestionType.SHORT_ANSWER,
+// points: 1,
+// answers: [],
+// matchDistractors: [],
+// },
+// ],
+// showCorrectAnswers: false,
+// },
+// ],
+// pages: [],
+// },
+// ],
+// };
+
+// await fileStorageService.saveCourseAsync(testCourse);
+
+// const loadedCourses = await fileStorageService.loadSavedCourses();
+// const loadedCourse = loadedCourses.find(
+// (c) => c.settings.name === testCourse.settings.name
+// );
+
+// expect(loadedCourse).toEqual(testCourse);
+// });
+
+// it("markdown storage can persist pages", async () => {
+// const testCourse: LocalCourse = {
+// settings: {
+// name: "Test Course with page",
+// assignmentGroups: [],
+// daysOfWeek: [DayOfWeek.Monday, DayOfWeek.Wednesday],
+// startDate: "07/09/2024 23:59:00",
+// endDate: "07/09/2024 23:59:00",
+// defaultDueTime: { hour: 1, minute: 59 },
+// },
+// modules: [
+// {
+// name: "page test module",
+// assignments: [],
+// quizzes: [],
+// pages: [
+// {
+// name: "test page persistence",
+// dueAt: "07/09/2024 23:59:00",
+// text: "this is some\n## markdown\n",
+// },
+// ],
+// },
+// ],
+// };
+
+// await fileStorageService.saveCourseAsync(testCourse);
+
+// const loadedCourses = await fileStorageService.loadSavedCourses();
+// const loadedCourse = loadedCourses.find(
+// (c) => c.settings.name === testCourse.settings.name
+// );
+
+// expect(loadedCourse).toEqual(testCourse);
+// });
+// });
diff --git a/nextjs-pages/src/services/utils/queryClient.tsx b/nextjs-pages/src/services/utils/queryClient.tsx
new file mode 100644
index 0000000..269cf20
--- /dev/null
+++ b/nextjs-pages/src/services/utils/queryClient.tsx
@@ -0,0 +1,145 @@
+import toast, { ErrorIcon, CheckmarkIcon } from "react-hot-toast";
+import { ReactNode } from "react";
+import { MutationCache, QueryCache, QueryClient } from "@tanstack/react-query";
+
+const addErrorAsToast = async (error: any) => {
+ console.error("error from toast", error);
+ const message = getErrorMessage(error);
+
+ toast(
+ (t: any) => (
+
+
+
+
+
+
+
+
+
+
+
+
+
{children}
+
+
+
+
+
+
+
+
{message}
+
+
+
+
{courses.map((c) => (
-
+
{c}{" "}
))}
diff --git a/nextjs/src/app/course/[courseName]/calendar/DayItemsInModule.tsx b/nextjs/src/app/course/[courseName]/calendar/DayItemsInModule.tsx
index 569f99d..b3cc793 100644
--- a/nextjs/src/app/course/[courseName]/calendar/DayItemsInModule.tsx
+++ b/nextjs/src/app/course/[courseName]/calendar/DayItemsInModule.tsx
@@ -81,7 +81,7 @@ function Pages({ moduleName, day }: { moduleName: string; day: string }) {
encodeURIComponent(moduleName) +
"/page/" +
encodeURIComponent(p.name)
- }
+ } shallow={true}
>
{p.name}
@@ -142,7 +142,7 @@ function Quizzes({ moduleName, day }: { moduleName: string; day: string }) {
encodeURIComponent(moduleName) +
"/quiz/" +
encodeURIComponent(q.name)
- }
+ } shallow={true}
>
{q.name}
@@ -204,7 +204,7 @@ function Assignments({ moduleName, day }: { moduleName: string; day: string }) {
encodeURIComponent(moduleName) +
"/assignment/" +
encodeURIComponent(a.name)
- }
+ } shallow={true}
>
{a.name}
diff --git a/nextjs/src/app/providersQueryClientUtils.ts b/nextjs/src/app/providersQueryClientUtils.ts
index 904a2ec..f141e37 100644
--- a/nextjs/src/app/providersQueryClientUtils.ts
+++ b/nextjs/src/app/providersQueryClientUtils.ts
@@ -7,6 +7,8 @@ export function makeQueryClient() {
// With SSR, we usually want to set some default staleTime
// above 0 to avoid refetching immediately on the client
staleTime: 60_000,
+ refetchOnWindowFocus: false,
+ retry: 0,
},
},
});