fix routing

Author: gordienkoas

page_analyzer/app.py

@@ -11,78 +11,76 @@
 DATABASE_URL = os.getenv('DATABASE_URL')
 
 app = Flask(__name__)
-app.secret_key = 'SECRETFORMYPROJECT007'
+app.secret_key = os.getenv('SECRET_KEY')
 
 
 def get_db_connection():
     conn = psycopg2.connect(DATABASE_URL)
     return conn
 
 
-@app.route('/', methods=['GET', 'POST'])
+@app.route('/', methods=['GET'])
 def index():
-    if request.method == 'POST':
-        url_input = request.form.get('url')
-        # Проверка валидности
-        if not validators.url(url_input) or len(url_input) > 255:
-            # Редирект на /urls с этим же URL
-            return redirect(url_for('urls', url=url_input))
-        else:
-            return redirect(url_for('urls', url=url_input))
     return render_template('index.html')
 
-@app.route('/urls', methods=['GET', 'POST'])
-def urls():
-    if request.method == 'POST':
-        url = request.form['url']
-        return redirect(url_for('urls', url=url))
-    else:
-        url = request.args.get('url')
-        if url:
-            if not validators.url(url) or len(url) > 255:
-                flash('Некорректный URL', 'error')
-                return render_template('index.html'), 422  # Возвращаем ошибку 422 с HTML
-
-            domain = urlparse(url).netloc
-
-            with get_db_connection() as conn:
-                with conn.cursor() as cur:
-                    try:
-                        cur.execute('SELECT id FROM urls WHERE name = %s', (domain,))
-                        existing_url = cur.fetchone()
-
-                        if existing_url:
-                            url_id = existing_url[0]
-                            flash('Страница уже существует', 'error')
-                            return redirect(url_for('url_detail', url_id=url_id))
-
-                        cur.execute('INSERT INTO urls (name) VALUES (%s) RETURNING id', (domain,))
-                        url_id = cur.fetchone()[0]
-                        conn.commit()
-                        flash('Страница успешно добавлена', 'success')
-
-                        return redirect(url_for('url_detail', url_id=url_id))
-                    except Exception as e:
-                        conn.rollback()
-                        flash(f'Произошла ошибка: {str(e)}', 'error')
-
-        # Если URL не передан, или если запрос POST без URL, получаем все URL из БД
-        with get_db_connection() as conn:
-            with conn.cursor() as cur:
-                cur.execute('''
-                    SELECT u.id, u.name, u.created_at,
-                           uc.status_code, uc.created_at AS last_check,
-                           uc.h1, uc.title, uc.description
-                    FROM urls u
-                    LEFT JOIN url_checks uc ON u.id = uc.url_id
-                    AND uc.created_at = (
-                        SELECT MAX(created_at)
-                        FROM url_checks 
-                        WHERE url_id = u.id
-                    )
-                ''')
-                urls = cur.fetchall()
-                return render_template('urls.html', urls=urls)
+
+@app.route('/urls', methods=['POST'])
+def create_url():
+    url_input = request.form.get('url')
+    error_message = None
+
+    # Валидация URL
+    if not url_input or len(url_input) > 255:
+        error_message = "Некорректный URL или превышена длина 255 символов."
+    elif not validators.url(url_input):
+        error_message = "Некорректный URL."
+
+    if error_message:
+        flash(error_message, 'error')
+        return render_template('index.html', url=url_input), 422  # Возвращаем ошибку 422 с HTML
+
+    # Нормализация URL
+    normalized_url = url_input.strip()
+
+    # Проверка на наличие URL в базе данных
+    with get_db_connection() as conn:
+        with conn.cursor() as cur:
+            cur.execute('SELECT id FROM urls WHERE name = %s', (normalized_url,))
+            existing_url = cur.fetchone()
+
+            if existing_url:
+                url_id = existing_url[0]
+                flash('Страница уже существует', 'error')
+                return redirect(url_for('url_detail', url_id=url_id))
+
+            # Сохранение нового URL в базу данных
+            cur.execute('INSERT INTO urls (name) VALUES (%s) RETURNING id', (normalized_url,))
+            url_id = cur.fetchone()[0]
+            conn.commit()
+            flash('Страница успешно добавлена', 'success')
+
+            return redirect(url_for('url_detail', url_id=url_id))
+
+
+@app.route('/urls', methods=['GET'])
+def list_urls():
+    with get_db_connection() as conn:
+        with conn.cursor() as cur:
+            cur.execute('''
+                SELECT u.id, u.name, u.created_at,
+                       uc.status_code, uc.created_at AS last_check,
+                       uc.h1, uc.title, uc.description
+                FROM urls u
+                LEFT JOIN url_checks uc ON u.id = uc.url_id
+                AND uc.created_at = (
+                    SELECT MAX(created_at)
+                    FROM url_checks 
+                    WHERE url_id = u.id
+                )
+            ''')
+            urls = cur.fetchall()
+            return render_template('urls.html', urls=urls)
+
 
 
 

page_analyzer/templates/index.html

@@ -19,7 +19,7 @@
         <div class="col-12 col-md-11 col-lg-8 mx-auto border rounded-3 bg-light p-5">
                 <h1 class="display-3">Анализатор страниц</h1>
                 <p class="lead">Бесплатно проверяйте сайты на SEO-пригодность</p>
-            <form method="POST">
+            <form method="POST" action="{{ url_for('create_url') }}">
                 <div class="input-group input-group-lg">
                     <input
                             type="url"

page_analyzer/templates/layout.html

@@ -17,7 +17,7 @@
                 <div class="collapse navbar-collapse" id="navbarNav">
                     <ul class="navbar-nav">
                         <li class="nav-item">
-                            <a class="nav-link active" aria-current="page" href="{{ url_for('urls') }}">Сайты</a>
+                            <a class="nav-link active" aria-current="page" href="{{ url_for('list_urls') }}">Сайты</a>
                         </li>
                     </ul>
                 </div>

page_analyzer/templates/result.html

@@ -50,7 +50,7 @@ <h2>Проверки:</h2>
             </tbody>
         </table>
 
-        <a href="{{ url_for('urls') }}" class="btn btn-secondary">Назад к списку</a>
+        <a href="{{ url_for('list_urls') }}" class="btn btn-secondary">Назад к списку</a>
     </div>
 </body>
 </html>