diff --git a/data.db b/data.db
index 39be854..b6891e3 100644
Binary files a/data.db and b/data.db differ
diff --git a/mysqlite.py b/mysqlite.py
index c98f408..8efea6f 100644
--- a/mysqlite.py
+++ b/mysqlite.py
@@ -10,4 +10,6 @@ def __enter__(self):
         return self.conn.cursor()
     def __exit__(self, type, value, traceback):
         self.conn.commit()
-        self.conn.close()
\ No newline at end of file
+        self.conn.close()
+
+    
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index a8a7a78..c7cffe1 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -39,7 +39,7 @@
     <li><a href="{{ url_for('info') }}">Info</a></li>
     <li><a href="{{ url_for('abc') }}">ABC</a></li>
     <li><a href="{{ url_for('malina') }}">Malina</a></li>
-    <li><a href="{{ url_for('zkracovac') }}">Zkracovač</a></li>
+    <li><a href="{{ url_for('zkracovač') }}">Zkracovač</a></li>
     <li><a href="{{ url_for('login') }}">Login</a></li>
     <li><a href="{{ url_for('logout') }}">logout</a></li>
     <li><a href="{{ url_for('registrace') }}">registrace</a></li>
diff --git a/templates/zkracovac.html b/templates/zkracovac.html
deleted file mode 100644
index 5c26bc5..0000000
--- a/templates/zkracovac.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends 'base.html' %}
-
-{%block title%}Zkracovač{%endblock%}
-
-{% block obsah %}
-
-<h1>Zkracovač URL</h1>
-
-<form method="post"></form>
-    <p class="url">
-    Zadej URL: 
-    <input type ="text"name ="url">
-    <button type="submit">Zkrátit</button>
-    </p>
-{% endblock obsah %}
\ No newline at end of file
diff --git "a/templates/zkracova\304\215.html" "b/templates/zkracova\304\215.html"
new file mode 100644
index 0000000..b2c1d0d
--- /dev/null
+++ "b/templates/zkracova\304\215.html"
@@ -0,0 +1,28 @@
+{% extends 'base.html' %}
+
+{%block title%}Zkracovač{%endblock%}
+
+{% block obsah %}
+
+<h1>Zkracovač URL</h1>
+
+{% if new %}
+<p>Vytvořena nová zkratka:<a href="{{new}}">{{ new }}   </a></p>
+
+{% endif %}
+
+<form method="post">
+<p class="url">
+    Zadejte URL: <br>
+     <input type="text" name="url">
+     <button type="submit">Zkrátit</button>
+    </p>
+</form>
+<h2>Seznam uložených zkratek</h2>
+<ul>
+{%for zkratka, adresa in zkratky%}
+    <li><a href="{{url_for('dezkracovac', zkratka = zkratka)}}">{{zkratka}}</a></li>
+    <li><a href="{{adresa}}">{{adresa}}</a></li>
+</ul>
+{%endfor%}
+{% endblock obsah %}
\ No newline at end of file
diff --git a/webface.py b/webface.py
index a23d50c..185efe1 100644
--- a/webface.py
+++ b/webface.py
@@ -6,6 +6,7 @@
 import sqlite3
 import random
 import string
+import re
 
 app = Flask(__name__)
 app.secret_key = b"totoj e zceLa n@@@hodny retezec nejlep os.urandom(24)"
@@ -15,7 +16,9 @@
 slova = ("Super", "Perfekt", "Úža", "Flask")
 
 
-
+@app.route("/", methods=["GET"])
+def index():
+    return render_template("base.html")
 
 def prihlasit(function):
     @functools.wraps(function)
@@ -28,22 +31,57 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
-@app.route("/", methods=["GET"])
-def index():
-    return render_template("base.html")
+@app.route("/zkracovač/",  methods=["GET"])
+def zkracovač():
+    new = request.args.get("new")
+    if "uzivatel" in session:
+        with SQLite("data.db") as cur:
+            res = cur.execute("SELECT zkratka, adresa FROM adresy Where user=?", [session["uzivatel"]])
+            zkratky = res.fetchall()
+            if not zkratky:
+                zkratky = []
+    else:
+        zkratky = []
+    return render_template("zkracovač.html", new=new, zkratky=zkratky)
+
 
-@app.route("/zkracovac/")
-def zkracovac():
-    return render_template("zkracovac.html")
 
-@app.route("/zkracovac/", methods=["POST"])
-def zkracovac_post():
+@app.route("/zkracovač/", methods=["POST"])
+def zkracovač_post():
     url = request.form.get("url")
-    zkratka = "".join(random.choices(string.ascii_uppercase +string.digits, k=5))
+    if url and re.match("https?://.+", url):
+        zkratka = ''.join(random.choices(string.ascii_uppercase +
+                                string.digits, k=5))
+
+        with SQLite("data.db") as cur:
+            if "uzivatel" in session:
+                cur.execute("INSERT INTO adresy (zkratka, adresa, user) VALUES (?, ?, ?)", [zkratka, url, session["uzivatel"]])
+                flash("Adresa uložena")
+            else:
+                cur.execute("INSERT INTO adresy (zkratka, adresa) VALUES (?, ?)", [zkratka, url])
+            return redirect(url_for("zkracovač", new=zkratka))
+    else:
+        flash("To, co jsi zadal není adresa webové stránky!")
+
+
+    return redirect(url_for("zkracovač",))
+
+@app.route("/zkracovač/<zkratka>",  methods=["GET"])
+def dezkracovac(zkratka):
+    print(zkratka)
     with SQLite("data.db") as cur:
-            cur.execute( " INSERT INTO adresy (zkratka,adresa) VALUES (?,?) ", [zkratka,url] )
-            
-    return redirect(url_for("zkracovac"))
+        cur.execute("SELECT adresa FROM adresy WHERE zkratka=? ;", [zkratka])
+        odpoved = cur.fetchone()
+        print(type(odpoved))
+        if odpoved:
+            print(odpoved[0])
+            return redirect(odpoved[0])
+
+        else:
+            flash("Toto ({}) není korektní ZKRATKA".format(zkratka))
+
+
+    return redirect(url_for("zkracovač"))