millas 0.1.2 → 0.1.3

package/src/admin/views/pages/form.njk

@@ -0,0 +1,145 @@
+{% extends "layouts/base.njk" %}
+
+{% block title %}{{ 'Edit' if isEdit else 'New' }} {{ resource.singular }}{% endblock %}
+{% block topbar_title %}{{ resource.icon }} {{ 'Edit' if isEdit else 'New' }} {{ resource.singular }}{% endblock %}
+
+{% block content %}
+<div class="breadcrumb">
+  <a href="{{ adminPrefix }}/">Dashboard</a>
+  <span class="breadcrumb-sep">›</span>
+  <a href="{{ adminPrefix }}/{{ resource.slug }}">{{ resource.label }}</a>
+  <span class="breadcrumb-sep">›</span>
+  <span>{{ 'Edit #' + record.id if isEdit else 'New' }}</span>
+</div>
+
+<div class="card" style="max-width:720px">
+  <div class="card-header">
+    <span class="card-title">{{ 'Edit ' + resource.singular + ' #' + record.id if isEdit else 'Create ' + resource.singular }}</span>
+  </div>
+  <div class="card-body">
+    <form method="POST" action="{{ formAction }}">
+      {% if isEdit %}
+      <input type="hidden" name="_method" value="PUT">
+      {% endif %}
+
+      {% if errors | length %}
+      <div class="alert alert-error" style="margin-bottom:20px">
+        <div>
+          <strong>Please fix the following errors:</strong>
+          <ul style="margin-top:6px;padding-left:16px">
+            {% for field, msgs in errors %}
+            <li>{{ msgs[0] }}</li>
+            {% endfor %}
+          </ul>
+        </div>
+      </div>
+      {% endif %}
+
+      <div class="form-grid">
+        {% for field in formFields %}
+        <div class="form-group {% if field.type == 'textarea' or field.type == 'json' %}full{% endif %}">
+          <label class="form-label">
+            {{ field.label }}
+            {% if field.required %}<span class="required">*</span>{% endif %}
+          </label>
+
+          {% set val = record[field.name] if record[field.name] is defined else '' %}
+          {% set hasError = errors[field.name] is defined %}
+
+          {% if field.type == 'select' and field.options %}
+          <select name="{{ field.name }}" class="form-control {% if hasError %}error{% endif %}">
+            <option value="">— Select —</option>
+            {% for opt in field.options %}
+            <option value="{{ opt }}" {% if val == opt %}selected{% endif %}>{{ opt }}</option>
+            {% endfor %}
+          </select>
+
+          {% elif field.type == 'boolean' %}
+          <select name="{{ field.name }}" class="form-control">
+            <option value="1" {% if val %}selected{% endif %}>Yes</option>
+            <option value="0" {% if not val %}selected{% endif %}>No</option>
+          </select>
+
+          {% elif field.type == 'textarea' %}
+          <textarea
+            name="{{ field.name }}"
+            class="form-control {% if hasError %}error{% endif %}"
+            placeholder="{{ field.placeholder or '' }}"
+            rows="4">{{ val }}</textarea>
+
+          {% elif field.type == 'json' %}
+          <textarea
+            name="{{ field.name }}"
+            class="form-control {% if hasError %}error{% endif %}"
+            placeholder='{"key": "value"}'
+            style="font-family:monospace;font-size:12px"
+            rows="5">{{ val | dump if val else '' }}</textarea>
+
+          {% elif field.type == 'password' %}
+          <input
+            type="password"
+            name="{{ field.name }}"
+            class="form-control {% if hasError %}error{% endif %}"
+            placeholder="{{ 'Leave blank to keep current' if isEdit else '' }}">
+
+          {% elif field.type == 'email' %}
+          <input
+            type="email"
+            name="{{ field.name }}"
+            value="{{ val }}"
+            class="form-control {% if hasError %}error{% endif %}"
+            placeholder="{{ field.placeholder or '' }}">
+
+          {% elif field.type == 'number' %}
+          <input
+            type="number"
+            name="{{ field.name }}"
+            value="{{ val }}"
+            class="form-control {% if hasError %}error{% endif %}"
+            placeholder="{{ field.placeholder or '0' }}">
+
+          {% elif field.type == 'date' %}
+          <input
+            type="date"
+            name="{{ field.name }}"
+            value="{{ val }}"
+            class="form-control {% if hasError %}error{% endif %}">
+
+          {% else %}
+          <input
+            type="text"
+            name="{{ field.name }}"
+            value="{{ val }}"
+            class="form-control {% if hasError %}error{% endif %}"
+            placeholder="{{ field.placeholder or '' }}">
+          {% endif %}
+
+          {% if hasError %}
+          <span class="form-error">{{ errors[field.name][0] }}</span>
+          {% elif field.help %}
+          <span class="form-help">{{ field.help }}</span>
+          {% endif %}
+        </div>
+        {% endfor %}
+      </div>
+
+      <div class="flex items-center gap-2" style="margin-top:24px;padding-top:20px;border-top:1px solid var(--border)">
+        <button type="submit" class="btn btn-primary">
+          {{ '💾 Save Changes' if isEdit else '＋ Create ' + resource.singular }}
+        </button>
+        <a href="{{ adminPrefix }}/{{ resource.slug }}" class="btn btn-ghost">Cancel</a>
+        {% if isEdit and resource.canDelete %}
+        <button type="button" class="btn btn-danger" style="margin-left:auto"
+          onclick="confirmDelete('{{ adminPrefix }}/{{ resource.slug }}/{{ record.id }}/delete', '{{ resource.singular }} #{{ record.id }}')">
+          Delete
+        </button>
+        {% endif %}
+      </div>
+    </form>
+  </div>
+</div>
+
+<style>
+  .form-control.error { border-color: var(--danger); }
+</style>
+{% endblock %}

