From d764caa76811484f6f7ea200864d0fa74a2c97c6 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Fri, 28 Feb 2020 03:39:02 +0000 Subject: [PATCH] modified: app.py modified: dbWrite.py modified: main.py modified: routes/_search.py Remove login_manager code Correct some DB lookups --- app.py | 3 --- dbWrite.py | 5 +++-- main.py | 30 ----------------------------- routes/_search.py | 48 +++++++++++++++++++++++------------------------ 4 files changed, 27 insertions(+), 59 deletions(-) diff --git a/app.py b/app.py index 491304c..88af264 100644 --- a/app.py +++ b/app.py @@ -3,13 +3,10 @@ import random import string from flask import Flask from flask_bootstrap import Bootstrap -from flask_login import LoginManager, UserMixin, login_user, login_required, logout_user, current_user, login_manager app = Flask(__name__) app.secret_key = "4pFwRNNXs+xQSOEaHrq4iSBwl+mq1UTdRuxqhM+RQpo=" Bootstrap(app) -login_manager = LoginManager() -login_manager.init_app(app) def randomUrlSuffix(stringLength=6): lettersAndDigits = string.ascii_letters + string.digits diff --git a/dbWrite.py b/dbWrite.py index 0473fde..f20b81f 100644 --- a/dbWrite.py +++ b/dbWrite.py @@ -13,6 +13,7 @@ CLOUDSQL_PASSWORD = "P8P1YopMlwg8TxhE" CLOUDSQL_WRITE_PASSWORD = "1URYcxXXlQ6xOWgj" CLOUDSQL_READ_PASSWORD = "o4GWrbbkBKy3oR6u" CLOUDSQL_DATABASE = "2019_hockeyResults" +LOCAL_DATABASE = "hockeyResults2019" CLOUDSQL_DATABASE_STATIC = "hockeyResults" CLOUDSQL_CHARSET = "utf8" @@ -36,7 +37,7 @@ def write_cloudsql(): # else: # db = MySQLdb.connect(host='db.ipa.champion', user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET) - db = pymysql.connect(host='db.ipa.champion', user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET) + db = pymysql.connect(host='db.ipa.champion', user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=LOCAL_DATABASE, charset=CLOUDSQL_CHARSET) return db def write_cloudsql_static(): @@ -80,7 +81,7 @@ def read_cloudsql(): # else: # db = MySQLdb.connect(host='db.ipa.champion', user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET) - db = pymysql.connect(host='db.ipa.champion', user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET) + db = pymysql.connect(host='db.ipa.champion', user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=LOCAL_DATABASE, charset=CLOUDSQL_CHARSET) return db def read_cloudsql_static(): diff --git a/main.py b/main.py index 4c7757e..9949b36 100644 --- a/main.py +++ b/main.py @@ -10,7 +10,6 @@ from app import app from flask import Flask, flash, render_template, request, redirect, url_for from flask_wtf import FlaskForm from flask_bootstrap import Bootstrap -from flask_login import LoginManager, UserMixin, login_user, login_required, logout_user, current_user from wtforms import StringField, PasswordField, BooleanField from wtforms.fields.html5 import DateField from wtforms.validators import InputRequired, Email, Length @@ -20,35 +19,6 @@ from routes import * app.register_blueprint(routes) -login_manager = LoginManager() - -class User(UserMixin): - # proxy for a database of users - user_database = {"JohnDoe": ("JohnDoe", "John"), "JaneDoe": ("JaneDoe", "Jane")} - - def __init__(self, username, password): - self.id = username - self.password = password - - @classmethod - def get(cls,id): - return cls.user_database.get(id) - -@login_manager.request_loader -def load_user(request): - token = request.headers.get('Authorization') - if token is None: - token = request.args.get('token') - - if token is not None: - username,password = token.split(":") # naive token - user_entry = User.get(username) - if (user_entry is not None): - user = User(user_entry[0],user_entry[1]) - if (user.password == password): - return user - return None - @app.route('/hkfc-d/vote-chart', methods=['GET', 'POST']) def hkfc_d_vote_chart(): diff --git a/routes/_search.py b/routes/_search.py index f521c69..40ee80a 100644 --- a/routes/_search.py +++ b/routes/_search.py @@ -13,8 +13,8 @@ from datetime import date def search(): sql = "SELECT hockeyClub FROM mensHockeyClubs ORDER BY hockeyClub" sql2 = "SELECT nextClub, oppoLogo FROM hkfcDAdminSettings" - clubs = sql_read(sql) - settings = sql_read(sql2) + clubs = sql_read_static(sql) + settings = sql_read_static(sql2) form = searchForm() form.clubName.choices = [(name['hockeyClub'], name['hockeyClub']) for name in clubs] clubLogo = settings[0]['oppoLogo'] @@ -44,8 +44,8 @@ def searchTeam(): def playerRecords(): sql = "SELECT hockeyClub FROM mensHockeyClubs ORDER BY hockeyClub" sql2 = "SELECT nextClub, oppoLogo FROM hkfcDAdminSettings" - clubs = sql_read(sql) - settings = sql_read(sql2) + clubs = sql_read_static(sql) + settings = sql_read_static(sql2) form = playerRecordsForm() form.clubName.choices = [(name['hockeyClub'], name['hockeyClub']) for name in clubs] clubLogo = settings[0]['oppoLogo'] @@ -60,12 +60,12 @@ def playerRecordSearchResults(): _team = request.form['teamName'] lookup_table = _club.lower() + _team if _club and _team and request.method == 'POST': - sql = "SELECT * FROM _" + lookup_table + " ORDER BY playerNumber" - sql2 = "SHOW COLUMNS FROM _" + lookup_table + "" - sql3 = "SELECT matchNumber, matchHomeClub, matchHomeTeam, matchAwayClub, matchAwayTeam FROM _mensResults WHERE (matchHomeClub='" + _club + "' AND matchHomeTeam='" + _team + "') OR (matchAwayClub='" + _club + "' AND matchAwayTeam='" + _team + "')" - rows = sql_read(sql) - columns = sql_read(sql2) - matches = sql_read(sql3) + sql = "SELECT * FROM _" + _season + "_" + lookup_table + " ORDER BY playerNumber" + sql2 = "SHOW COLUMNS FROM _" + _season + "_" + lookup_table + "" + sql3 = "SELECT matchNumber, matchHomeClub, matchHomeTeam, matchAwayClub, matchAwayTeam FROM _" + _season + "_mensResults WHERE (matchHomeClub='" + _club + "' AND matchHomeTeam='" + _team + "') OR (matchAwayClub='" + _club + "' AND matchAwayTeam='" + _team + "')" + rows = sql_read_static(sql) + columns = sql_read_static(sql2) + matches = sql_read_static(sql3) for match in matches: matchNumbersList.append(str(match['matchNumber'])) if match['matchHomeClub'] == _club: @@ -81,8 +81,8 @@ def playerRecordSearchResults(): def teamRecords(): sql = "SELECT hockeyClub FROM mensHockeyClubs ORDER BY hockeyClub" sql2 = "SELECT nextClub, oppoLogo FROM hkfcDAdminSettings" - clubs = sql_read(sql) - settings = sql_read(sql2) + clubs = sql_read_static(sql) + settings = sql_read_static(sql2) form = teamRecordsForm() form.clubName.choices = [(name['hockeyClub'], name['hockeyClub']) for name in clubs] clubLogo = settings[0]['oppoLogo'] @@ -95,9 +95,9 @@ def teamRecordResults(): _team = request.form['teamName'] lookup_table = _club.lower() + _team if _club and _team and request.method == 'POST': - sql = "SELECT * FROM _record_" + lookup_table + " ORDER BY opposition" + sql = "SELECT * FROM _" + _season + "_record_" + lookup_table + " ORDER BY opposition" print(sql) - rows = sql_read(sql) + rows = sql_read_static(sql) table = teamResults(rows) table.border = True table.classes = ['table-striped', 'table-condensed', 'table-hover'] @@ -110,8 +110,8 @@ def teamRecordResults(): def clubPlayingRecords(): sql = "SELECT hockeyClub FROM mensHockeyClubs ORDER BY hockeyClub" sql2 = "SELECT nextClub, oppoLogo FROM hkfcDAdminSettings" - clubs = sql_read(sql) - settings = sql_read(sql2) + clubs = sql_read_static(sql) + settings = sql_read_static(sql2) form = clubPlayingRecordsForm() form.clubName.choices = [(name['hockeyClub'], name['hockeyClub']) for name in clubs] clubLogo = settings[0]['oppoLogo'] @@ -122,10 +122,10 @@ def clubPlayingRecordRearchResults(): _season = request.form['season'] _club = request.form['clubName'] if _club and request.method == 'POST': - sql = "SELECT * FROM _playerRecord_" + _club.lower() + " ORDER BY playerNumber" - sql2 = "SHOW COLUMNS FROM __playerRecord_" + _club.lower() + "" - rows = sql_read(sql) - columns = sql_read(sql2) + sql = "SELECT * FROM _" + _season + "_playerRecord_" + _club.lower() + " ORDER BY playerNumber" + sql2 = "SHOW COLUMNS FROM _" + _season + "_playerRecord_" + _club.lower() + "" + rows = sql_read_static(sql) + columns = sql_read_static(sql2) return render_template('_clubPlayingRecordResults.html', rows=rows, columns=columns) else: return 'Invalid search data entered' @@ -135,8 +135,8 @@ def clubPlayingRecordRearchResults(): def playerCheck(): sql = "SELECT hockeyClub FROM mensHockeyClubs ORDER BY hockeyClub" sql2 = "SELECT nextClub, oppoLogo FROM hkfcDAdminSettings" - clubs = sql_read(sql) - settings = sql_read(sql2) + clubs = sql_read_static(sql) + settings = sql_read_static(sql2) form = clubPlayingRecordsForm() form.clubName.choices = [(name['hockeyClub'], name['hockeyClub']) for name in clubs] clubLogo = settings[0]['oppoLogo'] @@ -150,8 +150,8 @@ def playerCheckResults(): if _club and request.method == 'POST': sql = "SELECT * FROM _playerRecord_" + _club.lower() + " ORDER BY playerNumber" sql2 = "SHOW COLUMNS FROM _playerRecord_" + _club.lower() + "" - rows = sql_read(sql) - columns = sql_read(sql2) + rows = sql_read_static(sql) + columns = sql_read_static(sql2) for row in rows: has_played = 0 for column in columns: