Merge branch 'main' into spie06

config.yaml

@@ -32,6 +32,7 @@ views:
     update:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/_partials/address.html
         - web/layouts/beneficiaries/update.html
   members:
     display:
@@ -84,11 +85,15 @@ views:
     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
+    delete_booking: 
+      files: 
+        - web/layouts/vehicles_management/delete-booking.html
   agenda: 
     list: 
       files: 

emails/auth/retrieve-password.html

@@ -1,5 +1,5 @@
 {{define "content"}}
 <p>Bonjour,</p>
 <p>Vous avez demandé à réinitialiser votre mot de passe pour <b>{{.username}}</b></p>
-<p>Pour créer votre nouveau mot de passe, cliquez sur le lien suivant : <a href="http://localhost:9000/auth/lost-password/recover?key={{.key}}">http://localhost:9000/auth/lost-password/recover?key={{.key}}</a></p>
+<p>Pour créer votre nouveau mot de passe, cliquez sur le lien suivant : <a href="https://spie06.parcoursmob.fr/auth/lost-password/recover?key={{.key}}">https://spie06.parcoursmob.fr/auth/lost-password/recover?key={{.key}}</a></p>
 {{end}}

emails/fleets/bookings/creation-admin-alert.html

@@ -1,4 +1,4 @@
 {{define "content"}}
 <p>Vous avez une nouvelle réservation e véhicule sur PARCOURSMOB.</p>
-<p>Connectez vous sur <a href="http://localhost:9000/app/vehicles-management/bookings/{{.bookingid}}">http://localhost:9000/app/vehicles-management/bookings/{{.bookingid}}</a> pour y accéder</p>
+<p>Connectez vous sur <a href="https://spie06.parcoursmob.fr/app/vehicles-management/bookings/{{.bookingid}}">https://spie06.parcoursmob.fr/app/vehicles-management/bookings/{{.bookingid}}</a> pour y accéder</p>
 {{end}}

emails/onboarding/existing-administrator.html

@@ -1,4 +1,4 @@
 {{define "content"}}
 <p>Vous avez été ajouté comme administrateur de l'organisation {{.group}} sur PARCOURSMOB.</p>
-<p>Connectez vous sur <a href="http://localhost:9000">http://localhost:9000</a> pour y accéder</p>
+<p>Connectez vous sur <a href="https://spie06.parcoursmob.fr">https://spie06.parcoursmob.fr</a> pour y accéder</p>
 {{end}}

emails/onboarding/existing-member.html

@@ -1,4 +1,4 @@
 {{define "content"}}
 <p>Vous avez été ajouté à l'organisation {{.group}} sur PARCOURSMOB.</p>
-<p>Connectez vous sur <a href="http://localhost:9000">http://localhost:9000</a> pour y accéder</p>
+<p>Connectez vous sur <a href="https://spie06.parcoursmob.fr">https://spie06.parcoursmob.fr</a> pour y accéder</p>
 {{end}}

emails/onboarding/new-administrator.html

@@ -1,5 +1,5 @@
 {{define "content"}}
 <p>Vous avez été ajouté comme administrateur de l'organisation {{.group}} sur PARCOURSMOB.</p>
 <p>Vous devez créer votre compte pour y accéder.</p>
-<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="http://localhost:9000/auth/onboarding?key={{.key}}">http://localhost:9000/auth/onboarding?key={{.key}}</a></p>
+<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="https://spie06.parcoursmob.fr/auth/onboarding?key={{.key}}">https://spie06.parcoursmob.fr/auth/onboarding?key={{.key}}</a></p>
 {{end}}

emails/onboarding/new-member.html

@@ -1,5 +1,5 @@
 {{define "content"}}
 <p>Vous avez été ajouté à l'organisation {{.group}} sur PARCOURSMOB.</p>
 <p>Vous devez créer votre compte pour y accéder.</p>
-<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="http://localhost:9000/auth/onboarding?key={{.key}}">http://localhost:9000/auth/onboarding?key={{.key}}</a></p>
+<p>Pour créer votre compte PARCOURSMOB, cliquez sur : <a href="https://spie06.parcoursmob.fr/auth/onboarding?key={{.key}}">https://spie06.parcoursmob.fr/auth/onboarding?key={{.key}}</a></p>
 {{end}}

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>Vous avez reçu un message sur le support PARCOURSMOB de la part de <b>{{.user}}</b></p>
 <p>{{.key}}</p>
 {{end}}

