webspresso 0.0.77 → 0.0.78

package/plugins/admin-panel/client/parts/06-login-setup-forms.js

@@ -19,7 +19,7 @@ const LoginForm = {
                 password: data.get('password'),
               });
               state.user = result.user;
-              m.route.set('/');
+              m.route.set(consumeIntendedRoute('/'));
             } catch (err) {
               state.error = err.message;
             } finally {
@@ -78,7 +78,7 @@ const SetupForm = {
           });
           state.user = result.user;
           state.needsSetup = false;
-          m.route.set('/');
+          m.route.set(consumeIntendedRoute('/'));
         } catch (err) {
           state.error = err.message;
         } finally {

package/plugins/admin-panel/index.js

@@ -119,6 +119,22 @@ function adminPanelPlugin(options = {}) {
       if (typeof configure === 'function') {
         configure(registry);
       }
+
+      // Session must be registered before file routes so SSR pages can read adminUser.
+      if (enabled && ctx.app && !ctx.app._webspressoSessionInitialized) {
+        const secret = sessionSecret || process.env.SESSION_SECRET || 'webspresso-admin-secret-change-in-production';
+        ctx.app.use(session({
+          secret,
+          resave: false,
+          saveUninitialized: false,
+          cookie: {
+            secure: process.env.NODE_ENV === 'production',
+            httpOnly: true,
+            maxAge: 24 * 60 * 60 * 1000, // 24 hours
+          },
+        }));
+        ctx.app._webspressoSessionInitialized = true;
+      }
     },
 
     /**
@@ -164,24 +180,7 @@ function adminPanelPlugin(options = {}) {
         db.registerModel(AdminUser);
       }
 
-      // Setup session middleware (only once)
-      if (!app._webspressoSessionInitialized) {
-        const secret = sessionSecret || process.env.SESSION_SECRET || 'webspresso-admin-secret-change-in-production';
-
-        app.use(session({
-          secret,
-          resave: false,
-          saveUninitialized: false,
-          cookie: {
-            secure: process.env.NODE_ENV === 'production',
-            httpOnly: true,
-            maxAge: 24 * 60 * 60 * 1000, // 24 hours
-          },
-        }));
-
-        app._webspressoSessionInitialized = true;
-      }
-
+      // Session middleware is initialized in register() (before file routes).
       // Register default modules
       registerSystemMenuItems({ registry });
       registerModelMenuItems({ registry, db });

package/plugins/admin-panel/modules/menu.js

@@ -351,6 +351,7 @@ const Sidebar = {
                 await api.post('/auth/logout');
                 state.user = null;
                 sidebarOpen = false;
+                clearIntendedRoute();
                 m.route.set('/login');
               },
             }, m(Icon, { name: 'logout', class: 'w-5 h-5' })),

package/plugins/content/admin/content-entries-component.js

@@ -0,0 +1,291 @@
+/**
+ * Content entries admin pages — Mithril component source.
+ * @module plugins/content/admin/content-entries-component
+ */
+
+/**
+ * @param {Object} [options]
+ * @param {string} [options.apiPrefix='/content']
+ */
+function generateContentEntriesComponent(options = {}) {
+  const apiPrefix = options.apiPrefix || '/content';
+
+  return `
+(function() {
+  var API = '${apiPrefix}';
+
+  function ContentEntriesListPage() {
+  var typeSlug = m.route.param('typeSlug');
+  var entries = [];
+  var typeMeta = null;
+  var loading = true;
+  var error = null;
+
+  function load() {
+    loading = true;
+    return Promise.all([
+      api.get(API + '/types/' + encodeURIComponent(typeSlug) + '/schema').catch(function() { return null; }),
+      api.get(API + '/types/' + encodeURIComponent(typeSlug) + '/entries'),
+    ]).then(function(results) {
+      if (results[0]) typeMeta = results[0].data;
+      entries = (results[1] && results[1].data) || [];
+      loading = false;
+    }).catch(function(e) {
+      error = e.message;
+      loading = false;
+    });
+  }
+
+  return {
+    oninit: load,
+    view: function() {
+      var title = typeMeta ? typeMeta.name : typeSlug;
+      return m(Layout, { breadcrumbs: [
+        { label: 'Content Types', href: '/content/types' },
+        { label: title, href: '/content/types/' + encodeURIComponent(typeSlug) + '/entries' },
+      ]}, [
+        m('.flex.items-center.justify-between.mb-6', [
+          m('h2.text-2xl.font-bold', title + ' — Entries'),
+          m('a.bg-blue-600.text-white.px-4.py-2.rounded.text-sm', {
+            href: '/content/types/' + encodeURIComponent(typeSlug) + '/entries/new',
+          }, 'New Entry'),
+        ]),
+        loading ? m('p.text-gray-500', 'Loading…') : null,
+        error ? m('.bg-red-50.text-red-700.p-4.rounded', error) : null,
+        !loading && !error ? m('.bg-white.dark:bg-slate-800.rounded-lg.shadow.overflow-hidden', [
+          m('table.w-full.text-sm', [
+            m('thead.bg-gray-50', m('tr', [
+              m('th.text-left.p-3', 'Title'),
+              m('th.text-left.p-3', 'Slug'),
+              m('th.text-left.p-3', 'Status'),
+              m('th.text-right.p-3', 'Actions'),
+            ])),
+            m('tbody', entries.map(function(e) {
+              return m('tr.border-t', [
+                m('td.p-3', e.title || '—'),
+                m('td.p-3.text-gray-500', e.slug),
+                m('td.p-3', m('span.px-2.py-0.5.rounded.text-xs', {
+                  class: e.status === 'published' ? 'bg-green-100 text-green-800' : 'bg-yellow-100 text-yellow-800',
+                }, e.status)),
+                m('td.p-3.text-right', m('a.text-blue-600', {
+                  href: '/content/types/' + encodeURIComponent(typeSlug) + '/entries/edit/' + e.id,
+                }, 'Edit')),
+              ]);
+            })),
+          ]),
+          entries.length === 0 ? m('p.p-6.text-gray-500', 'No entries yet.') : null,
+        ]) : null,
+      ]);
+    },
+  };
+  }
+
+  function fieldInput(field, formData, uploadUrl) {
+    var val = formData[field.name];
+    var label = field.label || field.name;
+
+    if (field.type === 'boolean') {
+      return m('label.flex.items-center.gap-2', [
+        m('input', { type: 'checkbox', checked: !!val, onchange: function(e) { formData[field.name] = e.target.checked; } }),
+        label,
+      ]);
+    }
+    if (field.type === 'textarea' || field.type === 'rich-text') {
+      return m('div', [
+        m('label.block.text-sm.font-medium.mb-1', label),
+        m('textarea.w-full.border.rounded.px-3.py-2.min-h-24', {
+          value: val || '',
+          oninput: function(e) { formData[field.name] = e.target.value; },
+        }),
+      ]);
+    }
+    if (field.type === 'select') {
+      return m('div', [
+        m('label.block.text-sm.font-medium.mb-1', label),
+        m('select.w-full.border.rounded.px-3.py-2', {
+          value: val || '',
+          onchange: function(e) { formData[field.name] = e.target.value; },
+        }, (field.options || []).map(function(o) { return m('option', { value: o }, o); })),
+      ]);
+    }
+    if (field.type === 'image' && uploadUrl) {
+      return m('div', [
+        m('label.block.text-sm.font-medium.mb-1', label),
+        m('input.w-full.border.rounded.px-3.py-2.mb-2', {
+          value: val || '',
+          placeholder: 'Image URL',
+          oninput: function(e) { formData[field.name] = e.target.value; },
+        }),
+        m('input', {
+          type: 'file',
+          accept: 'image/*',
+          onchange: function(e) {
+            var file = e.target.files && e.target.files[0];
+            if (!file) return;
+            var fd = new FormData();
+            fd.append('file', file);
+            fetch(uploadUrl, { method: 'POST', body: fd, credentials: 'include' })
+              .then(function(r) { return r.json(); })
+              .then(function(res) {
+                if (res.url) { formData[field.name] = res.url; m.redraw(); }
+              });
+          },
+        }),
+      ]);
+    }
+    if (field.type === 'repeater') {
+      var items = Array.isArray(val) ? val : [];
+      return m('div.space-y-3', [
+        m('label.block.text-sm.font-medium', label),
+        items.map(function(item, idx) {
+          return m('.border.rounded.p-3.space-y-2', [
+            m('.text-xs.text-gray-500', 'Item ' + (idx + 1)),
+            (field.fields || []).map(function(nf) {
+              return fieldInput(nf, item, uploadUrl);
+            }),
+            m('button.text-xs.text-red-600', {
+              type: 'button',
+              onclick: function() { items.splice(idx, 1); formData[field.name] = items; },
+            }, 'Remove'),
+          ]);
+        }),
+        m('button.text-sm.text-blue-600', {
+          type: 'button',
+          onclick: function() {
+            var row = {};
+            (field.fields || []).forEach(function(nf) { row[nf.name] = ''; });
+            items.push(row);
+            formData[field.name] = items;
+          },
+        }, '+ Add item'),
+      ]);
+    }
+    var inputType = field.type === 'number' ? 'number' : (field.type === 'date' ? 'date' : 'text');
+    return m('div', [
+      m('label.block.text-sm.font-medium.mb-1', label),
+      m('input.w-full.border.rounded.px-3.py-2', {
+        type: inputType,
+        value: val != null ? val : '',
+        oninput: function(e) {
+          formData[field.name] = field.type === 'number' ? Number(e.target.value) : e.target.value;
+        },
+      }),
+    ]);
+  }
+
+  function ContentEntryFormPage() {
+  var typeSlug = m.route.param('typeSlug');
+  var id = m.route.param('id');
+  var isNew = !id || id === 'new';
+  var schema = { fields: [] };
+  var form = { slug: '', title: '', status: 'published', data: {} };
+  var loading = true;
+  var saving = false;
+  var error = null;
+  var uploadUrl = (window.__ADMIN_CONFIG__ && window.__ADMIN_CONFIG__.uploadUrl) || null;
+
+  function load() {
+    return api.get(API + '/types/' + encodeURIComponent(typeSlug) + '/schema').then(function(res) {
+      schema = res.data.schema || { fields: [] };
+      if (!isNew) {
+        return api.get(API + '/entries/' + id).then(function(entryRes) {
+          var e = entryRes.data;
+          form.slug = e.slug;
+          form.title = e.title || '';
+          form.status = e.status || 'published';
+          form.data = e.data || {};
+          loading = false;
+        });
+      }
+      loading = false;
+    }).catch(function(e) {
+      error = e.message;
+      loading = false;
+    });
+  }
+
+  return {
+    oninit: load,
+    view: function() {
+      if (loading) return m(Layout, m('p.p-8', 'Loading…'));
+      return m(Layout, { breadcrumbs: [
+        { label: 'Content Types', href: '/content/types' },
+        { label: typeSlug, href: '/content/types/' + encodeURIComponent(typeSlug) + '/entries' },
+        { label: isNew ? 'New' : 'Edit', href: '#' },
+      ]}, [
+        m('h2.text-2xl.font-bold.mb-6', isNew ? 'New Entry' : 'Edit Entry'),
+        error ? m('.bg-red-50.text-red-700.p-4.rounded.mb-4', error) : null,
+        m('form.bg-white.dark:bg-slate-800.rounded-lg.shadow.p-6.space-y-4', {
+          onsubmit: function(e) {
+            e.preventDefault();
+            saving = true;
+            var payload = {
+              slug: form.slug,
+              title: form.title || null,
+              status: form.status,
+              data: form.data,
+            };
+            var req = isNew
+              ? api.post(API + '/types/' + encodeURIComponent(typeSlug) + '/entries', payload)
+              : api.put(API + '/entries/' + id, payload);
+            req.then(function() {
+              m.route.set('/content/types/' + encodeURIComponent(typeSlug) + '/entries');
+            }).catch(function(err) {
+              error = err.message;
+              saving = false;
+              m.redraw();
+            });
+          },
+        }, [
+          m('.grid.grid-cols-2.gap-4', [
+            m('div', [
+              m('label.block.text-sm.font-medium.mb-1', 'Slug'),
+              m('input.w-full.border.rounded.px-3.py-2', {
+                value: form.slug,
+                disabled: !isNew,
+                oninput: function(e) { form.slug = e.target.value; },
+              }),
+            ]),
+            m('div', [
+              m('label.block.text-sm.font-medium.mb-1', 'Title'),
+              m('input.w-full.border.rounded.px-3.py-2', {
+                value: form.title,
+                oninput: function(e) { form.title = e.target.value; },
+              }),
+            ]),
+          ]),
+          m('div', [
+            m('label.block.text-sm.font-medium.mb-1', 'Status'),
+            m('select.w-full.border.rounded.px-3.py-2', {
+              value: form.status,
+              onchange: function(e) { form.status = e.target.value; },
+            }, [
+              m('option', { value: 'published' }, 'Published'),
+              m('option', { value: 'draft' }, 'Draft'),
+            ]),
+          ]),
+          m('hr'),
+          schema.fields.map(function(f) {
+            return fieldInput(f, form.data, uploadUrl);
+          }),
+          m('.flex.justify-end.gap-3', [
+            m('a.px-4.py-2.border.rounded', {
+              href: '/content/types/' + encodeURIComponent(typeSlug) + '/entries',
+            }, 'Cancel'),
+            m('button.px-4.py-2.bg-blue-600.text-white.rounded', { disabled: saving }, saving ? 'Saving…' : 'Save'),
+          ]),
+        ]),
+      ]);
+    },
+  };
+  }
+
+  window.__customPages = window.__customPages || {};
+  window.__customPages['content-entries'] = ContentEntriesListPage;
+  window.__customPages['content-entries-new'] = ContentEntryFormPage;
+  window.__customPages['content-entries-edit'] = ContentEntryFormPage;
+})();
+`;
+}
+
+module.exports = { generateContentEntriesComponent };

package/plugins/content/admin/content-types-component.js

@@ -0,0 +1,250 @@
+/**
+ * Content types admin page — Mithril component source.
+ * @module plugins/content/admin/content-types-component
+ */
+
+/**
+ * @param {Object} [options]
+ * @param {string} [options.apiPrefix='/content']
+ */
+function generateContentTypesComponent(options = {}) {
+  const apiPrefix = options.apiPrefix || '/content';
+
+  return `
+(function() {
+  var API = '${apiPrefix}';
+  var FIELD_TYPES = ['text','textarea','rich-text','number','boolean','image','url','date','select','repeater'];
+
+  function emptyField() {
+    return { name: '', type: 'text', label: '', required: false, options: [], fields: [] };
+  }
+
+  function ContentTypesListPage() {
+  var types = [];
+  var loading = true;
+  var error = null;
+
+  function load() {
+    loading = true;
+    error = null;
+    return api.get(API + '/types').then(function(res) {
+      types = res.data || [];
+      loading = false;
+    }).catch(function(e) {
+      error = e.message || String(e);
+      loading = false;
+    });
+  }
+
+  return {
+    oninit: load,
+    view: function() {
+      return m(Layout, { breadcrumbs: [{ label: 'Content Types', href: '/content/types' }] }, [
+        m('.flex.items-center.justify-between.mb-6', [
+          m('h2.text-2xl.font-bold.text-gray-900.dark:text-slate-100', 'Content Types'),
+          m('a.bg-blue-600.text-white.px-4.py-2.rounded-lg.text-sm', { href: '/content/types/new' }, 'New Type'),
+        ]),
+        loading ? m('p.text-gray-500', 'Loading…') : null,
+        error ? m('.bg-red-50.text-red-700.p-4.rounded', error) : null,
+        !loading && !error ? m('.bg-white.dark:bg-slate-800.rounded-lg.shadow.overflow-hidden', [
+          m('table.w-full.text-sm', [
+            m('thead.bg-gray-50.dark:bg-slate-900', m('tr', [
+              m('th.text-left.p-3', 'Name'),
+              m('th.text-left.p-3', 'Slug'),
+              m('th.text-left.p-3', 'Fields'),
+              m('th.text-right.p-3', 'Actions'),
+            ])),
+            m('tbody', types.map(function(t) {
+              return m('tr.border-t.border-gray-100.dark:border-slate-700', [
+                m('td.p-3.font-medium', t.name),
+                m('td.p-3.text-gray-500', t.slug),
+                m('td.p-3.text-gray-500', (t.schema && t.schema.fields ? t.schema.fields.length : 0)),
+                m('td.p-3.text-right.space-x-2', [
+                  m('a.text-blue-600', { href: '/content/types/' + encodeURIComponent(t.slug) + '/entries' }, 'Entries'),
+                  m('a.text-gray-600', { href: '/content/types/edit/' + t.id }, 'Edit'),
+                ]),
+              ]);
+            })),
+          ]),
+          types.length === 0 ? m('p.p-6.text-gray-500', 'No content types yet.') : null,
+        ]) : null,
+      ]);
+    },
+  };
+  }
+
+  function ContentTypeFormPage() {
+  var id = m.route.param('id');
+  var isNew = !id || id === 'new';
+  var form = { slug: '', name: '', description: '', schema: { fields: [emptyField()] } };
+  var loading = !isNew;
+  var saving = false;
+  var error = null;
+
+  function load() {
+    if (isNew) return Promise.resolve();
+    return api.get(API + '/types/' + id).then(function(res) {
+      var d = res.data;
+      form.slug = d.slug;
+      form.name = d.name;
+      form.description = d.description || '';
+      form.schema = d.schema || { fields: [] };
+      if (!form.schema.fields || form.schema.fields.length === 0) {
+        form.schema.fields = [emptyField()];
+      }
+      loading = false;
+    }).catch(function(e) {
+      error = e.message;
+      loading = false;
+    });
+  }
+
+  function renderFieldEditor(field, path, onRemove) {
+    return m('.border.border-gray-200.dark:border-slate-600.rounded.p-4.space-y-3', [
+      m('.grid.grid-cols-2.gap-3', [
+        m('div', [
+          m('label.block.text-xs.text-gray-500.mb-1', 'Name'),
+          m('input.w-full.border.rounded.px-2.py-1', {
+            value: field.name,
+            oninput: function(e) { field.name = e.target.value; },
+          }),
+        ]),
+        m('div', [
+          m('label.block.text-xs.text-gray-500.mb-1', 'Type'),
+          m('select.w-full.border.rounded.px-2.py-1', {
+            value: field.type,
+            onchange: function(e) { field.type = e.target.value; },
+          }, FIELD_TYPES.map(function(t) { return m('option', { value: t }, t); })),
+        ]),
+        m('div', [
+          m('label.block.text-xs.text-gray-500.mb-1', 'Label'),
+          m('input.w-full.border.rounded.px-2.py-1', {
+            value: field.label || '',
+            oninput: function(e) { field.label = e.target.value; },
+          }),
+        ]),
+        m('div.flex.items-end', [
+          m('label.flex.items-center.gap-2.text-sm', [
+            m('input', { type: 'checkbox', checked: !!field.required, onchange: function(e) { field.required = e.target.checked; } }),
+            'Required',
+          ]),
+        ]),
+      ]),
+      field.type === 'select' ? m('div', [
+        m('label.block.text-xs.text-gray-500.mb-1', 'Options (comma-separated)'),
+        m('input.w-full.border.rounded.px-2.py-1', {
+          value: (field.options || []).join(', '),
+          oninput: function(e) {
+            field.options = e.target.value.split(',').map(function(s) { return s.trim(); }).filter(Boolean);
+          },
+        }),
+      ]) : null,
+      field.type === 'repeater' ? m('.pl-4.border-l-2.border-blue-200.space-y-2', [
+        m('p.text-xs.text-gray-500', 'Nested fields'),
+        (field.fields || []).map(function(nf, idx) {
+          return renderFieldEditor(nf, path + '.fields.' + idx, function() {
+            field.fields.splice(idx, 1);
+          });
+        }),
+        m('button.text-sm.text-blue-600', {
+          type: 'button',
+          onclick: function() {
+            field.fields = field.fields || [];
+            field.fields.push(emptyField());
+          },
+        }, '+ Add nested field'),
+      ]) : null,
+      onRemove ? m('button.text-sm.text-red-600', { type: 'button', onclick: onRemove }, 'Remove field') : null,
+    ]);
+  }
+
+  return {
+    oninit: load,
+    view: function() {
+      if (loading) return m(Layout, m('p.p-8.text-gray-500', 'Loading…'));
+      return m(Layout, { breadcrumbs: [
+        { label: 'Content Types', href: '/content/types' },
+        { label: isNew ? 'New' : 'Edit', href: '#' },
+      ]}, [
+        m('h2.text-2xl.font-bold.mb-6', isNew ? 'New Content Type' : 'Edit Content Type'),
+        error ? m('.bg-red-50.text-red-700.p-4.rounded.mb-4', error) : null,
+        m('form.bg-white.dark:bg-slate-800.rounded-lg.shadow.p-6.space-y-4', {
+          onsubmit: function(e) {
+            e.preventDefault();
+            saving = true;
+            error = null;
+            var payload = {
+              slug: form.slug,
+              name: form.name,
+              description: form.description || null,
+              schema: form.schema,
+            };
+            var req = isNew
+              ? api.post(API + '/types', payload)
+              : api.put(API + '/types/' + id, payload);
+            req.then(function() {
+              m.route.set('/content/types');
+            }).catch(function(err) {
+              error = err.message;
+              saving = false;
+              m.redraw();
+            });
+          },
+        }, [
+          m('.grid.grid-cols-2.gap-4', [
+            m('div', [
+              m('label.block.text-sm.font-medium.mb-1', 'Slug'),
+              m('input.w-full.border.rounded.px-3.py-2', {
+                value: form.slug,
+                disabled: !isNew,
+                oninput: function(e) { form.slug = e.target.value; },
+              }),
+            ]),
+            m('div', [
+              m('label.block.text-sm.font-medium.mb-1', 'Name'),
+              m('input.w-full.border.rounded.px-3.py-2', {
+                value: form.name,
+                oninput: function(e) { form.name = e.target.value; },
+              }),
+            ]),
+          ]),
+          m('div', [
+            m('label.block.text-sm.font-medium.mb-1', 'Description'),
+            m('textarea.w-full.border.rounded.px-3.py-2', {
+              value: form.description,
+              oninput: function(e) { form.description = e.target.value; },
+            }),
+          ]),
+          m('div', [
+            m('.flex.items-center.justify-between.mb-2', [
+              m('h3.font-semibold', 'Fields'),
+              m('button.text-sm.text-blue-600', {
+                type: 'button',
+                onclick: function() { form.schema.fields.push(emptyField()); },
+              }, '+ Add field'),
+            ]),
+            form.schema.fields.map(function(f, i) {
+              return renderFieldEditor(f, String(i), function() {
+                form.schema.fields.splice(i, 1);
+              });
+            }),
+          ]),
+          m('.flex.justify-end.gap-3.pt-4', [
+            m('a.px-4.py-2.border.rounded', { href: '/content/types' }, 'Cancel'),
+            m('button.px-4.py-2.bg-blue-600.text-white.rounded', { disabled: saving }, saving ? 'Saving…' : 'Save'),
+          ]),
+        ]),
+      ]);
+    },
+  };
+  }
+
+  window.__customPages = window.__customPages || {};
+  window.__customPages['content-types'] = ContentTypesListPage;
+  window.__customPages['content-types-new'] = ContentTypeFormPage;
+  window.__customPages['content-types-edit'] = ContentTypeFormPage;
+})();
+`;
+}
+
+module.exports = { generateContentTypesComponent };