@studious-lms/server 1.0.8 → 1.1.1

package/dist/routers/section.js

@@ -5,11 +5,13 @@ import { prisma } from "../lib/prisma.js";
 const createSectionSchema = z.object({
     classId: z.string(),
     name: z.string(),
+    color: z.string().optional(),
 });
 const updateSectionSchema = z.object({
     id: z.string(),
     classId: z.string(),
     name: z.string(),
+    color: z.string().optional(),
 });
 const deleteSectionSchema = z.object({
     id: z.string(),
@@ -48,6 +50,9 @@ export const sectionRouter = createTRPCRouter({
                 class: {
                     connect: { id: input.classId },
                 },
+                ...(input.color && {
+                    color: input.color,
+                }),
             },
         });
         return section;
@@ -82,10 +87,51 @@ export const sectionRouter = createTRPCRouter({
             where: { id: input.id },
             data: {
                 name: input.name,
+                ...(input.color && {
+                    color: input.color,
+                }),
             },
         });
         return section;
     }),
+    reOrder: protectedProcedure
+        .input(z.object({
+        id: z.string(),
+        classId: z.string(),
+        order: z.number(),
+    }))
+        .mutation(async ({ ctx, input }) => {
+        if (!ctx.user) {
+            throw new TRPCError({
+                code: "UNAUTHORIZED",
+                message: "User must be authenticated",
+            });
+        }
+        // Verify user is a teacher of the class
+        const classData = await prisma.class.findFirst({
+            where: {
+                id: input.classId,
+                teachers: {
+                    some: {
+                        id: ctx.user.id,
+                    },
+                },
+            },
+        });
+        if (!classData) {
+            throw new TRPCError({
+                code: "NOT_FOUND",
+                message: "Class not found or you are not a teacher",
+            });
+        }
+        await prisma.section.update({
+            where: { id: input.id },
+            data: {
+                order: input.order,
+            },
+        });
+        return { id: input.id };
+    }),
     delete: protectedProcedure
         .input(deleteSectionSchema)
         .mutation(async ({ ctx, input }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studious-lms/server",
-  "version": "1.0.8",
+  "version": "1.1.1",
   "description": "Backend server for Studious application",
   "main": "dist/exportType.js",
   "types": "dist/exportType.d.ts",

package/prisma/schema.prisma

@@ -132,6 +132,7 @@ model Folder {
   childFolders Folder[] @relation("ParentChildFolders")
   parentFolder Folder? @relation("ParentChildFolders", fields: [parentFolderId], references: [id])
   parentFolderId String?
+  color String? @default("#3B82F6")
   class Class? @relation("ClassFiles", fields: [classId], references: [id])
   classId String? @unique
 }
@@ -194,6 +195,7 @@ model Assignment {
   eventId       String?
   markScheme    MarkScheme? @relation(fields: [markSchemeId], references: [id], onDelete: Cascade)
   markSchemeId  String?
+  order         Int?
   gradingBoundary GradingBoundary? @relation(fields: [gradingBoundaryId], references: [id], onDelete: Cascade)
   gradingBoundaryId String?
 }
@@ -227,6 +229,7 @@ model Submission {
   gradeReceived Int?
 
   rubricState String?
+  teacherComments String?
 
   submittedAt DateTime?
   submitted   Boolean? @default(false)
@@ -239,6 +242,8 @@ model Section {
   classId   String
   class     Class @relation(fields: [classId], references: [id], onDelete: Cascade)
   assignments Assignment[]
+  color String? @default("#3B82F6")
+  order Int?
 }
 
 model Session {

package/src/routers/assignment.ts

@@ -84,6 +84,23 @@ const updateSubmissionSchema = z.object({
 });
 
 export const assignmentRouter = createTRPCRouter({
+  order: protectedTeacherProcedure
+    .input(z.object({
+      id: z.string(),
+      classId: z.string(),
+      order: z.number(),
+    }))
+    .mutation(async ({ ctx, input }) => {
+      const { id, order } = input;
+
+      const assignment = await prisma.assignment.update({
+        where: { id },
+        data: { order },
+      });
+
+      return assignment;
+    }),
+
   create: protectedProcedure
     .input(createAssignmentSchema)
     .mutation(async ({ ctx, input }) => {

package/src/routers/class.ts

@@ -168,25 +168,30 @@ export const classRouter = createTRPCRouter({
         },
       });
 
+
+      if (!classData) {
+        throw new Error('Class not found');
+      }
+
+      const formattedClassData = {
+        ...classData,
+        assignments: classData.assignments.map(assignment => ({
+          ...assignment,
+          late: assignment.dueDate < new Date(),
+          submitted: assignment.submissions.some(submission => submission.studentId === ctx.user?.id),
+          returned: assignment.submissions.some(submission => submission.studentId === ctx.user?.id && submission.returned),
+        })),
+      }
+
       const sections = await prisma.section.findMany({
         where: {
           classId: classId,
         },
       });
 
-      if (!classData) {
-        throw new Error('Class not found');
-      }
-
       return {
         class: {
-          ...classData,
-          assignments: classData.assignments.map(assignment => ({
-            ...assignment,
-            late: assignment.dueDate < new Date(),
-            submitted: assignment.submissions.some(submission => submission.studentId === ctx.user?.id),
-            returned: assignment.submissions.some(submission => submission.studentId === ctx.user?.id && submission.returned),
-          })),
+          ...formattedClassData,
           sections,
         },
       };

package/src/routers/folder.ts

@@ -14,6 +14,7 @@ const fileSchema = z.object({
 const createFolderSchema = z.object({
   name: z.string(),
   parentFolderId: z.string().optional(),
+  color: z.string().optional(),
 });
 
 const uploadFilesToFolderSchema = z.object({
@@ -29,7 +30,7 @@ export const folderRouter = createTRPCRouter({
   create: protectedTeacherProcedure
     .input(createFolderSchema)
     .mutation(async ({ ctx, input }) => {
-      const { classId, name } = input;
+      const { classId, name, color } = input;
       let parentFolderId = input.parentFolderId || null;
 
       if (!ctx.user) {
@@ -75,6 +76,9 @@ export const folderRouter = createTRPCRouter({
               class: {
                 connect: { id: classId },
               },
+              ...(color && {
+                color: color,
+              }),
             },
           });
         }
@@ -104,6 +108,9 @@ export const folderRouter = createTRPCRouter({
               connect: { id: parentFolderId },
             },
           }),
+          ...(color && {
+            color: color,
+          }),
         },
         include: {
           files: {
@@ -682,14 +689,15 @@ export const folderRouter = createTRPCRouter({
       return updatedFolder;
     }),
 
-  rename: protectedTeacherProcedure
+  update: protectedTeacherProcedure
     .input(z.object({
       folderId: z.string(),
-      newName: z.string(),
+      name: z.string(),
+      color: z.string().optional(),
       classId: z.string(),
     }))
     .mutation(async ({ ctx, input }) => {
-      const { folderId, newName, classId } = input;
+      const { folderId, name, color, classId } = input;
 
       // Get the folder
       const folder = await prisma.folder.findFirst({
@@ -706,7 +714,7 @@ export const folderRouter = createTRPCRouter({
       }
 
       // Validate new name
-      if (!newName.trim()) {
+      if (!name.trim()) {
         throw new TRPCError({
           code: "BAD_REQUEST",
           message: "Folder name cannot be empty",
@@ -717,7 +725,10 @@ export const folderRouter = createTRPCRouter({
       const updatedFolder = await prisma.folder.update({
         where: { id: folderId },
         data: {
-          name: newName.trim(),
+          name: name.trim(),
+          ...(color && {
+            color: color,
+          }),
         },
         include: {
           files: {

package/src/routers/section.ts

@@ -6,12 +6,14 @@ import { prisma } from "../lib/prisma.js";
 const createSectionSchema = z.object({
   classId: z.string(),
   name: z.string(),
+  color: z.string().optional(),
 });
 
 const updateSectionSchema = z.object({
   id: z.string(),
   classId: z.string(),
   name: z.string(),
+  color: z.string().optional(),
 });
 
 const deleteSectionSchema = z.object({
@@ -55,6 +57,9 @@ export const sectionRouter = createTRPCRouter({
           class: {
             connect: { id: input.classId },
           },
+          ...(input.color && {
+            color: input.color,
+          }),
         },
       });
 
@@ -94,12 +99,58 @@ export const sectionRouter = createTRPCRouter({
         where: { id: input.id },
         data: {
           name: input.name,
+          ...(input.color && {
+            color: input.color,
+          }),
         },
       });
 
       return section;
     }),
 
+  reOrder: protectedProcedure
+    .input(z.object({
+      id: z.string(),
+      classId: z.string(),
+      order: z.number(),
+    }))
+    .mutation(async ({ ctx, input }) => {
+      if (!ctx.user) {
+        throw new TRPCError({
+          code: "UNAUTHORIZED",
+          message: "User must be authenticated",
+        });
+      }
+
+      // Verify user is a teacher of the class
+      const classData = await prisma.class.findFirst({
+        where: {
+          id: input.classId,
+          teachers: {
+            some: {
+              id: ctx.user.id,
+            },
+          },
+        },
+      });
+
+      if (!classData) {
+        throw new TRPCError({
+          code: "NOT_FOUND",
+          message: "Class not found or you are not a teacher",
+        });
+      }
+
+      await prisma.section.update({
+        where: { id: input.id },
+        data: {
+          order: input.order,
+        },
+      });
+
+      return { id: input.id };
+    }),
+
   delete: protectedProcedure
     .input(deleteSectionSchema)
     .mutation(async ({ ctx, input }) => {