web/layouts/administration/bookings_stats.html

@@ -8,7 +8,7 @@
             
         </div>
         <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
-            <a href="/exports/fleets/bookings">
+            <a href="/app/administration/stats/bookings/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">
                     Export

web/layouts/auth/lost-password-init.html

@@ -2,7 +2,7 @@
 <html class="h-full bg-gray-50">
     <head>
         <title>PARCOURSMOB - Identification</title>
-        <link rel="stylesheet" href="http://localhost:9000/public/css/main.css" />
+        <link rel="stylesheet" href="/public/css/main.css" />
     </head>
     <body class="h-full">
         <form method="post">

web/layouts/auth/lost-password-recover-ko.html

@@ -2,7 +2,7 @@
 <html class="h-full bg-gray-50">
     <head>
         <title>PARCOURSMOB - Identification</title>
-        <link rel="stylesheet" href="http://localhost:9000/public/css/main.css" />
+        <link rel="stylesheet" href="/public/css/main.css" />
     </head>
     <body class="h-full">
 

web/layouts/auth/lost-password-recover.html

@@ -2,7 +2,7 @@
 <html class="h-full bg-gray-50">
     <head>
         <title>PARCOURSMOB - Identification</title>
-        <link rel="stylesheet" href="http://localhost:9000/public/css/main.css" />
+        <link rel="stylesheet" href="/public/css/main.css" />
     </head>
     <body class="h-full">
         <form method="post">

web/layouts/auth/onboarding-ko.html

@@ -2,7 +2,7 @@
 <html class="h-full bg-gray-50">
     <head>
         <title>PARCOURSMOB - Identification</title>
-        <link rel="stylesheet" href="http://localhost:9000/public/css/main.css" />
+        <link rel="stylesheet" href="/public/css/main.css" />
     </head>
     <body class="h-full">
 

web/layouts/auth/onboarding.html

@@ -2,7 +2,7 @@
 <html class="h-full bg-gray-50">
     <head>
         <title>PARCOURSMOB - Identification</title>
-        <link rel="stylesheet" href="http://localhost:9000/public/css/main.css" />
+        <link rel="stylesheet" href="/public/css/main.css" />
     </head>
     <body class="h-full">
         <form method="post">

web/layouts/beneficiaries/update.html

@@ -163,7 +163,12 @@
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
 
                     {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.Data.address) }}
+                    {{if .ViewState.Data.address}}
+                    {{$default := .ViewState.Data.address}}
+                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                    {{else}}
+                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                    {{end}}
                     <!-- will dolater : tags, groups, ... -->
 
                 </div>

web/layouts/layout.html

@@ -22,7 +22,7 @@
       x-transition:enter="transition ease-in-out duration-300 transform" x-transition:enter-start="-translate-x-full"
       x-transition:enter-end="translate-x-0" x-transition:leave="transition ease-in-out duration-300 transform"
       x-transition:leave-start="translate-x-0" x-transition:leave-end="-translate-x-full">
-      <div class="relative flex-1 flex flex-col max-w-xs w-full pt-5 pb-4 bg-co-blue">
+      <div class="relative flex-1 flex flex-col max-w-xs w-full pb-4 bg-co-blue">
         <div class="absolute top-0 right-0 -mr-12 pt-2" @click="offCanvasMenu = false">
           <button type="button"
             class="ml-1 flex items-center justify-center h-10 w-10 rounded-full focus:outline-none focus:ring-2 focus:ring-inset focus:ring-white">
@@ -31,7 +31,8 @@
           </button>
         </div>
 
-        <div class="flex-shrink-0 flex items-center px-4">
+        <div class="bg-white flex items-center shadow"><img class="h-16 w-auto m-auto" src="/public/images/departement06.png"></div>
+        <div class="flex-shrink-0 flex items-center px-4 pt-5">
           <img class="h-8 w-auto" src="/public/images/main_logo.svg" alt="PARCOURSMOB">
         </div>
         <div class="mt-5 flex-1 h-0 overflow-y-auto">
