@sonicjs-cms/core 2.0.3 → 2.0.4

package/dist/{chunk-5B3VMVEX.cjs → chunk-RZW752PE.cjs}

@@ -4,7 +4,7 @@ var chunk3NVJ6W27_cjs = require('./chunk-3NVJ6W27.cjs');
 var chunk4BJGEGX5_cjs = require('./chunk-4BJGEGX5.cjs');
 var chunkLEG4KNFP_cjs = require('./chunk-LEG4KNFP.cjs');
 var chunk3SPQ3J4N_cjs = require('./chunk-3SPQ3J4N.cjs');
-var chunkUL32L2KV_cjs = require('./chunk-UL32L2KV.cjs');
+var chunkBRPONFW6_cjs = require('./chunk-BRPONFW6.cjs');
 var chunkRCQ2HIQD_cjs = require('./chunk-RCQ2HIQD.cjs');
 var hono = require('hono');
 var cors = require('hono/cors');
@@ -334,12 +334,12 @@ apiRoutes.get("/content", async (c) => {
         });
       }
     }
-    const filter = chunkUL32L2KV_cjs.QueryFilterBuilder.parseFromQuery(queryParams);
+    const filter = chunkBRPONFW6_cjs.QueryFilterBuilder.parseFromQuery(queryParams);
     if (!filter.limit) {
       filter.limit = 50;
     }
     filter.limit = Math.min(filter.limit, 1e3);
