nodebb-plugin-calendar-onekite 11.1.12 → 11.1.13

package/library.js

@@ -1,5 +1,10 @@
 'use strict';
 
+// We use NodeBB's route helpers for page routes so the rendered page includes
+// the normal client bundle (ajaxify/requirejs). The helper signatures differ
+// across NodeBB versions, but for NodeBB v4.x the order is:
+//   setupPageRoute(router, path, middlewaresArray, handler)
+//   setupAdminPageRoute(router, path, middlewaresArray, handler)
 const routeHelpers = require.main.require('./src/routes/helpers');
 
 const controllers = require('./lib/controllers');
@@ -15,18 +20,11 @@ const mw = (...fns) => fns.filter(isFn);
 Plugin.init = async function (params) {
   const { router, middleware } = params;
 
-  // Public page
-  const publicMws = mw(middleware.exposeUid, middleware.buildHeader);
-  router.get('/calendar', ...publicMws, controllers.renderCalendar);
-
-// ACP page
-  const adminPageMws = mw(
-    middleware.exposeUid,
-    middleware.ensureLoggedIn,
-    middleware.admin && middleware.admin.checkPrivileges,
-    middleware.admin && middleware.admin.buildHeader
-  );
-  router.get('/admin/plugins/calendar-onekite', ...adminPageMws, admin.renderAdmin);
+  // Page routes (HTML)
+  // IMPORTANT: pass an ARRAY for middlewares (even if empty), otherwise
+  // setupPageRoute will throw "middlewares is not iterable".
+  routeHelpers.setupPageRoute(router, '/calendar', mw(), controllers.renderCalendar);
+  routeHelpers.setupAdminPageRoute(router, '/admin/plugins/calendar-onekite', mw(), admin.renderAdmin);
 
 // Public API (JSON)
   router.get('/api/v3/plugins/calendar-onekite/events', mw(middleware.exposeUid), api.getEvents);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.1.12",
+  "version": "11.1.13",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -1,6 +1,6 @@
-/* global FullCalendar */
+/* global FullCalendar, ajaxify */
 
-define('forum/calendar-onekite', ['alerts', 'bootbox'], function (alerts, bootbox) {
+define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alerts, bootbox, hooks) {
   'use strict';
 
   function showAlert(type, msg) {
@@ -137,6 +137,24 @@ define('forum/calendar-onekite', ['alerts', 'bootbox'], function (alerts, bootbo
     calendar.render();
   }
 
+  // Auto-init on /calendar when ajaxify finishes rendering.
+  function autoInit(data) {
+    try {
+      const tpl = data && data.template ? data.template.name : (ajaxify && ajaxify.data && ajaxify.data.template ? ajaxify.data.template.name : '');
+      if (tpl === 'calendar-onekite') {
+        init('#onekite-calendar');
+      }
+    } catch (e) {}
+  }
+
+  if (hooks && typeof hooks.on === 'function') {
+    hooks.on('action:ajaxify.end', autoInit);
+  }
+
+  // In case the page is served as the initial load (no ajaxify navigation)
+  // call once after current tick.
+  setTimeout(() => autoInit({ template: (ajaxify && ajaxify.data && ajaxify.data.template) || { name: '' } }), 0);
+
   return {
     init,
   };

package/templates/admin/plugins/calendar-onekite.tpl

@@ -1,3 +1,5 @@
+<!-- IMPORT admin/partials/settings/header.tpl -->
+
 <div class="acp-page-container">
   <div class="row">
     <div class="col-lg-8">
@@ -74,6 +76,8 @@
   </div>
 </div>
 
+<!-- IMPORT admin/partials/settings/footer.tpl -->
+
 <script>
   require(['admin/plugins/calendar-onekite'], function (m) {
     m.init();

package/templates/calendar-onekite.tpl

@@ -11,8 +11,7 @@
 <script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.11/index.global.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@fullcalendar/core@6.1.11/locales-all.global.min.js"></script>
 
-<script>
-  require(['forum/calendar-onekite'], function (m) {
-    m.init('#onekite-calendar');
-  });
-</script>
+<!--
+  No inline require() here.
+  The plugin's forum script auto-initialises on the calendar page via ajaxify.
+-->