@studious-lms/server 1.2.47 → 1.2.49

package/src/index.ts

@@ -34,8 +34,6 @@ app.use((req, res, next) => {
   next();
 });
 
-app.use(generalLimiter);
-
 const allowedOrigins = env.NODE_ENV === 'production'
 ? [
     'https://www.studious.sh',
@@ -59,9 +57,13 @@ app.use(cors({
   credentials: true,
   methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
   allowedHeaders: ['Content-Type', 'Authorization', 'X-Requested-With', 'x-user'],
-  optionsSuccessStatus: 200
+  preflightContinue: false, // Important: stop further handling of OPTIONS
+  optionsSuccessStatus: 204, // Recommended for modern browsers
+
 }));
 
+app.use(generalLimiter);
+
 // CORS debugging middleware
 app.use((req, res, next) => {
   if (req.method === 'OPTIONS' || req.path.includes('trpc')) {
@@ -90,25 +92,25 @@ app.use((req, res, next) => {
   next();
 });
 
-app.use("/panel", async (_, res) => {
-  if (env.NODE_ENV !== "development") {
-    return res.status(404).send("Not Found");
-  }
-
-  // Dynamically import renderTrpcPanel only in development
-  const { renderTrpcPanel } = await import("trpc-ui");
-
-  return res.send(
-    renderTrpcPanel(appRouter, {
-      url: "/trpc", // Base url of your trpc server
-      meta: {
-        title: "Studious Backend",
-        description:
-          "This is the backend for the Studious application.",
-      },
-    })
-  );
-});
+// app.use("/panel", async (_, res) => {
+//   if (env.NODE_ENV !== "development") {
+//     return res.status(404).send("Not Found");
+//   }
+
+//   // Dynamically import renderTrpcPanel only in development
+//   const { renderTrpcPanel } = await import("trpc-ui");
+
+//   return res.send(
+//     renderTrpcPanel(appRouter, {
+//       url: "/trpc", // Base url of your trpc server
+//       meta: {
+//         title: "Studious Backend",
+//         description:
+//           "This is the backend for the Studious application.",
+//       },
+//     })
+//   );
+// });
 
 
 // Create HTTP server

package/src/middleware/security.ts

@@ -19,7 +19,7 @@ const rateLimitHandler = (req: Request, res: Response) => {
 
 // General API rate limiter - applies to all routes
 export const generalLimiter = rateLimit({
-  windowMs: 10 * 60 * 1000, // 10 minutes
+  windowMs: 10 * 60, // 10 minutes
   max: 100, // Limit each IP to 100 requests per windowMs
   message: 'Too many requests from this IP, please try again later.',
   standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
@@ -27,7 +27,7 @@ export const generalLimiter = rateLimit({
   handler: rateLimitHandler,
   skip: (req) => {
     // Skip rate limiting for health checks
-    return req.path === '/health';
+    return req.path === '/health' || req.method === 'OPTIONS';
   },
 });
 

package/src/routers/agenda.ts

@@ -37,6 +37,7 @@ export const agendaRouter = createTRPCRouter({
             },
           },
           include: {
+            assignmentsAttached: true,
             class: true,
           },
         }),
@@ -67,6 +68,7 @@ export const agendaRouter = createTRPCRouter({
             },
           },
           include: {
+            assignmentsAttached: true,
             class: true,
           },
         }),

package/src/routers/announcement.ts

@@ -33,6 +33,13 @@ const AnnouncementSelect = {
         select: {
             id: true,
             username: true,
+            profile: {
+                select: {
+                    displayName: true,
+                    profilePicture: true,
+                    profilePictureThumbnail: true,
+                },
+            },
         },
     },
     remarks: true,

package/src/routers/assignment.ts

@@ -1015,6 +1015,7 @@ export const assignmentRouter = createTRPCRouter({
               endTime: true,
               location: true,
               remarks: true,
+              color: true,
             }
           },
           markScheme: {
@@ -1835,6 +1836,7 @@ export const assignmentRouter = createTRPCRouter({
               name: true,
               startTime: true,
               endTime: true,
+              color: true,
             }
           }
         }
@@ -1969,6 +1971,7 @@ export const assignmentRouter = createTRPCRouter({
           endTime: true,
           location: true,
           remarks: true,
+          color: true,
         },
         orderBy: {
           startTime: 'asc'

package/src/routers/class.ts

@@ -26,12 +26,39 @@ export const classRouter = createTRPCRouter({
                 template: false,
               },
               select: {
+
                 id: true,
                 title: true,
                 type: true,
                 dueDate: true,
               },
             },
+            students: {
+              select: {
+                id: true,
+                username: true,
+                profile: {
+                  select: {
+                    displayName: true,
+                    profilePicture: true,
+                    profilePictureThumbnail: true,
+                  },
+                },
+              },
+            },
+            teachers: {
+              select: {
+                id: true,
+                username: true,
+                profile: {
+                  select: {
+                    displayName: true,
+                    profilePicture: true,
+                    profilePictureThumbnail: true,
+                  },
+                },
+              },
+            },
           },
         }),
         prisma.class.findMany({
@@ -57,6 +84,32 @@ export const classRouter = createTRPCRouter({
                 dueDate: true,
               },
             },
+            students: {
+              select: {
+                id: true,
+                username: true,
+                profile: {
+                  select: {
+                    displayName: true,
+                    profilePicture: true,
+                    profilePictureThumbnail: true,
+                  },
+                },
+              },
+            },
+            teachers: {
+              select: {
+                id: true,
+                username: true,
+                profile: {
+                  select: {
+                    displayName: true,
+                    profilePicture: true,
+                    profilePictureThumbnail: true,
+                  },
+                },
+              },
+            },
           },
         }),
       ]);
