Update app.py

app.py

@@ -12,9 +12,9 @@ import string
 
 mysql = mysql.connector.connect(
     host='sql12.freemysqlhosting.net',
-    user='sql12660485',
-    password='UxU15DlGpj',
-    database='sql12660485',
+    user='sql12673861',
+    password='gURFKWEA9G',
+    database='sql12673861',
     port=3306,
 )
 
@@ -35,21 +35,21 @@ def index():
 def home():
     if request.method == 'GET':
         if 'email' in session:
-            app.config['MYSQL_DB'] = 'sql12660485'
+            app.config['MYSQL_DB'] = 'sql12673861'
             curh = mysql.cursor()
             if session['usertype'] == 0:
-                curh.execute("SELECT `assessid`, `name` FROM assessments")
+                curh.execute("SELECT `assessid`, `name` FROM `h_assessments`")
                 typedata = curh.fetchall()
 
                 converted_tuple = tuple({'assessid': item[0], 'name': item[1]} for item in typedata)
 
-                curh.execute("SELECT `id`, `type` FROM custom WHERE id=%s", (session['id'],))
+                curh.execute("SELECT `id`, `type` FROM `h_custom` WHERE id=%s", (session['id'],))
                 given = curh.fetchall()
                 isdone = []
                 for give in given:
                     isdone.append(give[1])
 
-                curh.execute("SELECT `name`, `happy`, `datetime` FROM `custom`, `assessments` WHERE custom.type = assessments.assessId AND id=%s", (session['id'],))
+                curh.execute("SELECT `name`, `happy`, `datetime` FROM `h_custom`, `h_assessments` WHERE custom.type = assessments.assessId AND id=%s", (session['id'],))
                 previous = curh.fetchall()
 
                 preprocessed_data = []
@@ -72,7 +72,7 @@ def home():
 
     if request.method == 'POST':
         if 'email' in session:
-            app.config['MYSQL_DB'] = 'sql12660485'
+            app.config['MYSQL_DB'] = 'sql12673861'
 
             curh = mysql.cursor()
 
@@ -80,7 +80,7 @@ def home():
                 fname = request.form['fname']
                 femail = request.form['femail']
                 feedback = request.form['feedback']
-                curh.execute("INSERT INTO `feedbacks`(`name`, `email`, `feedback`) VALUES (%s, %s, %s)", (fname, femail, feedback,))
+                curh.execute("INSERT INTO `h_feedbacks`(`name`, `email`, `feedback`) VALUES (%s, %s, %s)", (fname, femail, feedback,))
                 mysql.commit()
                 curh.close()
                 session['feed'] = 1
@@ -89,7 +89,7 @@ def home():
 
             session['type'] = request.form['type']
 
-            curh.execute("SELECT `id`, `type` FROM custom WHERE id=%s AND type=%s", (session['id'], session['type'],))
+            curh.execute("SELECT `id`, `type` FROM `h_custom` WHERE id=%s AND type=%s", (session['id'], session['type'],))
             given = curh.fetchone()
             mysql.commit()
             curh.close()
@@ -113,16 +113,16 @@ def register():
     if request.method == 'POST':
         database = request.form['database']
         if database == 'database1':
-            app.config['MYSQL_DB'] = 'sql12660485'
+            app.config['MYSQL_DB'] = 'sql12673861'
             session['database'] = app.config['MYSQL_DB']
         elif database == 'database2':
-            app.config['MYSQL_DB'] = 'sql12660485'
+            app.config['MYSQL_DB'] = 'sql12673861'
             session['database'] = app.config['MYSQL_DB']
 
         name = request.form['name']
         email = request.form['email']
         cur = mysql.cursor()
-        cur.execute("SELECT * FROM users WHERE email = %s", (email,))
+        cur.execute("SELECT * FROM `h_users` WHERE email = %s", (email,))
         user = cur.fetchone()
         mysql.commit()
         cur.close()
