Amélioration de l'expérience utilisateur

2024-09-09 20:27:54 +02:00
parent 76ddc9fe30
commit b087a7130c
13 changed files with 207 additions and 87 deletions
--- a/modules/site/Module.php
+++ b/modules/site/Module.php
@@ -19,25 +19,7 @@ class Module extends \Piko\Module
        $view = $this->application->getComponent('Piko\View');
        $view->params['user'] = $user;
        $view->params['language'] = $this->application->language;
-        // $view->attachBehavior('vite', 'app\lib\Vite::vite');
        $vite = new Vite($view);
        $vite->loadEntry('main.js');
-
-        $userModule = $this->application->getModule('user');
-        assert ($userModule instanceof \app\modules\user\Module);
-
-        $userModule->on(CreateControllerEvent::class, function(CreateControllerEvent $event) {
-            $event->controller->on(BeforeActionEvent::class, function (BeforeActionEvent $event) {
-
-                $action = $event->actionId;
-
-                switch($action) {
-                    case 'login':
-                        $event->controller->layout = 'minimal';
-                        break;
-                }
-
-            });
-        });
    }
 }
--- a/modules/site/layouts/minimal.php
+++ b/modules/site/layouts/minimal.php
@@ -2,7 +2,7 @@
 /* @var $this \Piko\View */
 /* @var $content string */

-if (!$this->title) $this->title = 'Openai';
+if (!$this->title) $this->title = 'IA Assistant';
 ?>
 <!DOCTYPE html>
 <html lang="<?= $this->params['language'] ?>">
