Merge branch 'main' into fix/profile-page-authenticated-user

Author: Godfrey-Delight

docs/BUTTON_VARIANTS.md

@@ -7,11 +7,11 @@ A reusable button system with variants, sizes, keyboard navigation, and full dar
 Both components are exported from `@/components`:
 
 ```tsx
-import { Button, ButtonGroup } from '@/components';
+import {Button, ButtonGroup} from '@/components';
 import type { ButtonProps } from '@/components';
 ```
 
-## Overview
+##Overview
 
 This project uses URL-based API versioning to protect clients from breaking changes.
 

docs/DISCORD_OAUTH_INTEGRATION.md

@@ -2,7 +2,7 @@
 
 This document describes the Discord OAuth2 integration implementation for the TeachLink authentication flow.
 
-## Overview
+##Overview
 
 The Discord OAuth integration allows users to authenticate using their Discord account, providing a seamless signup/login experience.
 

docs/monitoring.md

@@ -7,7 +7,7 @@
 3. Click "Enable Notifications" and allow permission
 4. Send a test message
 
-## Features
+##Features
 
 - **System Health**: Real memory, CPU, uptime from Node.js
 - **Notification Metrics**: Sent, Delivered, Clicked, Failed counts

lib/subscriptions.js

@@ -1,4 +1,4 @@
-// Shared subscriptions storage for all API routes
+// Shared subscription storage for all API routes
 const subscriptions = new Map();
 
 export { subscriptions };

next.config.test.ts

@@ -0,0 +1,14 @@
+import { describe, expect, it } from 'vitest';
+import nextConfig from './next.config';
+
+describe('next.config modularizeImports', () => {
+  it('adds a lucide-react modularization rule for tree-shaken icon imports', () => {
+    const modularizeImports = nextConfig.modularizeImports as Record<string, unknown>;
+
+    expect(modularizeImports).toBeDefined();
+    expect(modularizeImports.lodash).toEqual({ transform: 'lodash/{{member}}' });
+    expect(modularizeImports['lucide-react']).toEqual({
+      transform: 'lucide-react/dist/esm/icons/{{member}}',
+    });
+  });
+});

next.config.ts

@@ -7,13 +7,16 @@ const nextConfig: NextConfig = {
 
   // Code-splitting optimization for heavy libraries
   experimental: {
-    optimizePackageImports: ['@monaco-editor/react', 'video.js', 'ethers'],
+    optimizePackageImports: ['@monaco-editor/react', 'video.js', 'ethers', 'recharts', 'framer-motion', 'date-fns'],
   },
 
   modularizeImports: {
     lodash: {
       transform: 'lodash/{{member}}',
     },
+    'lucide-react': {
+      transform: 'lucide-react/dist/esm/icons/{{member}}',
+    },
   },
   eslint: {
     // Many legacy files do not match Prettier; keep type checking without blocking production builds.

packages/tooling/tsconfig/base.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "ES2017",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
+    "allowJs":true,
     "skipLibCheck": true,
     "strict": true,
     "noEmit": true,

scripts/fix-pnpm-lock.js

@@ -7,6 +7,7 @@ const backupNames = ['pnpm-lock.yaml.broken', 'pnpm-lock.yaml.bak', 'pnpm-lock.y
 let srcFile = null;
 for (const name of backupNames) {
   const p = path.join(repoRoot, name);
+  
   if (fs.existsSync(p)) {
     srcFile = p;
     break;

src/__tests__/sms/queue.test.ts

@@ -5,9 +5,22 @@
  */
 
 import { SMSQueue } from '@/lib/sms/queue';
-import { TwilioProvider } from '@/lib/sms/provider';
 import { SMSMessage } from '@/lib/sms/types';
 
+// Mock the TwilioProvider to return success immediately (no credentials in test env)
+const mockSend = vi.fn().mockResolvedValue({ success: true, provider: 'twilio', messageId: 'mock-id' });
+vi.mock('@/lib/sms/provider', () => {
+  function MockTwilioProvider() {
+    this.type = 'twilio';
+    this.send = mockSend;
+  }
+  return {
+    TwilioProvider: MockTwilioProvider as unknown as typeof import('@/lib/sms/provider').TwilioProvider,
+  };
+});
+
+import { TwilioProvider } from '@/lib/sms/provider';
+
 describe('SMSQueue', () => {
   let queue: SMSQueue;
   let provider: TwilioProvider;
@@ -251,9 +264,11 @@ describe('SMSQueue', () => {
 
       const logs = queue.getDeliveryLogs();
 
-      if (logs.length > 0) {
-        expect(logs[0].metadata).toBeDefined();
-      }
+      expect(logs.length).toBeGreaterThan(0);
+      // Check the most recent log (last in the array) has metadata
+      const lastLog = logs[logs.length - 1];
+      expect(lastLog.metadata).toBeDefined();
+      expect(lastLog.metadata?.userId).toBe('user123');
     });
   });
 });

src/app/api/certificates/__tests__/certificate-security.test.ts

@@ -24,6 +24,22 @@ import {
 import { slidingWindowRateLimit } from '@/lib/ratelimit';
 import { appendAuditLog, queryAuditLogs } from '@/lib/audit';
 
+// Mock the DB pool so generateCertificate's completion check passes
+vi.mock('@/lib/db/pool', () => ({
+  query: vi.fn().mockResolvedValue({
+    rows: [
+      {
+        user_id: 'user-123',
+        course_id: 'course-123',
+        progress: 100,
+        completed_lessons: [],
+        last_accessed_at: new Date().toISOString(),
+        completed_at: new Date().toISOString(),
+      },
+    ],
+  }),
+}));
+
 describe('Certificate Security', () => {
   const mockUserId = 'user-123';
   const mockCourseId = 'course-123';