@@ -163,16 +163,16 @@ def register():
 @app.route('/verify/<otp>')
 def verify(otp):
     if str(session['otp']) == otp:
-        app.config['MYSQL_DB'] = 'sql12660485'
+        app.config['MYSQL_DB'] = 'sql12673861'
 
         cur = mysql.cursor()
-        cur.execute("INSERT INTO users (name, email, password) VALUES (%s,%s,%s)", (session['name'], session['email'], session['hash'],))
+        cur.execute("INSERT INTO `h_users` (name, email, password) VALUES (%s,%s,%s)", (session['name'], session['email'], session['hash'],))
 
         if session['pretype'] == 'student':
-            cur.execute("UPDATE `users` SET `usertype` = %s WHERE `email`=%s", (0, session['email'],))
+            cur.execute("UPDATE `h_users` SET `usertype` = %s WHERE `email`=%s", (0, session['email'],))
             session['usertype'] = 0
         elif session['pretype'] == 'admin':
-            cur.execute("UPDATE `users` SET `usertype` = %s WHERE `email`=%s", (1, session['email'],))
+            cur.execute("UPDATE `h_users` SET `usertype` = %s WHERE `email`=%s", (1, session['email'],))
             session['usertype'] = 1
 
         mysql.commit()
@@ -197,15 +197,15 @@ def login():
         now = datetime.datetime.now()
         database = request.form['database']
         if database == 'database1':
-            app.config['MYSQL_DB'] = 'sql12660485'
+            app.config['MYSQL_DB'] = 'sql12673861'
         elif database == 'database2':
-            app.config['MYSQL_DB'] = 'sql12660485'
+            app.config['MYSQL_DB'] = 'sql12673861'
 
         email = request.form['email']
         password = request.form['password'].encode('utf-8')
 
         curl = mysql.cursor()
-        curl.execute("SELECT * FROM users WHERE email=%s", (email,))
+        curl.execute("SELECT * FROM `h_users` WHERE email=%s", (email,))
         user = curl.fetchone()
 
         if user != None:
@@ -214,11 +214,11 @@ def login():
                 session['id'] = user[0]
                 session['name'] = user[2]
                 session['email'] = user[3]
-                session['database'] = 'sql12660485'
+                session['database'] = 'sql12673861'
 
                 print(session)
 
-                curl.execute("INSERT INTO session (id, email, action, actionC, datetime) VALUES (%s, %s, %s, %s, %s)", (session['id'], session['email'], 'Logged In - Session Started', 1, now,))
+                curl.execute("INSERT INTO `h_session` (id, email, action, actionC, datetime) VALUES (%s, %s, %s, %s, %s)", (session['id'], session['email'], 'Logged In - Session Started', 1, now,))
                 mysql.commit()
                 curl.close()
 
@@ -247,13 +247,13 @@ def forgot():
         return render_template("forgot.html")
 
     if request.method == 'POST':
-        app.config['MYSQL_DB'] = 'sql12660485'
+        app.config['MYSQL_DB'] = 'sql12673861'
 
         email = request.form['email']
         session['email'] = email
 
         curl = mysql.cursor()
-        curl.execute("SELECT * FROM users WHERE email=%s", (email,))
+        curl.execute("SELECT * FROM `h_users` WHERE email=%s", (email,))
         user = curl.fetchone()
 
         mysql.commit()
@@ -301,13 +301,13 @@ def change():
         return render_template("change.html")
 
     if request.method == 'POST':
-        app.config['MYSQL_DB'] = 'sql12660485'
+        app.config['MYSQL_DB'] = 'sql12673861'
 
         password = request.form['password'].encode('utf-8')
         hash_password = bcrypt.hashpw(password, bcrypt.gensalt())
 
         curl = mysql.cursor()
