nodebb-plugin-equipment-calendar 0.2.5 → 0.2.6

package/library.js

@@ -466,8 +466,9 @@ async function renderCalendarPage(req, res) {
     startISO: start.toISO(),
     endISO: end.toISO(),
     initialDateISO: start.toISODate(),
-    eventsJson: JSON.stringify(events),
+    eventsB64: Buffer.from(JSON.stringify(events), 'utf8').toString('base64'),
     canCreate: canUserCreate,
+    canCreateJs: canUserCreate ? 'true' : 'false',
     isApprover,
     csrf: req.csrfToken,
     forumUrl: nconf.get('url'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {

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

@@ -15,46 +15,46 @@
         <h5>Permissions</h5>
         <div class="mb-3">
           <label class="form-label">Groupes autorisés à créer (CSV)</label>
-          <input id="creatorGroups" class="form-control" value="{{settings.creatorGroups}}">
+          <input id="creatorGroups" class="form-control" value="{settings.creatorGroups}">
         </div>
         <div class="mb-3">
           <label class="form-label">Groupe validateur</label>
-          <input id="approverGroup" class="form-control" value="{{settings.approverGroup}}">
+          <input id="approverGroup" class="form-control" value="{settings.approverGroup}">
         </div>
         <div class="mb-3">
           <label class="form-label">Groupe notifié (emails/notifs)</label>
-          <input id="notifyGroup" class="form-control" value="{{settings.notifyGroup}}">
+          <input id="notifyGroup" class="form-control" value="{settings.notifyGroup}">
         </div>
         <div class="form-check">
-          <input class="form-check-input" type="checkbox" id="showRequesterToAll" {{#if view_showRequesterToAll}}checked{{/if}}>
+          <input class="form-check-input" type="checkbox" id="showRequesterToAll" {{{ if view_showRequesterToAll }}}checked{{{ end }}}>
           <label class="form-check-label" for="showRequesterToAll">Afficher le demandeur à tout le monde</label>
         </div>
       </div>
 
       <div class="card card-body mb-3">
         <h5>Matériel</h5>
-        <textarea id="itemsJson" class="form-control" rows="10">{{settings.itemsJson}}</textarea>
+        <textarea id="itemsJson" class="form-control" rows="10">{settings.itemsJson}</textarea>
       </div>
 
       <div class="card card-body mb-3">
         <h5>HelloAsso</h5>
-        <div class="mb-3"><label class="form-label">Client ID</label><input id="ha_clientId" class="form-control" value="{{settings.ha_clientId}}"></div>
-        <div class="mb-3"><label class="form-label">Client Secret</label><input id="ha_clientSecret" class="form-control" value="{{settings.ha_clientSecret}}"></div>
-        <div class="mb-3"><label class="form-label">Organization Slug</label><input id="ha_organizationSlug" class="form-control" value="{{settings.ha_organizationSlug}}"></div>
-        <div class="mb-3"><label class="form-label">Return URL</label><input id="ha_returnUrl" class="form-control" value="{{settings.ha_returnUrl}}"></div>
-        <div class="mb-3"><label class="form-label">Webhook Secret (HMAC SHA256)</label><input id="ha_webhookSecret" class="form-control" value="{{settings.ha_webhookSecret}}"></div>
+        <div class="mb-3"><label class="form-label">Client ID</label><input id="ha_clientId" class="form-control" value="{settings.ha_clientId}"></div>
+        <div class="mb-3"><label class="form-label">Client Secret</label><input id="ha_clientSecret" class="form-control" value="{settings.ha_clientSecret}"></div>
+        <div class="mb-3"><label class="form-label">Organization Slug</label><input id="ha_organizationSlug" class="form-control" value="{settings.ha_organizationSlug}"></div>
+        <div class="mb-3"><label class="form-label">Return URL</label><input id="ha_returnUrl" class="form-control" value="{settings.ha_returnUrl}"></div>
+        <div class="mb-3"><label class="form-label">Webhook Secret (HMAC SHA256)</label><input id="ha_webhookSecret" class="form-control" value="{settings.ha_webhookSecret}"></div>
       </div>
 
       <div class="card card-body mb-3">
         <h5>Calendrier</h5>
         <div class="mb-3"><label class="form-label">Vue par défaut</label>
           <select id="defaultView" class="form-select">
-            <option value="dayGridMonth" {{#if view_dayGridMonth}}selected{{/if}}>Mois</option>
-            <option value="timeGridWeek" {{#if view_timeGridWeek}}selected{{/if}}>Semaine</option>
-            <option value="timeGridDay" {{#if view_timeGridDay}}selected{{/if}}>Jour</option>
+            <option value="dayGridMonth" {{{ if view_dayGridMonth }}}selected{{{ end }}}>Mois</option>
+            <option value="timeGridWeek" {{{ if view_timeGridWeek }}}selected{{{ end }}}>Semaine</option>
+            <option value="timeGridDay" {{{ if view_timeGridDay }}}selected{{{ end }}}>Jour</option>
           </select>
         </div>
-        <div class="mb-3"><label class="form-label">Timezone</label><input id="timezone" class="form-control" value="{{settings.timezone}}"></div>
+        <div class="mb-3"><label class="form-label">Timezone</label><input id="timezone" class="form-control" value="{settings.timezone}"></div>
       </div>
 
       <button id="save" class="btn btn-primary">Sauvegarder</button>

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

@@ -1,7 +1,7 @@
 <div class="equipment-approvals-page">
   <h1>Validation des réservations</h1>
 
-  {{#if hasRows}}
+  {{{ if hasRows }}}
   <div class="table-responsive">
     <table class="table table-striped align-middle">
       <thead>
@@ -16,36 +16,36 @@
         </tr>
       </thead>
       <tbody>
-        {{#each rows}}
+        {{{ each rows }}}
         <tr>
-          <td>{{itemName}}</td>
-          <td>{{requester}}</td>
-          <td>{{start}}</td>
-          <td>{{end}}</td>
-          <td><code>{{status}}</code></td>
+          <td>{rows.itemName}</td>
+          <td>{rows.requester}</td>
+          <td>{rows.start}</td>
+          <td>{rows.end}</td>
+          <td><code>{rows.status}</code></td>
           <td>
-            {{#if paymentUrl}}
-              <a href="{{paymentUrl}}" target="_blank" rel="noreferrer">Lien</a>
-            {{else}}
+            {{{ if rows.paymentUrl }}}
+              <a href="{rows.paymentUrl}" target="_blank" rel="noreferrer">Lien</a>
+            {{{ else }}}
               -
-            {{/if}}
+            {{{ end }}}
           </td>
           <td>
-            <form method="post" action="/equipment/reservations/{{id}}/approve" class="d-inline">
-              <input type="hidden" name="_csrf" value="{{../csrf}}">
+            <form method="post" action="/equipment/reservations/{rows.id}/approve" class="d-inline">
+              <input type="hidden" name="_csrf" value="{rows.csrf}">
               <button class="btn btn-sm btn-success" type="submit">Approuver</button>
             </form>
-            <form method="post" action="/equipment/reservations/{{id}}/reject" class="d-inline ms-1">
-              <input type="hidden" name="_csrf" value="{{../csrf}}">
+            <form method="post" action="/equipment/reservations/{rows.id}/reject" class="d-inline ms-1">
+              <input type="hidden" name="_csrf" value="{rows.csrf}">
               <button class="btn btn-sm btn-danger" type="submit">Refuser</button>
             </form>
           </td>
         </tr>
-        {{/each}}
+        {{{ end }}}
       </tbody>
     </table>
   </div>
-  {{else}}
+  {{{ else }}}
     <div class="alert alert-success">Aucune demande en attente 🎉</div>
-  {{/if}}
+  {{{ end }}}
 </div>

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

@@ -6,22 +6,22 @@
       <div>
         <label class="form-label">Matériel</label>
         <select name="itemId" class="form-select" onchange="this.form.submit()">
-          {{#each items}}
-          <option value="{{id}}" {{#if selected}}selected{{/if}}>{{name}} — {{location}}</option>
-          {{/each}}
+          {{{ each items }}}
+          <option value="{items.id}" {{{ if items.selected }}}selected{{{ end }}}>{items.name} — {items.location}</option>
+          {{{ end }}}
         </select>
       </div>
       <div class="text-muted small">
-        <div><strong>Lieu:</strong> {{chosenItemLocation}}</div>
-        <div><strong>Prix:</strong> {{chosenItemPriceCents}} cts</div>
+        <div><strong>Lieu:</strong> {chosenItemLocation}</div>
+        <div><strong>Prix:</strong> {chosenItemPriceCents} cts</div>
       </div>
     </form>
   </div>
 
-  {{#if canCreate}}
+  {{{ if canCreate }}}
   <form id="ec-create-form" method="post" action="/equipment/reservations/create" class="card card-body mb-3">
-    <input type="hidden" name="_csrf" value="{{csrf}}">
-    <input type="hidden" name="itemId" value="{{chosenItemId}}">
+    <input type="hidden" name="_csrf" value="{csrf}">
+    <input type="hidden" name="itemId" value="{chosenItemId}">
     <input type="hidden" name="start" value="">
     <input type="hidden" name="end" value="">
     <div class="row g-2 align-items-end">
@@ -35,19 +35,19 @@
     </div>
     <div class="form-text">Clique sur une date ou sélectionne une plage sur le calendrier pour soumettre une demande.</div>
   </form>
-  {{else}}
+  {{{ else }}}
   <div class="alert alert-info">Tu peux consulter le calendrier, mais tu n’as pas les droits pour créer une demande.</div>
-  {{/if}}
+  {{{ end }}}
 
   <div class="card card-body">
     <div id="equipment-calendar"></div>
   </div>
 
-  {{#if isApprover}}
+  {{{ if isApprover }}}
   <div class="mt-3">
     <a class="btn btn-outline-secondary" href="/equipment/approvals">Aller à la validation</a>
   </div>
-  {{/if}}
+  {{{ end }}}
 </div>
 
 <link rel="stylesheet" href="/plugins/nodebb-plugin-equipment-calendar/vendor/index.global.min.css">
@@ -55,16 +55,13 @@
 <script src="/plugins/nodebb-plugin-equipment-calendar/js/client.js"></script>
 
 <script>
-  // eventsJson is already JSON, we output it unescaped by using data attribute trick
-  window.EC_EVENTS = JSON.parse(document.getElementById('ec-events-json').textContent);
-  window.EC_INITIAL_DATE = "{{initialDateISO}}";
-  window.EC_INITIAL_VIEW = "{{view}}";
-  window.EC_TZ = "{{tz}}";
-  window.EC_CAN_CREATE = {{#if canCreate}}true{{else}}false{{/if}};
+  window.EC_EVENTS = JSON.parse(atob('{eventsB64}'));
+  window.EC_INITIAL_DATE = "{initialDateISO}";
+  window.EC_INITIAL_VIEW = "{view}";
+  window.EC_TZ = "{tz}";
+  window.EC_CAN_CREATE = {canCreateJs};
 </script>
 
-<script type="application/json" id="ec-events-json">{{{eventsJson}}}</script>
-
 <style>
   .ec-status-pending .fc-event-title { font-weight: 600; }
   .ec-status-valid .fc-event-title { font-weight: 700; }

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

@@ -1,9 +1,9 @@
 <div class="equipment-payment-return">
   <h1>Paiement</h1>
-  {{#if statusError}}
-    <div class="alert alert-danger">Le paiement semble avoir échoué. Référence réservation: <code>{{rid}}</code></div>
-  {{else}}
-    <div class="alert alert-info">Merci. Si le paiement est confirmé, la réservation passera en "validée". Référence: <code>{{rid}}</code></div>
-  {{/if}}
+  {{{ if statusError }}}
+    <div class="alert alert-danger">Le paiement semble avoir échoué. Référence réservation: <code>{rid}</code></div>
+  {{{ else }}}
+    <div class="alert alert-info">Merci. Si le paiement est confirmé, la réservation passera en "validée". Référence: <code>{rid}</code></div>
+  {{{ end }}}
   <a class="btn btn-primary" href="/equipment/calendar">Retour au calendrier</a>
 </div>