nodebb-plugin-onekite-calendar 1.0.5 → 1.0.6

package/CHANGELOG.md

@@ -1,4 +1,18 @@
-# Changelog – calendar-onekite
+# Changelog – nodebb-plugin-onekite-calendar
+
+## 1.0.6
+- Refactor interne : centralisation de l’envoi d’emails et du logging (opt-in)
+- Compatibilité : ajout d’alias de routes "onekite-calendar" en plus de "calendar-onekite" (API + ACP)
+
+## 1.0.5
+- Widget : points colorés selon le type (mêmes couleurs que le calendrier)
+- Widget mobile : swipe horizontal pour naviguer semaine par semaine
+
+## 1.0.4
+- Widget : affichage des évènements sous forme de points (sans texte)
+- Widget : survol/clic sur un point affiche le contenu (tooltip + popup)
+- Widget : renommage « Calendrier (2 semaines) » en « Calendrier »
+- Texte : remplacement de toutes les occurrences « OneKite » par « Onekite »
 
 ## 1.0.3
 - Suppression du texte d’archivage dans le toast de purge (plus de « 0 archivés »)

package/lib/admin.js

@@ -2,9 +2,11 @@
 
 const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
-const emailer = require.main.require('./src/emailer');
 const nconf = require.main.require('nconf');
 