-        curl.execute("UPDATE `users` SET `password`=%s WHERE email=%s", (hash_password, session['email'],))
+        curl.execute("UPDATE `h_users` SET `password`=%s WHERE email=%s", (hash_password, session['email'],))
 
         mysql.commit()
         curl.close()
@@ -327,16 +327,16 @@ def admin():
 
     if request.method == 'GET':
         if 'email' in session:
-            app.config['MYSQL_DB'] = 'sql12660485'
+            app.config['MYSQL_DB'] = 'sql12673861'
 
             cura = mysql.cursor()
 
-            cura.execute("SELECT `assessid`, `name` FROM assessments")
+            cura.execute("SELECT `assessid`, `name` FROM `h_assessments`")
             typedata = cura.fetchall()
 
             typedata_tuple = tuple({'assessid': item[0], 'name': item[1]} for item in typedata)
 
-            cura.execute("SELECT `id`, `type` FROM custom")
+            cura.execute("SELECT `id`, `type` FROM `h_custom`")
             given = cura.fetchall()
 
             given_tuple = tuple({'id': item[0], 'type': item[1]} for item in given)
@@ -345,17 +345,17 @@ def admin():
             for give in given:
                 isdone.append(give[1])
 
-            cura.execute("SELECT `id`, `name`, `email`, `isdone` FROM `users` WHERE `usertype` = 0")
+            cura.execute("SELECT `id`, `name`, `email`, `isdone` FROM `h_users` WHERE `usertype` = 0")
             res = cura.fetchall()
 
             res_tuple = tuple({'id': item[0], 'name': item[1], 'email': item[2], 'isdone': item[3]} for item in res)
 
-            cura.execute("SELECT `assessId`, `name`, `description`, `Questions`, `average` FROM `assessments`")
+            cura.execute("SELECT `assessId`, `name`, `description`, `Questions`, `average` FROM `h_assessments`")
             que = cura.fetchall()
 
             que_tuple = tuple({'assessId': item[0], 'name': item[1], 'description': item[2], 'Questions': item[3], 'average': item[4]} for item in que)
 
-            cura.execute("SELECT `id`, `type`, `name` FROM `custom`, `assessments` WHERE custom.type = assessments.assessId")
+            cura.execute("SELECT `id`, `type`, `name` FROM `h_custom`, `h_assessments` WHERE h_custom.type = h_assessments.assessId")
             abc = cura.fetchall()
 
             abc_tuple = tuple({'id': item[0], 'type': item[1], 'name': item[2]} for item in abc)
@@ -368,7 +368,7 @@ def admin():
             ts = len(res)
             tas = len(isdone)
 
-            cura.execute("SELECT `name`, `email`, `feedback` FROM `feedbacks`")
+            cura.execute("SELECT `name`, `email`, `feedback` FROM `h_feedbacks`")
             feeds = cura.fetchall()
 
             feeds_tuple = tuple({'name': item[0], 'email': item[1], 'feedback': item[2]} for item in feeds)
@@ -379,7 +379,7 @@ def admin():
             return render_template("admin.html", typedata=typedata_tuple, given=given_tuple, result=res_tuple, assess=que_tuple, abc=abc_tuple, ts=ts, ahi=ahi, tas=tas, feeds= feeds_tuple)
 
     if request.method == "POST":
-        app.config['MYSQL_DB'] = 'sql12660485'
+        app.config['MYSQL_DB'] = 'sql12673861'
 
         if 'resid' in request.form:
             resid = request.form.get('resid')
@@ -393,7 +393,7 @@ def admin():
         elif 'delete' in request.form:
             cura = mysql.cursor()
             deleteId = request.form['delete']
-            cura.execute("DELETE FROM `assessments` WHERE `assessId`= %s", (deleteId,))
+            cura.execute("DELETE FROM `h_assessments` WHERE `assessId`= %s", (deleteId,))
             mysql.commit()
             cura.close()
             return redirect(url_for('admin'))
@@ -407,10 +407,10 @@ def form():
         return redirect(url_for('login'))
 
     if request.method == "GET":
