update front

config.yaml

@@ -9,7 +9,6 @@ views:
     files:
       - web/layouts/dashboard/_partials/agenda-widget.html
       - web/layouts/dashboard/_partials/beneficiaries-widget.html
-      - web/layouts/dashboard/_partials/bookings-widget.html
       - web/layouts/dashboard/dashboard.html
   beneficiaries:
     list:
@@ -29,11 +28,9 @@ views:
         - web/layouts/beneficiaries/_partials/beneficiary-events.html
         - web/layouts/beneficiaries/_partials/beneficiary-files.html
         - web/layouts/beneficiaries/_partials/beneficiary-organizations.html
-        - web/layouts/beneficiaries/_partials/beneficiary-diags.html
+        - web/layouts/solidarity_service/beneficiary-solidarity.html
         - web/layouts/beneficiaries/display.html
-    create_diag:
+
-      files:
-        - web/layouts/beneficiaries/create-diag.html
     update:
       files:
         - web/layouts/_partials/address_autocomplete.html
@@ -63,14 +60,10 @@ views:
     booking_display: 
       files: 
         - web/layouts/vehicles/booking-display.html
-        - web/layouts/vehicles_management/_partials/booking-diags.html
     bookings_list: 
       files: 
         - web/layouts/vehicles_management/_partials/bookings-list.html
         - web/layouts/vehicles/bookings-list.html
-    create_booking_diag:
-      files:
-        - web/layouts/vehicles/create-booking-diag.html
   vehicles_management:
     overview:
       files:
@@ -90,42 +83,30 @@ views:
       files:
         - web/layouts/vehicles_management/_partials/calendar.html
         - web/layouts/vehicles_management/fleet-display.html
-        - web/layouts/vehicles_management/_partials/vehicle-diags.html
     fleet_update:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/_partials/address.html
         - web/layouts/vehicles_management/_partials/vehicle-type-select.html
         - web/layouts/vehicles_management/fleet-update.html
     booking_display: 
       files: 
         - web/layouts/vehicles_management/booking-display.html
-        - web/layouts/vehicles_management/_partials/booking-diags.html
     delete_booking: 
       files: 
         - web/layouts/vehicles_management/delete-booking.html
-    create_vehicle_diag:
-      files:
-        - web/layouts/vehicles_management/create-vehicle-diag.html
-    create_booking_diag:
-      files:
-        - web/layouts/vehicles_management/create-booking-diag.html
   agenda: 
     list: 
       files: 
         - web/layouts/agenda/home.html
-    history:
-      files:
-        - web/layouts/agenda/history.html
     display_event: 
       files: 
         - web/layouts/agenda/_partials/subscribers-table.html
         - web/layouts/agenda/display-event.html
-        - web/layouts/agenda/_partials/event-files.html
     create_event: 
       files: 
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/agenda/create-event.html
-        - web/layouts/agenda/_partials/event-files.html
     delete_subscriber: 
       files: 
         - web/layouts/agenda/delete-subscriber.html
@@ -151,8 +132,8 @@ views:
         - web/layouts/journeys/_partials/journeys-all.html
         - web/layouts/journeys/_partials/journeys-others.html
         - web/layouts/journeys/_partials/journeys-carpool.html
-        - web/layouts/journeys/_partials/journeys-public-transit.html
+        #- web/layouts/journeys/_partials/journeys-public-transit.html
-        - web/layouts/journeys/_partials/journeys-solidarity-transport.html
+        - web/layouts/journeys/_partials/journeys-solidarity-service.html
         - web/layouts/journeys/search.html
     list:
       files:
@@ -185,38 +166,6 @@ views:
     display_group:
       files:
         - web/layouts/group_module/display_group.html
-  diags:
-    list:
-      files:
-        - web/layouts/diags/home.html
-    display_diag:
-      files:
-        - web/layouts/diags/display-diag.html
-        - web/layouts/diags/_partials/diags-files.html
-    delete:
-      files:
-        - web/layouts/diags/delete-diag.html
-    update:
-      files:
-        - web/layouts/diags/update-diag.html
-    history:
-      files:
-        - web/layouts/diags/history-diags.html
-
-  solidarity_transport:
-    overview:
-      files:
-        - web/layouts/solidarity_transport/_partials/drivers_list.html
-        - web/layouts/solidarity_transport/overview.html
-    driver_create:
-      files:
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/solidarity_transport/driver_create.html
-    driver_display:
-      files:
-        - web/layouts/solidarity_transport/_partials/driver_availabilities.html
-        - web/layouts/solidarity_transport/_partials/driver_documents.html
-        - web/layouts/solidarity_transport/driver_display.html
 
   administration:
     home:
@@ -239,10 +188,6 @@ views:
     vehicles_list:
       files:
         - web/layouts/administration/vehicles_stats.html
-    bookings_list:
-      files:
-        - web/layouts/administration/_partials/bookings_list.html
-        - web/layouts/administration/bookings_stats.html
     settings: 
       files:
         - web/layouts/administration/_partials/groups_admins.html
@@ -270,6 +215,21 @@ views:
       ko: 
         files:
           - web/layouts/auth/onboarding-ko.html
+  solidarity_service: 
+    list:
+      files:
+        - web/layouts/solidarity_service/main.html
+        - web/layouts/solidarity_service/_partials/beneficiary-list.html
+        - web/layouts/solidarity_service/_partials/driver-list.html
+        - web/layouts/solidarity_service/_partials/booking-list.html
+    create:
+      files:
+        - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/solidarity_service/_partials/create-booking.html
+    create_driver:
+      files:
+        - web/layouts/solidarity_service/_partials/create-driver.html
+        - web/layouts/_partials/address_autocomplete.html
 
 icons:
   svg:

default

@@ -0,0 +1 @@
+default

emails/onboarding/support_emailing.html

@@ -1,4 +1,4 @@
 {{define "content"}}
 <p>Vous avez reçu un commentaire sur PARCOURSMOB de la part de <b>{{.user}}</b></p>
-<p>{{unescapeHTML .key}}</p>
+<p>{{.key}}</p>
 {{end}}

web/assets/css/main.css

@@ -1,15 +1,6 @@
-@import "tailwindcss";
+@tailwind base;
-
+@tailwind components;
-@theme {
+@tailwind utilities;
-  --color-co-blue: #243887;
-  --color-co-lightblue: #907eff;
-  --color-co-red: #ff1300;
-  --color-co-green: #6cc11f;
-  --color-co-yellow: #ffdd00;
-  --color-co-orange: #ff5300;
-
-  --radius-co: 40%;
-}
 
 @font-face {
     font-family: "Manometer";

web/layouts/_partials/address_autocomplete.html

@@ -15,7 +15,7 @@
             this.responselength = 0
             return []
         }
-        result = await fetch('https://api.geocode.earth/v1/autocomplete/\?api_key=ge-4949288cd450ad31&text=' + this.input)
+        result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input)
         json = await result.json()
 
         this.responselength = json['features'].length
@@ -34,7 +34,7 @@
         x-model="input">
 
     <ul x-show="responselength > 0"
-    class="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-xl py-1 text-base overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox" aria-labelledby="listbox-label" aria-activedescendant="listbox-option-3">
+    class="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-xl py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox" aria-labelledby="listbox-label" aria-activedescendant="listbox-option-3">
         <template x-for="item in autocomplete">
             <a href="#">
                 <li class="text-gray-900 hover:bg-gray-200 cursor-default select-none relative py-2 pl-3 pr-9" 

web/layouts/_partials/mainmenu.html

@@ -6,7 +6,7 @@
         {{ if .Active }}
         class="bg-white text-co-blue group flex items-center px-2 py-2 text-base font-medium rounded-2xl">
         {{ else}}
-        class="text-white hover:bg-white hover:bg-opacity-5 hover:text-co-blue group flex items-center px-2 py-2 text-base font-medium rounded-2xl">
+        class="text-white hover:bg-white hover:bg-opacity-5 group flex items-center px-2 py-2 text-base font-medium rounded-2xl">
         {{end}}
 
         {{$.IconSet.Icon .Icon "mr-4 flex-shrink-0 h-6 w-6"}}

web/layouts/agenda/_partials/event-files.html

@@ -1,134 +0,0 @@
-{{define "event_files"}}
-<div class="px-4 py-6 sm:px-6"
-x-data="{
-    fields: {
-        name: null,
-        type: null,
-        file: null,
-    },
-    rules: {
-        name: ['required'],
-        type: ['required'],
-        file: ['required'],
-    },
-    formValidation: {
-        valid: false,
-        fields: {
-            name: {valid: null},
-            type: {valid: null},
-            file: {valid: null},
-        }
-    },
-    isFormValid: true,
-    validate() {
-        this.formValidation = Iodine.assert(this.fields, this.rules)
-    },
-    validateField(field) {
-        this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-    },
-    submit(event) {
-        this.validate()
-        if(!this.formValidation.valid) {
-            this.isFormValid = false
-            event.preventDefault()
-        }
-        return this.formValidation.valid
-    }
-}">
-    {{if eq (len .ViewState.documents) 0}}
-    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
-    {{end}}
-    
-    {{if gt (len .ViewState.documents) 0}}
-    
-    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
-        <table class="min-w-full divide-y divide-gray-300">
-          <thead>
-            <tr>
-              <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Type</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Nom du document</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Ajouté le</th>
-              <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                <span class="sr-only">Actions</span>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            {{range .ViewState.documents}}
-            <tr>
-              <td class="relative py-4 pl-4 sm:pl-6 pr-3 text-sm">
-                <div class="font-medium text-gray-900">
-                    <span class="bg-co-blue text-xs text-white rounded-xl p-1 mr-2">{{index $.ViewState.file_types_map .Metadata.Type}}</span>
-                </div>
-              </td>
-              <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
-              <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
-              <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                <a href="/app/agenda/{{$.ViewState.event.ID}}/documents/{{.FileName}}" target="_blank">
-                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
-                </a>
-              </td>
-            </tr>
-            {{end}}
-    
-    
-            <!-- More plans... -->
-          </tbody>
-        </table>
-      </div>
-    
-    {{end}}
-    {{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
-    <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/agenda/{{.ViewState.event.ID}}/documents"  @submit="submit"  enctype="multipart/form-data">
-        <div class="md:grid md:grid-cols-6 p-2">
-          <div class="sm:col-span-2">
-            <label for="type" class="block text-sm font-medium text-gray-700">Type</label>
-            <select id="type" name="type" class="mt-1 block w-full rounded-l-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm"
-                x-model="fields.type" @blur="validateField('type')"
-                :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                <option value="" selected>Sélectionner un type</option>
-                {{range .ViewState.events_file_types}}
-                <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
-                {{end}}
-            </select>
-          </div>
-              <div class="sm:col-span-4">
-                <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                      <input type="text" name="name" id="name"
-                          placeholder="Nom du fichier"
-                          class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-r-2xl"
-                          x-model="fields.name" @blur="validateField('name')"
-                          :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'" />
-              </div>
-              <div class="sm:col-span-6 mt-4">
-                <label for="cover-photo" class="block text-sm font-medium text-gray-700">Téléchargement</label>
-                <div class="mt-1 flex justify-center rounded-md border-2 border-dashed px-6 pt-5 pb-6"
-                x-on:drop="console.log('toto')"
-                :class="formValidation.fields.file.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                  <div class="space-y-1 text-center">
-                    {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}}
-                    <div class="flex text-sm text-gray-600">
-                      <label for="file-upload" class="relative cursor-pointer rounded-md bg-white font-medium text-co-blue focus-within:outline-none focus-within:ring-2 focus-within:ring-co-blue focus-within:ring-offset-2 hover:text-co-blue">
-                        <span>Sélectionnez un fichier </span>
-                        <input id="file-upload" name="file-upload" type="file" class="sr-only"
-                        x-model="fields.file" @blur="validateField('file')">
-                      </label>
-                      <!-- <p class="pl-1">ou glissez-déposez</p>  -->
-
-                        
-                    </div>
-                    <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                    <p class="text-co-blue p-2" x-text="fields.file" x-if="fields.file"></p>
-                  </div>
-                </div>
-              </div>
-        </div>
-        <button type="submit"
-            class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-            Ajouter le document
-        </button>
-    </form>
-    {{end}}
-</div>
-{{end}}

web/layouts/agenda/create-event.html

@@ -4,20 +4,18 @@
     <h1 class="text-2xl font-semibold text-gray-900">Ajouter à l'agenda</h1>
 </div>
 
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8" x-data="{
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
+    x-data="{
         fields: {
             name: null,
             type: null,
-            description: '',
+            description: null,
             allday: false,
             startdate: null,
             enddate: null,
             starttime: null,
             endtime: null,
             max_subscribers: 0,
-            file_name: null,
-            file_type: null,
-            file: null,
         },
         rules: {
             name: ['required'],
@@ -27,10 +25,7 @@
             starttime: ['optional'],
             endtime: ['optional'],
             description: ['optional'],
-            max_subscribers: ['required', 'min:0'],
+            max_subscribers: ['required', 'min:0']
-            file_name: ['optional'],
-            file_type: ['optional'],
-            file: ['optional'],
         },
         formValidation: {
             valid: false,
@@ -44,22 +39,9 @@
                 endtime: {valid: null},
                 allday: {valid: null},
                 max_subscribers: {valid: null},
-                file_name: {valid: null},
-                file_type: {valid: null},
-                file: {valid: null},
             }
         },
         isFormValid: true,
-        init() {
-          let quill = new Quill(this.$refs.quill, { theme: 'snow' })
- 
-          quill.root.innerHTML = this.fields.description 
- 
-          quill.on('text-change', () => {
-                this.fields.description = quill.root.innerHTML
-          })
-
-        },
         validate() {
             this.formValidation = Iodine.assert(this.fields, this.rules)
 
@@ -80,14 +62,12 @@
             return this.formValidation.valid
         }
     }">
-
+    <form class="space-y-6" method="POST" @submit="submit">
-    <form id="eventForm" class="space-y-6" method="POST" @submit="submit">
         <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
             <div class="md:grid md:grid-cols-3 md:gap-6">
                 <div class="md:col-span-1">
                     <h3 class="text-lg font-medium leading-6 text-gray-900">Informations sur le dispositif</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations générales sur le dispositif d'accompagnement à
+                    <p class="mt-1 text-sm text-gray-500">Informations générales sur le dispositif d'accompagnement à ajouter à l'agenda</p>
-                        ajouter à l'agenda</p>
                 </div>
                 <div class="mt-5 md:mt-0 md:col-span-2">
                     <div class="grid grid-cols-6 gap-6">
@@ -100,7 +80,8 @@
                         </div>
                         <div class="sm:col-span-3">
                             <label for="type" class="block text-sm font-medium text-gray-700">Type de dispositif</label>
-                            <select id="type" name="type" x-model="fields.type" @blur="validateField('type')"
+                            <select id="type" name="type" 
+                                x-model="fields.type" @blur="validateField('type')"
                                 class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm rounded-2xl"
                                 :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                                 <option></option>
@@ -113,12 +94,10 @@
                         <div class="col-span-6">
                             <label for="description" class="block text-sm font-medium text-gray-700">Description</label>
                             <div class="mt-1">
-                                <!-- <textarea rows="4" name="description" id="descrpition" x-model="fields.description"
+                                <textarea rows="4" name="description" id="descrpition" 
-                                    @blur="validateField('description')"
+                                    x-model="fields.description" @blur="validateField('description')"
                                     :class="formValidation.fields.description.valid == false ? 'border-co-red border-2' : 'border-gray-300'"
-                                    class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea> -->
+                                    class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                                <input type="hidden" name="description" x-model="fields.description" />
-                                <div x-ref="quill" class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-b-2xl">></div>
                             </div>
                         </div>
 
@@ -140,14 +119,12 @@
 
                         <div class="col-span-6">
 
-                            <button type="button"
+                            <button type="button" class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2" role="switch" aria-checked="false"
-                                class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2"
+                                :class="fields.allday ? 'bg-co-blue' : 'bg-gray-200'"
-                                role="switch" aria-checked="false" :class="fields.allday ? 'bg-co-blue' : 'bg-gray-200'"
                                 @click="fields.allday = ! fields.allday">
                                 <span class="sr-only">Use setting</span>
                                 <!-- Enabled: "translate-x-5", Not Enabled: "translate-x-0" -->
-                                <span aria-hidden="true"
+                                <span aria-hidden="true" class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
-                                    class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
                                     :class="fields.allday ? 'translate-x-5' : 'translate-x-0'"></span>
                             </button> <span class="text-md font-medium text-gray-700 ml-2">Toute la journée</span>
                             <input type="hidden" name="allday" x-model="fields.allday">
@@ -157,16 +134,14 @@
                         <div class="sm:col-span-6">
                             <div class="inline-flex w-full">
                                 <div class="flex-1">
-                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Date de
+                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Date de début</label>
-                                        début</label>
                                     <input type="date" name="startdate" id="startdate" placeholder="JJ/MM/AAAA"
                                             class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl"
                                             x-model="fields.startdate" @blur="validateField('startdate')"
                                             :class="formValidation.fields.startdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                                 </div>
                                 <div class="flex-1">
-                                    <label for="enddate" class="block text-sm font-medium text-gray-700">Date de
+                                    <label for="enddate" class="block text-sm font-medium text-gray-700">Date de fin</label>
-                                        fin</label>
                                     <input type="date" name="enddate" id="enddate" placeholder="JJ/MM/AAAA"
                                             class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl"
                                             x-model="fields.enddate" @blur="validateField('enddate')"
@@ -180,16 +155,14 @@
                         <div class="sm:col-span-6" x-show="!fields.allday">
                             <div class="inline-flex w-full">
                                 <div class="flex-1">
-                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Horaire de
+                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Horaire de début</label>
-                                        début</label>
                                     <input type="time" name="starttime" id="starttime" placeholder="00:00"
                                             class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl"
                                             x-model="fields.starttime" @blur="validateField('starttime')"
                                             :class="formValidation.fields.starttime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                                 </div>
                                 <div class="flex-1">
-                                    <label for="endtime" class="block text-sm font-medium text-gray-700">Horaire de
+                                    <label for="endtime" class="block text-sm font-medium text-gray-700">Horaire de fin</label>
-                                        fin</label>
                                     <input type="time" name="endtime" id="endtime" placeholder="00:00"
                                             class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl"
                                             x-model="fields.endtime" @blur="validateField('endtime')"
@@ -211,14 +184,12 @@
             <div class="md:grid md:grid-cols-3 md:gap-6">
                 <div class="md:col-span-1">
                     <h3 class="text-lg font-medium leading-6 text-gray-900">Paramètres</h3>
-                    <p class="mt-1 text-sm text-gray-500">Paramètres du dispositif (nombre de places disponibles,
+                    <p class="mt-1 text-sm text-gray-500">Paramètres du dispositift (nombre de places disponibles, etc...)</p>
-                        etc...)</p>
                 </div>
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2 align-middle">
                     <div class="grid grid-cols-6 gap-6">
                         <div class="col-span-6 sm:col-span-3">
-                            <label for="max_subscribers" class="block text-sm font-medium text-gray-700">Places
+                            <label for="max_subscribers" class="block text-sm font-medium text-gray-700">Places disponibles (0 = illimité)</label>
-                                disponibles (0 = illimité)</label>
                             <input type="number" name="max_subscribers" id="max_subscribers"
                                 class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
                                 x-model="fields.max_subscribers" @blur="validateField('max_subscribers')"
@@ -228,54 +199,8 @@
                 </div>
             </div>
         </div>
-        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-8">
+
-            <div class="md:grid md:grid-cols-3 md:gap-6">
+
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Ajouter un document</h3>
-                    <p class="mt-1 text-sm text-gray-500">Téléchargez un document lié à cet événement</p>
-                </div>
-                    <div class="md:grid md:grid-cols-6 p-2">
-                      <div class="sm:col-span-2">
-                        <label for="file_type" class="block text-sm font-medium text-gray-700">Type</label>
-                        <select id="file_type" name="file_type" class="mt-1 block w-full rounded-l-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm"
-                            x-model="fields.file_type" @blur="validateField('file_type')"
-                            :class="formValidation.fields.file_type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                            <option value="" selected>Sélectionner un type</option>
-                            {{range .ViewState.events_file_types}}
-                            <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
-                            {{end}}
-                        </select>
-                      </div>
-                          <div class="sm:col-span-4">
-                            <label for="file_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                                  <input type="text" name="file_name" id="file_name"
-                                      placeholder="Nom du fichier"
-                                      class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-r-2xl"
-                                      x-model="fields.file_name" @blur="validateField('file_name')"
-                                      :class="formValidation.fields.file_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'" />
-                          </div>
-                          <div class="sm:col-span-6 mt-4">
-                            <label for="cover-photo" class="block text-sm font-medium text-gray-700">Téléchargement</label>
-                            <div class="mt-1 flex justify-center rounded-md border-2 border-dashed px-6 pt-5 pb-6"
-                            x-on:drop="console.log('toto')"
-                            :class="formValidation.fields.file.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                              <div class="space-y-1 text-center">
-                                {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}}
-                                <div class="flex text-sm text-gray-600">
-                                  <label for="file-upload" class="relative cursor-pointer rounded-md bg-white font-medium text-co-blue focus-within:outline-none focus-within:ring-2 focus-within:ring-co-blue focus-within:ring-offset-2 hover:text-co-blue">
-                                    <span>Sélectionnez un fichier </span>
-                                    <input id="file-upload" name="file-upload" type="file" class="sr-only"
-                                    x-model="fields.file" @blur="validateField('file')">
-                                  </label>                                      
-                                </div>
-                                <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                                <p class="text-co-blue p-2" x-text="fields.file" x-if="fields.file"></p>
-                              </div>
-                            </div>
-                          </div>
-                    </div>
-            </div>
-        </div> -->
 
         <div class="flex justify-end">
             <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>

web/layouts/agenda/display-event.html

@@ -78,14 +78,13 @@
                             {{if .ViewState.event.Description}}
                             <div class="sm:col-span-2">
                                 <dt class="text-sm font-medium text-gray-500">Description</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ unescapeHTML .ViewState.event.Description}}</dd>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.event.Description}}</dd>
                             </div>
                             {{end}}
                         </dl>
                     </div>
                 </div>
             </section>
-            
             {{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
             <section aria-labelledby="subscribers-table"></section>
                 <div class="bg-white shadow sm:rounded-lg">
@@ -206,17 +205,5 @@
             </div>
         </section>
     </div>
-    <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
-        <div class="space-y-6 lg:col-start-1 lg:col-span-2">
-            <section aria-labelledby="event-documents">
-                <div class="bg-white mt-4 px-4 py-5 shadow sm:rounded-lg sm:px-6">
-                    <h2 id="documents-title" class="text-lg font-medium text-gray-900">Documents</h2>
-                    <div class="flex justify-between items-center">
-                        <div>{{template "event_files" .}}</div>
-                    </div>
-                </div>
-            </section>
-        </div>
-    </div>
 </main>
 {{ end }}

web/layouts/agenda/home.html

@@ -29,7 +29,7 @@
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
             <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow md:rounded-lg">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
                     <table class="min-w-full divide-y divide-gray-300">
                         <thead class="bg-gray-50">
                             <tr>

web/layouts/agenda/updateEvent.html

@@ -44,16 +44,6 @@
             }
         },
         isFormValid: true,
-        init() {
-          let quill = new Quill(this.$refs.quill, { theme: 'snow' })
- 
-          quill.root.innerHTML = this.fields.description 
- 
-          quill.on('text-change', () => {
-                this.fields.description = quill.root.innerHTML
-          })
-
-        },
         validate() {
             this.formValidation = Iodine.assert(this.fields, this.rules)
 
@@ -109,12 +99,10 @@
                             <label for="description" class="block text-sm font-medium text-gray-700">Description</label>
                             <div class="mt-1">
                                 
-                <!--<textarea rows="4" name="description" id="descrpition" value="{{.ViewState.event.Description}}"
+                                <textarea rows="4" name="description" id="descrpition" value="{{.ViewState.event.Description}}"
                                     x-model="fields.description" @blur="validateField('description')"
                                     :class="formValidation.fields.description.valid == false ? 'border-co-red border-2' : 'border-gray-300'"
-class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>-->
+                                    class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                                <input type="hidden" name="description" x-model="fields.description" />
-                                <div x-ref="quill" class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-b-2xl">></div>
                                
                                 </div>
                         </div>

web/layouts/beneficiaries/_partials/beneficiary-diags.html

@@ -1,58 +0,0 @@
-{{define "beneficiary_diags"}}
-{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
-{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
-<div class="bg-white shadow sm:rounded-lg">
-    <div class="px-4 py-5 sm:px-6">
-        <div class="flex items-center space-x-5">
-            <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Diagnostics réalisés</h2>
-            <a href="{{.ViewState.beneficiary.ID}}/create-diag">
-                <button type="button"
-                class="flex justify-around rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
-                {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-                Créer un diagnostic
-                </button>
-            </a>
-        </div>
-    </div>
-    <div class="border-t border-gray-200">
-        {{ $diagCount := len .ViewState.diags }}
-        <ul role="list" class="divide-y divide-gray-200 flex-1">
-            {{if eq $diagCount 0}}
-                <li class="py-2 px-4">
-                    <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun diagnostique effectué pour le moment.</p>
-                </li>
-            {{else}}
-                {{range .ViewState.diags}}
-                {{ $diags := .ID }}
-                {{if eq .Deleted false}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <a href="/app/diags/{{$diags}}"class="mt-1 text-sm text-gray-900">{{.Name}}</a>
-                            </div>
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                            </div>
-                            <a href="/app/diags/{{$diags}}" target="_blank">
-                                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le diagnostic</span></button>
-                            </a>
-                    </li>
-                {{end}}
-                {{if eq .Deleted true}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{.Name}}</p>
-                            </div>
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                            </div>
-                        <div class="flex-1 ml-3">
-                            <p class="mt-1 text-sm text-gray-900">Ce diagnostic a été retiré</p>
-                        </div>
-                    </li>
-                {{end}}
-                {{end}}
-            {{end}}
-        </ul>
-    </div>
-</div>
-{{end}}

web/layouts/beneficiaries/_partials/beneficiary-events.html

@@ -59,5 +59,27 @@
             {{end}}
         </ul>
     </div>
+      <div class="max-w-3xl mx-auto px-4 sm:px-6 md:flex md:items-center md:justify-between md:space-x-5 lg:max-w-7xl lg:px-8">
+        <div class="flex items-center space-x-5">
+            <div class="flex-shrink-0">
+                <div class="relative">
+                    <span class="absolute inset-0 shadow-inner rounded-full" aria-hidden="true"></span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="max-w-3xl mx-auto px-4 sm:px-6 md:flex md:items-center md:justify-between md:space-x-5 lg:max-w-7xl lg:px-8">
+        <div class="flex items-center space-x-5">
+            <div class="flex-shrink-0">
+                <div class="relative">
+                    <!-- <img class="h-16 w-16 rounded-co" src="/app/beneficiaries/solidarity_service{{.ViewState.Passenger.Id}}/picture" alt=""> -->
+                    <span class="absolute inset-0 shadow-inner rounded-full" aria-hidden="true"></span>
+                </div>
+            </div>
+        </div>
+        <div
+            class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
+        </div>
+    </div>
 </div>
 {{end}}

web/layouts/beneficiaries/create-diag.html

@@ -1,110 +0,0 @@
-{{define "content"}}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Ajouter un diagnostic</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            name: null,
-            namespace: 'parcoursmob_beneficiaries',
-        },
-        rules: {
-            name: ['required'],
-            namespace: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations obligatoires
-                        pour créer un diagnostic dans PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="name" id="name" autocomplete="name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <input type="hidden" name="namespace" value="parcoursmob_beneficiaries" />
-        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma JSON</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
-                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.json_schema" @blur="validateField('json_schema')"
-                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma UI</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
-                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
-                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div> -->
-        <div class="flex justify-end">
-            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/beneficiaries/{{.ViewState.beneficiary}}">
-                <button type="button"
-                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-            </a>
-            <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le diagnostique</button>
-        </div>
-    </form>
-</div>
-{{end}}

web/layouts/beneficiaries/display.html

@@ -138,10 +138,10 @@
                                             :class="tab == 'organizations' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                             Gestionnaires </a>
                                         
-                                        <!--<a href="#" @click="tab = 'diags'"
+                                        <a href="#" @click="tab = 'solidarityService'"
                                         class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :class="tab == 'diags' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        :class="tab == 'solidarityService' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Diagnostics </a>-->
+                                        Transport Solidaire </a>
                                     </nav>
                                 </div>
                             </div>
@@ -150,7 +150,8 @@
                         <div x-show="tab == 'documents'">{{template "beneficiary_files" .}}</div>
                         <div x-show="tab == 'notes'">{{template "beneficiary_notes" .}}</div>
                         <div x-show="tab == 'organizations'">{{template "beneficiary_organizations" .}}</div>
-                        <!--<div x-show="tab == 'diags'">{{template "beneficiary_diags" .}}</div>-->
+                        <div x-show="tab == 'solidarityService'">{{template "beneficiary_solidarity" .}}</div>
+
                     </div>
                 </div>
             </section>

web/layouts/beneficiaries/list.html

@@ -45,7 +45,7 @@
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
             <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow md:rounded-lg">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
                     <table class="min-w-full divide-y divide-gray-300">
                         <thead class="bg-gray-50">
                             <tr>
@@ -62,9 +62,7 @@
                                 <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
                                     Labels
                                 </th>                                
-                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                               
-                                    <span class="sr-only">Modifier</span>
-                                </th>
                             </tr>
                         </thead>
                         <tbody class="divide-y divide-gray-200 bg-white">
@@ -96,6 +94,7 @@
                                                 class="inline-flex rounded-full bg-green-100 px-2 text-xs font-semibold leading-5 text-green-800"
                                                 x-text="tag"></span>
                                         </template>
+
                                     </td>
                                     <td
                                         class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">

web/layouts/dashboard/_partials/bookings-widget.html

@@ -1,32 +0,0 @@
-{{define "bookings_widget"}}
-<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
-    <div class="-ml-4 -mt-2 px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
-        <div class="ml-4 mt-2">
-            <h3 class="text-lg leading-6 font-medium text-gray-900">Prochaines réservations</h3>
-        </div>
-        <!-- <div class="ml-4 mt-2 flex-shrink-0">
-          <button type="button" class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Voir</button>
-        </div> -->
-    </div>
-    <ul role="list" class="divide-y divide-gray-200 flex-1">
-        {{range .}}
-        {{if or (eq .Data.Deleted nil) (eq .Data.Deleted false)}}
-            <li class="py-2 px-4 flex">
-                <a href="/app/vehicles-management/bookings/{{.ID}}" class="flex w-full">
-                <div class="ml-3">
-                    
-                    <p class="text-sm font-medium text-gray-900">Du {{(timeFrom .Startdate).Format "02/01"}} au {{(timeFrom .Enddate).Format "02/01"}}</p>
-                </div>
-            </a>
-            </li>
-        {{end}}
-        {{end}}
-    </ul>
-
-    <a href="/app/vehicles-management/">
-        <button class="w-full p-2 text-center bg-co-blue text-white rounded-b-2xl text-sm">
-            Reservation des véhicules
-        </button>
-    </a>
-</div>
-{{end}}

web/layouts/dashboard/dashboard.html

@@ -70,7 +70,7 @@
 
       {{template "beneficiaries_widget" .ViewState.beneficiaries}}
       {{template "agenda_widget" .ViewState.events}}
-      {{template "bookings_widget" .ViewState.fleets}}
+
 
     </div>
 </div>

web/layouts/diags/_partials/diags-files.html

@@ -1,132 +0,0 @@
-{{define "diags_files"}}
-<div class="px-4 py-6 sm:px-6"
-x-data="{
-    fields: {
-        name: null,
-        type: diagnostic,
-        file: null,
-    },
-    rules: {
-        name: ['required'],
-        type: ['required'],
-        file: ['required'],
-    },
-    formValidation: {
-        valid: false,
-        fields: {
-            name: {valid: null},
-            type: {valid: null},
-            file: {valid: null},
-        }
-    },
-    isFormValid: true,
-    validate() {
-        this.formValidation = Iodine.assert(this.fields, this.rules)
-    },
-    validateField(field) {
-        this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-    },
-    submit(event) {
-        this.validate()
-        if(!this.formValidation.valid) {
-            this.isFormValid = false
-            event.preventDefault()
-        }
-        return this.formValidation.valid
-    }
-}">
-    {{if eq (len .ViewState.documents) 0}}
-    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
-    {{end}}
-    
-    {{if gt (len .ViewState.documents) 0}}
-    
-    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
-        <table class="min-w-full divide-y divide-gray-300">
-          <thead>
-            <tr>
-              <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Type</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Nom du document</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Ajouté le</th>
-              <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                <span class="sr-only">Actions</span>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            {{range .ViewState.documents}}
-            <tr>
-              <td class="relative py-4 pl-4 sm:pl-6 pr-3 text-sm">
-                <div class="font-medium text-gray-900">
-                    <span class="bg-co-blue text-xs text-white rounded-xl p-1 mr-2">{{index $.ViewState.file_types_map .Metadata.Type}}</span>
-                </div>
-              </td>
-              <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
-              <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
-              <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                <a href="/app/diags/{{$.ViewState.diag.ID}}/documents/{{.FileName}}" target="_blank">
-                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
-                </a>
-              </td>
-            </tr>
-            {{end}}
-    
-    
-            <!-- More plans... -->
-          </tbody>
-        </table>
-      </div>
-    
-    {{end}}
-    <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/diags/{{.ViewState.diag.ID}}/documents"  @submit="submit"  enctype="multipart/form-data">
-        <div class="md:grid md:grid-cols-6 p-2">
-          <div class="sm:col-span-2">
-            <label for="type" class="block text-sm font-medium text-gray-700">Type</label>
-            <select id="type" name="type" class="mt-1 block w-full rounded-l-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm"
-                x-model="fields.type" @blur="validateField('type')"
-                :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                <option value="" selected>Sélectionner un type</option>
-                {{range .ViewState.events_file_types}}
-                <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
-                {{end}}
-            </select>
-          </div>
-              <div class="sm:col-span-4">
-                <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                      <input type="text" name="name" id="name"
-                          placeholder="Nom du fichier"
-                          class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-r-2xl"
-                          x-model="fields.name" @blur="validateField('name')"
-                          :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'" />
-              </div>
-              <div class="sm:col-span-6 mt-4">
-                <label for="cover-photo" class="block text-sm font-medium text-gray-700">Téléchargement</label>
-                <div class="mt-1 flex justify-center rounded-md border-2 border-dashed px-6 pt-5 pb-6"
-                x-on:drop="console.log('toto')"
-                :class="formValidation.fields.file.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                  <div class="space-y-1 text-center">
-                    {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}}
-                    <div class="flex text-sm text-gray-600">
-                      <label for="file-upload" class="relative cursor-pointer rounded-md bg-white font-medium text-co-blue focus-within:outline-none focus-within:ring-2 focus-within:ring-co-blue focus-within:ring-offset-2 hover:text-co-blue">
-                        <span>Sélectionnez un fichier </span>
-                        <input id="file-upload" name="file-upload" type="file" class="sr-only"
-                        x-model="fields.file" @blur="validateField('file')">
-                      </label>
-                      <!-- <p class="pl-1">ou glissez-déposez</p>  -->
-
-                        
-                    </div>
-                    <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                    <p class="text-co-blue p-2" x-text="fields.file" x-if="fields.file"></p>
-                  </div>
-                </div>
-              </div>
-        </div>
-        <button type="submit"
-            class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-            Ajouter le document
-        </button>
-    </form>
-</div>
-{{end}}

web/layouts/diags/delete-diag.html

@@ -1,32 +0,0 @@
-{{define "content"}}
-<div>
-        <form method="POST" >
-
-            <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
-        
-            <div class="fixed inset-0 z-10 overflow-y-auto">
-            <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-
-                <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
-                <div>
-                    <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
-                    {{.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
-                    </div>
-                    <div class="mt-3 text-center sm:mt-5">
-                        <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Confirmation de retrait</h3>
-                        <div class="mt-2">
-                            <p class="text-sm text-gray-500">Voulez-vous vraiment retirer ce dignostique ?</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-                    <a href="/app/diags/{{.ViewState.diag.ID}}" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
-                    <button  type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Confirmation</button>
-                </div>
-                </div>
-            </div>
-            </div>
-        </form>
-
- </div>
-{{end}}

web/layouts/diags/display-diag.html

@@ -1,80 +0,0 @@
-{{ define "content" }}
-<main class="py-10">
-    <div class="max-w-3xl mx-auto px-4 sm:px-6 md:flex md:items-center md:justify-between md:space-x-5 lg:max-w-7xl lg:px-8">
-        <div class="flex items-center space-x-5">
-            <div>
-                <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.diag.Name}}</h1>
-            </div>
-            {{$diag := .ViewState.diag.ID}}
-        </div>
-        <div
-        class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
-            {{if eq .ViewState.diag.Deleted false}}
-            <a href="/app/diags/{{$diag}}/update" class="inline-flex"><button type="button"
-                class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>
-            <a href="/app/diags/{{$diag}}/delete" class="inline-flex"><button type="button"
-                class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Retirer</button></a>
-            {{end}}
-        </div>
-    </div>
-    <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
-        <div class="space-y-6 lg:col-start-1 lg:col-span-2">
-            <section aria-labelledby="diag-information-title">
-                <div class="bg-white shadow sm:rounded-lg">
-                    <div class="px-4 py-5 sm:px-6">
-                        <h2 id="diag" class="text-lg leading-6 font-medium text-gray-900">Informations</h2>
-                        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations sur le diagnostic.</p>
-                    </div>
-                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date du diagnostic</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .ViewState.diag.Diagdate).Format "02/01/2006"}}</dd>
-                            </div>
-                            {{if eq .ViewState.diag.Namespace "parcoursmob_beneficiaries"}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Type</dt>
-                                <dd class="mt-1 text-sm text-gray-900">Diagnostic personnelle</dd>
-                            </div>
-                            {{end}}
-                            {{if eq .ViewState.diag.Namespace "parcoursmob_vehicles"}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Type</dt>
-                                <dd class="mt-1 text-sm text-gray-900">Diagnostic automobile</dd>
-                            </div>
-                            {{end}}
-                            {{if eq .ViewState.diag.Namespace "parcoursmob_bookings"}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Type</dt>
-                                <dd class="mt-1 text-sm text-gray-900">Diagnostic véhicule réservé</dd>
-                            </div>
-                            {{end}}
-                            <!-- {{if .ViewState.diag.Json_schema}}
-                            <div class="sm:col-span-2">
-                                <dt class="text-sm font-medium text-gray-500">JSON_schema</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.diag.Json_schema}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.diag.Ui_schema}}
-                            <div class="sm:col-span-2">
-                                <dt class="text-sm font-medium text-gray-500">UI_schema</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.diag.Ui_schema}}</dd>
-                            </div>
-                            {{end}} -->
-                        </dl>
-                    </div>
-                </div>
-            </section>
-            <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
-                <div class="space-y-6 lg:col-start-1 lg:col-span-2">
-                    <section aria-labelledby="event-documents">
-                        <div class="bg-white mt-4 px-4 py-5 shadow sm:rounded-lg sm:px-6">
-                            <h2 id="documents-title" class="text-lg font-medium text-gray-900">Documents</h2>
-                            <div class="flex justify-between items-center">
-                                <div>{{template "diags_files" .}}</div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-            </div>
-{{ end }}

