nodebb-plugin-calendar-onekite 1.3.5 → 1.3.7

package/library.js

@@ -99,7 +99,8 @@ async function updateEvent(eid, data) {
     allDay: data.allDay !== undefined ? (data.allDay ? 1 : 0) : existing.allDay,
     location: data.location !== undefined ? String(data.location) : existing.location,
     visibility: data.visibility !== undefined ? String(data.visibility) : existing.visibility,
-    bookingEnabled: data.bookingEnabled !== undefined ? (data.bookingEnabled ? 1 : 0) : (existing.bookingEnabled || 0),
+    bookingEnabled:
+      data.bookingEnabled !== undefined ? (data.bookingEnabled ? 1 : 0) : (existing.bookingEnabled || 0),
     bookingItems: JSON.stringify(bookingItems),
     updatedAt: String(Date.now()),
   };
@@ -224,6 +225,23 @@ function computePrice(event, reservation) {
   return unit * reservation.quantity * days;
 }
 
+/* ********* ADMIN PAGE (AJOUTÉ) ********* */
+
+async function renderAdminPage(req, res) {
+  try {
+    const settings = (await Settings.get('calendar-onekite')) || {};
+    res.render('admin/plugins/calendar-onekite', {
+      title: 'Calendar OneKite',
+      settings,
+    });
+  } catch (err) {
+    if (req.path && req.path.startsWith('/api/')) {
+      return res.status(500).json({ error: err.message });
+    }
+    res.status(500).send(err.message);
+  }
+}
+
 /* ********* INIT ********* */
 
 Plugin.init = async function (params) {
@@ -390,7 +408,7 @@ Plugin.init = async function (params) {
         status: 'pending_admin',
         helloAssoOrderId: null,
         createdAt: now,
-        pickupLocation: item.pickupLocation || ''
+        pickupLocation: item.pickupLocation || '',
       };
 
       allRes.push(reservation);
@@ -566,7 +584,6 @@ Plugin.init = async function (params) {
       const itemIndex = items.findIndex(i => i.id === reservation.itemId);
       if (itemIndex !== -1) {
         const item = items[itemIndex];
-        // plus de reservedTemp, la logique se base sur les réservations
         item.reserved = (item.reserved || 0) + reservation.quantity;
         items[itemIndex] = item;
       }
@@ -602,12 +619,12 @@ Plugin.init = async function (params) {
     }
   });
 
-  /* PAGE ADMIN PLUGIN */
+  /* PAGE ADMIN PLUGIN (CORRIGÉ) */
 
-  router.get('/admin/plugins/nodebb-plugin-calendar-onekite', middleware.admin.buildHeader, renderAdminPage);
-  router.get('/api/admin/plugins/nodebb-plugin-calendar-onekite', renderAdminPage);
+  router.get('/admin/plugins/calendar-onekite', middleware.admin.buildHeader, renderAdminPage);
+  router.get('/api/admin/plugins/calendar-onekite', renderAdminPage);
 
-  router.put('/api/admin/plugins/nodebb-plugin-calendar-onekite', middleware.admin.checkPrivileges, async (req, res) => {
+  router.put('/api/admin/plugins/calendar-onekite', middleware.admin.checkPrivileges, async (req, res) => {
     try {
       await Settings.set('calendar-onekite', req.body);
       res.json({ status: 'ok' });
@@ -710,7 +727,7 @@ Plugin.addAdminNavigation = function (header) {
   header.plugins.push({
     route: '/plugins/calendar-onekite',
     icon: 'fa fa-calendar',
-    name: 'Calendar Lite',
+    name: 'Calendar OneKite',
   });
   return header;
 };
@@ -727,7 +744,7 @@ Plugin.defineWidgets = async function (widgets) {
 
 Plugin.renderUpcomingWidget = async function (widget, callback) {
   try {
-    const settings = await Settings.get('calendar-onekite') || {};
+    const settings = (await Settings.get('calendar-onekite')) || {};
     const limit = Number(widget.data.limit || settings.limit || 5);
     const events = await getUpcomingEvents(limit);
     const html = await appRef.renderAsync('widgets/calendar-upcoming', { events });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "1.3.5",
+  "version": "1.3.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.3.5",
+  "version": "1.3.7",
   "library": "./library.js",
   "staticDirs": {
     "static": "static"

package/templates/calendar.tpl

@@ -84,5 +84,5 @@
   </div>
 </div>
 
-<link rel="stylesheet" href="/plugins/nodebb-plugin-calendar-lite/static/style.css">
-<script src="/plugins/nodebb-plugin-calendar-lite/static/js/calendar.js"></script>
+<link rel="stylesheet" href="/plugins/nodebb-plugin-calendar-onekite/static/style.css">
+<script src="/plugins/nodebb-plugin-calendar-onekite/static/js/calendar.js"></script>

package/templates/widgets/calendar-upcoming.tpl

@@ -0,0 +1,22 @@
+<div class="calendar-upcoming-widget">
+    <h4>Prochains événements</h4>
+
+    <!-- IF !events.length -->
+    <p>Aucun événement prévu.</p>
+    <!-- ELSE -->
+    <ul class="calendar-upcoming-list">
+        <!-- BEGIN events -->
+        <li>
+            <strong>{events.title}</strong><br>
+            <small>
+                <!-- tu peux custom le format date via moment côté client si tu veux -->
+                {events.start} → {events.end}
+            </small>
+            <!-- IF events.location -->
+            <br><small>{events.location}</small>
+            <!-- ENDIF events.location -->
+        </li>
+        <!-- END events -->
+    </ul>
+    <!-- ENDIF !events.length -->
+</div>