+const { sendEmail } = require('./email');
+const log = require('./log');
+
 function forumBaseUrl() {
   const base = String(nconf.get('url') || '').trim().replace(/\/$/, '');
   return base;
@@ -18,53 +20,7 @@ function formatFR(tsOrIso) {
   return `${dd}/${mm}/${yyyy}`;
 }
 
-async function sendEmail(template, toEmail, subject, data) {
-  // Prefer sending by uid (NodeBB core expects uid in various places)
-  const uid = data && Number.isInteger(data.uid) ? data.uid : null;
-  if (!toEmail && !uid) return;
-
-  const settings = await meta.settings.get('calendar-onekite').catch(() => ({}));
-  const lang = (settings && settings.defaultLang) || (meta && meta.config && meta.config.defaultLang) || 'fr';
-  const params = Object.assign({}, data || {}, subject ? { subject } : {});
-
-  // If we have a uid, use the native uid-based sender first.
-  try {
-    if (uid && typeof emailer.send === 'function') {
-      // NodeBB: send(template, uid, params)
-      if (emailer.send.length >= 3) {
-        await emailer.send(template, uid, params);
-      } else {
-        await emailer.send(template, uid, params);
-      }
-      return;
-    }
-  } catch (err) {
-    console.warn('[calendar-onekite] Failed to send email', {
-      template,
-      toEmail,
-      err: err && err.message ? err.message : String(err),
-    });
-  }
-
-  try {
-    if (typeof emailer.sendToEmail === 'function') {
-      // NodeBB: sendToEmail(template, email, language, params)
-      if (emailer.sendToEmail.length >= 4) {
-        await emailer.sendToEmail(template, toEmail, lang, params);
-      } else {
-        // Older signature: sendToEmail(template, email, params)
-        await emailer.sendToEmail(template, toEmail, params);
-      }
-      return;
-    }
-  } catch (err) {
-    console.warn('[calendar-onekite] Failed to send email', {
-      template,
-      toEmail,
-      err: err && err.message ? err.message : String(err),
-    });
-  }
-}
+// Email helper is centralized in lib/email.js.
 
 function normalizeCallbackUrl(configured, meta) {
   const base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
@@ -95,7 +51,7 @@ const admin = {};
 
 admin.renderAdmin = async function (req, res) {
   res.render('admin/plugins/calendar-onekite', {
-    title: 'Calendar OneKite',
+    title: 'Calendar Onekite',
   });
 };
 
@@ -148,10 +104,6 @@ admin.approveReservation = async function (req, res) {
     clientId: settings.helloassoClientId,
     clientSecret: settings.helloassoClientSecret,
   });
-        if (!token) {
-
-        }
-
   let paymentUrl = null;
   if (token) {
     const requester = await user.getUserFields(r.uid, ['username', 'email']);
@@ -173,7 +125,7 @@ admin.approveReservation = async function (req, res) {
       // User return/back/error URLs must be real pages; webhook uses the plugin endpoint.
       callbackUrl: returnUrl,
       webhookUrl: webhookUrl,
-      itemName: 'Réservation matériel OneKite',
+      itemName: 'Réservation matériel Onekite',
       containsDonation: false,
       metadata: { reservationId: String(rid) },
     });
@@ -188,7 +140,7 @@ admin.approveReservation = async function (req, res) {
   if (paymentUrl) {
     r.paymentUrl = paymentUrl;
   } else {
-    console.warn('[calendar-onekite] HelloAsso payment link not created (approve ACP)', { rid });
+    log.warn('HelloAsso payment link not created (approve ACP)', { rid });
   }
 
   await dbLayer.saveReservation(r);
@@ -292,98 +244,6 @@ admin.purgeSpecialEventsByYear = async function (req, res) {
   return res.json({ ok: true, removed: count });
 };
 
-// Debug endpoint to validate HelloAsso connectivity and item loading
-
-
-admin.debugHelloAsso = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
-  const env = (settings && settings.helloassoEnv) || 'prod';
-
-  // Never expose secrets in debug output
-  const safeSettings = {
-    helloassoEnv: env,
-    helloassoClientId: settings && settings.helloassoClientId ? String(settings.helloassoClientId) : '',
-    helloassoClientSecret: settings && settings.helloassoClientSecret ? '***' : '',
-    helloassoOrganizationSlug: settings && settings.helloassoOrganizationSlug ? String(settings.helloassoOrganizationSlug) : '',
-    helloassoFormType: settings && settings.helloassoFormType ? String(settings.helloassoFormType) : '',
-    helloassoFormSlug: settings && settings.helloassoFormSlug ? String(settings.helloassoFormSlug) : '',
-  };
-
-  const out = {
-    ok: true,
-    settings: safeSettings,
-    token: { ok: false },
-    // Catalog = what you actually want for a shop (available products/material)
-    catalog: { ok: false, count: 0, sample: [], keys: [] },
-    // Sold items = items present in orders (can be 0 if no sales yet)
-    soldItems: { ok: false, count: 0, sample: [] },
-  };
-
-  try {
-    const token = await helloasso.getAccessToken({
-      env,
-      clientId: settings.helloassoClientId,
-      clientSecret: settings.helloassoClientSecret,
-    });
-    if (!token) {
-      out.token = { ok: false, error: 'token-null' };
-      return res.json(out);
-    }
-    out.token = { ok: true };
-
-    // Catalog items (via /public)
-    try {
-      const y = new Date().getFullYear();
-      const { publicForm, items } = await helloasso.listCatalogItems({
-        env,
-        token,
-        organizationSlug: settings.helloassoOrganizationSlug,
-        formType: settings.helloassoFormType,
-        formSlug: `locations-materiel-${y}`,
-      });
-
-      const arr = Array.isArray(items) ? items : [];
-      out.catalog.ok = true;
-      out.catalog.count = arr.length;
-      out.catalog.keys = publicForm && typeof publicForm === 'object' ? Object.keys(publicForm) : [];
-      out.catalog.sample = arr.slice(0, 10).map((it) => ({
-        id: it.id,
-        name: it.name,
-        price: it.price ?? null,
-      }));
-    } catch (e) {
-      out.catalog = { ok: false, error: String(e && e.message ? e.message : e), count: 0, sample: [], keys: [] };
-    }
-
-    // Sold items
-    try {
-      const y2 = new Date().getFullYear();
-      const items = await helloasso.listItems({
-        env,
-        token,
-        organizationSlug: settings.helloassoOrganizationSlug,
-        formType: settings.helloassoFormType,
-        formSlug: `locations-materiel-${y2}`,
-      });
-      const arr = Array.isArray(items) ? items : [];
-      out.soldItems.ok = true;
-      out.soldItems.count = arr.length;
-      out.soldItems.sample = arr.slice(0, 10).map((it) => ({
-        id: it.id || it.itemId || it.reference || it.name,
-        name: it.name || it.label || it.itemName,
-        price: it.price || it.amount || it.unitPrice || null,
-      }));
-    } catch (e) {
-      out.soldItems = { ok: false, error: String(e && e.message ? e.message : e), count: 0, sample: [] };
-    }
-
-    return res.json(out);
-  } catch (e) {
-    out.ok = false;
-    out.token = { ok: false, error: String(e && e.message ? e.message : e) };
-    return res.json(out);
-  }
-};
 
 // Accounting endpoint: aggregates paid reservations so you can contabilize what was rented.
 // Query params:

package/lib/api.js

@@ -3,14 +3,15 @@
 const crypto = require('crypto');
 
 const meta = require.main.require('./src/meta');
-const emailer = require.main.require('./src/emailer');
 const nconf = require.main.require('nconf');
 const user = require.main.require('./src/user');
 const groups = require.main.require('./src/groups');
 const db = require.main.require('./src/database');
-const logger = require.main.require('./src/logger');
+// logger available if you want to debug locally; we avoid noisy logs in prod.
 
 const dbLayer = require('./db');
+const { sendEmail } = require('./email');
+const log = require('./log');
 
 // Fast membership check without N calls to groups.isMember.
 // NodeBB's groups.getUserGroups([uid]) returns an array (per uid) of group objects.
@@ -52,36 +53,7 @@ function normalizeAllowedGroups(raw) {
 const helloasso = require('./helloasso');
 const discord = require('./discord');
 
-// Email helper: NodeBB's Emailer signature differs across versions.
-// We try the common forms. Any failure is logged for debugging.
-async function sendEmail(template, toEmail, subject, data) {
-  if (!toEmail) return;
-  try {
-    // NodeBB core signature (historically):
-    //   Emailer.sendToEmail(template, email, language, params[, callback])
-    // Subject is not a positional arg; it must be injected (either by NodeBB itself
-    // or via filter:email.modify). We always pass it in params.subject.
-    const language = (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
-    const params = Object.assign({}, data || {}, subject ? { subject } : {});
-    if (typeof emailer.sendToEmail === 'function') {
-      await emailer.sendToEmail(template, toEmail, language, params);
-      return;
-    }
-    // Fallback for older/unusual builds (rare)
-    if (typeof emailer.send === 'function') {
-      // Some builds accept (template, email, language, params)
-      if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, language, params);
-        return;
-      }
-      // Some builds accept (template, email, params)
-      await emailer.send(template, toEmail, params);
-    }
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err) });
-  }
-}
+// Email helper is in lib/email.js (no logs here).
 
 function normalizeBaseUrl(meta) {
   // Prefer meta.config.url, fallback to nconf.get('url')
@@ -102,7 +74,8 @@ function normalizeCallbackUrl(configured, meta) {
   let url = (configured || '').trim();
   if (!url) {
     // Default webhook endpoint (recommended): namespaced under /plugins
-    url = base ? `${base}/plugins/calendar-onekite/helloasso` : '';
+    // Prefer the new namespace; legacy endpoint remains available.
+    url = base ? `${base}/plugins/onekite-calendar/helloasso` : '';
   }
   if (url && url.startsWith('/') && base) {
     url = `${base}${url}`;
@@ -722,7 +695,7 @@ api.createReservation = async function (req, res) {
       }
     }
   } catch (e) {
-    console.warn('[calendar-onekite] Failed to send pending email', e && e.message ? e.message : e);
+    log.warn('Failed to send pending email', e && e.message ? e.message : e);
   }
 
   // Discord webhook (optional)
@@ -788,7 +761,7 @@ api.approveReservation = async function (req, res) {
       totalAmount: (() => {
         const cents = Math.max(0, Math.round((Number(r.total) || 0) * 100));
         if (!cents) {
-          console.warn('[calendar-onekite] HelloAsso totalAmount is 0 (approve API)', { rid, total: r.total });
+          log.warn('HelloAsso totalAmount is 0 (approve API)', { rid, total: r.total });
         }
         return cents;
       })(),
@@ -797,7 +770,7 @@ api.approveReservation = async function (req, res) {
       // Can be overridden via ACP setting `helloassoCallbackUrl`.
       callbackUrl: normalizeReturnUrl(meta),
       webhookUrl: normalizeCallbackUrl(settings2.helloassoCallbackUrl, meta),
-      itemName: 'Réservation matériel OneKite',
+      itemName: 'Réservation matériel Onekite',
       containsDonation: false,
       metadata: { reservationId: String(rid) },
     });
@@ -809,7 +782,7 @@ api.approveReservation = async function (req, res) {
         r.checkoutIntentId = checkoutIntentId;
       }
     } else {
-      console.warn('[calendar-onekite] HelloAsso payment link not created (approve API)', { rid });
+      log.warn('HelloAsso payment link not created (approve API)', { rid });
     }
   } catch (e) {
     // ignore payment link errors, admin can retry

package/lib/constants.js

@@ -0,0 +1,10 @@
+'use strict';
+
+// Keep backward compatibility with historical route namespaces.
+// New plugin name: nodebb-plugin-onekite-calendar
+
+module.exports = {
+  LEGACY_NAMESPACE: 'calendar-onekite',
+  NAMESPACE: 'onekite-calendar',
+  WIDGET_ID: 'calendar-onekite-twoweeks',
+};

package/lib/discord.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const https = require('https');
+const log = require('./log');
 const { URL } = require('url');
 
 function isEnabled(v, defaultValue) {
@@ -88,7 +89,7 @@ function buildReservationMessage(kind, reservation) {
 function buildWebhookPayload(kind, reservation) {
   // Discord "regroupe" visuellement les messages consécutifs d'un même auteur.
   // En utilisant un username différent par action, on obtient un message bien distinct.
-  const webhookUsername = kind === 'paid' ? 'OneKite • Paiement' : 'OneKite • Réservation';
+  const webhookUsername = kind === 'paid' ? 'Onekite • Paiement' : 'Onekite • Réservation';
 
   const calUrl = 'https://www.onekite.com/calendar';
   const username = reservation && reservation.username ? String(reservation.username) : '';
@@ -124,7 +125,7 @@ function buildWebhookPayload(kind, reservation) {
           ? 'Un paiement a été reçu pour une réservation.'
           : 'Une nouvelle demande de réservation a été créée.',
         fields,
-        footer: { text: 'OneKite • Calendrier' },
+        footer: { text: 'Onekite • Calendrier' },
         timestamp: new Date().toISOString(),
       },
     ],
@@ -140,7 +141,7 @@ async function notifyReservationRequested(settings, reservation) {
     await postWebhook(url, buildWebhookPayload('request', reservation));
   } catch (e) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Discord webhook failed (request)', e && e.message ? e.message : String(e));
+    log.warn('Discord webhook failed (request)', e && e.message ? e.message : String(e));
   }
 }
 
@@ -153,7 +154,7 @@ async function notifyPaymentReceived(settings, reservation) {
     await postWebhook(url, buildWebhookPayload('paid', reservation));
   } catch (e) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Discord webhook failed (paid)', e && e.message ? e.message : String(e));
+    log.warn('Discord webhook failed (paid)', e && e.message ? e.message : String(e));
   }
 }
 