web/layouts/diags/history-diags.html

@@ -1,73 +0,0 @@
-{{define "content"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Diagnostics retirés</h1>
-
-    <div class="sm:flex sm:items-center">
-        <div class="sm:flex-auto">
-            <p class="mt-2 text-sm text-gray-700"></p>
-        </div>
-        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
-            <a href="/app/diags/">
-                <button type="button"
-                    class="inline-flex items-center justify-center mr-3 bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                    Retour
-                </button>
-            </a>
-        </div>
-    </div>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <div class="mt-8 flex flex-col">
-        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
-            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
-                    <table class="min-w-full divide-y divide-gray-300">
-                        <thead class="bg-gray-50">
-                            <tr>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-                                    Nom du diagnostic
-                                </th>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-                                    Type
-                                </th>
-                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                                    <span class="sr-only">Actions</span>
-                                </th>
-                            </tr>
-                            <tbody class="divide-y divide-gray-200 bg-white">
-                                {{range .ViewState.diags}}
-                                {{if eq .Deleted true}}
-                                <a href="/app/diags/{{.ID}}">
-                                <tr>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-
-                                        <div class="font-medium text-gray-900">{{.Name}}</div>
-                                    </td>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        {{if eq .Namespace "parcoursmob_beneficiaries"}}
-                                        <div class="text-gray-500">Diagnostic personnelle</div>
-                                        {{end}}
-                                        {{if eq .Namespace "parcoursmob_vehicles"}}
-                                        <div class="text-gray-500">Diagnostic automobile</div>
-                                        {{end}}
-                                        {{if eq .Namespace "parcoursmob_bookings"}}
-                                        <div class="text-gray-500">Diagnostic véhicule réservé</div>
-                                        {{end}}
-                                    </td>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        <a href="/app/diags/{{.ID}}" class="text-co-blue hover:text-co-blue">Voir</a>
-                                    </td>
-                                </tr>
-                                </a>
-                                {{end}}
-                                {{end}}
-                            </tbody>
-                        </thead>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{{end}}

web/layouts/diags/home.html

@@ -1,84 +0,0 @@
-{{define "content"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Diagnostics effectués</h1>
-
-    <div class="sm:flex sm:items-center">
-        <div class="sm:flex-auto">
-            <p class="mt-2 text-sm text-gray-700"></p>
-        </div>
-        <!-- <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
-            <a href="/app/diags/history">
-                <button type="button"
-                    class="inline-flex items-center justify-center mr-3 bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                    {{$.IconSet.Icon "hero:outline/calendar" "h-5 w-5 mr-3"}}
-                    Historique
-                </button>
-            </a>
-        </div> -->
-    </div>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <div class="mt-8 flex flex-col">
-        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
-            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
-                    <table class="min-w-full divide-y divide-gray-300">
-                        <thead class="bg-gray-50">
-                            <tr>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-                                    Nom du diagnostic
-                                </th>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-                                    Type
-                                </th>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-                                    Date
-                                </th>
-                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                                    <span class="sr-only">Actions</span>
-                                </th>
-                            </tr>
-                            <tbody class="divide-y divide-gray-200 bg-white">
-                                {{range .ViewState.diags}}
-                                <a href="/app/diags/{{.ID}}">
-                                <tr>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        <div class="font-medium text-gray-900">{{.Name}}</div>
-                                    </td>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        {{if eq .Namespace "parcoursmob_beneficiaries"}}
-                                        <div class="text-gray-500">Diagnostic personnelle</div>
-                                        {{end}}
-                                        {{if eq .Namespace "parcoursmob_vehicles"}}
-                                        <div class="text-gray-500">Diagnostic automobile</div>
-                                        {{end}}
-                                        {{if eq .Namespace "parcoursmob_bookings"}}
-                                        <div class="text-gray-500">Diagnostic véhicule réservé</div>
-                                        {{end}}
-                                    </td>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        <div class="font-medium text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</div>
-                                    </td>
-                                    <td class="whitespace nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        {{if eq .Deleted true}}
-                                        <div class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Diagnostic retiré</div>
-                                        {{end}}
-                                    </td>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                        <a href="/app/diags/{{.ID}}" target="_blank">
-                                            <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le diagnostic</span></button>
-                                            </a>
-                                    </td>
-                                </tr>
-                                </a>
-                                {{end}}
-                            </tbody>
-                        </thead>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{{end}}

web/layouts/diags/update-diag.html

@@ -1,117 +0,0 @@
-{{define "content"}}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Éditer un diagnostique</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            name: '{{.ViewState.diag.Name}}',
-            namespace: '{{.ViewState.diag.Namespace}}',
-            json_schema: '{{.ViewState.diag.Json_schema}}',
-            ui_schema: '{{.ViewState.diag.Ui_schema}}',
-        },
-        rules: {
-            name: ['required'],
-            namespace: ['required'],
-            json_schema: ['required'],
-            ui_schema: ['required']
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {valid: null},
-                json_schema: {valid: null},
-                ui_schema: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations obligatoires
-                        pour éditer un diagnostique dans PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="name" id="name" autocomplete="given-name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'"
-                                value="{{.ViewState.diag.Name}}">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <input type="hidden" name="namespace" value="{{.ViewState.diag.Namespace}}" />
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma JSON</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostique</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
-                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.json_schema" @blur="validateField('json_schema')"
-                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma UI</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostique</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
-                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
-                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="flex justify-end">
-            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/diags/{{.ViewState.diag.ID}}">
-                <button type="button"
-                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-            </a>
-            <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Éditer le diagnostique</button>
-        </div>
-    </form>
-</div>
-{{end}}

web/layouts/journeys/_partials/journeys-all.html

@@ -51,47 +51,11 @@
     </div>
     
 
-    {{end}}
-
-    {{ if gt (len .ViewState.journeys.Journeys) 0}}
-    <div class="px-4 pt-4 flex text-sm text-grey-900 font-bold border-t-2">
-        <div class="flex-1">
-            {{.IconSet.Icon "tabler-icons:bus" "h-6 w-6 inline-flex mr-4"}}
-            {{(timeFrom (index .ViewState.journeys.Journeys 0).Departure).Format "15:04"}} - {{(timeFrom (index .ViewState.journeys.Journeys 0).Arrival).Format "15:04"}}
-            ({{(index .ViewState.journeys.Journeys 0).Duration.Minutes | printf "%.0f"}} Minutes)
-        </div>
-        <div></div>
-    </div>
-    <div class="p-4 pb-8 flex">
-        {{$firstwalk := true}}
-        {{range (index .ViewState.journeys.Journeys 0).Sections}}
-        {{if eq .Type "street_network"}}
-        <span class="ml-2 mt-1 h-5 w-5 rounded-co bg-gray-200 flex items-center justify-center ring-8 ring-white text-white">
-            {{$.IconSet.Icon "tabler-icons:walk" "h-4 w-4 stroke-gray-800"}}
-        </span>
-        {{if $firstwalk}}
-        {{$firstwalk = false}}
-        {{$.IconSet.Icon "hero:outline/chevron-right" "h-3 w-3 stroke-gray-800 m-2"}}
-        {{end}}
-        {{end}}
-        {{if eq .Type "public_transport"}}
-        <span class="ml-2 rounded-xl px-2 py-1 bg-co-blue flex items-center justify-center ring-8 ring-white text-sm text-white whitespace-nowrap">
-            {{if eq .Display.Network "Antibes - Envibus"}}Envibus{{else}}{{.Display.Network}}{{end}} Ligne {{.Display.Label}}
-        </span>
-        {{$.IconSet.Icon "hero:outline/chevron-right" "h-3 w-3 stroke-gray-800 m-2"}}
-        {{end}}
-        {{end}}
-        <div class="flex-1"></div>
-        <button class="text-sm px-2 py-1 bg-gray-200 text-co-blue rounded-xl" @click="tab = 'public-transit'">Voir le détail</button>
-    </div>
-    <div class="p-4 text-center">
-        <button class="rounded-xl text-md px-4 py-1 bg-gray-200 text-co-blue" @click="tab = 'public-transit'">{{ len .ViewState.journeys.Journeys}} solutions en transports en commun : les voir toutes</button>
-    </div>
-
     {{end}}
 
     <!--VEHICLES-->
-    <!--<div class="px-4 pt-16 flex text-sm text-grey-900">
+
+    <div class="px-4 pt-16 flex text-sm text-grey-900  border-t-2">
         <div class="flex-1">
             {{.IconSet.Icon "tabler-icons:car" "h-6 w-6 inline-flex mr-4"}}
             <span class=" font-bold">{{len .ViewState.vehicles}} véhicules</span> partagés disponibles ce jour là et la semaine suivante
@@ -100,34 +64,8 @@
     </div>
     <div class="p-4 text-center">
         <a href="/app/vehicles/"><button class="text-md px-4 py-1 bg-gray-200 text-co-blue rounded-xl">Réserver un véhicule</button></a>
-    </div>-->
+    </div>
-<h3 class="p-4 text-lg">Transport solidaire</h3>
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <thead class="bg-gray-50">
-    <tr>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Conducteurs disponibles
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{ range .ViewState.solidarity_drivers }}
-    <tr>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Data.first_name }} {{ .Data.last_name }}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue hover:text-co-blue" 
-          href="/app/solidarity-transport/drivers/{{.ID}}/match">
-          Organiser le transport solidaire
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
 </div>
 {{end}}
+
+

web/layouts/journeys/_partials/journeys-solidarity-service.html

@@ -0,0 +1,208 @@
+{{define "journeys_solidarity_service"}}
+
+<form class="space-y-6" method="POST" name="create_booking">
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8" >
+        <div class="bg-white shadow sm:rounded-2xl">
+            <h2 class="text-lg font-medium text-gray-900 p-4 sm:px-6">
+                Bénéficiaires
+            </h2>
+            <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+                <div class="mt-8 flex flex-col">
+                    <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+                        <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                            <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                                <table class="min-w-full divide-y divide-gray-300">
+                                    <tbody class="divide-y divide-gray-200 bg-white">
+                                        {{range $beneficiary := .ViewState.solidarity_results.Beneficiaries}}
+                                        <tr>
+                                            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                                <div class="flex items-center">
+                                                    <button type="button" @click="
+                                                    document.getElementById('passenger_id').value = '{{$beneficiary.Id}}'
+                                                    document.getElementById('passenger_name').textContent = '{{$beneficiary.FirstName}}{{$beneficiary.LastName}}'" class="ml-4">                                                              
+                                                        <div class="font-medium text-gray-900">
+                                                            <span>
+                                                                {{$beneficiary.FirstName}}
+                                                            </span>
+                                                            <span>
+                                                                {{$beneficiary.LastName}}
+                                                            </span>
+                                                        </div>
+                                                    </button>
+                                                </div>
+                                            </td>
+                                            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                            
+                                            </td>
+                                            <td
+                                                class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                                            
+                                            </td>
+                                        </tr>
+                                        {{end}}
+                                        <!-- More people... -->
+                                    </tbody>
+                                </table>
+                                <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                                    <div class="flex-1 flex justify-between sm:hidden">
+                                        <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                                        @click="paginate(current)"> Previous </a>
+                                        <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                                        @click="paginate(current+2)"> Next </a>
+                                    </div>
+                                    <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                                    <div>
+                                        <p class="text-sm text-gray-700">
+                                            Résultats
+                                            <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                                            à
+                                            <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                                            sur
+                                            <span class="font-medium" x-text="state.count"></span>
+                                        </p>
+                                    </div>
+                                    <div>
+                                        <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                            @click="paginate(current)">
+                                            <span class="sr-only">Previous</span>
+                                            <!-- Heroicon name: solid/chevron-left -->
+                                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                            <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                            </svg>
+                                        </a>
+                                        <template x-for="i in nb_pages">
+                                            <a href="#" @click="paginate(i)"
+                                            class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                                            :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                                            x-text="i"></a>
+                                        </template>
+                                        <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
+                                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                            @click="paginate(current+2)">
+                                            <span class="sr-only">Next</span>
+                                            <!-- Heroicon name: solid/chevron-right -->
+                                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                            <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                                            </svg>
+                                        </a>
+                                        </nav>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <p id="passenger_name"></p>
+        <input type="hidden" id="passenger_id" name="passenger_id" >             
+    </div>
+</div>                
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8" x-data="{
+    }">
+    <h2 class="text-lg font-medium text-gray-900 p-4 sm:px-6">
+        Sélectionner un Conducteurs
+    </h2>
+    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+
+        <div class="mt-8 flex flex-col">
+            <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+                <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                    <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                        <table class="min-w-full divide-y divide-gray-300">
+                            <tbody class="divide-y divide-gray-200 bg-white">
+                                {{ if gt (len .ViewState.solidarity_results.Drivers) 0}}
+                                {{range $driver := .ViewState.solidarity_results.Drivers}}
+                                <tr>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="flex items-center">
+                                            <button type="button" @click="
+                                            document.getElementById('driver_id').value = '{{$driver.User.Id}}'
+                                            document.getElementById('driver_name').textContent = '{{$driver.User.FirstName}}{{$driver.User.LastName}}'" class="ml-4">                                                              
+                                                <div class="font-medium text-gray-900">
+                                                    <span>
+                                                        {{$driver.User.FirstName}}
+                                                    </span>
+                                                    <span>
+                                                        {{$driver.User.LastName}}
+                                                    </span>
+                                                </div>
+                                            </button>
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                    
+                                    </td>
+                                    <td
+                                        class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                                    
+                                    </td>
+                                </tr>
+                                {{end}}
+                                {{end}}
+                                <!-- More people... -->
+                            </tbody>
+                        </table>
+                        <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                            <div class="flex-1 flex justify-between sm:hidden">
+                            <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                            @click="paginate(current)"> Previous </a>
+                            <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                            @click="paginate(current+2)"> Next </a>
+                            </div>
+                            <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                                <div>
+                                    <p class="text-sm text-gray-700">
+                                    Résultats
+                                    <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                                    à
+                                    <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                                    sur
+                                    <span class="font-medium" x-text="state.count"></span>
+                                    </p>
+                                </div>
+                                <div>
+                                    <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                                    <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                        @click="paginate(current)">
+                                        <span class="sr-only">Previous</span>
+                                        <!-- Heroicon name: solid/chevron-left -->
+                                        <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                        <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                        </svg>
+                                    </a>
+                                    <template x-for="i in nb_pages">
+                                        <a href="#" @click="paginate(i)"
+                                        class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                                        :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                                        x-text="i"></a>
+                                    </template>
+                                    <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
+                                    <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                        @click="paginate(current+2)">
+                                        <span class="sr-only">Next</span>
+                                        <!-- Heroicon name: solid/chevron-right -->
+                                        <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                        <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                                        </svg>
+                                    </a>
+                                    </nav>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <p id="driver_name"></p>
+        <input type="hidden" id="driver_id" name="driver_id" >
+        <input type="submit"
+        class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto" 
+        value="Confirmer">
+        </div>
+</div>
+
+</form>
+{{end}}
+

web/layouts/journeys/_partials/journeys-solidarity-transport.html

@@ -1,36 +0,0 @@
-
-{{define "journeys_solidarity_transport"}}
-
-{{ if eq (len .ViewState.solidarity_drivers) 0}}
-<p class="p-12 text-gray-500 text-center text-md">Aucun conducteur solidaire disponible pour ce trajet.</p>
-{{else}}
-
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <thead class="bg-gray-50">
-    <tr>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Conducteurs disponibles
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{ range .ViewState.solidarity_drivers }}
-    <tr>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Data.first_name }} {{ .Data.last_name }}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue hover:text-co-blue" 
-          href="/app/solidarity-transport/drivers/{{.ID}}/match">
-          Organiser le transport solidaire
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
-{{end}}
-{{end}}

web/layouts/journeys/search.html

@@ -39,14 +39,14 @@
                                 <label for="departuredate" class="block text-sm font-medium text-gray-700">Le</label>
                                 <div class="mt-1">
                                     <input type="date" id="departuredate" name="departuredate" value="{{.ViewState.departuredate}}"
-                                        class="p-2 shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1">
+                                        class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1">
                                 </div>
                             </div>
                             <div class="lg:col-span-1">
                                 <label for="departuretime" class="block text-sm font-medium text-gray-700">A</label>
                                 <div class="mt-1">
                                     <input type="time" id="departuretime" name="departuretime" value="{{.ViewState.departuretime}}"
-                                        class="p-2 shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
+                                        class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
                                 </div>
                             </div>
                             
@@ -81,7 +81,9 @@
 
                                 <option value="public-transit">Transports</option>
 
-                                <option value="solidarity-transport">Transport solidaire</option> -->
+                                <option value="solidarity-service">Transports Solidaire</option>
+
+                                <!-- <option value="active-modes">Modes actifs</option> -->
 
                                 <option value="others">Autres</option>
                             </select>
@@ -105,10 +107,15 @@
                                         :class="tab == 'public-transit' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                         Transports </a>
                                     
-                                    <a href="#" @click="tab = 'solidarity-transport'"
+                                    <a href="#" @click="tab = 'solidarity-service'"
                                         class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'solidarity-transport' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        :class="tab == 'solidarity-service' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Transport solidaire </a>
+                                        Transports Solidaire </a>
+
+                                    <!-- <a href="#" @click="tab = 'active-modes'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'active-modes' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Modes actifs </a> -->
 
                                     <a href="#" @click="tab = 'others'"
                                         class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
@@ -121,8 +128,7 @@
 
                     <div x-show="tab == 'all'">{{template "journeys_all" .}}</div>
                     <div x-show="tab == 'carpool'">{{template "journeys_carpool" .}}</div>
-                    <div x-show="tab == 'public-transit'">{{template "journeys_public_transit" .}}</div>
+                    <div x-show="tab == 'solidarity-service'">{{template "journeys_solidarity_service" .}}</div>
-                    <div x-show="tab == 'solidarity-transport'">{{template "journeys_solidarity_transport" .}}</div>
                     <div x-show="tab == 'others'">{{template "journeys_others" .}}</div>
                 </div>
             </div>
@@ -133,3 +139,4 @@
  
 </div>
 {{end}}
+

web/layouts/layout.html

@@ -5,11 +5,9 @@
 <head>
   <title>PARCOURSMOB</title>
   <link rel="stylesheet" href="/public/css/main.css" />
-  <link href="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.snow.css" rel="stylesheet" />
   <!-- <script defer type="text/javascript" src="/public/js/main.js" defer></script> -->
   <script src="https://cdn.jsdelivr.net/npm/@kingshott/iodine@8.1.0/dist/iodine.min.umd.js" defer></script>
   <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js" defer></script>
-  <script src="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.js"></script>
 </head>
 
 <body class="h-full" x-data="{ offCanvasMenu: false }">

web/layouts/members/display.html

@@ -54,7 +54,7 @@
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.first_name}}</dd>
                             </div>
                             <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Prénom</dt>
+                                <dt class="text-sm font-medium text-gray-500">Prénon</dt>
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.last_name}}
                                </dd>
                             </div>

web/layouts/solidarity_service/_partials/beneficiary-list.html

@@ -0,0 +1,157 @@
+{{define "beneficiary_solidarity_list"}}
+<main>
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 px-4 py-5 sm:px-6" >
+        <h1 class="text-2xl font-semibold text-gray-900">Bénéficiaires Silvermobi</h1>
+    </div>
+                <form class="space-y-6" method="GET" name="driver_journeys" @submit="submit">                
+                    <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8" x-data="{
+                                state: {{.ViewState.JSONWithLimits 0 10}},
+                                current: 0,
+                                nb_pages() {
+                                    let nbEl = this.state.count 
+                                    return Math.ceil(nbEl/10)
+                                },
+                                async paginate(page) {
+                                    let start = (page-1)*10
+                                    if(start < 0|| start > this.state.count) {
+                                        return
+                                    }
+                                    let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
+                                    let data = await resp.json()
+                                    this.state.beneficiariessolidarity = data
+                                    this.current=page-1
+                                }
+                            }">
+                            <div class=" px-4 py-5 sm:px-6">
+                                <div class="mt-8 flex flex-col">
+                                    <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+                                        <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                                            <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                                                <table class="min-w-full divide-y divide-gray-300">
+                                                    <thead class="bg-gray-50">
+                                                        <tr>
+                                                            <th scope="col"
+                                                                class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                                                Nom
+                                                            </th>
+                                                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                                                Téléphone
+                                                            </th>
+                                                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                                                Adresse
+                                                            </th>
+                                                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                                                Labels
+                                                            </th>
+                                                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                                                Option
+                                                            </th>
+                                                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                                                Info
+                                                            </th>
+                                                          
+                                                        </tr>
+                                                    </thead>
+                                                    <tbody class="divide-y divide-gray-200 bg-white">
+                                                        <template x-for="beneficiary in state.beneficiariessolidarity.passenger">
+                                                            <tr>
+                                                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                                                    <div class="flex items-center">
+                                                                        <button type="button" @click="
+                                                                                document.getElementById('passenger_id').value = beneficiary.id;
+                                                                                document.getElementById('passenger_name').textContent = beneficiary.first_name+' '+beneficiary.last_name" class="ml-4">
+                                                                            <div class="font-medium text-gray-900">
+                                                                                <span
+                                                                                    x-text="beneficiary.first_name" >
+                                                                                </span>
+                                                                                <span
+                                                                                    x-text="beneficiary.last_name">
+                                                                                </span>
+                                                                            </div>
+                                                                            <div class="text-gray-500" x-text="beneficiary.email">                                                                
+                                                                            </div>
+                                                                        </button>
+                                                                    </div>
+                                                                </td>
+                                                               
+                                                                <td class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                                                                    <a :href="'/app/solidarity_service/create/'+ beneficiary.id"
+                                                                        class="text-co-blue hover:text-co-blue">Demande de trajet<span class="sr-only">
+                                                                    </a>
+                                                                </td>
+                                                                <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                                                    <div class="text-gray-900" x-text="beneficiary.phone_number"></div>
+                                                                </td>
+                                                                <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
+                                                                    x-text="beneficiary.data.address ? beneficiary.address.properties.label : ''">
+                                                                </td>
+                                                                <td class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                                                                    <a :href="'/app/beneficiaries/' + beneficiary.id"
+                                                                        class="text-co-blue hover:text-co-blue">Voir<span class="sr-only">, <span
+                                                                                x-text="beneficiary.first_name"></span> <span
+                                                                                x-text="beneficiary.last_name"></span>
+                                                                    </a>
+                                                                </td>
+                                                            </tr>
+                                                        </template>
+                                                        <!-- More people... -->
+                                                    </tbody>
+                                                </table>
+                                                <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                                                    <div class="flex-1 flex justify-between sm:hidden">
+                                                        <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                                                        @click="paginate(current)"> Previous </a>
+                                                        <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                                                        @click="paginate(current+2)"> Next </a>
+                                                    </div>
+                                                    <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                                                    <div>
+                                                        <p class="text-sm text-gray-700">
+                                                            Résultats
+                                                            <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                                                            à
+                                                            <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                                                            sur
+                                                            <span class="font-medium" x-text="state.count"></span>
+                                                        </p>
+                                                    </div>
+                                                    <div>
+                                                        <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                                                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                                            @click="paginate(current)">
+                                                            <span class="sr-only">Previous</span>
+                                                            <!-- Heroicon name: solid/chevron-left -->
+                                                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                                            <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                                            </svg>
+                                                        </a>
+                                                        <template x-for="i in nb_pages">
+                                                            <a href="#" @click="paginate(i)"
+                                                            class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                                                            :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                                                            x-text="i"></a>
+                                                        </template>
+                                                        <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
+                                                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                                            @click="paginate(current+2)">
+                                                            <span class="sr-only">Next</span>
+                                                            <!-- Heroicon name: solid/chevron-right -->
+                                                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                                            <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                                                            </svg>
+                                                        </a>
+                                                        </nav>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <input type="hidden" id="passenger_id" name="passenger_id" >
+                           
+                    </div>
+                </div>
+                </form>
+</main>
+{{end}}

