From d50794fc7d340e94e2d458dd4e033cb3aec640b0 Mon Sep 17 00:00:00 2001
From: Nikolay Shirokov <nshirokov@internet.ru>
Date: Wed, 10 Jan 2024 22:37:55 +0700
Subject: [PATCH 1/4] in-process

---
 .gitignore                            |   2 ++
 .idea/misc.xml                        |   3 ++
 __pycache__/app.cpython-310.pyc       | Bin 0 -> 1282 bytes
 __pycache__/shortener.cpython-310.pyc | Bin 0 -> 448 bytes
 app.py                                |  46 ++++++++++++++++++++++++++
 requirements.txt                      |  11 ++++++
 shortener.py                          |   7 ++++
 static/css/main.css                   |   0
 templates/base.html                   |  39 ++++++++++++++++++++++
 templates/index.html                  |  23 +++++++++++++
 templates/short_url.html              |  12 +++++++
 11 files changed, 143 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 __pycache__/app.cpython-310.pyc
 create mode 100644 __pycache__/shortener.cpython-310.pyc
 create mode 100644 app.py
 create mode 100644 requirements.txt
 create mode 100644 shortener.py
 create mode 100644 static/css/main.css
 create mode 100644 templates/base.html
 create mode 100644 templates/index.html
 create mode 100644 templates/short_url.html

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7279662
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea/
+env/
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 264d191..b73d6c6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,4 +4,7 @@
     <option name="stateVersion" value="1" />
   </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10" project-jdk-type="Python SDK" />
