nodebb-plugin-calendar-onekite 1.4.7 → 2.0.0

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "1.4.7",
-  "description": "",
-  "repository": {
-    "type": "git",
-    "url": "https://git.worobel.net/Arnaud/nodebb-plugin-calendar-onekite.git"
-  },
-  "license": "ISC",
-  "author": "",
-  "type": "commonjs",
+  "version": "2.0.0",
+  "description": "Calendar + equipment booking + admin approval + HelloAsso payments for NodeBB v4 (no-jQuery UI)",
   "main": "library.js",
-  "nbbpm": {
-    "compatibility": ">=4.0.0 <5.0.0"
+  "license": "MIT",
+  "keywords": [
+    "nodebb",
+    "plugin",
+    "calendar",
+    "booking",
+    "helloasso",
+    "fullcalendar"
+  ],
+  "engines": {
+    "node": ">=18"
   },
-  "files": [
-    "plugin.json",
-    "library.js",
-    "helloasso.js",
-    "templates/",
-    "static/"
-  ]
+  "dependencies": {},
+  "scripts": {
+    "lint": "echo \"(optional) add eslint if you want\"",
+    "test": "echo \"no tests\""
+  }
 }

package/plugin.json

@@ -1,21 +1,33 @@
-{
-  "id": "nodebb-plugin-calendar-onekite",
-  "name": "Calendar Onekite",
-  "description": "Calendrier + réservation de matériel + validation admin + paiement HelloAsso pour NodeBB v4",
-  "url": "",
-  "version": "1.4.6",
-  "library": "./library.js",
-  "staticDirs": {
-    "static": "static"
-  },
-  "hooks": [
-    { "hook": "static:app.load", "method": "init" },
-    { "hook": "filter:admin.header.build", "method": "addAdminNavigation" },
-    { "hook": "filter:widgets.getWidgets", "method": "defineWidgets" },
-    { "hook": "filter:widget.render:calendarUpcoming", "method": "renderUpcomingWidget" }
-  ],
-  "acpScripts": [
-    "static/js/admin.js"
-  ],
-  "templates": "templates"
-}
+{
+  "id": "nodebb-plugin-calendar-onekite",
+  "name": "Calendar Onekite",
+  "description": "Calendrier + réservation matériel + validation admin + paiement HelloAsso pour NodeBB v4 (no-jQuery UI)",
+  "url": "",
+  "version": "2.0.0",
+  "library": "./library.js",
+  "staticDirs": {
+    "static": "static"
+  },
+  "acpScripts": [
+    "static/js/admin.js"
+  ],
+  "hooks": [
+    {
+      "hook": "static:app.load",
+      "method": "init"
+    },
+    {
+      "hook": "filter:admin.header.build",
+      "method": "addAdminNavigation"
+    },
+    {
+      "hook": "filter:widgets.getWidgets",
+      "method": "defineWidgets"
+    },
+    {
+      "hook": "filter:widget.render:calendarUpcoming",
+      "method": "renderUpcomingWidget"
+    }
+  ],
+  "templates": "templates"
+}

package/static/css/calendar-onekite.css

