From ff9322e3d370af6ca0ef8880f0ae09d0866a82a7 Mon Sep 17 00:00:00 2001
From: elukjanovica <elukjanovica.e@rkg.lv>
Date: Sat, 27 Apr 2024 22:02:01 +0300
Subject: [PATCH]

---
 instance/Picture_Puzzle_web.db | Bin 20480 -> 20480 bytes
 main.py                        |  40 ++++++++++-----------------------
 templates/auth/register.html   |   2 ++
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/instance/Picture_Puzzle_web.db b/instance/Picture_Puzzle_web.db
index 0ac512fefed862833ed4b56e3e7913e339a98bbb..321cb65c4a73fb4d90aa5100758d3314ebeebc86 100644
GIT binary patch
literal 20480
zcmeI(&u`mQ8~|`TPTD4ryr~fFP)&N#R5j6X6sIjv!NjsO>Z)a3o3%*OgsPYLHF?Cb
zjs2XiyKS7faX{i<;KY?92Tq(gz$8wbx$J-h5=XwzN!GMdBD5h+UrUbd_v7pLKK3Q=
zJwG^T3d!k-7YvxB>)I7f*R@-eYMQnTdkXf+mVlGw<N}WR)cLH_Wvx8?B1`_(lGzs;
z(aBHQ7r9?&6~=TFKmim$0Te(16hHwKKmim$f&WP0Y0p@^n$PQ>uS?c;xbKBh?a6wp
zQ9EqV!`kg;gQ^r-%%p`)clQn(JB=3IyMIXcj+)JPXeMnl$&Wh$hl5Q&uC?lSYOSJG
zsgy31Vvb<p>})Bd!)IrU0qf4m-f!*RtF<1|yN!pmDD0AI*3sVX!BK-2;~SSUrM2Y3
z)erKzCS0384nK3?Pwp{`q!(Wwt3DoE>NoZDt{$5_JBv-CkOyi{Trg27b4*mW%La3r
z?6WXD^@2HKe87Y=n`B;}C%0GKPR#4JDtK(EUjyE#CG}QiVK>N$Mt&q;!T~oFKmim$
z0Te(16hHwKKmim$0Te)iR~9H5DJ`F`b0_Ls)%6WHe9ByJC^|jH9pSQDUG?w3-0=qQ
zB~n^x_2z>?)V&=AT^{UtUYofr==4M=tJU{I$Z5wpF65k7+|*Or^+Fv+I2<m0?(;xK
z3{Ly3x;d3-RjjS*=6SUY^vNL4HS!yIPX2i14q`<VKmim$0Te(16hHwKKmim$0Te)i
z|65?m$m?pX!B{p*`o*DyM9#RLo*EBO^Z)6ruaWPGB!%41xvz4K?4Q|hAqh7WKmim$
z0Te(16hHwKKmim$f!7fDFukA^R_cZ7yXDG8xmu}iFdOE9c~~1A)R)+_tJad+e8?RS
z=5fPOiL&o@x0j%{X>M9uliD^9Mb|Z%Yny{86rJt(n!+`WuP^7TDEAj3%IeORwK<8x
zAN#x`nG~KI?x>qjC(vP7rm)~2*3h4wH_B{t(-D2H0^VDIfQ3h^R&^3E^3`_&re#`j
zxV3%Jkx{_ue)QxCto#pPwR@kh(NQsKm94PPVY1qDRk)ieWwd3g_N~W8Fi$SKzO2Jx
zXaA7Grv)9)=CsEh@EK>C13rjb(@d)F?OGK;8dbN&$%*JhjubrHo;s(eJ(w-0&=%o#
zWA#un5p-C{%@Z{t4~;o6Ali*j3h=bX(R$vgDWrMILUX`ue#bkdvd8JHK0-OTgUzAE
za2FMFHvu89J&NCfYTUmG*T2K6v>B`kXsb{k=`oe1UZ+tgwM@VZ&MtwEQ~l9nF#Y&3
zr~qpIKTU=j8IteFGx7uZn*2q6A-|JvUgIUlswjX0D1ZVefC4Ch0w{n2D1ZVefC3=!
zhOwfL$9>Xo8>W7FlxFFQv8qpx!7S#Cf<74~Fs%g@U_9=TQe~${IFfG}H}p$`6vmsz
PwU_l18Dk|q9ufElEClY5

delta 158
zcmZozz}T>Wae_1>%S0JxQ5FWhXcJ!k9}FyfrVRYb{O9>h`F?E{6gbGs)#${`E-os{
z*pxo`JFnH`aK6=?nv4(;)5+ZYF_Sy_tC<)CHVY~o;h#9cjE#!{2;f{UUNDz|f&VO6
i1sel{v9z<|<R)7kE{IB?)K{oxEe`I)l(Nj^)M5a?&?UnF

diff --git a/main.py b/main.py
index 5b7fa3b..e6535ce 100644
--- a/main.py
+++ b/main.py
@@ -2,6 +2,7 @@ from flask import Flask, render_template, redirect, request, session, url_for
 from flask_sqlalchemy import SQLAlchemy
 from flask_admin import Admin
 from flask_admin.contrib.sqla import ModelView
+from werkzeug.security import generate_password_hash, check_password_hash
 
 app = Flask(__name__)
 app.secret_key = 'bebra'
@@ -12,11 +13,11 @@ class User(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     username = db.Column(db.String(100), unique=True, nullable=False)
     password = db.Column(db.String(100), nullable=False)
-    email = db.Column(db.String(100), nullable=False)
-
+    email = db.Column(db.String(100), unique=True, nullable=False)
+    
 class Post(db.Model):
     id = db.Column(db.Integer, primary_key=True)
-    date_created = db.Column(db.String(100), unique=True, nullable=False)
+    date_created = db.Column(db.String(100), unique=False, nullable=False)
     alias = db.Column(db.String(100), unique=True, nullable=False)
     title = db.Column(db.String(100), nullable=False)
     image = db.Column(db.String(100), nullable=False)
@@ -30,26 +31,6 @@ def register_admin_views():
     admin.add_view(ModelView(User, db.session))
     admin.add_view(ModelView(Post, db.session))
 
-users = {
-    'thegamer': 'gamerpro1',
-    'justuser': 'randompassword'
-}
-
-posts = [
-    {"alias": "advices", "title": "Advices for game developers", "image": "advice.png"},
-    {"alias": "design-and-music", "title": "Design and music", "image": "design-and-music.png"},
-    {"alias": "expectations", "title": "Game expectations vs. reality", "image": "developers-be-like.png"},
-    {"alias": "update-1-1", "title": "Game 'Picture Puzzle remake' update 1.1", "image": "skeleton.png"},
-    {"alias": "chatgpt", "title": "ChatGPT as code helper", "image": "chatgpt-meme.png"},
-    {"alias": "difficulties", "title": "Difficulties while making game", "image": "staircase-fail.png"},
-    {"alias": "how-it-was-made", "title": "How the 'Picture Puzzle remake' was made", "image": "coding.png"},
-    {"alias": "update-1", "title": "Game 'Picture Puzzle remake' update 1.0", "image": "baobab.png"},
-    {"alias": "history", "title": "Picture Puzzle history", "image": "picture-puzzle.png"}
-]
-
-def fetch_latest_posts():
-    return posts
-
 @app.route("/")
 def index():
     latest_posts = Post.query.all()
@@ -66,9 +47,9 @@ def about():
 
 @app.route("/posts/<alias>")
 def post(alias):
-    post_info = next((p for p in posts if p['alias'] == alias), None)
+    post_info = Post.query.filter_by(alias=alias).first()
     if post_info:
-        return render_template(f"{alias}.html")
+        return render_template(f"{alias}.html", post_info=post_info)
     else:
         return "Post not found", 404
 
@@ -77,7 +58,8 @@ def login():
     if request.method == "POST":
         username = request.form["username"]
         password = request.form["password"]
-        if username in users and users[username] == password:
+        user = User.query.filter_by(username=username, password=password).first()
+        if user:
             session["username"] = username
             return redirect(url_for("index"))
     return render_template("auth/login.html")
@@ -91,12 +73,14 @@ def logout():
 def register():
     if request.method == "POST":
         username = request.form["username"]
+        email = request.form["email"]
         password = request.form["password"]
-        users[username] = password
+        new_user = User(username=username, email=email, password=password)
+        db.session.add(new_user)
+        db.session.commit()
         return redirect(url_for("login"))
     return render_template("auth/register.html")
 
 if __name__ == '__main__':
-    create_tables()
     register_admin_views()
     app.run(debug=True)
\ No newline at end of file
diff --git a/templates/auth/register.html b/templates/auth/register.html
index d450fe4..12aef3b 100644
--- a/templates/auth/register.html
+++ b/templates/auth/register.html
@@ -7,6 +7,8 @@
   <form method="post">
     <label for="username">Username</label></br>
     <input type="text" name="username" id="username" required></br>
+    <label for="email">Email</label></br>
+    <input type="text" name="email" id="email" required></br>
     <label for="password">Password</label></br>
     <input type="password" name="password" id="password" required></br>
     <label for="password">Confirm password</label></br>