From 0e8121fcdb1e71c3b5ac369d5d0b6c793d2b4494 Mon Sep 17 00:00:00 2001
From: nyx <me@everypizza.im>
Date: Wed, 12 Mar 2025 22:47:50 -0500
Subject: [PATCH] A ton more DB work

---
 app/app.py                | 26 ++++++++++++-
 app/templates/register.j2 | 79 ++++++++++++++++++++++-----------------
 config.sample.ini         |  7 +++-
 requirements.txt          |  1 +
 4 files changed, 77 insertions(+), 36 deletions(-)

diff --git a/app/app.py b/app/app.py
index b019c4c..09df521 100644
--- a/app/app.py
+++ b/app/app.py
@@ -1,16 +1,39 @@
+from urllib import request
+
 from flask import *
 from os import path, walk
 
+import hashlib
+
 import configparser
 
+from sqlalchemy import create_engine
+from sqlalchemy.orm import scoped_session,sessionmaker
+
 config = configparser.ConfigParser()
 config.read('config.ini')
 
 instanceBranding = str(config['BRANDING']['instanceName'])
-instanceLocation = str(config['GENERAL']['instanceLocation'])
+instanceLocation = str(config['BRANDING']['instanceLocation'])
+
+databaseUsername = str(config['DATABASE']['username'])
+databasePassword = str(config['DATABASE']['password'])
+databaseName = str(config['DATABASE']['name'])
+
+engine=create_engine("postgresql://" + databaseUsername + ":" + databasePassword + "@localhost/" + databaseName)
+db=scoped_session(sessionmaker(bind=engine))
 
 app = Flask(__name__)
 
+def encrypt(data):
+    hash = hashlib.sha512()
+    data = data.encode('utf-8')
+    hash.update(data)
+    hash = hash.hexdigest()
+#    print(str(hash))
+    return hash
+
+#encrypt("hi")
 
 @app.route('/')
 def home():
@@ -40,4 +63,5 @@ for extra_dir in extra_dirs:
                 extra_files.append(filename)
 
 if __name__ == '__main__':
+    app.secret_key = 'super secret key'
     app.run(debug=True, extra_files=extra_files)
diff --git a/app/templates/register.j2 b/app/templates/register.j2
index 4f3feb2..cfacb9d 100644
--- a/app/templates/register.j2
+++ b/app/templates/register.j2
@@ -11,42 +11,53 @@
             <h1>
                 Register at {{ instanceLocation }}
             </h1>
-            <label>
+            <form>
+                <label>
+                    <input
+                        placeholder="username"
+                        type="text"
+                        name="username"
+                        size="10"
+                        required
+                    />
+                </label>
+                <br>
+                <br>
+                <label>
+                    <input
+                        placeholder="password"
+                        type="password"
+                        name="password"
+                        size="10"
+                        required
+                    />
+                </label>
+                <label>
+                    <input
+                        placeholder="confirm password"
+                        type="password"
+                        name="confirm"
+                        size="10"
+                        required
+                    />
+                </label>
+                <br>
+                <br>
+                <label>
+                    Agree to the rules
+                    <input
+                        type="checkbox"
+                        name="scales"
+                        required
+                    />
+                </label>
+                <br>
+                <br>
                 <input
-                    placeholder="username"
-                    type="text"
-                    name="name"
-                    size="10"
-                    required
+                    type="submit"
+                    value="Register"
                 />
-            </label>
-            <br>
-            <br>
-            <label>
-                <input
-                    placeholder="password"
-                    type="password"
-                    name="password"
-                    size="10"
-                    required
-                />
-            </label>
-            <br>
-            <br>
-            <label>
-                Agree to the rules
-                <input
-                    type="checkbox"
-                    name="scales"
-                    required
-                />
-            </label>
-            <br>
-            <br>
-            <input
-                type="submit"
-                value="Register"
-            />
+            </form>
         </div>
     </body>
 </html>
diff --git a/config.sample.ini b/config.sample.ini
index 292fec4..85d626f 100644
--- a/config.sample.ini
+++ b/config.sample.ini
@@ -1,3 +1,8 @@
 [BRANDING]
 instanceName = NyxAsk Sample Config
-instanceLocatiom = 'ask.example.com'
\ No newline at end of file
+instanceLocation = 'ask.example.com'
+
+[DATABASE]
+username = nyxask
+password = nyxask
+name = nyxask
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 521e32d..3b5a9d0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 flask
 flask-sqlalchemy
+psycopg2
\ No newline at end of file