From 1bb651b7e4944011b6eac0aa60b25d28c24e1f48 Mon Sep 17 00:00:00 2001 From: maurine Date: Thu, 9 Apr 2026 19:36:55 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20suppression=20d'une=20migration=20et=20?= =?UTF-8?q?am=C3=A9lioration=20des=20formulaires=20+=20messages=20d'erreur?= =?UTF-8?q?=20(r=C3=A9vision=20design=20+=20placeholders=20ajout=C3=A9s)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- migrations/Version20260331084216.php | 35 ----------------- src/DataFixtures/AppFixtures.php | 18 --------- templates/home/home.html.twig | 10 ++--- templates/user/edit_password.html.twig | 54 ++++++++++++++------------ translations/security.fr.yaml | 2 + 5 files changed, 36 insertions(+), 83 deletions(-) delete mode 100644 migrations/Version20260331084216.php create mode 100644 translations/security.fr.yaml diff --git a/migrations/Version20260331084216.php b/migrations/Version20260331084216.php deleted file mode 100644 index 8f5111f..0000000 --- a/migrations/Version20260331084216.php +++ /dev/null @@ -1,35 +0,0 @@ -addSql('CREATE TABLE "user" (id UUID NOT NULL, email VARCHAR(180) NOT NULL, roles JSON NOT NULL, password VARCHAR(255) NOT NULL, email_quota VARCHAR(255) NOT NULL, alternate_email VARCHAR(255) NOT NULL, identifiant_kaz VARCHAR(255) NOT NULL, quota VARCHAR(255) NOT NULL, has_nextcloud_access BOOLEAN NOT NULL, nextcloud_quota VARCHAR(255) NOT NULL, has_mobilizon BOOLEAN NOT NULL, has_agora_access BOOLEAN NOT NULL, last_name VARCHAR(255) NOT NULL, first_name VARCHAR(255) NOT NULL, image VARCHAR(255) DEFAULT NULL, telephone VARCHAR(20) DEFAULT NULL, PRIMARY KEY (id))'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D649E7927C74 ON "user" (email)'); - $this->addSql('CREATE TABLE messenger_messages (id BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL, body TEXT NOT NULL, headers TEXT NOT NULL, queue_name VARCHAR(190) NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, available_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, delivered_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY (id))'); - $this->addSql('CREATE INDEX IDX_75EA56E0FB7336F0E3BD61CE16BA31DBBF396750 ON messenger_messages (queue_name, available_at, delivered_at, id)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE "user"'); - $this->addSql('DROP TABLE messenger_messages'); - } -} diff --git a/src/DataFixtures/AppFixtures.php b/src/DataFixtures/AppFixtures.php index 1e31748..cec78c9 100644 --- a/src/DataFixtures/AppFixtures.php +++ b/src/DataFixtures/AppFixtures.php @@ -71,24 +71,6 @@ class AppFixtures extends Fixture $manager->persist($admin); - // Création d'un compte de test fixe présent dans le LDAP - $melvin = new User(); - $melvin->setEmail('melvin.leveque@kazkouil.fr'); - $melvin->setRoles(['ROLE_USER', 'ROLE_ADMIN', 'ROLE_ORGANISATION']); - $melvin->setPassword($this->hasher->hashPassword($melvin, 'password')); - $melvin->setFirstName(''); - $melvin->setLastName(''); - $melvin->setAlternateEmail(''); - $melvin->setIdentifiantKaz('MELVIN-KAZ-001'); - $melvin->setQuota('5G'); - $melvin->setEmailQuota('1G'); - $melvin->setNextcloudQuota('10G'); - $melvin->setHasNextcloudAccess(true); - $melvin->setHasMobilizon(true); - $melvin->setHasAgoraAccess(true); - - $manager->persist($melvin); - // Création d'un compte de test fixe présent dans le LDAP pour ma présentation $toto = new User(); $toto->setEmail('toto@kazkouil.fr'); diff --git a/templates/home/home.html.twig b/templates/home/home.html.twig index 409cd2b..633a0de 100644 --- a/templates/home/home.html.twig +++ b/templates/home/home.html.twig @@ -20,19 +20,19 @@ TODO : Gérer les données avec Pahéko, mise en service en cours par un des développeurs de l'association. Cela sera vu à posteriori du stage #}

- Votre abonnement actuellement : + Ton abonnement actuellement :

diff --git a/templates/user/edit_password.html.twig b/templates/user/edit_password.html.twig index 4deec57..a1426c1 100644 --- a/templates/user/edit_password.html.twig +++ b/templates/user/edit_password.html.twig @@ -6,19 +6,22 @@
-

- Sécurité du compte +

+ Modifier le mot de passe de mon espace kaznaute

{{ form_start(form) }} -
+
{# Champ Ancien Mot de Passe #}
- {{ form_label(form.oldPassword, 'Mot de passe actuel', { + {{ form_label(form.oldPassword, 'Mon mot de passe actuel', { 'label_attr': {'class': 'block text-sm font-semibold text-text'} }) }} {{ form_widget(form.oldPassword, { - 'attr': {'class': 'w-full px-4 py-3 border border-gris-clair rounded-lg focus:outline-none focus:border-bouton focus:ring-1 focus:ring-bouton placeholder-gris-moyen transition-shadow'} + 'attr': { + 'class': 'w-full px-4 py-3 border border-gris-clair rounded-lg focus:outline-none focus:border-bouton focus:ring-1 focus:ring-bouton placeholder-gris-moyen transition-shadow', + 'placeholder':'Saisissez votre ancien mot de passe' + } }) }} {# Affichage message pour les erreurs de saisie de l'ancien mot de passe #} @@ -28,45 +31,46 @@
{# Champs Nouveau Mot de Passe #} -
- {# Affichage de l'erreur si les deux champs ne correspondent pas #} +
+ {# Affichage d'un message d'erreur si les deux champs ne correspondent pas #}
{{ form_errors(form.newPassword) }}
-
- {{ form_label(form.newPassword.first, 'Nouveau mot de passe', { + +
+ {{ form_label(form.newPassword.first, 'Mon nouveau mot de passe', { 'label_attr': {'class': 'block text-sm font-semibold text-text'} }) }} {{ form_widget(form.newPassword.first, { - 'attr': {'class': 'w-full px-4 py-3 border border-gris-clair rounded-lg focus:outline-none focus:border-bouton focus:ring-1 focus:ring-bouton transition-shadow'} + 'attr': { + 'class': 'w-full px-4 py-3 border border-gris-clair rounded-lg focus:outline-none focus:border-bouton focus:ring-1 focus:ring-bouton placeholder-gris-moyen transition-all', + 'placeholder':'Saisissez un nouveau mot de passe' + } }) }} - - {# Affichage de l'erreur de longueur (min 8 caractères) #} -
+
{{ form_errors(form.newPassword.first) }}
-
- {{ form_label(form.newPassword.second, 'Confirmer le nouveau mot de passe', { +
+ {{ form_label(form.newPassword.second, 'Confirmer mon nouveau mot de passe', { 'label_attr': {'class': 'block text-sm font-semibold text-text'} }) }} {{ form_widget(form.newPassword.second, { - 'attr': {'class': 'w-full px-4 py-3 border border-gris-clair rounded-lg focus:outline-none focus:border-bouton focus:ring-1 focus:ring-bouton transition-shadow'} + 'attr': { + 'class': 'w-full px-4 py-3 border border-gris-clair rounded-lg focus:outline-none focus:border-bouton focus:ring-1 focus:ring-bouton placeholder-gris-moyen transition-all', + 'placeholder': 'Confirmez votre saisie' + } }) }}
- -
- {{ form_errors(form.newPassword) }} -
{# Bouton de validation #} -
- +
+
{{ form_end(form) }} diff --git a/translations/security.fr.yaml b/translations/security.fr.yaml new file mode 100644 index 0000000..2b71776 --- /dev/null +++ b/translations/security.fr.yaml @@ -0,0 +1,2 @@ +# translations/security.fr.yaml +"Invalid credentials.": "Identifiants invalides. Veuillez vérifier votre email ou votre mot de passe."