Merge pull request #41 from ivelin/dev

Dev

Author: ivelin

.github/workflows/e2e-tests.yaml

@@ -1,4 +1,7 @@
 # .github/workflows/e2e-tests.yaml
+# File path: .github/workflows/e2e-tests.yaml
+# Runs CI for K12Beast, including E2E and server tests with build debugging
+
 name: Tests
 on:
   push:
@@ -13,8 +16,10 @@ jobs:
       NEXT_PUBLIC_SUPABASE_URL: ${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}
       NEXT_PUBLIC_SUPABASE_ANON_KEY: ${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}
       SUPABASE_SERVICE_ROLE_KEY: ${{ secrets.SUPABASE_SERVICE_ROLE_KEY }}
-      TEST_USER_EMAIL: ${{ secrets.TEST_USER_EMAIL }}  # From GitHub Secrets
-      TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }}  # From GitHub Secrets
+      TEST_USER_EMAIL: ${{ secrets.TEST_USER_EMAIL }}
+      TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }}
+      XAI_API_KEY: ${{ secrets.XAI_API_KEY }}
+      XAI_MODEL_NAME: ${{ secrets.XAI_MODEL_NAME }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -46,9 +51,12 @@ jobs:
     runs-on: ubuntu-latest
     env:
       NEXT_PUBLIC_SUPABASE_URL: ${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}
+      NEXT_PUBLIC_SUPABASE_ANON_KEY: ${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}
       SUPABASE_SERVICE_ROLE_KEY: ${{ secrets.SUPABASE_SERVICE_ROLE_KEY }}
-      TEST_USER_EMAIL: ${{ secrets.TEST_USER_EMAIL }}  # From GitHub Secrets
-      TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }}  # From GitHub Secrets
+      TEST_USER_EMAIL: ${{ secrets.TEST_USER_EMAIL }}
+      TEST_USER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }}
+      XAI_API_KEY: ${{ secrets.XAI_API_KEY }}
+      XAI_MODEL_NAME: ${{ secrets.XAI_MODEL_NAME }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -59,8 +67,22 @@ jobs:
       - name: Debug environment variables
         run: |
           echo "NEXT_PUBLIC_SUPABASE_URL: $NEXT_PUBLIC_SUPABASE_URL"
-          echo "SUPABASE_SERVICE_ROLE_KEY: [REDACTED]"  # Avoid logging sensitive data
-          env | grep -E 'NEXT_PUBLIC_SUPABASE_URL|SUPABASE_SERVICE_ROLE_KEY'
+          echo "NEXT_PUBLIC_SUPABASE_ANON_KEY: [REDACTED]"
+          echo "SUPABASE_SERVICE_ROLE_KEY: [REDACTED]"
+          echo "XAI_API_KEY: [REDACTED]"
+          echo "XAI_MODEL_NAME: [REDACTED]"
+          env | grep -E 'NEXT_PUBLIC_SUPABASE_URL|NEXT_PUBLIC_SUPABASE_ANON_KEY|SUPABASE_SERVICE_ROLE_KEY|XAI_API_KEY|XAI_MODEL_NAME'
+      - name: Run build
+        run: npm run build --verbose
+      - name: Verify build manifest
+        run: |
+          if [ -f .next/build-manifest.json ]; then
+            echo "build-manifest.json found"
+          else
+            echo "build-manifest.json missing"
+            ls -la .next
+            exit 1
+          fi
       - name: Run Jest server tests
         run: npm run test:server
       - name: Upload server test report

.gitignore

@@ -52,4 +52,7 @@ tmp/
 # ignore test artifacts
 playwright-report/
 test-results/
-playwright/
+playwright/
+
+# ignore dynamically generated files
+public/sitemap.xml

next-sitemap.config.js

@@ -0,0 +1,65 @@
+// next-sitemap.config.js
+// File path: next-sitemap.config.js
+// Configures sitemap for K12Beast, including only root and /public/* pages
+// Scans src/app/public for page.tsx and src/content/docs for page.mdx, excluding all other routes
+
+const fs = require('fs');
+const path = require('path');
+
+const PUBLIC_DIR = path.join(process.cwd(), 'src/app/public');
+const DOCS_DIR = path.join(process.cwd(), 'src/content/docs');
+
+function getPublicPaths(dir, prefix, fileName) {
+  console.log(`[Sitemap Config] Scanning directory: ${dir}`);
+  const paths = [];
+  if (!fs.existsSync(dir)) {
+    console.log(`[Sitemap Config] Directory not found: ${dir}`);
+    return paths;
+  }
+  fs.readdirSync(dir).forEach(file => {
+    const filePath = path.join(dir, file);
+    if (fs.statSync(filePath).isDirectory()) {
+      paths.push(...getPublicPaths(filePath, `${prefix}/${file}`, fileName));
+    } else if (file === fileName) {
+      const relativePath = prefix.endsWith('/public') ? '/public' : prefix;
+      // Only include paths starting with /public/ or /public
+      if (!relativePath.includes('[') && (relativePath === '/public' || relativePath.startsWith('/public/'))) {
+        console.log(`[Sitemap Config] Including path: ${relativePath}`);
+        paths.push({
+          loc: relativePath,
+          lastmod: new Date().toISOString(),
+          changefreq: 'daily',
+          priority: relativePath === '/public' ? 0.8 : 0.7,
+        });
+      } else {
+        console.log(`[Sitemap Config] Excluding path: ${relativePath}`);
+      }
+    }
+  });
+  return paths;
+}
+
+module.exports = {
+  siteUrl: 'https://k12beast.com',
+  generateRobotsTxt: true,
+  generateIndexSitemap: false,
+  // Prevent automatic inclusion of src/app routes
+  exclude: ['/*'], // Exclude all routes by default
+  additionalPaths: async () => {
+    console.log('[Sitemap Config] Generating sitemap paths');
+    console.log(`[Sitemap Config] Environment: CI=${process.env.CI || 'false'}`);
+    const paths = [
+      {
+        loc: '/',
+        lastmod: new Date().toISOString(),
+        changefreq: 'daily',
+        priority: 1.0,
+      },
+    ];
+    // Include all /public/* paths
+    paths.push(...getPublicPaths(PUBLIC_DIR, '/public', 'page.tsx'));
+    paths.push(...getPublicPaths(DOCS_DIR, '/public/docs', 'page.mdx'));
+    console.log(`[Sitemap Config] Total paths generated: ${paths.length}`);
+    return paths;
+  },
+};

next.config.ts

@@ -1,43 +1,45 @@
+// next.config.ts
 // File path: next.config.ts
 // Configures Next.js for K12Beast, including MDX support for documentation pages
 // Allows external image domains for testing and Supabase storage URLs
 // Disables TypeScript build errors and source maps in development
 // Sets cache control headers for source maps
-// Configures MDX to strip comments and frontmatter from rendering
+// Configures MDX to strip comments and frontmatter, with GFM support for tables
 
 import type { NextConfig } from 'next';
 import createMDX from '@next/mdx';
 import remarkFrontmatter from 'remark-frontmatter';
+import remarkGfm from 'remark-gfm';
 import remarkRemoveComments from 'remark-remove-comments';
 import { remove } from 'unist-util-remove';
 
 // Custom remark plugin to remove frontmatter node from the MDX AST
 function remarkRemoveFrontmatter() {
   return (tree: any) => {
-    remove(tree, { type: 'yaml' }); // Remove frontmatter (yaml node)
+    remove(tree, { type: 'yaml' });
     return tree;
   };
 }
 
 const nextConfig: NextConfig = {
   productionBrowserSourceMaps: false,
   typescript: {
-    ignoreBuildErrors: true, // Disable TypeScript errors during build
+    ignoreBuildErrors: true,
   },
   images: {
-    domains: ['mockurl.com'], // For tests
+    domains: ['mockurl.com'],
     remotePatterns: [
       {
         protocol: 'https',
-        hostname: '*.supabase.co', // Allow any subdomain of supabase.co
-        port: '', // Leave empty for default ports (80, 443)
-        pathname: '/storage/v1/object/public/**', // Match Supabase storage paths
+        hostname: '*.supabase.co',
+        port: '',
+        pathname: '/storage/v1/object/public/**',
       },
     ],
   },
   webpack: (config, { dev }) => {
     if (dev) {
-      config.devtool = false; // Disable source maps in dev mode
+      config.devtool = false;
     }
     return config;
   },
@@ -54,17 +56,17 @@ const nextConfig: NextConfig = {
       },
     ];
   },
-  pageExtensions: ['js', 'jsx', 'ts', 'tsx', 'md', 'mdx'], // Enable MDX pages
+  pageExtensions: ['js', 'jsx', 'ts', 'tsx', 'md', 'mdx'],
 };
 
 const withMDX = createMDX({
   options: {
     remarkPlugins: [
-      remarkFrontmatter, // Parse frontmatter
-      remarkRemoveFrontmatter, // Remove frontmatter from rendering
-      remarkRemoveComments, // Remove comments (e.g., lines starting with //)
+      remarkFrontmatter,
+      remarkRemoveFrontmatter,
+      remarkRemoveComments,
+      remarkGfm,
     ],
-    // Add rehype plugins here if needed in the future
     rehypePlugins: [],
   },
 });