Merge branch 'Auth'

2024-10-22 23:04:20 +03:00
parent efa3c0737b e7b46d178a
commit bd4edd39e0
4 changed files with 17 additions and 5 deletions
--- a/App/Auth/auth.py
+++ b/App/Auth/auth.py
@@ -27,4 +27,4 @@ def auth():
            })
            return redirect(url_for('index'))
        else:
-            return auth_data.error_message
+            return render_template('error.html', error_message=auth_data.error_message)
--- a/App/Auth/auth_route.py
+++ b/App/Auth/auth_route.py
@@ -10,6 +10,6 @@ def route(db_config, input_data, sql_provider, name) -> InfoRespronse:
    _sql = sql_provider.get(name, input_data)
    print("sql = ", _sql)
    result = select_list(db_config, _sql)
-    if result is None:
-        return InfoRespronse(result, error_message = 'Ошибка на этапе авторизации', status=False)
+    if result is None or len(result) == 0:
+        return InfoRespronse(result, error_message = 'Произошла ошибка на этапе авторизации :(', status=False)
    return InfoRespronse(result, error_message='', status=True)
--- a/App/Auth/templates/auth.html
+++ b/App/Auth/templates/auth.html
@@ -7,9 +7,9 @@
 <body>
    <form action="" method="post">
        <label for="login">Login: </label>
-        <input type="text" name="login"><br>
+        <input type="text" name="login" required><br>
        <label for="password">Password: </label>
-        <input type="password" name="password"><br>
+        <input type="password" name="password" required><br>
        <input type="submit" value="Submit">
    </form>
 </body>
--- a/App/Auth/templates/error.html
+++ b/App/Auth/templates/error.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Ошибка</title>
+</head>
+<body>
+    <h1>Сожалеем</h1>
+    <p>{{ error_message }}</p>
+    <p><a href="{{ url_for('auth_bp.auth') }}">Вернуться</a></p>
+</body>
+</html>