nodebb-plugin-calendar-onekite 1.4.4 → 1.4.6

package/library.js

@@ -1,25 +1,19 @@
 'use strict';
 
 /**
- * NodeBB v4 plugin: Calendar OneKite
- * - Events + booking items (with pickupLocation per item)
- * - Multi-day reservations
- * - Admin validation -> HelloAsso checkout link -> payment webhook -> mark paid
- * - Admin planning view + "My reservations" page
- * - Settings:
- *   - Settings key: "calendar-onekite"
- *   - Admin page: /admin/plugins/calendar-onekite
- *   - Admin API:  /api/admin/plugins/calendar-onekite
+ * Calendar OneKite — NodeBB v4
  *
- * Templates expected:
- * - templates/calendar.tpl
- * - templates/calendar-my-reservations.tpl
- * - templates/admin/plugins/calendar-onekite.tpl
- * - templates/admin/calendar-planning.tpl
- * - templates/widgets/calendar-upcoming.tpl
- * - templates/emails/calendar-reservation-created.tpl
- * - templates/emails/calendar-reservation-approved.tpl
- * - templates/emails/calendar-payment-confirmed.tpl
+ * Key point: NodeBB v4 client helper `api.*` calls /api/v3/...
+ * So we expose both /api/... and /api/v3/... for the same handlers.
+ *
+ * Admin page:
+ *   GET  /admin/plugins/calendar-onekite
+ * Ajaxify JSON:
+ *   GET  /api/admin/plugins/calendar-onekite
+ *   GET  /api/v3/admin/plugins/calendar-onekite
+ * Save settings:
+ *   PUT  /api/admin/plugins/calendar-onekite
+ *   PUT  /api/v3/admin/plugins/calendar-onekite
  */
 
 const db = require.main.require('./src/database');
@@ -46,7 +40,7 @@ async function nextReservationId() {
   return String(rid);
 }
 
