Skip to content

Update to Flask 2.x, fix Werkzeug dependency issue, operator fixes #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to Flask 2.x, fix Werkzeug dependency issue, operator fixes #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ec56aa
update requirements.txt to fix Werkzeug dependency errors
vincebel7 Dec 3, 2022
8a11c58
change to equality operator for some compares
vincebel7 Dec 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
__pycache__
flaskenv/
venv/
config.pyc
server.pyc
tools.pyc
tools.pyc
6 changes: 4 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Flask==1.1.1
Flask==2.1.1
flask_mysqldb==0.2.0
flask_socketio==4.2.1
flask_socketio==4.3.2
Werkzeug==2.0.1

12 changes: 6 additions & 6 deletions server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ def Register():
lastName = request.form['lastName']

#Valid input check
if(len(email) is 0):
if(len(email) == 0):
error = 'Email cannot be empty'
return render_template('register.html', error = error)
if (len(password) < 8):
error = 'Password must be 8 characters long'
return render_template('register.html', error = error)
if (len(firstName) is 0):
if (len(firstName) == 0):
error = 'First Name cannot be empty'
return render_template('register.html', error = error)

Expand All @@ -73,7 +73,7 @@ def Register():
_sql = "select * from Login_Credentials where PlayerID = '{0}'"
cur.execute(_sql.format(email))
data=cur.fetchall()
if(len(data) is 0):
if(len(data) == 0):
error = None
cur.execute("INSERT INTO Player_Profile(PlayerID,firstName,lastName) VALUES(%s,%s,%s)",(email,firstName,lastName))
cur.execute("INSERT INTO Login_Credentials VALUES(%s,MD5(%s))",(email,password))
Expand All @@ -97,7 +97,7 @@ def Login():
_sql = "select password from Login_Credentials where PlayerID = '{0}'"
cur.execute(_sql.format(email))
stored=cur.fetchall()
if(len(stored) is 0):
if(len(stored) == 0):
error = 'Email not found!'
else:
if(enc_string==stored):
Expand Down Expand Up @@ -407,7 +407,7 @@ def buyPerk(arr):
cur.execute(_sql.format(email,arr[1]))
stored=cur.fetchall()
# print(stored)
if(len(stored) is 0):
if(len(stored) == 0):
quantity = 1
_sql = "insert into Owned_Perk values('{0}',{1},{2})"
cur.execute(_sql.format(email,arr[1],quantity))
Expand All @@ -421,4 +421,4 @@ def buyPerk(arr):
mysql.connection.commit()

if __name__ == "__main__":
socketio.run(app)
socketio.run(app)