web/layouts/solidarity_service/_partials/booking-list.html

@@ -0,0 +1,133 @@
+{{define "booking_solidarity_list" }}
+<main>              
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 px-4 py-5 sm:px-6" x-data="{
+        state: {{.ViewState.JSONWithLimits 0 10}},
+        current: 0,
+        nb_pages() {
+            let nbEl = this.state.count 
+            return Math.ceil(nbEl/10)
+        },
+        async paginate(page) {
+            let start = (page-1)*10
+            if(start < 0|| start > this.state.count) {
+                return
+            }
+            let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
+            let data = await resp.json()
+            this.state.bookings = data
+            this.current=page-1
+        }            
+    }">
+    <h1 class="text-2xl font-semibold text-gray-900">Transports
+    </h1>
+    <div class="px-4 py-5 sm:px-6">
+
+        <div class="mt-8 flex flex-col">
+            <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+                <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                    <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                        <table class="min-w-full divide-y divide-gray-300">
+                            <tbody class="divide-y divide-gray-200 bg-white">
+                                <tr>
+                                    <th>Date</th>
+                                    <th>Conducteur</th>
+                                    <th>Passager</th>
+                                </tr>
+                                <template x-for="booking in state.bookings.booking">     
+                                    <tr>
+                                        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                            <div class="flex items-center">                                                        
+                                                    <div class="font-medium text-gray-900">
+                                                        <span
+                                                            x-text="booking.passengerPickupDate">
+                                                        </span>
+                                                    </div>
+                                                </button>
+                                            </div>
+                                        </td>
+                                        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                            <div class="flex items-center">                                                             
+                                                    <div class="font-medium text-gray-900">                                                       
+                                                        <span
+                                                            x-text="booking.driver.first_name">
+                                                        </span>   
+                                                        <span
+                                                            x-text="booking.driver.last_name">
+                                                        </span>                                                    
+                                                    </div>
+                                                </button>
+                                            </div>
+                                        </td>
+                                        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                            <div class="flex items-center">                                                             
+                                                    <div class="font-medium text-gray-900">                                                       
+                                                        <span
+                                                        x-text="booking.passenger.first_name">
+                                                        </span>
+                                                        <span
+                                                            x-text="booking.passenger.last_name">
+                                                        </span>                                                                                                       
+                                                    </div>
+                                                </button>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </template>    
+                            </tbody>
+                        </table>
+                        <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                            <div class="flex-1 flex justify-between sm:hidden">
+                            <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                            @click="paginate(current)"> Previous </a>
+                            <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                            @click="paginate(current+2)"> Next </a>
+                            </div>
+                            <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                                <div>
+                                    <p class="text-sm text-gray-700">
+                                    Résultats
+                                    <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                                    à
+                                    <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                                    sur
+                                    <span class="font-medium" x-text="state.count"></span>
+                                    </p>
+                                </div>
+                                <div>
+                                    <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                                    <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                        @click="paginate(current)">
+                                        <span class="sr-only">Previous</span>
+                                        <!-- Heroicon name: solid/chevron-left -->
+                                        <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                        <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                        </svg>
+                                    </a>
+                                    <template x-for="i in nb_pages">
+                                        <a href="#" @click="paginate(i)"
+                                        class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                                        :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                                        x-text="i"></a>
+                                    </template>
+                                    <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
+                                    <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                        @click="paginate(current+2)">
+                                        <span class="sr-only">Next</span>
+                                        <!-- Heroicon name: solid/chevron-right -->
+                                        <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                        <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                                        </svg>
+                                    </a>
+                                    </nav>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <p id="booking_name"></p>
+        </div>
+    </div>
+</main>
+{{end}}

web/layouts/solidarity_service/_partials/create-booking.html

@@ -0,0 +1,165 @@
+{{define "content"}}
+<main>
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+        <h1 class="text-2xl font-semibold text-gray-900">
+            Transport Solidaire
+        </h1>
+    </div>
+    <div>
+        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+            <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
+                <form class="space-y-6" method="GET" name="driver_journeys" @submit="submit">                
+                    
+                        <div class="border-t border-gray-200 px-4 py-5 sm:px-6">    
+                            {{ $departureField := "departure" }}
+                            {{ $departureLabel := "Départ" }}
+                            {{ template "address_autocomplete" dict "FieldName" $departureField "FieldLabel" $departureLabel }}
+                    
+                            {{ $destinationField := "destination" }}
+                            {{ $destinationLabel := "Destination" }}
+                            {{ template "address_autocomplete" dict "FieldName" $destinationField "FieldLabel" $destinationLabel }}
+    
+                            <div class="py-4 grid grid-cols-2">
+                                <div class="lg:col-span-1">
+                                    <label for="date" class="block text-sm font-medium text-gray-700">Le</label>
+                                    <div class="mt-1">
+                                        <input type="datetime-local" id="date" name="date" 
+                                            class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1">
+                                    </div>
+                                </div> 
+                            </div>
+                            <input type="submit"
+                                    class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto" 
+                                    value="Chercher un Conducteurs">               
+                        </div>
+                </div>
+                </form>
+                <div class="bg-white shadow sm:rounded-2xl">
+
+                    <form class="space-y-6" method="POST" name="create_booking">
+                    
+                        <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8" x-data="{
+                            state: {{.ViewState.JSONWithLimits 0 10}},
+                            current: 0,
+                            nb_pages() {
+                                let nbEl = this.state.count 
+                                return Math.ceil(nbEl/10)
+                            },
+                            async paginate(page) {
+                                let start = (page-1)*10
+                                if(start < 0|| start > this.state.count) {
+                                    return
+                                }
+                                let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
+                                let data = await resp.json()
+                                this.state.drivers = data
+                                this.current=page-1
+                            }
+                        }">
+                        <h2 class="text-lg font-medium text-gray-900 p-4 sm:px-6">
+                            Sélectionner un Conducteurs
+                        </h2>
+                        <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+
+                            <div class="mt-8 flex flex-col">
+                                <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+                                    <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                                        <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                                            <table class="min-w-full divide-y divide-gray-300">
+                                                <tbody class="divide-y divide-gray-200 bg-white">
+                                                    <template x-for="driver in state.drivers.driver_journeys">
+                                                        <tr>
+                                                            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                                                <div class="flex items-center">
+                                                                    <button type="button" @click="
+                                                                    document.getElementById('driver_id').value = driver.user.id
+                                                                    document.getElementById('driver_name').textContent = driver.user.first_name+' '+driver.user.last_name" class="ml-4">                                                              
+                                                                        <div class="font-medium text-gray-900">
+                                                                            <span
+                                                                            x-text="driver.user.first_name">
+                                                                            </span>
+                                                                            <span
+                                                                                x-text="driver.user.last_name">
+                                                                            </span>
+                                                                        </div>
+                                                                    </button>
+                                                                </div>
+                                                            </td>
+                                                            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                                            
+                                                            </td>
+                                                            <td
+                                                                class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                                                            
+                                                            </td>
+                                                        </tr>
+                                                    </template>
+                        
+                                                    <!-- More people... -->
+                                                </tbody>
+                                            </table>
+                                            <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                                                <div class="flex-1 flex justify-between sm:hidden">
+                                                <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                                                @click="paginate(current)"> Previous </a>
+                                                <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                                                @click="paginate(current+2)"> Next </a>
+                                                </div>
+                                                <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                                                    <div>
+                                                        <p class="text-sm text-gray-700">
+                                                        Résultats
+                                                        <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                                                        à
+                                                        <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                                                        sur
+                                                        <span class="font-medium" x-text="state.count"></span>
+                                                        </p>
+                                                    </div>
+                                                    <div>
+                                                        <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                                                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                                            @click="paginate(current)">
+                                                            <span class="sr-only">Previous</span>
+                                                            <!-- Heroicon name: solid/chevron-left -->
+                                                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                                            <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                                            </svg>
+                                                        </a>
+                                                        <template x-for="i in nb_pages">
+                                                            <a href="#" @click="paginate(i)"
+                                                            class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                                                            :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                                                            x-text="i"></a>
+                                                        </template>
+                                                        <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
+                                                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                                            @click="paginate(current+2)">
+                                                            <span class="sr-only">Next</span>
+                                                            <!-- Heroicon name: solid/chevron-right -->
+                                                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                                            <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                                                            </svg>
+                                                        </a>
+                                                        </nav>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <p id="driver_name"></p>
+                            <input type="hidden" id="driver_id" name="driver_id" >
+                            <input type="submit"
+                            class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto" 
+                            value="Confirmer">
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</main>
+{{end}}

web/layouts/solidarity_service/_partials/create-driver.html

@@ -1,7 +1,7 @@
 {{define "content"}}
 
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Créer un conducteur solidaire</h1>
+    <h1 class="text-2xl font-semibold text-gray-900">Ajouter un conducteur</h1>
 </div>
 
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
@@ -12,14 +12,9 @@
             email: null,
             phone_number: null,
             birthdate: null,
+            file_number: null
         },
-        rules: {
+       
-            first_name: ['required'],
-            last_name: ['required'],
-            email: ['required', 'email'],
-            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
-            birthdate: ['required'],
-        },
         formValidation: {
             valid: false,
             fields: {
@@ -28,6 +23,7 @@
                 email: {valid: null},
                 phone_number: {valid: null},
                 birthdate: {valid: null},
+                file_number: {valid: null},
             }
         },
         isFormValid: true,
@@ -51,7 +47,8 @@
             <div class="md:grid md:grid-cols-3 md:gap-6">
                 <div class="md:col-span-1">
                     <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations personnelles obligatoires pour créer le conducteur</p>
+                    <p class="mt-1 text-sm text-gray-500">Informations personnelles sur le conducteur obligatoires
+                        pour créer son profil dans PARCOURSMOB</p>
                 </div>
                 <div class="mt-5 md:mt-0 md:col-span-2">
                     <div class="grid grid-cols-6 gap-6">
@@ -96,6 +93,7 @@
                                 x-model="fields.birthdate" @blur="validateField('birthdate')"
                                 :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                         </div>
+                       
                     </div>
                 </div>
             </div>
@@ -147,7 +145,49 @@
                     <h3 class="text-lg font-medium leading-6 text-gray-900">Paramètres</h3>
                     <p class="mt-1 text-sm text-gray-500">Paramètres liés au conducteur, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
                 </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
+            </div>
+        </div> 
+
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations conducteur solidaire</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations personnelles sur le conducteur obligatoires
+                        pour créer son profil dans PARCOURSMOB</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="model" class="block text-sm font-medium text-gray-700">Model</label>
+                            <input type="text" name="model" id="model" 
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                :class="border-gray-300">
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="brand" class="block text-sm font-medium text-gray-700">Marque</label>
+                            <input type="text" name="brand" id="brand" 
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                :class="border-gray-300">
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="radius" class="block text-sm font-medium text-gray-700">Périmètre de service </label>
+                            <input type="number" name="radius" id="radius" 
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                :class="border-gray-300">
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="alias" class="block text-sm font-medium text-gray-700">Alias</label>
+                            <input type="text" name="alias" id="alias" 
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                :class="border-gray-300">
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="grade" class="block text-sm font-medium text-gray-700">Grade</label>
+                            <input type="text" name="grade" id="grade" 
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                :class="border-gray-100">
+                        </div>  
+                        <div class="col-span-6 sm:col-span-3">
 
                             {{ $fieldName := "address" }}
                             {{ template "address_autocomplete" dict "FieldName" $fieldName }}
@@ -157,17 +197,109 @@
                         </div>                     
                     </div>
                 </div>
+            </div>
+        </div>
       
+        <div x-data="{
+            days : [
+            'Monday' ,
+            'Tuesday' ,
+            'Wednesday' ,
+            'Thursday' ,
+            'Friday' ,
+            'Saturday' ,
+            'Sunday' ,
+            ],
+
+            hours : [
+            '12:00 AM',
+            '01:00 AM',
+            '02:00 AM',
+            '03:00 AM',
+            '04:00 AM',
+            '05:00 AM',
+            '06:00 AM',
+            '07:00 AM',
+            '08:00 AM',
+            '09:00 AM',
+            '10:00 AM',
+            '11:00 AM',
+            '12:00 PM',
+            '01:00 PM',
+            '02:00 PM',
+            '03:00 PM',
+            '04:00 PM',
+            '05:00 PM',
+            '06:00 PM',
+            '07:00 PM',
+            '08:00 PM',
+            '09:00 PM',
+            '10:00 PM',
+            '11:00 PM'
+            ],
+
+            confirmAvailabilities() {
+                const driverAvailabilities = [];
+
+                this.days.forEach(day  => {
+                    this.hours.forEach(hour => {
+                        let checkbox = document.getElementById('hour-' + day + '-' + hour).checked;
+                        if( checkbox && checkbox === true){
+                            const startTime = hour;
+                            const endTime = hour;
+    
+                            const availabilitySlot = {
+                                DayOfWeek: day, 
+                                StartTime: startTime,
+                                EndTime: endTime,
+                            };
+    
+                            driverAvailabilities.push(availabilitySlot);
+                        }
+                    })
+                })
+                console.log(driverAvailabilities);
+                let availabilities = document.getElementById('availabilities');
+                availabilities.value = JSON.stringify(driverAvailabilities);
+                return
+                
+            }
+        }">
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Disponibilitées</h3>
+                    <p class="mt-1 text-sm text-gray-500">La définition de vos horraires permet de vous proposer des trajés uniquement quand vous serai disponible.  </p>
+                </div>
+            </div>
+        </div>
+        <div class="grid grid-cols-1 grid-rows-7 gap-4">
+        <template x-for="day in days" :key="day" >
+            <div class="mb-4 gap-2 mt-4 bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6"> 
+                <label :for="'day-select-'+ day" class="block text-sm font-medium select-none transition-colors duration-200 hover:text-gray-900 text-center mb-4" x-text="day"></label>
+                <div :name="day" :id="'day-select-' + day" class="grid grid-cols-6 grid-rows-2">
+                        <template x-for="hour in hours" :key="hour">
+                            <div class="flex flex-col items-center mb-4 ">
+                                <input :id="'hour-' + day + '-' + hour" type="checkbox"  x-value="hour" class="mt-1 focus:ring-co-blue focus:border-co-blue block shadow-sm sm:text-sm text-xl py-2 px-4 h-12 rounded-2xl w-auto"></input>
+                                <label :for="'hour-' + day + '-' + hour" x-text="hour" class="block text-sm font-medium text-gray-700 select-none transition-colors duration-200 hover:text-gray-900 text-center "></label>
+                            </div>
+                        </template>
+                </div>
+            </div>
+        </template>
+    </div>
+        <input type="hidden" id="availabilities" name="availabilities" >
         <div class="flex justify-end">
             <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/solidarity-transport/">
+            <a href="/app/beneficiaries/">
                 <button type="button"
                     class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
             </a>
+            <button type="button" @click="confirmAvailabilities()"
+        class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Confirmer les horaires</button>
             <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le conducteur solidaire</button>
+                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le conducteur</button>
         </div>
     </form>
 </div>
 {{end}}
-

web/layouts/solidarity_service/_partials/driver-list.html

@@ -0,0 +1,123 @@
+
+{{define "driver_solidarity_list" }}
+<main>
+                        
+        <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 px-4 py-5 sm:px-6" x-data="{
+            state: {{.ViewState.JSONWithLimits 0 10}},
+            current: 0,
+            nb_pages() {
+                let nbEl = this.state.count 
+                return Math.ceil(nbEl/10)
+            },
+            async paginate(page) {
+                let start = (page-1)*10
+                if(start < 0|| start > this.state.count) {
+                    return
+                }
+                let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
+                let data = await resp.json()
+                this.state.drivers = data
+                this.current=page-1
+            }
+
+        }">
+        <h1 class="text-2xl font-semibold text-gray-900">            Conducteurs
+        </h1>
+        <div class="px-4 py-5 sm:px-6">
+            <a
+             class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto" 
+             href="driver/create">Ajouter un conducteur solidaire</a>
+            <div class="mt-8 flex flex-col">
+                <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+                    <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                        <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                            <table class="min-w-full divide-y divide-gray-300">
+                                <tbody class="divide-y divide-gray-200 bg-white">
+                                    <template x-for="driver in state.drivers.driver_journeys">
+                                        <tr>
+                                            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                                <div class="flex items-center">
+                                                    <button type="button" @click="
+                                                    document.getElementById('driver_id').value = driver.id
+                                                    document.getElementById('driver_name').textContent = driver.first_name+' '+driver.last_name" class="ml-4">                                                              
+                                                        <div class="font-medium text-gray-900">
+                                                            <span
+                                                            x-text="driver.first_name">
+                                                            </span>
+                                                            <span
+                                                                x-text="driver.last_name">
+                                                            </span>
+                                                        </div>
+                                                    </button>
+                                                </div>
+                                            </td>
+                                            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                            
+                                            </td>
+                                            <td
+                                                class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                                            
+                                            </td>
+                                        </tr>
+                                    </template>
+        
+                                    <!-- More people... -->
+                                </tbody>
+                            </table>
+                            <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                                <div class="flex-1 flex justify-between sm:hidden">
+                                <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                                @click="paginate(current)"> Previous </a>
+                                <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                                @click="paginate(current+2)"> Next </a>
+                                </div>
+                                <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                                    <div>
+                                        <p class="text-sm text-gray-700">
+                                        Résultats
+                                        <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                                        à
+                                        <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                                        sur
+                                        <span class="font-medium" x-text="state.count"></span>
+                                        </p>
+                                    </div>
+                                    <div>
+                                        <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                            @click="paginate(current)">
+                                            <span class="sr-only">Previous</span>
+                                            <!-- Heroicon name: solid/chevron-left -->
+                                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                            <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                            </svg>
+                                        </a>
+                                        <template x-for="i in nb_pages">
+                                            <a href="#" @click="paginate(i)"
+                                            class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                                            :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                                            x-text="i"></a>
+                                        </template>
+                                        <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
+                                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                            @click="paginate(current+2)">
+                                            <span class="sr-only">Next</span>
+                                            <!-- Heroicon name: solid/chevron-right -->
+                                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                            <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                                            </svg>
+                                        </a>
+                                        </nav>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <p id="driver_name"></p>
+            <input type="hidden" id="driver_id" name="driver_id" >
+            </div>
+        </div>
+</main>
+{{end}}

web/layouts/solidarity_service/beneficiary-solidarity.html

@@ -0,0 +1,36 @@
+{{define "beneficiary_solidarity"}}
+<div class="px-4 py-6 sm:px-6">
+    <h3 class="text-lg">Transport solidaire</h3>
+        {{ $bookingSolidarity := len .ViewState.bookingSolidarity }}
+        {{if eq $bookingSolidarity 0}} 
+        <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucune course Silvermobi n'est prévue pour le moment.</p>
+        <div>
+            <form method="POST" @submit="submit">
+            <button
+                type="submit"
+                class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
+                Inscription aux Transports Solidaires
+            </button>
+            </form>
+        </div>
+        {{else}}
+        <table class="min-w-full divide-y divide-gray-300">
+            <tbody class="divide-y divide-gray-200 bg-white">
+                <tr>
+                    <th>Date</th>
+                    <th>Conducteur</th>
+                    <th>Passager</th>
+                </tr>
+           
+            {{range .ViewState.bookingSolidarity}}
+                <tr>     
+                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{( .PassengerPickupDate)}}</td>
+                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{.Driver.FirstName}} {{.Driver.LastName}}</td>
+                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{.Passenger.FirstName}} {{.Passenger.LastName}} </td>
+                </tr>
+                {{end}}
+            </tbody>
+        </table>
+        {{end}}
+    </div>
+{{end}}

web/layouts/solidarity_service/main.html

@@ -1,50 +1,47 @@
 {{define "content"}}
-
+<main>
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 px-4 py-5 sm:px-6">
-  <h1 class="text-2xl font-semibold text-gray-900">Transport solidaire</h1>
+        <h1 class="text-2xl font-semibold text-gray-900">
-
+            Transport Solidaire
-    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden my-4" x-data="{
+        </h1>
-        tab: 'drivers',
+    </div>
+    <section aria-labelledby="functionalities-title" x-data="{
+        tab: 'beneficiaries',
         to(event) {
             this.tab = event.target.value
         }
     }">
+    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden px-4 py-5 sm:px-6">
         <div class="divide-y divide-gray-200">
             <div>
                 <div class="hidden sm:block">
                     <div class="border-b border-gray-200 pl-4">
                         <nav class="-mb-px flex space-x-8" aria-label="Tabs"> 
+                            <a href="#" @click="tab = 'beneficiaries'"
+                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                Bénéficiaires </a>
+
                             <a href="#" @click="tab = 'drivers'"
                                 class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'drivers' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                :class="tab == 'organizations' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                 Conducteurs </a>
                             
-                            <!--<a href="#" @click="tab = 'beneficiaries'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'beneficiaries' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Bénéficiaires </a>-->
-
                             <a href="#" @click="tab = 'solidarityService'"
                                 class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                 :class="tab == 'solidarityService' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Trajets </a>
+                                Trajets Solidaire </a>
                         </nav>
                     </div>
                 </div>
             </div>
 
-            <div x-show="tab == 'drivers'">{{template "solidarity_drivers_list" .}}</div>
+            <div x-show="tab == 'beneficiaries'">{{template "beneficiary_solidarity_list" .}}</div>
-
+            <div x-show="tab == 'drivers'">{{template "driver_solidarity_list" .}}</div>
-
+            <div x-show="tab == 'solidarityService'">{{template "booking_solidarity_list" .}}</div>
-            <div x-show="tab == 'beneficiaries'">1</div>
-            <div x-show="tab == 'solidarityService'">
-              <div class="m-10 text-center text-gray-600">Aucun trajet déclaré</div>
-            </div>
 
         </div>
     </div>
-
+    </section>
-
+</main>
-</div>
-
 {{end}}

web/layouts/solidarity_transport/_partials/driver_availabilities.html

@@ -1,84 +0,0 @@
-{{define "driver_availabilities"}}
-
-<div class="bg-white shadow sm:rounded-lg"
-  x-data="{
-    availabilitiesdialog: false
-  }">
-  <div class="px-4 py-5 sm:px-6">
-    <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Disponibilités</h2>
-  </div>
-  <div class="border-t border-gray-200 px-4">
-    <div class="py-4">
-      {{ range .ViewState.driver.Data.solidarity_transport_availabilities }}
-      <div class="flex flex-row">
-        <div class="flex-none">
-        {{ if eq .day 0.0}}Dimanche
-        {{ else if eq .day 1.0}}Lundi
-        {{ else if eq .day 2.0}}Mardi
-        {{ else if eq .day 3.0}}Mercredi
-        {{ else if eq .day 4.0}}Jeudi
-        {{ else if eq .day 5.0}}Vendredi
-        {{ else if eq .day 6.0}}Samedi
-        {{ end }}
-        {{.start_time}} - {{ .end_time }}
-        </div>
-        <div class="flex-auto">&nbsp;</div>
-        <div class="flex-none text-sm"><a class="text-co-blue" href="/app/solidarity-transport/drivers/{{$.ViewState.driver.ID}}/availabilities/{{.id}}/delete">Supprimer</a></div>
-      </div>
-      {{ end }}
-    </div>
-    <button type="button" @click="availabilitiesdialog = !availabilitiesdialog" 
-      class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue my-4 px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
-      {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-      Ajouter une disponibilité
-    </button>
-  </div>
-  <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
-       x-show="availabilitiesdialog">
-    <div class="fixed inset-0 bg-gray-900 opacity-30 transition-opacity"></div>
-                                
-    <div class="fixed inset-0 z-10 overflow-y-auto">
-      <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-        <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-sm sm:p-6">
-          <div>
-            <div class="mt-3 text-center sm:mt-5">
-              <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Ajouter une disponibilité</h3>
-                <div class="mt-2">
-                  <p class="text-sm text-gray-500">Paramétrer la nouvelle disponibilité du conducteur</p>
-                </div>
-              </div>
-            </div>
-          <form method="POST" action="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}/availabilities" class="my-4">
-              <div class="my-4">
-                <input name="days.monday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Lundi &nbsp;&nbsp;
-                <input name="days.tuesday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Mardi &nbsp;&nbsp;
-                <input name="days.wednesday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Mercredi &nbsp;&nbsp;
-                <input name="days.thursday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Jeudi &nbsp;&nbsp;
-                <input name="days.friday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Vendredi &nbsp;&nbsp;
-                <input name="days.saturday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Samedi &nbsp;&nbsp;
-                <input name="days.sunday" type="checkbox" class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded"> Dimanche &nbsp;&nbsp;
-              </div>
-              <div class="my-4 inline-flex justify-items-center">
-                <div class="p-1">De</div>
-                <input type="time" id="starttime" name="starttime" value="08:00"
-                       class="shadow-sm focus:ring-co-blue focus:border-co-blue p-1 sm:text-sm border-gray-300 rounded-l-2xl border-l-0">
-                <div class="p-1 px-4">à</div>
-                <input type="time" id="endtime" name="endtime" value="18:00"
-                       class="shadow-sm focus:ring-co-blue focus:border-co-blue p-1 sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
-                
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button type="submit" class="inline-flex w-full justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:text-sm">Ajouter</button>
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button @click="availabilitiesdialog=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-              </div>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
- </div>
-
-{{end}}

web/layouts/solidarity_transport/_partials/driver_documents.html

@@ -1,136 +0,0 @@
-
-{{define "driver_files"}}
-<div class="px-4 py-6 sm:px-6"
-x-data="{
-    fields: {
-        name: null,
-        type: null,
-        file: null,
-    },
-    rules: {
-        name: ['required'],
-        type: ['required'],
-        file: ['required'],
-    },
-    formValidation: {
-        valid: false,
-        fields: {
-            name: {valid: null},
-            type: {valid: null},
-            file: {valid: null},
-        }
-    },
-    isFormValid: true,
-    validate() {
-        this.formValidation = Iodine.assert(this.fields, this.rules)
-    },
-    validateField(field) {
-        this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-    },
-    submit(event) {
-        this.validate()
-        if(!this.formValidation.valid) {
-            this.isFormValid = false
-            event.preventDefault()
-        }
-        return this.formValidation.valid
-    }
-}">
-    {{if eq (len .ViewState.documents) 0}}
-    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
-    {{end}}
-
-
-    {{if gt (len .ViewState.documents) 0}}
-    
-    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
-        <table class="min-w-full divide-y divide-gray-300">
-          <thead>
-            <tr>
-              <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Type</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Nom du document</th>
-              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Ajouté le</th>
-              <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                <span class="sr-only">Actions</span>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            {{range .ViewState.documents}}
-            <tr>
-              <td class="relative py-4 pl-4 sm:pl-6 pr-3 text-sm">
-                <div class="font-medium text-gray-900">
-                    <span class="bg-co-blue text-xs text-white rounded-xl p-1 mr-2">{{index $.ViewState.file_types_map .Metadata.Type}}</span>
-                </div>
-              </td>
-              <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
-              <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
-              <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                <a href="/app/solidarity-transport/drivers/{{$.ViewState.driver.ID}}/documents/{{.FileName}}" target="_blank">
-                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
-                </a>
-              </td>
-            </tr>
-            {{end}}
-    
-    
-            <!-- More plans... -->
-          </tbody>
-        </table>
-      </div>
-    
-    {{end}}
-
-    <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/drivers/{{.ViewState.driver.ID}}/documents"  @submit="submit"  enctype="multipart/form-data">
-        <div class="md:grid md:grid-cols-6 p-2">
-            <div class="sm:col-span-2">
-                <label for="type" class="block text-sm font-medium text-gray-700">Type</label>
-                <select id="type" name="type" class="mt-1 block w-full rounded-l-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm"
-                    x-model="fields.type" @blur="validateField('type')"
-                    :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                    <option value="" selected>Sélectionner un type</option>
-                    {{range .ViewState.drivers_file_types}}
-                    <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
-                    {{end}}
-                </select>
-              </div>
-              <div class="sm:col-span-4">
-                <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                      <input type="text" name="name" id="name"
-                          placeholder="Nom du fichier"
-                          class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-r-2xl p-2"
-                          x-model="fields.name" @blur="validateField('name')"
-                          :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'" />
-              </div>
-              <div class="sm:col-span-6 mt-4">
-                <label for="cover-photo" class="block text-sm font-medium text-gray-700">Téléchargement</label>
-                <div class="mt-1 flex justify-center rounded-md border-2 border-dashed px-6 pt-5 pb-6"
-                x-on:drop="console.log('toto')"
-                :class="formValidation.fields.file.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                  <div class="space-y-1 text-center">
-                    {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}}
-                    <div class="flex text-sm text-gray-600">
-                      <label for="file-upload" class="relative cursor-pointer rounded-md bg-white font-medium text-co-blue focus-within:outline-none focus-within:ring-2 focus-within:ring-co-blue focus-within:ring-offset-2 hover:text-co-blue">
-                        <span>Sélectionnez un fichier </span>
-                        <input id="file-upload" name="file-upload" type="file" class="sr-only"
-                        x-model="fields.file" @blur="validateField('file')">
-                      </label>
-                      <!-- <p class="pl-1">ou glissez-déposez</p>  -->
-
-                        
-                    </div>
-                    <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                    <p class="text-co-blue p-2" x-text="fields.file" x-if="fields.file"></p>
-                  </div>
-                </div>
-              </div>
-        </div>
-        <button type="submit"
-            class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-            Ajouter le document
-        </button>
-    </form>
-
-</div>
-{{end}}

web/layouts/solidarity_transport/_partials/drivers_list.html

@@ -1,55 +0,0 @@
-{{ define "solidarity_drivers_list" }}
-<div class="sm:flex sm:items-center">
-  <div class="sm:flex-auto">
-    <p class="mt-2 text-sm text-gray-700"></p>
-  </div>
-  <div class="m-4 sm:ml-16 sm:flex-none">
-    <!--<a href="/api/cache/{{.ViewState.CacheId}}/export">
-      <button type="button"
-        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-        {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
-        Exporter
-      </button>
-    </a>-->
-    <a href="/app/solidarity-transport/drivers/create">
-      <button type="button"
-        class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
-        {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-        Ajouter un conducteur solidaire
-      </button>
-    </a>
-  </div>
-</div>
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <thead class="bg-gray-50">
-    <tr>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Nom
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Disponibilités
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    {{ range .ViewState.drivers }}
-    <tr>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Data.first_name }} {{ .Data.last_name }}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6"></td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        <a class="text-co-blue hover:text-co-blue" 
-          href="/app/solidarity-transport/drivers/{{.ID}}">
-          Voir
-        </a>
-      </td>
-    </tr>
-    {{ end }}
-  </tbody>
-</table>
-{{ end }}

web/layouts/solidarity_transport/driver_display.html

