@sonicjs-cms/core 2.0.3 → 2.0.5

package/dist/{chunk-PPUKPNTP.js → chunk-LGC3TNCY.js}

@@ -1,8 +1,8 @@
-import { getCacheService, CACHE_CONFIGS, getLogger } from './chunk-LH4Z7QID.js';
-import { requireAuth, isPluginActive, requireRole, AuthManager, logActivity } from './chunk-M6FPVS7E.js';
-import { PluginService, MigrationService } from './chunk-CDBVZEWR.js';
+import { getCacheService, CACHE_CONFIGS, getLogger, SettingsService } from './chunk-6FR25MPC.js';
+import { requireAuth, isPluginActive, requireRole, AuthManager, logActivity } from './chunk-G5KY3WJV.js';
+import { PluginService, MigrationService } from './chunk-HSRPDEQQ.js';
 import { init_admin_layout_catalyst_template, renderDesignPage, renderCheckboxPage, renderFAQList, renderTestimonialsList, renderCodeExamplesList, renderAlert, renderTable, renderPagination, renderConfirmationDialog, getConfirmationDialogScript, renderAdminLayoutCatalyst, renderAdminLayout, adminLayoutV2, renderForm } from './chunk-3LZ6TLPC.js';
-import { QueryFilterBuilder, sanitizeInput, getCoreVersion, escapeHtml } from './chunk-XJETEIRU.js';
+import { QueryFilterBuilder, sanitizeInput, getCoreVersion, escapeHtml } from './chunk-VSLEA22M.js';
 import { metricsTracker } from './chunk-FICTAGD4.js';
 import { Hono } from 'hono';
 import { cors } from 'hono/cors';