+  <component name="PyCharmProfessionalAdvertiser">
+    <option name="shown" value="true" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/__pycache__/app.cpython-310.pyc b/__pycache__/app.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..90e2893a689f3e5ddc72fbf7e2d2dc157fe47045
GIT binary patch
literal 1282
zcmZ`&zi-<{6uu)x@<jcNU?go(phbZWT1=o*Q5ZoTCuvhShFdv9Z#mF<CyUaNRE}g)
z8QttPd(kNwGxxvY+9`9kEbV)gYzSz2#5=zC-MjnVd-pEy^+JZ@tH1u#U$~6@O~&qM
zq47OR@dr-8fE$)_$x}x<sViMhm}6S0C%r~@ji36`=S*`QTyZI&rNyER-T~8|7KnsD
zFz_L`W)SFb(YbPESBuv@5N|lNA-rbj({GRtB3<Y;$Uq0sUpn?DJZ%UA7{21jcW2Vb
zc=QgVV`I1W9-FvW)&r|E&{mZ?U75Jlbx>KOX1N{nI-LA`d}yX~ovzUmfXii)>dU*u
zbCZ<%yC{kXQ|ED^_u*XLBmd*0A0IvaRXsdBJA80Bd8D5G@?=VsyW_T022sr<2PPfu
zE?OuaaByBZ(%;yx18_097I=t>txvGE+c!RM*cJ)59v$6X^uWhGeF#8YGdY0vgpI?x
z{g6U_fFYlax$LZLlE!wemU{i}8;s^Lf+DMoiO-G3tOL-qxH9FG?<7FFgK~sYP*(u|
zoh{g1h78WhW&hxo<IAt@eLTfU0OwYr&Fn3+UEJ~E+vr)LZ4qV3GB@$Mm?t)0<}aet
z^>iNF^wj1HJuQpq_*8B6C|<4hSL<3RW%bG`H6(h9BjlH(Tgv^L<&*J{e6u*!O4XrK
zX%3Yky{pvoDmL2{2d~aQ%1xDKGI)}e`a)YvS=Iiev`Ka$+ZBe|93;gIYooA7>UJ^D
zZAq#WM1F>?VSU^t{i>X1`OCTm2-`kFP0Bk{kFWrzHcCMrf(`i|AMz1?U8h<5z@z_k
z&P~<d3*1v;-LLqj=3#<u{M-J#OwC(vU0mIvqk>!Fti8r<57qZ{lyK~)_`CF@CYk@G
zv-i-8t~PA^8XEfvVjm;1bbPb;8F`RJ_mIX(rW7_^?SVe8E>6aGq&K5SXepFU%=9wk
zut62RvUv0QtVa%1TRXt1cCizrKh3jQa$!fb#e15AHci>2XY&f{PKj;EU0Y=z3$zvo
go0hmw4PAVW(;n;cE*DP71s^%0gMXJ~$XoyX3(z|!=Kufz

literal 0
HcmV?d00001

diff --git a/__pycache__/shortener.cpython-310.pyc b/__pycache__/shortener.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ae13377f69eaa2961b30ae6e7662fb4cd5892018
GIT binary patch
literal 448
zcmYk2%}xR_5Xaly1p(n=JecSU?8P;H8x0W=A&Q86_^}tVZY%r67TX0~qc^X<fG0fq
z7`{fYo_GaMwnPn+%r7&Ong2{na=8o;Hu`+Six7Y>nM|7^l6~Q9NdN%^17HHAm=LL^
zf;5zP0j7#z6X?mY=m52GQqbHj925^rN9D@#N%gdLRzGhvTkVU>t83G`u@S!QI<DvU
zLejsZEE){&AL7T=we^k7t?iu^Tk8CoxCuzbqHwk#fZzy3&{HBc(vb41yu)Yk1jK%|
z#(@qw^z{VSJmQ8tNv#l(9-pxt;@X(;OtDgE6pF1<qsf!iQmtHRiHS6G2#q=e8hijc
zD^`5xjW)xS8KLWwz>1mUQsR@LQIBoMqP;pL9=0Q9RO_AJ*qCVG5Yy#;%;&l?vLf91
ymrlt0HGz4kL7EeRu2K0gnwCgO$m-;PDP%>Br}laT4Fa5(zrkd03TQ$ntNZ}%nQZm|

literal 0
HcmV?d00001

diff --git a/app.py b/app.py
new file mode 100644
index 0000000..28f806a
--- /dev/null
+++ b/app.py
@@ -0,0 +1,46 @@
+from flask import Flask, render_template, url_for, redirect, request
+from flask_sqlalchemy import SQLAlchemy
+from datetime import datetime
+import shortener
+
+app = Flask(__name__)
+app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///date_base.db'
+db = SQLAlchemy(app)
+
+shortened_urls = {}
+
+class Date_Base(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    user_name = db.Column(db.String(50), nullable=False)
+    full_url = db.Column(db.String, nullable=False)
+    short_url = db.Column(db.String(), nullable=False)
+    date = db.Column(db.DateTime, default=datetime.utcnow)
+
+    def __repr__(self):
+        return '<Date_Base %r>' % self.id
+
+
+@app.route("/", methods=['GET', 'POST'])
+def index():
+    if request.method == 'POST':
+        long_url = request.form['long_url']
+        short_url = shortener.generate_short_url()
+        while short_url in shortened_urls:
+            short_url = shortener.generate_short_url()
+
+        shortened_urls[short_url] = long_url
+
+        return render_template('short_url.html', short_url = short_url)
+    return render_template('index.html')
+
+
+@app.route('/<short_url>')
+def redirect_url(short_url):
+    long_url = shortened_urls.get(short_url)
+    if long_url:
+        return redirect(long_url)
+    else:
+        return 'Url not found'
+
+if __name__ == '__main__':
+    app.run(debug=True)
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..ca78b68
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,11 @@
+blinker==1.7.0
+click==8.1.7
+Flask==3.0.0
+Flask-SQLAlchemy==3.1.1
+greenlet==3.0.3
+itsdangerous==2.1.2
+Jinja2==3.1.2
+MarkupSafe==2.1.3
+SQLAlchemy==2.0.25
+typing_extensions==4.9.0
+Werkzeug==3.0.1
diff --git a/shortener.py b/shortener.py
new file mode 100644
index 0000000..5ce6c92
--- /dev/null
+++ b/shortener.py
@@ -0,0 +1,7 @@
+import random
+LENGHT = 6
+CHARACTERS = 'ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz234567890'  # алфавит для генерации короткой ссылки
+
+def generate_short_url():
+    short_url = ''.join(random.choices(CHARACTERS, k=LENGHT))
+    return short_url
\ No newline at end of file
diff --git a/static/css/main.css b/static/css/main.css
new file mode 100644
index 0000000..e69de29
diff --git a/templates/base.html b/templates/base.html
new file mode 100644
index 0000000..d288550
--- /dev/null
+++ b/templates/base.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css">
+    <title>{% block title %}{% endblock %}</title>
+</head>
+<body>
+    <div class="container">
+    <header class="d-flex justify-content-center py-3">
+      <ul class="nav nav-pills">
+        <li class="nav-item"><a href="/" class="nav-link active" aria-current="page">Главная</a></li>
+        <li class="nav-item"><a href="#" class="nav-link">Features</a></li>
+        <li class="nav-item"><a href="#" class="nav-link">Pricing</a></li>
+        <li class="nav-item"><a href="#" class="nav-link">FAQs</a></li>
+        <li class="nav-item"><a href="#" class="nav-link">About</a></li>
+      </ul>
+    </header>
+  </div>
+    {% block body %}{% endblock %}
+    <div class="container">
+  <footer class="py-3 my-4">
+    <ul class="nav justify-content-center border-bottom pb-3 mb-3">
+      <li class="nav-item"><a href="/" class="nav-link px-2 text-body-secondary">Home</a></li>
+      <li class="nav-item"><a href="#" class="nav-link px-2 text-body-secondary">Features</a></li>
+      <li class="nav-item"><a href="#" class="nav-link px-2 text-body-secondary">Pricing</a></li>
+      <li class="nav-item"><a href="#" class="nav-link px-2 text-body-secondary">FAQs</a></li>
+      <li class="nav-item"><a href="#" class="nav-link px-2 text-body-secondary">About</a></li>
+    </ul>
+    <p class="text-center text-body-secondary">© 2024 by Shirokov Nikolay</p>
+  </footer>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
new file mode 100644
index 0000000..befc760
--- /dev/null
+++ b/templates/index.html
@@ -0,0 +1,23 @@
+{% extends 'base.html' %}
+
+{% block title %}
+Короче
+{% endblock %}
+
+{% block body %}
+<div class="container">
+<div class="px-4 py-5 my-5 text-center">
+
+    <h1 class="display-5 fw-bold text-body-emphasis">Короче URL</h1>
+    <div class="col-lg-6 mx-auto">
+      <p class="lead mb-4">Сервис для быстрого преобразования длинной URL ссылки в более короткую </p>
+        <form method="POST" action="{{ url_for('index') }}">
+            <div class="d-grid gap-2 d-sm-flex justify-content-sm-center">
+            <input type="text" name="long_url" placeholder="Введите Url-ссылку">
+            <button type="submit" class="btn btn-outline-secondary btn-lg px-4">Короче</button>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/short_url.html b/templates/short_url.html
new file mode 100644
index 0000000..d544f8b
--- /dev/null
+++ b/templates/short_url.html
@@ -0,0 +1,12 @@
+{% extends 'base.html' %}
+
+{% block title %}
+Ваш Url
+{% endblock %}
+
+{% block body %}
+<div class="container">
+<h1>Страница вашего короткого Url адреса: {{request.url_root}}{{short_url}}</h1>
+</div>
+
+{% endblock %}
\ No newline at end of file

From 6c92c54d0c470ba01df1e3113f08ef8c781952f3 Mon Sep 17 00:00:00 2001
From: Nikolay Shirokov <nshirokov@internet.ru>
Date: Wed, 10 Jan 2024 22:47:35 +0700
Subject: [PATCH 2/4] in-process

---
 main.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 main.py

diff --git a/main.py b/main.py
deleted file mode 100644
index e69de29..0000000

From b098f2f409d5215242dd76bb3b8f58fe7b18c3f3 Mon Sep 17 00:00:00 2001
From: Nikolay Shirokov <nshirokov@internet.ru>
Date: Tue, 16 Jan 2024 21:03:55 +0700
Subject: [PATCH 3/4] add gitignore and DB

---
 .gitignore                                    | 162 +++++++++++++++++-
 .idea/.gitignore                              |   3 -
 .../inspectionProfiles/profiles_settings.xml  |   6 -
 .idea/misc.xml                                |  10 --
 .idea/modules.xml                             |   8 -
 .idea/project_LP.iml                          |   8 -
 .idea/vcs.xml                                 |   6 -
 __pycache__/app.cpython-310.pyc               | Bin 1282 -> 0 bytes
 __pycache__/shortener.cpython-310.pyc         | Bin 448 -> 0 bytes
 app.py                                        |  48 ++++--
 requirements.txt                              |   8 +-
 templates/base.html                           |  15 +-
 templates/index.html                          |  13 +-
 templates/short_url.html                      |  20 ++-
 14 files changed, 228 insertions(+), 79 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/project_LP.iml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 __pycache__/app.cpython-310.pyc
 delete mode 100644 __pycache__/shortener.cpython-310.pyc

diff --git a/.gitignore b/.gitignore
index 7279662..593bd5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,162 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
-env/
\ No newline at end of file
+db/
+*.db
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index b73d6c6..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10" project-jdk-type="Python SDK" />
-  <component name="PyCharmProfessionalAdvertiser">
-    <option name="shown" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index e4508d0..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/project_LP.iml" filepath="$PROJECT_DIR$/.idea/project_LP.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/project_LP.iml b/.idea/project_LP.iml
deleted file mode 100644
index d0876a7..0000000
--- a/.idea/project_LP.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/__pycache__/app.cpython-310.pyc b/__pycache__/app.cpython-310.pyc
deleted file mode 100644
index 90e2893a689f3e5ddc72fbf7e2d2dc157fe47045..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1282
zcmZ`&zi-<{6uu)x@<jcNU?go(phbZWT1=o*Q5ZoTCuvhShFdv9Z#mF<CyUaNRE}g)
z8QttPd(kNwGxxvY+9`9kEbV)gYzSz2#5=zC-MjnVd-pEy^+JZ@tH1u#U$~6@O~&qM
zq47OR@dr-8fE$)_$x}x<sViMhm}6S0C%r~@ji36`=S*`QTyZI&rNyER-T~8|7KnsD
zFz_L`W)SFb(YbPESBuv@5N|lNA-rbj({GRtB3<Y;$Uq0sUpn?DJZ%UA7{21jcW2Vb
zc=QgVV`I1W9-FvW)&r|E&{mZ?U75Jlbx>KOX1N{nI-LA`d}yX~ovzUmfXii)>dU*u
zbCZ<%yC{kXQ|ED^_u*XLBmd*0A0IvaRXsdBJA80Bd8D5G@?=VsyW_T022sr<2PPfu
zE?OuaaByBZ(%;yx18_097I=t>txvGE+c!RM*cJ)59v$6X^uWhGeF#8YGdY0vgpI?x
z{g6U_fFYlax$LZLlE!wemU{i}8;s^Lf+DMoiO-G3tOL-qxH9FG?<7FFgK~sYP*(u|
zoh{g1h78WhW&hxo<IAt@eLTfU0OwYr&Fn3+UEJ~E+vr)LZ4qV3GB@$Mm?t)0<}aet
z^>iNF^wj1HJuQpq_*8B6C|<4hSL<3RW%bG`H6(h9BjlH(Tgv^L<&*J{e6u*!O4XrK
zX%3Yky{pvoDmL2{2d~aQ%1xDKGI)}e`a)YvS=Iiev`Ka$+ZBe|93;gIYooA7>UJ^D
zZAq#WM1F>?VSU^t{i>X1`OCTm2-`kFP0Bk{kFWrzHcCMrf(`i|AMz1?U8h<5z@z_k
z&P~<d3*1v;-LLqj=3#<u{M-J#OwC(vU0mIvqk>!Fti8r<57qZ{lyK~)_`CF@CYk@G
zv-i-8t~PA^8XEfvVjm;1bbPb;8F`RJ_mIX(rW7_^?SVe8E>6aGq&K5SXepFU%=9wk
zut62RvUv0QtVa%1TRXt1cCizrKh3jQa$!fb#e15AHci>2XY&f{PKj;EU0Y=z3$zvo
go0hmw4PAVW(;n;cE*DP71s^%0gMXJ~$XoyX3(z|!=Kufz

diff --git a/__pycache__/shortener.cpython-310.pyc b/__pycache__/shortener.cpython-310.pyc
deleted file mode 100644
index ae13377f69eaa2961b30ae6e7662fb4cd5892018..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 448
zcmYk2%}xR_5Xaly1p(n=JecSU?8P;H8x0W=A&Q86_^}tVZY%r67TX0~qc^X<fG0fq
z7`{fYo_GaMwnPn+%r7&Ong2{na=8o;Hu`+Six7Y>nM|7^l6~Q9NdN%^17HHAm=LL^
zf;5zP0j7#z6X?mY=m52GQqbHj925^rN9D@#N%gdLRzGhvTkVU>t83G`u@S!QI<DvU
zLejsZEE){&AL7T=we^k7t?iu^Tk8CoxCuzbqHwk#fZzy3&{HBc(vb41yu)Yk1jK%|
z#(@qw^z{VSJmQ8tNv#l(9-pxt;@X(;OtDgE6pF1<qsf!iQmtHRiHS6G2#q=e8hijc
zD^`5xjW)xS8KLWwz>1mUQsR@LQIBoMqP;pL9=0Q9RO_AJ*qCVG5Yy#;%;&l?vLf91
ymrlt0HGz4kL7EeRu2K0gnwCgO$m-;PDP%>Br}laT4Fa5(zrkd03TQ$ntNZ}%nQZm|

diff --git a/app.py b/app.py
index 28f806a..fd859c6 100644
--- a/app.py
+++ b/app.py
@@ -3,44 +3,64 @@
 from datetime import datetime
 import shortener
 
+
 app = Flask(__name__)
-app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///date_base.db'
+
+app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///list.db'
+app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 db = SQLAlchemy(app)
 
 shortened_urls = {}
 
-class Date_Base(db.Model):
+class Article(db.Model):
     id = db.Column(db.Integer, primary_key=True)
-    user_name = db.Column(db.String(50), nullable=False)
+    #user_name = db.Column(db.String(50), nullable=False)
     full_url = db.Column(db.String, nullable=False)
-    short_url = db.Column(db.String(), nullable=False)
+    short_url = db.Column(db.String, nullable=False)
     date = db.Column(db.DateTime, default=datetime.utcnow)
 
     def __repr__(self):
-        return '<Date_Base %r>' % self.id
+        return '<Article %r>' % self.id
 
 
 @app.route("/", methods=['GET', 'POST'])
 def index():
     if request.method == 'POST':
-        long_url = request.form['long_url']
+        full_url = request.form['full_url']
         short_url = shortener.generate_short_url()
         while short_url in shortened_urls:
             short_url = shortener.generate_short_url()
 
-        shortened_urls[short_url] = long_url
+        shortened_urls[short_url] = full_url
+
+        article = Article(full_url = full_url, short_url = short_url)
+
+        try:
+            db.session.add(article)
+            db.session.commit()
+            return redirect('short_url')
+        except:
+            return 'При преобразовании возникла проблема'
 
-        return render_template('short_url.html', short_url = short_url)
     return render_template('index.html')
 
 
+@app.route('/short_url')
+def short_url():
+    article = Article.query.order_by(Article.date).all()
+    return render_template('short_url.html', article = article)
+
 @app.route('/<short_url>')
 def redirect_url(short_url):
-    long_url = shortened_urls.get(short_url)
-    if long_url:
-        return redirect(long_url)
-    else:
-        return 'Url not found'
+    try:
+        f = Article.query.filter_by(short_url = short_url).one()
+        if f.full_url:
+            return redirect(f.full_url)
+    except:
+            return 'Url not found'
+
 
 if __name__ == '__main__':
-    app.run(debug=True)
\ No newline at end of file
+    with app.app_context():         # <--- without these two lines,
+        db.create_all()             # <--- we get the OperationalError in the title
+        app.run(debug=True)
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index ca78b68..9fd4a86 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 blinker==1.7.0
 click==8.1.7
-Flask==3.0.0
-Flask-SQLAlchemy==3.1.1
+Flask==2.1.3
+Flask-SQLAlchemy==2.5.1
 greenlet==3.0.3
 itsdangerous==2.1.2
 Jinja2==3.1.2
 MarkupSafe==2.1.3
-SQLAlchemy==2.0.25
+SQLAlchemy==1.4.49
 typing_extensions==4.9.0
-Werkzeug==3.0.1
+Werkzeug==2.2.2
diff --git a/templates/base.html b/templates/base.html
index d288550..567e2ab 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -13,24 +13,17 @@
     <div class="container">
     <header class="d-flex justify-content-center py-3">
       <ul class="nav nav-pills">
-        <li class="nav-item"><a href="/" class="nav-link active" aria-current="page">Главная</a></li>
-        <li class="nav-item"><a href="#" class="nav-link">Features</a></li>
-        <li class="nav-item"><a href="#" class="nav-link">Pricing</a></li>
+        <li class="nav-item"><a href="/" class="nav-link">Главная</a></li>
+        <li class="nav-item"><a href="/short_url" class="nav-link">Ваши Url</a></li>
         <li class="nav-item"><a href="#" class="nav-link">FAQs</a></li>
-        <li class="nav-item"><a href="#" class="nav-link">About</a></li>
+        <li class="nav-item"><a href="#" class="nav-link"> Вход/Регистрация</a></li>
       </ul>
     </header>
   </div>
     {% block body %}{% endblock %}
     <div class="container">
   <footer class="py-3 my-4">
-    <ul class="nav justify-content-center border-bottom pb-3 mb-3">
-      <li class="nav-item"><a href="/" class="nav-link px-2 text-body-secondary">Home</a></li>
-      <li class="nav-item"><a href="#" class="nav-link px-2 text-body-secondary">Features</a></li>
-      <li class="nav-item"><a href="#" class="nav-link px-2 text-body-secondary">Pricing</a></li>
-      <li class="nav-item"><a href="#" class="nav-link px-2 text-body-secondary">FAQs</a></li>
-      <li class="nav-item"><a href="#" class="nav-link px-2 text-body-secondary">About</a></li>
-    </ul>
+    <ul class="nav justify-content-center border-bottom pb-3 mb-3"></ul>
     <p class="text-center text-body-secondary">© 2024 by Shirokov Nikolay</p>
   </footer>
 </div>
diff --git a/templates/index.html b/templates/index.html
index befc760..97b32ba 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,17 +7,18 @@
 {% block body %}
 <div class="container">
 <div class="px-4 py-5 my-5 text-center">
-
     <h1 class="display-5 fw-bold text-body-emphasis">Короче URL</h1>
     <div class="col-lg-6 mx-auto">
       <p class="lead mb-4">Сервис для быстрого преобразования длинной URL ссылки в более короткую </p>
         <form method="POST" action="{{ url_for('index') }}">
-            <div class="d-grid gap-2 d-sm-flex justify-content-sm-center">
-            <input type="text" name="long_url" placeholder="Введите Url-ссылку">
-            <button type="submit" class="btn btn-outline-secondary btn-lg px-4">Короче</button>
+            <div class="row mb-3 text-center">
+                    <input type="text" class="col-md-8 themed-grid-col" name="full_url" id="full_url" placeholder="Введите Url-ссылку">
+                <div class="col-md-4 themed-grid-col">
+                    <button type="submit" class="btn btn-outline-secondary btn-lg px-4">Короче</button>
+                </div>
+            </div>
         </form>
-      </div>
     </div>
-  </div>
+</div>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/short_url.html b/templates/short_url.html
index d544f8b..a5cb513 100644
--- a/templates/short_url.html
+++ b/templates/short_url.html
@@ -6,7 +6,23 @@
 
 {% block body %}
 <div class="container">
-<h1>Страница вашего короткого Url адреса: {{request.url_root}}{{short_url}}</h1>
+<table class="table table-bordered">
+    <thead class="table-primary">
+        <tr><th>full Url</th>
+        <th>short Url</th>
+        <th>date</th>
+    </tr></thead>
+    {% for el in article %}
+    <tbody><tr>
+        <td>{{ el.full_url }}</td>
+        <td><a href={{request.url_root}}{{ el.short_url }}>{{ el.short_url }}</a></td>
+        <td>{{ el.date }}</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+</table>
 </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+

From 09ab9982cd3f88c0e14c2f0189c43fa4e72a1623 Mon Sep 17 00:00:00 2001
From: Nikolay Shirokov <nshirokov@internet.ru>
Date: Mon, 29 Jan 2024 21:45:17 +0700
Subject: [PATCH 4/4] in process

---
 app.py                                        | 153 +++++++++++++++---
 config.py                                     |   2 +
 create_admin.py                               |  25 +++
 forms.py                                      |  27 ++++
 migrations/README                             |   1 +
 migrations/alembic.ini                        |  50 ++++++
 migrations/env.py                             | 113 +++++++++++++
 migrations/script.py.mako                     |  24 +++
 .../31ee6a74b04d_added_foreingkey_user_id.py  |  34 ++++
 ...649762b05dd7_added_foreingkey_user_name.py |  34 ++++
 .../ca9a586bad41_added_foreingkey_user_id.py  |  34 ++++
 requirements.txt                              |   5 +
 templates/base.html                           |   9 +-
 templates/index.html                          |  12 +-
 templates/login.html                          |  37 +++++
 templates/nonreg.html                         |  33 ++++
 templates/registration.html                   |  43 +++++
 templates/short_url.html                      |   9 +-
 18 files changed, 612 insertions(+), 33 deletions(-)
 create mode 100644 config.py
 create mode 100644 create_admin.py
 create mode 100644 forms.py
 create mode 100644 migrations/README
 create mode 100644 migrations/alembic.ini
 create mode 100644 migrations/env.py
 create mode 100644 migrations/script.py.mako
 create mode 100644 migrations/versions/31ee6a74b04d_added_foreingkey_user_id.py
 create mode 100644 migrations/versions/649762b05dd7_added_foreingkey_user_name.py
 create mode 100644 migrations/versions/ca9a586bad41_added_foreingkey_user_id.py
 create mode 100644 templates/login.html
 create mode 100644 templates/nonreg.html
 create mode 100644 templates/registration.html

diff --git a/app.py b/app.py
index fd859c6..69d70f8 100644
--- a/app.py
+++ b/app.py
@@ -1,28 +1,73 @@
-from flask import Flask, render_template, url_for, redirect, request
-from flask_sqlalchemy import SQLAlchemy
 from datetime import datetime
-import shortener
 
+from flask import Flask, render_template, url_for, redirect, request, flash
+from flask_login import LoginManager, login_user, logout_user, current_user,login_required
+from flask_login import UserMixin
+from flask_sqlalchemy import SQLAlchemy
+from werkzeug.security import generate_password_hash, check_password_hash
+from flask_migrate import Migrate
+from forms import LoginForm, RegistrationForm
+import shortener
+from sqlalchemy import MetaData
 
 app = Flask(__name__)
-
+app.config.from_object('config')
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///list.db'
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
-db = SQLAlchemy(app)
+convention = {
+    "ix": 'ix_%(column_0_label)s',
+    "uq": "uq_%(table_name)s_%(column_0_name)s",
+    "ck": "ck_%(table_name)s_%(constraint_name)s",
+    "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
+    "pk": "pk_%(table_name)s"
+}
+
+metadata = MetaData(naming_convention=convention)
+db = SQLAlchemy(app,metadata=metadata)
+login_manager = LoginManager()
+login_manager.init_app(app)
+login_manager.login_view = 'login'
+migrate = Migrate(app, db)
+
+
+
+@login_manager.user_loader
+def load_user(user_id):
+    return User.query.get(user_id)
+
 
 shortened_urls = {}
 
+
 class Article(db.Model):
     id = db.Column(db.Integer, primary_key=True)
-    #user_name = db.Column(db.String(50), nullable=False)
     full_url = db.Column(db.String, nullable=False)
     short_url = db.Column(db.String, nullable=False)
     date = db.Column(db.DateTime, default=datetime.utcnow)
+    user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
 
     def __repr__(self):
         return '<Article %r>' % self.id
 
 
+class User(db.Model, UserMixin):
+    id = db.Column(db.Integer, primary_key=True)
+    username = db.Column(db.String(64), index=True, unique=True)
+    password = db.Column(db.String(128))
+    role = db.Column(db.String(10), index=True)
+
+
+
+    def set_password(self, password):
+        self.password = generate_password_hash(password)
+
+    def check_password(self, password):
+        return check_password_hash(self.password, password)
+
+    def __repr__(self):
+        return '<User {}>'.format(self.username)
+
+
 @app.route("/", methods=['GET', 'POST'])
 def index():
     if request.method == 'POST':
@@ -30,37 +75,97 @@ def index():
         short_url = shortener.generate_short_url()
         while short_url in shortened_urls:
             short_url = shortener.generate_short_url()
-
         shortened_urls[short_url] = full_url
-
-        article = Article(full_url = full_url, short_url = short_url)
-
-        try:
-            db.session.add(article)
-            db.session.commit()
-            return redirect('short_url')
-        except:
-            return 'При преобразовании возникла проблема'
-
+        if current_user.is_authenticated:
+            article = Article(full_url=full_url, short_url=short_url,user_id=current_user.id)
+            try:
+                db.session.add(article)
+                db.session.commit()
+                return redirect('short_url')
+            except:
+                return 'При преобразовании возникла проблема'
+        flash('Для просмотра истории создания ваших ссылок необходимо войти или зарегистрироваться')
+        return render_template('nonreg.html',full_url=full_url,short_url=short_url)
     return render_template('index.html')
 
 
 @app.route('/short_url')
+@login_required
 def short_url():
-    article = Article.query.order_by(Article.date).all()
-    return render_template('short_url.html', article = article)
+    #article = Article.query.order_by(Article.date).all()
+    res = db.session.query(Article,User).join(Article, User.id == Article.user_id).all()
+    return render_template('short_url.html', res=res)
+
+
+@app.route('/login')
+def login():
+    if current_user.is_authenticated:
+        return redirect(url_for('index'))
+    title = "Авторизация"
+    login_form = LoginForm()
+    return render_template('login.html', page_title=title, form=login_form)
+
+
+@app.route('/process-login', methods=['POST'])
+def process_login():
+    form = LoginForm()
+    if form.validate_on_submit():
+        user = User.query.filter_by(username=form.username.data).first()
+        if user and user.check_password(form.password.data):
+            login_user(user)
+            flash('Вы вошли на сайт')
+            return redirect(url_for('index'))
+    flash('Неправильное имя пользователя или пароль')
+    return redirect(url_for('login'))
+
+
+@app.route('/logout')
+@login_required
+def logout():
+    logout_user()
+    flash('Вы успешно вышли')
+    return redirect(url_for('index'))
+
+@app.route('/register')
+def register():
+    if current_user.is_authenticated:
+        return redirect(url_for('index'))
+    form = RegistrationForm()
+    title = "Регистрация"
+    return render_template('registration.html',page_title=title, form=form)
+
+
+@app.route('/process-reg', methods=['POST'])
+def process_reg():
+    form = RegistrationForm()
+    if form.validate_on_submit():
+        new_user = User(username=form.username.data,role='user')
+        new_user.set_password(form.password.data)
+        db.session.add(new_user)
+        db.session.commit()
+        flash('Вы успешно зарегистрировались!')
+        return redirect(url_for('login'))
+    else:
+        for field, errors in form.errors.items():
+            for error in errors:
+                flash('Ошибка в поле "{}": - {}'.format(
+                    getattr(form, field).label.text,
+                    error
+                ))
+        return redirect(url_for('user.register'))
+
 
 @app.route('/<short_url>')
 def redirect_url(short_url):
     try:
-        f = Article.query.filter_by(short_url = short_url).one()
+        f = Article.query.filter_by(short_url=short_url).one()
         if f.full_url:
             return redirect(f.full_url)
     except:
-            return 'Url not found'
+        return 'Url not found'
 
 
 if __name__ == '__main__':
-    with app.app_context():         # <--- without these two lines,
-        db.create_all()             # <--- we get the OperationalError in the title
-        app.run(debug=True)
\ No newline at end of file
+    with app.app_context():  # <--- without these two lines,
+        db.create_all()  # <--- we get the OperationalError in the title
+        app.run(debug=True)
diff --git a/config.py b/config.py
new file mode 100644
index 0000000..f553e91
--- /dev/null
+++ b/config.py
@@ -0,0 +1,2 @@
+CSRF_ENABLED = True
+SECRET_KEY = 'you-will-never-guess'
\ No newline at end of file
diff --git a/create_admin.py b/create_admin.py
new file mode 100644
index 0000000..1162274
--- /dev/null
+++ b/create_admin.py
@@ -0,0 +1,25 @@
+from getpass import getpass
+import sys
+
+from app import app
+from app import User,db
+
+
+with app.app_context():
+    username = input('Введите имя пользователя: ')
+
+    if User.query.filter(User.username == username).count():
+        print('Такой пользователь уже есть')
+        sys.exit(0)
+
+    password = getpass('Введите пароль: ')
+    password2 = getpass('Повторите пароль: ')
+    if not password == password2:
+        sys.exit(0)
+
+    new_user = User(username=username, role='admin')
+    new_user.set_password(password)
+
+    db.session.add(new_user)
+    db.session.commit()
+    print('User with id {} added'.format(new_user.id))
\ No newline at end of file
diff --git a/forms.py b/forms.py
new file mode 100644
index 0000000..22f1467
--- /dev/null
+++ b/forms.py
@@ -0,0 +1,27 @@
+from flask_wtf import FlaskForm
+from wtforms import StringField, PasswordField, SubmitField
+from wtforms.validators import DataRequired, EqualTo, ValidationError
+
+
+
+
+class LoginForm(FlaskForm):
+    username = StringField('Имя пользователя', validators=[DataRequired()],
+          render_kw={"class": "form-control"})
+    password = PasswordField('Пароль', validators=[DataRequired()],
+          render_kw={"class": "form-control"})
+    submit = SubmitField('Отправить', render_kw={"class": "btn btn-primary"})
+
+class RegistrationForm(FlaskForm):
+    username = StringField('Имя пользователя', validators=[DataRequired()],
+         render_kw={"class": "form-control"})
+    password = PasswordField('Пароль', validators=[DataRequired()],
+         render_kw={"class": "form-control"})
+    password2 = PasswordField('Повторите пароль',validators=[DataRequired(),EqualTo('password')],
+         render_kw={"class": "form-control"})
+    submit = SubmitField('Отправить!',render_kw={"class": "btn btn-primary"})
+
+    # def validate_username(self, username):
+    #     users_count = User.query.filter_by(username=username.data).count()
+    #     if users_count > 0:
+    #         raise ValidationError('Пользователь с таким именем уже зарегистрирован')
\ No newline at end of file
diff --git a/migrations/README b/migrations/README
new file mode 100644
index 0000000..0e04844
--- /dev/null
+++ b/migrations/README
@@ -0,0 +1 @@
+Single-database configuration for Flask.
diff --git a/migrations/alembic.ini b/migrations/alembic.ini
new file mode 100644
index 0000000..ec9d45c
--- /dev/null
+++ b/migrations/alembic.ini
@@ -0,0 +1,50 @@
+# A generic, single database configuration.
+
+[alembic]
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic,flask_migrate
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[logger_flask_migrate]
+level = INFO
+handlers =
+qualname = flask_migrate
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/migrations/env.py b/migrations/env.py
new file mode 100644
index 0000000..4c97092
--- /dev/null
+++ b/migrations/env.py
@@ -0,0 +1,113 @@
+import logging
+from logging.config import fileConfig
+
+from flask import current_app
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+logger = logging.getLogger('alembic.env')
+
+
+def get_engine():
+    try:
+        # this works with Flask-SQLAlchemy<3 and Alchemical
+        return current_app.extensions['migrate'].db.get_engine()
+    except (TypeError, AttributeError):
+        # this works with Flask-SQLAlchemy>=3
+        return current_app.extensions['migrate'].db.engine
+
+
+def get_engine_url():
+    try:
+        return get_engine().url.render_as_string(hide_password=False).replace(
+            '%', '%%')
+    except AttributeError:
+        return str(get_engine().url).replace('%', '%%')
+
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+config.set_main_option('sqlalchemy.url', get_engine_url())
+target_db = current_app.extensions['migrate'].db
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def get_metadata():
+    if hasattr(target_db, 'metadatas'):
+        return target_db.metadatas[None]
+    return target_db.metadata
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url, target_metadata=get_metadata(), literal_binds=True
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+
+    # this callback is used to prevent an auto-migration from being generated
+    # when there are no changes to the schema
+    # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
+    def process_revision_directives(context, revision, directives):
+        if getattr(config.cmd_opts, 'autogenerate', False):
+            script = directives[0]
+            if script.upgrade_ops.is_empty():
+                directives[:] = []
+                logger.info('No changes in schema detected.')
+
+    conf_args = current_app.extensions['migrate'].configure_args
+    if conf_args.get("process_revision_directives") is None:
+        conf_args["process_revision_directives"] = process_revision_directives
+
+    connectable = get_engine()
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=get_metadata(),
+            **conf_args
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
diff --git a/migrations/script.py.mako b/migrations/script.py.mako
new file mode 100644
index 0000000..2c01563
--- /dev/null
+++ b/migrations/script.py.mako
@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}
diff --git a/migrations/versions/31ee6a74b04d_added_foreingkey_user_id.py b/migrations/versions/31ee6a74b04d_added_foreingkey_user_id.py
new file mode 100644
index 0000000..fea8224
--- /dev/null
+++ b/migrations/versions/31ee6a74b04d_added_foreingkey_user_id.py
@@ -0,0 +1,34 @@
+"""added foreingkey user_id
+
+Revision ID: 31ee6a74b04d
+Revises: 649762b05dd7
+Create Date: 2024-01-29 20:05:57.928626
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '31ee6a74b04d'
+down_revision = '649762b05dd7'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('article', schema=None) as batch_op:
+        batch_op.drop_constraint('fk_article_user_id_user', type_='foreignkey')
+        batch_op.create_foreign_key(batch_op.f('fk_article_user_id_user'), 'user', ['user_id'], ['id'])
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('article', schema=None) as batch_op:
+        batch_op.drop_constraint(batch_op.f('fk_article_user_id_user'), type_='foreignkey')
+        batch_op.create_foreign_key('fk_article_user_id_user', 'user', ['user_id'], ['username'])
+
+    # ### end Alembic commands ###
diff --git a/migrations/versions/649762b05dd7_added_foreingkey_user_name.py b/migrations/versions/649762b05dd7_added_foreingkey_user_name.py
new file mode 100644
index 0000000..f453a0f
--- /dev/null
+++ b/migrations/versions/649762b05dd7_added_foreingkey_user_name.py
@@ -0,0 +1,34 @@
+"""added foreingkey user_name
+
+Revision ID: 649762b05dd7
+Revises: ca9a586bad41
+Create Date: 2024-01-29 20:03:58.860250
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '649762b05dd7'
+down_revision = 'ca9a586bad41'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('article', schema=None) as batch_op:
+        batch_op.drop_constraint('fk_article_user_id_user', type_='foreignkey')
+        batch_op.create_foreign_key(batch_op.f('fk_article_user_id_user'), 'user', ['user_id'], ['username'])
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('article', schema=None) as batch_op:
+        batch_op.drop_constraint(batch_op.f('fk_article_user_id_user'), type_='foreignkey')
+        batch_op.create_foreign_key('fk_article_user_id_user', 'user', ['user_id'], ['id'])
+
+    # ### end Alembic commands ###
diff --git a/migrations/versions/ca9a586bad41_added_foreingkey_user_id.py b/migrations/versions/ca9a586bad41_added_foreingkey_user_id.py
new file mode 100644
index 0000000..0263c89
--- /dev/null
+++ b/migrations/versions/ca9a586bad41_added_foreingkey_user_id.py
@@ -0,0 +1,34 @@
+"""added foreingkey user_id
+
+Revision ID: ca9a586bad41
+Revises: 
+Create Date: 2024-01-29 19:29:25.698347
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ca9a586bad41'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('article', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('user_id', sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(None, 'user', ['user_id'], ['id'])
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('article', schema=None) as batch_op:
+        batch_op.drop_constraint(None, type_='foreignkey')
+        batch_op.drop_column('user_id')
+
+    # ### end Alembic commands ###
diff --git a/requirements.txt b/requirements.txt
index 9fd4a86..92b85a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,10 @@
 blinker==1.7.0
 click==8.1.7
 Flask==2.1.3
+Flask-Login==0.6.3
 Flask-SQLAlchemy==2.5.1
+Flask-WTF==1.2.1
+Flask-Migrate==2.3.1
 greenlet==3.0.3
 itsdangerous==2.1.2
 Jinja2==3.1.2
@@ -9,3 +12,5 @@ MarkupSafe==2.1.3
 SQLAlchemy==1.4.49
 typing_extensions==4.9.0
 Werkzeug==2.2.2
+wtf==0.1
+WTForms==3.1.2
diff --git a/templates/base.html b/templates/base.html
index 567e2ab..c2270c8 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -10,16 +10,17 @@
     <title>{% block title %}{% endblock %}</title>
 </head>
 <body>
-    <div class="container">
+<div class="container">
     <header class="d-flex justify-content-center py-3">
       <ul class="nav nav-pills">
         <li class="nav-item"><a href="/" class="nav-link">Главная</a></li>
         <li class="nav-item"><a href="/short_url" class="nav-link">Ваши Url</a></li>
-        <li class="nav-item"><a href="#" class="nav-link">FAQs</a></li>
-        <li class="nav-item"><a href="#" class="nav-link"> Вход/Регистрация</a></li>
+        <li class="nav-item"><a href="/login" class="nav-link">Вход</a></li>
+        <li class="nav-item"><a href="/register" class="nav-link">Регистрация</a></li>
+          <li class="nav-item"><a href="/logout" class="nav-link">Выход</a></li>
       </ul>
     </header>
-  </div>
+</div>
     {% block body %}{% endblock %}
     <div class="container">
   <footer class="py-3 my-4">
diff --git a/templates/index.html b/templates/index.html
index 97b32ba..e1220cc 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,7 +4,17 @@
 Короче
 {% endblock %}
 
+
 {% block body %}
+{% with messages = get_flashed_messages() %}
+    {% if messages %}
+    <div class="alert alert-warning" role="alert">
+        {% for message in messages %}
+            {{ message }}<br>
+        {% endfor %}
+    </div>
+    {% endif %}
+{% endwith %}
 <div class="container">
 <div class="px-4 py-5 my-5 text-center">
     <h1 class="display-5 fw-bold text-body-emphasis">Короче URL</h1>
@@ -14,7 +24,7 @@ <h1 class="display-5 fw-bold text-body-emphasis">Короче URL</h1>
             <div class="row mb-3 text-center">
                     <input type="text" class="col-md-8 themed-grid-col" name="full_url" id="full_url" placeholder="Введите Url-ссылку">
                 <div class="col-md-4 themed-grid-col">
-                    <button type="submit" class="btn btn-outline-secondary btn-lg px-4">Короче</button>
+                    <button type="submit" class="btn btn-primary btn-lg px-4">Короче</button>
                 </div>
             </div>
         </form>
diff --git a/templates/login.html b/templates/login.html
new file mode 100644
index 0000000..cc98062
--- /dev/null
+++ b/templates/login.html
@@ -0,0 +1,37 @@
+{% extends 'base.html' %}
+
+{% block title %}
+{% endblock %}
+
+{% block body %}
+{% with messages = get_flashed_messages() %}
+    {% if messages %}
+    <div class="alert alert-warning" role="alert">
+        {% for message in messages %}
+            {{ message }}<br>
+        {% endfor %}
+    </div>
+    {% endif %}
+{% endwith %}
+<div class="container">
+
+    <div class="row">
+        <div class="col-4"></div>
+        <div class="col-4">
+            <h1> {{ page_title }}</h1>
+            <form action="{{ url_for('process_login') }}" method="post">
+                {{ form.hidden_tag() }}
+                <div class="form-group">
+                    {{ form.username.label }}<br>
+                    {{ form.username() }}
+                </div>
+                <div class="form-group">
+                    {{ form.password.label }}<br>
+                    {{ form.password() }}<br>
+                </div>
+                {{ form.submit }}
+            </form>
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/templates/nonreg.html b/templates/nonreg.html
new file mode 100644
index 0000000..eb43fb4
--- /dev/null
+++ b/templates/nonreg.html
@@ -0,0 +1,33 @@
+{% extends 'base.html' %}
+
+{% block title %}
+Ваш Url
+{% endblock %}
+
+{% block body %}
+{% with messages = get_flashed_messages() %}
+    {% if messages %}
+    <div class="alert alert-warning" role="alert">
+        {% for message in messages %}
+            {{ message }}<br>
+        {% endfor %}
+    </div>
+    {% endif %}
+{% endwith %}
+<div class="container">
+<table class="table table-bordered">
+    <thead class="table-primary">
+        <tr><th>full Url</th>
+        <th>short Url</th>
+    </tr></thead>
+    <tbody><tr>
+        <td>{{ full_url }}</td>
+        <td><a href={{request.url_root}}{{ short_url }}>{{ short_url }}</a></td>
+    </tr>
+    </tbody>
+</table>
+</div>
+
+{% endblock %}
+
+
diff --git a/templates/registration.html b/templates/registration.html
new file mode 100644
index 0000000..7e2fada
--- /dev/null
+++ b/templates/registration.html
@@ -0,0 +1,43 @@
+{% extends 'base.html' %}
+
+{% block title %}
+{% endblock %}
+
+
+
+{% block body %}
+{% with messages = get_flashed_messages() %}
+    {% if messages %}
+    <div class="alert alert-warning" role="alert">
+        {% for message in messages %}
+            {{ message }}<br>
+        {% endfor %}
+    </div>
+    {% endif %}
+{% endwith %}
+<div class="container">
+
+    <div class="row">
+        <div class="col-4"></div>
+        <div class="col-4">
+            <h1> {{ page_title }}</h1>
+            <form action="{{ url_for('process_reg') }}" method="post">
+                {{ form.hidden_tag() }}
+                <div class="form-group">
+                    {{ form.username.label }}<br>
+                    {{ form.username() }}
+                </div>
+                <div class="form-group">
+                    {{ form.password.label }}<br>
+                    {{ form.password() }}<br>
+                </div>
+                <div class="form-group">
+                    {{ form.password2.label }}<br>
+                    {{ form.password2() }}<br>
+                </div>
+                {{ form.submit }}
+            </form>
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/templates/short_url.html b/templates/short_url.html
index a5cb513..5fb4069 100644
--- a/templates/short_url.html
+++ b/templates/short_url.html
@@ -4,6 +4,7 @@
 Ваш Url
 {% endblock %}
 
+
 {% block body %}
 <div class="container">
 <table class="table table-bordered">
@@ -12,11 +13,11 @@
         <th>short Url</th>
         <th>date</th>
     </tr></thead>
-    {% for el in article %}
+    {% for el in res %}
     <tbody><tr>
-        <td>{{ el.full_url }}</td>
-        <td><a href={{request.url_root}}{{ el.short_url }}>{{ el.short_url }}</a></td>
-        <td>{{ el.date }}</td>
+        <td>{{ el.Article.full_url }}</td>
+        <td><a href={{request.url_root}}{{ el.Article.short_url }}>{{ el.Article.short_url }}</a></td>
+        <td>{{ el.Article.date }}</td>
     </tr>
     {% endfor %}
     </tbody>