nodebb-plugin-equipment-calendar 9.1.3 → 9.1.4

package/library.js

@@ -1,9 +1,7 @@
 'use strict';
 
-const nconf = require.main.require('nconf');
 const meta = require.main.require('./src/meta');
 const db = require.main.require('./src/database');
-const user = require.main.require('./src/user');
 const groups = require.main.require('./src/groups');
 const winston = require.main.require('winston');
 
@@ -35,16 +33,13 @@ async function getSettings() {
 async function isUserInAnyGroups(uid, groupCsv) {
   if (!uid || !groupCsv) return false;
   const names = String(groupCsv).split(',').map(s => s.trim()).filter(Boolean);
-  if (!names.length) return false;
   for (const name of names) {
-    const inGroup = await groups.isMember(uid, name);
-    if (inGroup) return true;
+    if (await groups.isMember(uid, name)) return true;
   }
   return false;
 }
 
-function rid() {
-  // UUID v4 (no dependency)
+function genRid() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
     const r = Math.random() * 16 | 0;
     const v = c === 'x' ? r : (r & 0x3 | 0x8);
@@ -60,14 +55,13 @@ async function saveReservation(r) {
   await db.sortedSetAdd(reservationsZset, r.createdAt || Date.now(), r.rid);
 }
 
-async function listReservations(limit=500) {
+async function listReservations(limit=1000) {
   const rids = await db.getSortedSetRevRange(reservationsZset, 0, limit - 1);
   const objs = await Promise.all(rids.map(id => db.getObject(reservationKey(id))));
   return objs.filter(Boolean);
 }
 
 function toEvent(r) {
-  // FullCalendar allDay uses exclusive end
   const start = String(r.startIso).slice(0,10);
   const end = new Date(String(r.endIso).slice(0,10) + 'T00:00:00Z');
   end.setUTCDate(end.getUTCDate() + 1);
@@ -75,42 +69,27 @@ function toEvent(r) {
 
   const status = r.status || 'pending';
   const title = status === 'paid' ? '[PAID] Reservation' : (status === 'approved' ? '[APPROVED] Reservation' : '[PENDING] Reservation');
-
-  return {
-    id: r.rid,
-    title,
-    start,
-    end: endExcl,
-    allDay: true,
-  };
+  return { id: r.rid, title, start, end: endExcl, allDay: true };
 }
 
 plugin.init = async function (params) {
   const { router, middleware } = params;
 
-  // Admin page
   router.get('/admin/plugins/equipment-calendar', middleware.admin.buildHeader, async (req, res) => {
     res.render('admin/plugins/equipment-calendar', {});
   });
-  router.get('/api/admin/plugins/equipment-calendar', async (req, res) => {
-    res.json({});
-  });
+  router.get('/api/admin/plugins/equipment-calendar', async (req, res) => res.json({}));
 
-  // Calendar page
   router.get('/equipment/calendar', middleware.buildHeader, async (req, res) => {
     res.render('equipment-calendar/calendar', {});
   });
-  router.get('/api/equipment/calendar', async (req, res) => {
-    res.json({});
-  });
+  router.get('/api/equipment/calendar', async (req, res) => res.json({}));
 
-  // API: events
   router.get('/api/plugins/equipment-calendar/events', async (req, res) => {
     const list = await listReservations(1000);
     res.json({ events: list.map(toEvent) });
   });
 
-  // API: create reservation
   router.post('/api/plugins/equipment-calendar/reservations', middleware.applyCSRF, async (req, res) => {
     const uid = req.uid;
     if (!uid) return res.status(403).json({ message: 'forbidden' });
@@ -125,36 +104,17 @@ plugin.init = async function (params) {
     if (!startIso || !endIso) return res.status(400).json({ message: 'dates required' });
     if (!itemIds.length) return res.status(400).json({ message: 'items required' });
 
-    const r = {
-      rid: rid(),
-      uid,
-      startIso,
-      endIso,
-      itemIds: itemIds.map(String),
-      status: 'pending',
-      createdAt: Date.now(),
-    };
+    const r = { rid: genRid(), uid, startIso, endIso, itemIds: itemIds.map(String), status: 'pending', createdAt: Date.now() };
     await saveReservation(r);
     res.json({ ok: true, rid: r.rid });
   });
 
-  winston.info('[equipment-calendar] loaded (official4x skeleton)');
+  winston.info('[equipment-calendar] loaded (official4x standard bundle)');
 };
 
 plugin.addAdminMenu = async function (header) {
-  header.plugins.push({
-    route: '/plugins/equipment-calendar',
-    icon: 'fa-calendar',
-    name: 'Equipment Calendar',
-  });
+  header.plugins.push({ route: '/plugins/equipment-calendar', icon: 'fa-calendar', name: 'Equipment Calendar' });
   return header;
 };
 
-// Optional: allow /calendar -> /equipment/calendar without hard redirect
-plugin.addRouteAliases = async function (hookData) {
-  // hookData: { router, middleware, controllers } - but for filter:router.page we can inject page routes elsewhere;
-  // Keep empty to avoid breaking installs. Alias handled by theme route config if needed.
-  return hookData;
-};
-
 module.exports = plugin;

package/package.json

@@ -1,22 +1,11 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "9.1.3",
-  "description": "Equipment reservation calendar (NodeBB 4.x compatible, official settings pattern)",
+  "version": "9.1.4",
+  "description": "Equipment reservation calendar (NodeBB 4.x compatible, official ACP settings, FullCalendar standard bundle)",
   "main": "library.js",
   "license": "MIT",
-  "keywords": [
-    "nodebb",
-    "plugin",
-    "calendar",
-    "reservations",
-    "fullcalendar"
-  ],
   "dependencies": {
-    "@fullcalendar/core": "^6.1.11",
-    "@fullcalendar/daygrid": "^6.1.11",
-    "@fullcalendar/interaction": "^6.1.11",
-    "@fullcalendar/list": "^6.1.11",
-    "@fullcalendar/timegrid": "^6.1.11"
+    "fullcalendar": "^6.1.20"
   },
   "scripts": {
     "postinstall": "node ./scripts/postinstall.js"

package/plugin.json

@@ -1,8 +1,7 @@
 {
   "id": "nodebb-plugin-equipment-calendar",
   "name": "Equipment Calendar",
-  "description": "Equipment reservation calendar with approvals and HelloAsso integration (skeleton).",
-  "url": "https://github.com/your-org/nodebb-plugin-equipment-calendar",
+  "description": "Equipment reservation calendar (NodeBB 4.x)",
   "library": "./library.js",
   "hooks": [
     {
@@ -12,10 +11,6 @@
     {
       "hook": "filter:admin.header.build",
       "method": "addAdminMenu"
-    },
-    {
-      "hook": "filter:router.page",
-      "method": "addRouteAliases"
     }
   ],
   "acpScripts": [

package/public/js/acp.js

@@ -5,28 +5,32 @@ define('admin/plugins/equipment-calendar', ['settings', 'alerts'], function (Set
 
   function onPage() {
     const url = (ajaxify && ajaxify.data && ajaxify.data.url) ? ajaxify.data.url : (window.location.pathname || '');
-    if (!url.startsWith('admin/plugins/equipment-calendar')) {
-      return;
-    }
+    if (!url.startsWith('admin/plugins/equipment-calendar')) return;
+
     const container = $('.equipment-calendar-settings');
     if (!container.length) return;
 
-    // NodeBB 4.x settings module supports sync/persist (official pattern)
-    if (typeof Settings.sync === 'function') {
-      Settings.sync('equipmentCalendar', container);
-    } else {
-      Settings.load('equipmentCalendar', container);
-    }
+    try {
+      if (typeof Settings.sync === 'function') {
+        Settings.sync('equipmentCalendar', container);
+      } else {
+        Settings.load('equipmentCalendar', container);
+      }
+    } catch (e) {}
 
     $('#save').off('click.ec').on('click.ec', function (e) {
       e.preventDefault();
       const done = function () {
         alerts.success('[[admin/settings:settings-saved]]');
       };
-      if (typeof Settings.persist === 'function') {
-        Settings.persist('equipmentCalendar', container, done, true);
-      } else {
-        Settings.save('equipmentCalendar', container, done);
+      try {
+        if (typeof Settings.persist === 'function') {
+          Settings.persist('equipmentCalendar', container, done, true);
+        } else {
+          Settings.save('equipmentCalendar', container, done);
+        }
+      } catch (err) {
+        alerts.error(err && err.message ? err.message : 'Erreur');
       }
     });
   }

package/public/js/client.js

@@ -5,12 +5,10 @@ define('equipment-calendar/client', ['api', 'alerts'], function (api, alerts) {
 
   function pageMatch() {
     const url = (ajaxify && ajaxify.data && ajaxify.data.url) ? ajaxify.data.url : '';
-    return url === 'equipment/calendar' || url === 'calendar';
+    return url === 'equipment/calendar';
   }
 
-  function isoDate(d) {
-    return String(d || '').slice(0, 10);
-  }
+  function isoDate(s) { return String(s || '').slice(0, 10); }
 
   async function loadEvents() {
     const res = await api.get('/plugins/equipment-calendar/events', {});
@@ -21,31 +19,27 @@ define('equipment-calendar/client', ['api', 'alerts'], function (api, alerts) {
     $('#ec-start').val(startIso);
     $('#ec-end').val(endIso);
     const modalEl = document.getElementById('ecModal');
-    const modal = window.bootstrap ? window.bootstrap.Modal.getOrCreateInstance(modalEl) : null;
-    if (modal) modal.show();
+    if (!modalEl || !window.bootstrap) return;
+    window.bootstrap.Modal.getOrCreateInstance(modalEl).show();
   }
 
   async function createReservation(payload) {
-    const res = await api.post('/plugins/equipment-calendar/reservations', payload);
-    return res;
+    return api.post('/plugins/equipment-calendar/reservations', payload);
   }
 
   async function initCalendar() {
     const el = document.getElementById('ec-calendar');
-    if (!el || !window.FullCalendar) return;
+    if (!el || !window.FullCalendar || !window.FullCalendar.Calendar) return;
 
     const events = await loadEvents();
 
-    const calendar = new FullCalendar.Calendar(el, {
-      plugins: [ FullCalendarDayGrid, FullCalendarTimeGrid, FullCalendarList, FullCalendarInteraction ],
+    const calendar = new window.FullCalendar.Calendar(el, {
       initialView: 'dayGridMonth',
       headerToolbar: { left: 'prev,next today', center: 'title', right: 'dayGridMonth,timeGridWeek,listWeek' },
       selectable: true,
       selectMirror: true,
-      eventTimeFormat: { hour: '2-digit', minute: '2-digit', hour12: false },
-      allDaySlot: true,
+      displayEventTime: false,
       select: function (info) {
-        // all-day selection end is exclusive -> store inclusive end
         const start = isoDate(info.startStr);
         const endExcl = isoDate(info.endStr);
         let end = endExcl;
@@ -61,7 +55,7 @@ define('equipment-calendar/client', ['api', 'alerts'], function (api, alerts) {
         const d = isoDate(info.dateStr);
         openModal(d, d);
       },
-      events: events,
+      events,
     });
 
     calendar.render();
@@ -77,8 +71,7 @@ define('equipment-calendar/client', ['api', 'alerts'], function (api, alerts) {
         await createReservation({ startIso, endIso, itemIds, _csrf: csrf });
         alerts.success('Demande envoyée');
         const modalEl = document.getElementById('ecModal');
-        const modal = window.bootstrap ? window.bootstrap.Modal.getOrCreateInstance(modalEl) : null;
-        if (modal) modal.hide();
+        if (modalEl && window.bootstrap) window.bootstrap.Modal.getOrCreateInstance(modalEl).hide();
 
         const newEvents = await loadEvents();
         calendar.removeAllEvents();
@@ -89,10 +82,7 @@ define('equipment-calendar/client', ['api', 'alerts'], function (api, alerts) {
     });
   }
 
-  function onEnd() {
-    if (!pageMatch()) return;
-    initCalendar();
-  }
+  function onEnd() { if (pageMatch()) initCalendar(); }
 
   Client.init = function () {
     $(window).off('action:ajaxify.end.ecCal').on('action:ajaxify.end.ecCal', onEnd);

package/scripts/postinstall.js

@@ -14,24 +14,12 @@ function exists(p) { try { fs.accessSync(p); return true; } catch { return false
   const outDir = path.join(root, 'public', 'vendor', 'fullcalendar');
   fs.mkdirSync(outDir, { recursive: true });
 
-  const candidates = [
-    // FullCalendar v6 provides "index.global.min.js" per package
-    { pkg: '@fullcalendar/core', js: 'index.global.min.js', css: 'index.global.min.css' },
-    { pkg: '@fullcalendar/daygrid', js: 'index.global.min.js', css: 'index.global.min.css' },
-    { pkg: '@fullcalendar/timegrid', js: 'index.global.min.js', css: 'index.global.min.css' },
-    { pkg: '@fullcalendar/list', js: 'index.global.min.js', css: 'index.global.min.css' },
-    { pkg: '@fullcalendar/interaction', js: 'index.global.min.js', css: 'index.global.min.css' },
-  ];
+  const js = path.join(root, 'node_modules', 'fullcalendar', 'index.global.min.js');
+  const css = path.join(root, 'node_modules', 'fullcalendar', 'index.global.min.css');
 
   const copied = [];
-  candidates.forEach((c) => {
-    const base = path.join(root, 'node_modules', c.pkg);
-    const js = path.join(base, c.js);
-    const css = path.join(base, c.css);
-    if (exists(js)) { copyFile(js, path.join(outDir, `${c.pkg.replace('@fullcalendar/','')}.${c.js}`)); copied.push(js); }
-    if (exists(css)) { copyFile(css, path.join(outDir, `${c.pkg.replace('@fullcalendar/','')}.${c.css}`)); copied.push(css); }
-  });
+  if (exists(js)) { copyFile(js, path.join(outDir, 'index.global.min.js')); copied.push(js); }
+  if (exists(css)) { copyFile(css, path.join(outDir, 'index.global.min.css')); copied.push(css); }
 
-  // Also write a small manifest for debugging
   fs.writeFileSync(path.join(outDir, 'manifest.json'), JSON.stringify({ copied }, null, 2), 'utf-8');
 })();

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

@@ -52,7 +52,7 @@
   </div>
 
   <div class="card card-body mb-3">
-    <h5 class="mb-3">Réservation</h5>
+    <h5 class="mb-3">Calendrier</h5>
     <div class="row g-3">
       <div class="col-md-6">
         <label class="form-label">Timeout paiement (minutes)</label>

package/templates/equipment-calendar/calendar.tpl

@@ -38,16 +38,8 @@
   </div>
 </div>
 
-<link rel="stylesheet" href="{config.relative_path}/plugins/nodebb-plugin-equipment-calendar/vendor/fullcalendar/core.index.global.min.css">
-<link rel="stylesheet" href="{config.relative_path}/plugins/nodebb-plugin-equipment-calendar/vendor/fullcalendar/daygrid.index.global.min.css">
-<link rel="stylesheet" href="{config.relative_path}/plugins/nodebb-plugin-equipment-calendar/vendor/fullcalendar/timegrid.index.global.min.css">
-<link rel="stylesheet" href="{config.relative_path}/plugins/nodebb-plugin-equipment-calendar/vendor/fullcalendar/list.index.global.min.css">
-
-<script src="{config.relative_path}/plugins/nodebb-plugin-equipment-calendar/vendor/fullcalendar/core.index.global.min.js"></script>
-<script src="{config.relative_path}/plugins/nodebb-plugin-equipment-calendar/vendor/fullcalendar/interaction.index.global.min.js"></script>
-<script src="{config.relative_path}/plugins/nodebb-plugin-equipment-calendar/vendor/fullcalendar/daygrid.index.global.min.js"></script>
-<script src="{config.relative_path}/plugins/nodebb-plugin-equipment-calendar/vendor/fullcalendar/timegrid.index.global.min.js"></script>
-<script src="{config.relative_path}/plugins/nodebb-plugin-equipment-calendar/vendor/fullcalendar/list.index.global.min.js"></script>
+<link rel="stylesheet" href="{config.relative_path}/plugins/nodebb-plugin-equipment-calendar/vendor/fullcalendar/index.global.min.css">
+<script src="{config.relative_path}/plugins/nodebb-plugin-equipment-calendar/vendor/fullcalendar/index.global.min.js"></script>
 
 <script>
 require(['equipment-calendar/client'], function (mod) { mod.init(); });