nodebb-plugin-calendar-onekite 1.4.5 → 1.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "",
   "repository": {
     "type": "git",

package/plugin.json

@@ -3,7 +3,7 @@
   "name": "Calendar Onekite",
   "description": "Calendrier + réservation de matériel + validation admin + paiement HelloAsso pour NodeBB v4",
   "url": "",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "library": "./library.js",
   "staticDirs": {
     "static": "static"

package/static/js/calendar.js

@@ -1,301 +1,42 @@
-'use strict';
-
-$(document).ready(function () {
-  if (!$('#calendar').length) return;
-
-  const CalendarPage = {
-
-    canBook: false,
-
-    init: function () {
-      this.prepareModals();
-      this.checkPermissions();
-      this.initCalendar();
-    },
-
-    checkPermissions: function () {
-      $.get('/api/calendar/permissions/book').then(res => {
-        CalendarPage.canBook = !!(res && res.allow);
-      });
-    },
-
-    prepareModals: function () {
-      $('.calendar-modal').hide();
-      $('.calendar-modal .calendar-close').on('click', function () {
-        $(this).closest('.calendar-modal').fadeOut();
-      });
-    },
-
-    initCalendar: function () {
-      const calendarEl = document.getElementById('calendar');
-
-      const calendar = new FullCalendar.Calendar(calendarEl, {
-        themeSystem: 'bootstrap5',
-        initialView: 'dayGridMonth',
-        locale: 'fr',
-        height: 'auto',
-        selectable: true,
-        headerToolbar: {
-          left: 'prev,next today',
-          center: 'title',
-          right: 'dayGridMonth,timeGridWeek,listWeek'
-        },
-
-        events: (info, success, fail) => {
-          $.get('/api/calendar/events', { start: info.startStr, end: info.endStr })
-            .then(events => {
-              success(events.map(ev => ({
-                id: ev.eid,
-                title: ev.title,
-                start: ev.start,
-                end: ev.end,
-                allDay: ev.allDay == 1,
-                extendedProps: ev
-              })));
-            })
-            .catch(fail);
-        },
-
-        dateClick: info => {
-          CalendarPage.openCreateEventModal(info.dateStr);
-        },
-
-        eventClick: info => {
-          CalendarPage.openEventModal(info.event.extendedProps);
-        }
-      });
-
-      calendar.render();
-
-      // bouton nouvel event
-      $.get('/api/calendar/permissions/create').then(res => {
-        if (!res || !res.allow) {
-          $('#calendar-new-event').hide();
-        } else {
-          $('#calendar-new-event').on('click', () => {
-            CalendarPage.openCreateEventModal();
-          });
-        }
-      });
-    },
-
-    /* -------- MODAL EVENT -------- */
-
-    openCreateEventModal: function (dateStr) {
-      const modal = $('#calendar-event-modal');
-
-      $('#event-modal-title').text('Créer un événement');
-      $('#event-title').val('');
-      $('#event-description').val('');
-      const base = dateStr || new Date().toISOString().slice(0, 10);
-      $('#event-start').val(base + 'T09:00');
-      $('#event-end').val(base + 'T11:00');
-      $('#event-allDay').prop('checked', false);
-      $('#event-location').val('');
-      $('#event-bookingEnabled').prop('checked', false);
-      $('#booking-items').empty();
-
-      $('#event-save').off('click').on('click', () => {
-        CalendarPage.saveEvent();
-      });
-
-      $('#event-delete').hide();
-      $('#event-reserve').hide();
-
-      $('#event-add-item').off('click').on('click', () => {
-        CalendarPage.addBookingItemRow();
-      });
-
-      modal.fadeIn();
-    },
-
-    openEventModal: function (eventData) {
-      const modal = $('#calendar-event-modal');
-
-      $('#event-modal-title').text('Événement : ' + eventData.title);
-      $('#event-title').val(eventData.title);
-      $('#event-description').val(eventData.description || '');
-      $('#event-start').val(eventData.start.replace('Z', ''));
-      $('#event-end').val(eventData.end.replace('Z', ''));
-      $('#event-allDay').prop('checked', eventData.allDay == 1);
-      $('#event-location').val(eventData.location || '');
-      $('#event-bookingEnabled').prop('checked', eventData.bookingEnabled == 1);
-
-      CalendarPage.renderBookingItems(eventData.bookingItems || []);
-
-      $('#event-add-item').off('click').on('click', () => {
-        CalendarPage.addBookingItemRow();
-      });
-
-      $('#event-save').off('click').on('click', () => {
-        CalendarPage.updateEvent(eventData.eid);
-      });
-
-      $('#event-delete').show().off('click').on('click', () => {
-        bootbox.confirm('Supprimer cet événement ?', ok => {
-          if (!ok) return;
-          $.ajax({ url: '/api/calendar/event/' + eventData.eid, method: 'DELETE' })
-            .then(() => location.reload());
-        });
-      });
-
-      if (CalendarPage.canBook && Number(eventData.bookingEnabled)) {
-        $('#event-reserve').show().off('click').on('click', () => {
-          CalendarPage.openReserveModal(eventData.eid);
-        });
-      } else {
-        $('#event-reserve').hide();
-      }
-
-      modal.fadeIn();
-    },
-
-    saveEvent: function () {
-      const data = CalendarPage.collectEventForm();
-      $.ajax({
-        url: '/api/calendar/event',
-        method: 'POST',
-        contentType: 'application/json',
-        data: JSON.stringify(data),
-      }).then(() => location.reload())
-        .catch(err => app.alertError(err.responseJSON?.error || err.message));
-    },
-
-    updateEvent: function (eid) {
-      const data = CalendarPage.collectEventForm();
-      $.ajax({
-        url: '/api/calendar/event/' + eid,
-        method: 'PUT',
-        contentType: 'application/json',
-        data: JSON.stringify(data),
-      }).then(() => location.reload())
-        .catch(err => app.alertError(err.responseJSON?.error || err.message));
-    },
-
-    collectEventForm: function () {
-      const items = [];
-      $('#booking-items .booking-item-row').each(function () {
-        const row = $(this);
-        const total = Number(row.find('.item-total').val() || 0);
-        if (!total) return;
-
-        items.push({
-          id: row.find('.item-id').val(),
-          name: row.find('.item-name').val(),
-          total,
-          reserved: Number(row.find('.item-reserved').val() || 0),
-          reservedTemp: Number(row.find('.item-reservedTemp').val() || 0),
-          price: Number(row.find('.item-price').val() || 0),
-          pickupLocation: row.find('.item-pickup').val() || ''
-        });
-      });
-
-      return {
-        title: $('#event-title').val(),
-        description: $('#event-description').val(),
-        start: $('#event-start').val(),
-        end: $('#event-end').val(),
-        allDay: $('#event-allDay').is(':checked'),
-        location: $('#event-location').val(),
-        bookingEnabled: $('#event-bookingEnabled').is(':checked'),
-        bookingItems: items
-      };
-    },
-
-    renderBookingItems: function (items) {
-      const container = $('#booking-items');
-      container.empty();
-      (items || []).forEach(item => CalendarPage.addBookingItemRow(item));
-    },
-
-    addBookingItemRow: function (item = {}) {
-      const row = $(`
-        <div class="booking-item-row">
-          <input type="text" class="item-id form-control" placeholder="ID" value="${item.id || ''}">
-          <input type="text" class="item-name form-control" placeholder="Nom matériel" value="${item.name || ''}">
-          <input type="number" class="item-total form-control" placeholder="Total" value="${item.total || 0}">
-          <input type="number" class="item-price form-control" placeholder="Prix €" step="0.01" value="${item.price || 0}">
-          <input type="text" class="item-pickup form-control" placeholder="Lieu retrait" value="${item.pickupLocation || ''}">
-          <input type="hidden" class="item-reserved" value="${item.reserved || 0}">
-          <input type="hidden" class="item-reservedTemp" value="${item.reservedTemp || 0}">
-          <button class="btn btn-danger btn-sm item-remove">✕</button>
-        </div>
-      `);
-
-      row.find('.item-remove').on('click', () => row.remove());
-      $('#booking-items').append(row);
-    },
-
-    /* -------- MODAL RÉSERVATION -------- */
-
-    openReserveModal: function (eid) {
-      $.get('/api/calendar/event/' + eid).then(eventData => {
-        const modal = $('#calendar-reserve-modal');
-
-        $('#reserve-title').text(eventData.title);
-
-        const items = eventData.bookingItems || [];
-        if (!items.length || !Number(eventData.bookingEnabled)) {
-          $('#reserve-items').html('<p>Aucun matériel réservable pour cet événement.</p>');
-          $('#reserve-confirm').hide();
-        } else {
-          let html = '<ul>';
-          items.forEach((item, index) => {
-            const pickup = item.pickupLocation || 'Lieu de retrait non précisé';
-            html += `
-              <li>
-                <label>
-                  <input type="radio" name="reserve-item" value="${item.id}" ${index === 0 ? 'checked' : ''}>
-                  <strong>${item.name}</strong>
-                  ${item.price ? `– ${item.price} €/jour` : ''}
-                  <br><small>📍 Retrait : ${pickup}</small>
-                </label>
-              </li>`;
-          });
-          html += '</ul>';
-          $('#reserve-items').html(html);
-          $('#reserve-confirm').show();
-        }
-
-        const today = new Date().toISOString().slice(0, 10);
-        $('#reserve-start').val(today);
-        $('#reserve-end').val(today);
-        $('#reserve-quantity').val(1);
-
-        $('#reserve-confirm').off('click').on('click', () => {
-          CalendarPage.sendReservation(eid);
-        });
+define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', [
+  'api',
+  'alerts',
+], function (api, alerts) {
+  'use strict';
+
+  function init() {
+    // jQuery est fourni par NodeBB sur les pages rendues via buildHeader
+    const $ = window.jQuery;
+    if (!$) {
+      // fallback: on évite le crash
+      console.error('[calendar-onekite] jQuery not found');
+      return;
+    }
 
-        modal.fadeIn();
+    // Exemple: bind bouton "nouvel événement"
+    $('#calendar-new-event')
+      .off('click.calendarOnekite')
+      .on('click.calendarOnekite', function () {
+        // TODO: ouvre ton modal / formulaire
+        alerts.success('Clique OK: handler actif ✅');
       });
-    },
 
-    sendReservation: function (eid) {
-      const itemId = $('input[name="reserve-item"]:checked').val();
-      const quantity = Number($('#reserve-quantity').val() || 1);
-      const dateStart = $('#reserve-start').val();
-      const dateEnd = $('#reserve-end').val();
+    // Si tu as d'autres binds / initialisation calendrier, fais-les ici
+  }
 
-      if (!itemId) return app.alertError('Sélectionnez un matériel.');
-      if (!quantity || quantity <= 0) return app.alertError('Quantité invalide.');
-      if (!dateStart || !dateEnd) return app.alertError('Merci de renseigner les dates.');
-      if (dateEnd < dateStart) return app.alertError('La date de fin doit être ≥ la date de début.');
+  // important: ajaxify SPA
+  $(window).on('action:ajaxify.end', function () {
+    // page /calendar
+    if (ajaxify?.data?.template?.includes('calendar')) {
+      init();
+    }
+  });
 
-      $.ajax({
-        url: '/api/calendar/event/' + eid + '/book',
-        method: 'POST',
-        contentType: 'application/json',
-        data: JSON.stringify({ itemId, quantity, dateStart, dateEnd }),
-      })
-        .then(res => {
-          app.alertSuccess(res.message || 'Demande envoyée.');
-          $('#calendar-reserve-modal').fadeOut();
-        })
-        .catch(err => {
-          app.alertError(err.responseJSON?.error || err.message);
-        });
+  $(function () {
+    if (ajaxify?.data?.template?.includes('calendar')) {
+      init();
     }
-  };
+  });
 
-  CalendarPage.init();
+  return { init };
 });

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

@@ -26,4 +26,9 @@
   </div>
 
   <button id="calendar-onekite-save" class="btn btn-primary">Enregistrer</button>
-</div>
+</div>
+<script>
+require(['plugins/nodebb-plugin-calendar-onekite/static/js/calendar'], function (Calendar) {
+  Calendar.init && Calendar.init();
+});
+</script>

package/templates/calendar.tpl

@@ -84,5 +84,8 @@
   </div>
 </div>
 
-<link rel="stylesheet" href="/plugins/nodebb-plugin-calendar-onekite/static/style.css">
-<script src="/plugins/nodebb-plugin-calendar-onekite/static/js/calendar.js"></script>
+<script>
+require(['plugins/nodebb-plugin-calendar-onekite/static/js/calendar'], function (Calendar) {
+  Calendar.init && Calendar.init();
+});
+</script>