package/lib/email.js

@@ -0,0 +1,39 @@
+'use strict';
+
+const meta = require.main.require('./src/meta');
+const emailer = require.main.require('./src/emailer');
+
+function defaultLanguage() {
+  return (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
+}
+
+/**
+ * Send a transactional email using NodeBB's emailer.
+ *
+ * We intentionally do not log here (per project preferences).
+ */
+async function sendEmail(template, toEmail, subject, data) {
+  if (!toEmail) return;
+
+  const language = defaultLanguage();
+  const params = Object.assign({}, data || {}, subject ? { subject } : {});
+
+  // Common signature: sendToEmail(template, email, language, params)
+  if (emailer && typeof emailer.sendToEmail === 'function') {
+    await emailer.sendToEmail(template, toEmail, language, params);
+    return;
+  }
+
+  // Fallbacks for older builds
+  if (emailer && typeof emailer.send === 'function') {
+    if (emailer.send.length >= 4) {
+      await emailer.send(template, toEmail, language, params);
+      return;
+    }
+    await emailer.send(template, toEmail, params);
+  }
+}
+
+module.exports = {
+  sendEmail,
+};

package/lib/helloasso.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const https = require('https');
+const log = require('./log');
 
 function requestJson(method, url, headers = {}, bodyObj = null) {
   return new Promise((resolve) => {
@@ -284,11 +285,11 @@ async function listCatalogItems({ env, token, organizationSlug, formType, formSl
 async function createCheckoutIntent({ env, token, organizationSlug, formType, formSlug, totalAmount, payerEmail, callbackUrl, webhookUrl, itemName, containsDonation, metadata }) {
   if (!token || !organizationSlug) return null;
   if (!callbackUrl || !/^https?:\/\//i.test(String(callbackUrl))) {
-    console.warn('[calendar-onekite] HelloAsso invalid return/back/error URL', { callbackUrl });
+    log.warn('HelloAsso invalid return/back/error URL', { callbackUrl });
     return null;
   }
   if (webhookUrl && !/^https?:\/\//i.test(String(webhookUrl))) {
-    console.warn('[calendar-onekite] HelloAsso invalid webhook URL', { webhookUrl });
+    log.warn('HelloAsso invalid webhook URL', { webhookUrl });
   }
   // Checkout intents are created at organization level.
   const url = `${baseUrl(env)}/v5/organizations/${encodeURIComponent(organizationSlug)}/checkout-intents`;
@@ -311,7 +312,7 @@ async function createCheckoutIntent({ env, token, organizationSlug, formType, fo
   // Log the error payload to help diagnose configuration issues (slug, env, urls, amount, etc.)
   try {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] HelloAsso checkout-intent failed', { status, json });
+    log.warn('HelloAsso checkout-intent failed', { status, json });
   } catch (e) { /* ignore */ }
   return null;
 }

package/lib/helloassoWebhook.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const crypto = require('crypto');
+const log = require('./log');
 
 const db = require.main.require('./src/database');
 const meta = require.main.require('./src/meta');
@@ -67,7 +68,7 @@ async function sendEmail(template, toEmail, subject, data) {
     // fall back to sendToEmail only.
   } catch (err) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email (webhook)', { template, toEmail, err: String(err && err.message || err) });
+    log.warn('Failed to send email (webhook)', { template, toEmail, err: String(err && err.message || err) });
   }
 }
 
@@ -281,7 +282,7 @@ async function handler(req, res, next) {
 
     if (allowedIps.length && clientIp && !allowedIps.includes(clientIp)) {
       // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] HelloAsso webhook blocked by IP allowlist', { ip: clientIp, allowed: allowedIps });
+      log.warn('HelloAsso webhook blocked by IP allowlist', { ip: clientIp, allowed: allowedIps });
       return res.status(403).json({ ok: false, error: 'ip-not-allowed' });
     }
 
@@ -324,7 +325,7 @@ async function handler(req, res, next) {
     }
     if (!resolvedRid) {
       // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] HelloAsso webhook missing reservationId in metadata', { eventType: payload && payload.eventType, paymentId, checkoutIntentId });
+      log.warn('HelloAsso webhook missing reservationId in metadata', { eventType: payload && payload.eventType, paymentId, checkoutIntentId });
       // Do NOT mark as processed: if metadata/config is fixed later, a manual replay may be possible.
       return res.json({ ok: true, processed: false, missingReservationId: true });
     }

package/lib/log.js

@@ -0,0 +1,29 @@
+'use strict';
+
+// Minimal, opt-in logging.
+// Enable by setting ONEKITE_CALENDAR_DEBUG=1 in the NodeBB process env.
+
+let logger;
+try {
+  logger = require.main.require('./src/logger');
+} catch (e) {
+  logger = null;
+}
+
+const enabled = () => !!process.env.ONEKITE_CALENDAR_DEBUG;
+
+function warn(msg, meta) {
+  if (!enabled()) return;
+  if (logger && typeof logger.warn === 'function') {
+    logger.warn(`[onekite-calendar] ${msg}`, meta || '');
+  }
+}
+
+function error(msg, meta) {
+  if (!enabled()) return;
+  if (logger && typeof logger.error === 'function') {
+    logger.error(`[onekite-calendar] ${msg}`, meta || '');
+  }
+}
+
+module.exports = { warn, error };

package/lib/scheduler.js

@@ -3,6 +3,7 @@
 const meta = require.main.require('./src/meta');
 const db = require.main.require('./src/database');
 const dbLayer = require('./db');
+const log = require('./log');
 
 let timer = null;
 
@@ -83,11 +84,7 @@ async function processAwaitingPayment() {
       }
     } catch (err) {
       // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] Failed to send email (scheduler)', {
-        template,
-        toEmail,
-        err: String((err && err.message) || err),
-      });
+      log.warn('Failed to send email (scheduler)', { template, toEmail, err: String((err && err.message) || err) });
     }
   }
 

package/lib/widgets.js

@@ -41,7 +41,7 @@ widgets.defineWidgets = async function (widgetData) {
 
   list.push({
     widget: 'calendar-onekite-twoweeks',
-    name: 'Calendrier OneKite (2 semaines)',
+    name: 'Calendrier Onekite',
     description: 'Affiche la semaine courante + la semaine suivante (FullCalendar via CDN).',
     content: '',
   });
@@ -54,16 +54,19 @@ widgets.renderTwoWeeksWidget = async function (data) {
   const id = makeDomId();
   const calUrl = widgetCalendarUrl();
   const apiBase = forumBaseUrl();
-  const eventsEndpoint = `${apiBase}/api/v3/plugins/calendar-onekite/events`;
+  // Prefer the new namespace, but keep a transparent fallback to the legacy one.
+  const eventsEndpoint = `${apiBase}/api/v3/plugins/onekite-calendar/events`;
+  const legacyEventsEndpoint = `${apiBase}/api/v3/plugins/calendar-onekite/events`;
 
   const idJson = JSON.stringify(id);
   const calUrlJson = JSON.stringify(calUrl);
   const eventsEndpointJson = JSON.stringify(eventsEndpoint);
+  const legacyEventsEndpointJson = JSON.stringify(legacyEventsEndpoint);
 
   const html = `
 <div class="onekite-twoweeks">
   <div class="d-flex justify-content-between align-items-center mb-1">
-    <div style="font-weight: 600;">Calendrier (2 semaines)</div>
+    <div style="font-weight: 600;">Calendrier</div>
     <a href="${escapeHtml(calUrl)}" class="btn btn-sm btn-outline-secondary" style="line-height: 1.1;">Ouvrir</a>
   </div>
   <div id="${escapeHtml(id)}"></div>
@@ -75,6 +78,7 @@ widgets.renderTwoWeeksWidget = async function (data) {
   const containerId = ${idJson};
   const calUrl = ${calUrlJson};
   const eventsEndpoint = ${eventsEndpointJson};
+  const legacyEventsEndpoint = ${legacyEventsEndpointJson};
 
   function loadOnce(tag, attrs) {
     return new Promise((resolve, reject) => {
@@ -137,21 +141,137 @@ widgets.renderTwoWeeksWidget = async function (data) {
       },
       navLinks: false,
       eventTimeFormat: { hour: '2-digit', minute: '2-digit', hour12: false },
+      eventContent: function(arg) {
+        // Render a simple dot instead of text.
+        const wrap = document.createElement('span');
+        wrap.className = 'onekite-dot';
+        wrap.setAttribute('aria-label', arg.event.title || '');
+        // Mark the node so eventDidMount can find it.
+        wrap.setAttribute('data-onekite-dot', '1');
+        return { domNodes: [wrap] };
+      },
       events: function(info, successCallback, failureCallback) {
         const qs = new URLSearchParams({ start: info.startStr, end: info.endStr });
-        fetch(eventsEndpoint + '?' + qs.toString(), { credentials: 'same-origin' })
+        const url1 = eventsEndpoint + '?' + qs.toString();
+        fetch(url1, { credentials: 'same-origin' })
+          .then((r) => {
+            if (r && r.status === 404) {
+              const url2 = legacyEventsEndpoint + '?' + qs.toString();
+              return fetch(url2, { credentials: 'same-origin' });
+            }
+            return r;
+          })
           .then((r) => r.json())
           .then((json) => successCallback(json || []))
           .catch((e) => failureCallback(e));
       },
+      eventDidMount: function(info) {
+        // Native tooltip + click popup (Bootbox when available).
+        const title = info.event && info.event.title ? String(info.event.title) : '';
+        const start = info.event && info.event.start ? info.event.start : null;
+        const end = info.event && info.event.end ? info.event.end : null;
+        const fmt = (d) => {
+          try {
+            return new Intl.DateTimeFormat('fr-FR', { dateStyle: 'medium' }).format(d);
+          } catch (e) {
+            return d ? d.toISOString().slice(0, 10) : '';
+          }
+        };
+        const period = start ? (end ? (fmt(start) + ' → ' + fmt(end)) : fmt(start)) : '';
+        const body = [title, period].filter(Boolean).join('\n');
+        if (info.el) {
+          // Make dot color match the FullCalendar event colors.
+          try {
+            const dot = info.el.querySelector && info.el.querySelector('[data-onekite-dot="1"]');
+            if (dot) {
+              // Prefer explicit event colors, otherwise fall back to computed styles.
+              const bg = (info.event && (info.event.backgroundColor || info.event.borderColor)) || '';
+              if (bg) {
+                dot.style.backgroundColor = bg;
+              } else {
+                const cs = window.getComputedStyle(info.el);
+                const bgs = cs && cs.backgroundColor;
+                if (bgs && bgs !== 'rgba(0, 0, 0, 0)' && bgs !== 'transparent') {
+                  dot.style.backgroundColor = bgs;
+                }
+              }
+            }
+          } catch (e) {
+            // ignore
+          }
+
+          info.el.title = body;
+          info.el.style.cursor = 'pointer';
+          info.el.addEventListener('click', function(ev) {
+            ev.preventDefault();
+            ev.stopPropagation();
+            const html = '<div style="white-space:pre-line;">' + (body || '').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</div>';
+            if (window.bootbox && typeof window.bootbox.alert === 'function') {
+              window.bootbox.alert({ message: html });
+            } else {
+              // Fallback
+              alert(body);
+            }
+          }, { passive: false });
+        }
+      },
+      // On mobile, users can tap the calendar background to open the full page.
       dateClick: function() {
         window.location.href = calUrl;
       },
-      eventClick: function() {
-        window.location.href = calUrl;
+      // Do not redirect on eventClick: we show a popup in eventDidMount.
+      eventClick: function(info) {
+        try { if (info && info.jsEvent) info.jsEvent.preventDefault(); } catch (e) {}
       },
     });
 
+    // Mobile: swipe left/right to change week (2-week view).
+    (function enableSwipe() {
+      try {
+        if (!('ontouchstart' in window)) return;
+        const target = el; // calendar root
+        let sx = 0;
+        let sy = 0;
+        let st = 0;
+        let tracking = false;
+
+        target.addEventListener('touchstart', function (e) {
+          if (!e.touches || e.touches.length !== 1) return;
+          const t = e.touches[0];
+          sx = t.clientX;
+          sy = t.clientY;
+          st = Date.now();
+          tracking = true;
+        }, { passive: true });
+
+        target.addEventListener('touchend', function (e) {
+          if (!tracking) return;
+          tracking = false;
+          const changed = e.changedTouches && e.changedTouches[0];
+          if (!changed) return;
+          const dx = changed.clientX - sx;
+          const dy = changed.clientY - sy;
+          const adx = Math.abs(dx);
+          const ady = Math.abs(dy);
+          const dt = Date.now() - st;
+
+          // Must be a quick-ish horizontal swipe.
+          if (dt > 800) return;
+          if (adx < 50) return;
+          if (ady > adx * 0.75) return;
+
+          // Move by one week per swipe, even though the view spans 2 weeks.
+          if (dx < 0) {
+            calendar.incrementDate({ weeks: 1 });
+          } else {
+            calendar.incrementDate({ weeks: -1 });
+          }
+        }, { passive: true });
+      } catch (e) {
+        // ignore
+      }
+    })();
+
     calendar.render();
   }
 
@@ -165,7 +285,18 @@ widgets.renderTwoWeeksWidget = async function (data) {
   .onekite-twoweeks .fc .fc-button { padding: .2rem .35rem; font-size: .75rem; }
   .onekite-twoweeks .fc .fc-daygrid-day-number { font-size: .75rem; padding: 2px; }
   .onekite-twoweeks .fc .fc-col-header-cell-cushion { font-size: .75rem; }
-  .onekite-twoweeks .fc .fc-event-title { font-size: .72rem; }
+  .onekite-twoweeks .fc .fc-event-title { display: none; }
+  .onekite-twoweeks .fc .fc-event-time { display: none; }
+  .onekite-twoweeks .onekite-dot {
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    background: var(--fc-event-bg-color, currentColor);
+    border: 1px solid var(--fc-event-border-color, transparent);
+    opacity: 0.85;
+    margin: 0 2px;
+  }
 </style>
   `;
 

package/library.js

@@ -13,6 +13,7 @@ const admin = require('./lib/admin');
 const scheduler = require('./lib/scheduler');
 const helloassoWebhook = require('./lib/helloassoWebhook');
 const widgets = require('./lib/widgets');
+const { LEGACY_NAMESPACE, NAMESPACE } = require('./lib/constants');
 const bodyParser = require('body-parser');
 
 const Plugin = {};
@@ -59,25 +60,30 @@ Plugin.init = async function (params) {
   // 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);
+  // Admin page route (keep legacy + add new)
+  routeHelpers.setupAdminPageRoute(router, `/admin/plugins/${LEGACY_NAMESPACE}`, mw(), admin.renderAdmin);
+  routeHelpers.setupAdminPageRoute(router, `/admin/plugins/${NAMESPACE}`, mw(), admin.renderAdmin);
 
   // Public API (JSON) — NodeBB 4.x only (v3 API)
-  router.get('/api/v3/plugins/calendar-onekite/events', ...publicExpose, api.getEvents);
-  router.get('/api/v3/plugins/calendar-onekite/items', ...publicExpose, api.getItems);
-  router.get('/api/v3/plugins/calendar-onekite/capabilities', ...publicExpose, api.getCapabilities);
-
-  router.post('/api/v3/plugins/calendar-onekite/reservations', ...publicExpose, api.createReservation);
-  router.get('/api/v3/plugins/calendar-onekite/reservations/:rid', ...publicExpose, api.getReservationDetails);
-  router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/approve', ...publicExpose, api.approveReservation);
-  router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/refuse', ...publicExpose, api.refuseReservation);
-  router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/cancel', ...publicExpose, api.cancelReservation);
-
-  router.post('/api/v3/plugins/calendar-onekite/special-events', ...publicExpose, api.createSpecialEvent);
-  router.get('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.getSpecialEventDetails);
-  router.delete('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.deleteSpecialEvent);
+  const pluginBases = [LEGACY_NAMESPACE, NAMESPACE];
+  pluginBases.forEach((ns) => {
+    router.get(`/api/v3/plugins/${ns}/events`, ...publicExpose, api.getEvents);
+    router.get(`/api/v3/plugins/${ns}/items`, ...publicExpose, api.getItems);
+    router.get(`/api/v3/plugins/${ns}/capabilities`, ...publicExpose, api.getCapabilities);
+
+    router.post(`/api/v3/plugins/${ns}/reservations`, ...publicExpose, api.createReservation);
+    router.get(`/api/v3/plugins/${ns}/reservations/:rid`, ...publicExpose, api.getReservationDetails);
+    router.put(`/api/v3/plugins/${ns}/reservations/:rid/approve`, ...publicExpose, api.approveReservation);
+    router.put(`/api/v3/plugins/${ns}/reservations/:rid/refuse`, ...publicExpose, api.refuseReservation);
+    router.put(`/api/v3/plugins/${ns}/reservations/:rid/cancel`, ...publicExpose, api.cancelReservation);
+
+    router.post(`/api/v3/plugins/${ns}/special-events`, ...publicExpose, api.createSpecialEvent);
+    router.get(`/api/v3/plugins/${ns}/special-events/:eid`, ...publicExpose, api.getSpecialEventDetails);
+    router.delete(`/api/v3/plugins/${ns}/special-events/:eid`, ...publicExpose, api.deleteSpecialEvent);
+  });
 
   // Admin API (JSON)
-  const adminBases = ['/api/v3/admin/plugins/calendar-onekite'];
+  const adminBases = [`/api/v3/admin/plugins/${LEGACY_NAMESPACE}`, `/api/v3/admin/plugins/${NAMESPACE}`];
 
   adminBases.forEach((base) => {
     router.get(`${base}/settings`, ...adminMws, admin.getSettings);
@@ -88,7 +94,6 @@ Plugin.init = async function (params) {
     router.put(`${base}/reservations/:rid/refuse`, ...adminMws, admin.refuseReservation);
 
     router.post(`${base}/purge`, ...adminMws, admin.purgeByYear);
-    router.get(`${base}/debug`, ...adminMws, admin.debugHelloAsso);
     // Accounting / exports
     router.get(`${base}/accounting`, ...adminMws, admin.getAccounting);
     router.get(`${base}/accounting.csv`, ...adminMws, admin.exportAccountingCsv);
@@ -112,11 +117,13 @@ Plugin.init = async function (params) {
   // Accept webhook on both legacy root path and namespaced plugin path.
   // Some reverse proxies block unknown root paths, so /plugins/... is recommended.
   router.post('/helloasso', helloassoJson, helloassoWebhook.handler);
-  router.post('/plugins/calendar-onekite/helloasso', helloassoJson, helloassoWebhook.handler);
+  router.post(`/plugins/${LEGACY_NAMESPACE}/helloasso`, helloassoJson, helloassoWebhook.handler);
+  router.post(`/plugins/${NAMESPACE}/helloasso`, helloassoJson, helloassoWebhook.handler);
 
   // Optional: health checks
   router.get('/helloasso', (req, res) => res.json({ ok: true }));
-  router.get('/plugins/calendar-onekite/helloasso', (req, res) => res.json({ ok: true }));
+  router.get(`/plugins/${LEGACY_NAMESPACE}/helloasso`, (req, res) => res.json({ ok: true }));
+  router.get(`/plugins/${NAMESPACE}/helloasso`, (req, res) => res.json({ ok: true }));
 
   scheduler.start();
 };
@@ -124,9 +131,9 @@ Plugin.init = async function (params) {
 Plugin.addAdminNavigation = async function (header) {
   header.plugins = header.plugins || [];
   header.plugins.push({
-    route: '/plugins/calendar-onekite',
+    route: `/plugins/${LEGACY_NAMESPACE}`,
     icon: 'fa-calendar',
-    name: 'Calendar OneKite',
+    name: 'Calendar Onekite',
   });
   return header;
 };

package/package.json

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

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "nodebb-plugin-onekite-calendar",
-  "name": "OneKite Calendar",
+  "name": "Onekite Calendar",
   "description": "Equipment reservation calendar (FullCalendar) with admin approval & HelloAsso checkout",
   "url": "https://www.onekite.com/calendar",
   "hooks": [
@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.3"
+  "version": "1.0.7"
 }

package/public/admin.js

@@ -316,14 +316,6 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     }
   }
 
-  async function debugHelloAsso() {
-    try {
-      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
-    } catch (e) {
-      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
-    }
-  }
-
   async function loadAccounting(from, to) {
     const params = new URLSearchParams();
     if (from) params.set('from', from);
@@ -336,23 +328,6 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     const form = document.getElementById('onekite-settings-form');
     if (!form) return;
 
-    // Make the HelloAsso debug output readable in both light and dark ACP themes.
-    // NodeBB 4.x uses Bootstrap variables, so we can rely on CSS variables here.
-    (function injectAdminCss() {
-      const id = 'onekite-admin-css';
-      if (document.getElementById(id)) return;
-      const style = document.createElement('style');
-      style.id = id;
-      style.textContent = `
-        #onekite-debug-output.onekite-debug-output {
-          background: var(--bs-body-bg) !important;
-          color: var(--bs-body-color) !important;
-          border: 1px solid var(--bs-border-color) !important;
-        }
-      `;
-      document.head.appendChild(style);
-    })();
-
     // Load settings
     try {
       const s = await loadSettings();
@@ -674,30 +649,6 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
       });
     }
 
-    // Debug
-    const debugBtn = document.getElementById('onekite-debug-run');
-    if (debugBtn) {
-      debugBtn.addEventListener('click', async () => {
-        const out = document.getElementById('onekite-debug-output');
-        if (out) out.textContent = 'Chargement...';
-        try {
-          const result = await debugHelloAsso();
-          if (out) out.textContent = JSON.stringify(result, null, 2);
-          const catalogCount = result && result.catalog ? parseInt(result.catalog.count, 10) || 0 : 0;
-          const catalogOk = !!(result && result.catalog && result.catalog.ok);
-          // Accept "count > 0" even if ok flag is false (some proxies can strip fields, etc.)
-          if (catalogOk || catalogCount > 0) {
-            showAlert('success', `Catalogue HelloAsso: ${catalogCount} item(s)`);
-          } else {
-            showAlert('error', 'HelloAsso: impossible de récupérer le catalogue.');
-          }
-        } catch (e) {
-          if (out) out.textContent = String(e && e.message ? e.message : e);
-          showAlert('error', 'Debug impossible.');
-        }
-      });
-    }
-
     // Accounting (paid reservations)
     const accFrom = document.getElementById('onekite-acc-from');
     const accTo = document.getElementById('onekite-acc-to');

package/public/client.js

@@ -4,7 +4,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   'use strict';
 
   // Ensure small UI tweaks are applied even when themes override bootstrap defaults.
-  (function ensureOneKiteStyles() {
+  (function ensureOnekiteStyles() {
     try {
       if (document.getElementById('onekite-inline-styles')) return;
       const style = document.createElement('style');

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

@@ -2,22 +2,10 @@
 
 <div class="row">
   <div class="col-lg-9">
-    <h1>Calendar OneKite</h1>
+    <h1>Calendar Onekite</h1>
 
     <ul class="nav nav-tabs mt-3" role="tablist">
-      <li class="nav-item" role="presentation">
-        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#onekite-tab-settings" type="button" role="tab">Locations</button>
-      </li>
-      <li class="nav-item" role="presentation">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-events" type="button" role="tab">Évènements</button>
-      </li>
-      <li class="nav-item" role="presentation">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-pending" type="button" role="tab">Demandes en attente</button>
-      </li>
-      <li class="nav-item" role="presentation">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-debug" type="button" role="tab">Debug HelloAsso</button>
-      </li>
-      <li class="nav-item" role="presentation">
+<li class="nav-item" role="presentation">
         <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-accounting" type="button" role="tab">Comptabilisation</button>
       </li>
     </ul>
@@ -154,14 +142,7 @@
         <h4>Demandes en attente</h4>
         <div id="onekite-pending" class="list-group"></div>
       </div>
-
-      <div class="tab-pane fade" id="onekite-tab-debug" role="tabpanel">
-        <p class="text-muted">Teste la récupération du token et la liste du matériel (catalogue).</p>
-        <button type="button" class="btn btn-secondary me-2" id="onekite-debug-run">Tester le chargement du matériel</button>
-        <pre id="onekite-debug-output" class="mt-3 p-3 border rounded onekite-debug-output" style="max-height: 360px; overflow: auto;"></pre>
-      </div>
-
-      <div class="tab-pane fade" id="onekite-tab-accounting" role="tabpanel">
+<div class="tab-pane fade" id="onekite-tab-accounting" role="tabpanel">
         <h4>Comptabilisation des locations (payées)</h4>
         <div class="d-flex flex-wrap gap-2 align-items-end mb-3">
           <div>