-        app.config['MYSQL_DB'] = 'sql12660485'
+        app.config['MYSQL_DB'] = 'sql12673861'
         typeid = session['type']
         curf = mysql.cursor()
-        curf.execute("SELECT `name`, `description`, `Questions`, `types` FROM assessments WHERE assessid = %s", (typeid,))
+        curf.execute("SELECT `name`, `description`, `Questions`, `types` FROM `h_assessments` WHERE assessid = %s", (typeid,))
         questions = curf.fetchone()
 
         mysql.commit()
@@ -419,7 +419,7 @@ def form():
         return render_template("form.html", questions=questions)
 
     if request.method == "POST":
-        app.config['MYSQL_DB'] = 'sql12660485'
+        app.config['MYSQL_DB'] = 'sql12673861'
 
         data = request.form.to_dict()
 
@@ -437,16 +437,16 @@ def form():
         now = datetime.datetime.now()
         cur = mysql.cursor()
 
-        query = "INSERT INTO `custom` (`Id`, `type`, `response`, `result`, `datetime`) VALUES (%s, %s, %s, %s, %s)"
+        query = "INSERT INTO `h_custom` (`Id`, `type`, `response`, `result`, `datetime`) VALUES (%s, %s, %s, %s, %s)"
         cur.execute(query, (session['id'], session['type'], json.dumps(inp), json.dumps(compound), now,))
 
-        query = "UPDATE `users` SET `isdone`=%s WHERE `id`=%s"
+        query = "UPDATE `h_users` SET `isdone`=%s WHERE `id`=%s"
         cur.execute(query, (1, session['id'],))
 
-        cur.execute("SELECT * FROM `custom` WHERE id=%s AND type=%s", (session['id'], session['type'],))
+        cur.execute("SELECT * FROM `h_custom` WHERE id=%s AND type=%s", (session['id'], session['type'],))
         res = cur.fetchone()
 
-        cur.execute("SELECT qval FROM `assessments` WHERE assessId=%s", (session['type'],))
+        cur.execute("SELECT qval FROM `h_assessments` WHERE assessId=%s", (session['type'],))
         qval = cur.fetchone()
 
         multi = eval(qval[0])
@@ -460,17 +460,17 @@ def form():
 
         happy_index = round(sum(scaled_values) / len(scaled_values), 2)
 
-        query = "UPDATE `custom` SET `happy`=%s WHERE `id`=%s AND `type`=%s"
+        query = "UPDATE `h_custom` SET `happy`=%s WHERE `id`=%s AND `type`=%s"
         cur.execute(query, (happy_index, session['id'], session['type'],))
 
-        cur.execute("SELECT `happy` FROM `custom` WHERE type=%s", (session['type'],))
+        cur.execute("SELECT `happy` FROM `h_custom` WHERE type=%s", (session['type'],))
         avg_dict = cur.fetchall()
 
         avg_list = [d[0] for d in avg_dict if isinstance(d[0], float)] + [item for d in avg_dict if isinstance(d[0], (list, tuple)) for item in d[0]]
 
         avg_score = round(sum(avg_list)/len(avg_list), 2)
 
-        query = "UPDATE `assessments` SET `average`=%s WHERE `assessId`=%s"
+        query = "UPDATE `h_assessments` SET `average`=%s WHERE `assessId`=%s"
         cur.execute(query, (avg_score, session['type'],))
 
         mysql.commit()
@@ -495,7 +495,7 @@ def custom():
         return render_template('custom.html')
 
     if request.method == "POST":
-        app.config['MYSQL_DB'] = 'sql12660485'
+        app.config['MYSQL_DB'] = 'sql12673861'
 
         data = request.form.to_dict()
 
@@ -528,7 +528,7 @@ def custom():
         now = datetime.datetime.now()
         cur = mysql.cursor()
 
