nodebb-plugin-equipment-calendar 0.2.6 → 0.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {
@@ -18,7 +18,6 @@
   "dependencies": {
     "axios": "^1.7.9",
     "luxon": "^3.5.0",
-    "uuid": "^9.0.1",
-    "fullcalendar": "^6.1.19"
+    "uuid": "^9.0.1"
   }
 }

package/plugin.json

@@ -21,8 +21,7 @@
   "templates": "./public/templates",
   "staticDirs": {
     "js": "public/js",
-    "css": "public/css",
-    "vendor": "node_modules/fullcalendar/dist"
+    "css": "public/css"
   },
   "scripts": [
     "public/js/client.js"

package/public/js/admin.js

@@ -1,40 +1,55 @@
 'use strict';
-/* global socket */
+/* global window, document, socket, app */
 
-define('admin/plugins/equipment-calendar', ['jquery'], function ($) {
-  const EquipmentCalendar = {};
+(function () {
+  function byId(id) { return document.getElementById(id); }
 
-  EquipmentCalendar.init = function () {
-    $('#save').on('click', function () {
-      const payload = {
-        creatorGroups: $('#creatorGroups').val(),
-        approverGroup: $('#approverGroup').val(),
-        notifyGroup: $('#notifyGroup').val(),
-        itemsJson: $('#itemsJson').val(),
-        ha_clientId: $('#ha_clientId').val(),
-        ha_clientSecret: $('#ha_clientSecret').val(),
-        ha_organizationSlug: $('#ha_organizationSlug').val(),
-        ha_returnUrl: $('#ha_returnUrl').val(),
-        ha_webhookSecret: $('#ha_webhookSecret').val(),
-        defaultView: $('#defaultView').val(),
-        timezone: $('#timezone').val(),
-        showRequesterToAll: $('#showRequesterToAll').is(':checked') ? '1' : '0',
-      };
+  function collect() {
+    return {
+      creatorGroups: byId('creatorGroups') ? byId('creatorGroups').value : '',
+      approverGroup: byId('approverGroup') ? byId('approverGroup').value : '',
+      notifyGroup: byId('notifyGroup') ? byId('notifyGroup').value : '',
+      itemsJson: byId('itemsJson') ? byId('itemsJson').value : '[]',
+      ha_clientId: byId('ha_clientId') ? byId('ha_clientId').value : '',
+      ha_clientSecret: byId('ha_clientSecret') ? byId('ha_clientSecret').value : '',
+      ha_organizationSlug: byId('ha_organizationSlug') ? byId('ha_organizationSlug').value : '',
+      ha_returnUrl: byId('ha_returnUrl') ? byId('ha_returnUrl').value : '',
+      ha_webhookSecret: byId('ha_webhookSecret') ? byId('ha_webhookSecret').value : '',
+      defaultView: byId('defaultView') ? byId('defaultView').value : 'dayGridMonth',
+      timezone: byId('timezone') ? byId('timezone').value : 'Europe/Paris',
+      showRequesterToAll: (byId('showRequesterToAll') && byId('showRequesterToAll').checked) ? '1' : '0',
+    };
+  }
+
+  function onReady(fn) {
+    if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', fn);
+    else fn();
+  }
+
+  onReady(function () {
+    const btn = byId('save');
+    if (!btn) return;
+
+    btn.addEventListener('click', function () {
+      if (typeof socket === 'undefined' || !socket.emit) {
+        const msg = 'Socket NodeBB indisponible (socket.emit). Vérifie que tu es bien dans l\'ACP.';
+        if (window.app && window.app.alertError) window.app.alertError(msg);
+        else alert(msg);
+        return;
+      }
+
+      const payload = collect();
 
       socket.emit('admin.settings.save', { hash: 'equipmentCalendar', values: payload }, function (err) {
         if (err) {
-          if (window.app && window.app.alertError) {
-            return window.app.alertError(err.message || err);
-          }
-          return alert(err.message || err);
-        }
-        if (window.app && window.app.alertSuccess) {
-          return window.app.alertSuccess('Sauvegardé');
+          const m = (err.message || err) + '';
+          if (window.app && window.app.alertError) return window.app.alertError(m);
+          alert(m);
+          return;
         }
+        if (window.app && window.app.alertSuccess) return window.app.alertSuccess('Sauvegardé');
         alert('Sauvegardé');
       });
     });
-  };
-
-  return EquipmentCalendar;
-});
+  });
+}());

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

@@ -62,6 +62,3 @@
   </div>
 </div>
 
-<script>
-  require(['admin/plugins/equipment-calendar'], function (m) { m.init(); });
-</script>

package/public/templates/equipment-calendar/calendar.tpl

@@ -50,8 +50,7 @@
   {{{ end }}}
 </div>
 
-<link rel="stylesheet" href="/plugins/nodebb-plugin-equipment-calendar/vendor/index.global.min.css">
-<script src="/plugins/nodebb-plugin-equipment-calendar/vendor/index.global.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/6.1.19/index.global.min.js"></script>
 <script src="/plugins/nodebb-plugin-equipment-calendar/js/client.js"></script>
 
 <script>