package/src/admin/views/pages/list.njk

@@ -0,0 +1,164 @@
+{% extends "layouts/base.njk" %}
+
+{% block title %}{{ resource.label }}{% endblock %}
+{% block topbar_title %}{{ resource.icon }} {{ resource.label }}{% endblock %}
+
+{% block topbar_actions %}
+  {% if resource.canCreate %}
+  <a href="{{ adminPrefix }}/{{ resource.slug }}/create" class="btn btn-primary">
+    <span>＋</span> New {{ resource.singular }}
+  </a>
+  {% endif %}
+{% endblock %}
+
+{% block content %}
+<div class="breadcrumb">
+  <a href="{{ adminPrefix }}/">Dashboard</a>
+  <span class="breadcrumb-sep">›</span>
+  <span>{{ resource.label }}</span>
+</div>
+
+<div class="card">
+  {# ── Toolbar ── #}
+  <div class="card-header">
+    <span class="card-title text-muted text-sm">{{ total }} record{{ 's' if total != 1 }}</span>
+    <div class="flex items-center gap-2 ml-auto">
+      {# Search #}
+      <form method="GET" action="{{ adminPrefix }}/{{ resource.slug }}" style="display:flex;gap:8px">
+        <input type="hidden" name="sort"  value="{{ sort }}">
+        <input type="hidden" name="order" value="{{ order }}">
+        {% if filters | length %}
+        {% for key, val in activeFilters %}
+        <input type="hidden" name="filter[{{ key }}]" value="{{ val }}">
+        {% endfor %}
+        {% endif %}
+        <div class="search-wrap">
+          <span class="search-icon">🔍</span>
+          <input
+            type="text" name="search"
+            value="{{ search }}"
+            placeholder="Search..."
+            class="form-control search-input">
+        </div>
+        <button type="submit" class="btn btn-ghost">Search</button>
+        {% if search %}
+        <a href="{{ adminPrefix }}/{{ resource.slug }}" class="btn btn-ghost">✕ Clear</a>
+        {% endif %}
+      </form>
+    </div>
+  </div>
+
+  {# ── Filters row ── #}
+  {% if filters | length %}
+  <div style="padding:12px 20px;border-bottom:1px solid var(--border);display:flex;gap:10px;flex-wrap:wrap">
+    <form method="GET" action="{{ adminPrefix }}/{{ resource.slug }}" style="display:flex;gap:8px;flex-wrap:wrap;align-items:center">
+      <input type="hidden" name="search" value="{{ search }}">
+      <input type="hidden" name="sort"   value="{{ sort }}">
+      <input type="hidden" name="order"  value="{{ order }}">
+      {% for filter in filters %}
+      <div style="display:flex;flex-direction:column;gap:4px">
+        <label class="form-label" style="font-size:10px">{{ filter.label }}</label>
+        {% if filter.type == 'select' %}
+        <select name="filter[{{ filter.name }}]" class="form-control" style="width:auto;min-width:120px" onchange="this.form.submit()">
+          <option value="">All</option>
+          {% for opt in filter.options %}
+          <option value="{{ opt }}" {% if activeFilters[filter.name] == opt %}selected{% endif %}>{{ opt }}</option>
+          {% endfor %}
+        </select>
+        {% elif filter.type == 'boolean' %}
+        <select name="filter[{{ filter.name }}]" class="form-control" style="width:auto;min-width:100px" onchange="this.form.submit()">
+          <option value="">All</option>
+          <option value="1" {% if activeFilters[filter.name] == '1' %}selected{% endif %}>Yes</option>
+          <option value="0" {% if activeFilters[filter.name] == '0' %}selected{% endif %}>No</option>
+        </select>
+        {% endif %}
+      </div>
+      {% endfor %}
+      {% if activeFilters | length %}
+      <a href="{{ adminPrefix }}/{{ resource.slug }}{% if search %}?search={{ search }}{% endif %}" class="btn btn-ghost btn-sm" style="align-self:flex-end">✕ Reset filters</a>
+      {% endif %}
+    </form>
+  </div>
+  {% endif %}
+
+  {# ── Table ── #}
+  <div class="table-wrap">
+    {% if rows | length %}
+    <table>
+      <thead>
+        <tr>
+          {% for field in listFields %}
+          <th class="{% if field.name in sortable %}sortable{% endif %} {% if sort == field.name %}sort-{{ order }}{% endif %}">
+            {% if field.name in sortable %}
+            <a href="{{ adminPrefix }}/{{ resource.slug }}?sort={{ field.name }}&order={{ 'desc' if (sort == field.name and order == 'asc') else 'asc' }}&search={{ search }}&page={{ page }}" style="color:inherit;text-decoration:none">
+              {{ field.label }}
+            </a>
+            {% else %}
+            {{ field.label }}
+            {% endif %}
+          </th>
+          {% endfor %}
+          {% if resource.canEdit or resource.canDelete %}
+          <th class="col-actions">Actions</th>
+          {% endif %}
+        </tr>
+      </thead>
+      <tbody>
+        {% for row in rows %}
+        <tr>
+          {% for field in listFields %}
+          <td>{{ row[field.name] | adminCell(field) | safe }}</td>
+          {% endfor %}
+          {% if resource.canEdit or resource.canDelete %}
+          <td class="col-actions">
+            <div class="flex items-center gap-2" style="justify-content:flex-end">
+              {% if resource.canEdit %}
+              <a href="{{ adminPrefix }}/{{ resource.slug }}/{{ row.id }}/edit" class="btn btn-ghost btn-sm">Edit</a>
+              {% endif %}
+              {% if resource.canDelete %}
+              <button onclick="confirmDelete('{{ adminPrefix }}/{{ resource.slug }}/{{ row.id }}/delete', '#{{ row.id }}')" class="btn btn-danger btn-sm">Delete</button>
+              {% endif %}
+            </div>
+          </td>
+          {% endif %}
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+
+    {# ── Pagination ── #}
+    {% if lastPage > 1 %}
+    <div class="pagination">
+      <button class="page-btn" {% if page <= 1 %}disabled{% endif %}
+        onclick="location.href='{{ adminPrefix }}/{{ resource.slug }}?page={{ page - 1 }}&sort={{ sort }}&order={{ order }}&search={{ search }}'">‹</button>
+      {% for p in range(1, lastPage + 1) %}
+        {% if p <= 3 or p >= lastPage - 1 or (p >= page - 1 and p <= page + 1) %}
+        <button class="page-btn {% if p == page %}active{% endif %}"
+          onclick="location.href='{{ adminPrefix }}/{{ resource.slug }}?page={{ p }}&sort={{ sort }}&order={{ order }}&search={{ search }}'">{{ p }}</button>
+        {% elif p == 4 and page > 5 %}
+        <span style="color:var(--text-muted);padding:0 4px">…</span>
+        {% endif %}
+      {% endfor %}
+      <button class="page-btn" {% if page >= lastPage %}disabled{% endif %}
+        onclick="location.href='{{ adminPrefix }}/{{ resource.slug }}?page={{ page + 1 }}&sort={{ sort }}&order={{ order }}&search={{ search }}'">›</button>
+      <span class="page-info">
+        {{ (page - 1) * perPage + 1 }}–{{ [page * perPage, total] | min }} of {{ total }}
+      </span>
+    </div>
+    {% endif %}
+
+    {% else %}
+    <div class="empty-state">
+      <div class="empty-icon">{{ resource.icon }}</div>
+      <div class="empty-title">No {{ resource.label }} found</div>
+      <div class="empty-desc">
+        {% if search %}No results for "{{ search }}".{% else %}Get started by creating your first record.{% endif %}
+      </div>
+      {% if resource.canCreate %}
+      <a href="{{ adminPrefix }}/{{ resource.slug }}/create" class="btn btn-primary">＋ New {{ resource.singular }}</a>
+      {% endif %}
+    </div>
+    {% endif %}
+  </div>
+</div>
+{% endblock %}

package/src/container/Application.js

@@ -92,7 +92,38 @@ class Application {
   }
 
   /**
-   * Bind all routes onto the Express app + mount error handlers.
+   * Bind all routes onto the Express app.
+   * Does NOT add 404/error fallbacks — call mountFallbacks() after
+   * registering any extra middleware (e.g. Admin panel).
+   *
+   * Typical usage:
+   *   app.mountRoutes();
+   *   Admin.mount(expressApp);   // admin routes added here
+   *   app.mountFallbacks();      // 404 + error handler last
+   *
+   * Or use app.mount() which does all three in one call.
+   */
+  mountRoutes() {
+    this._router = new Router(this._express, this._route.getRegistry(), this._mwRegistry);
+    this._router.mountRoutes();
+    return this;
+  }
+
+  /**
+   * Add 404 + global error handlers. Must be called LAST.
+   */
+  mountFallbacks() {
+    if (!this._router) {
+      this._router = new Router(this._express, this._route.getRegistry(), this._mwRegistry);
+    }
+    this._router.mountFallbacks();
+    return this;
+  }
+
+  /**
+   * Bind routes + add 404/error handlers in one call.
+   * Use this when NOT using the Admin panel, or when Admin
+   * is mounted before this call.
    */
   mount() {
     const router = new Router(this._express, this._route.getRegistry(), this._mwRegistry);

package/src/router/Router.js

@@ -25,6 +25,54 @@ class Router {
 
   /**
    * Bind all registered routes onto the Express app.
+   * Does NOT add 404/error handlers — call mountFallbacks() after
+   * all other middleware (like Admin) has been registered.
+   */
+  mountRoutes() {
+    const routes = this._registry.all();
+    for (const route of routes) {
+      this._bindRoute(route);
+    }
+    return this;
+  }
+
+  /**
+   * Add the 404 + global error handlers.
+   * Must be called LAST — after all routes and admin panels.
+   */
+  mountFallbacks() {
+    // 404 handler
+    this._app.use((req, res) => {
+      res.status(404).json({
+        error:   'Not Found',
+        message: `Cannot ${req.method} ${req.path}`,
+        status:  404,
+      });
+    });
+
+    // Global error handler
+    this._app.use((err, req, res, _next) => {
+      const status  = err.status || err.statusCode || 500;
+      const message = err.message || 'Internal Server Error';
+
+      if (status >= 500 && process.env.NODE_ENV !== 'production') {
+        console.error(err.stack);
+      }
+
+      res.status(status).json({
+        error:   status >= 500 ? 'Internal Server Error' : message,
+        message,
+        status,
+        ...(err.errors && { errors: err.errors }),
+        ...(status >= 500 && process.env.NODE_ENV !== 'production' && { stack: err.stack }),
+      });
+    });
+    return this;
+  }
+
+  /**
+   * Bind all registered routes onto the Express app
+   * AND add 404/error handlers (original behaviour).
    */
   mount() {
     const routes = this._registry.all();

package/src/scaffold/templates.js

@@ -90,35 +90,25 @@ require('dotenv').config();
 
 const express = require('express');
 
-/**
- * Resolve the millas package whether installed locally (node_modules)
- * or used from a globally installed CLI (millas serve).
- */
 function resolveMillas() {
-  // 1. Try local node_modules first (preferred)
   try { return require('millas/src'); } catch {}
-  // 2. Try resolving from the global CLI location
   try {
     const path     = require('path');
     const cliPath  = require.resolve('millas/bin/millas.js');
     const millasSrc = path.join(path.dirname(cliPath), '..', 'src', 'index.js');
     return require(millasSrc);
   } catch {}
-  throw new Error(
-    'Cannot find millas. Run: npm install millas\\n' +
-    'Or install globally: npm install -g millas'
-  );
+  throw new Error('Cannot find millas. Run: npm install millas');
 }
 
 const {
   Application,
-  DatabaseServiceProvider,
+  Admin,
   CacheServiceProvider,
   StorageServiceProvider,
   MailServiceProvider,
   QueueServiceProvider,
   EventServiceProvider,
-  AuthServiceProvider,
 } = resolveMillas();
 
 const AppServiceProvider = require('../providers/AppServiceProvider');
@@ -138,7 +128,6 @@ app.providers([
   QueueServiceProvider,
   EventServiceProvider,
   AppServiceProvider,
-  // AuthServiceProvider,  // uncomment when you have a User model
 ]);
 
 // ── Define routes ────────────────────────────────────────────────
@@ -152,7 +141,17 @@ app.routes(Route => {
   await app.boot();
 
   if (!process.env.MILLAS_ROUTE_LIST) {
-    app.mount();
+    // Register app routes first (without 404 handler yet)
+    app.mountRoutes();
+
+    // Admin panel mounts here — before the 404 fallback
+    // To disable: comment out this line
+    // To change path: Admin.configure({ prefix: '/cms' });
+    Admin.mount(expressApp);
+
+    // Add 404 + error handlers LAST
+    app.mountFallbacks();
+
     app.listen();
   }
 })();
@@ -169,19 +168,13 @@ module.exports = { app, expressApp, get route() { return app.route; } };
  * Define your web-facing routes here using the Millas Route API.
  *
  *   Route.get('/path', ControllerClass, 'method')
- *   Route.get('/path', (req, res) => res.json({ ... }))   // closure
- *   Route.resource('/posts', PostController)               // full CRUD
- *   Route.group({ prefix: '/admin', middleware: ['auth'] }, () => { ... })
+ *   Route.get('/path', (req, res) => res.json({ ... }))
+ *   Route.resource('/posts', PostController)
+ *   Route.group({ prefix: '/v1', middleware: ['auth'] }, () => { ... })
+ *   Route.auth('/auth')   — registers all auth routes
  */
 module.exports = function (Route) {
-  Route.get('/', (req, res) => {
-    res.json({
-      framework: 'Millas',
-      version:   '0.1.0',
-      message:   'Welcome to your Millas application!',
-      docs:      'https://millas.dev/docs',
-    });
-  });
+  // Your web routes here
 };
 `,
 
@@ -189,10 +182,7 @@ module.exports = function (Route) {
     'routes/api.js': `'use strict';
 
 /**
- * API Routes
- *
- * All routes here are prefixed with /api.
- * Add Route.middleware(['auth']) to protect routes.
+ * API Routes — all routes are prefixed with /api
  */
 module.exports = function (Route) {
   Route.prefix('/api').group(() => {
@@ -201,6 +191,9 @@ module.exports = function (Route) {
       res.json({ status: 'ok', timestamp: new Date().toISOString() });
     });
 
+    // Your API routes here
+    // Route.resource('/users', UserController);
+
   });
 };
 `,