Compare commits
5 Commits
f8336fb407
...
prod/v1.3
| Author | SHA1 | Date | |
|---|---|---|---|
| f93d6eafb3 | |||
| e670e38343 | |||
| fe3a1ec36c | |||
| 44ae524626 | |||
| 829a69f1a5 |
@@ -58,3 +58,20 @@ jobs:
|
|||||||
echo "CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-1x00000000000000000000AA}" >> .env
|
echo "CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-1x00000000000000000000AA}" >> .env
|
||||||
docker compose down app || true
|
docker compose down app || true
|
||||||
docker compose up -d --build app
|
docker compose up -d --build app
|
||||||
|
|
||||||
|
- name: Verify application startup
|
||||||
|
run: |
|
||||||
|
echo "Waiting for application to start..."
|
||||||
|
COUNT=0
|
||||||
|
while [ $COUNT -lt 30 ]; do
|
||||||
|
if docker exec astalange_app wget -qO- http://localhost:8080/login | grep -q "Connexion"; then
|
||||||
|
echo "Application is up and login page is accessible!"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo "Waiting... ($COUNT/30)"
|
||||||
|
sleep 5
|
||||||
|
COUNT=$((COUNT+1))
|
||||||
|
done
|
||||||
|
echo "Application failed to start or login page is not accessible."
|
||||||
|
docker logs astalange_app
|
||||||
|
exit 1
|
||||||
|
|||||||
@@ -55,4 +55,19 @@ jobs:
|
|||||||
docker compose down app || true
|
docker compose down app || true
|
||||||
docker compose up -d --build app
|
docker compose up -d --build app
|
||||||
|
|
||||||
|
- name: Verify application startup
|
||||||
|
run: |
|
||||||
|
echo "Waiting for application to start..."
|
||||||
|
COUNT=0
|
||||||
|
while [ $COUNT -lt 30 ]; do
|
||||||
|
if docker exec astalange_app wget -qO- http://localhost:8080/login | grep -q "Connexion"; then
|
||||||
|
echo "Application is up and login page is accessible!"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo "Waiting... ($COUNT/30)"
|
||||||
|
sleep 5
|
||||||
|
COUNT=$((COUNT+1))
|
||||||
|
done
|
||||||
|
echo "Application failed to start or login page is not accessible."
|
||||||
|
docker logs astalange_app
|
||||||
|
exit 1
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>as-talange-parent</artifactId>
|
<artifactId>as-talange-parent</artifactId>
|
||||||
<groupId>com.astalange</groupId>
|
<groupId>com.astalange</groupId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>as-talange-parent</artifactId>
|
<artifactId>as-talange-parent</artifactId>
|
||||||
<groupId>com.astalange</groupId>
|
<groupId>com.astalange</groupId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>as-talange-parent</artifactId>
|
<artifactId>as-talange-parent</artifactId>
|
||||||
<groupId>com.astalange</groupId>
|
<groupId>com.astalange</groupId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -147,10 +147,10 @@ public class PublicInscriptionController {
|
|||||||
redirectAttributes.addFlashAttribute("tarif", tarifStr);
|
redirectAttributes.addFlashAttribute("tarif", tarifStr);
|
||||||
redirectAttributes.addFlashAttribute("documents", java.util.Arrays.asList(
|
redirectAttributes.addFlashAttribute("documents", java.util.Arrays.asList(
|
||||||
"Photo d’identité",
|
"Photo d’identité",
|
||||||
"Carte d’identité ou passeport de l’enfant",
|
"Carte d’identité ou passeport de l'adhérent",
|
||||||
"Livret de famille (si pas de pièce d’identité)",
|
"Livret de famille (si pas de pièce d’identité)",
|
||||||
"Adresse e-mail du représentant légal",
|
"Adresse e-mail de l'adhérent (représentant légal en cas de mineur)",
|
||||||
"Pour les enfants nés à l’étranger : passeport + justificatif de domicile des parents"
|
"Pour les adhérents nés à l'étranger : Passeport + justificatif de domicile (du représentant légal en cas de mineur)"
|
||||||
));
|
));
|
||||||
redirectAttributes.addFlashAttribute("isNouvelle", true);
|
redirectAttributes.addFlashAttribute("isNouvelle", true);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
spring:
|
spring:
|
||||||
application:
|
application:
|
||||||
name: as-talange
|
name: as-talange
|
||||||
app.version: @project.version@
|
|
||||||
datasource:
|
datasource:
|
||||||
url: jdbc:postgresql://localhost:5433/astalange
|
url: jdbc:postgresql://localhost:5433/astalange
|
||||||
username: myuser
|
username: myuser
|
||||||
@@ -21,3 +20,6 @@ app.version: @project.version@
|
|||||||
|
|
||||||
server:
|
server:
|
||||||
port: 8080
|
port: 8080
|
||||||
|
|
||||||
|
app:
|
||||||
|
version: @project.version@
|
||||||
|
|||||||
@@ -8,10 +8,14 @@
|
|||||||
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
|
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
|
||||||
<style>
|
<style>
|
||||||
body { font-family: 'Inter', sans-serif; }
|
body { font-family: 'Inter', sans-serif; }
|
||||||
.was-validated input:invalid {
|
.was-validated input:invalid, .was-validated select:invalid {
|
||||||
border-color: #ef4444 !important;
|
border-color: #ef4444 !important;
|
||||||
background-color: #fef2f2 !important;
|
background-color: #fef2f2 !important;
|
||||||
}
|
}
|
||||||
|
.was-validated input[type="radio"]:invalid, .was-validated input[type="checkbox"]:invalid {
|
||||||
|
outline: 2px solid #ef4444;
|
||||||
|
outline-offset: 2px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body class="bg-gray-50 flex items-center justify-center min-h-screen py-12">
|
<body class="bg-gray-50 flex items-center justify-center min-h-screen py-12">
|
||||||
@@ -28,7 +32,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<form th:action="@{/inscription-public/formulaire}" th:object="${preInscription}" method="post" class="space-y-6">
|
<form th:action="@{/inscription-public/formulaire}" th:object="${preInscription}" method="post" class="space-y-6" novalidate>
|
||||||
<input type="hidden" name="token" th:value="${tokenUuid}" />
|
<input type="hidden" name="token" th:value="${tokenUuid}" />
|
||||||
|
|
||||||
<div class="space-y-3">
|
<div class="space-y-3">
|
||||||
@@ -142,6 +146,15 @@
|
|||||||
form.addEventListener('submit', function(event) {
|
form.addEventListener('submit', function(event) {
|
||||||
if (!form.checkValidity()) {
|
if (!form.checkValidity()) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
|
let errorMsg = document.getElementById('form-error-msg');
|
||||||
|
if (!errorMsg) {
|
||||||
|
errorMsg = document.createElement('div');
|
||||||
|
errorMsg.id = 'form-error-msg';
|
||||||
|
errorMsg.className = 'mb-6 p-4 bg-red-50 border-l-4 border-red-500 text-red-700 text-sm rounded transition-all duration-300';
|
||||||
|
errorMsg.innerHTML = '<h3 class="font-bold">Erreur de validation</h3><p>Veuillez renseigner tous les champs obligatoires (encadrés en rouge).</p>';
|
||||||
|
form.insertBefore(errorMsg, form.firstChild);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
form.classList.add('was-validated');
|
form.classList.add('was-validated');
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
<groupId>com.astalange</groupId>
|
<groupId>com.astalange</groupId>
|
||||||
<artifactId>as-talange-parent</artifactId>
|
<artifactId>as-talange-parent</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.3</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<name>as-talange-parent</name>
|
<name>as-talange-parent</name>
|
||||||
|
|||||||
Reference in New Issue
Block a user