correction for pr

1 year ago · eb37915b00
parent a4a6b5d6f2
commit eb37915b00
2 changed files with 53 additions and 30 deletions
--- a/src/Controller/AuthController.php
+++ b/src/Controller/AuthController.php
@ -26,25 +26,28 @@ class AuthController {
        return ViewHttpResponse::twig("display_register.html.twig", []);
    }

+    private function displayRegisterBadFields(array $fails): HttpResponse{
+        $bad_fields = [];
+        foreach ($fails as $err) {
+            if ($err instanceof FieldValidationFail) {
+                $bad_fields[] = $err->getFieldName();
+            }
+        }
+        return ViewHttpResponse::twig("display_register.html.twig", ['bad_fields' => $bad_fields]);
+    }
    public function confirmRegister(array $request): HttpResponse {

        $fails = [];
        $request = HttpRequest::from($request, $fails, [
            "username" => [Validators::name(), Validators::lenBetween(0, 32)],
-            "password" => [Validators::lenBetween(0, 256)],
-            "confirmpassword" => [Validators::lenBetween(0, 256)],
-            "email" => [Validators::regex("/@/")]
+            "password" => [Validators::lenBetween(6, 256)],
+            "confirmpassword" => [Validators::lenBetween(6, 256)],
+            "email" => [Validators::regex("/^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/g"),Validators::lenBetween(5, 256)]
        ]);


        if (!empty($fails)) {
-            $bad_fields = [];
-            foreach ($fails as $err) {
-                if ($err instanceof FieldValidationFail) {
-                    $bad_fields[] = $err->getFieldName();
-                }
-            }
-            return ViewHttpResponse::twig("display_register.html.twig", ['bad_fields' => $bad_fields]);
+            return $this->displayRegisterBadFields($fails);
        }

        $fails = $this->model->validationRegister($request['username'], $request["password"], $request['confirmpassword'], $request['email']);
@ -53,13 +56,7 @@ class AuthController {
            return ViewHttpResponse::twig("display_auth_confirm.html.twig", ['username' => $results['username'], 'email' => $results['email']]);
        }

-        $bad_fields = [];
-        foreach ($fails as $err) {
-            if ($err instanceof FieldValidationFail) {
-                $bad_fields[] = $err->getFieldName();
-            }
-        }
-        return ViewHttpResponse::twig("display_register.html.twig", ['bad_fields' => $bad_fields]);
+        return $this->displayRegisterBadFields($fails);
    }

    public function displayLogin():HttpResponse{
@ -75,17 +72,12 @@ class AuthController {


        $fails = $this->model->validationLogin($request['email'],$request['password']);
-        $bad_fields = [];
-        foreach ($fails as $err){
-            if ($err instanceof FieldValidationFail){
-                $bad_fields [] = $err->getFieldName();
-            }
-        }
+
        if (empty($fails)){
            $results = $this->model->getUserFields($request['email']);
            return ViewHttpResponse::twig("display_auth_confirm.html.twig",['username' => $results['username'], 'email' => $results['email']]);
        }
-        return ViewHttpResponse::twig("display_login.html.twig",['bad_fields' => $bad_fields]);
+        return $this->displayRegisterBadFields($fails);
    }

 }
--- a/src/Views/display_auth_confirm.html.twig
+++ b/src/Views/display_auth_confirm.html.twig
@ -1,17 +1,48 @@
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
    <meta charset="UTF-8">
-    <title>Compte</title>
-</head>
-<body>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Profil Utilisateur</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            background-color: #f4f4f4;
+            margin: 0;
+            padding: 0;
+            display: flex;
+            align-items: start;
+            justify-content: center;
+            height: 100vh;
+        }

-<center><h1>Nouveau Compte</h1></center>
+        .user-profile {
+            background-color: #7FBFFF;
+            padding: 20px;
+            border-radius: 10px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+            max-width: 400px;
+            width: 100%;
+            text-align: center;
+        }

+        h1 {
+            color: #333;
+        }

-<h2>Votre pseudo : {{ username }}</h2>
-<h2>Votre Email : {{ email }}</h2>
+        p {
+            color: #666;
+        }
+    </style>
+</head>
+<body>

+<div class="user-profile">
+    <h1>Votre profil</h1>
+    <p><strong>Pseudo : </strong> {{ username }} </p>
+    <p><strong>Email : {{ email }} </strong></p>
+</div>

 </body>
 </html>