@@ -78,7 +78,7 @@ apiContentCrudRoutes.post("/", requireAuth(), async (c) => {
       title,
       JSON.stringify(data || {}),
       status || "draft",
-      user?.userId || "unknown",
+      user?.userId || "system",
       now,
       now
     ).run();
@@ -671,6 +671,7 @@ apiMediaRoutes.post("/upload", async (c) => {
         size: mediaRecord.size,
         width: mediaRecord.width,
         height: mediaRecord.height,
+        r2_key: mediaRecord.r2_key,
         publicUrl: mediaRecord.public_url,
         thumbnailUrl: mediaRecord.thumbnail_url,
         uploadedAt: new Date(mediaRecord.uploaded_at * 1e3).toISOString()
@@ -797,6 +798,7 @@ apiMediaRoutes.post("/upload-multiple", async (c) => {
           size: mediaRecord.size,
           width: mediaRecord.width,
           height: mediaRecord.height,
+          r2_key: mediaRecord.r2_key,
           publicUrl: mediaRecord.public_url,
           thumbnailUrl: mediaRecord.thumbnail_url,
           uploadedAt: new Date(mediaRecord.uploaded_at * 1e3).toISOString()
@@ -916,10 +918,17 @@ apiMediaRoutes.post("/create-folder", async (c) => {
     }
     const checkStmt = c.env.DB.prepare("SELECT COUNT(*) as count FROM media WHERE folder = ? AND deleted_at IS NULL");
     const existingFolder = await checkStmt.bind(folderName).first();
+    if (existingFolder && existingFolder.count > 0) {
+      return c.json({
+        success: false,
+        error: `Folder "${folderName}" already exists`
+      }, 400);
+    }
     return c.json({
       success: true,
-      message: `Folder "${folderName}" created successfully`,
-      folder: folderName
+      message: `Folder "${folderName}" is ready. Upload files to this folder to make it appear in the media library.`,
+      folder: folderName,
+      note: "Folders appear automatically when you upload files to them"
     });
   } catch (error) {
     console.error("Create folder error:", error);
@@ -1433,8 +1442,12 @@ adminApiRoutes.get("/activity", async (c) => {
 });
 var createCollectionSchema = z.object({
   name: z.string().min(1).max(255).regex(/^[a-z0-9_]+$/, "Must contain only lowercase letters, numbers, and underscores"),
-  display_name: z.string().min(1).max(255),
+  displayName: z.string().min(1).max(255).optional(),
+  display_name: z.string().min(1).max(255).optional(),
   description: z.string().optional()
+}).refine((data) => data.displayName || data.display_name, {
+  message: "Either displayName or display_name is required",
+  path: ["displayName"]
 });
 var updateCollectionSchema = z.object({
   display_name: z.string().min(1).max(255).optional(),
@@ -1521,15 +1534,16 @@ adminApiRoutes.get("/collections/:id", async (c) => {
       updated_at: Number(row.updated_at)
     }));
     return c.json({
-      data: {
-        ...collection,
-        is_active: collection.is_active === 1,
-        managed: collection.managed === 1,
-        schema: collection.schema ? JSON.parse(collection.schema) : null,
-        created_at: Number(collection.created_at),
-        updated_at: Number(collection.updated_at),
-        fields
-      }
+      id: collection.id,
+      name: collection.name,
+      display_name: collection.display_name,
+      description: collection.description,
+      is_active: collection.is_active === 1,
+      managed: collection.managed === 1,
+      schema: collection.schema ? JSON.parse(collection.schema) : null,
+      created_at: Number(collection.created_at),
+      updated_at: Number(collection.updated_at),
+      fields
     });
   } catch (error) {
     console.error("Error fetching collection:", error);
@@ -1538,7 +1552,16 @@ adminApiRoutes.get("/collections/:id", async (c) => {
 });
 adminApiRoutes.post("/collections", async (c) => {
   try {
-    const body = await c.req.json();
+    const contentType = c.req.header("Content-Type");
+    if (!contentType || !contentType.includes("application/json")) {
+      return c.json({ error: "Content-Type must be application/json" }, 400);
+    }
+    let body;
+    try {
+      body = await c.req.json();
+    } catch (e) {
+      return c.json({ error: "Invalid JSON in request body" }, 400);
+    }
     const validation = createCollectionSchema.safeParse(body);
     if (!validation.success) {
       return c.json({ error: "Validation failed", details: validation.error.errors }, 400);
@@ -1546,6 +1569,7 @@ adminApiRoutes.post("/collections", async (c) => {
     const validatedData = validation.data;
     const db = c.env.DB;
     const user = c.get("user");
+    const displayName = validatedData.displayName || validatedData.display_name || "";
     const existingStmt = db.prepare("SELECT id FROM collections WHERE name = ?");
     const existing = await existingStmt.bind(validatedData.name).first();
     if (existing) {
@@ -1582,7 +1606,7 @@ adminApiRoutes.post("/collections", async (c) => {
     await insertStmt.bind(
       collectionId,
       validatedData.name,
-      validatedData.display_name,
+      displayName,
       validatedData.description || null,
       JSON.stringify(basicSchema),
       1,
@@ -1597,13 +1621,11 @@ adminApiRoutes.post("/collections", async (c) => {
       console.error("Error clearing cache:", e);
     }
     return c.json({
-      data: {
-        id: collectionId,
-        name: validatedData.name,
-        display_name: validatedData.display_name,
-        description: validatedData.description,
-        created_at: now
-      }
+      id: collectionId,
+      name: validatedData.name,
+      displayName,
+      description: validatedData.description,
+      created_at: now
     }, 201);
   } catch (error) {
     console.error("Error creating collection:", error);
@@ -1667,6 +1689,11 @@ adminApiRoutes.delete("/collections/:id", async (c) => {
   try {
     const id = c.req.param("id");
     const db = c.env.DB;
+    const collectionStmt = db.prepare("SELECT name FROM collections WHERE id = ?");
+    const collection = await collectionStmt.bind(id).first();
+    if (!collection) {
+      return c.json({ error: "Collection not found" }, 404);
+    }
     const contentStmt = db.prepare("SELECT COUNT(*) as count FROM content WHERE collection_id = ?");
     const contentResult = await contentStmt.bind(id).first();
     if (contentResult && contentResult.count > 0) {
@@ -1674,17 +1701,13 @@ adminApiRoutes.delete("/collections/:id", async (c) => {
         error: `Cannot delete collection: it contains ${contentResult.count} content item(s). Delete all content first.`
       }, 400);
     }
-    const collectionStmt = db.prepare("SELECT name FROM collections WHERE id = ?");
-    const collection = await collectionStmt.bind(id).first();
     const deleteFieldsStmt = db.prepare("DELETE FROM content_fields WHERE collection_id = ?");
     await deleteFieldsStmt.bind(id).run();
     const deleteStmt = db.prepare("DELETE FROM collections WHERE id = ?");
     await deleteStmt.bind(id).run();
     try {
       await c.env.CACHE_KV.delete("cache:collections:all");
-      if (collection) {
-        await c.env.CACHE_KV.delete(`cache:collection:${collection.name}`);
-      }
+      await c.env.CACHE_KV.delete(`cache:collection:${collection.name}`);
     } catch (e) {
       console.error("Error clearing cache:", e);
     }
@@ -2344,7 +2367,7 @@ authRoutes.post("/register/form", async (c) => {
         Account created successfully! Redirecting to admin dashboard...
         <script>
           setTimeout(() => {
-            window.location.href = '/admin/content';
+            window.location.href = '/admin/dashboard';
           }, 2000);
         </script>
       </div>
@@ -2412,7 +2435,7 @@ authRoutes.post("/login/form", async (c) => {
           </div>
           <script>
             setTimeout(() => {
-              window.location.href = '/admin/content';
+              window.location.href = '/admin/dashboard';
             }, 2000);
           </script>
         </div>
@@ -2705,7 +2728,7 @@ authRoutes.post("/accept-invitation", async (c) => {
       maxAge: 60 * 60 * 24
       // 24 hours
     });
-    return c.redirect("/admin/content?welcome=true");
+    return c.redirect("/admin/dashboard?welcome=true");
   } catch (error) {
     console.error("Accept invitation error:", error);
     return c.json({ error: "Failed to accept invitation" }, 500);
@@ -5183,11 +5206,11 @@ adminContentRoutes.post("/", async (c) => {
     const now = Date.now();
     const insertStmt = db.prepare(`
       INSERT INTO content (
-        id, collection_id, slug, title, data, status, 
+        id, collection_id, slug, title, data, status,
         scheduled_publish_at, scheduled_unpublish_at,
-        meta_title, meta_description, author_id, created_at, updated_at
+        meta_title, meta_description, author_id, created_by, created_at, updated_at
       )
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
     await insertStmt.bind(
       contentId,
@@ -5201,6 +5224,7 @@ adminContentRoutes.post("/", async (c) => {
       data.meta_title || null,
       data.meta_description || null,
       user?.userId || "unknown",
+      user?.userId || "unknown",
       now,
       now
     ).run();
@@ -5502,10 +5526,10 @@ adminContentRoutes.post("/duplicate", async (c) => {
     originalData.title = `${originalData.title || "Untitled"} (Copy)`;
     const insertStmt = db.prepare(`
       INSERT INTO content (
-        id, collection_id, slug, title, data, status, 
-        author_id, created_at, updated_at
+        id, collection_id, slug, title, data, status,
+        author_id, created_by, created_at, updated_at
       )
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
     await insertStmt.bind(
       newId,
@@ -5516,6 +5540,7 @@ adminContentRoutes.post("/duplicate", async (c) => {
       "draft",
       // Always start as draft
       user?.userId || "unknown",
+      user?.userId || "unknown",
       now,
       now
     ).run();
@@ -5866,6 +5891,11 @@ var admin_content_default = adminContentRoutes;
 
 // src/templates/pages/admin-profile.template.ts
 init_admin_layout_catalyst_template();
+function renderAvatarImage(avatarUrl, firstName, lastName) {
+  return `<div id="avatar-image-container" class="w-24 h-24 rounded-full mx-auto mb-4 overflow-hidden bg-gradient-to-br from-cyan-400 to-purple-400 flex items-center justify-center ring-4 ring-zinc-950/5 dark:ring-white/10">
+    ${avatarUrl ? `<img src="${avatarUrl}" alt="Profile picture" class="w-full h-full object-cover">` : `<span class="text-2xl font-bold text-white">${firstName.charAt(0)}${lastName.charAt(0)}</span>`}
+  </div>`;
+}
 function renderProfilePage(data) {
   const pageContent = `
     <div class="space-y-8">
@@ -6064,9 +6094,7 @@ function renderProfilePage(data) {
             <h3 class="text-base font-semibold text-zinc-950 dark:text-white mb-4">Profile Picture</h3>
 
             <div class="text-center">
-              <div class="w-24 h-24 rounded-full mx-auto mb-4 overflow-hidden bg-gradient-to-br from-cyan-400 to-purple-400 flex items-center justify-center ring-4 ring-zinc-950/5 dark:ring-white/10">
-                ${data.profile.avatar_url ? `<img src="${data.profile.avatar_url}" alt="Profile picture" class="w-full h-full object-cover">` : `<span class="text-2xl font-bold text-white">${data.profile.first_name.charAt(0)}${data.profile.last_name.charAt(0)}</span>`}
-              </div>
+              ${renderAvatarImage(data.profile.avatar_url, data.profile.first_name, data.profile.last_name)}
 
               <form id="avatar-form" hx-post="/admin/profile/avatar" hx-target="#avatar-messages" hx-encoding="multipart/form-data">
                 <input
@@ -7902,6 +7930,10 @@ userRoutes.post("/profile/avatar", async (c) => {
       WHERE id = ?
     `);
     await updateStmt.bind(avatarUrl, Date.now(), user.userId).run();
+    const userStmt = db.prepare(`
+      SELECT first_name, last_name FROM users WHERE id = ?
+    `);
+    const userData = await userStmt.bind(user.userId).first();
     await logActivity(
       db,
       user.userId,
@@ -7912,11 +7944,18 @@ userRoutes.post("/profile/avatar", async (c) => {
       c.req.header("x-forwarded-for") || c.req.header("cf-connecting-ip"),
       c.req.header("user-agent")
     );
-    return c.html(renderAlert2({
+    const alertHtml = renderAlert2({
       type: "success",
       message: "Profile picture updated successfully!",
       dismissible: true
-    }));
+    });
+    const avatarUrlWithCache = `${avatarUrl}?t=${Date.now()}`;
+    const avatarImageHtml = renderAvatarImage(avatarUrlWithCache, userData.first_name, userData.last_name);
+    const avatarImageWithOob = avatarImageHtml.replace(
+      'id="avatar-image-container"',
+      'id="avatar-image-container" hx-swap-oob="true"'
+    );
+    return c.html(alertHtml + avatarImageWithOob);
   } catch (error) {
     console.error("Avatar upload error:", error);
     return c.html(renderAlert2({
@@ -9148,8 +9187,10 @@ function renderMediaLibraryPage(data) {
                 </button>
                 <button
                   class="w-full text-left px-3 py-2 text-sm text-zinc-700 dark:text-zinc-300 hover:text-zinc-950 dark:hover:text-white hover:bg-zinc-50 dark:hover:bg-zinc-800/50 rounded-lg transition-colors"
-                  hx-delete="/media/cleanup"
+                  hx-delete="/admin/media/cleanup"
                   hx-confirm="Delete unused files?"
+                  hx-target="body"
+                  hx-swap="beforeend"
                 >
                   Cleanup Unused
                 </button>
@@ -9329,11 +9370,12 @@ function renderMediaLibraryPage(data) {
         </div>
         
         <!-- Upload Form -->
-        <form 
+        <form
           id="upload-form"
           hx-post="/admin/media/upload"
           hx-encoding="multipart/form-data"
           hx-target="#upload-results"
+          hx-on::after-request="if(event.detail.successful) { setTimeout(() => { window.location.href = '/admin/media?t=' + Date.now(); }, 1500); }"
           class="space-y-4"
         >
           <!-- Drag and Drop Zone -->
@@ -10216,21 +10258,23 @@ adminMediaRoutes.get("/", async (c) => {
     const { results } = await stmt.bind(...params).all();
     const foldersStmt = db.prepare(`
       SELECT folder, COUNT(*) as count, SUM(size) as totalSize
-      FROM media 
-      GROUP BY folder 
+      FROM media
+      WHERE deleted_at IS NULL
+      GROUP BY folder
       ORDER BY folder
     `);
     const { results: folders } = await foldersStmt.all();
     const typesStmt = db.prepare(`
-      SELECT 
-        CASE 
+      SELECT
+        CASE
           WHEN mime_type LIKE 'image/%' THEN 'images'
           WHEN mime_type LIKE 'video/%' THEN 'videos'
           WHEN mime_type IN ('application/pdf', 'text/plain') THEN 'documents'
           ELSE 'other'
         END as type,
         COUNT(*) as count
-      FROM media 
+      FROM media
+      WHERE deleted_at IS NULL
       GROUP BY type
     `);
     const { results: types } = await typesStmt.all();
@@ -10506,6 +10550,18 @@ adminMediaRoutes.post("/upload", async (c) => {
     }
     const uploadResults = [];
     const errors = [];
+    console.log("[MEDIA UPLOAD] c.env keys:", Object.keys(c.env));
+    console.log("[MEDIA UPLOAD] MEDIA_BUCKET defined?", !!c.env.MEDIA_BUCKET);
+    console.log("[MEDIA UPLOAD] MEDIA_BUCKET type:", typeof c.env.MEDIA_BUCKET);
+    if (!c.env.MEDIA_BUCKET) {
+      console.error("[MEDIA UPLOAD] MEDIA_BUCKET is not available! Available env keys:", Object.keys(c.env));
+      return c.html(html`
+        <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded">
+          Media storage (R2) is not configured. Please check your wrangler.toml configuration.
+          <br><small>Debug: Available bindings: ${Object.keys(c.env).join(", ")}</small>
+        </div>
+      `);
+    }
     for (const file of files) {
       try {
         const validation = fileValidationSchema2.safeParse({
@@ -10737,6 +10793,87 @@ adminMediaRoutes.put("/:id", async (c) => {
     `);
   }
 });
+adminMediaRoutes.delete("/cleanup", requireRole("admin"), async (c) => {
+  try {
+    const db = c.env.DB;
+    const allMediaStmt = db.prepare("SELECT id, r2_key, filename FROM media WHERE deleted_at IS NULL");
+    const { results: allMedia } = await allMediaStmt.all();
+    const contentStmt = db.prepare("SELECT data FROM content");
+    const { results: contentRecords } = await contentStmt.all();
+    const referencedUrls = /* @__PURE__ */ new Set();
+    for (const record of contentRecords) {
+      if (record.data) {
+        const dataStr = typeof record.data === "string" ? record.data : JSON.stringify(record.data);
+        const urlMatches = dataStr.matchAll(/\/files\/([^\s"',]+)/g);
+        for (const match of urlMatches) {
+          referencedUrls.add(match[1]);
+        }
+      }
+    }
+    const unusedFiles = allMedia.filter((file) => !referencedUrls.has(file.r2_key));
+    if (unusedFiles.length === 0) {
+      return c.html(html`
+        <div class="bg-blue-100 border border-blue-400 text-blue-700 px-4 py-3 rounded">
+          No unused media files found. All files are referenced in content.
+        </div>
+        <script>
+          setTimeout(() => {
+            window.location.href = '/admin/media?t=' + Date.now();
+          }, 2000);
+        </script>
+      `);
+    }
+    let deletedCount = 0;
+    const errors = [];
+    for (const file of unusedFiles) {
+      try {
+        await c.env.MEDIA_BUCKET.delete(file.r2_key);
+        const deleteStmt = db.prepare("UPDATE media SET deleted_at = ? WHERE id = ?");
+        await deleteStmt.bind(Math.floor(Date.now() / 1e3), file.id).run();
+        deletedCount++;
+      } catch (error) {
+        console.error(`Failed to delete ${file.filename}:`, error);
+        errors.push({
+          filename: file.filename,
+          error: error instanceof Error ? error.message : "Unknown error"
+        });
+      }
+    }
+    return c.html(html`
+      <div class="bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded mb-4">
+        Successfully cleaned up ${deletedCount} unused media file${deletedCount !== 1 ? "s" : ""}.
+        ${errors.length > 0 ? html`
+          <br><span class="text-sm">Failed to delete ${errors.length} file${errors.length !== 1 ? "s" : ""}.</span>
+        ` : ""}
+      </div>
+
+      ${errors.length > 0 ? html`
+        <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded">
+          <p class="font-medium">Cleanup errors:</p>
+          <ul class="list-disc list-inside mt-2 text-sm">
+            ${errors.map((error) => html`
+              <li>${error.filename}: ${error.error}</li>
+            `)}
+          </ul>
+        </div>
+      ` : ""}
+
+      <script>
+        // Refresh media library after cleanup
+        setTimeout(() => {
+          window.location.href = '/admin/media?t=' + Date.now();
+        }, 2500);
+      </script>
+    `);
+  } catch (error) {
+    console.error("Cleanup error:", error);
+    return c.html(html`
+      <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded">
+        Cleanup failed: ${error instanceof Error ? error.message : "Unknown error"}
+      </div>
+    `);
+  }
+});
 adminMediaRoutes.delete("/:id", async (c) => {
   try {
     const user = c.get("user");
@@ -16276,7 +16413,7 @@ router.get("/stats", async (c) => {
     }
     let contentCount = 0;
     try {
-      const contentStmt = db.prepare("SELECT COUNT(*) as count FROM content WHERE deleted_at IS NULL");
+      const contentStmt = db.prepare("SELECT COUNT(*) as count FROM content");
       const contentResult = await contentStmt.first();
       contentCount = contentResult?.count || 0;
     } catch (error) {
@@ -16300,14 +16437,14 @@ router.get("/stats", async (c) => {
     } catch (error) {
       console.error("Error fetching users count:", error);
     }
-    const html9 = renderStatsCards({
+    const html8 = renderStatsCards({
       collections: collectionsCount,
       contentItems: contentCount,
       mediaFiles: mediaCount,
       users: usersCount,
       mediaSize
     });
-    return c.html(html9);
+    return c.html(html8);
   } catch (error) {
     console.error("Error fetching stats:", error);
     return c.html('<div class="text-red-500">Failed to load statistics</div>');
@@ -16331,8 +16468,8 @@ router.get("/storage", async (c) => {
     } catch (error) {
       console.error("Error fetching media size:", error);
     }
-    const html9 = renderStorageUsage(databaseSize, mediaSize);
-    return c.html(html9);
+    const html8 = renderStorageUsage(databaseSize, mediaSize);
+    return c.html(html8);
   } catch (error) {
     console.error("Error fetching storage usage:", error);
     return c.html('<div class="text-red-500">Failed to load storage information</div>');
@@ -16381,12 +16518,12 @@ router.get("/recent-activity", async (c) => {
         user: userName
       };
     });
-    const html9 = renderRecentActivity(activities);
-    return c.html(html9);
+    const html8 = renderRecentActivity(activities);
+    return c.html(html8);
   } catch (error) {
     console.error("Error fetching recent activity:", error);
-    const html9 = renderRecentActivity([]);
-    return c.html(html9);
+    const html8 = renderRecentActivity([]);
+    return c.html(html8);
   }
 });
 router.get("/api/metrics", async (c) => {
@@ -16399,7 +16536,7 @@ router.get("/api/metrics", async (c) => {
 });
 router.get("/system-status", async (c) => {
   try {
-    const html9 = `
+    const html8 = `
       <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
         <div class="relative group">
           <div class="absolute inset-0 bg-gradient-to-br from-blue-500/20 to-cyan-500/20 dark:from-blue-500/10 dark:to-cyan-500/10 rounded-xl opacity-0 group-hover:opacity-100 transition-opacity duration-300"></div>
@@ -16454,7 +16591,7 @@ router.get("/system-status", async (c) => {
         </div>
       </div>
     `;
-    return c.html(html9);
+    return c.html(html8);
   } catch (error) {
     console.error("Error fetching system status:", error);
     return c.html('<div class="text-red-500">Failed to load system status</div>');
@@ -17872,11 +18009,13 @@ adminCollectionsRoutes.post("/", async (c) => {
       now,
       now
     ).run();
-    try {
-      await c.env.CACHE_KV.delete("cache:collections:all");
-      await c.env.CACHE_KV.delete(`cache:collection:${name}`);
-    } catch (e) {
-      console.error("Error clearing cache:", e);
+    if (c.env.CACHE_KV) {
+      try {
+        await c.env.CACHE_KV.delete("cache:collections:all");
+        await c.env.CACHE_KV.delete(`cache:collection:${name}`);
+      } catch (e) {
+        console.error("Error clearing cache:", e);
+      }
     }
     if (isHtmx) {
       return c.html(html`
@@ -18208,31 +18347,52 @@ function renderSettingsPage(data) {
       // Initialize tab-specific features on page load
       const currentTab = '${activeTab}';
 
-      function saveAllSettings() {
+      async function saveAllSettings() {
         // Collect all form data
         const formData = new FormData();
-        
-        // Get all form inputs
-        document.querySelectorAll('input, select, textarea').forEach(input => {
+
+        // Get all form inputs in the settings content area
+        document.querySelectorAll('#settings-content input, #settings-content select, #settings-content textarea').forEach(input => {
           if (input.type === 'checkbox') {
-            formData.append(input.name, input.checked);
+            formData.append(input.name, input.checked ? 'true' : 'false');
           } else if (input.name) {
             formData.append(input.name, input.value);
           }
         });
-        
+
         // Show loading state
         const saveBtn = document.querySelector('button[onclick="saveAllSettings()"]');
         const originalText = saveBtn.innerHTML;
-        saveBtn.innerHTML = 'Saving...';
+        saveBtn.innerHTML = '<svg class="animate-spin -ml-0.5 mr-1.5 h-5 w-5 inline" fill="none" stroke="currentColor" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"></path></svg>Saving...';
         saveBtn.disabled = true;
-        
-        // Simulate save (replace with actual API call)
-        setTimeout(() => {
+
+        try {
+          // Determine which endpoint to call based on current tab
+          let endpoint = '/admin/settings/general';
+          if (currentTab === 'general') {
+            endpoint = '/admin/settings/general';
+          }
+          // Add more endpoints for other tabs when implemented
+
+          const response = await fetch(endpoint, {
+            method: 'POST',
+            body: formData
+          });
+
+          const result = await response.json();
+
+          if (result.success) {
+            showNotification(result.message || 'Settings saved successfully!', 'success');
+          } else {
+            showNotification(result.error || 'Failed to save settings', 'error');
+          }
+        } catch (error) {
+          console.error('Error saving settings:', error);
+          showNotification('Failed to save settings. Please try again.', 'error');
+        } finally {
           saveBtn.innerHTML = originalText;
           saveBtn.disabled = false;
-          showNotification('Settings saved successfully!', 'success');
-        }, 1000);
+        }
       }
       
       function resetSettings() {
@@ -19637,15 +19797,20 @@ function getMockSettings(user) {
 adminSettingsRoutes.get("/", (c) => {
   return c.redirect("/admin/settings/general");
 });
-adminSettingsRoutes.get("/general", (c) => {
+adminSettingsRoutes.get("/general", async (c) => {
   const user = c.get("user");
+  const db = c.env.DB;
+  const settingsService = new SettingsService(db);
+  const generalSettings = await settingsService.getGeneralSettings(user?.email);
+  const mockSettings = getMockSettings(user);
+  mockSettings.general = generalSettings;
   const pageData = {
     user: user ? {
       name: user.email,
       email: user.email,
       role: user.role
     } : void 0,
-    settings: getMockSettings(user),
+    settings: mockSettings,
     activeTab: "general",
     version: c.get("appVersion")
   };
@@ -19926,28 +20091,55 @@ adminSettingsRoutes.post("/api/database-tools/truncate", async (c) => {
     }, 500);
   }
 });
-adminSettingsRoutes.post("/", async (c) => {
+adminSettingsRoutes.post("/general", async (c) => {
   try {
+    const user = c.get("user");
+    if (!user || user.role !== "admin") {
+      return c.json({
+        success: false,
+        error: "Unauthorized. Admin access required."
+      }, 403);
+    }
     const formData = await c.req.formData();
-    return c.html(html`
-      <div class="bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded">
-        Settings saved successfully!
-        <script>
-          setTimeout(() => {
-            showNotification('Settings saved successfully!', 'success');
-          }, 100);
-        </script>
-      </div>
-    `);
+    const db = c.env.DB;
+    const settingsService = new SettingsService(db);
+    const settings = {
+      siteName: formData.get("siteName"),
+      siteDescription: formData.get("siteDescription"),
+      adminEmail: formData.get("adminEmail"),
+      timezone: formData.get("timezone"),
+      language: formData.get("language"),
+      maintenanceMode: formData.get("maintenanceMode") === "true"
+    };
+    if (!settings.siteName || !settings.siteDescription) {
+      return c.json({
+        success: false,
+        error: "Site name and description are required"
+      }, 400);
+    }
+    const success = await settingsService.saveGeneralSettings(settings);
+    if (success) {
+      return c.json({
+        success: true,
+        message: "General settings saved successfully!"
+      });
+    } else {
+      return c.json({
+        success: false,
+        error: "Failed to save settings"
+      }, 500);
+    }
   } catch (error) {
-    console.error("Error saving settings:", error);
-    return c.html(html`
-      <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded">
-        Failed to save settings. Please try again.
-      </div>
-    `);
+    console.error("Error saving general settings:", error);
+    return c.json({
+      success: false,
+      error: "Failed to save settings. Please try again."
+    }, 500);
   }
 });
+adminSettingsRoutes.post("/", async (c) => {
+  return c.redirect("/admin/settings/general");
+});
 
 // src/routes/index.ts
 var ROUTES_INFO = {
@@ -19978,5 +20170,5 @@ var ROUTES_INFO = {
 };
 
 export { ROUTES_INFO, adminCheckboxRoutes, adminCollectionsRoutes, adminDesignRoutes, adminLogsRoutes, adminMediaRoutes, adminPluginRoutes, adminSettingsRoutes, admin_api_default, admin_code_examples_default, admin_content_default, admin_faq_default, admin_testimonials_default, api_content_crud_default, api_default, api_media_default, api_system_default, auth_default, router, userRoutes };
-//# sourceMappingURL=chunk-PPUKPNTP.js.map
-//# sourceMappingURL=chunk-PPUKPNTP.js.map
+//# sourceMappingURL=chunk-LGC3TNCY.js.map
+//# sourceMappingURL=chunk-LGC3TNCY.js.map