step 3 done.

Author: gordienkoas

.env

@@ -1 +1,2 @@
-SECRET_KEY="SECRETFORMYPROJECT007"
+SECRET_KEY="SECRETFORMYPROJECT007"
+DATABASE_URL=postgresql://tirion:1234@localhost:5432/hexlet

.gitignore

@@ -1,3 +1,4 @@
 .python-version
 .venv
 .idea
+.env

Makefile

@@ -14,3 +14,5 @@ build:
 render-start:
 	gunicorn -w 5 -b 0.0.0.0:$(PORT) page_analyzer:app
 
+lint:
+	ruff check .

build.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+
 curl -LsSf https://astral.sh/uv/install.sh | sh
 source $HOME/.local/bin/env
-make install
+
+make install && psql -a -d $DATABASE_URL -f database.sql

page_analyzer/app.py

@@ -1,24 +1,81 @@
 import os
-from flask import Flask, render_template
+from flask import Flask, render_template, request, redirect, flash, url_for
+import psycopg2
 from dotenv import load_dotenv
+import validators
 
 load_dotenv()
+DATABASE_URL = os.getenv('DATABASE_URL')
 
 app = Flask(__name__)
-app.config['SECRET_KEY'] = os.getenv('SECRET_KEY')
+app.secret_key = 'your_secret_key'  # Замените на ваш секретный ключ
 
-@app.route('/')
+
+def get_db_connection():
+    conn = psycopg2.connect(DATABASE_URL)
+    return conn
+
+
+@app.route('/', methods=['GET', 'POST'])
 def index():
+    if request.method == 'POST':
+        url = request.form['url']
+        if not validators.url(url) or len(url) > 255:
+            flash('Неверный URL-адрес!', 'error')
+            return redirect(url_for('index'))
+
+        conn = get_db_connection()
+        cur = conn.cursor()
+        try:
+            cur.execute('INSERT INTO urls (name) VALUES (%s)', (url,))
+            conn.commit()
+            flash('URL успешно добавлен!', 'success')
+        except psycopg2.IntegrityError:
+            conn.rollback()
+            flash('Этот URL уже существует!', 'error')
+        finally:
+            cur.close()
+            conn.close()
+
+        return redirect(url_for('index'))
+
     return render_template('index.html')
 
-@app.route('/urls')
-def all_urls():
-    pass
 
-@app.route('/urls', methods=['POST'])
-def add_url():
-    pass
+@app.route('/urls', methods=['GET'])
+def urls():
+    conn = get_db_connection()
+    cur = conn.cursor()
+    cur.execute('SELECT * FROM urls ORDER BY created_at DESC')
+    urls = cur.fetchall()
+    cur.close()
+    conn.close()
+
+    return render_template('urls.html', urls=urls)
+
+
+@app.route('/urls/<int:url_id>', methods=['GET'])
+def url_detail(url_id):
+    conn = get_db_connection()
+    cur = conn.cursor()
+    cur.execute('SELECT * FROM urls WHERE id = %s', (url_id,))
+    url = cur.fetchone()
+    cur.close()
+    conn.close()
+
+    if url is None:
+        flash('URL не найден!', 'error')
+        return redirect(url_for('urls'))
+
+    return render_template('url_detail.html', url=url)
+
 
-__all__ = ['app']
 if __name__ == '__main__':
-    app.run()
+    app.run(debug=True)
+
+
+
+#
+# @app.route('/urls', methods=['POST'])
+# def add_url():
+#     pass

page_analyzer/templates/index.html

@@ -19,20 +19,21 @@
         <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 action="{{ url_for('add_url') }}" method="post" class="d-flex justify-content-center">
-                    <div class="input-group input-group-lg">
-                        <input
+            <form method="POST">
+                <div class="input-group input-group-lg">
+                    <input
                             type="url"
                             name="url"
                             value="{{ url if url is defined else '' }}"
                             placeholder="https://www.example.com"
                             class="form-control form-control-lg"
                             required
-                        >
-                        <input type="submit" value="Проверить" class="btn btn-primary btn-lg ms-3 px-5 text-uppercase mx-2">
-                    </div>
-                </form>
+                    >
+                    <input type="submit" value="Проверить" class="btn btn-primary btn-lg ms-3 px-5 text-uppercase mx-2">
+
+                </div>
+            </form>
         </div>
     </div>
 </body>
-{% endblock %}
+{% endblock %}

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('all_urls') }}">Сайты</a>
+                            <a class="nav-link active" aria-current="page" href="{{ url_for('urls') }}">Сайты</a>
                         </li>
                     </ul>
                 </div>

page_analyzer/templates/urls.html

@@ -15,13 +15,14 @@ <h1 class="mb-4">Сайты</h1>
         <tbody>
             {% for url in urls %}
                 <tr>
-                    <td>{{ url.id }}</td>
-                    <td><a href="{{ url_for('url_detail', id=url.id) }}">{{ url.name }}</a></td>
-                    <td>{{ url.last_check.strftime('%d-%m-%Y %H:%M') if url.last_check else 'Ещё не проверялся' }}</td>
-                    <td>{{ url.status_code if url.status_code else '' }}</td>
+                    <td>{{ url[0] }}</td>
+                    <td><a href="{{ url_for('url_detail', url_id=url[0]) }}">{{ url[1] }}</a></td>
+                    <td>{{ url[2] }}</td>
+                    <td>{{ url_id }}</td>
                 </tr>
             {% endfor %}
         </tbody>
     </table>
+    <a href="{{ url_for('index') }}" class="btn btn-secondary">Назад</a>
 </div>
 {% endblock %}

pyproject.toml

@@ -7,7 +7,9 @@ requires-python = ">=3.10"
 dependencies = [
     "flask>=3.1.0",
     "gunicorn>=23.0.0",
+    "psycopg2-binary>=2.9.10",
     "pytest>=8.3.5",
     "python-dotenv>=1.1.0",
     "ruff>=0.11.7",
+    "validators>=0.35.0",
 ]