nodebb-plugin-calendar-onekite 11.1.95 → 11.1.96

package/lib/admin.js

@@ -194,7 +194,7 @@ admin.approveReservation = async function (req, res) {
         pickupLon: r.pickupLon || '',
         mapUrl,
         validatedBy: r.approvedByUsername || '',
-        validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/user/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
+        validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/users/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
       });
     }
   } catch (e) {}

package/lib/api.js

@@ -624,7 +624,7 @@ api.approveReservation = async function (req, res) {
       mapUrl,
       paymentUrl: r.paymentUrl || '',
       validatedBy: r.approvedByUsername || '',
-      validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/user/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
+      validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/users/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
     });
   }
   return res.json({ ok: true });

package/package.json

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

package/public/client.js

@@ -634,30 +634,7 @@ function toDatetimeLocalValue(date) {
     const canCreateSpecial = !!caps.canCreateSpecial;
     const canDeleteSpecial = !!caps.canDeleteSpecial;
 
-    let setMode('reservation'); 
-        function refreshDesktopModeButton() {
-          try {
-            const btn = document.querySelector('#onekite-calendar .fc-newSpecial-button');
-            if (!btn) return;
-            const isSpecial = mode === 'special';
-            btn.textContent = isSpecial ? 'Évènement ✓' : 'Évènement';
-            btn.classList.toggle('onekite-active', isSpecial);
-          } catch (e) {}
-        }
-
-        function setMode(next) {
-          mode = next;
-          refreshDesktopModeButton();
-          try {
-            const mb = document.querySelector('#onekite-mobile-controls .onekite-mode-btn');
-            if (mb) {
-              const isSpecial = mode === 'special';
-              mb.textContent = isSpecial ? 'Mode évènement ✓' : 'Mode évènement';
-              mb.classList.toggle('onekite-active', isSpecial);
-            }
-          } catch (e) {}
-        }
-// or 'special'
+    let mode = 'reservation'; // or 'special'
 
     // Inject lightweight responsive CSS once.
     try {
@@ -683,21 +660,7 @@ function toDatetimeLocalValue(date) {
             #onekite-calendar .fc .fc-toolbar-title { font-size: 1rem; }
             #onekite-calendar .fc .fc-button { padding: .2rem .4rem; font-size: .8rem; }
           }
-        
-          /* Violet action button (events mode) */
-          #onekite-calendar .fc .fc-newSpecial-button,
-          .onekite-btn-violet {
-            background: #6f42c1 !important;
-            border-color: #6f42c1 !important;
-            color: #fff !important;
-          }
-          /* Active state */
-          #onekite-calendar .fc .fc-newSpecial-button.onekite-active,
-          .onekite-btn-violet.onekite-active {
-            filter: brightness(0.95);
-            box-shadow: 0 0 0 0.15rem rgba(111,66,193,.25);
-          }
-`;
+        `;
         document.head.appendChild(st);
       }
     } catch (e) {}
@@ -741,10 +704,8 @@ function toDatetimeLocalValue(date) {
         newSpecial: {
           text: 'Évènement',
           click: () => {
-            setMode((mode === 'special') ? 'reservation' : 'special');
-            if (mode === 'special') {
-              showAlert('success', 'Mode évènement : sélectionne une plage (date/heure) sur le calendrier.');
-            }
+            mode = 'special';
+            showAlert('success', 'Mode évènement : sélectionne une plage (date/heure) sur le calendrier.');
           },
         },
       } : {},
@@ -769,7 +730,7 @@ function toDatetimeLocalValue(date) {
         try {
           if (mode === 'special' && canCreateSpecial) {
             const payload = await openSpecialEventDialog(info);
-            setMode('reservation');
+            mode = 'reservation';
             if (!payload) {
               calendar.unselect();
               isDialogOpen = false;
@@ -895,7 +856,7 @@ function toDatetimeLocalValue(date) {
         // Reserved-by line (user profile link)
         const username = String(p.username || p.user || p.reservedBy || p.ownerUsername || '').trim();
         const userLine = username
-          ? `<div class="mb-2"><strong>Réservée par</strong><br><a href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
+          ? `<div class="mb-2"><strong>Réservé par</strong><br><a href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
           : '';
         const itemsHtml = (() => {
         const names = Array.isArray(p.itemNames) ? p.itemNames : (typeof p.itemNames === 'string' && p.itemNames.trim() ? p.itemNames.split(',').map(s=>s.trim()).filter(Boolean) : (p.itemName ? [p.itemName] : []));
@@ -908,7 +869,7 @@ function toDatetimeLocalValue(date) {
 
         const approvedBy = String(p.approvedByUsername || '').trim();
         const validatedByHtml = approvedBy
-          ? `<div class=\"mb-2\"><strong>Validée par</strong><br><a href=\"https://www.onekite.com/user/${encodeURIComponent(approvedBy)}\">${escapeHtml(approvedBy)}</a></div>`
+          ? `<div class=\"mb-2\"><strong>Validée par</strong><br><a href=\"https://www.onekite.com/users/${encodeURIComponent(approvedBy)}\">${escapeHtml(approvedBy)}</a></div>`
           : '';
 
         // Pickup details (address / time / notes) shown once validated
@@ -1165,9 +1126,6 @@ function toDatetimeLocalValue(date) {
 
     calendar.render();
 
-    refreshDesktopModeButton();
-
-
     // Mobile controls: view (month/week) + mode (reservation/event) without bloating the header.
     try {
       const controlsId = 'onekite-mobile-controls';
@@ -1215,16 +1173,17 @@ function toDatetimeLocalValue(date) {
         if (canCreateSpecial) {
           const modeBtn = document.createElement('button');
           modeBtn.type = 'button';
-          modeBtn.className = 'btn btn-sm onekite-btn-violet onekite-mode-btn';
+          modeBtn.className = 'btn btn-sm btn-outline-warning onekite-mode-btn';
           function refreshModeBtn() {
             const isSpecial = mode === 'special';
             modeBtn.textContent = isSpecial ? 'Mode évènement ✓' : 'Mode évènement';
             modeBtn.classList.toggle('active', isSpecial);
-            // Keep violet, only toggle active class
-            modeBtn.classList.toggle('onekite-active', isSpecial);
+            // Make the button visually distinct from the view buttons
+            modeBtn.classList.toggle('btn-warning', isSpecial);
+            modeBtn.classList.toggle('btn-outline-warning', !isSpecial);
           }
           modeBtn.addEventListener('click', () => {
-            setMode((mode === 'special') ? 'reservation' : 'special');
+            mode = (mode === 'special') ? 'reservation' : 'special';
             refreshModeBtn();
             if (mode === 'special') {
               showAlert('success', 'Mode évènement : sélectionne une plage (date/heure) sur le calendrier.');