Merge pull request 'dev' (#4) from dev into master

Reviewed-on: #4

src/main/java/fr/titionfire/ffsaf/domain/service/ClubService.java

@@ -10,6 +10,7 @@ import fr.titionfire.ffsaf.data.repository.CombRepository;
 import fr.titionfire.ffsaf.net2.ServerCustom;
 import fr.titionfire.ffsaf.net2.data.SimpleClubModel;
 import fr.titionfire.ffsaf.net2.request.SReqClub;
+import fr.titionfire.ffsaf.rest.data.ClubMapData;
 import fr.titionfire.ffsaf.rest.data.DeskMember;
 import fr.titionfire.ffsaf.rest.data.RenewAffData;
 import fr.titionfire.ffsaf.rest.data.SimpleClubList;
@@ -25,6 +26,7 @@ import io.quarkus.hibernate.reactive.panache.common.WithSession;
 import io.quarkus.panache.common.Page;
 import io.quarkus.panache.common.Sort;
 import io.quarkus.vertx.VertxContextSupport;
+import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.unchecked.Unchecked;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -121,7 +123,8 @@ public class ClubService {
     }
 
     public Uni<ClubModel> getOfUser(SecurityCtx securityCtx) {
-        return combRepository.find("userId = ?1", securityCtx.getSubject()).firstResult().invoke(Unchecked.consumer(m -> {
+        return combRepository.find("userId = ?1", securityCtx.getSubject()).firstResult()
+                .invoke(Unchecked.consumer(m -> {
                     if (m == null || m.getClub() == null)
                         throw new DNotFoundException("Club non trouvé");
                 }))
@@ -143,7 +146,8 @@ public class ClubService {
         TypeReference<HashMap<Contact, String>> typeRef = new TypeReference<>() {
         };
 
-        return combRepository.find("userId = ?1", securityCtx.getSubject()).firstResult().invoke(Unchecked.consumer(m -> {
+        return combRepository.find("userId = ?1", securityCtx.getSubject()).firstResult()
+                .invoke(Unchecked.consumer(m -> {
                     if (m == null || m.getClub() == null)
                         throw new DNotFoundException("Club non trouvé");
                     if (!securityCtx.isInClubGroup(m.getClub().getId()))
@@ -279,4 +283,31 @@ public class ClubService {
                         .toList()))
                 .map(o -> data);
     }
+
+    public Uni<List<ClubMapData>> getMapData() {
+        return repository.list("international", false).toMulti().flatMap(list -> Multi.createFrom().iterable(list))
+                .call(clubModel -> Mutiny.fetch(clubModel.getContact()))
+                .map(clubModel -> {
+                    ClubMapData data = new ClubMapData();
+
+                    data.setName(clubModel.getName());
+                    data.setUuid(clubModel.getClubId());
+                    if (clubModel.getTraining_location() != null) {
+                        try {
+                            MAPPER.readTree(clubModel.getTraining_location()).forEach(l -> {
+                                ClubMapData.Location loc = new ClubMapData.Location();
+                                loc.setLat(l.get("lat").asDouble());
+                                loc.setLng(l.get("lng").asDouble());
+                                loc.setAddr(l.get("text").asText());
+                                data.training_location.add(loc);
+                            });
+                        } catch (JsonProcessingException ignored) {
+                        }
+                    }
+                    data.setTraining_day_time(clubModel.getTraining_day_time());
+                    data.setContact(clubModel.getContact());
+
+                    return data;
+                }).collect().asList();
+    }
 }

src/main/java/fr/titionfire/ffsaf/domain/service/MembreService.java

@@ -41,6 +41,7 @@ import org.hibernate.reactive.mutiny.Mutiny;
 
 import java.io.*;
 import java.nio.file.Files;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Objects;
@@ -438,11 +439,27 @@ public class MembreService {
         photoCell.setBorder(PdfPCell.NO_BORDER);
         memberTable.addCell(photoCell);
 
+        String[] cert;
+        if (licence.getCertificate() != null && !licence.getCertificate().isBlank()) {
+            cert = licence.getCertificate().split("¤");
+            if (cert.length <= 1){
+                cert = new String[]{licence.getCertificate(), "--"};
+            }else{
+                try {
+                    cert[1] = sdf.format(new SimpleDateFormat("yyyy-MM-dd").parse(cert[1]));
+                } catch (ParseException e) {
+                    cert[1] = "--";
+                }
+            }
+        } else {
+            cert = new String[]{"--", "--"};
+        }
+
         // Adding member details
         memberTable.addCell(new Phrase("NOM : " + m.getLname().toUpperCase(), bodyFont));
         memberTable.addCell(new Phrase("Prénom : " + m.getFname(), bodyFont));
         memberTable.addCell(new Phrase("Licence n° : " + m.getLicence(), bodyFont));
-        memberTable.addCell(new Phrase("Certificat médical par Dr " + licence.getCertificate(), bodyFont));
+        memberTable.addCell(new Phrase("Certificat médical par " + cert[0] + ", le " + cert[1], bodyFont));
         memberTable.addCell(new Phrase("")); // Empty cell for spacing
 
         document.add(memberTable);

src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java

@@ -3,10 +3,7 @@ package fr.titionfire.ffsaf.rest;
 import fr.titionfire.ffsaf.data.model.ClubModel;
 import fr.titionfire.ffsaf.domain.service.ClubService;
 import fr.titionfire.ffsaf.net2.data.SimpleClubModel;
-import fr.titionfire.ffsaf.rest.data.DeskMember;
-import fr.titionfire.ffsaf.rest.data.RenewAffData;
-import fr.titionfire.ffsaf.rest.data.SimpleClub;
-import fr.titionfire.ffsaf.rest.data.SimpleClubList;
+import fr.titionfire.ffsaf.rest.data.*;
 import fr.titionfire.ffsaf.rest.exception.DForbiddenException;
 import fr.titionfire.ffsaf.rest.exception.DInternalError;
 import fr.titionfire.ffsaf.rest.from.FullClubForm;
@@ -315,4 +312,10 @@ public class ClubEndpoints {
         }));
     }
 
+    @GET
+    @Path("get_map_data")
+    public Uni<List<ClubMapData>> getMapData() {
+        return clubService.getMapData();
+    }
+
 }

src/main/java/fr/titionfire/ffsaf/rest/data/ClubMapData.java

@@ -0,0 +1,27 @@
+package fr.titionfire.ffsaf.rest.data;
+
+import fr.titionfire.ffsaf.utils.Contact;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Data
+@RegisterForReflection
+public class ClubMapData {
+    public String name;
+    public String uuid;
+    public List<Location> training_location = new ArrayList<>();
+    public String training_day_time;
+    public Map<Contact, String> contact;
+
+    @Data
+    @RegisterForReflection
+    public static class Location {
+        public double lat;
+        public double lng;
+        public String addr;
+    }
+}

src/main/java/fr/titionfire/ffsaf/utils/Utils.java

@@ -11,7 +11,6 @@ import java.io.*;
 import java.net.URISyntaxException;
 import java.net.URLConnection;
 import java.nio.file.Files;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.concurrent.CompletableFuture;
@@ -78,14 +77,7 @@ public class Utils {
 
             try (InputStream is = new BufferedInputStream(new ByteArrayInputStream(input))) {
                 String mimeType = URLConnection.guessContentTypeFromStream(is);
-                System.out.println(mimeType);
-                /*try {
-                    mimeType = Magic.getMagicMatch(input, false).getMimeType();
-                } catch (MagicParseException | MagicMatchNotFoundException | MagicException e) {
-                    mimeType = URLConnection.guessContentTypeFromStream(is);
-                }*/
                 String[] detectedExtensions = MimeTypes.findExtensionsByMimeTypes(mimeType, false);
-                System.out.println(Arrays.toString(detectedExtensions));
                 if (detectedExtensions.length == 0)
                     throw new IOException("Fail to detect file extension for MIME type " + mimeType);
 

src/main/resources/application.properties

@@ -52,3 +52,6 @@ quarkus.http.auth.permission.authenticated.policy=authenticated
 quarkus.http.auth.permission.public.paths=/index.html
 quarkus.http.auth.permission.public.policy=permit
 quarkus.keycloak.admin-client.server-url=https://auth.safca.fr
+
+
+quarkus.native.resources.includes=asset/**

src/main/webapp/index.html

@@ -2,9 +2,9 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8"/>
-    <link rel="icon" type="image/svg+xml" href="/vite.svg"/>
+    <link rel="icon" type="image/svg+xml" href="/FFSSAF-bord-blanc-fond-transparent.webp"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>Vite + React</title>
+    <title>FFSAF Intranet</title>
 
     <link href="/index.css" rel="stylesheet">
 
@@ -23,7 +23,7 @@
 <noscript>You need to enable JavaScript to run this app.</noscript>
 <div id="root">
     <div class="loader-container">
-        <h1 style="color: #00aff2">Chargement de l'application FFSAF...</h1>
+        <h1 style="color: #00aff2">Chargement de l'intranet FFSAF...</h1>
         <div class="spinner"></div>
     </div>
 </div>

src/main/webapp/public/club-maps.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="fr">
+<head>
+    <meta charset="UTF-8">
+    <title>Où pratiquer le MSF ?</title>
+
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
+          integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
+          crossorigin=""/>
+    <!-- Make sure you put this AFTER Leaflet's CSS -->
+    <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
+            integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
+            crossorigin=""></script>
+</head>
+<body>
+<div id="map" style="width: 100%; height: 95vh"></div>
+
+<script src="club-maps.js"></script>
+</body>
+</html>

src/main/webapp/public/club-maps.js

@@ -0,0 +1,111 @@
+const api_url = "https://intra.ffsaf.fr";
+
+let map = L.map('map').setView([46.631196, 2.456000], 6);
+
+L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    maxZoom: 19,
+    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+}).addTo(map);
+
+const getMeta = async (url) => {
+    const img = new Image();
+    img.src = url;
+    await img.decode();
+    return img
+};
+
+function timeNumberToSting(nbMin) {
+    return String(Math.floor(nbMin / 60)).padStart(2, '0') + ":" + String(nbMin % 60).padStart(2, '0')
+}
+
+const sortHoraire = (a, b) => {
+    if (a.day === b.day)
+        return a.time_start - b.time_start;
+    return a.day - b.day;
+}
+
+async function getData() {
+    const response = await fetch(`${api_url}/api/club/get_map_data`);
+    if (!response.ok) {
+        throw new Error(`Response status: ${response.status}`);
+    }
+
+    const data = await response.json();
+    for (const d of data) {
+        if (d.training_location.length === 0)
+            continue;
+
+        let icon = null;
+        if (d.uuid !== null) {
+            const img = await getMeta(`${api_url}/api/club/${d.uuid}/logo`);
+            let ratio = img.naturalHeight / img.naturalWidth;
+
+            icon = L.icon({
+                iconUrl: `${api_url}/api/club/${d.uuid}/logo`,
+
+                iconSize: [50, 50 * ratio], // size of the icon
+                //shadowSize:   [50, 64], // size of the shadow
+                iconAnchor: [25, 50 * ratio], // point of the icon which will correspond to marker's location
+                //shadowAnchor: [4, 62],  // the same for the shadow
+                popupAnchor: [0, -50 * ratio] // point from which the popup should open relative to the iconAnchor
+            });
+        }
+
+        for (const m of d.training_location) {
+            let marker;
+            if (icon === null)
+                marker = L.marker([m.lat, m.lng]);
+            else
+                marker = L.marker([m.lat, m.lng], {icon: icon});
+            marker.addTo(map);
+
+            const div_info = document.createElement("div");
+            let tmp = document.createElement("h3");
+            tmp.textContent = d.name;
+            div_info.appendChild(tmp);
+
+            div_info.appendChild(document.createTextNode(`Adresse: `));
+            div_info.appendChild(document.createElement("br"));
+            for (const m of d.training_location) {
+                div_info.appendChild(document.createTextNode(m.addr));
+                div_info.appendChild(document.createElement("br"));
+            }
+            div_info.appendChild(document.createElement("br"));
+
+            div_info.appendChild(document.createTextNode(`Horaire: `));
+            div_info.appendChild(document.createElement("br"));
+            if (!d.training_day_time || JSON.parse(d.training_day_time).length === 0) {
+                div_info.appendChild(document.createTextNode("Pas d'horaire disponible"));
+                div_info.appendChild(document.createElement("br"));
+            } else {
+                for (const m of JSON.parse(d.training_day_time).sort(sortHoraire)) {
+                    let days = ["Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche"];
+
+                    div_info.appendChild(document.createTextNode(`${days[m.day]}: ${timeNumberToSting(m.time_start)} - ${timeNumberToSting(m.time_end)}`));
+                    div_info.appendChild(document.createElement("br"));
+                }
+            }
+            div_info.appendChild(document.createElement("br"));
+
+            div_info.appendChild(document.createTextNode(`Contact: `));
+            div_info.appendChild(document.createElement("br"));
+            if (d.contact === null || Object.keys(d.contact).length === 0) {
+                div_info.appendChild(document.createTextNode("Pas de contact disponible"));
+                div_info.appendChild(document.createElement("br"));
+            } else {
+                for (const [key, value] of Object.entries(d.contact)) {
+                    div_info.appendChild(document.createTextNode(`${key.charAt(0).toUpperCase() + key.slice(1).toLowerCase()}: ${value}`));
+                    div_info.appendChild(document.createElement("br"));
+                }
+            }
+            marker.bindPopup(div_info.innerHTML);
+
+            if (icon !== null){
+                marker.valueOf()._icon.style.backgroundColor = '#FFFFFF';
+                marker.valueOf()._icon.style.borderRadius = '10px';
+            }
+        }
+    }
+}
+
+getData().then(() => console.log("end loading"));

src/main/webapp/public/vite.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

src/main/webapp/src/assets/react.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

src/main/webapp/src/components/Club/LocationEditor.jsx

@@ -98,15 +98,19 @@ export function LocationEditorModal({modal, sendData}) {
             return
 
         const delayDebounceFn = setTimeout(() => {
-            refresh(`https://api-adresse.data.gouv.fr/search/?q=${encodeURI(location)}&type=housenumber&autocomplete=1`)
+            refresh(`https://api-adresse.data.gouv.fr/search/?q=${encodeURI(location)}&type=housenumber&autocomplete=1&limit=5`)
         }, 500)
         return () => clearTimeout(delayDebounceFn)
     }, [location]);
 
     useEffect(() => {
-        if (data?.features?.length === 1) {
-            const {lat, lng} = convertLambert93ToLatLng(data.features[0].properties.x, data.features[0].properties.y)
-            setLocationObj({text: data.features[0].properties.label, lng: lng, lat: lat})
+        if (data.features?.some((e) => e.properties.label === location)) {
+            data.features.forEach((d) => {
+                if (d.properties.label === location) {
+                    const {lat, lng} = convertLambert93ToLatLng(d.properties.x, d.properties.y)
+                    setLocationObj({text: d.properties.label, lng: lng, lat: lat})
+                }
+            })
         } else {
             setLocationObj({text: "", lng: undefined, lat: undefined})
         }
@@ -144,14 +148,17 @@ export function LocationEditorModal({modal, sendData}) {
                         <div className="row">
                             <div className="input-group mb-3">
                                 <label className="input-group-text">Adresse</label>
-                                <input className="form-control" aria-autocomplete="list" aria-expanded="true" autoComplete="true"
+                                <input className="form-control" aria-autocomplete="list" aria-expanded="true"
                                        placeholder="Chercher une adresse..." aria-label="Recherche" list="addr" value={location}
                                        onChange={e => setLocation(e.target.value)}/>
-                                <datalist id="addr">
-                                    {data?.features && data.features.map((d, index) => {
-                                        return <option key={index}>{d.properties.label}</option>
+                            </div>
+                            <div className="input-group mb-3">
+                                <ul className="list-group">
+                                    {data?.features && !data.features.some((e) => e.properties.label === location) && data.features.map((d, index) => {
+                                        return <li key={index} className="list-group-item"
+                                                   onClick={() => setLocation(d.properties.label)}>{d.properties.label}</li>
                                     })}
-                                </datalist>
+                                </ul>
                             </div>
                         </div>
 
@@ -166,7 +173,9 @@ export function LocationEditorModal({modal, sendData}) {
                         </div>
                     </div>
                     <div className="modal-footer">
-                        <button type="submit" className="btn btn-primary" data-bs-dismiss="modal" disabled={locationObj.lng === undefined}>Enregistrer</button>
+                        <button type="submit" className="btn btn-primary" data-bs-dismiss="modal"
+                                disabled={locationObj.lng === undefined}>Enregistrer
+                        </button>
                         <button type="reset" className="btn btn-secondary" data-bs-dismiss="modal">Annuler</button>
                     </div>
                 </div>

src/main/webapp/src/components/Nav.jsx

@@ -1,4 +1,3 @@
-import LogoIcon from '../assets/FFSSAF-bord-blanc-fond-transparent.webp'
 import './Nav.css'
 import {NavLink} from "react-router-dom";
 import {useAuth} from "../hooks/useAuth.jsx";
@@ -9,8 +8,8 @@ export function Nav() {
     return <nav className="navbar navbar-light navbar-expand-md bg-body-tertiary " id="main-navbar">
         <div className="container-fluid">
             <a className="navbar-brand" href="/">
-                <img className="logo" src={LogoIcon} alt="logo"/>
-                FFSAF Intra
+                <img className="logo" src="/FFSSAF-bord-blanc-fond-transparent.webp" alt="logo"/>
+                FFSAF Intranet
             </a>
 
             <button className="navbar-toggler" type="button" data-bs-toggle="collapse"

src/main/webapp/src/pages/Homepage.jsx

@@ -1,7 +1,58 @@
+import {faUser, faUsers} from "@fortawesome/free-solid-svg-icons";
+import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+
 export const Home = () => {
-    return (
-        <div>
-            <h1 className="text-green-800 text-4xl">Welcome to the Homepage</h1>
+    return <>
+        <div className="container">
+            <div style={{textAlign: "center", margin: "2em"}}>
+                <h1 className="text-green-800 text-4xl">Bienvenu sur l'intranet de Fédération Française de Soft Armored Fighting</h1>
+            </div>
+            <div className="row" style={{marginTop: "3em"}}>
+                <div className="col" style={{backgroundColor: "#FFFFFF79", padding: "0", borderRadius: "3em 3em 1em 1em", margin: "1em"}}>
+                    <div className="align-content-center"
+                         style={{textAlign: "center", backgroundColor: "#FFFFFF79", padding: "1em 1em 0em 1em", borderRadius: "3em 3em 0 0"}}>
+                        <h2><FontAwesomeIcon icon={faUser} size="2xl"/></h2>
+                        <h2>Pour les combatants</h2>
+                    </div>
+                    <p style={{padding: "0.5em 1em 0.5em 1em"}}>
+                        Vous y retrouverez toutes vos informations ainsi que l'état de votre inscription à la fédération. Vous pouvez également
+                        télécharger votre attestation d'inscription, vous inscrire aux compétitions ainsi qu'en consultée vos résultats sous réserve
+                        que le club organisateur les ait renseignés. <br/>
+                        <br/>
+                        Lors de votre première inscription, vous réservez un email contenant vos
+                        informations d'identification sur ce site, ce mail sera envoyé une fois votre inscription validée par nos soins.
+                    </p>
+                </div>
+                <div className="col" style={{backgroundColor: "#FFFFFF79", padding: "0", borderRadius: "3em 3em 1em 1em", margin: "1em"}}>
+                    <div className="align-content-center"
+                         style={{textAlign: "center", backgroundColor: "#FFFFFF79", padding: "1em 1em 0em 1em", borderRadius: "3em 3em 0 0"}}>
+                        <h2><FontAwesomeIcon icon={faUsers} size="2xl"/></h2>
+                        <h2>Pour les clubs</h2>
+                    </div>
+                    <p style={{padding: "0.5em 1em 0.5em 1em"}}>
+                        C'est ici que vous pouvez faire l'inscription de vos membres à la fédération, que vous pouvez demander où renouveler votre
+                        demande d'affiliation, renseigné vos horaires, lieux d'entraînement et réseaux sociaux qui seront par la suite affichés sur le
+                        site ffsaf.fr.<br/>
+                        Vous aurez par ailleurs la possibilité de publier des formulaires d'inscriptions pour vos compétitions ainsi
+                        que d'un publié les résultats.<br/><br/>
+                        Vous n'étes pas encore affilié à la fédération ? Vous pouvez faire une demande d'affiliation en cliquant <a href="/affiliation">içi</a>.
+                    </p>
+                </div>
+            </div>
         </div>
-    );
+        <div style={{
+            backgroundImage: "url('home_back.jpg')",
+            backgroundRepeat: "no-repeat",
+            backgroundAttachment: "fixed",
+            backgroundSize: "cover",
+            backgroundPosition: "center",
+            position: "absolute",
+            height: "100vh",
+            width: "100vw",
+            top: 0,
+            left: 0,
+            zIndex: -2
+        }}>
+        </div>
+    </>
 };

src/main/webapp/src/pages/admin/member/LicenceCard.jsx

@@ -4,9 +4,7 @@ import {useEffect, useReducer, useState} from "react";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 import {faPen} from "@fortawesome/free-solid-svg-icons";
 import {AxiosError} from "../../../components/AxiosError.jsx";
-import {CheckField, TextField} from "../../../components/MemberCustomFiels.jsx";
 import {apiAxios, errFormater, getSaison} from "../../../utils/Tools.js";
-import {Input} from "../../../components/Input.jsx";
 import {toast} from "react-toastify";
 
 function licenceReducer(licences, action) {
@@ -93,6 +91,7 @@ function sendLicence(event, dispatch) {
     event.preventDefault();
 
     const formData = new FormData(event.target);
+    formData.set('certificate', `${event.target.certificateBy?.value}¤${event.target.certificateDate?.value}`)
     formData.set('licence', event.target.licence?.value?.length > 0 ? event.target.licence?.value : null)
 
     toast.promise(
@@ -132,14 +131,18 @@ function removeLicence(id, dispatch) {
 
 function ModalContent({licence, dispatch}) {
     const [saison, setSaison] = useState(0)
-    const [certificate, setCertificate] = useState("")
+    const [certificateBy, setCertificateBy] = useState("")
+    const [certificateDate, setCertificateDate] = useState("")
     const [validate, setValidate] = useState(false)
     const [isNew, setNew] = useState(true)
     const setSeason = (event) => {
         setSaison(Number(event.target.value))
     }
-    const handleCertificateChange = (event) => {
-        setCertificate(event.target.value);
+    const handleCertificateByChange = (event) => {
+        setCertificateBy(event.target.value.replaceAll('¤', ''));
+    }
+    const handleCertificateDateChange = (event) => {
+        setCertificateDate(event.target.value.replaceAll('¤', ''));
     }
     const handleValidateChange = (event) => {
         setValidate(event.target.value === 'true');
@@ -149,12 +152,14 @@ function ModalContent({licence, dispatch}) {
         if (licence.id !== -1) {
             setNew(false)
             setSaison(licence.saison)
-            setCertificate(licence.certificate)
+            setCertificateBy(licence.certificate.split('¤')[0])
+            setCertificateDate(licence.certificate.split('¤')[1])
             setValidate(licence.validate)
         } else {
             setNew(true)
             setSaison(getSaison())
-            setCertificate("")
+            setCertificateBy("")
+            setCertificateDate("")
             setValidate(false)
         }
     }, [licence]);
@@ -178,9 +183,15 @@ function ModalContent({licence, dispatch}) {
                 <span className="input-group-text" id="basic-addon2">{saison + 1}</span>
             </div>
 
-            <span>Médecin figurant sur le certificat médical</span>
-            <TextField name="certificate" text="Nom" value={certificate}
-                       onChange={handleCertificateChange} required={false}/>
+            <span>Certificat médical</span>
+            <div className="input-group mb-3 ">
+                <span className="input-group-text" id="basic-addon2">Fait par</span>
+                <input type="text" className="form-control" placeholder="Fait par" name="certificateBy"
+                       aria-label="Fait par" aria-describedby="basic-addon2" value={certificateBy} onChange={handleCertificateByChange}/>
+                <span className="input-group-text" id="basic-addon2">, le</span>
+                <input type="date" className="form-control" placeholder="jj/mm/aaaa" name="certificateDate"
+                       aria-describedby="basic-addon2" value={certificateDate} onChange={handleCertificateDateChange}/>
+            </div>
             <RadioGroupeOnOff name="validate" text="Validation de la licence" value={validate}
                               onChange={handleValidateChange}/>
         </div>

src/main/webapp/src/pages/club/member/LicenceCard.jsx

@@ -7,7 +7,6 @@ import {AxiosError} from "../../../components/AxiosError.jsx";
 import {apiAxios, errFormater, getSaison} from "../../../utils/Tools.js";
 import {toast} from "react-toastify";
 import {ColoredText} from "../../../components/ColoredCircle.jsx";
-import {TextField} from "../../../components/MemberCustomFiels.jsx";
 
 function licenceReducer(licences, action) {
     switch (action.type) {
@@ -91,6 +90,8 @@ function sendLicence(event, dispatch) {
     event.preventDefault();
 
     const formData = new FormData(event.target);
+    formData.set('certificate', `${event.target.certificateBy?.value}¤${event.target.certificateDate?.value}`)
+
     toast.promise(
         apiAxios.post(`/licence/club/${formData.get('membre')}`, formData),
         {
@@ -127,20 +128,31 @@ function removeLicence(id, dispatch) {
 }
 
 function ModalContent({licence, dispatch}) {
-    const [certificate, setCertificate] = useState("")
+    const [certificateBy, setCertificateBy] = useState("")
+    const [certificateDate, setCertificateDate] = useState("")
     const [isNew, setNew] = useState(true)
 
-    const handleCertificateChange = (event) => {
-        setCertificate(event.target.value);
+    const handleCertificateByChange = (event) => {
+        setCertificateBy(event.target.value.replaceAll('¤', ''));
+    }
+    const handleCertificateDateChange = (event) => {
+        setCertificateDate(event.target.value.replaceAll('¤', ''));
     }
 
     useEffect(() => {
         if (licence.id !== -1) {
             setNew(false)
-            setCertificate(licence.certificate)
+            if (licence.certificate === null){
+                setCertificateBy("")
+                setCertificateDate("")
+            }else {
+                setCertificateBy(licence.certificate.split('¤')[0])
+                setCertificateDate(licence.certificate.split('¤')[1])
+            }
         } else {
             setNew(true)
-            setCertificate("")
+            setCertificateBy("")
+            setCertificateDate("")
         }
     }, [licence]);
 
@@ -157,9 +169,15 @@ function ModalContent({licence, dispatch}) {
                     aria-label="Close"></button>
         </div>
         <div className="modal-body">
-            <span>Médecin figurant sur le certificat médical</span>
-            <TextField name="certificate" text="Nom" value={certificate}
-                       onChange={handleCertificateChange} required={false} disabled={!currentSaison || licence.validate}/>
+            <span>Certificat médical</span>
+            <div className="input-group mb-3 ">
+                <span className="input-group-text" id="basic-addon2">Fait par</span>
+                <input type="text" className="form-control" placeholder="Fait par" name="certificateBy"
+                       aria-label="Fait par" aria-describedby="basic-addon2" value={certificateBy} onChange={handleCertificateByChange}/>
+                <span className="input-group-text" id="basic-addon2">, le</span>
+                <input type="date" className="form-control" placeholder="jj/mm/aaaa" name="certificateDate"
+                       aria-describedby="basic-addon2" value={certificateDate} onChange={handleCertificateDateChange}/>
+            </div>
 
             <div className="input-group mb-3 justify-content-md-center">
                 <div>Validation de la licence: <ColoredText boolean={licence.validate}/></div>