@@ -0,0 +1,4 @@
+.calendar-modal{display:none;position:fixed;z-index:9999;left:0;top:0;width:100%;height:100%;overflow:auto;background:rgba(0,0,0,.45)}
+.calendar-modal-content{background:#fff;margin:5vh auto;padding:16px;width:min(900px,92vw);border-radius:10px;box-shadow:0 10px 40px rgba(0,0,0,.2)}
+.calendar-close{float:right;cursor:pointer;font-size:22px;line-height:1}
+#calendar{min-height:600px}

package/static/js/admin.js

@@ -1,172 +1,184 @@
-define('plugins/nodebb-plugin-calendar-onekite/static/js/admin', [
-  'api',
-  'alerts',
-], function (api, alerts) {
-  'use strict';
-
-  const AdminCalendar = {};
-
-  AdminCalendar.init = function () {
-    AdminCalendar.initSettings();
-    AdminCalendar.initPlanning();
-  };
-
-  AdminCalendar.initSettings = function () {
-    if (!$('#calendar-onekite-admin').length) return;
-    AdminCalendar.bindSettingsSave();
-    AdminCalendar.loadPending();
-  };
-
-  AdminCalendar.initPlanning = function () {
-    if (!$('#calendar-planning').length) return;
-    AdminCalendar.loadPlanning();
-  };
-
-  AdminCalendar.bindSettingsSave = function () {
-    // évite les doubles binds quand ajaxify recharge la page
-    $('#calendar-onekite-save')
-      .off('click.calendarOnekite')
-      .on('click.calendarOnekite', function () {
-        const settings = {
-          allowedGroups: $('#calendar-onekite-groups').val(),
-          allowedBookingGroups: $('#calendar-onekite-book-groups').val(),
-          limit: $('#calendar-onekite-widget-limit').val(),
-        };
-
-        // ✅ endpoint standard (doit exister côté serveur)
-        api.put('/admin/plugins/calendar-onekite', settings)
-          .then(() => alerts.success('Paramètres enregistrés'))
-          .catch(err => alerts.error(err?.message || err));
-      });
-  };
-
-  AdminCalendar.loadPending = function () {
-    api.get('/admin/calendar/pending')
-      .then(list => {
-        const container = $('#pending-reservations');
-        if (!container.length) return;
-
-        container.empty();
-
-        if (!list.length) {
-          container.html('<p>Aucune réservation en attente.</p>');
-          return;
-        }
-
-        list.forEach(block => {
-          const ev = block.event;
-          const card = $(`
-            <div class="card mb-3">
-              <div class="card-header">
-                <strong>${ev.title}</strong><br>
-                <small>${ev.start} → ${ev.end}</small>
-              </div>
-              <div class="card-body"></div>
-            </div>
-          `);
-
-          const body = card.find('.card-body');
-
-          block.reservations.forEach(r => {
-            const row = $(`
-              <div class="reservation-row mb-2 p-2 border rounded">
-                <p><strong>RID :</strong> ${r.rid}</p>
-                <p><strong>UID :</strong> ${r.uid}</p>
-                <p><strong>Matériel :</strong> ${r.itemId}</p>
-                <p><strong>Quantité :</strong> ${r.quantity}</p>
-                <p><strong>Dates :</strong> ${r.dateStart} → ${r.dateEnd} (${r.days || ''} jours)</p>
-                <p><strong>Lieu de retrait :</strong> ${r.pickupLocation || 'Non précisé'}</p>
-                <button class="btn btn-success btn-sm validate-btn">Valider</button>
-                <button class="btn btn-danger btn-sm cancel-btn">Annuler</button>
-              </div>
-            `);
-
-            row.find('.validate-btn').on('click', () => {
-              AdminCalendar.validateReservation(r.rid, row);
-            });
-
-            row.find('.cancel-btn').on('click', () => {
-              AdminCalendar.cancelReservation(r.rid, row);
-            });
-
-            body.append(row);
-          });
-
-          container.append(card);
-        });
-      })
-      .catch(err => alerts.error(err?.message || err));
-  };
-
-  AdminCalendar.validateReservation = function (rid, row) {
-    api.post('/admin/calendar/reservation/' + rid + '/validate', {})
-      .then(() => {
-        row.css('background', '#d4edda');
-        row.find('.validate-btn').remove();
-        row.find('.cancel-btn').remove();
-        row.append('<p><strong>Validée.</strong> Lien de paiement envoyé.</p>');
-      })
-      .catch(err => alerts.error(err?.message || err));
-  };
-
-  AdminCalendar.cancelReservation = function (rid, row) {
-    require(['bootbox'], function (bootbox) {
-      bootbox.confirm('Annuler cette réservation ?', ok => {
-        if (!ok) return;
-        api.post('/admin/calendar/reservation/' + rid + '/cancel', {})
-          .then(() => {
-            row.css('background', '#f8d7da');
-            row.find('.validate-btn').remove();
-            row.find('.cancel-btn').remove();
-            row.append('<p><strong>Annulée.</strong></p>');
-          })
-          .catch(err => alerts.error(err?.message || err));
-      });
-    });
-  };
-
-  AdminCalendar.loadPlanning = function () {
-    api.get('/admin/calendar/planning')
-      .then(rows => {
-        const tbody = $('#planning-body');
-        if (!tbody.length) return;
-
-        tbody.empty();
-
-        if (!rows.length) {
-          tbody.append('<tr><td colspan="9">Aucune réservation future.</td></tr>');
-          return;
-        }
-
-        rows.forEach(r => {
-          const tr = $(`
-            <tr>
-              <td>${r.eventTitle}</td>
-              <td>${r.itemName}</td>
-              <td>${r.pickupLocation || 'Non précisé'}</td>
-              <td>${r.uid}</td>
-              <td>${r.quantity}</td>
-              <td>${r.dateStart}</td>
-              <td>${r.dateEnd}</td>
-              <td>${r.days}</td>
-              <td>${r.status}</td>
-            </tr>
-          `);
-          tbody.append(tr);
-        });
-      })
-      .catch(err => alerts.error(err?.message || err));
-  };
-
-  // ✅ essentiel : relance l’init à chaque navigation ACP ajaxify
-  $(window).on('action:ajaxify.end', function () {
-    AdminCalendar.init();
-  });
-
-  // et au chargement initial
-  $(function () {
-    AdminCalendar.init();
-  });
-
-  return AdminCalendar;
-});
+define('plugins/nodebb-plugin-calendar-onekite/static/js/admin', ['api', 'alerts'], function (api, alerts) {
+  'use strict';
+
+  const STATE = { initedSettings:false, initedPlanning:false, delegationBound:false };
+
+  function qs(sel, root=document){ return root.querySelector(sel); }
+  function qsa(sel, root=document){ return Array.from(root.querySelectorAll(sel)); }
+
+  function escapeHtml(s){
+    return String(s ?? '')
+      .replaceAll('&','&amp;').replaceAll('<','&lt;').replaceAll('>','&gt;')
+      .replaceAll('"','&quot;').replaceAll("'","&#039;");
+  }
+
+  async function saveSettings() {
+    const settings = {
+      allowedGroups: qs('#calendar-onekite-groups')?.value || '',
+      allowedBookingGroups: qs('#calendar-onekite-book-groups')?.value || '',
+      limit: qs('#calendar-onekite-widget-limit')?.value || '',
+      helloassoApiBase: qs('#calendar-onekite-helloasso-apibase')?.value || '',
+      helloassoOrganizationSlug: qs('#calendar-onekite-helloasso-org')?.value || '',
+      helloassoFormSlug: qs('#calendar-onekite-helloasso-form')?.value || '',
+      helloassoClientId: qs('#calendar-onekite-helloasso-clientid')?.value || '',
+      helloassoClientSecret: qs('#calendar-onekite-helloasso-secret')?.value || '',
+      helloassoReturnUrl: qs('#calendar-onekite-helloasso-return')?.value || '',
+    };
+
+    try {
+      await api.put('/admin/plugins/calendar-onekite', settings);
+      alerts.success('Paramètres enregistrés');
+    } catch (e) {
+      alerts.error(e?.message || e);
+    }
+  }
+
+  function renderPending(container, list) {
+    if (!Array.isArray(list) || list.length === 0) {
+      container.innerHTML = '<p>Aucune réservation en attente.</p>';
+      return;
+    }
+
+    container.innerHTML = list.map(block => {
+      const ev = block.event || {};
+      const reservations = Array.isArray(block.reservations) ? block.reservations : [];
+      const rows = reservations.map(r => `
+        <div class="reservation-row mb-2 p-2 border rounded" data-rid="${escapeHtml(r.rid)}">
+          <p><strong>RID :</strong> ${escapeHtml(r.rid)}</p>
+          <p><strong>UID :</strong> ${escapeHtml(r.uid)}</p>
+          <p><strong>Matériel :</strong> ${escapeHtml(r.itemId)}</p>
+          <p><strong>Quantité :</strong> ${escapeHtml(r.quantity)}</p>
+          <p><strong>Dates :</strong> ${escapeHtml(r.dateStart)} → ${escapeHtml(r.dateEnd)} (${escapeHtml(r.days||'')} jours)</p>
+          <p><strong>Lieu de retrait :</strong> ${escapeHtml(r.pickupLocation || 'Non précisé')}</p>
+          <button class="btn btn-success btn-sm js-validate">Valider</button>
+          <button class="btn btn-danger btn-sm js-cancel">Annuler</button>
+        </div>
+      `).join('');
+
+      return `
+        <div class="card mb-3">
+          <div class="card-header">
+            <strong>${escapeHtml(ev.title)}</strong><br>
+            <small>${escapeHtml(ev.start)} → ${escapeHtml(ev.end)}</small>
+          </div>
+          <div class="card-body">${rows}</div>
+        </div>
+      `;
+    }).join('');
+  }
+
+  async function loadPending() {
+    const container = qs('#pending-reservations');
+    if (!container) return;
+    try {
+      const list = await api.get('/admin/calendar/pending');
+      renderPending(container, list);
+    } catch (e) {
+      alerts.error(e?.message || e);
+    }
+  }
+
+  async function validateReservation(rid, row) {
+    try {
+      await api.post(`/admin/calendar/reservation/${encodeURIComponent(rid)}/validate`, {});
+      row.style.background = '#d4edda';
+      qsa('.js-validate, .js-cancel', row).forEach(b => b.remove());
+      row.insertAdjacentHTML('beforeend', '<p><strong>Validée.</strong> Lien de paiement envoyé.</p>');
+    } catch (e) {
+      alerts.error(e?.message || e);
+    }
+  }
+
+  async function cancelReservation(rid, row) {
+    if (!window.confirm('Annuler cette réservation ?')) return;
+    try {
+      await api.post(`/admin/calendar/reservation/${encodeURIComponent(rid)}/cancel`, {});
+      row.style.background = '#f8d7da';
+      qsa('.js-validate, .js-cancel', row).forEach(b => b.remove());
+      row.insertAdjacentHTML('beforeend', '<p><strong>Annulée.</strong></p>');
+    } catch (e) {
+      alerts.error(e?.message || e);
+    }
+  }
+
+  function bindDelegationOnce() {
+    if (STATE.delegationBound) return;
+    STATE.delegationBound = true;
+
+    document.addEventListener('click', (ev) => {
+      const t = ev.target;
+      if (!(t instanceof HTMLElement)) return;
+
+      const row = t.closest('.reservation-row');
+      if (!row) return;
+
+      const rid = row.getAttribute('data-rid');
+      if (!rid) return;
+
+      if (t.classList.contains('js-validate')) validateReservation(rid, row);
+      if (t.classList.contains('js-cancel')) cancelReservation(rid, row);
+    }, { passive: true });
+  }
+
+  async function loadPlanning() {
+    const tbody = qs('#planning-body');
+    if (!tbody) return;
+
+    try {
+      const rows = await api.get('/admin/calendar/planning');
+      if (!rows || !rows.length) {
+        tbody.innerHTML = '<tr><td colspan="9">Aucune réservation future.</td></tr>';
+        return;
+      }
+      tbody.innerHTML = rows.map(r => `
+        <tr>
+          <td>${escapeHtml(r.eventTitle)}</td>
+          <td>${escapeHtml(r.itemName)}</td>
+          <td>${escapeHtml(r.pickupLocation || 'Non précisé')}</td>
+          <td>${escapeHtml(r.uid)}</td>
+          <td>${escapeHtml(r.quantity)}</td>
+          <td>${escapeHtml(r.dateStart)}</td>
+          <td>${escapeHtml(r.dateEnd)}</td>
+          <td>${escapeHtml(r.days)}</td>
+          <td>${escapeHtml(r.status)}</td>
+        </tr>
+      `).join('');
+    } catch (e) {
+      alerts.error(e?.message || e);
+    }
+  }
+
+  function initSettingsPage() {
+    const root = qs('#calendar-onekite-admin');
+    if (!root || STATE.initedSettings) return;
+    STATE.initedSettings = true;
+
+    qs('#calendar-onekite-save')?.addEventListener('click', saveSettings);
+    bindDelegationOnce();
+    loadPending();
+  }
+
+  function initPlanningPage() {
+    const root = qs('#calendar-planning');
+    if (!root || STATE.initedPlanning) return;
+    STATE.initedPlanning = true;
+    loadPlanning();
+  }
+
+  function resetFlagsIfLeft() {
+    if (!qs('#calendar-onekite-admin')) STATE.initedSettings = false;
+    if (!qs('#calendar-planning')) STATE.initedPlanning = false;
+  }
+
+  const obs = new MutationObserver(() => {
+    resetFlagsIfLeft();
+    initSettingsPage();
+    initPlanningPage();
+  });
+  obs.observe(document.body, { childList: true, subtree: true });
+
+  initSettingsPage();
+  initPlanningPage();
+
+  return {};
+});

package/static/js/calendar-my-reservations.js

@@ -0,0 +1,55 @@
+define('plugins/nodebb-plugin-calendar-onekite/static/js/my-reservations', ['api', 'alerts'], function (api, alerts) {
+  'use strict';
+  const STATE = { inited:false };
+
+  function qs(sel, root=document){ return root.querySelector(sel); }
+  function escapeHtml(s){
+    return String(s ?? '')
+      .replaceAll('&','&amp;').replaceAll('<','&lt;').replaceAll('>','&gt;')
+      .replaceAll('"','&quot;').replaceAll("'","&#039;");
+  }
+
+  async function load() {
+    const root = qs('#calendar-my-reservations');
+    const tbody = qs('#my-reservations-body');
+    if (!root || !tbody) return;
+
+    try {
+      const rows = await api.get('/calendar/my-reservations');
+      if (!rows || !rows.length) {
+        tbody.innerHTML = '<tr><td colspan="7">Aucune réservation.</td></tr>';
+        return;
+      }
+      tbody.innerHTML = rows.map(r => `
+        <tr>
+          <td>${escapeHtml(r.eventTitle)}</td>
+          <td>${escapeHtml(r.itemName)}</td>
+          <td>${escapeHtml(r.pickupLocation || '')}</td>
+          <td>${escapeHtml(r.dateStart)}</td>
+          <td>${escapeHtml(r.dateEnd)}</td>
+          <td>${escapeHtml(r.days || '')}</td>
+          <td>${escapeHtml(r.status)}</td>
+        </tr>
+      `).join('');
+    } catch (e) {
+      alerts.error(e?.message || e);
+    }
+  }
+
+  function initOnce() {
+    if (STATE.inited) return;
+    if (!qs('#calendar-my-reservations')) return;
+    STATE.inited = true;
+    load();
+  }
+
+  function resetIfLeft() {
+    if (!qs('#calendar-my-reservations')) STATE.inited = false;
+  }
+
+  const obs = new MutationObserver(() => { resetIfLeft(); initOnce(); });
+  obs.observe(document.body, { childList:true, subtree:true });
+  initOnce();
+
+  return { init: initOnce };
+});