-// number of days between two yyyy-mm-dd dates (inclusive)
+// inclusive days between dates
 function daysBetween(start, end) {
   const d1 = new Date(start);
   const d2 = new Date(end);
@@ -58,6 +52,20 @@ function daysBetween(start, end) {
   return Math.max(1, diff + 1);
 }
 
+/* -----------------------------
+ * Route helpers (factorized)
+ * ---------------------------- */
+
+function mountApiBoth(router, method, path, ...handlers) {
+  // path must start with /admin or /calendar etc (without /api prefix)
+  // Example: mountApiBoth(router, 'get', '/admin/calendar/pending', middleware.admin.checkPrivileges, handler)
+  const m = String(method).toLowerCase();
+  if (typeof router[m] !== 'function') throw new Error(`Unsupported router method: ${method}`);
+
+  router[m]('/api' + path, ...handlers);
+  router[m]('/api/v3' + path, ...handlers);
+}
+
 /* -----------------------------
  * Events
  * ---------------------------- */
@@ -125,7 +133,9 @@ async function updateEvent(eid, data) {
     allDay: data.allDay !== undefined ? (data.allDay ? 1 : 0) : existing.allDay,
     location: data.location !== undefined ? String(data.location) : existing.location,
     visibility: data.visibility !== undefined ? String(data.visibility) : existing.visibility,
-    bookingEnabled: data.bookingEnabled !== undefined ? (data.bookingEnabled ? 1 : 0) : (existing.bookingEnabled || 0),
+    bookingEnabled: data.bookingEnabled !== undefined
+      ? (data.bookingEnabled ? 1 : 0)
+      : (existing.bookingEnabled || 0),
     bookingItems: JSON.stringify(bookingItems),
     updatedAt: String(Date.now()),
   };
@@ -185,7 +195,6 @@ async function userCanCreate(uid) {
 
   const userGroupsArr = await user.getUserGroups([uid]);
   const groups = (userGroupsArr[0] || []).map(g => (g.name || '').toLowerCase());
-
   return groups.some(g => allowedSet.has(g));
 }
 
@@ -193,7 +202,6 @@ async function userCanBook(uid) {
   if (!uid || uid === 0) return false;
 
   const settings = await Settings.get(SETTINGS_KEY);
-  // if not configured -> allow any logged-in user
   if (!settings || !settings.allowedBookingGroups) return true;
 
   const allowedSet = new Set(
@@ -206,7 +214,6 @@ async function userCanBook(uid) {
 
   const userGroupsArr = await user.getUserGroups([uid]);
   const groups = (userGroupsArr[0] || []).map(g => (g.name || '').toLowerCase());
-
   return groups.some(g => allowedSet.has(g));
 }
 
@@ -220,7 +227,7 @@ async function setRsvp(eid, uid, status) {
   if (!event) throw new Error('Event not found');
 
   const parseList = (str) => {
-    try { return JSON.parse(str || '[]'); } catch (e) { return []; }
+    try { return JSON.parse(str || '[]'); } catch { return []; }
   };
 
   let yes = parseList(event.rsvpYes);
@@ -293,6 +300,173 @@ async function renderAdminPage(req, res) {
   }
 }
 
+/* -----------------------------
+ * Admin handlers (shared)
+ * ---------------------------- */
+
+async function adminGetPending(req, res) {
+  try {
+    const result = [];
+    const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
+
+    for (const eid of eids) {
+      const event = await getEvent(eid);
+      if (!event) continue;
+
+      const reservations = JSON.parse(event.reservations || '[]');
+      const pending = reservations.filter(r => r.status === 'pending_admin');
+      if (pending.length) result.push({ event, reservations: pending });
+    }
+
+    res.json(result);
+  } catch (err) {
+    res.status(500).json({ error: err.message });
+  }
+}
+
+async function adminValidateReservation(req, res) {
+  try {
+    const rid = req.params.rid;
+    const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
+
+    let targetEvent = null;
+    let reservation = null;
+
+    for (const eid of eids) {
+      const event = await getEvent(eid);
+      if (!event) continue;
+
+      const reservations = JSON.parse(event.reservations || '[]');
+      const r = reservations.find(rr => rr.rid === rid);
+      if (r) {
+        targetEvent = event;
+        reservation = r;
+        break;
+      }
+    }
+
+    if (!reservation) return res.status(404).json({ error: 'Réservation introuvable' });
+    if (reservation.status !== 'pending_admin') return res.status(400).json({ error: 'Réservation déjà traitée' });
+
+    reservation.status = 'awaiting_payment';
+
+    const resList = JSON.parse(targetEvent.reservations || '[]');
+    const idx = resList.findIndex(r => r.rid === rid);
+    resList[idx] = reservation;
+    targetEvent.reservations = JSON.stringify(resList);
+
+    await db.setObject(getEventKey(targetEvent.eid), targetEvent);
+
+    const amount = computePrice(targetEvent, reservation);
+    const checkoutUrl = await helloAsso.createHelloAssoCheckoutIntent({
+      eid: reservation.eid,
+      rid,
+      uid: reservation.uid,
+      itemId: reservation.itemId,
+      quantity: reservation.quantity,
+      amount,
+    });
+
+    try {
+      await emailer.send('calendar-reservation-approved', reservation.uid, {
+        subject: 'Votre réservation a été validée',
+        eventTitle: targetEvent.title,
+        itemName: reservation.itemId,
+        quantity: reservation.quantity,
+        checkoutUrl,
+        pickupLocation: reservation.pickupLocation || 'Non précisé',
+        dateStart: reservation.dateStart,
+        dateEnd: reservation.dateEnd,
+        days: reservation.days || 1,
+      });
+    } catch (e) {
+      console.warn('[calendar-onekite] email reservation-approved error:', e.message);
+    }
+
+    res.json({ success: true, checkoutUrl });
+  } catch (err) {
+    res.status(500).json({ error: err.message });
+  }
+}
+
+async function adminCancelReservation(req, res) {
+  try {
+    const rid = req.params.rid;
+    const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
+
+    let found = false;
+
+    for (const eid of eids) {
+      const event = await getEvent(eid);
+      if (!event) continue;
+
+      const reservations = JSON.parse(event.reservations || '[]');
+      const rIndex = reservations.findIndex(rr => rr.rid === rid);
+      if (rIndex !== -1) {
+        reservations[rIndex].status = 'cancelled';
+        event.reservations = JSON.stringify(reservations);
+        await db.setObject(getEventKey(event.eid), event);
+        found = true;
+        break;
+      }
+    }
+
+    if (!found) return res.status(404).json({ error: 'Réservation introuvable' });
+    res.json({ success: true });
+  } catch (err) {
+    res.status(500).json({ error: err.message });
+  }
+}
+
+async function adminGetPlanning(req, res) {
+  try {
+    const now = new Date();
+    const eids = await db.getSortedSetRangeByScore(EVENTS_SET_KEY, 0, -1, now.getTime(), '+inf');
+    const rows = [];
+
+    for (const eid of eids) {
+      const event = await getEvent(eid);
+      if (!event) continue;
+
+      const items = JSON.parse(event.bookingItems || '[]');
+      const reservations = JSON.parse(event.reservations || '[]');
+
+      reservations
+        .filter(r => r.status === 'pending_admin' || r.status === 'awaiting_payment' || r.status === 'paid')
+        .forEach(r => {
+          const item = items.find(i => i.id === r.itemId);
+          rows.push({
+            eid: event.eid,
+            eventTitle: event.title,
+            itemId: r.itemId,
+            itemName: item ? item.name : r.itemId,
+            uid: r.uid,
+            quantity: r.quantity,
+            dateStart: r.dateStart,
+            dateEnd: r.dateEnd,
+            days: r.days || daysBetween(r.dateStart, r.dateEnd),
+            status: r.status,
+            pickupLocation: r.pickupLocation || 'Non précisé',
+          });
+        });
+    }
+
+    rows.sort((a, b) => new Date(a.dateStart) - new Date(b.dateStart));
+    res.json(rows);
+  } catch (err) {
+    res.status(500).json({ error: err.message });
+  }
+}
+
+async function adminSaveSettings(req, res) {
+  try {
+    await Settings.set(SETTINGS_KEY, req.body);
+    res.json({ status: 'ok' });
+  } catch (err) {
+    res.status(500).json({ error: err.message });
+  }
+}
+
 /* -----------------------------
  * Plugin init
  * ---------------------------- */
@@ -311,6 +485,7 @@ Plugin.init = async function (params) {
   // Admin planning page
   router.get('/admin/calendar/planning', middleware.admin.buildHeader, renderPlanningPage);
   router.get('/api/admin/calendar/planning/page', renderPlanningPage);
+  router.get('/api/v3/admin/calendar/planning/page', renderPlanningPage);
 
   /* -----------------------------
    * Events API
@@ -327,6 +502,18 @@ Plugin.init = async function (params) {
     }
   });
 
+  // Optional v3 mirror for future usage with api.get on front pages
+  router.get('/api/v3/calendar/events', async (req, res) => {
+    try {
+      const { start, end } = req.query;
+      if (!start || !end) return res.status(400).json({ error: 'Missing start/end' });
+      const events = await getEventsBetween(start, end);
+      res.json(events);
+    } catch (err) {
+      res.status(500).json({ error: err.message });
+    }
+  });
+
   router.post('/api/calendar/event', middleware.ensureLoggedIn, async (req, res) => {
     try {
       const uid = req.user?.uid || 0;
@@ -392,7 +579,7 @@ Plugin.init = async function (params) {
   });
 
   /* -----------------------------
-   * Client permissions endpoints
+   * Client permissions
    * ---------------------------- */
 
   router.get('/api/calendar/permissions/create', async (req, res) => {
@@ -408,7 +595,7 @@ Plugin.init = async function (params) {
   });
 
   /* -----------------------------
-   * Multi-day reservation request
+   * Booking (multi-day)
    * ---------------------------- */
 
   router.post('/api/calendar/event/:eid/book', middleware.ensureLoggedIn, async (req, res) => {
@@ -440,7 +627,6 @@ Plugin.init = async function (params) {
 
       const allRes = JSON.parse(event.reservations || '[]');
 
-      // Stock check: sum overlapping reservations (pending_admin/awaiting_payment/paid) for the same item
       const overlapping = allRes.filter(r => {
         if (r.itemId !== itemId) return false;
         if (r.status === 'cancelled') return false;
@@ -482,7 +668,6 @@ Plugin.init = async function (params) {
 
       await db.setObject(getEventKey(eid), event);
 
-      // Email: request created
       try {
         await emailer.send('calendar-reservation-created', uid, {
           subject: 'Votre demande de réservation a été envoyée',
@@ -510,133 +695,7 @@ Plugin.init = async function (params) {
   });
 
   /* -----------------------------
-   * Admin: pending list
-   * ---------------------------- */
-
-  router.get('/api/admin/calendar/pending', middleware.admin.checkPrivileges, async (req, res) => {
-    try {
-      const result = [];
-      const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
-
-      for (const eid of eids) {
-        const event = await getEvent(eid);
-        if (!event) continue;
-
-        const reservations = JSON.parse(event.reservations || '[]');
-        const pending = reservations.filter(r => r.status === 'pending_admin');
-        if (pending.length) result.push({ event, reservations: pending });
-      }
-
-      res.json(result);
-    } catch (err) {
-      res.status(500).json({ error: err.message });
-    }
-  });
-
-  /* -----------------------------
-   * Admin: validate reservation -> awaiting_payment + HelloAsso checkout
-   * ---------------------------- */
-
-  router.post('/api/admin/calendar/reservation/:rid/validate', middleware.admin.checkPrivileges, async (req, res) => {
-    try {
-      const rid = req.params.rid;
-      const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
-
-      let targetEvent = null;
-      let reservation = null;
-
-      for (const eid of eids) {
-        const event = await getEvent(eid);
-        if (!event) continue;
-
-        const reservations = JSON.parse(event.reservations || '[]');
-        const r = reservations.find(rr => rr.rid === rid);
-        if (r) {
-          targetEvent = event;
-          reservation = r;
-          break;
-        }
-      }
-
-      if (!reservation) return res.status(404).json({ error: 'Réservation introuvable' });
-      if (reservation.status !== 'pending_admin') return res.status(400).json({ error: 'Réservation déjà traitée' });
-
-      reservation.status = 'awaiting_payment';
-
-      const resList = JSON.parse(targetEvent.reservations || '[]');
-      const idx = resList.findIndex(r => r.rid === rid);
-      resList[idx] = reservation;
-      targetEvent.reservations = JSON.stringify(resList);
-
-      await db.setObject(getEventKey(targetEvent.eid), targetEvent);
-
-      const amount = computePrice(targetEvent, reservation);
-      const checkoutUrl = await helloAsso.createHelloAssoCheckoutIntent({
-        eid: reservation.eid,
-        rid,
-        uid: reservation.uid,
-        itemId: reservation.itemId,
-        quantity: reservation.quantity,
-        amount,
-      });
-
-      try {
-        await emailer.send('calendar-reservation-approved', reservation.uid, {
-          subject: 'Votre réservation a été validée',
-          eventTitle: targetEvent.title,
-          itemName: reservation.itemId,
-          quantity: reservation.quantity,
-          checkoutUrl,
-          pickupLocation: reservation.pickupLocation || 'Non précisé',
-          dateStart: reservation.dateStart,
-          dateEnd: reservation.dateEnd,
-          days: reservation.days || 1,
-        });
-      } catch (e) {
-        console.warn('[calendar-onekite] email reservation-approved error:', e.message);
-      }
-
-      res.json({ success: true, checkoutUrl });
-    } catch (err) {
-      res.status(500).json({ error: err.message });
-    }
-  });
-
-  /* -----------------------------
-   * Admin: cancel reservation
-   * ---------------------------- */
-
-  router.post('/api/admin/calendar/reservation/:rid/cancel', middleware.admin.checkPrivileges, async (req, res) => {
-    try {
-      const rid = req.params.rid;
-      const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
-
-      let found = false;
-
-      for (const eid of eids) {
-        const event = await getEvent(eid);
-        if (!event) continue;
-
-        const reservations = JSON.parse(event.reservations || '[]');
-        const rIndex = reservations.findIndex(rr => rr.rid === rid);
-        if (rIndex !== -1) {
-          reservations[rIndex].status = 'cancelled';
-          event.reservations = JSON.stringify(reservations);
-          await db.setObject(getEventKey(event.eid), event);
-          found = true;
-          break;
-        }
-      }
-
-      if (!found) return res.status(404).json({ error: 'Réservation introuvable' });
-      res.json({ success: true });
-    } catch (err) {
-      res.status(500).json({ error: err.message });
-    }
-  });
-
-  /* -----------------------------
-   * HelloAsso webhook (marks reservation paid)
+   * HelloAsso webhook
    * ---------------------------- */
 
   router.post('/api/calendar/helloasso/webhook', async (req, res) => {
@@ -651,7 +710,6 @@ Plugin.init = async function (params) {
       const custom = order.customFields || {};
       const eid = String(custom.eid || '');
       const rid = String(custom.rid || '');
-
       if (!eid || !rid) return res.status(400).json({ error: 'Missing eid/rid in customFields' });
 
       const event = await getEvent(eid);
@@ -664,7 +722,6 @@ Plugin.init = async function (params) {
       const reservation = reservations[rIndex];
       if (reservation.status === 'paid') return res.json({ ok: true });
 
-      // Update optional aggregate reserved count
       const items = JSON.parse(event.bookingItems || '[]');
       const itemIndex = items.findIndex(i => i.id === reservation.itemId);
       if (itemIndex !== -1) {
@@ -705,24 +762,43 @@ Plugin.init = async function (params) {
   });
 
   /* -----------------------------
-   * Admin plugin page + settings API
-   * IMPORTANT: keep these routes EXACTLY aligned with your admin.js
+   * Admin plugin page + settings API (factorized v3 mounting)
    * ---------------------------- */
 
   router.get('/admin/plugins/calendar-onekite', middleware.admin.buildHeader, renderAdminPage);
-  router.get('/api/admin/plugins/calendar-onekite', renderAdminPage);
 
-  router.put('/api/admin/plugins/calendar-onekite', middleware.admin.checkPrivileges, async (req, res) => {
-    try {
-      await Settings.set(SETTINGS_KEY, req.body);
-      res.json({ status: 'ok' });
-    } catch (err) {
-      res.status(500).json({ error: err.message });
-    }
-  });
+  // Ajaxify GET JSON (must exist under /api/v3 on NodeBB v4)
+  mountApiBoth(router, 'get', '/admin/plugins/calendar-onekite', middleware.admin.checkPrivileges, renderAdminPage);
+
+  // Save settings (PUT)
+  mountApiBoth(router, 'put', '/admin/plugins/calendar-onekite', middleware.admin.checkPrivileges, adminSaveSettings);
+
+  /* -----------------------------
+   * Admin endpoints (pending/validate/cancel/planning) — both /api and /api/v3
+   * ---------------------------- */
+
+  mountApiBoth(router, 'get', '/admin/calendar/pending', middleware.admin.checkPrivileges, adminGetPending);
+
+  mountApiBoth(
+    router,
+    'post',
+    '/admin/calendar/reservation/:rid/validate',
+    middleware.admin.checkPrivileges,
+    adminValidateReservation
+  );
+
+  mountApiBoth(
+    router,
+    'post',
+    '/admin/calendar/reservation/:rid/cancel',
+    middleware.admin.checkPrivileges,
+    adminCancelReservation
+  );
+
+  mountApiBoth(router, 'get', '/admin/calendar/planning', middleware.admin.checkPrivileges, adminGetPlanning);
 
   /* -----------------------------
-   * My reservations API
+   * My reservations API (optional v3 mirror for api.get on front pages)
    * ---------------------------- */
 
   router.get('/api/calendar/my-reservations', middleware.ensureLoggedIn, async (req, res) => {
@@ -761,15 +837,14 @@ Plugin.init = async function (params) {
     }
   });
 
-  /* -----------------------------
-   * Admin planning API (future reservations)
-   * ---------------------------- */
-
-  router.get('/api/admin/calendar/planning', middleware.admin.checkPrivileges, async (req, res) => {
+  router.get('/api/v3/calendar/my-reservations', middleware.ensureLoggedIn, async (req, res) => {
+    // same handler, duplicated minimally for clarity
     try {
-      const now = new Date();
-      const eids = await db.getSortedSetRangeByScore(EVENTS_SET_KEY, 0, -1, now.getTime(), '+inf');
-      const rows = [];
+      const uid = String(req.user?.uid || 0);
+      if (!uid || uid === '0') return res.status(403).json({ error: 'Non connecté' });
+
+      const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
+      const result = [];
 
       for (const eid of eids) {
         const event = await getEvent(eid);
@@ -779,27 +854,21 @@ Plugin.init = async function (params) {
         const reservations = JSON.parse(event.reservations || '[]');
 
         reservations
-          .filter(r => r.status === 'pending_admin' || r.status === 'awaiting_payment' || r.status === 'paid')
+          .filter(r => String(r.uid) === uid)
           .forEach(r => {
             const item = items.find(i => i.id === r.itemId);
-            rows.push({
-              eid: event.eid,
+            result.push({
+              ...r,
               eventTitle: event.title,
-              itemId: r.itemId,
+              eventStart: event.start,
+              eventEnd: event.end,
               itemName: item ? item.name : r.itemId,
-              uid: r.uid,
-              quantity: r.quantity,
-              dateStart: r.dateStart,
-              dateEnd: r.dateEnd,
-              days: r.days || daysBetween(r.dateStart, r.dateEnd),
-              status: r.status,
-              pickupLocation: r.pickupLocation || 'Non précisé',
             });
           });
       }
 
-      rows.sort((a, b) => new Date(a.dateStart) - new Date(b.dateStart));
-      res.json(rows);
+      result.sort((a, b) => new Date(a.dateStart) - new Date(b.dateStart));
+      res.json(result);
     } catch (err) {
       res.status(500).json({ error: err.message });
     }
@@ -812,7 +881,6 @@ Plugin.init = async function (params) {
 
 Plugin.addAdminNavigation = function (header) {
   header.plugins.push({
-    // NodeBB ACP will resolve this under /admin
     route: '/plugins/calendar-onekite',
     icon: 'fa fa-calendar',
     name: 'Calendar OneKite',
@@ -821,7 +889,7 @@ Plugin.addAdminNavigation = function (header) {
 };
 
 /* -----------------------------
- * Widget
+ * Widgets
  * ---------------------------- */
 
 Plugin.defineWidgets = async function (widgets) {
@@ -834,13 +902,17 @@ Plugin.defineWidgets = async function (widgets) {
   return widgets;
 };
 
+// Supports both promise-style (v4) and callback-style (older)
 Plugin.renderUpcomingWidget = async function (widget, callback) {
   try {
     const settings = (await Settings.get(SETTINGS_KEY)) || {};
-    const limit = Number((widget && widget.data && widget.data.limit) || settings.limit || 5);
+    const limit = Number(widget?.data?.limit || settings.limit || 5);
+
     const events = await getUpcomingEvents(limit);
     const html = await appRef.renderAsync('widgets/calendar-upcoming', { events });
+
     widget.html = html;
+
     if (typeof callback === 'function') {
       return callback(null, widget);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "",
   "repository": {
     "type": "git",

package/plugin.json

@@ -3,7 +3,7 @@
   "name": "Calendar Onekite",
   "description": "Calendrier + réservation de matériel + validation admin + paiement HelloAsso pour NodeBB v4",
   "url": "",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "library": "./library.js",
   "staticDirs": {
     "static": "static"

package/static/js/calendar.js

@@ -1,301 +1,42 @@
-'use strict';
-
-$(document).ready(function () {
-  if (!$('#calendar').length) return;
-
-  const CalendarPage = {
-
-    canBook: false,
-
-    init: function () {
-      this.prepareModals();
-      this.checkPermissions();
-      this.initCalendar();
-    },
-
-    checkPermissions: function () {
-      $.get('/api/calendar/permissions/book').then(res => {
-        CalendarPage.canBook = !!(res && res.allow);
-      });
-    },
-
-    prepareModals: function () {
-      $('.calendar-modal').hide();
-      $('.calendar-modal .calendar-close').on('click', function () {
-        $(this).closest('.calendar-modal').fadeOut();
-      });
-    },
-
-    initCalendar: function () {
-      const calendarEl = document.getElementById('calendar');
-
-      const calendar = new FullCalendar.Calendar(calendarEl, {
-        themeSystem: 'bootstrap5',
-        initialView: 'dayGridMonth',
-        locale: 'fr',
-        height: 'auto',
-        selectable: true,
-        headerToolbar: {
-          left: 'prev,next today',
-          center: 'title',
-          right: 'dayGridMonth,timeGridWeek,listWeek'
-        },
-
-        events: (info, success, fail) => {
-          $.get('/api/calendar/events', { start: info.startStr, end: info.endStr })
-            .then(events => {
-              success(events.map(ev => ({
-                id: ev.eid,
-                title: ev.title,
-                start: ev.start,
-                end: ev.end,
-                allDay: ev.allDay == 1,
-                extendedProps: ev
-              })));
-            })
-            .catch(fail);
-        },
-
-        dateClick: info => {
-          CalendarPage.openCreateEventModal(info.dateStr);
-        },
-
-        eventClick: info => {
-          CalendarPage.openEventModal(info.event.extendedProps);
-        }
-      });
-
-      calendar.render();
-
-      // bouton nouvel event
-      $.get('/api/calendar/permissions/create').then(res => {
-        if (!res || !res.allow) {
-          $('#calendar-new-event').hide();
-        } else {
-          $('#calendar-new-event').on('click', () => {
-            CalendarPage.openCreateEventModal();
-          });
-        }
-      });
-    },
-
-    /* -------- MODAL EVENT -------- */
-
-    openCreateEventModal: function (dateStr) {
-      const modal = $('#calendar-event-modal');
-
-      $('#event-modal-title').text('Créer un événement');
-      $('#event-title').val('');
-      $('#event-description').val('');
-      const base = dateStr || new Date().toISOString().slice(0, 10);
-      $('#event-start').val(base + 'T09:00');
-      $('#event-end').val(base + 'T11:00');
-      $('#event-allDay').prop('checked', false);
-      $('#event-location').val('');
-      $('#event-bookingEnabled').prop('checked', false);
-      $('#booking-items').empty();
-
-      $('#event-save').off('click').on('click', () => {
-        CalendarPage.saveEvent();
-      });
-
-      $('#event-delete').hide();
-      $('#event-reserve').hide();
-
-      $('#event-add-item').off('click').on('click', () => {
-        CalendarPage.addBookingItemRow();
-      });
-
-      modal.fadeIn();
-    },
-
-    openEventModal: function (eventData) {
-      const modal = $('#calendar-event-modal');
-
-      $('#event-modal-title').text('Événement : ' + eventData.title);
-      $('#event-title').val(eventData.title);
-      $('#event-description').val(eventData.description || '');
-      $('#event-start').val(eventData.start.replace('Z', ''));
-      $('#event-end').val(eventData.end.replace('Z', ''));
-      $('#event-allDay').prop('checked', eventData.allDay == 1);
-      $('#event-location').val(eventData.location || '');
-      $('#event-bookingEnabled').prop('checked', eventData.bookingEnabled == 1);
-
-      CalendarPage.renderBookingItems(eventData.bookingItems || []);
-
-      $('#event-add-item').off('click').on('click', () => {
-        CalendarPage.addBookingItemRow();
-      });
-
-      $('#event-save').off('click').on('click', () => {
-        CalendarPage.updateEvent(eventData.eid);
-      });
-
-      $('#event-delete').show().off('click').on('click', () => {
-        bootbox.confirm('Supprimer cet événement ?', ok => {
-          if (!ok) return;
-          $.ajax({ url: '/api/calendar/event/' + eventData.eid, method: 'DELETE' })
-            .then(() => location.reload());
-        });
-      });
-
-      if (CalendarPage.canBook && Number(eventData.bookingEnabled)) {
-        $('#event-reserve').show().off('click').on('click', () => {
-          CalendarPage.openReserveModal(eventData.eid);
-        });
-      } else {
-        $('#event-reserve').hide();
-      }
-
-      modal.fadeIn();
-    },
-
-    saveEvent: function () {
-      const data = CalendarPage.collectEventForm();
-      $.ajax({
-        url: '/api/calendar/event',
-        method: 'POST',
-        contentType: 'application/json',
-        data: JSON.stringify(data),
-      }).then(() => location.reload())
-        .catch(err => app.alertError(err.responseJSON?.error || err.message));
-    },
-
-    updateEvent: function (eid) {
-      const data = CalendarPage.collectEventForm();
-      $.ajax({
-        url: '/api/calendar/event/' + eid,
-        method: 'PUT',
-        contentType: 'application/json',
-        data: JSON.stringify(data),
-      }).then(() => location.reload())
-        .catch(err => app.alertError(err.responseJSON?.error || err.message));
-    },
-
-    collectEventForm: function () {
-      const items = [];
-      $('#booking-items .booking-item-row').each(function () {
-        const row = $(this);
-        const total = Number(row.find('.item-total').val() || 0);
-        if (!total) return;
-
-        items.push({
-          id: row.find('.item-id').val(),
-          name: row.find('.item-name').val(),
-          total,
-          reserved: Number(row.find('.item-reserved').val() || 0),
-          reservedTemp: Number(row.find('.item-reservedTemp').val() || 0),
-          price: Number(row.find('.item-price').val() || 0),
-          pickupLocation: row.find('.item-pickup').val() || ''
-        });
-      });
-
-      return {
-        title: $('#event-title').val(),
-        description: $('#event-description').val(),
-        start: $('#event-start').val(),
-        end: $('#event-end').val(),
-        allDay: $('#event-allDay').is(':checked'),
-        location: $('#event-location').val(),
-        bookingEnabled: $('#event-bookingEnabled').is(':checked'),
-        bookingItems: items
-      };
-    },
-
-    renderBookingItems: function (items) {
-      const container = $('#booking-items');
-      container.empty();
-      (items || []).forEach(item => CalendarPage.addBookingItemRow(item));
-    },
-
-    addBookingItemRow: function (item = {}) {
-      const row = $(`
-        <div class="booking-item-row">
-          <input type="text" class="item-id form-control" placeholder="ID" value="${item.id || ''}">
-          <input type="text" class="item-name form-control" placeholder="Nom matériel" value="${item.name || ''}">
-          <input type="number" class="item-total form-control" placeholder="Total" value="${item.total || 0}">
-          <input type="number" class="item-price form-control" placeholder="Prix €" step="0.01" value="${item.price || 0}">
-          <input type="text" class="item-pickup form-control" placeholder="Lieu retrait" value="${item.pickupLocation || ''}">
-          <input type="hidden" class="item-reserved" value="${item.reserved || 0}">
-          <input type="hidden" class="item-reservedTemp" value="${item.reservedTemp || 0}">
-          <button class="btn btn-danger btn-sm item-remove">✕</button>
-        </div>
-      `);
-
-      row.find('.item-remove').on('click', () => row.remove());
-      $('#booking-items').append(row);
-    },
-
-    /* -------- MODAL RÉSERVATION -------- */
-
-    openReserveModal: function (eid) {
-      $.get('/api/calendar/event/' + eid).then(eventData => {
-        const modal = $('#calendar-reserve-modal');
-
-        $('#reserve-title').text(eventData.title);
-
-        const items = eventData.bookingItems || [];
-        if (!items.length || !Number(eventData.bookingEnabled)) {
-          $('#reserve-items').html('<p>Aucun matériel réservable pour cet événement.</p>');
-          $('#reserve-confirm').hide();
-        } else {
-          let html = '<ul>';
-          items.forEach((item, index) => {
-            const pickup = item.pickupLocation || 'Lieu de retrait non précisé';
-            html += `
-              <li>
-                <label>
-                  <input type="radio" name="reserve-item" value="${item.id}" ${index === 0 ? 'checked' : ''}>
-                  <strong>${item.name}</strong>
-                  ${item.price ? `– ${item.price} €/jour` : ''}
-                  <br><small>📍 Retrait : ${pickup}</small>
-                </label>
-              </li>`;
-          });
-          html += '</ul>';
-          $('#reserve-items').html(html);
-          $('#reserve-confirm').show();
-        }
-
-        const today = new Date().toISOString().slice(0, 10);
-        $('#reserve-start').val(today);
-        $('#reserve-end').val(today);
-        $('#reserve-quantity').val(1);
-
-        $('#reserve-confirm').off('click').on('click', () => {
-          CalendarPage.sendReservation(eid);
-        });
+define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', [
+  'api',
+  'alerts',
+], function (api, alerts) {
+  'use strict';
+
+  function init() {
+    // jQuery est fourni par NodeBB sur les pages rendues via buildHeader
+    const $ = window.jQuery;
+    if (!$) {
+      // fallback: on évite le crash
+      console.error('[calendar-onekite] jQuery not found');
+      return;
+    }
 
-        modal.fadeIn();
+    // Exemple: bind bouton "nouvel événement"
+    $('#calendar-new-event')
+      .off('click.calendarOnekite')
+      .on('click.calendarOnekite', function () {
+        // TODO: ouvre ton modal / formulaire
+        alerts.success('Clique OK: handler actif ✅');
       });
-    },
 
-    sendReservation: function (eid) {
-      const itemId = $('input[name="reserve-item"]:checked').val();
-      const quantity = Number($('#reserve-quantity').val() || 1);
-      const dateStart = $('#reserve-start').val();
-      const dateEnd = $('#reserve-end').val();
+    // Si tu as d'autres binds / initialisation calendrier, fais-les ici
+  }
 
-      if (!itemId) return app.alertError('Sélectionnez un matériel.');
-      if (!quantity || quantity <= 0) return app.alertError('Quantité invalide.');
-      if (!dateStart || !dateEnd) return app.alertError('Merci de renseigner les dates.');
-      if (dateEnd < dateStart) return app.alertError('La date de fin doit être ≥ la date de début.');
+  // important: ajaxify SPA
+  $(window).on('action:ajaxify.end', function () {
+    // page /calendar
+    if (ajaxify?.data?.template?.includes('calendar')) {
+      init();
+    }
+  });
 
-      $.ajax({
-        url: '/api/calendar/event/' + eid + '/book',
-        method: 'POST',
-        contentType: 'application/json',
-        data: JSON.stringify({ itemId, quantity, dateStart, dateEnd }),
-      })
-        .then(res => {
-          app.alertSuccess(res.message || 'Demande envoyée.');
-          $('#calendar-reserve-modal').fadeOut();
-        })
-        .catch(err => {
-          app.alertError(err.responseJSON?.error || err.message);
-        });
+  $(function () {
+    if (ajaxify?.data?.template?.includes('calendar')) {
+      init();
     }
-  };
+  });
 
-  CalendarPage.init();
+  return { init };
 });

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

@@ -26,4 +26,9 @@
   </div>
 
   <button id="calendar-onekite-save" class="btn btn-primary">Enregistrer</button>
-</div>
+</div>
+<script>
+require(['plugins/nodebb-plugin-calendar-onekite/static/js/calendar'], function (Calendar) {
+  Calendar.init && Calendar.init();
+});
+</script>