nodebb-plugin-calendar-onekite 2.1.0 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Calendar + equipment booking + admin approval + HelloAsso payments for NodeBB v4 (no-jQuery UI)",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -3,13 +3,14 @@
   "name": "Calendar Onekite",
   "description": "Calendrier + réservation matériel + validation admin + paiement HelloAsso pour NodeBB v4 (no-jQuery UI)",
   "url": "",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "library": "./library.js",
   "staticDirs": {
     "static": "static"
   },
   "acpScripts": [
-    "static/js/admin.js"
+    "static/js/admin.bundle.js",
+    "static/js/admin-planning.bundle.js"
   ],
   "hooks": [
     {

package/static/js/admin-planning.bundle.js

@@ -0,0 +1,26 @@
+(function () {
+  'use strict';
+
+  function ready(fn){
+    if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', fn);
+    else fn();
+  }
+
+  function boot(){
+    if (!document.querySelector('#planning-calendar')) return;
+
+    if (typeof window.require !== 'function') {
+      console.warn('[calendar-onekite] require is not defined (planning)');
+      return;
+    }
+
+    window.require([
+      'plugins/nodebb-plugin-calendar-onekite/static/js/admin-planning'
+    ], function (Mod) {
+      try { Mod && Mod.init && Mod.init(); } catch (e) { console.error(e); }
+    });
+  }
+
+  ready(boot);
+  document.addEventListener('action:ajaxify.end', boot);
+})();

package/static/js/admin.bundle.js

@@ -0,0 +1,26 @@
+(function () {
+  'use strict';
+
+  function ready(fn){
+    if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', fn);
+    else fn();
+  }
+
+  function boot(){
+    if (!document.querySelector('#calendar-onekite-admin') && !document.querySelector('#calendar-planning')) return;
+
+    if (typeof window.require !== 'function') {
+      console.warn('[calendar-onekite] require is not defined (ACP)');
+      return;
+    }
+
+    window.require([
+      'plugins/nodebb-plugin-calendar-onekite/static/js/admin'
+    ], function (Admin) {
+      try { Admin && Admin.init && Admin.init(); } catch (e) { console.error(e); }
+    });
+  }
+
+  ready(boot);
+  document.addEventListener('action:ajaxify.end', boot);
+})();

package/static/js/calendar.bundle.js

@@ -0,0 +1,63 @@
+(function () {
+  'use strict';
+
+  function log(...a){ try{ console.log('[calendar-onekite]', ...a);}catch{} }
+  function warn(...a){ try{ console.warn('[calendar-onekite]', ...a);}catch{} }
+
+  function ready(fn){
+    if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', fn);
+    else fn();
+  }
+
+  function runWithModules(mods, cb){
+    if (typeof window.require === 'function') {
+      window.require(mods, function(){ cb.apply(null, arguments); });
+      return true;
+    }
+    return false;
+  }
+
+  async function fetchJson(path, method='GET', body){
+    const url = path.startsWith('/api/') || path.startsWith('/api/v3/') ? path : ('/api/v3' + path);
+    const headers = { 'Content-Type':'application/json' };
+    const csrf = (window.ajaxify && window.ajaxify.data && window.ajaxify.data.csrf_token) || null;
+    if (csrf) headers['x-csrf-token'] = csrf;
+    const res = await fetch(url, { method, headers, credentials:'same-origin', body: body ? JSON.stringify(body): undefined });
+    if (!res.ok) {
+      let msg = res.statusText;
+      try { const j = await res.json(); msg = j.error || j.message || msg; } catch {}
+      const e = new Error(msg); e.status=res.status; throw e;
+    }
+    return res.json();
+  }
+
+  function initCalendar(api, alerts){
+    // use the existing calendar module (AMD) if present; else minimal inline init
+    if (runWithModules(['plugins/nodebb-plugin-calendar-onekite/static/js/calendar'], function(Calendar){
+      if (Calendar && Calendar.init) Calendar.init();
+    })) return;
+
+    // Fallback: we don't have AMD loader, do nothing but tell why
+    warn('AMD require introuvable, impossible d\'initialiser le calendrier.');
+    if (alerts && alerts.error) alerts.error('Calendrier: require introuvable (scripts NodeBB non chargés)');
+  }
+
+  function boot(){
+    if (!document.querySelector('#calendar')) return;
+    // Ensure FullCalendar loaded
+    if (!window.FullCalendar) {
+      warn('FullCalendar non chargé (CDN bloqué ?).');
+    }
+    runWithModules(['api', 'alerts'], function(api, alerts){
+      initCalendar(api, alerts);
+    }) || initCalendar(null, null);
+  }
+
+  ready(boot);
+
+  // NodeBB ajaxify navigation
+  if (window.socket && window.socket.on) {
+    // do nothing
+  }
+  document.addEventListener('action:ajaxify.end', boot);
+})();

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

@@ -0,0 +1,42 @@
+(function(){
+  'use strict';
+  if (window.__onekiteMyResLoaded) return;
+  window.__onekiteMyResLoaded=true;
+
+  function qs(sel, root){ return (root||document).querySelector(sel); }
+  function escapeHtml(s){
+    return String(s ?? '').replaceAll('&','&amp;').replaceAll('<','&lt;').replaceAll('>','&gt;')
+      .replaceAll('"','&quot;').replaceAll("'","&#039;");
+  }
+
+  function boot(api, alerts){
+    async function load(){
+      const tbody=qs('#my-reservations-body');
+      if (!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){ console.error(e); alerts.error(e?.message||e); }
+    }
+    async function init(){ if (!qs('#calendar-my-reservations')) return; await load(); }
+    document.addEventListener('action:ajaxify.end', init);
+    init();
+  }
+
+  if (typeof require === 'function'){
+    require(['api','alerts'], function(api, alerts){ boot(api, alerts); });
+  }
+})();

package/templates/admin/calendar-planning.tpl

@@ -28,8 +28,6 @@
 </div>
 
 <script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.15/index.global.min.js"></script>
-<script>
-require(['plugins/nodebb-plugin-calendar-onekite/static/js/admin-planning'], function (Mod) {
-  Mod.init && Mod.init();
-});
-</script>
+<script src="/plugins/nodebb-plugin-calendar-onekite/static/js/admin.bundle.js"></script>
+
+<script src="/plugins/nodebb-plugin-calendar-onekite/static/js/admin-planning.bundle.js"></script>

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

@@ -74,6 +74,5 @@
   <button id="calendar-onekite-save" class="btn btn-primary">Enregistrer</button>
 </div>
 
-<script>
-require(['plugins/nodebb-plugin-calendar-onekite/static/js/admin'], function () {});
-</script>
+
+<script src="/plugins/nodebb-plugin-calendar-onekite/static/js/admin.bundle.js"></script>

package/templates/calendar-my-reservations.tpl

@@ -26,4 +26,6 @@ require(['plugins/nodebb-plugin-calendar-onekite/static/js/calendar-my-reservati
 });
 </script>
 
+<script src="/plugins/nodebb-plugin-calendar-onekite/static/js/my-reservations.bundle.js"></script>
+
 <!-- IMPORT partials/footer.tpl -->

package/templates/calendar.tpl

@@ -99,10 +99,6 @@
 
 <script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.15/index.global.min.js"></script>
 
-<script>
-require(['plugins/nodebb-plugin-calendar-onekite/static/js/calendar'], function (Calendar) {
-  Calendar.init && Calendar.init();
-});
-</script>
+<script src="/plugins/nodebb-plugin-calendar-onekite/static/js/calendar.bundle.js"></script>
 
 <!-- IMPORT partials/footer.tpl -->