@@ -69,6 +122,7 @@ export const classRouter = createTRPCRouter({
           subject: cls.subject,
           dueToday: cls.assignments,
           assignments: cls.assignments,
+          members: [...cls.students, ...cls.teachers],
           color: cls.color,
         })),
         studentInClass: studentClasses.map(cls => ({
@@ -78,6 +132,7 @@ export const classRouter = createTRPCRouter({
           subject: cls.subject,
           dueToday: cls.assignments,
           assignments: cls.assignments,
+          members: [...cls.students, ...cls.teachers],
           color: cls.color,
         })),
       };

package/src/routers/newtonChat.ts

@@ -120,19 +120,17 @@ export const newtonChatRouter = createTRPCRouter({
             title: 'Session with Newton Tutor',
           },
         });
+        generateAndSendNewtonIntroduction(
+          newtonChat.id,
+          newtonChat.conversationId,
+          submission.id
+        ).catch(error => {
+          logger.error('Failed to generate AI introduction:', { error, newtonChatId: result.id });
+        });
 
         return newtonChat;
       });
 
-      // Generate AI introduction message in parallel (don't await - fire and forget)
-      generateAndSendNewtonIntroduction(
-        result.id,
-        result.conversationId,
-        submission.id
-      ).catch(error => {
-        logger.error('Failed to generate AI introduction:', { error, newtonChatId: result.id });
-      });
-
       return {
         conversationId: result.conversationId,
         newtonChatId: result.id,

package/src/seedDatabase.ts

@@ -8,6 +8,21 @@ export async function clearDatabase() {
     logger.info('Clearing database');
     await prisma.notification.deleteMany();
     
+    // Delete worksheet-related records
+    await prisma.studentQuestionProgress.deleteMany();
+    await prisma.studentWorksheetResponse.deleteMany();
+    await prisma.worksheetQuestion.deleteMany();
+    await prisma.worksheet.deleteMany();
+    
+    // Delete reactions (they reference announcements and comments)
+    await prisma.reaction.deleteMany();
+    
+    // Delete comments (they reference announcements and users)
+    await prisma.comment.deleteMany();
+    
+    // Delete NewtonChat (they reference submissions and conversations)
+    await prisma.newtonChat.deleteMany();
+    
     // Delete chat-related records
     await prisma.mention.deleteMany();
     await prisma.message.deleteMany();
@@ -39,10 +54,19 @@ export async function clearDatabase() {
     // Delete schools (which reference files for logos) - this will cascade delete the file references
     await prisma.school.deleteMany();
     
+    // Delete marketing-related records
+    await prisma.schoolDevelopementProgram.deleteMany();
+    await prisma.earlyAccessRequest.deleteMany();
+    
     // Finally delete all files
     await prisma.file.deleteMany();
 }
 
+// Helper function to generate DiceBear avatar URL
+function getDiceBearAvatar(seed: string): string {
+    return `https://api.dicebear.com/7.x/avataaars/svg?seed=${encodeURIComponent(seed)}`;
+}
+
 export async function createUser(email: string, password: string, username: string) {
     logger.debug("Creating user", { email, username, password });
 
@@ -109,7 +133,7 @@ export const seedDatabase = async () => {
         createUser('charlotte.walker@student.riverside.edu', 'student123', 'charlotte.walker'),
     ]);
 
-    // 4. Create User Profiles
+    // 4. Create User Profiles with DiceBear avatars
     await Promise.all([
         prisma.userProfile.create({
             data: {
@@ -118,6 +142,7 @@ export const seedDatabase = async () => {
                 bio: 'Biology teacher with 15 years of experience. Passionate about making science accessible to all students.',
                 location: 'Riverside, CA',
                 website: 'https://sarahjohnson-bio.com',
+                profilePicture: getDiceBearAvatar(teachers[0].username),
             }
         }),
         prisma.userProfile.create({
@@ -126,6 +151,7 @@ export const seedDatabase = async () => {
                 displayName: 'Mr. Michael Chen',
                 bio: 'Mathematics teacher and department head. Specializes in AP Calculus and Statistics.',
                 location: 'Riverside, CA',
+                profilePicture: getDiceBearAvatar(teachers[1].username),
             }
         }),
         prisma.userProfile.create({
@@ -134,18 +160,24 @@ export const seedDatabase = async () => {
                 displayName: 'Ms. Emma Davis',
                 bio: 'English Literature teacher. Loves fostering creative writing and critical thinking.',
                 location: 'Riverside, CA',
+                profilePicture: getDiceBearAvatar(teachers[2].username),
             }
         }),
     ]);
 
-    // Add profiles for some students
-    await Promise.all(students.slice(0, 6).map((student, index) => {
-        const names = ['Alex Martinez', 'Sophia Williams', 'James Brown', 'Olivia Taylor', 'Ethan Anderson', 'Ava Thomas'];
+    // Add profiles for all students with DiceBear avatars
+    await Promise.all(students.map((student, index) => {
+        const names = [
+            'Alex Martinez', 'Sophia Williams', 'James Brown', 'Olivia Taylor', 
+            'Ethan Anderson', 'Ava Thomas', 'Noah Jackson', 'Isabella White',
+            'Liam Harris', 'Mia Clark', 'Lucas Lewis', 'Charlotte Walker'
+        ];
         return prisma.userProfile.create({
             data: {
                 userId: student.id,
-                displayName: names[index],
-                bio: `Grade 11 student at Riverside High School.`,
+                displayName: names[index] || student.username,
+                bio: index < 6 ? `Grade 11 student at Riverside High School.` : undefined,
+                profilePicture: getDiceBearAvatar(student.username),
             }
         });
     }));