@@ -50,9 +51,10 @@
   <!-- Static sidebar for desktop -->
   <div class="hidden md:flex md:w-64 md:flex-col md:fixed md:inset-y-0">
     <!-- Sidebar component, swap this element with another sidebar if you like -->
-    <div class="flex flex-col flex-grow pt-5 bg-co-blue overflow-y-auto">
+    <div class="flex flex-col flex-grow bg-co-blue overflow-y-auto">
-      <div class="flex items-center flex-shrink-0 px-4">
+      <div class="bg-white flex items-center shadow"><img class="h-16 w-auto m-auto" src="/public/images/departement06.png"></div>
-        <img class="h-8 w-auto" src="/public/images/parcoursmob_logo_whitered.svg" alt="PARCOURSMOB">
+      <div class="flex items-center flex-shrink-0 px-4 pt-5">
+        <img class="h-8 w-auto m-auto" src="/public/images/main_logo.svg" alt="PARCOURSMOB">
       </div>
       <div class="mt-5 flex-1 flex flex-col">
         {{ template "mainmenu" . }}

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

@@ -39,6 +39,10 @@
                                     <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                         Retiré
                                     </span>
+                                    {{else if or .Deleted .Data.Deleted}}
+                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                        Annulé
+                                    </span>
                                     {{else}}
                                         {{if eq .Status 1 }}
                                         <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >

web/layouts/vehicles_management/booking-display.html

@@ -11,16 +11,19 @@
                 changeVehicle: false,
                 selectedvehicle: ''
             }">
+            {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
             <button type="button" @click="changeVehicle = ! changeVehicle"
                 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>
+            {{end}}
+            
 
             <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>
@@ -109,8 +112,13 @@
                 <div class="bg-white px-4 py-5 border-b border-gray-200 sm:px-6">
                     <div class="-ml-4 -mt-4 flex justify-between items-center flex-wrap sm:flex-nowrap">
                         <div class="ml-4 mt-4">
+                            {{if or .ViewState.booking.Data.Deleted .ViewState.booking.Deleted}}
+                            <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation annulée le {{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</h3>
+                            <p class="mt-1 text-sm text-gray-500">Motif : {{.ViewState.booking.Data.motif}}</p>
+                            {{else}}
                             <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation</h3>
                             <p class="mt-1 text-sm text-gray-500">Informations utiles sur la réservation.</p>
+                            {{end}}
                         </div>
                         <div class="ml-4 mt-4 flex-shrink-0">
                             <!-- <button type="button"
@@ -175,7 +183,9 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Startdate).Format "02/01/2006"}}</div>
+                                        {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
+                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">
@@ -195,7 +205,9 @@
                                         x-data="{ updateOpen: false }">
                                         <div class="w-full inline-flex" x-show="!updateOpen">
                                             <div class="flex-1">{{(timeFrom .ViewState.booking.Enddate).Format "02/01/2006"}}</div>
+                                            {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                             <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
+                                            {{end}}
                                         </div>
                                         <form method="POST" class="inline-flex" x-show="updateOpen">
                                             <div class="flex-1">
@@ -215,7 +227,9 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailablefrom).Format "02/01/2006"}}</div>
+                                        {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
+                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">
@@ -235,7 +249,9 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</div>
+                                        {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
+                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">

web/layouts/vehicles_management/bookings-list.html

@@ -9,7 +9,7 @@
         </div>
         <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
             
-            <a href="/api/cache/{{.ViewState.cacheid}}/export">
+            <a href="/exports/fleets/bookings">
                 <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"}}

web/layouts/vehicles_management/fleet-update.html

@@ -78,7 +78,12 @@
                 </div>
                 <div class="mt-5 md:mt-0 md:col-span-2">
                     {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.vehicle.Data.address) }}
+                    {{if .ViewState.Data.address}}
+                    {{$default := .ViewState.Data.address}}
+                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                    {{else}}
+                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                    {{end}}
 
                     <div class="mt-5">
                         <label for="informations" class="block text-sm font-medium text-gray-700">Informations pratiques pour le bénéficiaire</label>

