@raketa-cloud/admin 0.0.12 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "main": "src/index.js",
   "scripts": {
     "dev": "npx tailwindcss -i ./src/styles/application.css -o ../../apps/admin/static/application.css --watch",

package/src/Adapter.js

@@ -125,6 +125,7 @@ export default class Adapter {
 
   async renderLayout(assigns, body) {
     const layoutTemplate = `${currentPath}/views/layouts/application.ejs`;
+
     return await ejs.renderFile(layoutTemplate, {
       ...assigns,
       body,

package/src/HonoAdapter.js

@@ -84,113 +84,117 @@ export default class HonoAdapter extends Adapter {
   ]) {
     const method = this.getMethod(verb);
 
-    [...Object.keys(this.globalConfig.i18n.locales), ""].forEach(
-      (currentLocale) => {
-        const completedPath = `/${currentLocale}${path}`;
-
-        method(completedPath, async (routerCtx, next) => {
-          const ctx = await this.createContext(
-            routerCtx,
-            next,
-            verb,
-            resource,
-            action
-          );
-
-          ctx.locales = this.globalConfig.i18n.locales;
-          ctx.defaultLocale = this.globalConfig.i18n.defaultLocale;
-          ctx.locale = currentLocale;
-
-          const _context = {
-            locales: ctx.locales,
-            locale: ctx.locale,
-            defaultLocale: ctx.defaultLocale,
-            path: ctx.req.path,
-            query: ctx.query || {},
-          };
-
-          console.info(
-            `\x1b[35m[${ctx.method}] ${ctx.rawPath}\x1b[0m -> ${resource}/${action} | ${JSON.stringify(ctx.params)}`
-          );
-
-          const assigns = {
-            beforeFilterAssigns: {},
-            actionAssigns: {},
-            afterFilterAssigns: {},
-          };
-
-          // Initialize global context
-          ctx.initGlobalContext();
-
-          // Process before filters
-          if (before_filter) {
-            const {
-              redirect,
-              json,
-              assigns: beforeFilterAssigns = {},
-            } = before_filter(ctx) || {};
-
-            if (redirect) return routerCtx.redirect(redirect);
-
-            if (json) {
-              return routerCtx.json(json);
-            }
-
-            assigns.beforeFilterAssigns = beforeFilterAssigns;
-          }
-
-          // Process action
+    Object.keys(this.globalConfig.i18n.locales).forEach((currentLocale) => {
+      const completePath = `/${currentLocale}${path}`;
+
+      // A terrible, terrible hack...
+      // So how do we override for the entire handler.. do we need to completely override it, or just partially? Fun stuff?
+      this.router.router.routes = this.router.router.routes.filter((route) => {
+        return route[0] !== verb || route[1] !== completePath;
+      });
+
+      method(completePath, async (routerCtx, next) => {
+        const ctx = await this.createContext(
+          routerCtx,
+          next,
+          verb,
+          resource,
+          action
+        );
+
+        ctx.locales = this.globalConfig.i18n.locales;
+        ctx.defaultLocale = this.globalConfig.i18n.defaultLocale;
+        ctx.locale = currentLocale;
+
+        const _context = {
+          locales: ctx.locales,
+          locale: ctx.locale,
+          defaultLocale: ctx.defaultLocale,
+          path: ctx.req.path,
+          query: ctx.query || {},
+        };
+
+        console.info(
+          `\x1b[35m[${ctx.method}] ${ctx.rawPath}\x1b[0m -> ${resource}/${action} | ${JSON.stringify(ctx.params)}`
+        );
+
+        const assigns = {
+          beforeFilterAssigns: {},
+          actionAssigns: {},
+          afterFilterAssigns: {},
+        };
+
+        // Initialize global context
+        ctx.initGlobalContext();
+
+        // Process before filters
+        if (before_filter) {
           const {
-            headers,
             redirect,
             json,
-            assigns: actionAssigns = {},
-          } = (await handler(ctx)) || {};
-          assigns.actionAssigns = actionAssigns;
-
-          this.applyHeaders(headers, routerCtx);
+            assigns: beforeFilterAssigns = {},
+          } = before_filter(ctx) || {};
 
           if (redirect) return routerCtx.redirect(redirect);
 
-          // Process after filters
-          if (after_filter) {
-            const {
-              redirect,
-              json,
-              assigns: afterFilterAssigns = {},
-            } = after_filter(ctx) || {};
+          if (json) {
+            return routerCtx.json(json);
+          }
 
-            if (redirect) return routerCtx.redirect(redirect);
+          assigns.beforeFilterAssigns = beforeFilterAssigns;
+        }
 
-            if (json) {
-              return routerCtx.json(json);
-            }
+        // Process action
+        const {
+          headers,
+          redirect,
+          json,
+          assigns: actionAssigns = {},
+        } = (await handler(ctx)) || {};
+        assigns.actionAssigns = actionAssigns;
 
-            assigns.afterFilterAssigns = afterFilterAssigns;
-          }
+        this.applyHeaders(headers, routerCtx);
+
+        if (redirect) return routerCtx.redirect(redirect);
+
+        // Process after filters
+        if (after_filter) {
+          const {
+            redirect,
+            json,
+            assigns: afterFilterAssigns = {},
+          } = after_filter(ctx) || {};
 
-          const fullAssigns = {
-            ...ctx.assigns,
-            ...assigns.beforeFilterAssigns,
-            ...assigns.actionAssigns,
-            ...assigns.afterFilterAssigns,
-            _context: _context,
-          };
+          if (redirect) return routerCtx.redirect(redirect);
 
           if (json) {
             return routerCtx.json(json);
           }
 
-          const rendered = this.renderAction({
-            views,
-            action,
-            assigns: fullAssigns,
-          });
-
-          return routerCtx.html(rendered);
+          assigns.afterFilterAssigns = afterFilterAssigns;
+        }
+
+        const fullAssigns = {
+          ...ctx.assigns,
+          ...assigns.beforeFilterAssigns,
+          ...assigns.actionAssigns,
+          ...assigns.afterFilterAssigns,
+          _context: _context,
+        };
+
+        if (json) {
+          return routerCtx.json(json);
+        }
+
+        const rendered = this.renderAction({
+          views,
+          action,
+          assigns: fullAssigns,
         });
-      }
-    );
+
+        return routerCtx.html(rendered);
+      });
+    });
   }
 
   routeCollection(mapping) {

package/src/views/page_revisions/_nav.ejs

@@ -37,4 +37,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

package/src/views/page_revisions/visuals/edit_form.ejs

@@ -39,4 +39,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>