Bonjour,
Vous avez demandé à réinitialiser votre mot de passe pour {{.username}}
-Pour créer votre nouveau mot de passe, cliquez sur le lien suivant : https://spie06.parcoursmob.fr/auth/lost-password/recover?key={{.key}}
-{{end}} \ No newline at end of file +Pour créer votre nouveau mot de passe, cliquez sur le lien suivant : {{ .baseUrl }}/auth/lost-password/recover?key={{.key}}
+{{end}} diff --git a/emails/onboarding/support_emailing.html b/emails/onboarding/support_emailing.html index 1d8d7d3..bf81792 100644 --- a/emails/onboarding/support_emailing.html +++ b/emails/onboarding/support_emailing.html @@ -1,4 +1,4 @@ {{define "content"}} -Vous avez reçu un message sur le support PARCOURSMOB de la part de {{.user}}
-{{.key}}
-{{end}} \ No newline at end of file +Vous avez reçu un commentaire sur PARCOURSMOB de la part de {{.user}}
+{{unescapeHTML .key}}
+{{end}} diff --git a/emails/solidarity_transport/booking_driver_accept.html b/emails/solidarity_transport/booking_driver_accept.html new file mode 100644 index 0000000..b07a0e7 --- /dev/null +++ b/emails/solidarity_transport/booking_driver_accept.html @@ -0,0 +1,5 @@ +{{define "content"}} +Bonjour,
+Trajet accepté par un conducteur.
+Voir le trajet : {{ .baseUrl }}/solidarity-transport/bookings/{{.bookingid}}
+{{end}} diff --git a/emails/solidarity_transport/booking_driver_decline.html b/emails/solidarity_transport/booking_driver_decline.html new file mode 100644 index 0000000..ac762b4 --- /dev/null +++ b/emails/solidarity_transport/booking_driver_decline.html @@ -0,0 +1,5 @@ +{{define "content"}} +Bonjour,
+Trajet refusé par un conducteur.
+Voir le trajet : {{ .baseUrl }}/solidarity-transport/bookings/{{.bookingid}}
+{{end}} diff --git a/sms/solidarity_transport/driver_accept.tmpl b/sms/solidarity_transport/driver_accept.tmpl new file mode 100644 index 0000000..d435dff --- /dev/null +++ b/sms/solidarity_transport/driver_accept.tmpl @@ -0,0 +1 @@ +{{ define "sms_template" }}[{{ .name }}] {{ .driver_first_name }} {{ .driver_last_name }} vient d'accepter votre trajet vers {{.address}} le {{.date}}.{{ end }} diff --git a/sms/solidarity_transport/request_driver.tmpl b/sms/solidarity_transport/request_driver.tmpl new file mode 100644 index 0000000..3c06dcc --- /dev/null +++ b/sms/solidarity_transport/request_driver.tmpl @@ -0,0 +1,2 @@ +{{ define "sms_template" }}[{{ .name }}] Nouvelle demande de trajet solidaire le {{ .datetime }}. +Acceptez ou refusez sur {{ .baseUrl }}/ext/st/bp/{booking_id}{{ end }} diff --git a/web/assets/css/main.css b/web/assets/css/main.css index 15ab027..f045e41 100644 --- a/web/assets/css/main.css +++ b/web/assets/css/main.css @@ -1,6 +1,15 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import "tailwindcss"; + +@theme { + --color-co-blue: #00727e; + --color-co-lightblue: #907eff; + --color-co-red: #de1581; + --color-co-green: #6cc11f; + --color-co-yellow: #ffdd00; + --color-co-orange: #ff5300; + + --radius-co: 40%; +} @font-face { font-family: "Manometer"; @@ -16,4 +25,7 @@ html { font-family: Bitter, serif; } -} \ No newline at end of file + input { + padding: 2px; + } +} diff --git a/web/assets/js/main.js b/web/assets/js/main.js index 0b0b059..773e98d 100644 --- a/web/assets/js/main.js +++ b/web/assets/js/main.js @@ -1,6 +1,11 @@ import '@kingshott/iodine'; import Alpine from 'alpinejs' +import { Protocol } from "pmtiles"; +import { layers, namedFlavor } from '@protomaps/basemaps'; window.Alpine = Alpine -Alpine.start() \ No newline at end of file +Alpine.start() + +let protocol = new Protocol(); +maplibregl.addProtocol("pmtiles",protocol.tile); diff --git a/web/layouts/_partials/address_autocomplete.html b/web/layouts/_partials/address_autocomplete.html index 3ffd1b2..374059c 100644 --- a/web/layouts/_partials/address_autocomplete.html +++ b/web/layouts/_partials/address_autocomplete.html @@ -1,13 +1,12 @@ {{ define "address_autocomplete" }} - -Aucun document
+ {{end}} + + {{if gt (len .ViewState.documents) 0}} + +| Type | +Nom du document | +Ajouté le | ++ Actions + | +
|---|---|---|---|
|
+
+ {{index $.ViewState.file_types_map .Metadata.Type}}
+
+ |
+ {{.Metadata.Name}} | +{{.LastModified.Format "02/01/2006"}} | ++ + + + | +