From d5a40e52d9abd51f6c04271e4d4e06572b0f5cb8 Mon Sep 17 00:00:00 2001 From: Alex Mickelson Date: Wed, 23 Jul 2025 09:29:19 -0600 Subject: [PATCH] fixing lint config --- eslint.config.mjs | 8 +++----- src/app/addCourse/AddCourseToGlobalSettingsForm.tsx | 10 +--------- .../addCourse/AddExistingCourseToGlobalSettings.tsx | 2 +- src/app/api/mcp/[transport]/route.ts | 1 - src/hooks/localCourse/localCoursesHooks.ts | 1 - src/models/local/tests/pageMarkdown.test.ts | 2 +- .../tests/quizMarkdown/matchingAnswerErrors.test.ts | 2 +- .../local/tests/quizMarkdown/matchingAnswers.test.ts | 6 +++--- .../local/tests/quizMarkdown/multipleAnswers.test.ts | 8 ++++---- .../local/tests/quizMarkdown/multipleChoice.test.ts | 8 ++++---- .../tests/quizMarkdown/quizDeterministicChecks.test.ts | 6 +++--- .../local/tests/quizMarkdown/quizMarkdown.test.ts | 8 ++++---- src/models/local/tests/quizMarkdown/testAnswer.test.ts | 6 +++--- src/models/local/tests/testSemesterImport.test.ts | 4 ++-- .../fileStorage/globalSettingsFileStorageService.ts | 1 + src/services/fileStorage/moduleFileStorageService.ts | 1 - src/services/fileStorage/utils/fileSystemUtils.ts | 1 - src/services/htmlMarkdownUtils.ts | 2 +- src/services/serverFunctions/router/settingsRouter.ts | 3 --- 19 files changed, 32 insertions(+), 48 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 69097f5..04ae4ce 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -10,13 +10,11 @@ const compat = new FlatCompat({ }); const eslintConfig = [ + { + ignores: ["**/node_modules/**", "**/.next/**", "storage/**"], + }, ...compat.config({ extends: ["next/core-web-vitals", "next/typescript", "prettier"], - ignores: [ - "**/node_modules/**", - "**/.next/**", - "storage/**" - ], rules: { "react-refresh/only-export-components": "off", // Disabled the rule "@typescript-eslint/no-unused-vars": [ diff --git a/src/app/addCourse/AddCourseToGlobalSettingsForm.tsx b/src/app/addCourse/AddCourseToGlobalSettingsForm.tsx index c8c4d11..f637774 100644 --- a/src/app/addCourse/AddCourseToGlobalSettingsForm.tsx +++ b/src/app/addCourse/AddCourseToGlobalSettingsForm.tsx @@ -8,18 +8,10 @@ import { Spinner } from "@/components/Spinner"; import { SuspenseAndErrorHandling } from "@/components/SuspenseAndErrorHandling"; import { useCourseListInTermQuery } from "@/hooks/canvas/canvasCourseHooks"; import { useCanvasTermsQuery } from "@/hooks/canvas/canvasHooks"; -import { - useGlobalSettingsQuery, - useUpdateGlobalSettingsMutation, -} from "@/hooks/localCourse/globalSettingsHooks"; import { useCreateLocalCourseMutation, useLocalCoursesSettingsQuery, } from "@/hooks/localCourse/localCoursesHooks"; -import { - useDirectoryIsCourseQuery, - useEmptyDirectoriesQuery, -} from "@/hooks/localCourse/storageDirectoryHooks"; import { CanvasCourseModel } from "@/models/canvas/courses/canvasCourseModel"; import { CanvasEnrollmentTermModel } from "@/models/canvas/enrollmentTerms/canvasEnrollmentTermModel"; import { AssignmentSubmissionType } from "@/features/local/assignments/models/assignmentSubmissionType"; @@ -165,7 +157,7 @@ function OtherSettings({ selectedTerm, selectedCanvasCourse, setSelectedCanvasCourse, - selectedDirectory, + selectedDirectory: _, setSelectedDirectory, selectedDaysOfWeek, setSelectedDaysOfWeek, diff --git a/src/app/addCourse/AddExistingCourseToGlobalSettings.tsx b/src/app/addCourse/AddExistingCourseToGlobalSettings.tsx index f0cb99e..68047fa 100644 --- a/src/app/addCourse/AddExistingCourseToGlobalSettings.tsx +++ b/src/app/addCourse/AddExistingCourseToGlobalSettings.tsx @@ -31,7 +31,7 @@ export const AddExistingCourseToGlobalSettings = () => { ); }; -const ExistingCourseForm: FC<{}> = () => { +const ExistingCourseForm: FC = () => { const [path, setPath] = useState("./"); const [name, setName] = useState(""); const nameInputRef = useRef(null); diff --git a/src/app/api/mcp/[transport]/route.ts b/src/app/api/mcp/[transport]/route.ts index 718c878..a6f9809 100644 --- a/src/app/api/mcp/[transport]/route.ts +++ b/src/app/api/mcp/[transport]/route.ts @@ -1,7 +1,6 @@ import { assignmentMarkdownSerializer } from "@/features/local/assignments/models/utils/assignmentMarkdownSerializer"; import { groupByStartDate } from "@/models/local/utils/timeUtils"; import { fileStorageService } from "@/services/fileStorage/fileStorageService"; -import { ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js"; import { createMcpHandler } from "mcp-handler"; import { z } from "zod"; import { githubClassroomUrlPrompt } from "./github-classroom-prompt"; diff --git a/src/hooks/localCourse/localCoursesHooks.ts b/src/hooks/localCourse/localCoursesHooks.ts index 1dfc039..2d0dae5 100644 --- a/src/hooks/localCourse/localCoursesHooks.ts +++ b/src/hooks/localCourse/localCoursesHooks.ts @@ -6,7 +6,6 @@ import { useMutation, useQueryClient, } from "@tanstack/react-query"; -import { useGlobalSettingsQuery } from "./globalSettingsHooks"; export const useLocalCoursesSettingsQuery = () => { const trpc = useTRPC(); diff --git a/src/models/local/tests/pageMarkdown.test.ts b/src/models/local/tests/pageMarkdown.test.ts index f15a70f..04b472b 100644 --- a/src/models/local/tests/pageMarkdown.test.ts +++ b/src/models/local/tests/pageMarkdown.test.ts @@ -1,5 +1,5 @@ +import { LocalCoursePage, localPageMarkdownUtils } from "@/features/local/pages/localCoursePageModels"; import { describe, it, expect } from "vitest"; -import { LocalCoursePage, localPageMarkdownUtils } from "../page/localCoursePage"; describe("PageMarkdownTests", () => { it("can parse page", () => { diff --git a/src/models/local/tests/quizMarkdown/matchingAnswerErrors.test.ts b/src/models/local/tests/quizMarkdown/matchingAnswerErrors.test.ts index 02aa0de..65f030a 100644 --- a/src/models/local/tests/quizMarkdown/matchingAnswerErrors.test.ts +++ b/src/models/local/tests/quizMarkdown/matchingAnswerErrors.test.ts @@ -1,5 +1,5 @@ +import { quizMarkdownUtils } from "@/features/local/quizzes/models/utils/quizMarkdownUtils"; import { describe, it, expect } from "vitest"; -import { quizMarkdownUtils } from "@/models/local/models/utils/quizMarkdownUtils"; describe("Matching Answer Error Messages", () => { it("can parse matching question", () => { diff --git a/src/models/local/tests/quizMarkdown/matchingAnswers.test.ts b/src/models/local/tests/quizMarkdown/matchingAnswers.test.ts index 0e6a253..25a0dfa 100644 --- a/src/models/local/tests/quizMarkdown/matchingAnswers.test.ts +++ b/src/models/local/tests/quizMarkdown/matchingAnswers.test.ts @@ -1,7 +1,7 @@ +import { QuestionType } from "@/features/local/quizzes/models/localQuizQuestion"; +import { quizMarkdownUtils } from "@/features/local/quizzes/models/utils/quizMarkdownUtils"; +import { quizQuestionMarkdownUtils } from "@/features/local/quizzes/models/utils/quizQuestionMarkdownUtils"; import { describe, it, expect } from "vitest"; -import { QuestionType } from "../../models/localQuizQuestion"; -import { quizMarkdownUtils } from "@/models/local/models/utils/quizMarkdownUtils"; -import { quizQuestionMarkdownUtils } from "@/models/local/models/utils/quizQuestionMarkdownUtils"; describe("MatchingTests", () => { it("can parse matching question", () => { diff --git a/src/models/local/tests/quizMarkdown/multipleAnswers.test.ts b/src/models/local/tests/quizMarkdown/multipleAnswers.test.ts index d7334ed..e6c8cb8 100644 --- a/src/models/local/tests/quizMarkdown/multipleAnswers.test.ts +++ b/src/models/local/tests/quizMarkdown/multipleAnswers.test.ts @@ -1,8 +1,8 @@ +import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz"; +import { QuestionType } from "@/features/local/quizzes/models/localQuizQuestion"; +import { quizMarkdownUtils } from "@/features/local/quizzes/models/utils/quizMarkdownUtils"; +import { quizQuestionMarkdownUtils } from "@/features/local/quizzes/models/utils/quizQuestionMarkdownUtils"; import { describe, it, expect } from "vitest"; -import { LocalQuiz } from "../../models/localQuiz"; -import { QuestionType } from "../../models/localQuizQuestion"; -import { quizMarkdownUtils } from "@/models/local/models/utils/quizMarkdownUtils"; -import { quizQuestionMarkdownUtils } from "@/models/local/models/utils/quizQuestionMarkdownUtils"; describe("MultipleAnswersTests", () => { it("quiz markdown includes multiple answer question", () => { diff --git a/src/models/local/tests/quizMarkdown/multipleChoice.test.ts b/src/models/local/tests/quizMarkdown/multipleChoice.test.ts index 2aa5315..8533bf5 100644 --- a/src/models/local/tests/quizMarkdown/multipleChoice.test.ts +++ b/src/models/local/tests/quizMarkdown/multipleChoice.test.ts @@ -1,8 +1,8 @@ +import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz"; +import { QuestionType } from "@/features/local/quizzes/models/localQuizQuestion"; +import { quizMarkdownUtils } from "@/features/local/quizzes/models/utils/quizMarkdownUtils"; +import { quizQuestionMarkdownUtils } from "@/features/local/quizzes/models/utils/quizQuestionMarkdownUtils"; import { describe, it, expect } from "vitest"; -import { LocalQuiz } from "../../models/localQuiz"; -import { QuestionType } from "../../models/localQuizQuestion"; -import { quizMarkdownUtils } from "@/models/local/models/utils/quizMarkdownUtils"; -import { quizQuestionMarkdownUtils } from "@/models/local/models/utils/quizQuestionMarkdownUtils"; describe("MultipleChoiceTests", () => { it("quiz markdown includes multiple choice question", () => { diff --git a/src/models/local/tests/quizMarkdown/quizDeterministicChecks.test.ts b/src/models/local/tests/quizMarkdown/quizDeterministicChecks.test.ts index 538859b..227d2cc 100644 --- a/src/models/local/tests/quizMarkdown/quizDeterministicChecks.test.ts +++ b/src/models/local/tests/quizMarkdown/quizDeterministicChecks.test.ts @@ -1,7 +1,7 @@ +import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz"; +import { QuestionType } from "@/features/local/quizzes/models/localQuizQuestion"; +import { quizMarkdownUtils } from "@/features/local/quizzes/models/utils/quizMarkdownUtils"; import { describe, it, expect } from "vitest"; -import { LocalQuiz } from "../../models/localQuiz"; -import { quizMarkdownUtils } from "../../models/utils/quizMarkdownUtils"; -import { QuestionType } from "@/models/local/models/localQuizQuestion"; // Test suite for deterministic checks on LocalQuiz describe("QuizDeterministicChecks", () => { diff --git a/src/models/local/tests/quizMarkdown/quizMarkdown.test.ts b/src/models/local/tests/quizMarkdown/quizMarkdown.test.ts index 66832b6..529fc2d 100644 --- a/src/models/local/tests/quizMarkdown/quizMarkdown.test.ts +++ b/src/models/local/tests/quizMarkdown/quizMarkdown.test.ts @@ -1,9 +1,9 @@ import { describe, it, expect } from "vitest"; -import { LocalQuiz } from "../../models/localQuiz"; -import { quizMarkdownUtils } from "../../models/utils/quizMarkdownUtils"; -import { QuestionType } from "@/models/local/models/localQuizQuestion"; -import { quizQuestionMarkdownUtils } from "@/models/local/models/utils/quizQuestionMarkdownUtils"; import { markdownToHtmlNoImages } from "@/services/htmlMarkdownUtils"; +import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz"; +import { QuestionType } from "@/features/local/quizzes/models/localQuizQuestion"; +import { quizMarkdownUtils } from "@/features/local/quizzes/models/utils/quizMarkdownUtils"; +import { quizQuestionMarkdownUtils } from "@/features/local/quizzes/models/utils/quizQuestionMarkdownUtils"; // Test suite for QuizMarkdown describe("QuizMarkdownTests", () => { diff --git a/src/models/local/tests/quizMarkdown/testAnswer.test.ts b/src/models/local/tests/quizMarkdown/testAnswer.test.ts index 1831eb4..8bbb901 100644 --- a/src/models/local/tests/quizMarkdown/testAnswer.test.ts +++ b/src/models/local/tests/quizMarkdown/testAnswer.test.ts @@ -1,10 +1,10 @@ +import { QuestionType, zodQuestionType } from "@/features/local/quizzes/models/localQuizQuestion"; +import { quizMarkdownUtils } from "@/features/local/quizzes/models/utils/quizMarkdownUtils"; +import { quizQuestionMarkdownUtils } from "@/features/local/quizzes/models/utils/quizQuestionMarkdownUtils"; import { getAnswers, getQuestionType, } from "@/services/canvas/canvasQuizService"; -import { QuestionType, zodQuestionType } from "../../models/localQuizQuestion"; -import { quizMarkdownUtils } from "../../models/utils/quizMarkdownUtils"; -import { quizQuestionMarkdownUtils } from "../../models/utils/quizQuestionMarkdownUtils"; import { describe, it, expect } from "vitest"; describe("TextAnswerTests", () => { diff --git a/src/models/local/tests/testSemesterImport.test.ts b/src/models/local/tests/testSemesterImport.test.ts index 076ab4a..7d9240f 100644 --- a/src/models/local/tests/testSemesterImport.test.ts +++ b/src/models/local/tests/testSemesterImport.test.ts @@ -6,9 +6,9 @@ import { prepPageForNewSemester, prepQuizForNewSemester, } from "../utils/semesterTransferUtils"; -import { LocalQuiz } from "../models/localQuiz"; -import { LocalCoursePage } from "../page/localCoursePage"; import { Lecture } from "../lecture"; +import { LocalCoursePage } from "@/features/local/pages/localCoursePageModels"; +import { LocalQuiz } from "@/features/local/quizzes/models/localQuiz"; describe("can take an assignment and template it for a new semester", () => { it("can sanitize assignment github classroom repo url", () => { diff --git a/src/services/fileStorage/globalSettingsFileStorageService.ts b/src/services/fileStorage/globalSettingsFileStorageService.ts index 4680ae9..f69f9b5 100644 --- a/src/services/fileStorage/globalSettingsFileStorageService.ts +++ b/src/services/fileStorage/globalSettingsFileStorageService.ts @@ -17,6 +17,7 @@ export const getGlobalSettings = async (): Promise => { try { await fs.access(SETTINGS_FILE_PATH); } catch (err) { + console.log(err); throw new Error( `Global Settings file does not exist at path: ${SETTINGS_FILE_PATH}` ); diff --git a/src/services/fileStorage/moduleFileStorageService.ts b/src/services/fileStorage/moduleFileStorageService.ts index 060c6f9..7a882bd 100644 --- a/src/services/fileStorage/moduleFileStorageService.ts +++ b/src/services/fileStorage/moduleFileStorageService.ts @@ -1,5 +1,4 @@ import { promises as fs } from "fs"; -import path from "path"; import { lectureFolderName } from "./utils/lectureUtils"; import { getCoursePathByName } from "./globalSettingsFileStorageService"; diff --git a/src/services/fileStorage/utils/fileSystemUtils.ts b/src/services/fileStorage/utils/fileSystemUtils.ts index 6bac2f3..aa6fbb0 100644 --- a/src/services/fileStorage/utils/fileSystemUtils.ts +++ b/src/services/fileStorage/utils/fileSystemUtils.ts @@ -1,5 +1,4 @@ import { promises as fs } from "fs"; -import path from "path"; import { getGlobalSettings } from "../globalSettingsFileStorageService"; export const directoryOrFileExists = async ( diff --git a/src/services/htmlMarkdownUtils.ts b/src/services/htmlMarkdownUtils.ts index d29d7ad..55f43ed 100644 --- a/src/services/htmlMarkdownUtils.ts +++ b/src/services/htmlMarkdownUtils.ts @@ -1,5 +1,5 @@ "use client"; -import { marked, MarkedExtension } from "marked"; +import { marked } from "marked"; import DOMPurify from "isomorphic-dompurify"; import { LocalCourseSettings } from "@/models/local/localCourseSettings"; import markedKatex from "marked-katex-extension"; diff --git a/src/services/serverFunctions/router/settingsRouter.ts b/src/services/serverFunctions/router/settingsRouter.ts index 39f4096..b04ee56 100644 --- a/src/services/serverFunctions/router/settingsRouter.ts +++ b/src/services/serverFunctions/router/settingsRouter.ts @@ -17,9 +17,6 @@ import { getGlobalSettings, updateGlobalSettings, } from "@/services/fileStorage/globalSettingsFileStorageService"; -import { promises as fs } from "fs"; -import { basePath } from "@/services/fileStorage/utils/fileSystemUtils"; -import path from "path"; export const settingsRouter = router({ allCoursesSettings: publicProcedure.query(async () => {