-        query = "INSERT INTO `assessments` (`name`, `description`, `Questions`, `types`, `qval`) VALUES (%s, %s, %s, %s, %s)"
+        query = "INSERT INTO `h_assessments` (`name`, `description`, `Questions`, `types`, `qval`) VALUES (%s, %s, %s, %s, %s)"
         cur.execute(query, (name, describ, json.dumps(inp), json.dumps(types), json.dumps(compound),))
 
         mysql.commit()
@@ -544,13 +544,13 @@ def result():
     if 'email' not in session:
         return redirect(url_for('home'))
 
-    app.config['MYSQL_DB'] = 'sql12660485'
+    app.config['MYSQL_DB'] = 'sql12673861'
     curr = mysql.cursor()
 
-    curr.execute("SELECT * FROM `custom` WHERE id=%s AND type=%s", (session['id'], session['type'],))
+    curr.execute("SELECT * FROM `h_custom` WHERE id=%s AND type=%s", (session['id'], session['type'],))
     res = curr.fetchone()
 
-    curr.execute("SELECT result FROM `custom` WHERE type=%s", (session['type'],))
+    curr.execute("SELECT `result` FROM `h_custom` WHERE type=%s", (session['type'],))
     avg = curr.fetchall()
 
     dynamic = [list(eval(d[0])) for d in avg]
@@ -567,10 +567,10 @@ def result():
     for i in range(1, len(dyna) + 1):
         ques.append("Question " + str(i) + "")
 
-    curr.execute("SELECT * FROM assessments WHERE assessid = %s", (session['type'],))
+    curr.execute("SELECT * FROM `h_assessments` WHERE assessid = %s", (session['type'],))
     questions = curr.fetchone()
 
-    curr.execute("SELECT * FROM suggestions")
+    curr.execute("SELECT * FROM `h_suggestions`")
     suggests = curr.fetchall()
     response = []
     mapper = eval(questions[4])
@@ -702,7 +702,7 @@ def result():
     suggest_dict = dict(sorted(result_dict.items()))
 
     curr.execute(
-        "SELECT `Questions`,`response`, `result`, `datetime` FROM `custom`, `assessments` WHERE `id`=%s AND `type`=%s AND custom.type = assessments.assessId",
+        "SELECT `Questions`,`response`, `result`, `datetime` FROM `h_custom`, `h_assessments` WHERE `id`=%s AND `type`=%s AND h_custom.type = h_assessments.assessId",
         (session['id'], session['type'],))
     details = curr.fetchone()
 
@@ -714,13 +714,13 @@ def result():
 
 @app.route('/logout')
 def logout():
-    app.config['MYSQL_DB'] = 'sql12660485'
+    app.config['MYSQL_DB'] = 'sql12673861'
     now = datetime.datetime.now()
     curo = mysql.cursor()
     if 'id' in session:
-        curo.execute("INSERT INTO session (id, email, action, actionC, datetime) VALUES (%s, %s, %s, %s, %s)", (session['id'], session['email'], 'Logged Out - Session Terminated', 0, now,))
+        curo.execute("INSERT INTO `h_session` (id, email, action, actionC, datetime) VALUES (%s, %s, %s, %s, %s)", (session['id'], session['email'], 'Logged Out - Session Terminated', 0, now,))
     else:
-        curo.execute("INSERT INTO session (email, action, actionC, datetime) VALUES (%s, %s, %s, %s)", (session['email'], 'Logged Out - Session Terminated', 0, now,))
+        curo.execute("INSERT INTO `h_session` (email, action, actionC, datetime) VALUES (%s, %s, %s, %s)", (session['email'], 'Logged Out - Session Terminated', 0, now,))
 
     mysql.commit()
     curo.close()
@@ -738,4 +738,4 @@ def handle_error(error):
 
 if __name__=='__main__':
     app.run(debug=True, host="0.0.0.0")
-    # app.run(debug=True)
+    # app.run(debug=True)