@@ -1,138 +0,0 @@
-{{define "content"}}
-<main class="py-10">
-    <!-- Page header -->
-    <div class="max-w-3xl mx-auto px-4 sm:px-6 md:flex md:items-center md:justify-between md:space-x-5 lg:max-w-7xl lg:px-8">
-        <div class="flex items-center space-x-5">
-            <div class="flex-shrink-0">
-                <div class="relative">
-                    <img class="h-16 w-16 rounded-co" src="/app/beneficiaries/{{.ViewState.driver.ID}}/picture" alt="">
-                    <span class="absolute inset-0 shadow-inner rounded-full" aria-hidden="true"></span>
-                </div>
-            </div>
-            <div>
-                <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.driver.Data.first_name}}
-                    {{.ViewState.driver.Data.last_name}}</h1>
-                <p class="text-sm font-medium text-gray-500">{{if .ViewState.driver.Metadata.created}}Ajouté le <time
-                        datetime="2022-07-25">{{.ViewState.driver.Metadata.created}}</time> par
-                    <a href="#" class="text-gray-900">Conseiller 1</a>{{end}}
-                </p>
-            </div>
-        </div>
-        <div
-            class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
-            <!-- <button type="button"
-                class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Supprimer</button> -->
-<!--            <a href="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}/update" class="inline-flex"><button type="button"
-                    class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>-->
-        </div>
-    </div>
-
-    <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
-        <div class="space-y-6 lg:col-start-1 lg:col-span-2">
-            <section aria-labelledby="driver-information-title">
-                <div class="bg-white shadow sm:rounded-lg">
-                    <div class="px-4 py-5 sm:px-6">
-                        <h2 id="driver-information-title" class="text-lg leading-6 font-medium text-gray-900">
-                            Informations personnelles</h2>
-                        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations générales sur le conducteur solidaire.</p>
-                    </div>
-                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            {{if .ViewState.driver.Data.email}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Email</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.email}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.phone_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Téléphone</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.phone_number}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.birthdate}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .ViewState.driver.Data.birthdate).Format
-                                    "02/01/2006"}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.driver.Data.gender (ne .ViewState.driver.Data.gender "0")}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Genre</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{genderISO5218 .ViewState.driver.Data.gender}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.address}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Adresse</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.address.properties.label}}</dd>
-                            </div>
-                            {{end}}
-                            {{if .ViewState.driver.Data.file_number}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Numéro de dossier (CAF / Pole emploi)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.file_number}}</dd>
-                            </div>
-                            {{end}}
-                        </dl>
-                    </div>
-                </div>
-            </section>
-
-            <section aria-labelledby="functionalities-title" x-data="{
-                    tab: 'documents',
-                    to(event) {
-                        this.tab = event.target.value
-                    }
-                }">
-                <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden">
-                    <div class="divide-y divide-gray-200">
-                        <div>
-                            <div class="sm:hidden">
-                                <label for="tabs" class="sr-only">Select a tab</label>
-                                <select id="tabs" name="tabs" @change="to"
-                                    class="block w-full pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
-                                    <!--<option value="notes">Notes</option>-->
-
-                                    <!-- <option value="journeys">Déplacements</option>
-
-                                    <option value="vehicles">Véhicules</option>
-
-                                    <option value="events">Dispositifs</option> -->
-
-                                    <option value="documents">Documents</option>
-                                </select>
-                            </div>
-                            <div class="hidden sm:block">
-                                <div class="border-b border-gray-200 pl-4">
-                                    <nav class="-mb-px flex space-x-8" aria-label="Tabs">
-                                        <!-- Current: "border-indigo-500 text-indigo-600", Default: "border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300" -->
-                                        <!--<a href="#" @click="tab = 'notes'"
-                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :class="tab == 'notes' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Notes </a>-->
-
-                                        <a href="#" @click="tab = 'documents'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Documents </a>
-
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div x-show="tab == 'documents'">{{template "driver_files" .}}</div>
-
-                    </div>
-                </div>
-            </section>
-        </div>
-
-        <section class="lg:col-start-3 lg:col-span-1">
-        {{template "driver_availabilities" .}}
-        </section>
-    </div>
-</main>
-{{end}}

web/layouts/support/support.html

@@ -1,17 +1,6 @@
 {{define "content"}}
 
-<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 space-y-6" x-data="{
+ <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 space-y-6">
-        comment: '',
-        init() {
-            let quill = new Quill(this.$refs.quill, { theme: 'snow', modules: { toolbar: [[{ 'header': [1, 2, 3, 4, 5, 6, false] }], ['bold', 'italic', 'underline'], ['link', 'image']] } })
- 
-            quill.root.innerHTML = this.comment
- 
-            quill.on('text-change', () => {
-                this.comment = quill.root.innerHTML
-            })
-        },
-    }">
     <h1 class="text-2xl font-semibold text-gray-900">Demande de support technique</h1>
     <div class="bg-white py-2 px-4 shadow sm:rounded-lg sm:px-10">
         <p class="text-sm text-gray-600 p-4">
@@ -23,9 +12,7 @@
             <div class="py-2 px-4 rounded-3xl bg-white dark:bg-gray-800">
                 <label class="sr-only">Votre message</label>
                 
-              <div x-ref="quill" class="block w-full resize-none border-0 border-b border-transparent p-0 pb-2 focus:border-co-blue focus:ring-0 sm:text-sm"></div>
+                <textarea name="comment" rows="4" class="block w-full resize-none border-0 border-b border-transparent p-0 pb-2 focus:border-co-blue focus:ring-0 sm:text-sm" placeholder="Votre message..."  required></textarea>
-              <input type="hidden" name="comment" x-model="comment" />
-              
             </div>
             <div class="flex justify-center items-center py-2 px-3 border-t dark:border-gray-600">
                 <button type="submit" value="send message" class="px-2 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">

web/layouts/vehicles/create-booking-diag.html

@@ -1,110 +0,0 @@
-{{define "content"}}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Ajouter un diagnostic</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            name: null,
-            namespace: 'parcoursmob_bookings',
-        },
-        rules: {
-            name: ['required'],
-            namespace: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations obligatoires
-                        pour créer un diagnostic dans PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="name" id="name" autocomplete="given-name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <input type="hidden" name="namespace" value="parcoursmob_bookings" />
-        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma JSON</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
-                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.json_schema" @blur="validateField('json_schema')"
-                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma UI</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
-                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
-                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div> -->
-        <div class="flex justify-end">
-            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/vehicles/bookings/{{.ViewState.booking}}">
-                <button type="button"
-                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-            </a>
-            <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le diagnostique</button>
-        </div>
-    </form>
-</div>
-{{end}}

web/layouts/vehicles/search.html

@@ -147,20 +147,6 @@
         <div class="lg:col-start-2 lg:col-span-2">
             {{if .ViewState.searched}}
             <div class="bg-white px-4 py-5 shadow sm:rounded-2xl sm:px-6">
-              <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Documents demandés</h2>
-              <table>
-                <tbody>
-                  {{range .ViewState.search.mandatory_documents}}
-                  <tr>
-                    <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">
-                      {{index $.ViewState.search.file_types_map .}}
-                    </td>
-                  </tr>
-                  {{end}}
-                </tbody>
-              </table>
-            </div>            
-            <div class="bg-white mt-8 px-4 py-5 shadow sm:rounded-2xl sm:px-6">
                 <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Véhicules disponibles</h2>
                 <div class="mt-8 flex flex-col">
                     <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">

web/layouts/vehicles_management/_partials/booking-diags.html

@@ -1,56 +0,0 @@
-{{define "booking_diags"}}
-{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
-{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
-<div class="bg-white shadow sm:rounded-lg">
-    <div class="px-4 py-5 flex items-center space-x-5 sm:px-6">
-        <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Diagnostics réalisés</h2>
-        <a href="{{.ViewState.booking.ID}}/create-diag">
-            <button type="button"
-            class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
-            {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-            Créer un diagnostic
-            </button>
-        </a>
-    </div>
-    <div class="border-t border-gray-200">
-        {{ $diagCount := len .ViewState.diags }}
-        <ul role="list" class="divide-y divide-gray-200 flex-1">
-            {{if eq $diagCount 0}}
-                <li class="py-2 px-4">
-                    <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun diagnostique effectué pour le moment.</p>
-                </li>
-            {{else}}
-                {{range .ViewState.diags}}
-                {{ $diags := .ID }}
-                {{if eq .Deleted false}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <a href="/app/diags/{{$diags}}" class="mt-1 text-sm text-gray-900">{{.Name}}</a>
-                            </div>
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                            </div>
-                            <a href="/app/diags/{{$diags}}" target="_blank">
-                                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le diagnostic</span></button>
-                            </a>
-                    </li>
-                {{end}}
-                {{if eq .Deleted true}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{.Name}}</p>
-                            </div>
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                            </div>
-                        <div class="flex-1 ml-3">
-                            <p class="mt-1 text-sm text-gray-900">Ce diagnostique a été retiré</p>
-                        </div>
-                    </li>
-                {{end}}
-                {{end}}
-            {{end}}
-        </ul>
-    </div>
-</div>
-{{end}}

web/layouts/vehicles_management/_partials/bookings-list.html

@@ -3,7 +3,7 @@
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
             <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow md:rounded-lg">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
                     <table class="min-w-full divide-y divide-gray-300">
                         <thead class="bg-gray-50">
                             <tr>
@@ -67,11 +67,8 @@
                                     {{if .Data.administrator_unavailability}}
                                     <div class="text-gray-900" ></div>
                                     {{else}}
-                                    <div class="text-gray-900" >
+                                    <div class="text-gray-900" ><img class="h-6 w-6 rounded-co"
-                                        <!--<img class="h-6 w-6 rounded-co" src="/app/beneficiaries/{{.Driver}}/picture" alt="">-->
+                                        src="/app/beneficiaries/{{.Driver}}/picture" alt=""></div>
-                                        {{ (index $.ViewState.drivers_map .Driver).Data.first_name }}
-                                        {{ (index $.ViewState.drivers_map .Driver).Data.last_name }}
-                                    </div>
                                     {{end}}
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">

web/layouts/vehicles_management/_partials/vehicle-diags.html

@@ -1,56 +0,0 @@
-{{define "vehicle_diags"}}
-{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
-{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
-<div class="bg-white shadow sm:rounded-lg">
-    <div class="px-4 py-5 flex items-center space-x-5 sm:px-6">
-        <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Diagnostics réalisés</h2>
-        <a href="{{.ViewState.vehicle.ID}}/create-diag">
-            <button type="button"
-            class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
-            {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-            Créer un diagnostic
-            </button>
-        </a>
-    </div>
-    <div class="border-t border-gray-200">
-        {{ $diagCount := len .ViewState.diags }}
-        <ul role="list" class="divide-y divide-gray-200 flex-1">
-            {{if eq $diagCount 0}}
-                <li class="py-2 px-4">
-                    <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun diagnostique effectué pour le moment.</p>
-                </li>
-            {{else}}
-                {{range .ViewState.diags}}
-                {{ $diags := .ID }}
-                {{if eq .Deleted false}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <a href="app/diags/{{$diags}}" class="mt-1 text-sm text-gray-900">{{.Name}}</a>
-                                <div class="flex-1 ml-3">
-                                    <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                                </div>
-                            </div>
-                            <a href="/app/diags/{{$diags}}" target="_blank">
-                                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le diagnostic</span></button>
-                            </a>
-                    </li>
-                {{end}}
-                {{if eq .Deleted true}}
-                    <li class="py-5 px-4 flex">
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{.Name}}</p>
-                            </div>
-                            <div class="flex-1 ml-3">
-                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
-                            </div>
-                        <div class="flex-1 ml-3">
-                            <p class="mt-1 text-sm text-gray-900">Ce diagnostique a été retiré</p>
-                        </div>
-                    </li>
-                {{end}}
-                {{end}}
-            {{end}}
-        </ul>
-    </div>
-</div>
-{{end}}

web/layouts/vehicles_management/_partials/vehicles-list.html

@@ -3,7 +3,7 @@
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
             <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow md:rounded-lg">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
                     <table class="min-w-full divide-y divide-gray-300">
                         <thead class="bg-gray-50">
                             <tr>

web/layouts/vehicles_management/booking-display.html

@@ -15,12 +15,12 @@
                 class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
                 Changer de véhicule
             </button>
-        <a href="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/delete">
+        <!-- <a href="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/delete">
                 <button type="button"
                     class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-red px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-red focus:ring-offset-2 sm:w-auto">
                     Annuler
                 </button>
-            </a>
+            </a> -->
 
             <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true" x-show="changeVehicle">
                 <div class="fixed inset-0 bg-gray-900 bg-opacity-30 transition-opacity"></div>
@@ -103,9 +103,6 @@
                     </div>
                 </div>
             </div>
-            <!--<div>
-                {{template "booking_diags" .}}
-            </div>-->
         </div>
         <div class="lg:col-start-2 lg:col-span-2">
             <div class="bg-white  shadow sm:rounded-2xl sm:px-6">
@@ -161,11 +158,6 @@
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
                                         {{.ViewState.vehicle.Data.licence_plate}}</dd>
                                 </div>
-                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
-                                    <dt class="text-sm font-medium text-gray-500">Kilométrage</dt>
-                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                                        {{.ViewState.vehicle.Data.kilometers}} km</dd>
-                                </div>
                                 <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Type</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">

web/layouts/vehicles_management/create-booking-diag.html

@@ -1,116 +0,0 @@
-{{define "content"}}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Ajouter un diagnostic</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            name: null,
-            namespace: 'parcoursmob_bookings',
-            json_schema: null,
-            ui_schema: null,
-        },
-        rules: {
-            name: ['required']
-            namespace: ['required']
-            json_schema: ['required']
-            ui_schema: ['required']
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {valid: null},
-                json_schema: {valid: null},
-                ui_schema: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations obligatoires
-                        pour créer un diagnostic dans PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="name" id="name" autocomplete="given-name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <input type="hidden" name="namespace" value="parcoursmob_bookings" />
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma JSON</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
-                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.json_schema" @blur="validateField('json_schema')"
-                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma UI</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
-                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
-                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="flex justify-end">
-            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/vehicles-management/bookings/{{.ViewState.booking}}">
-                <button type="button"
-                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-            </a>
-            <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le diagnostique</button>
-        </div>
-    </form>
-</div>
-{{end}}

web/layouts/vehicles_management/create-vehicle-diag.html

@@ -1,110 +0,0 @@
-{{define "content"}}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Ajouter un diagnostic</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-            name: null,
-            namespace: 'parcoursmob_vehicles',
-        },
-        rules: {
-            name: ['required'],
-            namespace: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations obligatoires
-                        pour créer un diagnostic dans PARCOURSMOB</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="name" id="name" autocomplete="given-name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <input type="hidden" name="namespace" value="parcoursmob_vehicles" />
-        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma JSON</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
-                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.json_schema" @blur="validateField('json_schema')"
-                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma UI</h3>
-                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
-                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
-                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div> -->
-        <div class="flex justify-end">
-            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle}}">
-                <button type="button"
-                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-            </a>
-            <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le diagnostique</button>
-        </div>
-    </form>
-</div>
-{{end}}

web/layouts/vehicles_management/fleet-add.html

@@ -10,13 +10,11 @@
             licence_plate: null,
             name: null,
             type: null,
-            informations: '',
         },
         rules: {
             licence_plate: ['required'], // 'regexMatch:^[A-Z]{1,2}-[0-9]{1,3}-[A-Z]{1,2}$'
             name: ['required'],
             type: ['required'],
-            informations: ['optional']
         },
         formValidation: {
             valid: false,
@@ -24,19 +22,9 @@
                 name: {valid: null},
                 licence_plate: {valid: null},
                 type: {valid: null},
-                informations: {valid: null},
             }
         },
         isFormValid: true,
-        init() {
-            let quill = new Quill(this.$refs.quill, { theme: 'snow', modules: { toolbar: [[{ 'header': [1, 2, 3, 4, 5, 6, false] }], ['bold', 'italic', 'underline'], ['link', 'image']] } })
- 
-            quill.root.innerHTML = this.fields.informations
- 
-            quill.on('text-change', () => {
-                this.fields.informations = quill.root.innerHTML
-            })
-        },
         validate() {
             this.formValidation = Iodine.assert(this.fields, this.rules)
         },
@@ -106,13 +94,6 @@
                                 @blur="fields.licence_plate = fields.licence_plate.toUpperCase(); validateField('licence_plate')"
                                 :class="formValidation.fields.licence_plate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                         </div>
-                        <!--<div class="col-span-3">
-                            <label for="kilometers"
-                                class="block text-sm font-medium text-gray-700">Kilométrage</label>
-                            <input type="text" name="kilometers" id="kilometers" placeholder="1 km"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.kilometers">
-                        </div>-->
                     </div>
                 </div>
             </div>
@@ -130,8 +111,8 @@
                     <div class="mt-5">
                         <label for="informations" class="block text-sm font-medium text-gray-700">Informations pratiques</label>
                         <div class="mt-1">
-                            <div x-ref="quill" class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-b-2xl"></div>
+                            <textarea rows="4" name="informations" id="informations"
-                            <input type="hidden" name="informations" x-model="fields.informations" />
+                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
                         </div>
                     </div>
                 </div>

web/layouts/vehicles_management/fleet-display.html

@@ -16,8 +16,8 @@
             <div class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
                 <button type="button" @click="dialog = !dialog"
                     class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Retirer de la flotte</button>
-                <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle.ID}}/update" class="inline-flex"><button type="button"
+                <!-- <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle.ID}}/update" class="inline-flex"><button type="button"
-                        class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>
+                        class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a> -->
             </div>
         </div>
         <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
@@ -54,12 +54,6 @@
                                     <dd class="mt-1 text-sm text-gray-900">{{.ViewState.vehicle.Data.licence_plate}}</dd>
                                 </div>
                                 {{end}}
-                                {{if .ViewState.vehicle.Data.kilometers}}
-                                <div class="sm:col-span-1">
-                                    <dt class="text-sm font-medium text-gray-500">Kilométrage</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">{{.ViewState.vehicle.Data.kilometers}} km</dd>
-                                </div>
-                                {{end}}
                                 {{if .ViewState.vehicle.Data.address}}
                                 <div class="sm:col-span-1">
                                     <dt class="text-sm font-medium text-gray-500">Lieu</dt>
@@ -69,7 +63,7 @@
                                 {{if .ViewState.vehicle.Data.informations}}
                                 <div class="sm:col-span-2">
                                     <dt class="text-sm font-medium text-gray-500">Informations pratiques pour le bénéficiaire</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">{{unescapeHTML .ViewState.vehicle.Data.informations}}</dd>
+                                    <dd class="mt-1 text-sm text-gray-900">{{.ViewState.vehicle.Data.informations}}</dd>
                                 </div>
                                 {{end}}
 
@@ -134,10 +128,8 @@
                                                     {{else}}
                                                     <div class="text-gray-900" >
                                                         <a href="/app/beneficiaries/{{.Driver}}">
-                                                            <!--<img class="h-6 w-6 rounded-co"
+                                                            <img class="h-6 w-6 rounded-co"
-                                                            src="/app/beneficiaries/{{.Driver}}/picture" alt="">-->
+                                                            src="/app/beneficiaries/{{.Driver}}/picture" alt="">
-                                                            {{(index $.ViewState.beneficiaries .Driver).Data.first_name}}
-                                                            {{(index $.ViewState.beneficiaries .Driver).Data.last_name}}
                                                         </a>
                                                     </div>
                                                     {{end}}

web/layouts/vehicles_management/fleet-update.html

@@ -9,8 +9,6 @@
         fields: {
             licence_plate: '{{ .ViewState.vehicle.Data.licence_plate }}',
             name: '{{ .ViewState.vehicle.Data.name }}',
-            kilometers: '{{ .ViewState.vehicle.Data.kilometers }}',
-            informations: '{{ .ViewState.vahicle.Data.informations}}',
         },
         rules: {
             licence_plate: ['required', 'regexMatch:^[A-Z]{1,2}-[0-9]{1,3}-[A-Z]{1,2}$'],
@@ -24,15 +22,6 @@
             }
         },
         isFormValid: true,
-        init() {
-            let quill = new Quill(this.$refs.quill, { theme: 'snow', modules: { toolbar: [[{ 'header': [1, 2, 3, 4, 5, 6, false] }], ['bold', 'italic', 'underline'], ['link', 'image']] } })
- 
-            quill.root.innerHTML = this.fields.informations
- 
-            quill.on('text-change', () => {
-                this.fields.informations = quill.root.innerHTML
-            })
-        },
         validate() {
             this.formValidation = Iodine.assert(this.fields, this.rules)
         },
@@ -46,12 +35,7 @@
                 event.preventDefault()
             }
             return this.formValidation.valid
-        },
-
-        displayAutomatic(type) {
-            return type == 'Voiture'
         }
-
     }">
     <form class="space-y-6" method="POST" @submit="submit">
         <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
@@ -71,30 +55,7 @@
                                 :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                         </div>
                         <div class="col-span-3">
-                            <div class="col-span-3">
+                            {{template "vehicle_type_select" .}}
-                                <label for="type" class="block text-sm font-medium text-gray-700">Type de véhicule</label>
-                                <select id="type" name="type" 
-                                    x-model="fields.type" @blur="validateField('type')"
-                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm rounded-2xl"
-                                    :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                                    <option value="" selected></option>
-                                    {{range .ViewState.vehicle_types}}
-                                    <option value="{{.}}">{{.}}</option>
-                                    {{end}}
-                                </select>
-                                <div class="m-4" x-show="displayAutomatic(fields.type)">
-                                    <legend class="sr-only">Automatique</legend>
-                                    <div class="relative flex items-start">
-                                        <div class="flex h-5 items-center">
-                                        <input id="automatic" aria-describedby="automatic-description" name="automatic" type="checkbox" class="h-4 w-4 rounded border-gray-300 text-co-blue focus:ring-co-blue">
-                                        </div>
-                                        <div class="ml-3 text-sm">
-                                        <label for="automatic" class="font-medium text-gray-700">Automatique</label>
-                                        <p id="automatic-description" class="text-gray-500">Ce véhicule a une boite automatique.</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                         <div class="col-span-3">
                             <label for="licence_plate"
@@ -105,15 +66,6 @@
                                 @blur="fields.licence_plate = fields.licence_plate.toUpperCase(); validateField('licence_plate')"
                                 :class="formValidation.fields.licence_plate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                         </div>
-                        <!--<div class="col-span-3">
-                            <label for="kilometers"
-                                class="block text-sm font-medium text-gray-700">Kilométrage</label>
-                            <input type="text" name="kilometers" id="kilometers" placeholder="1200 km"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.kilometers"
-                                @blur="fields.kilometers; validateField('kilometers')"
-                                :class="formValidation.fields.kilometers.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>-->
                     </div>
                 </div>
             </div>
@@ -131,8 +83,8 @@
                     <div class="mt-5">
                         <label for="informations" class="block text-sm font-medium text-gray-700">Informations pratiques pour le bénéficiaire</label>
                         <div class="mt-1">
-                            <div x-ref="quill" class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-b-2xl"></div>
+                            <textarea rows="4" name="informations" id="informations"
-                            <input type="hidden" name="informations" x-model="fields.informations" />
+                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
                         </div>
                     </div>
                 </div>

web/node_modules/.bin/detect-libc

@@ -1 +0,0 @@
-../detect-libc/bin/detect-libc.js

web/node_modules/.bin/jiti

@@ -1 +0,0 @@
-../jiti/lib/jiti-cli.mjs

web/node_modules/.bin/tailwindcss

@@ -1 +0,0 @@
-../@tailwindcss/cli/dist/index.mjs

web/node_modules/.package-lock.json

@@ -1,345 +0,0 @@
-{
-  "name": "web",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "detect-libc": "^1.0.3",
-        "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@tailwindcss/cli": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/cli/-/cli-4.0.9.tgz",
-      "integrity": "sha512-obJvIxu4SCA3PLQYDB7tz9Biv3LFB6+YM/DXNNqwjEMRBNr7Y7LLBk3Cl6xwM+/TxJlA2rEV/t+XwkbldcxeXA==",
-      "license": "MIT",
-      "dependencies": {
-        "@parcel/watcher": "^2.5.1",
-        "@tailwindcss/node": "4.0.9",
-        "@tailwindcss/oxide": "4.0.9",
-        "enhanced-resolve": "^5.18.1",
-        "lightningcss": "^1.29.1",
-        "mri": "^1.2.0",
-        "picocolors": "^1.1.1",
-        "tailwindcss": "4.0.9"
-      },
-      "bin": {
-        "tailwindcss": "dist/index.mjs"
-      }
-    },
-    "node_modules/@tailwindcss/node": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.0.9.tgz",
-      "integrity": "sha512-tOJvdI7XfJbARYhxX+0RArAhmuDcczTC46DGCEziqxzzbIaPnfYaIyRT31n4u8lROrsO7Q6u/K9bmQHL2uL1bQ==",
-      "license": "MIT",
-      "dependencies": {
-        "enhanced-resolve": "^5.18.1",
-        "jiti": "^2.4.2",
-        "tailwindcss": "4.0.9"
-      }
-    },
-    "node_modules/@tailwindcss/oxide": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.0.9.tgz",
-      "integrity": "sha512-eLizHmXFqHswJONwfqi/WZjtmWZpIalpvMlNhTM99/bkHtUs6IqgI1XQ0/W5eO2HiRQcIlXUogI2ycvKhVLNcA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      },
-      "optionalDependencies": {
-        "@tailwindcss/oxide-android-arm64": "4.0.9",
-        "@tailwindcss/oxide-darwin-arm64": "4.0.9",
-        "@tailwindcss/oxide-darwin-x64": "4.0.9",
-        "@tailwindcss/oxide-freebsd-x64": "4.0.9",
-        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.0.9",
-        "@tailwindcss/oxide-linux-arm64-gnu": "4.0.9",
-        "@tailwindcss/oxide-linux-arm64-musl": "4.0.9",
-        "@tailwindcss/oxide-linux-x64-gnu": "4.0.9",
-        "@tailwindcss/oxide-linux-x64-musl": "4.0.9",
-        "@tailwindcss/oxide-win32-arm64-msvc": "4.0.9",
-        "@tailwindcss/oxide-win32-x64-msvc": "4.0.9"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.0.9.tgz",
-      "integrity": "sha512-v0D8WqI/c3WpWH1kq/HP0J899ATLdGZmENa2/emmNjubT0sWtEke9W9+wXeEoACuGAhF9i3PO5MeyditpDCiWQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "license": "MIT",
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "license": "Apache-2.0",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "license": "MIT",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "license": "ISC"
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/jiti": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
-      "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
-      "license": "MIT",
-      "bin": {
-        "jiti": "lib/jiti-cli.mjs"
-      }
-    },
-    "node_modules/lightningcss": {
-      "version": "1.29.1",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.29.1.tgz",
-      "integrity": "sha512-FmGoeD4S05ewj+AkhTY+D+myDvXI6eL27FjHIjoyUkO/uw7WZD1fBVs0QxeYWa7E17CUHJaYX/RUGISCtcrG4Q==",
-      "license": "MPL-2.0",
-      "dependencies": {
-        "detect-libc": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "lightningcss-darwin-arm64": "1.29.1",
-        "lightningcss-darwin-x64": "1.29.1",
-        "lightningcss-freebsd-x64": "1.29.1",
-        "lightningcss-linux-arm-gnueabihf": "1.29.1",
-        "lightningcss-linux-arm64-gnu": "1.29.1",
-        "lightningcss-linux-arm64-musl": "1.29.1",
-        "lightningcss-linux-x64-gnu": "1.29.1",
-        "lightningcss-linux-x64-musl": "1.29.1",
-        "lightningcss-win32-arm64-msvc": "1.29.1",
-        "lightningcss-win32-x64-msvc": "1.29.1"
-      }
-    },
-    "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.29.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.29.1.tgz",
-      "integrity": "sha512-u1S+xdODy/eEtjADqirA774y3jLcm8RPtYztwReEXoZKdzgsHYPl0s5V52Tst+GKzqjebkULT86XMSxejzfISw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/mri": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
-      "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/node-addon-api": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "license": "MIT"
-    },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "license": "ISC"
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/tailwindcss": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.0.9.tgz",
-      "integrity": "sha512-12laZu+fv1ONDRoNR9ipTOpUD7RN9essRVkX36sjxuRUInpN7hIiHN4lBd/SIFjbISvnXzp8h/hXzmU8SQQYhw==",
-      "license": "MIT"
-    },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    }
-  }
-}

web/node_modules/@parcel/watcher-linux-x64-glibc/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017-present Devon Govett
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

web/node_modules/@parcel/watcher-linux-x64-glibc/README.md

@@ -1 +0,0 @@
-This is the linux-x64-glibc build of @parcel/watcher. See https://github.com/parcel-bundler/watcher for details.

web/node_modules/@parcel/watcher-linux-x64-glibc/package.json

@@ -1,33 +0,0 @@
-{
-  "name": "@parcel/watcher-linux-x64-glibc",
-  "version": "2.5.1",
-  "main": "watcher.node",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/parcel-bundler/watcher.git"
-  },
-  "description": "A native C++ Node module for querying and subscribing to filesystem events. Used by Parcel 2.",
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  },
-  "funding": {
-    "type": "opencollective",
-    "url": "https://opencollective.com/parcel"
-  },
-  "files": [
-    "watcher.node"
-  ],
-  "engines": {
-    "node": ">= 10.0.0"
-  },
-  "os": [
-    "linux"
-  ],
-  "cpu": [
-    "x64"
-  ],
-  "libc": [
-    "glibc"
-  ]
-}

web/node_modules/@parcel/watcher/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017-present Devon Govett
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

web/node_modules/@parcel/watcher/README.md

