more refactor

src/app/api/trpc/[trpc]/route.ts

@@ -1,5 +1,5 @@
 import { createTrpcContext } from "@/services/serverFunctions/context";
-import { trpcAppRouter } from "@/services/serverFunctions/router/appRouter";
+import { trpcAppRouter } from "@/services/serverFunctions/appRouter";
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 
 const handler = async (request: Request) => {

src/app/course/[courseName]/lecture/[lectureDay]/EditLecture.tsx

@@ -7,7 +7,7 @@ import {
 import {
   lectureToString,
   parseLecture,
-} from "@/services/fileStorage/utils/lectureUtils";
+} from "@/features/local/lectures/lectureUtils";
 import { useEffect, useState } from "react";
 import LecturePreview from "./LecturePreview";
 import EditLectureTitle from "./EditLectureTitle";

src/app/course/[courseName]/lecture/[lectureDay]/EditLectureTitle.tsx

@@ -1,6 +1,6 @@
 import { useLocalCourseSettingsQuery } from "@/features/local/course/localCoursesHooks";
 import { getDateFromString } from "@/features/local/utils/timeUtils";
-import { getLectureWeekName } from "@/services/fileStorage/utils/lectureUtils";
+import { getLectureWeekName } from "@/features/local/lectures/lectureUtils";
 import { getCourseUrl, getLecturePreviewUrl } from "@/services/urlUtils";
 import { useCourseContext } from "../../context/courseContext";
 import Link from "next/link";

src/app/layout.tsx

@@ -5,7 +5,7 @@ import { Suspense } from "react";
 import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import { MyToaster } from "./MyToaster";
 import { createServerSideHelpers } from "@trpc/react-query/server";
-import { trpcAppRouter } from "@/services/serverFunctions/router/appRouter";
+import { trpcAppRouter } from "@/services/serverFunctions/appRouter";
 import { createTrpcContext } from "@/services/serverFunctions/context";
 import superjson from "superjson";
 import { fileStorageService } from "@/features/local/utils/fileStorageService";

src/features/local/assignments/assignmentsFileStorageService.ts

@@ -7,7 +7,7 @@ import path from "path";
 import { promises as fs } from "fs";
 import { courseItemFileStorageService } from "@/features/local/course/courseItemFileStorageService";
 import { getCoursePathByName } from "@/features/local/globalSettings/globalSettingsFileStorageService";
-import { directoryOrFileExists } from "@/services/fileStorage/utils/fileSystemUtils";
+import { directoryOrFileExists } from "@/features/local/utils/fileSystemUtils";
 
 const getAssignmentNames = async (courseName: string, moduleName: string) => {
   const courseDirectory = await getCoursePathByName(courseName);

src/features/local/course/courseItemFileStorageService.ts

@@ -1,5 +1,5 @@
 import path from "path";
-import { directoryOrFileExists } from "../../../services/fileStorage/utils/fileSystemUtils";
+import { directoryOrFileExists } from "../utils/fileSystemUtils";
 import fs from "fs/promises";
 import {
   LocalAssignment,

src/features/local/course/settingsFileStorageService.ts

@@ -1,9 +1,6 @@
 import { promises as fs } from "fs";
 import path from "path";
-import {
-  basePath,
-  directoryOrFileExists,
-} from "../../../services/fileStorage/utils/fileSystemUtils";
+import { basePath, directoryOrFileExists } from "../utils/fileSystemUtils";
 import { AssignmentSubmissionType } from "@/features/local/assignments/models/assignmentSubmissionType";
 import {
   getCoursePathByName,

src/features/local/globalSettings/globalSettingsFileStorageService.ts

@@ -1,6 +1,6 @@
 import { promises as fs } from "fs";
 import path from "path";
-import { basePath } from "../../../services/fileStorage/utils/fileSystemUtils";
+import { basePath } from "../utils/fileSystemUtils";
 import {
   GlobalSettings,
   zodGlobalSettings,

src/features/local/lectures/lectureFileStorageService.ts

@@ -8,7 +8,7 @@ import {
   parseLecture,
   getLectureWeekName,
   lectureToString,
-} from "@/services/fileStorage/utils/lectureUtils";
+} from "@/features/local/lectures/lectureUtils";
 import {
   LocalCourseSettings,
   getDayOfWeek,

src/features/local/modules/moduleFileStorageService.ts

@@ -1,5 +1,5 @@
 import { promises as fs } from "fs";
-import { lectureFolderName } from "../../../services/fileStorage/utils/lectureUtils";
+import { lectureFolderName } from "../lectures/lectureUtils";
 import { getCoursePathByName } from "../globalSettings/globalSettingsFileStorageService";
 
 export const moduleFileStorageService = {

src/features/local/utils/fileStorageService.ts

@@ -1,9 +1,6 @@
 import { promises as fs } from "fs";
 import path from "path";
-import {
-  basePath,
-  directoryOrFileExists,
-} from "../../../services/fileStorage/utils/fileSystemUtils";
+import { basePath, directoryOrFileExists } from "./fileSystemUtils";
 import { quizFileStorageService } from "../quizzes/quizFileStorageService";
 import { pageFileStorageService } from "../pages/pageFileStorageService";
 import { moduleFileStorageService } from "../modules/moduleFileStorageService";

src/features/local/utils/fileSystemUtils.ts

@@ -1,5 +1,5 @@
 import { promises as fs } from "fs";
-import { getGlobalSettings } from "../../../features/local/globalSettings/globalSettingsFileStorageService";
+import { getGlobalSettings } from "../globalSettings/globalSettingsFileStorageService";
 
 export const directoryOrFileExists = async (
   directoryPath: string

src/services/serverFunctions/appRouter.ts

@@ -0,0 +1,32 @@
+import { createTrpcContext } from "./context";
+import { createCallerFactory, router } from "./trpcSetup";
+import { assignmentRouter } from "../../features/local/assignments/assignmentRouter";
+import { canvasFileRouter } from "./canvasFileRouter";
+import { directoriesRouter } from "../../features/local/utils/directoriesRouter";
+import { globalSettingsRouter } from "../../features/local/globalSettings/globalSettingsRouter";
+import { lectureRouter } from "../../features/local/lectures/lectureRouter";
+import { pageRouter } from "../../features/local/pages/pageRouter";
+import { quizRouter } from "../../features/local/quizzes/quizRouter";
+import { settingsRouter } from "../../features/local/course/settingsRouter";
+import { moduleRouter } from "@/features/local/modules/moduleRouter";
+
+export const trpcAppRouter = router({
+  assignment: assignmentRouter,
+  lectures: lectureRouter,
+  settings: settingsRouter,
+  quiz: quizRouter,
+  page: pageRouter,
+  module: moduleRouter,
+  directories: directoriesRouter,
+  canvasFile: canvasFileRouter,
+  globalSettings: globalSettingsRouter,
+});
+
+export const createCaller = createCallerFactory(trpcAppRouter);
+
+export const createAsyncCaller = async () => {
+  const context = await createTrpcContext();
+  return createCaller(context);
+};
+
+export type AppRouter = typeof trpcAppRouter;

src/services/serverFunctions/router/appRouter.ts

@@ -1,32 +0,0 @@
-import { createTrpcContext } from "../context";
-import { createCallerFactory, router } from "../trpcSetup";
-import { assignmentRouter } from "../../../features/local/assignments/assignmentRouter";
-import { canvasFileRouter } from "./canvasFileRouter";
-import { directoriesRouter } from "../../../features/local/utils/directoriesRouter";
-import { globalSettingsRouter } from "../../../features/local/globalSettings/globalSettingsRouter";
-import { lectureRouter } from "../../../features/local/lectures/lectureRouter";
-import { pageRouter } from "../../../features/local/pages/pageRouter";
-import { quizRouter } from "../../../features/local/quizzes/quizRouter";
-import { settingsRouter } from "../../../features/local/course/settingsRouter";
-import { moduleRouter } from "@/features/local/modules/moduleRouter";
-
-export const trpcAppRouter = router({
-  assignment: assignmentRouter,
-  lectures: lectureRouter,
-  settings: settingsRouter,
-  quiz: quizRouter,
-  page: pageRouter,
-  module: moduleRouter,
-  directories: directoriesRouter,
-  canvasFile: canvasFileRouter,
-  globalSettings: globalSettingsRouter,
-});
-
-export const createCaller = createCallerFactory(trpcAppRouter);
-
-export const createAsyncCaller = async () => {
-  const context = await createTrpcContext();
-  return createCaller(context);
-};
-
-export type AppRouter = typeof trpcAppRouter;

src/services/serverFunctions/trpcClient.ts

@@ -1,6 +1,6 @@
 import { createTRPCReact } from "@trpc/react-query";
 import { createTRPCContext } from "@trpc/tanstack-react-query";
-import { AppRouter } from "./router/appRouter";
+import { AppRouter } from "./appRouter";
 
 export const trpc = createTRPCReact<AppRouter>();
 

src/services/tests/fileStorageParsingErrors.test.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect, beforeEach } from "vitest";
 import { promises as fs } from "fs";
 import { fileStorageService } from "../../features/local/utils/fileStorageService";
-import { basePath } from "../fileStorage/utils/fileSystemUtils";
+import { basePath } from "../../features/local/utils/fileSystemUtils";
 
 describe("FileStorageTests", () => {
   beforeEach(async () => {

src/services/tests/lectureStorage.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
-import { lectureToString } from "../fileStorage/utils/lectureUtils";
-import { parseLecture } from "../fileStorage/utils/lectureUtils";
+import { lectureToString } from "../../features/local/lectures/lectureUtils";
+import { parseLecture } from "../../features/local/lectures/lectureUtils";
 import { Lecture } from "@/features/local/lectures/lectureModel";
 
 describe("can parse and stringify lectures", () => {