web/public/css/main.css

@@ -834,6 +834,10 @@ html {
   grid-column: span 5 / span 5;
 }
 
+.m-auto {
+  margin: auto;
+}
+
 .m-4 {
   margin: 1rem;
 }
@@ -1057,6 +1061,10 @@ html {
   height: 1.5rem;
 }
 
+.h-16 {
+  height: 4rem;
+}
+
 .h-8 {
   height: 2rem;
 }
@@ -1065,10 +1073,6 @@ html {
   height: 0px;
 }
 
-.h-16 {
-  height: 4rem;
-}
-
 .h-5 {
   height: 1.25rem;
 }
@@ -1591,7 +1595,7 @@ html {
 
 .border-co-red {
   --tw-border-opacity: 1;
-  border-color: rgb(255 19 0 / var(--tw-border-opacity));
+  border-color: rgb(222 21 129 / var(--tw-border-opacity));
 }
 
 .border-indigo-500 {
@@ -1601,7 +1605,7 @@ html {
 
 .border-co-blue {
   --tw-border-opacity: 1;
-  border-color: rgb(36 56 135 / var(--tw-border-opacity));
+  border-color: rgb(0 114 126 / var(--tw-border-opacity));
 }
 
 .bg-gray-100 {
@@ -1616,7 +1620,7 @@ html {
 
 .bg-co-blue {
   --tw-bg-opacity: 1;
-  background-color: rgb(36 56 135 / var(--tw-bg-opacity));
+  background-color: rgb(0 114 126 / var(--tw-bg-opacity));
 }
 
 .bg-white {
@@ -1631,7 +1635,7 @@ html {
 
 .bg-co-red {
   --tw-bg-opacity: 1;
-  background-color: rgb(255 19 0 / var(--tw-bg-opacity));
+  background-color: rgb(222 21 129 / var(--tw-bg-opacity));
 }
 
 .bg-co-yellow {
@@ -1794,10 +1798,6 @@ html {
   padding-right: 1.5rem;
 }
 
-.pt-5 {
-  padding-top: 1.25rem;
-}
-
 .pb-4 {
   padding-bottom: 1rem;
 }
@@ -1806,6 +1806,10 @@ html {
   padding-top: 0.5rem;
 }
 
+.pt-5 {
+  padding-top: 1.25rem;
+}
+
 .pl-8 {
   padding-left: 2rem;
 }
@@ -2008,12 +2012,12 @@ html {
 
 .text-co-blue {
   --tw-text-opacity: 1;
-  color: rgb(36 56 135 / var(--tw-text-opacity));
+  color: rgb(0 114 126 / var(--tw-text-opacity));
 }
 
 .text-co-red {
   --tw-text-opacity: 1;
-  color: rgb(255 19 0 / var(--tw-text-opacity));
+  color: rgb(222 21 129 / var(--tw-text-opacity));
 }
 
 .text-indigo-600 {
@@ -2253,7 +2257,7 @@ html {
 
 .focus-within\:ring-co-blue:focus-within {
   --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(36 56 135 / var(--tw-ring-opacity));
+  --tw-ring-color: rgb(0 114 126 / var(--tw-ring-opacity));
 }
 
 .focus-within\:ring-offset-2:focus-within {
@@ -2282,7 +2286,7 @@ html {
 
 .hover\:bg-co-blue:hover {
   --tw-bg-opacity: 1;
-  background-color: rgb(36 56 135 / var(--tw-bg-opacity));
+  background-color: rgb(0 114 126 / var(--tw-bg-opacity));
 }
 
 .hover\:bg-gray-100:hover {
@@ -2306,7 +2310,7 @@ html {
 
 .hover\:text-co-blue:hover {
   --tw-text-opacity: 1;
-  color: rgb(36 56 135 / var(--tw-text-opacity));
+  color: rgb(0 114 126 / var(--tw-text-opacity));
 }
 
 .hover\:text-white:hover {
@@ -2339,7 +2343,7 @@ html {
 
 .focus\:border-co-blue:focus {
   --tw-border-opacity: 1;
-  border-color: rgb(36 56 135 / var(--tw-border-opacity));
+  border-color: rgb(0 114 126 / var(--tw-border-opacity));
 }
 
 .focus\:border-indigo-500:focus {
@@ -2401,7 +2405,7 @@ html {
 
 .focus\:ring-co-blue:focus {
   --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(36 56 135 / var(--tw-ring-opacity));
+  --tw-ring-color: rgb(0 114 126 / var(--tw-ring-opacity));
 }
 
 .focus\:ring-indigo-500:focus {
@@ -2411,7 +2415,7 @@ html {
 
 .focus\:ring-co-red:focus {
   --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(255 19 0 / var(--tw-ring-opacity));
+  --tw-ring-color: rgb(222 21 129 / var(--tw-ring-opacity));
 }
 
 .focus\:ring-blue-500:focus {

web/public/images/main_logo.svg

@@ -1 +1,91 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 374.2 33.2"><defs><style>.cls-1{fill:#ff1300;}.cls-2{fill:#fff;}</style></defs><g id="Calque_2" data-name="Calque 2"><g id="Calque_1-2" data-name="Calque 1"><path class="cls-1" d="M300.9.6a4.7,4.7,0,0,1,4.9,4.9V32.6h-8.6a4.7,4.7,0,0,1-4.9-4.9V14.1h-.9c-.6,0-1,.6-1,1.5v17H282a4.7,4.7,0,0,1-4.9-4.9V14.1h-1a1.4,1.4,0,0,0-.9,1.5v17H263a1.2,1.2,0,0,1-1.2-1.2V5.5A4.7,4.7,0,0,1,266.7.6h17.9l-.7,5a.9.9,0,0,0,.7,1.1.9.9,0,0,0,1-.8l.8-4.6a.9.9,0,0,1,.9-.7Z"/><path class="cls-1" d="M341.1,16.4c0,9.1-1.9,16.8-16.5,16.8S307.8,25,307.8,16.4,310.6,0,324.6,0,341.1,7.8,341.1,16.4Z"/><path class="cls-1" d="M344.3,32.6a1.2,1.2,0,0,1-1.2-1.2V1.8A1.2,1.2,0,0,1,344.3.6h18.8c6.9,0,10.4,2.9,10.4,8.1s-1.6,6.9-4.5,7.5h0c2.9.6,5.2,3.2,5.2,7.7s-3.5,8.6-10.4,8.6Z"/><path class="cls-2" d="M16.2,11.6c0-.6-.4-.9-1-.9h-.8V31.4a1.2,1.2,0,0,1-1.2,1.2H1.2A1.2,1.2,0,0,1,0,31.4V1.8A1.2,1.2,0,0,1,1.2.6H16.8C25.7.6,30.9,4.2,31,10.7s-4.1,9.9-9.4,10H16.1Z"/><path class="cls-2" d="M44.9,23.1H43.2L40,31.9a1.1,1.1,0,0,1-1.2.7H26.9a1.3,1.3,0,0,1-1.3-1.9L37,3.4A4.5,4.5,0,0,1,41.3.6h5.8a4.1,4.1,0,0,1,4,2.6L62.6,30.8c.5,1-.2,1.8-1.3,1.8H41.7Z"/><path class="cls-2" d="M66.1,32.6a1.2,1.2,0,0,1-1.2-1.2V1.8A1.2,1.2,0,0,1,66.1.6H83.2C92.7.6,95.5,7,95.6,12.3c0,3.3-.8,6.9-3.4,8.3l3.4,12H84.4c-2.3,0-5.2-.7-5.9-2.7L71.9,10.7a1,1,0,0,0-1.2-.7,1,1,0,0,0-.5,1.3l7.2,21.3Z"/><path class="cls-2" d="M129.6,17.1c.8,0,1.3.5,1.2,1.2-.2,8.3-2.9,14.9-16.4,14.9-15.8.1-16.8-8.2-16.8-16.8S100.5,0,114.4,0c15.7,0,16.5,8,16.5,15.4H115.3V11.3c0-.8-.4-1.2-1-1.2s-.9.4-.9,1.2V21.9c0,.9.4,1.2.9,1.2s1-.3,1-1.2V17.1Z"/><path class="cls-2" d="M166.2,16.4c0,9.1-2,16.8-16.6,16.8S132.8,25,132.8,16.4,135.7,0,149.6,0,166.2,7.8,166.2,16.4Z"/><path class="cls-2" d="M200.5,1.8V12.2c0,12.7-1.4,21-16.3,21s-16-8.4-16-20.9V1.8A1.2,1.2,0,0,1,169.4.6h13a.9.9,0,0,1,.9.9V21.8c0,.9.4,1.2,1,1.2s.9-.3.9-1.2V1.5a.9.9,0,0,1,.9-.9h13.1A1.2,1.2,0,0,1,200.5,1.8Z"/><path class="cls-2" d="M203.9,32.6a1.2,1.2,0,0,1-1.3-1.2V1.8A1.2,1.2,0,0,1,203.8.6h17.1c9.5,0,12.3,6.4,12.4,11.7,0,3.3-.8,6.9-3.4,8.3l3.4,12H222.1c-2.3,0-5.2-.7-5.9-2.7l-6.6-19.2a1,1,0,0,0-1.2-.7,1,1,0,0,0-.5,1.3l7.2,21.3Z"/><path class="cls-2" d="M235.8,29.2v-10a1,1,0,0,1,1.5-1l11.1,5.1a1,1,0,0,0,1.2-.4.9.9,0,0,0-.6-1.2l-9.3-4.4c-4.5-2.2-4.4-5.5-4.4-8.2,0-7.6,7.4-9.1,14.6-9.1,5.4,0,12.1,1.8,14.3,4.4v9.2a1,1,0,0,1-1.5,1L252.3,9.8a1,1,0,0,0-1.3.4q-.3.8.6,1.2l8.5,4.1c5.3,2.6,4.7,4.9,4.7,9.2s-6.3,8.5-14.9,8.5C244.7,33.2,238,31.6,235.8,29.2Z"/></g></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 374.2 33.2"
+   version="1.1"
+   id="svg30"
+   sodipodi:docname="main_logo.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview32"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="4.0700159"
+     inkscape:cx="317.93488"
+     inkscape:cy="16.707551"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Calque_1-2" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#ff1300;}.cls-2{fill:#fff;}</style>
+  </defs>
+  <g
+     id="Calque_2"
+     data-name="Calque 2">
+    <g
+       id="Calque_1-2"
+       data-name="Calque 1">
+      <path
+         class="cls-1"
+         d="M300.9.6a4.7,4.7,0,0,1,4.9,4.9V32.6h-8.6a4.7,4.7,0,0,1-4.9-4.9V14.1h-.9c-.6,0-1,.6-1,1.5v17H282a4.7,4.7,0,0,1-4.9-4.9V14.1h-1a1.4,1.4,0,0,0-.9,1.5v17H263a1.2,1.2,0,0,1-1.2-1.2V5.5A4.7,4.7,0,0,1,266.7.6h17.9l-.7,5a.9.9,0,0,0,.7,1.1.9.9,0,0,0,1-.8l.8-4.6a.9.9,0,0,1,.9-.7Z"
+         id="path6"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         class="cls-1"
+         d="M341.1,16.4c0,9.1-1.9,16.8-16.5,16.8S307.8,25,307.8,16.4,310.6,0,324.6,0,341.1,7.8,341.1,16.4Z"
+         id="path8"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         class="cls-1"
+         d="M344.3,32.6a1.2,1.2,0,0,1-1.2-1.2V1.8A1.2,1.2,0,0,1,344.3.6h18.8c6.9,0,10.4,2.9,10.4,8.1s-1.6,6.9-4.5,7.5h0c2.9.6,5.2,3.2,5.2,7.7s-3.5,8.6-10.4,8.6Z"
+         id="path10"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         class="cls-2"
+         d="M16.2,11.6c0-.6-.4-.9-1-.9h-.8V31.4a1.2,1.2,0,0,1-1.2,1.2H1.2A1.2,1.2,0,0,1,0,31.4V1.8A1.2,1.2,0,0,1,1.2.6H16.8C25.7.6,30.9,4.2,31,10.7s-4.1,9.9-9.4,10H16.1Z"
+         id="path12" />
+      <path
+         class="cls-2"
+         d="M44.9,23.1H43.2L40,31.9a1.1,1.1,0,0,1-1.2.7H26.9a1.3,1.3,0,0,1-1.3-1.9L37,3.4A4.5,4.5,0,0,1,41.3.6h5.8a4.1,4.1,0,0,1,4,2.6L62.6,30.8c.5,1-.2,1.8-1.3,1.8H41.7Z"
+         id="path14" />
+      <path
+         class="cls-2"
+         d="M66.1,32.6a1.2,1.2,0,0,1-1.2-1.2V1.8A1.2,1.2,0,0,1,66.1.6H83.2C92.7.6,95.5,7,95.6,12.3c0,3.3-.8,6.9-3.4,8.3l3.4,12H84.4c-2.3,0-5.2-.7-5.9-2.7L71.9,10.7a1,1,0,0,0-1.2-.7,1,1,0,0,0-.5,1.3l7.2,21.3Z"
+         id="path16" />
+      <path
+         class="cls-2"
+         d="M129.6,17.1c.8,0,1.3.5,1.2,1.2-.2,8.3-2.9,14.9-16.4,14.9-15.8.1-16.8-8.2-16.8-16.8S100.5,0,114.4,0c15.7,0,16.5,8,16.5,15.4H115.3V11.3c0-.8-.4-1.2-1-1.2s-.9.4-.9,1.2V21.9c0,.9.4,1.2.9,1.2s1-.3,1-1.2V17.1Z"
+         id="path18" />
+      <path
+         class="cls-2"
+         d="M166.2,16.4c0,9.1-2,16.8-16.6,16.8S132.8,25,132.8,16.4,135.7,0,149.6,0,166.2,7.8,166.2,16.4Z"
+         id="path20" />
+      <path
+         class="cls-2"
+         d="M200.5,1.8V12.2c0,12.7-1.4,21-16.3,21s-16-8.4-16-20.9V1.8A1.2,1.2,0,0,1,169.4.6h13a.9.9,0,0,1,.9.9V21.8c0,.9.4,1.2,1,1.2s.9-.3.9-1.2V1.5a.9.9,0,0,1,.9-.9h13.1A1.2,1.2,0,0,1,200.5,1.8Z"
+         id="path22" />
+      <path
+         class="cls-2"
+         d="M203.9,32.6a1.2,1.2,0,0,1-1.3-1.2V1.8A1.2,1.2,0,0,1,203.8.6h17.1c9.5,0,12.3,6.4,12.4,11.7,0,3.3-.8,6.9-3.4,8.3l3.4,12H222.1c-2.3,0-5.2-.7-5.9-2.7l-6.6-19.2a1,1,0,0,0-1.2-.7,1,1,0,0,0-.5,1.3l7.2,21.3Z"
+         id="path24" />
+      <path
+         class="cls-2"
+         d="M235.8,29.2v-10a1,1,0,0,1,1.5-1l11.1,5.1a1,1,0,0,0,1.2-.4.9.9,0,0,0-.6-1.2l-9.3-4.4c-4.5-2.2-4.4-5.5-4.4-8.2,0-7.6,7.4-9.1,14.6-9.1,5.4,0,12.1,1.8,14.3,4.4v9.2a1,1,0,0,1-1.5,1L252.3,9.8a1,1,0,0,0-1.3.4q-.3.8.6,1.2l8.5,4.1c5.3,2.6,4.7,4.9,4.7,9.2s-6.3,8.5-14.9,8.5C244.7,33.2,238,31.6,235.8,29.2Z"
+         id="path26" />
+    </g>
+  </g>
+</svg>

web/tailwind.config.js

@@ -4,9 +4,9 @@ module.exports = {
   theme: {
     extend: {
       colors: {
-        'co-blue': '#243887',
+        'co-blue': '#00727e',
         'co-lightblue': '#907eff',
-        'co-red': '#ff1300',
+        'co-red': '#de1581',
         'co-green': '#6cc11f',
         'co-yellow': '#ffdd00',
         'co-orange': 'ff5300',