-    const builder = new chunkUL32L2KV_cjs.QueryFilterBuilder();
+    const builder = new chunkBRPONFW6_cjs.QueryFilterBuilder();
     const queryResult = builder.build("content", filter);
     if (queryResult.errors.length > 0) {
       return c.json({
@@ -426,7 +426,7 @@ apiRoutes.get("/collections/:collection/content", async (c) => {
     if (!collectionResult) {
       return c.json({ error: "Collection not found" }, 404);
     }
-    const filter = chunkUL32L2KV_cjs.QueryFilterBuilder.parseFromQuery(queryParams);
+    const filter = chunkBRPONFW6_cjs.QueryFilterBuilder.parseFromQuery(queryParams);
     if (!filter.where) {
       filter.where = { and: [] };
     }
@@ -442,7 +442,7 @@ apiRoutes.get("/collections/:collection/content", async (c) => {
       filter.limit = 50;
     }
     filter.limit = Math.min(filter.limit, 1e3);
-    const builder = new chunkUL32L2KV_cjs.QueryFilterBuilder();
+    const builder = new chunkBRPONFW6_cjs.QueryFilterBuilder();
     const queryResult = builder.build("content", filter);
     if (queryResult.errors.length > 0) {
       return c.json({
@@ -918,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);
@@ -2346,7 +2353,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>
@@ -2414,7 +2421,7 @@ authRoutes.post("/login/form", async (c) => {
           </div>
           <script>
             setTimeout(() => {
-              window.location.href = '/admin/content';
+              window.location.href = '/admin/dashboard';
             }, 2000);
           </script>
         </div>
@@ -2707,7 +2714,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);
@@ -6716,7 +6723,7 @@ function renderUserEditPage(data) {
                     <input
                       type="text"
                       name="first_name"
-                      value="${chunkUL32L2KV_cjs.escapeHtml(data.userToEdit.firstName || "")}"
+                      value="${chunkBRPONFW6_cjs.escapeHtml(data.userToEdit.firstName || "")}"
                       required
                       class="w-full rounded-lg bg-white dark:bg-zinc-800 px-3 py-2 text-sm text-zinc-950 dark:text-white shadow-sm ring-1 ring-inset ring-zinc-950/10 dark:ring-white/10 placeholder:text-zinc-400 dark:placeholder:text-zinc-500 focus:outline-none focus:ring-2 focus:ring-zinc-950 dark:focus:ring-white transition-shadow"
                     />
@@ -6727,7 +6734,7 @@ function renderUserEditPage(data) {
                     <input
                       type="text"
                       name="last_name"
-                      value="${chunkUL32L2KV_cjs.escapeHtml(data.userToEdit.lastName || "")}"
+                      value="${chunkBRPONFW6_cjs.escapeHtml(data.userToEdit.lastName || "")}"
                       required
                       class="w-full rounded-lg bg-white dark:bg-zinc-800 px-3 py-2 text-sm text-zinc-950 dark:text-white shadow-sm ring-1 ring-inset ring-zinc-950/10 dark:ring-white/10 placeholder:text-zinc-400 dark:placeholder:text-zinc-500 focus:outline-none focus:ring-2 focus:ring-zinc-950 dark:focus:ring-white transition-shadow"
                     />
@@ -6738,7 +6745,7 @@ function renderUserEditPage(data) {
                     <input
                       type="text"
                       name="username"
-                      value="${chunkUL32L2KV_cjs.escapeHtml(data.userToEdit.username || "")}"
+                      value="${chunkBRPONFW6_cjs.escapeHtml(data.userToEdit.username || "")}"
                       required
                       class="w-full rounded-lg bg-white dark:bg-zinc-800 px-3 py-2 text-sm text-zinc-950 dark:text-white shadow-sm ring-1 ring-inset ring-zinc-950/10 dark:ring-white/10 placeholder:text-zinc-400 dark:placeholder:text-zinc-500 focus:outline-none focus:ring-2 focus:ring-zinc-950 dark:focus:ring-white transition-shadow"
                     />
@@ -6749,7 +6756,7 @@ function renderUserEditPage(data) {
                     <input
                       type="email"
                       name="email"
-                      value="${chunkUL32L2KV_cjs.escapeHtml(data.userToEdit.email || "")}"
+                      value="${chunkBRPONFW6_cjs.escapeHtml(data.userToEdit.email || "")}"
                       required
                       class="w-full rounded-lg bg-white dark:bg-zinc-800 px-3 py-2 text-sm text-zinc-950 dark:text-white shadow-sm ring-1 ring-inset ring-zinc-950/10 dark:ring-white/10 placeholder:text-zinc-400 dark:placeholder:text-zinc-500 focus:outline-none focus:ring-2 focus:ring-zinc-950 dark:focus:ring-white transition-shadow"
                     />
@@ -6760,7 +6767,7 @@ function renderUserEditPage(data) {
                     <input
                       type="tel"
                       name="phone"
-                      value="${chunkUL32L2KV_cjs.escapeHtml(data.userToEdit.phone || "")}"
+                      value="${chunkBRPONFW6_cjs.escapeHtml(data.userToEdit.phone || "")}"
                       class="w-full rounded-lg bg-white dark:bg-zinc-800 px-3 py-2 text-sm text-zinc-950 dark:text-white shadow-sm ring-1 ring-inset ring-zinc-950/10 dark:ring-white/10 placeholder:text-zinc-400 dark:placeholder:text-zinc-500 focus:outline-none focus:ring-2 focus:ring-zinc-950 dark:focus:ring-white transition-shadow"
                     />
                   </div>
@@ -6774,7 +6781,7 @@ function renderUserEditPage(data) {
                         class="col-start-1 row-start-1 w-full appearance-none rounded-md bg-white/5 dark:bg-white/5 py-1.5 pl-3 pr-8 text-base text-zinc-950 dark:text-white outline outline-1 -outline-offset-1 outline-zinc-500/30 dark:outline-zinc-400/30 *:bg-white dark:*:bg-zinc-800 focus-visible:outline focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-zinc-500 dark:focus-visible:outline-zinc-400 sm:text-sm/6"
                       >
                         ${data.roles.map((role) => `
-                          <option value="${chunkUL32L2KV_cjs.escapeHtml(role.value)}" ${data.userToEdit.role === role.value ? "selected" : ""}>${chunkUL32L2KV_cjs.escapeHtml(role.label)}</option>
+                          <option value="${chunkBRPONFW6_cjs.escapeHtml(role.value)}" ${data.userToEdit.role === role.value ? "selected" : ""}>${chunkBRPONFW6_cjs.escapeHtml(role.label)}</option>
                         `).join("")}
                       </select>
                       <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-zinc-600 dark:text-zinc-400 sm:size-4">
@@ -6790,7 +6797,7 @@ function renderUserEditPage(data) {
                     name="bio"
                     rows="3"
                     class="w-full rounded-lg bg-white dark:bg-zinc-800 px-3 py-2 text-sm text-zinc-950 dark:text-white shadow-sm ring-1 ring-inset ring-zinc-950/10 dark:ring-white/10 placeholder:text-zinc-400 dark:placeholder:text-zinc-500 focus:outline-none focus:ring-2 focus:ring-zinc-950 dark:focus:ring-white transition-shadow"
-                  >${chunkUL32L2KV_cjs.escapeHtml(data.userToEdit.bio || "")}</textarea>
+                  >${chunkBRPONFW6_cjs.escapeHtml(data.userToEdit.bio || "")}</textarea>
                 </div>
               </div>
 
@@ -7789,12 +7796,12 @@ userRoutes.put("/profile", async (c) => {
   const db = c.env.DB;
   try {
     const formData = await c.req.formData();
-    const firstName = chunkUL32L2KV_cjs.sanitizeInput(formData.get("first_name")?.toString());
-    const lastName = chunkUL32L2KV_cjs.sanitizeInput(formData.get("last_name")?.toString());
-    const username = chunkUL32L2KV_cjs.sanitizeInput(formData.get("username")?.toString());
+    const firstName = chunkBRPONFW6_cjs.sanitizeInput(formData.get("first_name")?.toString());
+    const lastName = chunkBRPONFW6_cjs.sanitizeInput(formData.get("last_name")?.toString());
+    const username = chunkBRPONFW6_cjs.sanitizeInput(formData.get("username")?.toString());
     const email = formData.get("email")?.toString()?.trim().toLowerCase() || "";
-    const phone = chunkUL32L2KV_cjs.sanitizeInput(formData.get("phone")?.toString()) || null;
-    const bio = chunkUL32L2KV_cjs.sanitizeInput(formData.get("bio")?.toString()) || null;
+    const phone = chunkBRPONFW6_cjs.sanitizeInput(formData.get("phone")?.toString()) || null;
+    const bio = chunkBRPONFW6_cjs.sanitizeInput(formData.get("bio")?.toString()) || null;
     const timezone = formData.get("timezone")?.toString() || "UTC";
     const language = formData.get("language")?.toString() || "en";
     const emailNotifications = formData.get("email_notifications") === "1";
@@ -8161,12 +8168,12 @@ userRoutes.post("/users/new", async (c) => {
   const user = c.get("user");
   try {
     const formData = await c.req.formData();
-    const firstName = chunkUL32L2KV_cjs.sanitizeInput(formData.get("first_name")?.toString());
-    const lastName = chunkUL32L2KV_cjs.sanitizeInput(formData.get("last_name")?.toString());
-    const username = chunkUL32L2KV_cjs.sanitizeInput(formData.get("username")?.toString());
+    const firstName = chunkBRPONFW6_cjs.sanitizeInput(formData.get("first_name")?.toString());
+    const lastName = chunkBRPONFW6_cjs.sanitizeInput(formData.get("last_name")?.toString());
+    const username = chunkBRPONFW6_cjs.sanitizeInput(formData.get("username")?.toString());
     const email = formData.get("email")?.toString()?.trim().toLowerCase() || "";
-    const phone = chunkUL32L2KV_cjs.sanitizeInput(formData.get("phone")?.toString()) || null;
-    const bio = chunkUL32L2KV_cjs.sanitizeInput(formData.get("bio")?.toString()) || null;
+    const phone = chunkBRPONFW6_cjs.sanitizeInput(formData.get("phone")?.toString()) || null;
+    const bio = chunkBRPONFW6_cjs.sanitizeInput(formData.get("bio")?.toString()) || null;
     const role = formData.get("role")?.toString() || "viewer";
     const password = formData.get("password")?.toString() || "";
     const confirmPassword = formData.get("confirm_password")?.toString() || "";
@@ -8367,12 +8374,12 @@ userRoutes.put("/users/:id", async (c) => {
   const userId = c.req.param("id");
   try {
     const formData = await c.req.formData();
-    const firstName = chunkUL32L2KV_cjs.sanitizeInput(formData.get("first_name")?.toString());
-    const lastName = chunkUL32L2KV_cjs.sanitizeInput(formData.get("last_name")?.toString());
-    const username = chunkUL32L2KV_cjs.sanitizeInput(formData.get("username")?.toString());
+    const firstName = chunkBRPONFW6_cjs.sanitizeInput(formData.get("first_name")?.toString());
+    const lastName = chunkBRPONFW6_cjs.sanitizeInput(formData.get("last_name")?.toString());
+    const username = chunkBRPONFW6_cjs.sanitizeInput(formData.get("username")?.toString());
     const email = formData.get("email")?.toString()?.trim().toLowerCase() || "";
-    const phone = chunkUL32L2KV_cjs.sanitizeInput(formData.get("phone")?.toString()) || null;
-    const bio = chunkUL32L2KV_cjs.sanitizeInput(formData.get("bio")?.toString()) || null;
+    const phone = chunkBRPONFW6_cjs.sanitizeInput(formData.get("phone")?.toString()) || null;
+    const bio = chunkBRPONFW6_cjs.sanitizeInput(formData.get("bio")?.toString()) || null;
     const role = formData.get("role")?.toString() || "viewer";
     const isActive = formData.get("is_active") === "1";
     const emailVerified = formData.get("email_verified") === "1";
@@ -8515,8 +8522,8 @@ userRoutes.post("/invite-user", async (c) => {
     const formData = await c.req.formData();
     const email = formData.get("email")?.toString()?.trim().toLowerCase() || "";
     const role = formData.get("role")?.toString()?.trim() || "viewer";
-    const firstName = chunkUL32L2KV_cjs.sanitizeInput(formData.get("first_name")?.toString());
-    const lastName = chunkUL32L2KV_cjs.sanitizeInput(formData.get("last_name")?.toString());
+    const firstName = chunkBRPONFW6_cjs.sanitizeInput(formData.get("first_name")?.toString());
+    const lastName = chunkBRPONFW6_cjs.sanitizeInput(formData.get("last_name")?.toString());
     if (!email || !firstName || !lastName) {
       return c.json({ error: "Email, first name, and last name are required" }, 400);
     }
@@ -9331,11 +9338,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 -->
@@ -10218,21 +10226,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();
@@ -10508,6 +10518,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.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({
@@ -16237,7 +16259,7 @@ function renderStorageUsage(databaseSizeBytes, mediaSizeBytes) {
 }
 
 // src/routes/admin-dashboard.ts
-var VERSION = chunkUL32L2KV_cjs.getCoreVersion();
+var VERSION = chunkBRPONFW6_cjs.getCoreVersion();
 var router = new hono.Hono();
 router.use("*", chunk4BJGEGX5_cjs.requireAuth());
 router.get("/", async (c) => {
@@ -16278,7 +16300,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) {
@@ -17874,11 +17896,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.html`
@@ -19999,5 +20023,5 @@ exports.api_system_default = api_system_default;
 exports.auth_default = auth_default;
 exports.router = router;
 exports.userRoutes = userRoutes;
-//# sourceMappingURL=chunk-5B3VMVEX.cjs.map
-//# sourceMappingURL=chunk-5B3VMVEX.cjs.map
+//# sourceMappingURL=chunk-RZW752PE.cjs.map
+//# sourceMappingURL=chunk-RZW752PE.cjs.map