--- a/modules/user/controllers/DefaultController.php
+++ b/modules/user/controllers/DefaultController.php
@@ -52,9 +52,12 @@ class DefaultController extends \Piko\Controller

        if (!empty($post)) {

-            $user = new User($this->db);
+            $module = $this->module;
+            assert ($module instanceof \app\modules\user\Module);

+            $user = new User($this->db);
            $user->scenario = User::SCENARIO_REGISTER;
+            $user->passwordMinLength = $module->passwordMinLength;

            $user->bind($post);

@@ -89,8 +92,12 @@ class DefaultController extends \Piko\Controller

        if (!empty($post)) {

+            $module = $this->module;
+            assert ($module instanceof \app\modules\user\Module);
+
            $user = new User($this->db);
            $user->scenario = 'register';
+            $user->passwordMinLength = $module->passwordMinLength;
            $user->bind($post);
            $user->isValid();
            $errors = $user->getErrors();
@@ -156,13 +163,17 @@ class DefaultController extends \Piko\Controller
            }

            if ($user) {
-                // $user->sendResetPassword();
+                $app = $this->module->getApplication();
+                $router = $app->getComponent('Piko\Router');
+                $mailer = $app->getComponent('Nette\Mail\SmtpMailer');
+                $user->sendResetPassword($router, $mailer);
                $message['type'] = 'success';
                $message['content'] = __(
                    'user',
                    'A link has been sent to you by email ({email}). It will allow you to recreate your password.',
                    ['email' => $user->email]
                );
+                $reminder = '';
            } else {
                $message['type'] = 'danger';
                $message['content'] = __('user', 'Account not found.');
@@ -186,7 +197,7 @@ class DefaultController extends \Piko\Controller
        $user = User::findByAuthKey($token);

        if (!$user) {
-            throw new HttpException('Not found', 404);
+            throw new HttpException('User not found', 404);
        }

        $message = false;
--- a/modules/user/messages/fr.php
+++ b/modules/user/messages/fr.php
@@ -19,7 +19,7 @@ Une demande de changement de mot passe a été effectuée pour votre compte sur

 Votre identifiant est : {username}.

-Pour changer votre mot de passe , cliquez sur le lien ci-dessous.
+Pour changer votre mot de passe , cliquez sur ou copiez-collez dans votre navigateur le lien ci-dessous.

 {link}

--- a/modules/user/models/User.php
+++ b/modules/user/models/User.php
@@ -43,7 +43,8 @@ class User extends \Piko\DbRecord implements \Piko\User\IdentityInterface
    const SCENARIO_RESET = 'reset';

    public static \PDO $pdo;
-    public static Module $module;
+
+    public int $passwordMinLength = 8;

    /**
     * The table name
@@ -267,11 +268,11 @@ class User extends \Piko\DbRecord implements \Piko\User\IdentityInterface
            $this->errors['password'] = __('user', 'Password must be filled in.');

        } elseif (($this->scenario == self::SCENARIO_REGISTER || $this->scenario == self::SCENARIO_RESET) &&
-                strlen($this->password) < static::$module->passwordMinLength) {
+                strlen($this->password) < $this->passwordMinLength) {
            $this->errors['password'] =  __(
                'user',
                'Password is to short. Minimum {num}: characters.',
-                ['num' => static::$module->passwordMinLength]
+                ['num' => (string) $this->passwordMinLength]
            );
        }

@@ -367,7 +368,7 @@ class User extends \Piko\DbRecord implements \Piko\User\IdentityInterface
        $subject = __('user', 'Password change request on {site_name}', ['site_name' => $siteName]);

        $mail = new Message();
-        $mail->setFrom($siteName . ' <' . getenv('NO_REPLY_EMAIL') . '>')
+        $mail->setFrom(getenv('NO_REPLY_EMAIL'), $siteName)
             ->addTo($this->email)
             ->setSubject($subject)
             ->setBody($message);
--- a/modules/user/views/default/reminder.php
+++ b/modules/user/views/default/reminder.php
@@ -1,10 +1,12 @@
 <?php
-use piko\Piko;
-/* @var $this \piko\View */
+use function Piko\I18n\__;
+
+assert($this instanceof Piko\View);
+
 /* @var $message array */
 /* @var $reminder string */

-$this->title = Piko::t('user', 'Forget password');
+$this->title = __('user', 'Forget password');

 if (is_array($message)) {
    $this->params['message'] = $message;
@@ -18,10 +20,10 @@ if (is_array($message)) {

 <form method="post" id="reminder-form" novalidate>
  <div class="form-group">
-    <label for="reminder"><?= Piko::t('user', 'Your email or your username') ?></label>
+    <label for="reminder"><?= __('user', 'Your email or your username') ?></label>
    <input type="text" class="form-control" id="reminder" name="reminder" value="<?= $reminder ?>" autocomplete="off">
  </div>
-  <button type="submit" class="btn btn-primary"><?= Piko::t('user', 'Send') ?></button>
+  <button type="submit" class="btn btn-primary"><?= __('user', 'Send') ?></button>
 </form>

 </div>
--- a/modules/user/views/default/reset.php
+++ b/modules/user/views/default/reset.php
@@ -1,74 +1,76 @@
 <?php
-use piko\Piko;
+use function Piko\I18n\__;
+
+assert($this instanceof Piko\View);

-/* @var $this \piko\View */
 /* @var $user piko\user\models\User */
 /* @var $message array */
-/* @var $router \piko\Router */

-$router = Piko::get('router');
-
-$this->title = Piko::t('user', 'Change your account ({account}) password',['account' => $user->username]);
-
-if (is_array($message)) {
-    $this->params['message'] = $message;
-
-    echo '<div class="container text-center"><a class="btn btn-primary" href="'. $router->getUrl('user/default/login').'">'
-         . Piko::t('user', 'Login') . '</a></div>';
-
-    return;
-}
+$this->title = __('user', 'Change your account ({account}) password',['account' => $user->username]);

 $js = <<<SCRIPT
-jQuery(document).ready(function($) {
+document.addEventListener('DOMContentLoaded', function() {
+    function validateField(event) {
+        var field = event.target;

-    function validateField(e) {
-        var that = this;
-
-        $.post('{$router->getUrl('user/default/check-registration')}', $('#register-form').serialize(), function(errors) {
-            if (errors[that.name]) {
-                $(that).addClass('is-invalid')
-                 $(that).removeClass('is-valid')
-                $(that).next('.invalid-feedback').text(errors[that.name])
+        fetch('{$this->getUrl('user/default/check-registration')}', {
+            method: 'POST',
+            body: new URLSearchParams(new FormData(document.getElementById('register-form')))
+        })
+        .then(response => response.json())
+        .then(errors => {
+            if (errors[field.name]) {
+                field.classList.add('is-invalid');
+                field.classList.remove('is-valid');
+                field.nextElementSibling.textContent = errors[field.name];
            } else {
-                $(that).removeClass('is-invalid')
-                $(that).addClass('is-valid')
+                field.classList.remove('is-invalid');
+                field.classList.add('is-valid');
            }
        });
    }

-    $('#password').focusout(validateField);
-    $('#password2').focusout(validateField);
-
+    document.getElementById('password').addEventListener('focusout', validateField);
+    document.getElementById('password2').addEventListener('focusout', validateField);
 });
 SCRIPT;

 $this->registerJs($js);
-
-
 ?>

-<div class="container" style="margin-top: 100px">
+<div class="container">

 <h1 class="h4"><?= $this->title ?></h1>

+<?php if (!empty($message) && $message['type'] === 'success'): ?>
+<div class="alert alert-success" role="alert">
+  <?= $message['content'] ?>
+  <p class="text-center"><a class="btn btn-primary" href="<?= $this->getUrl('user/default/login') ?>">
+    <?= __('user', 'Login') ?></a>
+  </p>
+</div>
+
+<?php else: ?>
+
 <form method="post" id="register-form" novalidate>

-  <div class="form-group">
-    <label for="password"><?= Piko::t('user', 'Password') ?></label>
+  <div class="mb-2">
+    <label for="password"><?= __('user', 'Password') ?></label>
    <input type="password" class="form-control" id="password" name="password" value="" autocomplete="off">
    <div class="invalid-feedback"></div>
  </div>

-  <div class="form-group">
-    <label for="password2"><?= Piko::t('user', 'Confirm your password') ?></label>
+  <div class="mb-2">
+    <label for="password2"><?= __('user', 'Confirm your password') ?></label>
    <input type="password" class="form-control" id="password2" name="password2" value="" autocomplete="off">
    <div class="invalid-feedback"></div>
  </div>

-  <button type="submit" class="btn btn-primary"><?= Piko::t('user', 'Send') ?></button>
+  <button type="submit" class="btn btn-primary"><?= __('user', 'Send') ?></button>
 </form>

+<?php endif ?>
+
 </div>