nodebb-plugin-calendar-onekite 11.1.25 → 11.1.26

package/library.js

@@ -101,6 +101,7 @@ Plugin.init = async function (params) {
 
 // Add to admin navigation
 Plugin.addAdminNavigation = async function (data) {
+  data.plugins = data.plugins || [];
   data.plugins.push({
     route: '/plugins/calendar-onekite',
     icon: 'fa-calendar',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.1.25",
+  "version": "11.1.26",
   "description": "Calendar reservations with HelloAsso integration for OneKite",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -1,265 +1,139 @@
 'use strict';
-
 /* global FullCalendar */
 
-define('forum/calendar-onekite', ['api', 'alerts', 'hooks', 'bootbox'], function (api, alerts, hooks, bootbox) {
+define('forum/calendar-onekite', ['api', 'alerts'], function (api, alerts) {
   let calendar;
 
-  function ymdToTs(ymd) {
-    // ymd in YYYY-MM-DD, treat as UTC midnight
-    const [y, m, d] = ymd.split('-').map(Number);
-    return Date.UTC(y, m - 1, d, 0, 0, 0, 0);
-  }
-
-  function daysBetween(startYmd, endYmd) {
-    const start = ymdToTs(startYmd);
-    const end = ymdToTs(endYmd);
-    const dayMs = 24 * 3600 * 1000;
-    return Math.max(1, Math.round((end - start) / dayMs));
-  }
-
-  async function fetchJson(url, opts) {
-    try {
-      return await api[opts && opts.method === 'POST' ? 'post' : 'get'](url, opts && opts.body ? opts.body : undefined);
-    } catch (e) {
-      // fallback to fetch if api module not compatible
-      const res = await fetch(url, {
-        method: (opts && opts.method) || 'GET',
-        headers: { 'Content-Type': 'application/json' },
-        body: opts && opts.body ? JSON.stringify(opts.body) : undefined,
-        credentials: 'same-origin',
-      });
-      const j = await res.json().catch(() => ({}));
-      if (!res.ok) throw Object.assign(new Error('http'), { status: res.status, body: j });
-      return j;
-    }
-  }
-
-  async function loadItems() {
-    const r = await fetchJson('/plugins/calendar-onekite/items');
-    return (r && r.items) || [];
+  function showError(msg) {
+    try { alerts.error(msg); } catch (e) { console.error(msg); }
   }
 
-  function formatEuro(cents) {
-    return (Number(cents || 0) / 100).toFixed(2) + ' €';
+  function daysBetween(startStr, endStr) {
+    // start/end are YYYY-MM-DD strings, end is exclusive
+    const s = new Date(startStr + 'T00:00:00Z');
+    const e = new Date(endStr + 'T00:00:00Z');
+    const ms = e.getTime() - s.getTime();
+    return Math.max(1, Math.round(ms / (24 * 3600 * 1000)));
   }
 
-  function buildItemsList(items) {
-    const rows = items.map(it => {
-      return `<label style="display:flex;gap:8px;align-items:center;cursor:pointer;margin:6px 0;">
-        <input type="checkbox" class="onekite-item" value="${String(it.id).replace(/"/g, '&quot;')}">
-        <span style="flex:1;">${String(it.name)}</span>
-        <span>${formatEuro(it.priceCents)}</span>
-      </label>`;
-    }).join('');
-    return `<div id="onekite-items">${rows}</div>`;
+  async function fetchCatalog() {
+    const res = await api.get('/plugins/calendar-onekite/items');
+    return (res && res.items) || [];
   }
 
-  function getSelectedIds(root) {
-    return Array.from(root.querySelectorAll('input.onekite-item:checked')).map(el => el.value);
-  }
-
-  function sumSelected(items, ids) {
-    const map = new Map(items.map(i => [String(i.id), i]));
-    return ids.reduce((s, id) => s + Number((map.get(String(id)) || {}).priceCents || 0), 0);
+  function formatEuroFromCents(cents) {
+    const v = (Number(cents || 0) / 100).toFixed(2).replace('.', ',');
+    return v + ' €';
   }
 
   async function openRequestModal(selectionInfo) {
-    const startYmd = selectionInfo.startStr;
-    const endYmd = selectionInfo.endStr; // exclusive
-    const days = daysBetween(startYmd, endYmd);
-
-    let items = [];
     try {
-      items = await loadItems();
-    } catch (e) {
-      alerts.error('Impossible de charger le matériel (HelloAsso).');
-      calendar.unselect();
-      return;
-    }
-
-    if (!items.length) {
-      alerts.error('Aucun matériel disponible (catalogue HelloAsso vide).');
-      calendar.unselect();
-      return;
-    }
-
-    const body = document.createElement('div');
-    body.innerHTML = `
-      <p><strong>Période :</strong> ${startYmd} → ${endYmd} (${days} jour(s))</p>
-      <p><strong>Matériel :</strong></p>
-      ${buildItemsList(items)}
-      <hr>
-      <p><strong>Total estimé :</strong> <span id="onekite-total">${formatEuro(0)}</span></p>
-      <p class="help-block">Astuce : coche plusieurs matériels. Ctrl/Cmd+clic sur le libellé fonctionne aussi.</p>
-    `;
-
-    const updateTotal = () => {
-      const ids = getSelectedIds(body);
-      const perDay = sumSelected(items, ids);
-      body.querySelector('#onekite-total').textContent = formatEuro(perDay * days);
-    };
-
-    body.addEventListener('change', (e) => {
-      if (e.target && e.target.classList.contains('onekite-item')) updateTotal();
-    });
-    body.addEventListener('click', (e) => {
-      const label = e.target.closest('label');
-      if (!label) return;
-      const cb = label.querySelector('input.onekite-item');
-      if (!cb) return;
-      if (e.ctrlKey || e.metaKey) {
-        cb.checked = !cb.checked;
-        updateTotal();
+      const items = await fetchCatalog();
+      if (!items.length) {
+        showError('Aucun matériel disponible (catalogue HelloAsso non chargé).');
+        return;
       }
-    });
-
-    updateTotal();
 
-    bootbox.dialog({
-      title: 'Demande de réservation',
-      message: body,
-      buttons: {
-        cancel: {
-          label: 'Annuler',
-          className: 'btn-default',
-          callback: function () {
-            calendar.unselect();
-          },
-        },
-        ok: {
-          label: 'Envoyer la demande',
-          className: 'btn-primary',
-          callback: async function () {
-            const ids = getSelectedIds(body);
-            if (!ids.length) {
-              alerts.error('Sélectionne au moins un matériel.');
-              return false;
-            }
-            try {
-              await fetchJson('/plugins/calendar-onekite/reservations', {
-                method: 'POST',
-                body: {
-                  startTs: ymdToTs(startYmd),
-                  endTs: ymdToTs(endYmd),
-                  itemIds: ids,
-                },
-              });
-              alerts.success('Demande envoyée.');
-              calendar.refetchEvents();
-              calendar.unselect();
-            } catch (err) {
-              if (err && err.status === 409) {
-                alerts.error('Conflit : un des matériels est déjà réservé sur cette période.');
-              } else if (err && err.body && err.body.error) {
-                alerts.error(err.body.error);
-              } else {
-                alerts.error('Erreur lors de la demande.');
-              }
-              calendar.unselect();
-              return false;
-            }
-          },
-        },
-      },
-    });
-  }
+      const start = selectionInfo.startStr;
+      const end = selectionInfo.endStr;
+      const nbDays = daysBetween(start, end);
+
+      // Build simple modal UI (no jquery)
+      const modal = document.createElement('div');
+      modal.className = 'onekite-modal';
+      modal.innerHTML = `
+        <div class="onekite-modal__backdrop"></div>
+        <div class="onekite-modal__panel">
+          <h4>Nouvelle demande</h4>
+          <div style="margin-bottom:8px;">Du <strong>${start}</strong> au <strong>${end}</strong> (<strong>${nbDays}</strong> jour(s))</div>
+          <div style="max-height:240px; overflow:auto; border:1px solid #ddd; padding:8px; border-radius:6px;">
+            ${items.map((it, idx) => `
+              <label style="display:flex; align-items:center; gap:8px; margin:6px 0; cursor:pointer;">
+                <input type="checkbox" class="onekite-item" data-id="${it.id}" data-price="${it.priceCents || 0}">
+                <span>${it.name}</span>
+                <span style="margin-left:auto; opacity:.8;">${formatEuroFromCents(it.priceCents || 0)}/jour</span>
+              </label>
+            `).join('')}
+          </div>
+          <div style="margin-top:10px; display:flex; justify-content:space-between; align-items:center;">
+            <div>Estimation total : <strong id="onekite-total">0 €</strong></div>
+            <div style="display:flex; gap:8px;">
+              <button class="btn btn-default" id="onekite-cancel">Annuler</button>
+              <button class="btn btn-primary" id="onekite-submit">Envoyer</button>
+            </div>
+          </div>
+        </div>
+      `;
+      document.body.appendChild(modal);
+
+      const updateTotal = () => {
+        const checks = Array.from(modal.querySelectorAll('.onekite-item')).filter(i => i.checked);
+        const daily = checks.reduce((sum, el) => sum + Number(el.dataset.price || 0), 0);
+        const total = daily * nbDays;
+        modal.querySelector('#onekite-total').textContent = formatEuroFromCents(total);
+      };
+      modal.querySelectorAll('.onekite-item').forEach(el => el.addEventListener('change', updateTotal));
+      updateTotal();
 
-  async function openEventModal(info) {
-    const ev = info.event;
-    const props = ev.extendedProps || {};
-    const status = props.status || 'pending';
-    const items = (props.items || []).map(i => i.name).join(', ');
-    const days = props.days || '';
-    const total = props.totalCents != null ? formatEuro(props.totalCents) : '';
+      const close = () => { modal.remove(); calendar && calendar.unselect(); };
 
-    const body = document.createElement('div');
-    body.innerHTML = `
-      <p><strong>Statut :</strong> ${status}</p>
-      <p><strong>Matériel :</strong> ${items}</p>
-      ${days ? `<p><strong>Jours :</strong> ${days}</p>` : ''}
-      ${total ? `<p><strong>Total :</strong> ${total}</p>` : ''}
-    `;
+      modal.querySelector('#onekite-cancel').addEventListener('click', close);
+      modal.querySelector('.onekite-modal__backdrop').addEventListener('click', close);
 
-    const buttons = {
-      close: {
-        label: 'Fermer',
-        className: 'btn-default',
-      },
-    };
-
-    // Show approve/refuse buttons if server allows (we try; if 403, show error)
-    if (status === 'pending') {
-      buttons.refuse = {
-        label: 'Refuser',
-        className: 'btn-danger',
-        callback: async function () {
-          try {
-            await fetchJson(`/plugins/calendar-onekite/reservations/${encodeURIComponent(ev.id)}/refuse`, { method: 'POST', body: {} });
-            alerts.success('Réservation refusée.');
-            calendar.refetchEvents();
-          } catch (e) {
-            alerts.error("Impossible de refuser (droits requis).");
-          }
-        },
-      };
-      buttons.approve = {
-        label: 'Valider',
-        className: 'btn-success',
-        callback: async function () {
-          try {
-            const r = await fetchJson(`/plugins/calendar-onekite/reservations/${encodeURIComponent(ev.id)}/approve`, { method: 'POST', body: {} });
-            alerts.success('Réservation validée.');
-            if (r && r.paymentUrl) {
-              alerts.success('Lien de paiement envoyé.');
-            }
-            calendar.refetchEvents();
-          } catch (e) {
-            alerts.error("Impossible de valider (droits requis).");
-          }
-        },
-      };
+      modal.querySelector('#onekite-submit').addEventListener('click', async () => {
+        const selected = Array.from(modal.querySelectorAll('.onekite-item')).filter(i => i.checked).map(i => i.dataset.id);
+        if (!selected.length) {
+          showError('Sélectionne au moins un matériel.');
+          return;
+        }
+        try {
+          await api.post('/plugins/calendar-onekite/reservations', { start, end, itemIds: selected });
+          try { alerts.success('Demande envoyée'); } catch {}
+          close();
+          await calendar.refetchEvents();
+        } catch (err) {
+          const msg = (err && err.message) ? err.message : 'Impossible de créer la demande';
+          showError(msg);
+        }
+      });
+    } catch (e) {
+      showError('Impossible de charger le catalogue.');
+      console.error(e);
     }
-
-    bootbox.dialog({
-      title: 'Réservation',
-      message: body,
-      buttons,
-    });
   }
 
-  function initCalendar() {
+  async function initCalendar() {
     const el = document.getElementById('onekite-calendar');
-    if (!el || !window.FullCalendar) return;
+    if (!el || typeof FullCalendar === 'undefined') {
+      return;
+    }
 
     calendar = new FullCalendar.Calendar(el, {
-      locale: 'fr',
       initialView: 'dayGridMonth',
+      locale: 'fr',
       selectable: true,
       selectMirror: true,
       displayEventTime: false,
-      height: 'auto',
-      select: function (info) {
-        openRequestModal(info);
-      },
-      eventClick: function (info) {
-        info.jsEvent.preventDefault();
-        openEventModal(info);
-      },
-      events: async function (fetchInfo, success, failure) {
+      eventTimeFormat: { hour: '2-digit', minute: '2-digit' },
+      select: (info) => openRequestModal(info),
+      events: async (fetchInfo, successCallback, failureCallback) => {
         try {
-          const startTs = ymdToTs(fetchInfo.startStr);
-          const endTs = ymdToTs(fetchInfo.endStr);
-          const r = await fetchJson(`/plugins/calendar-onekite/events?startTs=${startTs}&endTs=${endTs}`);
-          success((r && r.events) || []);
+          const qs = new URLSearchParams({ start: fetchInfo.startStr, end: fetchInfo.endStr });
+          const res = await fetch('/api/v3/plugins/calendar-onekite/events?' + qs.toString(), { credentials: 'same-origin' });
+          if (!res.ok) throw new Error('events-fetch-failed');
+          const json = await res.json();
+          const events = (json.events || []).map(ev => ({
+            id: ev.id,
+            title: ev.title,
+            start: ev.start,
+            end: ev.end,
+            allDay: true,
+            extendedProps: ev.extendedProps || {},
+          }));
+          successCallback(events);
         } catch (e) {
-          failure(e);
-        }
-      },
-      eventDidMount: function (arg) {
-        const st = (arg.event.extendedProps && arg.event.extendedProps.status) || '';
-        if (st === 'pending' || st === 'awaiting_payment') {
-          arg.el.title = 'En attente';
+          console.error(e);
+          failureCallback(e);
         }
       },
     });
@@ -267,19 +141,22 @@ define('forum/calendar-onekite', ['api', 'alerts', 'hooks', 'bootbox'], function
     calendar.render();
   }
 
-  function maybeInit() {
-    // Ensure we only init on our template
-    try {
-      if (ajaxify && ajaxify.data && ajaxify.data.template && ajaxify.data.template.name !== 'calendar-onekite') return;
-    } catch (e) { /* ignore */ }
-    initCalendar();
+  function onAjaxifyEnd(_ev, data) {
+    if (data && data.tpl === 'calendar-onekite') {
+      initCalendar().catch(console.error);
+    }
   }
 
-  hooks.on('action:ajaxify.end', function () {
-    maybeInit();
-  });
+  // Auto-init on page load & ajaxify
+  if (window && window.addEventListener) {
+    window.addEventListener('action:ajaxify.end', (ev) => onAjaxifyEnd(ev, ev && ev.detail ? ev.detail : undefined));
+  }
+  // NodeBB uses jQuery-triggered events too, but jQuery isn't guaranteed. If present, hook it.
+  if (typeof window !== 'undefined' && window.jQuery) {
+    window.jQuery(window).on('action:ajaxify.end', function (_ev, data) { onAjaxifyEnd(_ev, data); });
+  }
 
   return {
-    init: maybeInit,
+    init: initCalendar,
   };
 });

package/templates/calendar-onekite.tpl

@@ -11,6 +11,3 @@
 <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 (mod) { mod.init(); });
-</script>

package/README.md

@@ -1,38 +0,0 @@
-# nodebb-plugin-calendar-onekite
-
-Plugin NodeBB (v4.7.x) : calendrier de réservation de matériel basé sur FullCalendar, workflow de validation via ACP, et génération de lien de paiement HelloAsso.
-
-## Installation
-
-Dans le dossier NodeBB :
-
-```bash
-npm install /path/to/nodebb-plugin-calendar-onekite
-# ou si vous avez un zip, dézippez dans node_modules puis :
-./nodebb build
-./nodebb restart
-```
-
-Activez ensuite le plugin dans l’ACP.
-
-## Page
-
-- URL : `/calendar` (ex: https://www.onekite.com/calendar)
-
-## Paramètres ACP
-
-ACP → Plugins → Calendar OneKite
-
-- `allowedGroups` : groupes autorisés à créer une demande (séparés par virgules)
-- `notifyGroups` : groupes notifiés par email
-- `pendingHoldMinutes` : durée de blocage d’une demande en attente
-- HelloAsso :
-  - `helloassoEnv` : sandbox/prod
-  - `helloassoClientId` / `helloassoClientSecret`
-  - `helloassoOrganizationSlug` / `helloassoFormType` / `helloassoFormSlug`
-  - `helloassoReturnUrl` (optionnel)
-
-## Notes
-
-- Les demandes sont créées en statut `pending` puis expirent automatiquement après `pendingHoldMinutes`.
-- La validation admin crée un checkout-intent HelloAsso et envoie le lien de paiement au demandeur.

package/lib/controllers.js

@@ -1,11 +0,0 @@
-'use strict';
-
-const controllers = {};
-
-controllers.renderCalendar = async function (req, res) {
-  res.render('calendar-onekite', {
-    title: 'Calendar',
-  });
-};
-
-module.exports = controllers;

package/lib/scheduler.js

@@ -1,50 +0,0 @@
-'use strict';
-
-const meta = require.main.require('./src/meta');
-const dbLayer = require('./db');
-
-let timer = null;
-
-async function expirePending() {
-  const settings = await meta.settings.get('calendar-onekite');
-  const holdMins = parseInt(settings.pendingHoldMinutes || '5', 10) || 5;
-  const now = Date.now();
-
-  const ids = await dbLayer.listAllReservationIds(5000);
-  if (!ids || !ids.length) {
-    return;
-  }
-
-  for (const rid of ids) {
-    const resv = await dbLayer.getReservation(rid);
-    if (!resv || resv.status !== 'pending') {
-      continue;
-    }
-    const createdAt = parseInt(resv.createdAt, 10) || 0;
-    const expiresAt = createdAt + holdMins * 60 * 1000;
-    if (now > expiresAt) {
-      // Expire (remove from calendar)
-      await dbLayer.removeReservation(rid);
-    }
-  }
-}
-
-function start() {
-  if (timer) return;
-  timer = setInterval(() => {
-    expirePending().catch(() => {});
-  }, 60 * 1000);
-}
-
-function stop() {
-  if (timer) {
-    clearInterval(timer);
-    timer = null;
-  }
-}
-
-module.exports = {
-  start,
-  stop,
-  expirePending,
-};

package/lib/settings.js

@@ -1,36 +0,0 @@
-'use strict';
-
-const Settings = require.main.require('./src/settings');
-
-const defaults = {
-  // Who can create reservations (comma-separated group names)
-  allowedGroups: 'registered-users',
-  // Who receives email notifications for new pending reservations (comma-separated group names)
-  notifyGroups: 'administrators',
-
-  // How long a "pending" reservation blocks equipment (minutes)
-  pendingHoldMinutes: 5,
-
-  // Default reservation status for newly created (pending)
-  // Also used by cleanup job
-  cleanupIntervalSeconds: 60,
-
-  // HelloAsso
-  helloassoEnv: 'sandbox', // sandbox | prod
-  helloassoClientId: '',
-  helloassoClientSecret: '',
-  helloassoOrganizationSlug: '',
-  helloassoFormType: 'event', // event | membership | donation | crowdfunding | paymentform
-  helloassoFormSlug: '',
-  helloassoReturnUrl: '',
-
-  // UX
-  showUsernamesOnCalendar: false,
-};
-
-const settings = new Settings('calendar-onekite', '1.0.0', defaults);
-
-module.exports = {
-  settings,
-  defaults,
-};

package/public/calendar-onekite.scss

@@ -1,8 +0,0 @@
-#onekite-calendar {
-  margin-top: 1rem;
-  .fc {
-    .fc-event {
-      cursor: pointer;
-    }
-  }
-}

package/templates/calendar-onekite/calendar.tpl

@@ -1,29 +0,0 @@
-<div class="container">
-  <div class="row">
-    <div class="col-12">
-      <h1>Calendrier des réservations</h1>
-      <p class="text-muted">Cliquez sur une date, ou sélectionnez une plage, pour faire une demande de réservation.</p>
-      <div id="onekite-calendar"></div>
-    </div>
-  </div>
-</div>
-
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.11/index.global.min.css" />
-
-<script defer src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.11/index.global.min.js"></script>
-<script defer src="https://cdn.jsdelivr.net/npm/@fullcalendar/core@6.1.11/locales-all.global.min.js"></script>
-
-<script>
-  (function () {
-    function boot() {
-      if (!window.require) return setTimeout(boot, 50);
-      window.require(['forum/calendar-onekite'], function (CalendarOneKite) {
-        CalendarOneKite.init({
-          el: '#onekite-calendar',
-          locale: (ajaxify && ajaxify.data && ajaxify.data.config && ajaxify.data.config.userLang) || 'fr',
-        });
-      });
-    }
-    boot();
-  })();
-</script>

package/templates/emails/calendar-onekite_approved.tpl

@@ -1,10 +0,0 @@
-<p>Bonjour {username},</p>
-<p>Votre réservation a été validée.</p>
-<ul>
-  <li>Matériel : {itemName}</li>
-  <li>Début : {start}</li>
-  <li>Fin : {end}</li>
-</ul>
-<!-- IF paymentUrl -->
-<p>Lien de paiement : <a href="{paymentUrl}">{paymentUrl}</a></p>
-<!-- ENDIF paymentUrl -->

package/templates/emails/calendar-onekite_pending.tpl

@@ -1,10 +0,0 @@
-<p>Bonjour {username},</p>
-<p>Nouvelle demande de réservation :</p>
-<ul>
-  <li>Demandeur : {requester}</li>
-  <li>Matériel : {itemName}</li>
-  <li>Début : {start}</li>
-  <li>Fin : {end}</li>
-  <li>ID : {rid}</li>
-</ul>
-<p>Validation/refus via l’ACP.</p>

package/templates/emails/calendar-onekite_refused.tpl

@@ -1,7 +0,0 @@
-<p>Bonjour {username},</p>
-<p>Votre demande de réservation a été refusée.</p>
-<ul>
-  <li>Matériel : {itemName}</li>
-  <li>Début : {start}</li>
-  <li>Fin : {end}</li>
-</ul>