@@ -1,135 +0,0 @@
-# @parcel/watcher
-
-A native C++ Node module for querying and subscribing to filesystem events. Used by [Parcel 2](https://github.com/parcel-bundler/parcel).
-
-## Features
-
-- **Watch** - subscribe to realtime recursive directory change notifications when files or directories are created, updated, or deleted.
-- **Query** - performantly query for historical change events in a directory, even when your program is not running.
-- **Native** - implemented in C++ for performance and low-level integration with the operating system.
-- **Cross platform** - includes backends for macOS, Linux, Windows, FreeBSD, and Watchman.
-- **Performant** - events are throttled in C++ so the JavaScript thread is not overwhelmed during large filesystem changes (e.g. `git checkout` or `npm install`).
-- **Scalable** - tens of thousands of files can be watched or queried at once with good performance.
-
-## Example
-
-```javascript
-const watcher = require('@parcel/watcher');
-const path = require('path');
-
-// Subscribe to events
-let subscription = await watcher.subscribe(process.cwd(), (err, events) => {
-  console.log(events);
-});
-
-// later on...
-await subscription.unsubscribe();
-
-// Get events since some saved snapshot in the past
-let snapshotPath = path.join(process.cwd(), 'snapshot.txt');
-let events = await watcher.getEventsSince(process.cwd(), snapshotPath);
-
-// Save a snapshot for later
-await watcher.writeSnapshot(process.cwd(), snapshotPath);
-```
-
-## Watching
-
-`@parcel/watcher` supports subscribing to realtime notifications of changes in a directory. It works recursively, so changes in sub-directories will also be emitted.
-
-Events are throttled and coalesced for performance during large changes like `git checkout` or `npm install`, and a single notification will be emitted with all of the events at the end.
-
-Only one notification will be emitted per file. For example, if a file was both created and updated since the last event, you'll get only a `create` event. If a file is both created and deleted, you will not be notifed of that file. Renames cause two events: a `delete` for the old name, and a `create` for the new name.
-
-```javascript
-let subscription = await watcher.subscribe(process.cwd(), (err, events) => {
-  console.log(events);
-});
-```
-
-Events have two properties:
-
-- `type` - the event type: `create`, `update`, or `delete`.
-- `path` - the absolute path to the file or directory.
-
-To unsubscribe from change notifications, call the `unsubscribe` method on the returned subscription object.
-
-```javascript
-await subscription.unsubscribe();
-```
-
-`@parcel/watcher` has the following watcher backends, listed in priority order:
-
-- [FSEvents](https://developer.apple.com/documentation/coreservices/file_system_events) on macOS
-- [Watchman](https://facebook.github.io/watchman/) if installed
-- [inotify](http://man7.org/linux/man-pages/man7/inotify.7.html) on Linux
-- [ReadDirectoryChangesW](https://msdn.microsoft.com/en-us/library/windows/desktop/aa365465%28v%3Dvs.85%29.aspx) on Windows
-- [kqueue](https://man.freebsd.org/cgi/man.cgi?kqueue) on FreeBSD, or as an alternative to FSEvents on macOS
-
-You can specify the exact backend you wish to use by passing the `backend` option. If that backend is not available on the current platform, the default backend will be used instead. See below for the list of backend names that can be passed to the options.
-
-## Querying
-
-`@parcel/watcher` also supports querying for historical changes made in a directory, even when your program is not running. This makes it easy to invalidate a cache and re-build only the files that have changed, for example. It can be **significantly** faster than traversing the entire filesystem to determine what files changed, depending on the platform.
-
-In order to query for historical changes, you first need a previous snapshot to compare to. This can be saved to a file with the `writeSnapshot` function, e.g. just before your program exits.
-
-```javascript
-await watcher.writeSnapshot(dirPath, snapshotPath);
-```
-
-When your program starts up, you can query for changes that have occurred since that snapshot using the `getEventsSince` function.
-
-```javascript
-let events = await watcher.getEventsSince(dirPath, snapshotPath);
-```
-
-The events returned are exactly the same as the events that would be passed to the `subscribe` callback (see above).
-
-`@parcel/watcher` has the following watcher backends, listed in priority order:
-
-- [FSEvents](https://developer.apple.com/documentation/coreservices/file_system_events) on macOS
-- [Watchman](https://facebook.github.io/watchman/) if installed
-- [fts](http://man7.org/linux/man-pages/man3/fts.3.html) (brute force) on Linux and FreeBSD
-- [FindFirstFile](https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-findfirstfilea) (brute force) on Windows
-
-The FSEvents (macOS) and Watchman backends are significantly more performant than the brute force backends used by default on Linux and Windows, for example returning results in miliseconds instead of seconds for large directory trees. This is because a background daemon monitoring filesystem changes on those platforms allows us to query cached data rather than traversing the filesystem manually (brute force).
-
-macOS has good performance with FSEvents by default. For the best performance on other platforms, install [Watchman](https://facebook.github.io/watchman/) and it will be used by `@parcel/watcher` automatically.
-
-You can specify the exact backend you wish to use by passing the `backend` option. If that backend is not available on the current platform, the default backend will be used instead. See below for the list of backend names that can be passed to the options.
-
-## Options
-
-All of the APIs in `@parcel/watcher` support the following options, which are passed as an object as the last function argument.
-
-- `ignore` - an array of paths or glob patterns to ignore. uses [`is-glob`](https://github.com/micromatch/is-glob) to distinguish paths from globs. glob patterns are parsed with [`micromatch`](https://github.com/micromatch/micromatch) (see [features](https://github.com/micromatch/micromatch#matching-features)).
-  - paths can be relative or absolute and can either be files or directories. No events will be emitted about these files or directories or their children.
-  - glob patterns match on relative paths from the root that is watched. No events will be emitted for matching paths.
-- `backend` - the name of an explicitly chosen backend to use. Allowed options are `"fs-events"`, `"watchman"`, `"inotify"`, `"kqueue"`, `"windows"`, or `"brute-force"` (only for querying). If the specified backend is not available on the current platform, the default backend will be used instead.
-
-## WASM
-
-The `@parcel/watcher-wasm` package can be used in place of `@parcel/watcher` on unsupported platforms. It relies on the Node `fs` module, so in non-Node environments such as browsers, an `fs` polyfill will be needed.
-
-**Note**: the WASM implementation is significantly less efficient than the native implementations because it must crawl the file system to watch each directory individually. Use the native `@parcel/watcher` package wherever possible.
-
-```js
-import {subscribe} from '@parcel/watcher-wasm';
-
-// Use the module as documented above.
-subscribe(/* ... */);
-```
-
-## Who is using this?
-
-- [Parcel 2](https://parceljs.org/)
-- [VSCode](https://code.visualstudio.com/updates/v1_62#_file-watching-changes)
-- [Tailwind CSS Intellisense](https://github.com/tailwindlabs/tailwindcss-intellisense)
-- [Gatsby Cloud](https://twitter.com/chatsidhartha/status/1435647412828196867)
-- [Nx](https://nx.dev)
-- [Nuxt](https://nuxt.com)
-
-## License
-
-MIT

web/node_modules/@parcel/watcher/binding.gyp

@@ -1,93 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "watcher",
-      "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
-      "sources": [ "src/binding.cc", "src/Watcher.cc", "src/Backend.cc", "src/DirTree.cc", "src/Glob.cc", "src/Debounce.cc" ],
-      "include_dirs" : ["<!(node -p \"require('node-addon-api').include_dir\")"],
-      'cflags!': [ '-fno-exceptions', '-std=c++17' ],
-      'cflags_cc!': [ '-fno-exceptions', '-std=c++17' ],
-      "conditions": [
-        ['OS=="mac"', {
-          "sources": [
-            "src/watchman/BSER.cc",
-            "src/watchman/WatchmanBackend.cc",
-            "src/shared/BruteForceBackend.cc",
-            "src/unix/fts.cc",
-            "src/macos/FSEventsBackend.cc",
-            "src/kqueue/KqueueBackend.cc"
-          ],
-          "link_settings": {
-            "libraries": ["CoreServices.framework"]
-          },
-          "defines": [
-            "WATCHMAN",
-            "BRUTE_FORCE",
-            "FS_EVENTS",
-            "KQUEUE"
-          ],
-          "xcode_settings": {
-            "GCC_ENABLE_CPP_EXCEPTIONS": "YES"
-          }
-        }],
-        ['OS=="mac" and target_arch=="arm64"', {
-          "xcode_settings": {
-            "ARCHS": ["arm64"]
-          }
-        }],
-        ['OS=="linux" or OS=="android"', {
-          "sources": [
-            "src/watchman/BSER.cc",
-            "src/watchman/WatchmanBackend.cc",
-            "src/shared/BruteForceBackend.cc",
-            "src/linux/InotifyBackend.cc",
-            "src/unix/legacy.cc"
-          ],
-          "defines": [
-            "WATCHMAN",
-            "INOTIFY",
-            "BRUTE_FORCE"
-          ]
-        }],
-        ['OS=="win"', {
-          "sources": [
-            "src/watchman/BSER.cc",
-            "src/watchman/WatchmanBackend.cc",
-            "src/shared/BruteForceBackend.cc",
-            "src/windows/WindowsBackend.cc",
-            "src/windows/win_utils.cc"
-          ],
-          "defines": [
-            "WATCHMAN",
-            "WINDOWS",
-            "BRUTE_FORCE"
-          ],
-          "msvs_settings": {
-            "VCCLCompilerTool": {
-              "ExceptionHandling": 1,  # /EHsc
-              "AdditionalOptions": ['-std:c++17']
-            }
-          }
-        }],
-        ['OS=="freebsd"', {
-          "sources": [
-            "src/watchman/BSER.cc",
-            "src/watchman/WatchmanBackend.cc",
-            "src/shared/BruteForceBackend.cc",
-            "src/unix/fts.cc",
-            "src/kqueue/KqueueBackend.cc"
-          ],
-          "defines": [
-            "WATCHMAN",
-            "BRUTE_FORCE",
-            "KQUEUE"
-          ]
-        }]
-      ]
-    }
-  ],
-  "variables": {
-    "openssl_fips": "",
-    "node_use_dtrace": "false"
-  }
-}

web/node_modules/@parcel/watcher/index.d.ts

@@ -1,49 +0,0 @@
-declare type FilePath = string;
-declare type GlobPattern = string;
-
-declare namespace ParcelWatcher {
-  export type BackendType = 
-    | 'fs-events'
-    | 'watchman'
-    | 'inotify'
-    | 'windows'
-    | 'brute-force';
-  export type EventType = 'create' | 'update' | 'delete';
-  export interface Options {
-    ignore?: (FilePath|GlobPattern)[];
-    backend?: BackendType;
-  }
-  export type SubscribeCallback = (
-    err: Error | null,
-    events: Event[]
-  ) => unknown;
-  export interface AsyncSubscription {
-    unsubscribe(): Promise<void>;
-  }
-  export interface Event {
-    path: FilePath;
-    type: EventType;
-  }
-  export function getEventsSince(
-    dir: FilePath,
-    snapshot: FilePath,
-    opts?: Options
-  ): Promise<Event[]>;
-  export function subscribe(
-    dir: FilePath,
-    fn: SubscribeCallback,
-    opts?: Options
-  ): Promise<AsyncSubscription>;
-  export function unsubscribe(
-    dir: FilePath,
-    fn: SubscribeCallback,
-    opts?: Options
-  ): Promise<void>;
-  export function writeSnapshot(
-    dir: FilePath,
-    snapshot: FilePath,
-    opts?: Options
-  ): Promise<FilePath>;
-}
-
-export = ParcelWatcher;

web/node_modules/@parcel/watcher/index.js

@@ -1,41 +0,0 @@
-const {createWrapper} = require('./wrapper');
-
-let name = `@parcel/watcher-${process.platform}-${process.arch}`;
-if (process.platform === 'linux') {
-  const { MUSL, family } = require('detect-libc');
-  if (family === MUSL) {
-    name += '-musl';
-  } else {
-    name += '-glibc';
-  }
-}
-
-let binding;
-try {
-  binding = require(name);
-} catch (err) {
-  handleError(err);
-  try {
-    binding = require('./build/Release/watcher.node');
-  } catch (err) {
-    handleError(err);
-    try {
-      binding = require('./build/Debug/watcher.node');
-    } catch (err) {
-      handleError(err);
-      throw new Error(`No prebuild or local build of @parcel/watcher found. Tried ${name}. Please ensure it is installed (don't use --no-optional when installing with npm). Otherwise it is possible we don't support your platform yet. If this is the case, please report an issue to https://github.com/parcel-bundler/watcher.`);
-    }
-  }
-}
-
-function handleError(err) {
-  if (err?.code !== 'MODULE_NOT_FOUND') {
-    throw err;
-  }
-}
-
-const wrapper = createWrapper(binding);
-exports.writeSnapshot = wrapper.writeSnapshot;
-exports.getEventsSince = wrapper.getEventsSince;
-exports.subscribe = wrapper.subscribe;
-exports.unsubscribe = wrapper.unsubscribe;

web/node_modules/@parcel/watcher/index.js.flow

@@ -1,48 +0,0 @@
-// @flow
-declare type FilePath = string;
-declare type GlobPattern = string;
-
-export type BackendType = 
-  | 'fs-events'
-  | 'watchman'
-  | 'inotify'
-  | 'windows'
-  | 'brute-force';
-export type EventType = 'create' | 'update' | 'delete';
-export interface Options {
-  ignore?: Array<FilePath | GlobPattern>,
-  backend?: BackendType
-}
-export type SubscribeCallback = (
-  err: ?Error,
-  events: Array<Event>
-) => mixed;
-export interface AsyncSubscription {
-  unsubscribe(): Promise<void>
-}
-export interface Event {
-  path: FilePath,
-  type: EventType
-}
-declare module.exports: {
-  getEventsSince(
-    dir: FilePath,
-    snapshot: FilePath,
-    opts?: Options
-  ): Promise<Array<Event>>,
-  subscribe(
-    dir: FilePath,
-    fn: SubscribeCallback,
-    opts?: Options
-  ): Promise<AsyncSubscription>,
-  unsubscribe(
-    dir: FilePath,
-    fn: SubscribeCallback,
-    opts?: Options
-  ): Promise<void>,
-  writeSnapshot(
-    dir: FilePath,
-    snapshot: FilePath,
-    opts?: Options
-  ): Promise<FilePath>
-}

web/node_modules/@parcel/watcher/package.json

@@ -1,88 +0,0 @@
-{
-  "name": "@parcel/watcher",
-  "version": "2.5.1",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/parcel-bundler/watcher.git"
-  },
-  "description": "A native C++ Node module for querying and subscribing to filesystem events. Used by Parcel 2.",
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  },
-  "funding": {
-    "type": "opencollective",
-    "url": "https://opencollective.com/parcel"
-  },
-  "files": [
-    "index.js",
-    "index.js.flow",
-    "index.d.ts",
-    "wrapper.js",
-    "package.json",
-    "README.md",
-    "LICENSE",
-    "src",
-    "scripts/build-from-source.js",
-    "binding.gyp"
-  ],
-  "scripts": {
-    "prebuild": "prebuildify --napi --strip --tag-libc",
-    "format": "prettier --write \"./**/*.{js,json,md}\"",
-    "build": "node-gyp rebuild",
-    "install": "node scripts/build-from-source.js",
-    "test": "mocha"
-  },
-  "engines": {
-    "node": ">= 10.0.0"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{js,json,md}": [
-      "prettier --write",
-      "git add"
-    ]
-  },
-  "dependencies": {
-    "detect-libc": "^1.0.3",
-    "is-glob": "^4.0.3",
-    "micromatch": "^4.0.5",
-    "node-addon-api": "^7.0.0"
-  },
-  "devDependencies": {
-    "esbuild": "^0.19.8",
-    "fs-extra": "^10.0.0",
-    "husky": "^7.0.2",
-    "lint-staged": "^11.1.2",
-    "mocha": "^9.1.1",
-    "napi-wasm": "^1.1.0",
-    "prebuildify": "^6.0.1",
-    "prettier": "^2.3.2"
-  },
-  "binary": {
-    "napi_versions": [
-      3
-    ]
-  },
-  "optionalDependencies": {
-    "@parcel/watcher-darwin-x64": "2.5.1",
-    "@parcel/watcher-darwin-arm64": "2.5.1",
-    "@parcel/watcher-win32-x64": "2.5.1",
-    "@parcel/watcher-win32-arm64": "2.5.1",
-    "@parcel/watcher-win32-ia32": "2.5.1",
-    "@parcel/watcher-linux-x64-glibc": "2.5.1",
-    "@parcel/watcher-linux-x64-musl": "2.5.1",
-    "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-    "@parcel/watcher-linux-arm64-musl": "2.5.1",
-    "@parcel/watcher-linux-arm-glibc": "2.5.1",
-    "@parcel/watcher-linux-arm-musl": "2.5.1",
-    "@parcel/watcher-android-arm64": "2.5.1",
-    "@parcel/watcher-freebsd-x64": "2.5.1"
-  }
-}

web/node_modules/@parcel/watcher/scripts/build-from-source.js

@@ -1,13 +0,0 @@
-#!/usr/bin/env node
-
-const {spawn} = require('child_process');
-
-if (process.env.npm_config_build_from_source === 'true') {
-  build();
-}
-
-function build() {
-  spawn('node-gyp', ['rebuild'], { stdio: 'inherit', shell: true }).on('exit', function (code) {
-    process.exit(code);
-  });
-}

web/node_modules/@parcel/watcher/src/Backend.cc

@@ -1,182 +0,0 @@
-#ifdef FS_EVENTS
-#include "macos/FSEventsBackend.hh"
-#endif
-#ifdef WATCHMAN
-#include "watchman/WatchmanBackend.hh"
-#endif
-#ifdef WINDOWS
-#include "windows/WindowsBackend.hh"
-#endif
-#ifdef INOTIFY
-#include "linux/InotifyBackend.hh"
-#endif
-#ifdef KQUEUE
-#include "kqueue/KqueueBackend.hh"
-#endif
-#ifdef __wasm32__
-#include "wasm/WasmBackend.hh"
-#endif
-#include "shared/BruteForceBackend.hh"
-
-#include "Backend.hh"
-#include <unordered_map>
-
-static std::unordered_map<std::string, std::shared_ptr<Backend>> sharedBackends;
-
-std::shared_ptr<Backend> getBackend(std::string backend) {
-  // Use FSEvents on macOS by default.
-  // Use watchman by default if available on other platforms.
-  // Fall back to brute force.
-  #ifdef FS_EVENTS
-    if (backend == "fs-events" || backend == "default") {
-      return std::make_shared<FSEventsBackend>();
-    }
-  #endif
-  #ifdef WATCHMAN
-    if ((backend == "watchman" || backend == "default") && WatchmanBackend::checkAvailable()) {
-      return std::make_shared<WatchmanBackend>();
-    }
-  #endif
-  #ifdef WINDOWS
-    if (backend == "windows" || backend == "default") {
-      return std::make_shared<WindowsBackend>();
-    }
-  #endif
-  #ifdef INOTIFY
-    if (backend == "inotify" || backend == "default") {
-      return std::make_shared<InotifyBackend>();
-    }
-  #endif
-  #ifdef KQUEUE
-    if (backend == "kqueue" || backend == "default") {
-      return std::make_shared<KqueueBackend>();
-    }
-  #endif
-  #ifdef __wasm32__
-    if (backend == "wasm" || backend == "default") {
-      return std::make_shared<WasmBackend>();
-    }
-  #endif
-  if (backend == "brute-force" || backend == "default") {
-    return std::make_shared<BruteForceBackend>();
-  }
-
-  return nullptr;
-}
-
-std::shared_ptr<Backend> Backend::getShared(std::string backend) {
-  auto found = sharedBackends.find(backend);
-  if (found != sharedBackends.end()) {
-    return found->second;
-  }
-
-  auto result = getBackend(backend);
-  if (!result) {
-    return getShared("default");
-  }
-
-  result->run();
-  sharedBackends.emplace(backend, result);
-  return result;
-}
-
-void removeShared(Backend *backend) {
-  for (auto it = sharedBackends.begin(); it != sharedBackends.end(); it++) {
-    if (it->second.get() == backend) {
-      sharedBackends.erase(it);
-      break;
-    }
-  }
-
-  // Free up memory.
-  if (sharedBackends.size() == 0) {
-    sharedBackends.rehash(0);
-  }
-}
-
-void Backend::run() {
-  #ifndef __wasm32__
-    mThread = std::thread([this] () {
-      try {
-        start();
-      } catch (std::exception &err) {
-        handleError(err);
-      }
-    });
-
-    if (mThread.joinable()) {
-      mStartedSignal.wait();
-    }
-  #else
-    try {
-      start();
-    } catch (std::exception &err) {
-      handleError(err);
-    }
-  #endif
-}
-
-void Backend::notifyStarted() {
-  mStartedSignal.notify();
-}
-
-void Backend::start() {
-  notifyStarted();
-}
-
-Backend::~Backend() {
-  #ifndef __wasm32__
-    // Wait for thread to stop
-    if (mThread.joinable()) {
-      // If the backend is being destroyed from the thread itself, detach, otherwise join.
-      if (mThread.get_id() == std::this_thread::get_id()) {
-        mThread.detach();
-      } else {
-        mThread.join();
-      }
-    }
-  #endif
-}
-
-void Backend::watch(WatcherRef watcher) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  auto res = mSubscriptions.find(watcher);
-  if (res == mSubscriptions.end()) {
-    try {
-      this->subscribe(watcher);
-      mSubscriptions.insert(watcher);
-    } catch (std::exception &err) {
-      unref();
-      throw;
-    }
-  }
-}
-
-void Backend::unwatch(WatcherRef watcher) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  size_t deleted = mSubscriptions.erase(watcher);
-  if (deleted > 0) {
-    this->unsubscribe(watcher);
-    unref();
-  }
-}
-
-void Backend::unref() {
-  if (mSubscriptions.size() == 0) {
-    removeShared(this);
-  }
-}
-
-void Backend::handleWatcherError(WatcherError &err) {
-  unwatch(err.mWatcher);
-  err.mWatcher->notifyError(err);
-}
-
-void Backend::handleError(std::exception &err) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  for (auto it = mSubscriptions.begin(); it != mSubscriptions.end(); it++) {
-    (*it)->notifyError(err);
-  }
-
-  removeShared(this);
-}

web/node_modules/@parcel/watcher/src/Backend.hh

@@ -1,37 +0,0 @@
-#ifndef BACKEND_H
-#define BACKEND_H
-
-#include "Event.hh"
-#include "Watcher.hh"
-#include "Signal.hh"
-#include <thread>
-
-class Backend {
-public:
-  virtual ~Backend();
-  void run();
-  void notifyStarted();
-
-  virtual void start();
-  virtual void writeSnapshot(WatcherRef watcher, std::string *snapshotPath) = 0;
-  virtual void getEventsSince(WatcherRef watcher, std::string *snapshotPath) = 0;
-  virtual void subscribe(WatcherRef watcher) = 0;
-  virtual void unsubscribe(WatcherRef watcher) = 0;
-
-  static std::shared_ptr<Backend> getShared(std::string backend);
-
-  void watch(WatcherRef watcher);
-  void unwatch(WatcherRef watcher);
-  void unref();
-  void handleWatcherError(WatcherError &err);
-
-  std::mutex mMutex;
-  std::thread mThread;
-private:
-  std::unordered_set<WatcherRef> mSubscriptions;
-  Signal mStartedSignal;
-
-  void handleError(std::exception &err);
-};
-
-#endif

web/node_modules/@parcel/watcher/src/Debounce.cc

@@ -1,113 +0,0 @@
-#include "Debounce.hh"
-
-#ifdef __wasm32__
-extern "C" void on_timeout(void *ctx) {
-  Debounce *debounce = (Debounce *)ctx;
-  debounce->notify();
-}
-#endif
-
-std::shared_ptr<Debounce> Debounce::getShared() {
-  static std::weak_ptr<Debounce> sharedInstance;
-  std::shared_ptr<Debounce> shared = sharedInstance.lock();
-  if (!shared) {
-    shared = std::make_shared<Debounce>();
-    sharedInstance = shared;
-  }
-
-  return shared;
-}
-
-Debounce::Debounce() {
-  mRunning = true;
-  #ifndef __wasm32__
-    mThread = std::thread([this] () {
-      loop();
-    });
-  #endif
-}
-
-Debounce::~Debounce() {
-  mRunning = false;
-  #ifndef __wasm32__
-    mWaitSignal.notify();
-    mThread.join();
-  #endif
-}
-
-void Debounce::add(void *key, std::function<void()> cb) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  mCallbacks.emplace(key, cb);
-}
-
-void Debounce::remove(void *key) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  mCallbacks.erase(key);
-}
-
-void Debounce::trigger() {
-  std::unique_lock<std::mutex> lock(mMutex);
-  #ifdef __wasm32__
-    notifyIfReady();
-  #else
-    mWaitSignal.notify();
-  #endif
-}
-
-#ifndef __wasm32__
-void Debounce::loop() {
-  while (mRunning) {
-    mWaitSignal.wait();
-    if (!mRunning) {
-      break;
-    }
-
-    notifyIfReady();
-  }
-}
-#endif
-
-void Debounce::notifyIfReady() {
-  if (!mRunning) {
-    return;
-  }
-
-  // If we haven't seen an event in more than the maximum wait time, notify callbacks immediately
-  // to ensure that we don't wait forever. Otherwise, wait for the minimum wait time and batch
-  // subsequent fast changes. This also means the first file change in a batch is notified immediately,
-  // separately from the rest of the batch. This seems like an acceptable tradeoff if the common case
-  // is that only a single file was updated at a time.
-  auto time = std::chrono::steady_clock::now();
-  if ((time - mLastTime) > std::chrono::milliseconds(MAX_WAIT_TIME)) {
-    mLastTime = time;
-    notify();
-  } else {
-    wait();
-  }
-}
-
-void Debounce::wait() {
-  #ifdef __wasm32__
-    clear_timeout(mTimeout);
-    mTimeout = set_timeout(MIN_WAIT_TIME, this);
-  #else
-    auto status = mWaitSignal.waitFor(std::chrono::milliseconds(MIN_WAIT_TIME));
-    if (mRunning && (status == std::cv_status::timeout)) {
-      notify();
-    }
-  #endif
-}
-
-void Debounce::notify() {
-  std::unique_lock<std::mutex> lock(mMutex);
-
-  mLastTime = std::chrono::steady_clock::now();
-  for (auto it = mCallbacks.begin(); it != mCallbacks.end(); it++) {
-    auto cb = it->second;
-    cb();
-  }
-
-  #ifndef __wasm32__
-    mWaitSignal.reset();
-  #endif
-}

web/node_modules/@parcel/watcher/src/Debounce.hh

@@ -1,49 +0,0 @@
-#ifndef DEBOUNCE_H
-#define DEBOUNCE_H
-
-#include <thread>
-#include <unordered_map>
-#include <functional>
-#include "Signal.hh"
-
-#define MIN_WAIT_TIME 50
-#define MAX_WAIT_TIME 500
-
-#ifdef __wasm32__
-extern "C" {
-  int set_timeout(int ms, void *ctx);
-  void clear_timeout(int timeout);
-  void on_timeout(void *ctx);
-};
-#endif
-
-class Debounce {
-public:
-  static std::shared_ptr<Debounce> getShared();
-
-  Debounce();
-  ~Debounce();
-
-  void add(void *key, std::function<void()> cb);
-  void remove(void *key);
-  void trigger();
-  void notify();
-
-private:
-  bool mRunning;
-  std::mutex mMutex;
-  #ifdef __wasm32__
-    int mTimeout;
-  #else
-    Signal mWaitSignal;
-    std::thread mThread;
-  #endif
-  std::unordered_map<void *, std::function<void()>> mCallbacks;
-  std::chrono::time_point<std::chrono::steady_clock> mLastTime;
-
-  void loop();
-  void notifyIfReady();
-  void wait();
-};
-
-#endif

web/node_modules/@parcel/watcher/src/DirTree.cc

@@ -1,152 +0,0 @@
-#include "DirTree.hh"
-#include <inttypes.h>
-
-static std::mutex mDirCacheMutex;
-static std::unordered_map<std::string, std::weak_ptr<DirTree>> dirTreeCache;
-
-struct DirTreeDeleter {
-  void operator()(DirTree *tree) {
-    std::lock_guard<std::mutex> lock(mDirCacheMutex);
-    dirTreeCache.erase(tree->root);
-    delete tree;
-
-    // Free up memory.
-    if (dirTreeCache.size() == 0) {
-      dirTreeCache.rehash(0);
-    }
-  }
-};
-
-std::shared_ptr<DirTree> DirTree::getCached(std::string root) {
-  std::lock_guard<std::mutex> lock(mDirCacheMutex);
-
-  auto found = dirTreeCache.find(root);
-  std::shared_ptr<DirTree> tree;
-
-  // Use cached tree, or create an empty one.
-  if (found != dirTreeCache.end()) {
-    tree = found->second.lock();
-  } else {
-    tree = std::shared_ptr<DirTree>(new DirTree(root), DirTreeDeleter());
-    dirTreeCache.emplace(root, tree);
-  }
-
-  return tree;
-}
-
-DirTree::DirTree(std::string root, FILE *f) : root(root), isComplete(true) {
-  size_t size;
-  if (fscanf(f, "%zu", &size)) {
-    for (size_t i = 0; i < size; i++) {
-      DirEntry entry(f);
-      entries.emplace(entry.path, entry);
-    }
-  }
-}
-
-// Internal find method that has no lock
-DirEntry *DirTree::_find(std::string path) {
-  auto found = entries.find(path);
-  if (found == entries.end()) {
-    return NULL;
-  }
-
-  return &found->second;
-}
-
-DirEntry *DirTree::add(std::string path, uint64_t mtime, bool isDir) {
-  std::lock_guard<std::mutex> lock(mMutex);
-
-  DirEntry entry(path, mtime, isDir);
-  auto it = entries.emplace(entry.path, entry);
-  return &it.first->second;
-}
-
-DirEntry *DirTree::find(std::string path) {
-  std::lock_guard<std::mutex> lock(mMutex);
-  return _find(path);
-}
-
-DirEntry *DirTree::update(std::string path, uint64_t mtime) {
-  std::lock_guard<std::mutex> lock(mMutex);
-
-  DirEntry *found = _find(path);
-  if (found) {
-    found->mtime = mtime;
-  }
-
-  return found;
-}
-
-void DirTree::remove(std::string path) {
-  std::lock_guard<std::mutex> lock(mMutex);
-
-  DirEntry *found = _find(path);
-
-  // Remove all sub-entries if this is a directory
-  if (found && found->isDir) {
-    std::string pathStart = path + DIR_SEP;
-    for (auto it = entries.begin(); it != entries.end();) {
-      if (it->first.rfind(pathStart, 0) == 0) {
-        it = entries.erase(it);
-      } else {
-        it++;
-      }
-    }
-  }
-
-  entries.erase(path);
-}
-
-void DirTree::write(FILE *f) {
-  std::lock_guard<std::mutex> lock(mMutex);
-
-  fprintf(f, "%zu\n", entries.size());
-  for (auto it = entries.begin(); it != entries.end(); it++) {
-    it->second.write(f);
-  }
-}
-
-void DirTree::getChanges(DirTree *snapshot, EventList &events) {
-  std::lock_guard<std::mutex> lock(mMutex);
-  std::lock_guard<std::mutex> snapshotLock(snapshot->mMutex);
-
-  for (auto it = entries.begin(); it != entries.end(); it++) {
-    auto found = snapshot->entries.find(it->first);
-    if (found == snapshot->entries.end()) {
-      events.create(it->second.path);
-    } else if (found->second.mtime != it->second.mtime && !found->second.isDir && !it->second.isDir) {
-      events.update(it->second.path);
-    }
-  }
-
-  for (auto it = snapshot->entries.begin(); it != snapshot->entries.end(); it++) {
-    size_t count = entries.count(it->first);
-    if (count == 0) {
-      events.remove(it->second.path);
-    }
-  }
-}
-
-DirEntry::DirEntry(std::string p, uint64_t t, bool d) {
-  path = p;
-  mtime = t;
-  isDir = d;
-  state = NULL;
-}
-
-DirEntry::DirEntry(FILE *f) {
-  size_t size;
-  if (fscanf(f, "%zu", &size)) {
-    path.resize(size);
-    if (fread(&path[0], sizeof(char), size, f)) {
-      int d = 0;
-      fscanf(f, "%" PRIu64 " %d\n", &mtime, &d);
-      isDir = d == 1;
-    }
-  }
-}
-
-void DirEntry::write(FILE *f) const {
-  fprintf(f, "%zu%s%" PRIu64 " %d\n", path.size(), path.c_str(), mtime, isDir);
-}

web/node_modules/@parcel/watcher/src/DirTree.hh

@@ -1,50 +0,0 @@
-#ifndef DIR_TREE_H
-#define DIR_TREE_H
-
-#include <string>
-#include <unordered_map>
-#include <memory>
-#include "Event.hh"
-
-#ifdef _WIN32
-#define DIR_SEP "\\"
-#else
-#define DIR_SEP "/"
-#endif
-
-struct DirEntry {
-  std::string path;
-  uint64_t mtime;
-  bool isDir;
-  mutable void *state;
-
-  DirEntry(std::string p, uint64_t t, bool d);
-  DirEntry(FILE *f);
-  void write(FILE *f) const;
-  bool operator==(const DirEntry &other) const {
-    return path == other.path;
-  }
-};
-
-class DirTree {
-public:
-  static std::shared_ptr<DirTree> getCached(std::string root);
-  DirTree(std::string root) : root(root), isComplete(false) {}
-  DirTree(std::string root, FILE *f);
-  DirEntry *add(std::string path, uint64_t mtime, bool isDir);
-  DirEntry *find(std::string path);
-  DirEntry *update(std::string path, uint64_t mtime);
-  void remove(std::string path);
-  void write(FILE *f);
-  void getChanges(DirTree *snapshot, EventList &events);
-
-  std::mutex mMutex;
-  std::string root;
-  bool isComplete;
-  std::unordered_map<std::string, DirEntry> entries;
-
-private:
-  DirEntry *_find(std::string path);
-};
-
-#endif

web/node_modules/@parcel/watcher/src/Event.hh

@@ -1,109 +0,0 @@
-#ifndef EVENT_H
-#define EVENT_H
-
-#include <string>
-#include <node_api.h>
-#include "wasm/include.h"
-#include <napi.h>
-#include <mutex>
-#include <map>
-#include <optional>
-
-using namespace Napi;
-
-struct Event {
-  std::string path;
-  bool isCreated;
-  bool isDeleted;
-  Event(std::string path) : path(path), isCreated(false), isDeleted(false) {}
-
-  Value toJS(const Env& env) {
-    EscapableHandleScope scope(env);
-    Object res = Object::New(env);
-    std::string type = isCreated ? "create" : isDeleted ? "delete" : "update";
-    res.Set(String::New(env, "path"), String::New(env, path.c_str()));
-    res.Set(String::New(env, "type"), String::New(env, type.c_str()));
-    return scope.Escape(res);
-  }
-};
-
-class EventList {
-public:
-  void create(std::string path) {
-    std::lock_guard<std::mutex> l(mMutex);
-    Event *event = internalUpdate(path);
-    if (event->isDeleted) {
-      // Assume update event when rapidly removed and created
-      // https://github.com/parcel-bundler/watcher/issues/72
-      event->isDeleted = false;
-    } else {
-      event->isCreated = true;
-    }
-  }
-
-  Event *update(std::string path) {
-    std::lock_guard<std::mutex> l(mMutex);
-    return internalUpdate(path);
-  }
-
-  void remove(std::string path) {
-    std::lock_guard<std::mutex> l(mMutex);
-    Event *event = internalUpdate(path);
-    event->isDeleted = true;
-  }
-
-  size_t size() {
-    std::lock_guard<std::mutex> l(mMutex);
-    return mEvents.size();
-  }
-
-  std::vector<Event> getEvents() {
-    std::lock_guard<std::mutex> l(mMutex);
-    std::vector<Event> eventsCloneVector;
-    for(auto it = mEvents.begin(); it != mEvents.end(); ++it) {
-      if (!(it->second.isCreated && it->second.isDeleted)) {
-        eventsCloneVector.push_back(it->second);
-      }
-    }
-    return eventsCloneVector;
-  }
-
-  void clear() {
-    std::lock_guard<std::mutex> l(mMutex);
-    mEvents.clear();
-    mError.reset();
-  }
-
-  void error(std::string err) {
-    std::lock_guard<std::mutex> l(mMutex);
-    if (!mError.has_value()) {
-      mError.emplace(err);
-    }
-  }
-
-  bool hasError() {
-    std::lock_guard<std::mutex> l(mMutex);
-    return mError.has_value();
-  }
-
-  std::string getError() {
-    std::lock_guard<std::mutex> l(mMutex);
-    return mError.value_or("");
-  }
-
-private:
-  mutable std::mutex mMutex;
-  std::map<std::string, Event> mEvents;
-  std::optional<std::string> mError;
-  Event *internalUpdate(std::string path) {
-    auto found = mEvents.find(path);
-    if (found == mEvents.end()) {
-      auto it = mEvents.emplace(path, Event(path));
-      return &it.first->second;
-    }
-
-    return &found->second;
-  }
-};
-
-#endif

web/node_modules/@parcel/watcher/src/Glob.cc

@@ -1,22 +0,0 @@
-#include "Glob.hh"
-
-#ifdef __wasm32__
-extern "C" bool wasm_regex_match(const char *s, const char *regex);
-#endif
-
-Glob::Glob(std::string raw) {
-  mRaw = raw;
-  mHash = std::hash<std::string>()(raw);
-  #ifndef __wasm32__
-    mRegex = std::regex(raw);
-  #endif
-}
-
-bool Glob::isIgnored(std::string relative_path) const {
-  // Use native JS regex engine for wasm to reduce binary size.
-  #ifdef __wasm32__
-    return wasm_regex_match(relative_path.c_str(), mRaw.c_str());
-  #else
-    return std::regex_match(relative_path, mRegex);
-  #endif
-}

web/node_modules/@parcel/watcher/src/Glob.hh

@@ -1,34 +0,0 @@
-#ifndef GLOB_H
-#define GLOB_H
-
-#include <unordered_set>
-#include <regex>
-
-struct Glob {
-  std::size_t mHash;
-  std::string mRaw;
-  #ifndef __wasm32__
-  std::regex mRegex;
-  #endif
-
-  Glob(std::string raw);
-
-  bool operator==(const Glob &other) const {
-    return mHash == other.mHash;
-  }
-
-  bool isIgnored(std::string relative_path) const;
-};
-
-namespace std
-{
-  template <>
-  struct hash<Glob>
-  {
-    size_t operator()(const Glob& g) const {
-      return g.mHash;
-    }
-  };
-}
-
-#endif

web/node_modules/@parcel/watcher/src/PromiseRunner.hh

@@ -1,101 +0,0 @@
-#ifndef PROMISE_RUNNER_H
-#define PROMISE_RUNNER_H
-
-#include <node_api.h>
-#include "wasm/include.h"
-#include <napi.h>
-
-using namespace Napi;
-
-class PromiseRunner {
-public:
-  const Env env;
-  Promise::Deferred deferred;
-
-  PromiseRunner(Env env) : env(env), deferred(Promise::Deferred::New(env)) {
-    napi_status status = napi_create_async_work(env, nullptr, env.Undefined(),
-                                                onExecute, onWorkComplete, this, &work);
-    if (status != napi_ok) {
-      work = nullptr;
-      const napi_extended_error_info *error_info = 0;
-      napi_get_last_error_info(env, &error_info);
-      if (error_info->error_message) {
-        Error::New(env, error_info->error_message).ThrowAsJavaScriptException();
-      } else {
-        Error::New(env).ThrowAsJavaScriptException();
-      }
-    }
-  }
-
-  virtual ~PromiseRunner() {}
-
-  Value queue() {
-    if (work) {
-      napi_status status = napi_queue_async_work(env, work);
-      if (status != napi_ok) {
-        onError(Error::New(env));
-      }
-    }
-
-    return deferred.Promise();
-  }
-
-private:
-  napi_async_work work;
-  std::string error;
-
-  static void onExecute(napi_env env, void *this_pointer) {
-    PromiseRunner* self = (PromiseRunner*) this_pointer;
-    try {
-      self->execute();
-    } catch (std::exception &err) {
-      self->error = err.what();
-    }
-  }
-
-  static void onWorkComplete(napi_env env, napi_status status, void *this_pointer) {
-    PromiseRunner* self = (PromiseRunner*) this_pointer;
-    if (status != napi_cancelled) {
-      HandleScope scope(self->env);
-      if (status == napi_ok) {
-        status = napi_delete_async_work(self->env, self->work);
-        if (status == napi_ok) {
-          if (self->error.size() == 0) {
-            self->onOK();
-          } else {
-            self->onError(Error::New(self->env, self->error));
-          }
-          delete self;
-          return;
-        }
-      }
-    }
-
-    // fallthrough for error handling
-    const napi_extended_error_info *error_info = 0;
-    napi_get_last_error_info(env, &error_info);
-    if (error_info->error_message){
-      self->onError(Error::New(env, error_info->error_message));
-    } else {
-      self->onError(Error::New(env));
-    }
-    delete self;
-  }
-
-  virtual void execute() {}
-  virtual Value getResult() {
-    return env.Null();
-  }
-
-  void onOK() {
-    HandleScope scope(env);
-    Value result = getResult();
-    deferred.Resolve(result);
-  }
-
-  void onError(const Error &e) {
-    deferred.Reject(e.Value());
-  }
-};
-
-#endif

web/node_modules/@parcel/watcher/src/Signal.hh

@@ -1,46 +0,0 @@
-#ifndef SIGNAL_H
-#define SIGNAL_H
-
-#include <mutex>
-#include <condition_variable>
-
-class Signal {
-public:
-  Signal() : mFlag(false), mWaiting(false) {}
-  void wait() {
-    std::unique_lock<std::mutex> lock(mMutex);
-    while (!mFlag) {
-      mWaiting = true;
-      mCond.wait(lock);
-    }
-  }
-
-  std::cv_status waitFor(std::chrono::milliseconds ms) {
-    std::unique_lock<std::mutex> lock(mMutex);
-    return mCond.wait_for(lock, ms);
-  }
-
-  void notify() {
-    std::unique_lock<std::mutex> lock(mMutex);
-    mFlag = true;
-    mCond.notify_all();
-  }
-
-  void reset() {
-    std::unique_lock<std::mutex> lock(mMutex);
-    mFlag = false;
-    mWaiting = false;
-  }
-  
-  bool isWaiting() {
-    return mWaiting;
-  }
-
-private:
-  bool mFlag;
-  bool mWaiting;
-  std::mutex mMutex;
-  std::condition_variable mCond;
-};
-
-#endif

web/node_modules/@parcel/watcher/src/Watcher.cc

@@ -1,237 +0,0 @@
-#include "Watcher.hh"
-#include <unordered_set>
-
-using namespace Napi;
-
-struct WatcherHash {
-  std::size_t operator() (WatcherRef const &k) const {
-    return std::hash<std::string>()(k->mDir);
-  }
-};
-
-struct WatcherCompare {
-  size_t operator() (WatcherRef const &a, WatcherRef const &b) const {
-    return *a == *b;
-  }
-};
-
-static std::unordered_set<WatcherRef , WatcherHash, WatcherCompare> sharedWatchers;
-
-WatcherRef Watcher::getShared(std::string dir, std::unordered_set<std::string> ignorePaths, std::unordered_set<Glob> ignoreGlobs) {
-  WatcherRef watcher = std::make_shared<Watcher>(dir, ignorePaths, ignoreGlobs);
-  auto found = sharedWatchers.find(watcher);
-  if (found != sharedWatchers.end()) {
-    return *found;
-  }
-
-  sharedWatchers.insert(watcher);
-  return watcher;
-}
-
-void removeShared(Watcher *watcher) {
-  for (auto it = sharedWatchers.begin(); it != sharedWatchers.end(); it++) {
-    if (it->get() == watcher) {
-      sharedWatchers.erase(it);
-      break;
-    }
-  }
-
-  // Free up memory.
-  if (sharedWatchers.size() == 0) {
-    sharedWatchers.rehash(0);
-  }
-}
-
-Watcher::Watcher(std::string dir, std::unordered_set<std::string> ignorePaths, std::unordered_set<Glob> ignoreGlobs)
-  : mDir(dir),
-    mIgnorePaths(ignorePaths),
-    mIgnoreGlobs(ignoreGlobs) {
-      mDebounce = Debounce::getShared();
-      mDebounce->add(this, [this] () {
-        triggerCallbacks();
-      });
-    }
-
-Watcher::~Watcher() {
-  mDebounce->remove(this);
-}
-
-void Watcher::wait() {
-  std::unique_lock<std::mutex> lk(mMutex);
-  mCond.wait(lk);
-}
-
-void Watcher::notify() {
-  std::unique_lock<std::mutex> lk(mMutex);
-  mCond.notify_all();
-
-  if (mCallbacks.size() > 0 && mEvents.size() > 0) {
-    // We must release our lock before calling into the debouncer
-    // to avoid a deadlock: the debouncer thread itself will require
-    // our lock from its thread when calling into `triggerCallbacks`
-    // while holding its own debouncer lock.
-    lk.unlock();
-    mDebounce->trigger();
-  }
-}
-
-struct CallbackData {
-  std::string error;
-  std::vector<Event> events;
-  CallbackData(std::string error, std::vector<Event> events) : error(error), events(events) {}
-};
-
-Value callbackEventsToJS(const Env &env, std::vector<Event> &events) {
-  EscapableHandleScope scope(env);
-  Array arr = Array::New(env, events.size());
-  size_t currentEventIndex = 0;
-  for (auto eventIterator = events.begin(); eventIterator != events.end(); eventIterator++) {
-    arr.Set(currentEventIndex++, eventIterator->toJS(env));
-  }
-  return scope.Escape(arr);
-}
-
-void callJSFunction(Napi::Env env, Function jsCallback, CallbackData *data) {
-  HandleScope scope(env);
-  auto err = data->error.size() > 0 ? Error::New(env, data->error).Value() : env.Null();
-  auto events = callbackEventsToJS(env, data->events);
-  jsCallback.Call({err, events});
-  delete data;
-
-  // Throw errors from the callback as fatal exceptions
-  // If we don't handle these node segfaults...
-  if (env.IsExceptionPending()) {
-    Napi::Error err = env.GetAndClearPendingException();
-    napi_fatal_exception(env, err.Value());
-  }
-}
-
-void Watcher::notifyError(std::exception &err) {
-  std::unique_lock<std::mutex> lk(mMutex);
-  for (auto it = mCallbacks.begin(); it != mCallbacks.end(); it++) {
-    CallbackData *data = new CallbackData(err.what(), {});
-    it->tsfn.BlockingCall(data, callJSFunction);
-  }
-
-  clearCallbacks();
-}
-
-// This function is called from the debounce thread.
-void Watcher::triggerCallbacks() {
-  std::unique_lock<std::mutex> lk(mMutex);
-  if (mCallbacks.size() > 0 && (mEvents.size() > 0 || mEvents.hasError())) {
-    auto error = mEvents.getError();
-    auto events = mEvents.getEvents();
-    mEvents.clear();
-
-    for (auto it = mCallbacks.begin(); it != mCallbacks.end(); it++) {
-      it->tsfn.BlockingCall(new CallbackData(error, events), callJSFunction);
-    }
-  }
-}
-
-// This should be called from the JavaScript thread.
-bool Watcher::watch(Function callback) {
-  std::unique_lock<std::mutex> lk(mMutex);
-
-  auto it = findCallback(callback);
-  if (it != mCallbacks.end()) {
-    return false;
-  }
-
-  auto tsfn = ThreadSafeFunction::New(
-    callback.Env(),
-    callback,
-    "Watcher callback",
-    0, // Unlimited queue
-    1 // Initial thread count
-  );
-
-  mCallbacks.push_back(Callback {
-    tsfn,
-    Napi::Persistent(callback),
-    std::this_thread::get_id()
-  });
-
-  return true;
-}
-
-// This should be called from the JavaScript thread.
-std::vector<Callback>::iterator Watcher::findCallback(Function callback) {
-  for (auto it = mCallbacks.begin(); it != mCallbacks.end(); it++) {
-    // Only consider callbacks created by the same thread, or V8 will panic.
-    if (it->threadId == std::this_thread::get_id() && it->ref.Value() == callback) {
-      return it;
-    }
-  }
-
-  return mCallbacks.end();
-}
-
-// This should be called from the JavaScript thread.
-bool Watcher::unwatch(Function callback) {
-  std::unique_lock<std::mutex> lk(mMutex);
-
-  bool removed = false;
-  auto it = findCallback(callback);
-  if (it != mCallbacks.end()) {
-    it->tsfn.Release();
-    it->ref.Unref();
-    mCallbacks.erase(it);
-    removed = true;
-  }
-
-  if (removed && mCallbacks.size() == 0) {
-    unref();
-    return true;
-  }
-
-  return false;
-}
-
-void Watcher::unref() {
-  if (mCallbacks.size() == 0) {
-    removeShared(this);
-  }
-}
-
-void Watcher::destroy() {
-  std::unique_lock<std::mutex> lk(mMutex);
-  clearCallbacks();
-}
-
-// Private because it doesn't lock.
-void Watcher::clearCallbacks() {
-  for (auto it = mCallbacks.begin(); it != mCallbacks.end(); it++) {
-    it->tsfn.Release();
-    it->ref.Unref();
-  }
-
-  mCallbacks.clear();
-  unref();
-}
-
-bool Watcher::isIgnored(std::string path) {
-  for (auto it = mIgnorePaths.begin(); it != mIgnorePaths.end(); it++) {
-    auto dir = *it + DIR_SEP;
-    if (*it == path || path.compare(0, dir.size(), dir) == 0) {
-      return true;
-    }
-  }
-
-  auto basePath = mDir + DIR_SEP;
-
-  if (path.rfind(basePath, 0) != 0) {
-    return false;
-  }
-
-  auto relativePath = path.substr(basePath.size());
-
-  for (auto it = mIgnoreGlobs.begin(); it != mIgnoreGlobs.end(); it++) {
-    if (it->isIgnored(relativePath)) {
-      return true;
-    }
-  }
-
-  return false;
-}

web/node_modules/@parcel/watcher/src/Watcher.hh

@@ -1,73 +0,0 @@
-#ifndef WATCHER_H
-#define WATCHER_H
-
-#include <condition_variable>
-#include <unordered_set>
-#include <set>
-#include <node_api.h>
-#include "Glob.hh"
-#include "Event.hh"
-#include "Debounce.hh"
-#include "DirTree.hh"
-#include "Signal.hh"
-
-using namespace Napi;
-
-struct Watcher;
-using WatcherRef = std::shared_ptr<Watcher>;
-
-struct Callback {
-  Napi::ThreadSafeFunction tsfn;
-  Napi::FunctionReference ref;
-  std::thread::id threadId;
-};
-
-class WatcherState {
-public:
-    virtual ~WatcherState() = default;
-};
-
-struct Watcher {
-  std::string mDir;
-  std::unordered_set<std::string> mIgnorePaths;
-  std::unordered_set<Glob> mIgnoreGlobs;
-  EventList mEvents;
-  std::shared_ptr<WatcherState> state;
-
-  Watcher(std::string dir, std::unordered_set<std::string> ignorePaths, std::unordered_set<Glob> ignoreGlobs);
-  ~Watcher();
-
-  bool operator==(const Watcher &other) const {
-    return mDir == other.mDir && mIgnorePaths == other.mIgnorePaths && mIgnoreGlobs == other.mIgnoreGlobs;
-  }
-
-  void wait();
-  void notify();
-  void notifyError(std::exception &err);
-  bool watch(Function callback);
-  bool unwatch(Function callback);
-  void unref();
-  bool isIgnored(std::string path);
-  void destroy();
-
-  static WatcherRef getShared(std::string dir, std::unordered_set<std::string> ignorePaths, std::unordered_set<Glob> ignoreGlobs);
-
-private:
-  std::mutex mMutex;
-  std::condition_variable mCond;
-  std::vector<Callback> mCallbacks;
-  std::shared_ptr<Debounce> mDebounce;
-
-  std::vector<Callback>::iterator findCallback(Function callback);
-  void clearCallbacks();
-  void triggerCallbacks();
-};
-
-class WatcherError : public std::runtime_error {
-public:
-  WatcherRef mWatcher;
-  WatcherError(std::string msg, WatcherRef watcher) : std::runtime_error(msg), mWatcher(watcher) {}
-  WatcherError(const char *msg, WatcherRef watcher) : std::runtime_error(msg), mWatcher(watcher) {}
-};
-
-#endif

web/node_modules/@parcel/watcher/src/binding.cc

@@ -1,268 +0,0 @@
-#include <unordered_set>
-#include <node_api.h>
-#include "wasm/include.h"
-#include <napi.h>
-#include "Glob.hh"
-#include "Event.hh"
-#include "Backend.hh"
-#include "Watcher.hh"
-#include "PromiseRunner.hh"
-
-using namespace Napi;
-
-std::unordered_set<std::string> getIgnorePaths(Env env, Value opts) {
-  std::unordered_set<std::string> result;
-
-  if (opts.IsObject()) {
-    Value v = opts.As<Object>().Get(String::New(env, "ignorePaths"));
-    if (v.IsArray()) {
-      Array items = v.As<Array>();
-      for (size_t i = 0; i < items.Length(); i++) {
-        Value item = items.Get(Number::New(env, i));
-        if (item.IsString()) {
-          result.insert(std::string(item.As<String>().Utf8Value().c_str()));
-        }
-      }
-    }
-  }
-
-  return result;
-}
-
-std::unordered_set<Glob> getIgnoreGlobs(Env env, Value opts) {
-  std::unordered_set<Glob> result;
-
-  if (opts.IsObject()) {
-    Value v = opts.As<Object>().Get(String::New(env, "ignoreGlobs"));
-    if (v.IsArray()) {
-      Array items = v.As<Array>();
-      for (size_t i = 0; i < items.Length(); i++) {
-        Value item = items.Get(Number::New(env, i));
-        if (item.IsString()) {
-          auto key = item.As<String>().Utf8Value();
-          try {
-            result.emplace(key);
-          } catch (const std::regex_error& e) {
-            Error::New(env, e.what()).ThrowAsJavaScriptException();
-          }
-        }
-      }
-    }
-  }
-
-  return result;
-}
-
-std::shared_ptr<Backend> getBackend(Env env, Value opts) {
-  Value b = opts.As<Object>().Get(String::New(env, "backend"));
-  std::string backendName;
-  if (b.IsString()) {
-    backendName = std::string(b.As<String>().Utf8Value().c_str());
-  }
-
-  return Backend::getShared(backendName);
-}
-
-class WriteSnapshotRunner : public PromiseRunner {
-public:
-  WriteSnapshotRunner(Env env, Value dir, Value snap, Value opts)
-    : PromiseRunner(env),
-      snapshotPath(std::string(snap.As<String>().Utf8Value().c_str())) {
-    watcher = Watcher::getShared(
-      std::string(dir.As<String>().Utf8Value().c_str()),
-      getIgnorePaths(env, opts),
-      getIgnoreGlobs(env, opts)
-    );
-
-    backend = getBackend(env, opts);
-  }
-
-  ~WriteSnapshotRunner() {
-    watcher->unref();
-    backend->unref();
-  }
-private:
-  std::shared_ptr<Backend> backend;
-  WatcherRef watcher;
-  std::string snapshotPath;
-
-  void execute() override {
-    backend->writeSnapshot(watcher, &snapshotPath);
-  }
-};
-
-class GetEventsSinceRunner : public PromiseRunner {
-public:
-  GetEventsSinceRunner(Env env, Value dir, Value snap, Value opts)
-    : PromiseRunner(env),
-      snapshotPath(std::string(snap.As<String>().Utf8Value().c_str())) {
-    watcher = std::make_shared<Watcher>(
-      std::string(dir.As<String>().Utf8Value().c_str()),
-      getIgnorePaths(env, opts),
-      getIgnoreGlobs(env, opts)
-    );
-
-    backend = getBackend(env, opts);
-  }
-
-  ~GetEventsSinceRunner() {
-    watcher->unref();
-    backend->unref();
-  }
-private:
-  std::shared_ptr<Backend> backend;
-  WatcherRef watcher;
-  std::string snapshotPath;
-
-  void execute() override {
-    backend->getEventsSince(watcher, &snapshotPath);
-    if (watcher->mEvents.hasError()) {
-      throw std::runtime_error(watcher->mEvents.getError());
-    }
-  }
-
-  Value getResult() override {
-    std::vector<Event> events = watcher->mEvents.getEvents();
-    Array eventsArray = Array::New(env, events.size());
-    size_t i = 0;
-    for (auto it = events.begin(); it != events.end(); it++) {
-      eventsArray.Set(i++, it->toJS(env));
-    }
-    return eventsArray;
-  }
-};
-
-template<class Runner>
-Value queueSnapshotWork(const CallbackInfo& info) {
-  Env env = info.Env();
-  if (info.Length() < 1 || !info[0].IsString()) {
-    TypeError::New(env, "Expected a string").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-
-  if (info.Length() < 2 || !info[1].IsString()) {
-    TypeError::New(env, "Expected a string").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-
-  if (info.Length() >= 3 && !info[2].IsObject()) {
-    TypeError::New(env, "Expected an object").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-
-  Runner *runner = new Runner(info.Env(), info[0], info[1], info[2]);
-  return runner->queue();
-}
-
-Value writeSnapshot(const CallbackInfo& info) {
-  return queueSnapshotWork<WriteSnapshotRunner>(info);
-}
-
-Value getEventsSince(const CallbackInfo& info) {
-  return queueSnapshotWork<GetEventsSinceRunner>(info);
-}
-
-class SubscribeRunner : public PromiseRunner {
-public:
-  SubscribeRunner(Env env, Value dir, Value fn, Value opts) : PromiseRunner(env) {
-    watcher = Watcher::getShared(
-      std::string(dir.As<String>().Utf8Value().c_str()),
-      getIgnorePaths(env, opts),
-      getIgnoreGlobs(env, opts)
-    );
-
-    backend = getBackend(env, opts);
-    watcher->watch(fn.As<Function>());
-  }
-
-private:
-  WatcherRef watcher;
-  std::shared_ptr<Backend> backend;
-  FunctionReference callback;
-
-  void execute() override {
-    try {
-      backend->watch(watcher);
-    } catch (std::exception &err) {
-      watcher->destroy();
-      throw;
-    }
-  }
-};
-
-class UnsubscribeRunner : public PromiseRunner {
-public:
-  UnsubscribeRunner(Env env, Value dir, Value fn, Value opts) : PromiseRunner(env) {
-    watcher = Watcher::getShared(
-      std::string(dir.As<String>().Utf8Value().c_str()),
-      getIgnorePaths(env, opts),
-      getIgnoreGlobs(env, opts)
-    );
-
-    backend = getBackend(env, opts);
-    shouldUnwatch = watcher->unwatch(fn.As<Function>());
-  }
-
-private:
-  WatcherRef watcher;
-  std::shared_ptr<Backend> backend;
-  bool shouldUnwatch;
-
-  void execute() override {
-    if (shouldUnwatch) {
-      backend->unwatch(watcher);
-    }
-  }
-};
-
-template<class Runner>
-Value queueSubscriptionWork(const CallbackInfo& info) {
-  Env env = info.Env();
-  if (info.Length() < 1 || !info[0].IsString()) {
-    TypeError::New(env, "Expected a string").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-
-  if (info.Length() < 2 || !info[1].IsFunction()) {
-    TypeError::New(env, "Expected a function").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-
-  if (info.Length() >= 3 && !info[2].IsObject()) {
-    TypeError::New(env, "Expected an object").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-
-  Runner *runner = new Runner(info.Env(), info[0], info[1], info[2]);
-  return runner->queue();
-}
-
-Value subscribe(const CallbackInfo& info) {
-  return queueSubscriptionWork<SubscribeRunner>(info);
-}
-
-Value unsubscribe(const CallbackInfo& info) {
-  return queueSubscriptionWork<UnsubscribeRunner>(info);
-}
-
-Object Init(Env env, Object exports) {
-  exports.Set(
-    String::New(env, "writeSnapshot"),
-    Function::New(env, writeSnapshot)
-  );
-  exports.Set(
-    String::New(env, "getEventsSince"),
-    Function::New(env, getEventsSince)
-  );
-  exports.Set(
-    String::New(env, "subscribe"),
-    Function::New(env, subscribe)
-  );
-  exports.Set(
-    String::New(env, "unsubscribe"),
-    Function::New(env, unsubscribe)
-  );
-  return exports;
-}
-
-NODE_API_MODULE(watcher, Init)

web/node_modules/@parcel/watcher/src/kqueue/KqueueBackend.cc

@@ -1,306 +0,0 @@
-#include <memory>
-#include <poll.h>
-#include <unistd.h>
-#include <libgen.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include "KqueueBackend.hh"
-
-#if __APPLE__
-#define st_mtim st_mtimespec
-#endif
-
-#if !defined(O_EVTONLY)
-#define O_EVTONLY O_RDONLY
-#endif
-
-#define CONVERT_TIME(ts) ((uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec)
-
-void KqueueBackend::start() {
-  if ((mKqueue = kqueue()) < 0) {
-    throw std::runtime_error(std::string("Unable to open kqueue: ") + strerror(errno));
-  }
-
-  // Create a pipe that we will write to when we want to end the thread.
-  int err = pipe(mPipe);
-  if (err == -1) {
-    throw std::runtime_error(std::string("Unable to open pipe: ") + strerror(errno));
-  }
-
-  // Subscribe kqueue to this pipe.
-  struct kevent ev;
-  EV_SET(
-    &ev,
-    mPipe[0],
-    EVFILT_READ,
-    EV_ADD | EV_CLEAR,
-    0,
-    0,
-    0
-  );
-
-  if (kevent(mKqueue, &ev, 1, NULL, 0, 0)) {
-    close(mPipe[0]);
-    close(mPipe[1]);
-    throw std::runtime_error(std::string("Unable to watch pipe: ") + strerror(errno));
-  }
-
-  notifyStarted();
-
-  struct kevent events[128];
-
-  while (true) {
-    int event_count = kevent(mKqueue, NULL, 0, events, 128, 0);
-    if (event_count < 0 || events[0].flags == EV_ERROR) {
-      throw std::runtime_error(std::string("kevent error: ") + strerror(errno));
-    }
-
-    // Track all of the watchers that are touched so we can notify them at the end of the events.
-    std::unordered_set<WatcherRef> watchers;
-
-    for (int i = 0; i < event_count; i++) {
-      int flags = events[i].fflags;
-      int fd = events[i].ident;
-      if (fd == mPipe[0]) {
-        // pipe was written to. break out of the loop.
-        goto done;
-      }
-
-      auto it = mFdToEntry.find(fd);
-      if (it == mFdToEntry.end()) {
-        // If fd wasn't in our map, we may have already stopped watching it. Ignore the event.
-        continue;
-      }
-
-      DirEntry *entry = it->second;
-
-      if (flags & NOTE_WRITE && entry && entry->isDir) {
-        // If a write occurred on a directory, we have to diff the contents of that
-        // directory to determine what file was added/deleted.
-        compareDir(fd, entry->path, watchers);
-      } else {
-        std::vector<KqueueSubscription *> subs = findSubscriptions(entry->path);
-        for (auto it = subs.begin(); it != subs.end(); it++) {
-          KqueueSubscription *sub = *it;
-          watchers.insert(sub->watcher);
-          if (flags & (NOTE_DELETE | NOTE_RENAME | NOTE_REVOKE)) {
-            sub->watcher->mEvents.remove(sub->path);
-            sub->tree->remove(sub->path);
-            mFdToEntry.erase((int)(size_t)entry->state);
-            mSubscriptions.erase(sub->path);
-          } else if (flags & (NOTE_WRITE | NOTE_ATTRIB | NOTE_EXTEND)) {
-            struct stat st;
-            lstat(sub->path.c_str(), &st);
-            if (entry->mtime != CONVERT_TIME(st.st_mtim)) {
-              entry->mtime = CONVERT_TIME(st.st_mtim);
-              sub->watcher->mEvents.update(sub->path);
-            }
-          }
-        }
-      }
-    }
-
-    for (auto it = watchers.begin(); it != watchers.end(); it++) {
-      (*it)->notify();
-    }
-  }
-
-done:
-  close(mPipe[0]);
-  close(mPipe[1]);
-  mEndedSignal.notify();
-}
-
-KqueueBackend::~KqueueBackend() {
-  write(mPipe[1], "X", 1);
-  mEndedSignal.wait();
-}
-
-void KqueueBackend::subscribe(WatcherRef watcher) {
-  // Build a full directory tree recursively, and watch each directory.
-  std::shared_ptr<DirTree> tree = getTree(watcher);
-
-  for (auto it = tree->entries.begin(); it != tree->entries.end(); it++) {
-    bool success = watchDir(watcher, it->second.path, tree);
-    if (!success) {
-      throw WatcherError(std::string("error watching " + watcher->mDir + ": " + strerror(errno)), watcher);
-    }
-  }
-}
-
-bool KqueueBackend::watchDir(WatcherRef watcher, std::string path, std::shared_ptr<DirTree> tree) {
-  if (watcher->isIgnored(path)) {
-    return false;
-  }
-
-  DirEntry *entry = tree->find(path);
-  if (!entry) {
-    return false;
-  }
-
-  KqueueSubscription sub = {
-    .watcher = watcher,
-    .path = path,
-    .tree = tree
-  };
-
-  if (!entry->state) {
-    int fd = open(path.c_str(), O_EVTONLY);
-    if (fd <= 0) {
-      return false;
-    }
-
-    struct kevent event;
-    EV_SET(
-      &event,
-      fd,
-      EVFILT_VNODE,
-      EV_ADD | EV_CLEAR | EV_ENABLE,
-      NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_ATTRIB | NOTE_RENAME | NOTE_REVOKE,
-      0,
-      0
-    );
-
-    if (kevent(mKqueue, &event, 1, NULL, 0, 0)) {
-      close(fd);
-      return false;
-    }
-
-    entry->state = (void *)(size_t)fd;
-    mFdToEntry.emplace(fd, entry);
-  }
-
-  sub.fd = (int)(size_t)entry->state;
-  mSubscriptions.emplace(path, sub);
-  return true;
-}
-
-std::vector<KqueueSubscription *> KqueueBackend::findSubscriptions(std::string &path) {
-  // Find the subscriptions affected by this path.
-  // Copy pointers to them into a vector so that modifying mSubscriptions doesn't invalidate the iterator.
-  auto range = mSubscriptions.equal_range(path);
-  std::vector<KqueueSubscription *> subs;
-  for (auto it = range.first; it != range.second; it++) {
-    subs.push_back(&it->second);
-  }
-
-  return subs;
-}
-
-bool KqueueBackend::compareDir(int fd, std::string &path, std::unordered_set<WatcherRef> &watchers) {
-  // macOS doesn't support fdclosedir, so we have to duplicate the file descriptor
-  // to ensure the closedir doesn't also stop watching.
-  #if __APPLE__
-    fd = dup(fd);
-  #endif
-
-  DIR *dir = fdopendir(fd);
-  if (dir == NULL) {
-    return false;
-  }
-
-  // fdopendir doesn't rewind to the beginning.
-  rewinddir(dir);
-
-  std::vector<KqueueSubscription *> subs = findSubscriptions(path);
-  std::string dirStart = path + DIR_SEP;
-
-  std::unordered_set<std::shared_ptr<DirTree>> trees;
-  for (auto it = subs.begin(); it != subs.end(); it++) {
-    trees.emplace((*it)->tree);
-  }
-
-  std::unordered_set<std::string> entries;
-  struct dirent *entry;
-  while ((entry = readdir(dir))) {
-    if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
-      continue;
-    }
-
-    std::string fullpath = dirStart + entry->d_name;
-    entries.emplace(fullpath);
-
-    for (auto it = trees.begin(); it != trees.end(); it++) {
-      std::shared_ptr<DirTree> tree = *it;
-      if (!tree->find(fullpath)) {
-        struct stat st;
-        fstatat(fd, entry->d_name, &st, AT_SYMLINK_NOFOLLOW);
-        tree->add(fullpath, CONVERT_TIME(st.st_mtim), S_ISDIR(st.st_mode));
-
-        // Notify all watchers with the same tree.
-        for (auto i = subs.begin(); i != subs.end(); i++) {
-          KqueueSubscription *sub = *i;
-          if (sub->tree == tree) {
-            if (sub->watcher->isIgnored(fullpath)) {
-              continue;
-            }
-
-            sub->watcher->mEvents.create(fullpath);
-            watchers.emplace(sub->watcher);
-
-            bool success = watchDir(sub->watcher, fullpath, sub->tree);
-            if (!success) {
-              sub->tree->remove(fullpath);
-              return false;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  for (auto it = trees.begin(); it != trees.end(); it++) {
-    std::shared_ptr<DirTree> tree = *it;
-    for (auto entry = tree->entries.begin(); entry != tree->entries.end();) {
-
-      if (
-        entry->first.rfind(dirStart, 0) == 0 &&
-        entry->first.find(DIR_SEP, dirStart.length()) == std::string::npos &&
-        entries.count(entry->first) == 0
-      ) {
-        // Notify all watchers with the same tree.
-        for (auto i = subs.begin(); i != subs.end(); i++) {
-          if ((*i)->tree == tree) {
-            KqueueSubscription *sub = *i;
-            if (!sub->watcher->isIgnored(entry->first)) {
-              sub->watcher->mEvents.remove(entry->first);
-              watchers.emplace(sub->watcher);
-            }
-          }
-        }
-
-        mFdToEntry.erase((int)(size_t)entry->second.state);
-        mSubscriptions.erase(entry->first);
-        entry = tree->entries.erase(entry);
-      } else {
-        entry++;
-      }
-    }
-  }
-
-  #if __APPLE__
-    closedir(dir);
-  #else
-    fdclosedir(dir);
-  #endif
-
-  return true;
-}
-
-void KqueueBackend::unsubscribe(WatcherRef watcher) {
-  // Find any subscriptions pointing to this watcher, and remove them.
-  for (auto it = mSubscriptions.begin(); it != mSubscriptions.end();) {
-    if (it->second.watcher.get() == watcher.get()) {
-      if (mSubscriptions.count(it->first) == 1) {
-        // Closing the file descriptor automatically unwatches it in the kqueue.
-        close(it->second.fd);
-        mFdToEntry.erase(it->second.fd);
-      }
-
-      it = mSubscriptions.erase(it);
-    } else {
-      it++;
-    }
-  }
-}

web/node_modules/@parcel/watcher/src/kqueue/KqueueBackend.hh

@@ -1,35 +0,0 @@
-#ifndef KQUEUE_H
-#define KQUEUE_H
-
-#include <unordered_map>
-#include <sys/event.h>
-#include "../shared/BruteForceBackend.hh"
-#include "../DirTree.hh"
-#include "../Signal.hh"
-
-struct KqueueSubscription {
-  WatcherRef watcher;
-  std::string path;
-  std::shared_ptr<DirTree> tree;
-  int fd;
-};
-
-class KqueueBackend : public BruteForceBackend {
-public:
-  void start() override;
-  ~KqueueBackend();
-  void subscribe(WatcherRef watcher) override;
-  void unsubscribe(WatcherRef watcher) override;
-private:
-  int mKqueue;
-  int mPipe[2];
-  std::unordered_multimap<std::string, KqueueSubscription> mSubscriptions;
-  std::unordered_map<int, DirEntry *> mFdToEntry;
-  Signal mEndedSignal;
-
-  bool watchDir(WatcherRef watcher, std::string path, std::shared_ptr<DirTree> tree);
-  bool compareDir(int fd, std::string &dir, std::unordered_set<WatcherRef> &watchers);
-  std::vector<KqueueSubscription *> findSubscriptions(std::string &path);
-};
-
-#endif

web/node_modules/@parcel/watcher/src/linux/InotifyBackend.cc

@@ -1,232 +0,0 @@
-#include <memory>
-#include <poll.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include "InotifyBackend.hh"
-
-#define INOTIFY_MASK \
-  IN_ATTRIB | IN_CREATE | IN_DELETE | \
-  IN_DELETE_SELF | IN_MODIFY | IN_MOVE_SELF | IN_MOVED_FROM | \
-  IN_MOVED_TO | IN_DONT_FOLLOW | IN_ONLYDIR | IN_EXCL_UNLINK
-#define BUFFER_SIZE 8192
-#define CONVERT_TIME(ts) ((uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec)
-
-void InotifyBackend::start() {
-  // Create a pipe that we will write to when we want to end the thread.
-  int err = pipe2(mPipe, O_CLOEXEC | O_NONBLOCK);
-  if (err == -1) {
-    throw std::runtime_error(std::string("Unable to open pipe: ") + strerror(errno));
-  }
-
-  // Init inotify file descriptor.
-  mInotify = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
-  if (mInotify == -1) {
-    throw std::runtime_error(std::string("Unable to initialize inotify: ") + strerror(errno));
-  }
-
-  pollfd pollfds[2];
-  pollfds[0].fd = mPipe[0];
-  pollfds[0].events = POLLIN;
-  pollfds[0].revents = 0;
-  pollfds[1].fd = mInotify;
-  pollfds[1].events = POLLIN;
-  pollfds[1].revents = 0;
-
-  notifyStarted();
-
-  // Loop until we get an event from the pipe.
-  while (true) {
-    int result = poll(pollfds, 2, 500);
-    if (result < 0) {
-      throw std::runtime_error(std::string("Unable to poll: ") + strerror(errno));
-    }
-
-    if (pollfds[0].revents) {
-      break;
-    }
-
-    if (pollfds[1].revents) {
-      handleEvents();
-    }
-  }
-
-  close(mPipe[0]);
-  close(mPipe[1]);
-  close(mInotify);
-
-  mEndedSignal.notify();
-}
-
-InotifyBackend::~InotifyBackend() {
-  write(mPipe[1], "X", 1);
-  mEndedSignal.wait();
-}
-
-// This function is called by Backend::watch which takes a lock on mMutex
-void InotifyBackend::subscribe(WatcherRef watcher) {
-  // Build a full directory tree recursively, and watch each directory.
-  std::shared_ptr<DirTree> tree = getTree(watcher);
-
-  for (auto it = tree->entries.begin(); it != tree->entries.end(); it++) {
-    if (it->second.isDir) {
-      bool success = watchDir(watcher, it->second.path, tree);
-      if (!success) {
-        throw WatcherError(std::string("inotify_add_watch on '") + it->second.path + std::string("' failed: ") + strerror(errno), watcher);
-      }
-    }
-  }
-}
-
-bool InotifyBackend::watchDir(WatcherRef watcher, std::string path, std::shared_ptr<DirTree> tree) {
-  int wd = inotify_add_watch(mInotify, path.c_str(), INOTIFY_MASK);
-  if (wd == -1) {
-    return false;
-  }
-
-  std::shared_ptr<InotifySubscription> sub = std::make_shared<InotifySubscription>();
-  sub->tree = tree;
-  sub->path = path;
-  sub->watcher = watcher;
-  mSubscriptions.emplace(wd, sub);
-
-  return true;
-}
-
-void InotifyBackend::handleEvents() {
-  char buf[BUFFER_SIZE] __attribute__ ((aligned(__alignof__(struct inotify_event))));;
-  struct inotify_event *event;
-
-  // Track all of the watchers that are touched so we can notify them at the end of the events.
-  std::unordered_set<WatcherRef> watchers;
-
-  while (true) {
-    int n = read(mInotify, &buf, BUFFER_SIZE);
-    if (n < 0) {
-      if (errno == EAGAIN || errno == EWOULDBLOCK) {
-        break;
-      }
-
-      throw std::runtime_error(std::string("Error reading from inotify: ") + strerror(errno));
-    }
-
-    if (n == 0) {
-      break;
-    }
-
-    for (char *ptr = buf; ptr < buf + n; ptr += sizeof(*event) + event->len) {
-      event = (struct inotify_event *)ptr;
-
-      if ((event->mask & IN_Q_OVERFLOW) == IN_Q_OVERFLOW) {
-        // overflow
-        continue;
-      }
-
-      handleEvent(event, watchers);
-    }
-  }
-
-  for (auto it = watchers.begin(); it != watchers.end(); it++) {
-    (*it)->notify();
-  }
-}
-
-void InotifyBackend::handleEvent(struct inotify_event *event, std::unordered_set<WatcherRef> &watchers) {
-  std::unique_lock<std::mutex> lock(mMutex);
-
-  // Find the subscriptions for this watch descriptor
-  auto range = mSubscriptions.equal_range(event->wd);
-  std::unordered_set<std::shared_ptr<InotifySubscription>> set;
-  for (auto it = range.first; it != range.second; it++) {
-    set.insert(it->second);
-  }
-
-  for (auto it = set.begin(); it != set.end(); it++) {
-    if (handleSubscription(event, *it)) {
-      watchers.insert((*it)->watcher);
-    }
-  }
-}
-
-bool InotifyBackend::handleSubscription(struct inotify_event *event, std::shared_ptr<InotifySubscription> sub) {
-  // Build full path and check if its in our ignore list.
-  std::shared_ptr<Watcher> watcher = sub->watcher;
-  std::string path = std::string(sub->path);
-  bool isDir = event->mask & IN_ISDIR;
-
-  if (event->len > 0) {
-    path += "/" + std::string(event->name);
-  }
-
-  if (watcher->isIgnored(path)) {
-    return false;
-  }
-
-  // If this is a create, check if it's a directory and start watching if it is.
-  // In any case, keep the directory tree up to date.
-  if (event->mask & (IN_CREATE | IN_MOVED_TO)) {
-    watcher->mEvents.create(path);
-
-    struct stat st;
-    // Use lstat to avoid resolving symbolic links that we cannot watch anyway
-    // https://github.com/parcel-bundler/watcher/issues/76
-    lstat(path.c_str(), &st);
-    DirEntry *entry = sub->tree->add(path, CONVERT_TIME(st.st_mtim), S_ISDIR(st.st_mode));
-
-    if (entry->isDir) {
-      bool success = watchDir(watcher, path, sub->tree);
-      if (!success) {
-        sub->tree->remove(path);
-        return false;
-      }
-    }
-  } else if (event->mask & (IN_MODIFY | IN_ATTRIB)) {
-    watcher->mEvents.update(path);
-
-    struct stat st;
-    stat(path.c_str(), &st);
-    sub->tree->update(path, CONVERT_TIME(st.st_mtim));
-  } else if (event->mask & (IN_DELETE | IN_DELETE_SELF | IN_MOVED_FROM | IN_MOVE_SELF)) {
-    bool isSelfEvent = (event->mask & (IN_DELETE_SELF | IN_MOVE_SELF));
-    // Ignore delete/move self events unless this is the recursive watch root
-    if (isSelfEvent && path != watcher->mDir) {
-      return false;
-    }
-
-    // If the entry being deleted/moved is a directory, remove it from the list of subscriptions
-    // XXX: self events don't have the IN_ISDIR mask
-    if (isSelfEvent || isDir) {
-      for (auto it = mSubscriptions.begin(); it != mSubscriptions.end();) {
-        if (it->second->path == path) {
-          it = mSubscriptions.erase(it);
-        } else {
-          ++it;
-        }
-      }
-    }
-
-    watcher->mEvents.remove(path);
-    sub->tree->remove(path);
-  }
-
-  return true;
-}
-
-// This function is called by Backend::unwatch which takes a lock on mMutex
-void InotifyBackend::unsubscribe(WatcherRef watcher) {
-  // Find any subscriptions pointing to this watcher, and remove them.
-  for (auto it = mSubscriptions.begin(); it != mSubscriptions.end();) {
-    if (it->second->watcher.get() == watcher.get()) {
-      if (mSubscriptions.count(it->first) == 1) {
-        int err = inotify_rm_watch(mInotify, it->first);
-        if (err == -1) {
-          throw WatcherError(std::string("Unable to remove watcher: ") + strerror(errno), watcher);
-        }
-      }
-
-      it = mSubscriptions.erase(it);
-    } else {
-      it++;
-    }
-  }
-}

web/node_modules/@parcel/watcher/src/linux/InotifyBackend.hh

@@ -1,34 +0,0 @@
-#ifndef INOTIFY_H
-#define INOTIFY_H
-
-#include <unordered_map>
-#include <sys/inotify.h>
-#include "../shared/BruteForceBackend.hh"
-#include "../DirTree.hh"
-#include "../Signal.hh"
-
-struct InotifySubscription {
-  std::shared_ptr<DirTree> tree;
-  std::string path;
-  WatcherRef watcher;
-};
-
-class InotifyBackend : public BruteForceBackend {
-public:
-  void start() override;
-  ~InotifyBackend();
-  void subscribe(WatcherRef watcher) override;
-  void unsubscribe(WatcherRef watcher) override;
-private:
-  int mPipe[2];
-  int mInotify;
-  std::unordered_multimap<int, std::shared_ptr<InotifySubscription>> mSubscriptions;
-  Signal mEndedSignal;
-
-  bool watchDir(WatcherRef watcher, std::string path, std::shared_ptr<DirTree> tree);
-  void handleEvents();
-  void handleEvent(struct inotify_event *event, std::unordered_set<WatcherRef> &watchers);
-  bool handleSubscription(struct inotify_event *event, std::shared_ptr<InotifySubscription> sub);
-};
-
-#endif

web/node_modules/@parcel/watcher/src/macos/FSEventsBackend.cc

@@ -1,338 +0,0 @@
-#include <CoreServices/CoreServices.h>
-#include <sys/stat.h>
-#include <string>
-#include <fstream>
-#include <unordered_set>
-#include "../Event.hh"
-#include "../Backend.hh"
-#include "./FSEventsBackend.hh"
-#include "../Watcher.hh"
-
-#define CONVERT_TIME(ts) ((uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec)
-#define IGNORED_FLAGS (kFSEventStreamEventFlagItemIsHardlink | kFSEventStreamEventFlagItemIsLastHardlink | kFSEventStreamEventFlagItemIsSymlink | kFSEventStreamEventFlagItemIsDir | kFSEventStreamEventFlagItemIsFile)
-
-void stopStream(FSEventStreamRef stream, CFRunLoopRef runLoop) {
-  FSEventStreamStop(stream);
-  FSEventStreamUnscheduleFromRunLoop(stream, runLoop, kCFRunLoopDefaultMode);
-  FSEventStreamInvalidate(stream);
-  FSEventStreamRelease(stream);
-}
-
-// macOS has a case insensitive file system by default. In order to detect
-// file renames that only affect case, we need to get the canonical path
-// and compare it with the input path to determine if a file was created or deleted.
-bool pathExists(char *path) {
-  int fd = open(path, O_RDONLY | O_SYMLINK);
-  if (fd == -1) {
-    return false;
-  }
-
-  char buf[PATH_MAX];
-  if (fcntl(fd, F_GETPATH, buf) == -1) {
-    close(fd);
-    return false;
-  }
-
-  bool res = strncmp(path, buf, PATH_MAX) == 0;
-  close(fd);
-  return res;
-}
-
-class State: public WatcherState {
-public:
-  FSEventStreamRef stream;
-  std::shared_ptr<DirTree> tree;
-  uint64_t since;
-};
-
-void FSEventsCallback(
-  ConstFSEventStreamRef streamRef,
-  void *clientCallBackInfo,
-  size_t numEvents,
-  void *eventPaths,
-  const FSEventStreamEventFlags eventFlags[],
-  const FSEventStreamEventId eventIds[]
-) {
-  char **paths = (char **)eventPaths;
-  std::shared_ptr<Watcher>& watcher = *static_cast<std::shared_ptr<Watcher> *>(clientCallBackInfo);
-
-  EventList& list = watcher->mEvents;
-  if (watcher->state == nullptr) {
-      return;
-  }
-
-  auto stateGuard = watcher->state;
-  auto* state = static_cast<State*>(stateGuard.get());
-  uint64_t since = state->since;
-  bool deletedRoot = false;
-
-  for (size_t i = 0; i < numEvents; ++i) {
-    bool isCreated = (eventFlags[i] & kFSEventStreamEventFlagItemCreated) == kFSEventStreamEventFlagItemCreated;
-    bool isRemoved = (eventFlags[i] & kFSEventStreamEventFlagItemRemoved) == kFSEventStreamEventFlagItemRemoved;
-    bool isModified = (eventFlags[i] & kFSEventStreamEventFlagItemModified) == kFSEventStreamEventFlagItemModified ||
-                      (eventFlags[i] & kFSEventStreamEventFlagItemInodeMetaMod) == kFSEventStreamEventFlagItemInodeMetaMod ||
-                      (eventFlags[i] & kFSEventStreamEventFlagItemFinderInfoMod) == kFSEventStreamEventFlagItemFinderInfoMod ||
-                      (eventFlags[i] & kFSEventStreamEventFlagItemChangeOwner) == kFSEventStreamEventFlagItemChangeOwner ||
-                      (eventFlags[i] & kFSEventStreamEventFlagItemXattrMod) == kFSEventStreamEventFlagItemXattrMod;
-    bool isRenamed = (eventFlags[i] & kFSEventStreamEventFlagItemRenamed) == kFSEventStreamEventFlagItemRenamed;
-    bool isDone = (eventFlags[i] & kFSEventStreamEventFlagHistoryDone) == kFSEventStreamEventFlagHistoryDone;
-    bool isDir = (eventFlags[i] & kFSEventStreamEventFlagItemIsDir) == kFSEventStreamEventFlagItemIsDir;
-
-
-    if (eventFlags[i] & kFSEventStreamEventFlagMustScanSubDirs) {
-      if (eventFlags[i] & kFSEventStreamEventFlagUserDropped) {
-        list.error("Events were dropped by the FSEvents client. File system must be re-scanned.");
-      } else if (eventFlags[i] & kFSEventStreamEventFlagKernelDropped) {
-        list.error("Events were dropped by the kernel. File system must be re-scanned.");
-      } else {
-        list.error("Too many events. File system must be re-scanned.");
-      }
-    }
-
-    if (isDone) {
-      watcher->notify();
-      break;
-    }
-
-    auto ignoredFlags = IGNORED_FLAGS;
-    if (__builtin_available(macOS 10.13, *)) {
-      ignoredFlags |= kFSEventStreamEventFlagItemCloned;
-    }
-
-    // If we don't care about any of the flags that are set, ignore this event.
-    if ((eventFlags[i] & ~ignoredFlags) == 0) {
-      continue;
-    }
-
-    // FSEvents exclusion paths only apply to files, not directories.
-    if (watcher->isIgnored(paths[i])) {
-      continue;
-    }
-
-    // Handle unambiguous events first
-    if (isCreated && !(isRemoved || isModified || isRenamed)) {
-      state->tree->add(paths[i], 0, isDir);
-      list.create(paths[i]);
-    } else if (isRemoved && !(isCreated || isModified || isRenamed)) {
-      state->tree->remove(paths[i]);
-      list.remove(paths[i]);
-      if (paths[i] == watcher->mDir) {
-        deletedRoot = true;
-      }
-    } else if (isModified && !(isCreated || isRemoved || isRenamed)) {
-      struct stat file;
-      if (stat(paths[i], &file)) {
-        continue;
-      }
-
-      // Ignore if mtime is the same as the last event.
-      // This prevents duplicate events from being emitted.
-      // If tv_nsec is zero, the file system probably only has second-level
-      // granularity so allow the even through in that case.
-      uint64_t mtime = CONVERT_TIME(file.st_mtimespec);
-      DirEntry *entry = state->tree->find(paths[i]);
-      if (entry && mtime == entry->mtime && file.st_mtimespec.tv_nsec != 0) {
-        continue;
-      }
-
-      if (entry) {
-        // Update mtime.
-        entry->mtime = mtime;
-      } else {
-        // Add to tree if this path has not been discovered yet.
-        state->tree->add(paths[i], mtime, S_ISDIR(file.st_mode));
-      }
-
-      list.update(paths[i]);
-    } else {
-      // If multiple flags were set, then we need to call `stat` to determine if the file really exists.
-      // This helps disambiguate creates, updates, and deletes.
-      struct stat file;
-      if (stat(paths[i], &file) || !pathExists(paths[i])) {
-        // File does not exist, so we have to assume it was removed. This is not exact since the
-        // flags set by fsevents get coalesced together (e.g. created & deleted), so there is no way to
-        // know whether the create and delete both happened since our snapshot (in which case
-        // we'd rather ignore this event completely). This will result in some extra delete events
-        // being emitted for files we don't know about, but that is the best we can do.
-        state->tree->remove(paths[i]);
-        list.remove(paths[i]);
-        if (paths[i] == watcher->mDir) {
-          deletedRoot = true;
-        }
-        continue;
-      }
-
-      // If the file was modified, and existed before, then this is an update, otherwise a create.
-      uint64_t ctime = CONVERT_TIME(file.st_birthtimespec);
-      uint64_t mtime = CONVERT_TIME(file.st_mtimespec);
-      DirEntry *entry = !since ? state->tree->find(paths[i]) : NULL;
-      if (entry && entry->mtime == mtime && file.st_mtimespec.tv_nsec != 0) {
-        continue;
-      }
-
-      // Some mounted file systems report a creation time of 0/unix epoch which we special case.
-      if (isModified && (entry || (ctime <= since && ctime != 0))) {
-        state->tree->update(paths[i], mtime);
-        list.update(paths[i]);
-      } else {
-        state->tree->add(paths[i], mtime, S_ISDIR(file.st_mode));
-        list.create(paths[i]);
-      }
-    }
-  }
-
-  if (!since) {
-    watcher->notify();
-  }
-
-  // Stop watching if the root directory was deleted.
-  if (deletedRoot) {
-    stopStream((FSEventStreamRef)streamRef, CFRunLoopGetCurrent());
-    watcher->state = nullptr;
-  }
-}
-
-void checkWatcher(WatcherRef watcher) {
-  struct stat file;
-  if (stat(watcher->mDir.c_str(), &file)) {
-    throw WatcherError(strerror(errno), watcher);
-  }
-
-  if (!S_ISDIR(file.st_mode)) {
-    throw WatcherError(strerror(ENOTDIR), watcher);
-  }
-}
-
-void FSEventsBackend::startStream(WatcherRef watcher, FSEventStreamEventId id) {
-  checkWatcher(watcher);
-
-  CFAbsoluteTime latency = 0.001;
-  CFStringRef fileWatchPath = CFStringCreateWithCString(
-    NULL,
-    watcher->mDir.c_str(),
-    kCFStringEncodingUTF8
-  );
-
-  CFArrayRef pathsToWatch = CFArrayCreate(
-    NULL,
-    (const void **)&fileWatchPath,
-    1,
-    NULL
-  );
-
-  // Make a watcher reference we can pass into the callback. This ensures bumped ref-count.
-  std::shared_ptr<Watcher>* callbackWatcher = new std::shared_ptr<Watcher> (watcher);
-  FSEventStreamContext callbackInfo {0, static_cast<void*> (callbackWatcher), nullptr, nullptr, nullptr};
-  FSEventStreamRef stream = FSEventStreamCreate(
-    NULL,
-    &FSEventsCallback,
-    &callbackInfo,
-    pathsToWatch,
-    id,
-    latency,
-    kFSEventStreamCreateFlagFileEvents
-  );
-
-  CFMutableArrayRef exclusions = CFArrayCreateMutable(NULL, watcher->mIgnorePaths.size(), NULL);
-  for (auto it = watcher->mIgnorePaths.begin(); it != watcher->mIgnorePaths.end(); it++) {
-    CFStringRef path = CFStringCreateWithCString(
-      NULL,
-      it->c_str(),
-      kCFStringEncodingUTF8
-    );
-
-    CFArrayAppendValue(exclusions, (const void *)path);
-  }
-
-  FSEventStreamSetExclusionPaths(stream, exclusions);
-
-  FSEventStreamScheduleWithRunLoop(stream, mRunLoop, kCFRunLoopDefaultMode);
-  bool started = FSEventStreamStart(stream);
-
-  CFRelease(pathsToWatch);
-  CFRelease(fileWatchPath);
-
-  if (!started) {
-    FSEventStreamRelease(stream);
-    throw WatcherError("Error starting FSEvents stream", watcher);
-  }
-
-  auto stateGuard = watcher->state;
-  State* s = static_cast<State*>(stateGuard.get());
-  s->tree = std::make_shared<DirTree>(watcher->mDir);
-  s->stream = stream;
-}
-
-void FSEventsBackend::start() {
-  mRunLoop = CFRunLoopGetCurrent();
-  CFRetain(mRunLoop);
-
-  // Unlock once run loop has started.
-  CFRunLoopPerformBlock(mRunLoop, kCFRunLoopDefaultMode, ^ {
-    notifyStarted();
-  });
-
-  CFRunLoopWakeUp(mRunLoop);
-  CFRunLoopRun();
-}
-
-FSEventsBackend::~FSEventsBackend() {
-  std::unique_lock<std::mutex> lock(mMutex);
-  CFRunLoopStop(mRunLoop);
-  CFRelease(mRunLoop);
-}
-
-void FSEventsBackend::writeSnapshot(WatcherRef watcher, std::string *snapshotPath) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  checkWatcher(watcher);
-
-  FSEventStreamEventId id = FSEventsGetCurrentEventId();
-  std::ofstream ofs(*snapshotPath);
-  ofs << id;
-  ofs << "\n";
-
-  struct timespec now;
-  clock_gettime(CLOCK_REALTIME, &now);
-  ofs << CONVERT_TIME(now);
-}
-
-void FSEventsBackend::getEventsSince(WatcherRef watcher, std::string *snapshotPath) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  std::ifstream ifs(*snapshotPath);
-  if (ifs.fail()) {
-    return;
-  }
-
-  FSEventStreamEventId id;
-  uint64_t since;
-  ifs >> id;
-  ifs >> since;
-
-  auto s = std::make_shared<State>();
-  s->since = since;
-  watcher->state = s;
-
-  startStream(watcher, id);
-  watcher->wait();
-  stopStream(s->stream, mRunLoop);
-
-  watcher->state = nullptr;
-}
-
-// This function is called by Backend::watch which takes a lock on mMutex
-void FSEventsBackend::subscribe(WatcherRef watcher) {
-  auto s = std::make_shared<State>();
-  s->since = 0;
-  watcher->state = s;
-  startStream(watcher, kFSEventStreamEventIdSinceNow);
-}
-
-// This function is called by Backend::unwatch which takes a lock on mMutex
-void FSEventsBackend::unsubscribe(WatcherRef watcher) {
-  auto stateGuard = watcher->state;
-  State* s = static_cast<State*>(stateGuard.get());
-  if (s != nullptr) {
-    stopStream(s->stream, mRunLoop);
-    watcher->state = nullptr;
-  }
-}

web/node_modules/@parcel/watcher/src/macos/FSEventsBackend.hh

@@ -1,20 +0,0 @@
-#ifndef FS_EVENTS_H
-#define FS_EVENTS_H
-
-#include <CoreServices/CoreServices.h>
-#include "../Backend.hh"
-
-class FSEventsBackend : public Backend {
-public:
-  void start() override;
-  ~FSEventsBackend();
-  void writeSnapshot(WatcherRef watcher, std::string *snapshotPath) override;
-  void getEventsSince(WatcherRef watcher, std::string *snapshotPath) override;
-  void subscribe(WatcherRef watcher) override;
-  void unsubscribe(WatcherRef watcher) override;
-private:
-  void startStream(WatcherRef watcher, FSEventStreamEventId id);
-  CFRunLoopRef mRunLoop;
-};
-
-#endif

web/node_modules/@parcel/watcher/src/shared/BruteForceBackend.cc

@@ -1,41 +0,0 @@
-#include <string>
-#include "../DirTree.hh"
-#include "../Event.hh"
-#include "./BruteForceBackend.hh"
-
-std::shared_ptr<DirTree> BruteForceBackend::getTree(WatcherRef watcher, bool shouldRead) {
-  auto tree = DirTree::getCached(watcher->mDir);
-
-  // If the tree is not complete, read it if needed.
-  if (!tree->isComplete && shouldRead) {
-    readTree(watcher, tree);
-    tree->isComplete = true;
-  }
-
-  return tree;
-}
-
-void BruteForceBackend::writeSnapshot(WatcherRef watcher, std::string *snapshotPath) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  auto tree = getTree(watcher);
-  FILE *f = fopen(snapshotPath->c_str(), "w");
-  if (!f) {
-    throw std::runtime_error(std::string("Unable to open snapshot file: ") + strerror(errno));
-  }
-
-  tree->write(f);
-  fclose(f);
-}
-
-void BruteForceBackend::getEventsSince(WatcherRef watcher, std::string *snapshotPath) {
-  std::unique_lock<std::mutex> lock(mMutex);
-  FILE *f = fopen(snapshotPath->c_str(), "r");
-  if (!f) {
-    throw std::runtime_error(std::string("Unable to open snapshot file: ") + strerror(errno));
-  }
-
-  DirTree snapshot{watcher->mDir, f};
-  auto now = getTree(watcher);
-  now->getChanges(&snapshot, watcher->mEvents);
-  fclose(f);
-}

web/node_modules/@parcel/watcher/src/shared/BruteForceBackend.hh

@@ -1,25 +0,0 @@
-#ifndef BRUTE_FORCE_H
-#define BRUTE_FORCE_H
-
-#include "../Backend.hh"
-#include "../DirTree.hh"
-#include "../Watcher.hh"
-
-class BruteForceBackend : public Backend {
-public:
-  void writeSnapshot(WatcherRef watcher, std::string *snapshotPath) override;
-  void getEventsSince(WatcherRef watcher, std::string *snapshotPath) override;
-  void subscribe(WatcherRef watcher) override {
-    throw "Brute force backend doesn't support subscriptions.";
-  }
-
-  void unsubscribe(WatcherRef watcher) override {
-    throw "Brute force backend doesn't support subscriptions.";
-  }
-
-  std::shared_ptr<DirTree> getTree(WatcherRef watcher, bool shouldRead = true);
-private:
-  void readTree(WatcherRef watcher, std::shared_ptr<DirTree> tree);
-};
-
-#endif

web/node_modules/@parcel/watcher/src/unix/fts.cc

@@ -1,50 +0,0 @@
-#include <string>
-
-// weird error on linux
-#ifdef __THROW
-#undef __THROW
-#endif
-#define __THROW
-
-#include <fts.h>
-#include <sys/stat.h>
-#include "../DirTree.hh"
-#include "../shared/BruteForceBackend.hh"
-
-#define CONVERT_TIME(ts) ((uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec)
-#if __APPLE__
-#define st_mtim st_mtimespec
-#endif
-
-void BruteForceBackend::readTree(WatcherRef watcher, std::shared_ptr<DirTree> tree) {
-  char *paths[2] {(char *)watcher->mDir.c_str(), NULL};
-  FTS *fts = fts_open(paths, FTS_NOCHDIR | FTS_PHYSICAL, NULL);
-  if (!fts) {
-    throw WatcherError(strerror(errno), watcher);
-  }
-
-  FTSENT *node;
-  bool isRoot = true;
-
-  while ((node = fts_read(fts)) != NULL) {
-    if (node->fts_errno) {
-      fts_close(fts);
-      throw WatcherError(strerror(node->fts_errno), watcher);
-    }
-
-    if (isRoot && !(node->fts_info & FTS_D)) {
-      fts_close(fts);
-      throw WatcherError(strerror(ENOTDIR), watcher);
-    }
-
-    if (watcher->isIgnored(std::string(node->fts_path))) {
-      fts_set(fts, node, FTS_SKIP);
-      continue;
-    }
-
-    tree->add(node->fts_path, CONVERT_TIME(node->fts_statp->st_mtim), (node->fts_info & FTS_D) == FTS_D);
-    isRoot = false;
-  }
-
-  fts_close(fts);
-}

web/node_modules/@parcel/watcher/src/unix/legacy.cc

@@ -1,77 +0,0 @@
-#include <string>
-
-// weird error on linux
-#ifdef __THROW
-#undef __THROW
-#endif
-#define __THROW
-
-#ifdef _LIBC
-# include <include/sys/stat.h>
-#else
-# include <sys/stat.h>
-#endif
-#include <dirent.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "../DirTree.hh"
-#include "../shared/BruteForceBackend.hh"
-
-#define CONVERT_TIME(ts) ((uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec)
-#if __APPLE__
-#define st_mtim st_mtimespec
-#endif
-#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
-
-void iterateDir(WatcherRef watcher, const std::shared_ptr <DirTree> tree, const char *relative, int parent_fd, const std::string &dirname) {
-    int open_flags = (O_RDONLY | O_CLOEXEC | O_DIRECTORY | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW);
-    int new_fd = openat(parent_fd, relative, open_flags);
-    if (new_fd == -1) {
-        if (errno == EACCES) {
-            return; // ignore insufficient permissions
-        }
-
-        throw WatcherError(strerror(errno), watcher);
-    }
-
-    struct stat rootAttributes;
-    fstatat(new_fd, ".", &rootAttributes, AT_SYMLINK_NOFOLLOW);
-    tree->add(dirname, CONVERT_TIME(rootAttributes.st_mtim), true);
-
-    if (DIR *dir = fdopendir(new_fd)) {
-        while (struct dirent *ent = (errno = 0, readdir(dir))) {
-            if (ISDOT(ent->d_name)) continue;
-
-            std::string fullPath = dirname + "/" + ent->d_name;
-
-            if (!watcher->isIgnored(fullPath)) {
-                struct stat attrib;
-                fstatat(new_fd, ent->d_name, &attrib, AT_SYMLINK_NOFOLLOW);
-                bool isDir = ent->d_type == DT_DIR;
-
-                if (isDir) {
-                    iterateDir(watcher, tree, ent->d_name, new_fd, fullPath);
-                } else {
-                    tree->add(fullPath, CONVERT_TIME(attrib.st_mtim), isDir);
-                }
-            }
-        }
-
-        closedir(dir);
-    } else {
-        close(new_fd);
-    }
-
-    if (errno) {
-        throw WatcherError(strerror(errno), watcher);
-    }
-}
-
-void BruteForceBackend::readTree(WatcherRef watcher, std::shared_ptr <DirTree> tree) {
-    int fd = open(watcher->mDir.c_str(), O_RDONLY);
-    if (fd) {
-        iterateDir(watcher, tree, ".", fd, watcher->mDir);
-        close(fd);
-    }
-}

web/node_modules/@parcel/watcher/src/wasm/WasmBackend.cc

@@ -1,132 +0,0 @@
-#include <sys/stat.h>
-#include "WasmBackend.hh"
-
-#define CONVERT_TIME(ts) ((uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec)
-
-void WasmBackend::start() {
-  notifyStarted();
-}
-
-void WasmBackend::subscribe(WatcherRef watcher) {
-  // Build a full directory tree recursively, and watch each directory.
-  std::shared_ptr<DirTree> tree = getTree(watcher);
-
-  for (auto it = tree->entries.begin(); it != tree->entries.end(); it++) {
-    if (it->second.isDir) {
-      watchDir(watcher, it->second.path, tree);
-    }
-  }
-}
-
-void WasmBackend::watchDir(WatcherRef watcher, std::string path, std::shared_ptr<DirTree> tree) {
-  int wd = wasm_backend_add_watch(path.c_str(), (void *)this);
-  std::shared_ptr<WasmSubscription> sub = std::make_shared<WasmSubscription>();
-  sub->tree = tree;
-  sub->path = path;
-  sub->watcher = watcher;
-  mSubscriptions.emplace(wd, sub);
-}
-
-extern "C" void wasm_backend_event_handler(void *backend, int wd, int type, char *filename) {
-  WasmBackend *b = (WasmBackend *)(backend);
-  b->handleEvent(wd, type, filename);
-}
-
-void WasmBackend::handleEvent(int wd, int type, char *filename) {
-  // Find the subscriptions for this watch descriptor
-  auto range = mSubscriptions.equal_range(wd);
-  std::unordered_set<std::shared_ptr<WasmSubscription>> set;
-  for (auto it = range.first; it != range.second; it++) {
-    set.insert(it->second);
-  }
-
-  for (auto it = set.begin(); it != set.end(); it++) {
-    if (handleSubscription(type, filename, *it)) {
-      (*it)->watcher->notify();
-    }
-  }
-}
-
-bool WasmBackend::handleSubscription(int type, char *filename, std::shared_ptr<WasmSubscription> sub) {
-  // Build full path and check if its in our ignore list.
-  WatcherRef watcher = sub->watcher;
-  std::string path = std::string(sub->path);
-
-  if (filename[0] != '\0') {
-    path += "/" + std::string(filename);
-  }
-
-  if (watcher->isIgnored(path)) {
-    return false;
-  }
-
-  if (type == 1) {
-    struct stat st;
-    stat(path.c_str(), &st);
-    sub->tree->update(path, CONVERT_TIME(st.st_mtim));
-    watcher->mEvents.update(path);
-  } else if (type == 2) {
-    // Determine if this is a create or delete depending on if the file exists or not.
-    struct stat st;
-    if (lstat(path.c_str(), &st)) {
-      // If the entry being deleted/moved is a directory, remove it from the list of subscriptions
-      DirEntry *entry = sub->tree->find(path);
-      if (!entry) {
-        return false;
-      }
-
-      if (entry->isDir) {
-        std::string pathStart = path + DIR_SEP;
-        for (auto it = mSubscriptions.begin(); it != mSubscriptions.end();) {
-          if (it->second->path == path || it->second->path.rfind(pathStart, 0) == 0) {
-            wasm_backend_remove_watch(it->first);
-            it = mSubscriptions.erase(it);
-          } else {
-            ++it;
-          }
-        }
-
-        // Remove all sub-entries
-        for (auto it = sub->tree->entries.begin(); it != sub->tree->entries.end();) {
-          if (it->first.rfind(pathStart, 0) == 0) {
-            watcher->mEvents.remove(it->first);
-            it = sub->tree->entries.erase(it);
-          } else {
-            it++;
-          }
-        }
-      }
-
-      watcher->mEvents.remove(path);
-      sub->tree->remove(path);
-    } else if (sub->tree->find(path)) {
-      sub->tree->update(path, CONVERT_TIME(st.st_mtim));
-      watcher->mEvents.update(path);
-    } else {
-      watcher->mEvents.create(path);
-
-      // If this is a create, check if it's a directory and start watching if it is.
-      DirEntry *entry = sub->tree->add(path, CONVERT_TIME(st.st_mtim), S_ISDIR(st.st_mode));
-      if (entry->isDir) {
-        watchDir(watcher, path, sub->tree);
-      }
-    }
-  }
-
-  return true;
-}
-
-void WasmBackend::unsubscribe(WatcherRef watcher) {
-  // Find any subscriptions pointing to this watcher, and remove them.
-  for (auto it = mSubscriptions.begin(); it != mSubscriptions.end();) {
-    if (it->second->watcher.get() == watcher.get()) {
-      if (mSubscriptions.count(it->first) == 1) {
-        wasm_backend_remove_watch(it->first);
-      }
-
-      it = mSubscriptions.erase(it);
-    } else {
-      it++;
-    }
-  }
-}

web/node_modules/@parcel/watcher/src/wasm/WasmBackend.hh

@@ -1,34 +0,0 @@
-#ifndef WASM_H
-#define WASM_H
-
-#include <unordered_map>
-#include "../shared/BruteForceBackend.hh"
-#include "../DirTree.hh"
-
-extern "C" {
-  int wasm_backend_add_watch(const char *filename, void *backend);
-  void wasm_backend_remove_watch(int wd);
-  void wasm_backend_event_handler(void *backend, int wd, int type, char *filename);
-};
-
-struct WasmSubscription {
-  std::shared_ptr<DirTree> tree;
-  std::string path;
-  WatcherRef watcher;
-};
-
-class WasmBackend : public BruteForceBackend {
-public:
-  void start() override;
-  void subscribe(WatcherRef watcher) override;
-  void unsubscribe(WatcherRef watcher) override;
-  void handleEvent(int wd, int type, char *filename);
-private:
-  int mWasm;
-  std::unordered_multimap<int, std::shared_ptr<WasmSubscription>> mSubscriptions;
-
-  void watchDir(WatcherRef watcher, std::string path, std::shared_ptr<DirTree> tree);
-  bool handleSubscription(int type, char *filename, std::shared_ptr<WasmSubscription> sub);
-};
-
-#endif

web/node_modules/@parcel/watcher/src/wasm/include.h

@@ -1,74 +0,0 @@
-/*
-Copyright Node.js contributors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-*/
-
-// Node does not include the headers for these functions when compiling for WASM, so add them here.
-#ifdef __wasm32__
-extern "C" {
-NAPI_EXTERN napi_status NAPI_CDECL
-napi_create_threadsafe_function(napi_env env,
-                                napi_value func,
-                                napi_value async_resource,
-                                napi_value async_resource_name,
-                                size_t max_queue_size,
-                                size_t initial_thread_count,
-                                void* thread_finalize_data,
-                                napi_finalize thread_finalize_cb,
-                                void* context,
-                                napi_threadsafe_function_call_js call_js_cb,
-                                napi_threadsafe_function* result);
-
-NAPI_EXTERN napi_status NAPI_CDECL napi_get_threadsafe_function_context(
-    napi_threadsafe_function func, void** result);
-
-NAPI_EXTERN napi_status NAPI_CDECL
-napi_call_threadsafe_function(napi_threadsafe_function func,
-                              void* data,
-                              napi_threadsafe_function_call_mode is_blocking);
-
-NAPI_EXTERN napi_status NAPI_CDECL
-napi_acquire_threadsafe_function(napi_threadsafe_function func);
-
-NAPI_EXTERN napi_status NAPI_CDECL napi_release_threadsafe_function(
-    napi_threadsafe_function func, napi_threadsafe_function_release_mode mode);
-
-NAPI_EXTERN napi_status NAPI_CDECL
-napi_unref_threadsafe_function(napi_env env, napi_threadsafe_function func);
-
-NAPI_EXTERN napi_status NAPI_CDECL
-napi_ref_threadsafe_function(napi_env env, napi_threadsafe_function func);
-
-NAPI_EXTERN napi_status NAPI_CDECL
-napi_create_async_work(napi_env env,
-                       napi_value async_resource,
-                       napi_value async_resource_name,
-                       napi_async_execute_callback execute,
-                       napi_async_complete_callback complete,
-                       void* data,
-                       napi_async_work* result);
-NAPI_EXTERN napi_status NAPI_CDECL napi_delete_async_work(napi_env env,
-                                                          napi_async_work work);
-NAPI_EXTERN napi_status NAPI_CDECL napi_queue_async_work(napi_env env,
-                                                         napi_async_work work);
-NAPI_EXTERN napi_status NAPI_CDECL napi_cancel_async_work(napi_env env,
-                                                          napi_async_work work);
-}
-#endif

web/node_modules/@parcel/watcher/src/watchman/BSER.cc

@@ -1,302 +0,0 @@
-#include <stdint.h>
-#include "./BSER.hh"
-
-BSERType decodeType(std::istream &iss) {
-  int8_t type;
-  iss.read(reinterpret_cast<char*>(&type), sizeof(type));
-  return (BSERType) type;
-}
-
-void expectType(std::istream &iss, BSERType expected) {
-  BSERType got = decodeType(iss);
-  if (got != expected) {
-    throw std::runtime_error("Unexpected BSER type");
-  }
-}
-
-void encodeType(std::ostream &oss, BSERType type) {
-  int8_t t = (int8_t)type;
-  oss.write(reinterpret_cast<char*>(&t), sizeof(t));
-}
-
-template<typename T>
-class Value : public BSERValue {
-public:
-  T value;
-  Value(T val) {
-    value = val;
-  }
-
-  Value() {}
-};
-
-class BSERInteger : public Value<int64_t> {
-public:
-  BSERInteger(int64_t value) : Value(value) {}
-  BSERInteger(std::istream &iss) {
-    int8_t int8;
-    int16_t int16;
-    int32_t int32;
-    int64_t int64;
-
-    BSERType type = decodeType(iss);
-
-    switch (type) {
-      case BSER_INT8:
-        iss.read(reinterpret_cast<char*>(&int8), sizeof(int8));
-        value = int8;
-        break;
-      case BSER_INT16:
-        iss.read(reinterpret_cast<char*>(&int16), sizeof(int16));
-        value = int16;
-        break;
-      case BSER_INT32:
-        iss.read(reinterpret_cast<char*>(&int32), sizeof(int32));
-        value = int32;
-        break;
-      case BSER_INT64:
-        iss.read(reinterpret_cast<char*>(&int64), sizeof(int64));
-        value = int64;
-        break;
-      default:
-        throw std::runtime_error("Invalid BSER int type");
-    }
-  }
-
-  int64_t intValue() override {
-    return value;
-  }
-
-  void encode(std::ostream &oss) override {
-    if (value <= INT8_MAX) {
-      encodeType(oss, BSER_INT8);
-      int8_t v = (int8_t)value;
-      oss.write(reinterpret_cast<char*>(&v), sizeof(v));
-    } else if (value <= INT16_MAX) {
-      encodeType(oss, BSER_INT16);
-      int16_t v = (int16_t)value;
-      oss.write(reinterpret_cast<char*>(&v), sizeof(v));
-    } else if (value <= INT32_MAX) {
-      encodeType(oss, BSER_INT32);
-      int32_t v = (int32_t)value;
-      oss.write(reinterpret_cast<char*>(&v), sizeof(v));
-    } else {
-      encodeType(oss, BSER_INT64);
-      oss.write(reinterpret_cast<char*>(&value), sizeof(value));
-    }
-  }
-};
-
-class BSERArray : public Value<BSER::Array> {
-public:
-  BSERArray() : Value() {}
-  BSERArray(BSER::Array value) : Value(value) {}
-  BSERArray(std::istream &iss) {
-    expectType(iss, BSER_ARRAY);
-    int64_t len = BSERInteger(iss).intValue();
-    for (int64_t i = 0; i < len; i++) {
-      value.push_back(BSER(iss));
-    }
-  }
-  
-  BSER::Array arrayValue() override {
-    return value;
-  }
-
-  void encode(std::ostream &oss) override {
-    encodeType(oss, BSER_ARRAY);
-    BSERInteger(value.size()).encode(oss);
-    for (auto it = value.begin(); it != value.end(); it++) {
-      it->encode(oss);
-    }
-  }
-};
-
-class BSERString : public Value<std::string> {
-public:
-  BSERString(std::string value) : Value(value) {}
-  BSERString(std::istream &iss) {
-    expectType(iss, BSER_STRING);
-    int64_t len = BSERInteger(iss).intValue();
-    value.resize(len);
-    iss.read(&value[0], len);
-  }
-
-  std::string stringValue() override {
-    return value;
-  }
-
-  void encode(std::ostream &oss) override {
-    encodeType(oss, BSER_STRING);
-    BSERInteger(value.size()).encode(oss);
-    oss << value;
-  }
-};
-
-class BSERObject : public Value<BSER::Object> {
-public:
-  BSERObject() : Value() {}
-  BSERObject(BSER::Object value) : Value(value) {}
-  BSERObject(std::istream &iss) {
-    expectType(iss, BSER_OBJECT);
-    int64_t len = BSERInteger(iss).intValue();
-    for (int64_t i = 0; i < len; i++) {
-      auto key = BSERString(iss).stringValue();
-      auto val = BSER(iss);
-      value.emplace(key, val);
-    }
-  }
-
-  BSER::Object objectValue() override {
-    return value;
-  }
-
-  void encode(std::ostream &oss) override {
-    encodeType(oss, BSER_OBJECT);
-    BSERInteger(value.size()).encode(oss);
-    for (auto it = value.begin(); it != value.end(); it++) {
-      BSERString(it->first).encode(oss);
-      it->second.encode(oss);
-    }
-  }
-};
-
-class BSERDouble : public Value<double> {
-public:
-  BSERDouble(double value) : Value(value) {}
-  BSERDouble(std::istream &iss) {
-    expectType(iss, BSER_REAL);
-    iss.read(reinterpret_cast<char*>(&value), sizeof(value));
-  }
-
-  double doubleValue() override {
-    return value;
-  }
-
-  void encode(std::ostream &oss) override {
-    encodeType(oss, BSER_REAL);
-    oss.write(reinterpret_cast<char*>(&value), sizeof(value));
-  }
-};
-
-class BSERBoolean : public Value<bool> {
-public:
-  BSERBoolean(bool value) : Value(value) {}
-  bool boolValue() override { return value; }
-  void encode(std::ostream &oss) override {
-    int8_t t = value == true ? BSER_BOOL_TRUE : BSER_BOOL_FALSE;
-    oss.write(reinterpret_cast<char*>(&t), sizeof(t));
-  }
-};
-
-class BSERNull : public Value<bool> {
-public:
-  BSERNull() : Value(false) {}
-  void encode(std::ostream &oss) override {
-    encodeType(oss, BSER_NULL);
-  }
-};
-
-std::shared_ptr<BSERArray> decodeTemplate(std::istream &iss) {
-  expectType(iss, BSER_TEMPLATE);
-  auto keys = BSERArray(iss).arrayValue();
-  auto len = BSERInteger(iss).intValue();
-  std::shared_ptr<BSERArray> arr = std::make_shared<BSERArray>();
-  for (int64_t i = 0; i < len; i++) {
-    BSER::Object obj;
-    for (auto it = keys.begin(); it != keys.end(); it++) {
-      if (iss.peek() == 0x0c) {
-        iss.ignore(1);
-        continue;
-      }
-
-      auto val = BSER(iss);
-      obj.emplace(it->stringValue(), val);
-    }
-    arr->value.push_back(obj);
-  }
-  return arr;
-}
-
-BSER::BSER(std::istream &iss) {
-  BSERType type = decodeType(iss);
-  iss.unget();
-
-  switch (type) {
-    case BSER_ARRAY:
-      m_ptr = std::make_shared<BSERArray>(iss);
-      break;
-    case BSER_OBJECT:
-      m_ptr = std::make_shared<BSERObject>(iss);
-      break;
-    case BSER_STRING:
-      m_ptr = std::make_shared<BSERString>(iss);
-      break;
-    case BSER_INT8:
-    case BSER_INT16:
-    case BSER_INT32:
-    case BSER_INT64:
-      m_ptr = std::make_shared<BSERInteger>(iss);
-      break;
-    case BSER_REAL:
-      m_ptr = std::make_shared<BSERDouble>(iss);
-      break;
-    case BSER_BOOL_TRUE:
-      iss.ignore(1);
-      m_ptr = std::make_shared<BSERBoolean>(true);
-      break;
-    case BSER_BOOL_FALSE:
-      iss.ignore(1);
-      m_ptr = std::make_shared<BSERBoolean>(false);
-      break;
-    case BSER_NULL:
-      iss.ignore(1);
-      m_ptr = std::make_shared<BSERNull>();
-      break;
-    case BSER_TEMPLATE:
-      m_ptr = decodeTemplate(iss);
-      break;
-    default:
-      throw std::runtime_error("unknown BSER type");
-  }
-}
-
-BSER::BSER() : m_ptr(std::make_shared<BSERNull>()) {}
-BSER::BSER(BSER::Array value) : m_ptr(std::make_shared<BSERArray>(value)) {}
-BSER::BSER(BSER::Object value) : m_ptr(std::make_shared<BSERObject>(value)) {}
-BSER::BSER(const char *value) : m_ptr(std::make_shared<BSERString>(value)) {}
-BSER::BSER(std::string value) : m_ptr(std::make_shared<BSERString>(value)) {}
-BSER::BSER(int64_t value) : m_ptr(std::make_shared<BSERInteger>(value)) {}
-BSER::BSER(double value) : m_ptr(std::make_shared<BSERDouble>(value)) {}
-BSER::BSER(bool value) : m_ptr(std::make_shared<BSERBoolean>(value)) {}
-
-BSER::Array BSER::arrayValue() { return m_ptr->arrayValue(); }
-BSER::Object BSER::objectValue() { return m_ptr->objectValue(); }
-std::string BSER::stringValue() { return m_ptr->stringValue(); }
-int64_t BSER::intValue() { return m_ptr->intValue(); }
-double BSER::doubleValue() { return m_ptr->doubleValue(); }
-bool BSER::boolValue() { return m_ptr->boolValue(); }
-void BSER::encode(std::ostream &oss) {
-  m_ptr->encode(oss);
-}
-
-int64_t BSER::decodeLength(std::istream &iss) {
-  char pdu[2];
-  if (!iss.read(pdu, 2) || pdu[0] != 0 || pdu[1] != 1) {
-    throw std::runtime_error("Invalid BSER");
-  }
-
-  return BSERInteger(iss).intValue();
-}
-
-std::string BSER::encode() {
-  std::ostringstream oss(std::ios_base::binary);
-  encode(oss);
-
-  std::ostringstream res(std::ios_base::binary);
-  res.write("\x00\x01", 2);
-  
-  BSERInteger(oss.str().size()).encode(res);
-  res << oss.str();
-  return res.str();
-}

web/node_modules/@parcel/watcher/src/watchman/BSER.hh

@@ -1,69 +0,0 @@
-#ifndef BSER_H
-#define BSER_H
-
-#include <string>
-#include <sstream>
-#include <vector>
-#include <unordered_map>
-#include <memory>
-
-enum BSERType {
-  BSER_ARRAY = 0x00,
-  BSER_OBJECT = 0x01,
-  BSER_STRING = 0x02,
-  BSER_INT8 = 0x03,
-  BSER_INT16 = 0x04,
-  BSER_INT32 = 0x05,
-  BSER_INT64 = 0x06,
-  BSER_REAL = 0x07,
-  BSER_BOOL_TRUE = 0x08,
-  BSER_BOOL_FALSE = 0x09,
-  BSER_NULL = 0x0a,
-  BSER_TEMPLATE = 0x0b
-};
-
-class BSERValue;
-
-class BSER {
-public:
-  typedef std::vector<BSER> Array;
-  typedef std::unordered_map<std::string, BSER> Object;
-
-  BSER();
-  BSER(BSER::Array value);
-  BSER(BSER::Object value);
-  BSER(std::string value);
-  BSER(const char *value);
-  BSER(int64_t value);
-  BSER(double value);
-  BSER(bool value);
-  BSER(std::istream &iss);
-
-  BSER::Array arrayValue();
-  BSER::Object objectValue();
-  std::string stringValue();
-  int64_t intValue();
-  double doubleValue();
-  bool boolValue();
-  void encode(std::ostream &oss);
-
-  static int64_t decodeLength(std::istream &iss);
-  std::string encode();
-private:
-  std::shared_ptr<BSERValue> m_ptr;
-};
-
-class BSERValue {
-protected:
-  friend class BSER;
-  virtual BSER::Array arrayValue() { return BSER::Array(); }
-  virtual BSER::Object objectValue() { return BSER::Object(); }
-  virtual std::string stringValue() { return std::string(); }
-  virtual int64_t intValue() { return 0; }
-  virtual double doubleValue() { return 0; }
-  virtual bool boolValue() { return false; }
-  virtual void encode(std::ostream &oss) {}
-  virtual ~BSERValue() {}
-};
-
-#endif

web/node_modules/@parcel/watcher/src/watchman/IPC.hh

@@ -1,175 +0,0 @@
-#ifndef IPC_H
-#define IPC_H
-
-#include <string>
-#include <stdlib.h>
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <windows.h>
-#else
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#endif
-
-class IPC {
-public:
-  IPC(std::string path) {
-    mStopped = false;
-    #ifdef _WIN32
-      while (true) {
-        mPipe = CreateFile(
-          path.data(), // pipe name
-          GENERIC_READ | GENERIC_WRITE, // read and write access
-          0, // no sharing
-          NULL, // default security attributes
-          OPEN_EXISTING, // opens existing pipe
-          FILE_FLAG_OVERLAPPED, // attributes
-          NULL // no template file
-        );
-
-        if (mPipe != INVALID_HANDLE_VALUE) {
-          break;
-        }
-
-        if (GetLastError() != ERROR_PIPE_BUSY) {
-          throw std::runtime_error("Could not open pipe");
-        }
-
-        // Wait for pipe to become available if it is busy
-        if (!WaitNamedPipe(path.data(), 30000)) {
-          throw std::runtime_error("Error waiting for pipe");
-        }
-      }
-
-      mReader = CreateEvent(NULL, true, false, NULL);
-      mWriter = CreateEvent(NULL, true, false, NULL);
-    #else
-      struct sockaddr_un addr;
-      memset(&addr, 0, sizeof(addr));
-      addr.sun_family = AF_UNIX;
-      strncpy(addr.sun_path, path.c_str(), sizeof(addr.sun_path) - 1);
-
-      mSock = socket(AF_UNIX, SOCK_STREAM, 0);
-      if (connect(mSock, (struct sockaddr *) &addr, sizeof(struct sockaddr_un))) {
-        throw std::runtime_error("Error connecting to socket");
-      }
-    #endif
-  }
-
-  ~IPC() {
-    mStopped = true;
-    #ifdef _WIN32
-      CancelIo(mPipe);
-      CloseHandle(mPipe);
-      CloseHandle(mReader);
-      CloseHandle(mWriter);
-    #else
-      shutdown(mSock, SHUT_RDWR);
-    #endif
-  }
-
-  void write(std::string buf) {
-    #ifdef _WIN32
-      OVERLAPPED overlapped;
-      overlapped.hEvent = mWriter;
-      bool success = WriteFile(
-        mPipe, // pipe handle
-        buf.data(), // message
-        buf.size(), // message length
-        NULL, // bytes written
-        &overlapped // overlapped
-      );
-
-      if (mStopped) {
-        return;
-      }
-
-      if (!success) {
-        if (GetLastError() != ERROR_IO_PENDING) {
-          throw std::runtime_error("Write error");
-        }
-      }
-
-      DWORD written;
-      success = GetOverlappedResult(mPipe, &overlapped, &written, true);
-      if (!success) {
-        throw std::runtime_error("GetOverlappedResult failed");
-      }
-
-      if (written != buf.size()) {
-        throw std::runtime_error("Wrong number of bytes written");
-      }
-    #else
-      int r = 0;
-      for (unsigned int i = 0; i != buf.size(); i += r) {
-        r = ::write(mSock, &buf[i], buf.size() - i);
-        if (r == -1) {
-          if (errno == EAGAIN) {
-            r = 0;
-          } else if (mStopped) {
-            return;
-          } else {
-            throw std::runtime_error("Write error");
-          }
-        }
-      }
-    #endif
-  }
-
-  int read(char *buf, size_t len) {
-    #ifdef _WIN32
-      OVERLAPPED overlapped;
-      overlapped.hEvent = mReader;
-      bool success = ReadFile(
-        mPipe, // pipe handle
-        buf, // buffer to receive reply
-        len, // size of buffer
-        NULL, // number of bytes read
-        &overlapped // overlapped
-      );
-
-      if (!success && !mStopped) {
-        if (GetLastError() != ERROR_IO_PENDING) {
-          throw std::runtime_error("Read error");
-        }
-      }
-
-      DWORD read = 0;
-      success = GetOverlappedResult(mPipe, &overlapped, &read, true);
-      if (!success && !mStopped) {
-        throw std::runtime_error("GetOverlappedResult failed");
-      }
-
-      return read;
-    #else
-      int r = ::read(mSock, buf, len);
-      if (r == 0 && !mStopped) {
-        throw std::runtime_error("Socket ended unexpectedly");
-      }
-
-      if (r < 0) {
-        if (mStopped) {
-          return 0;
-        }
-
-        throw std::runtime_error(strerror(errno));
-      }
-
-      return r;
-    #endif
-  }
-
-private:
-  bool mStopped;
-  #ifdef _WIN32
-    HANDLE mPipe;
-    HANDLE mReader;
-    HANDLE mWriter;
-  #else
-    int mSock;
-  #endif
-};
-
-#endif