diff --git a/acmsite/__init__.py b/acmsite/__init__.py index 13c2ee7..5794149 100644 --- a/acmsite/__init__.py +++ b/acmsite/__init__.py @@ -5,6 +5,8 @@ from flask_login import LoginManager from flask_bootstrap import Bootstrap5 from flask_fontawesome import FontAwesome +from werkzeug.middleware.proxy_fix import ProxyFix + from authlib.integrations.flask_client import OAuth db = SQLAlchemy() @@ -17,6 +19,8 @@ oauth = OAuth() def create_app(): app = Flask(__name__) + app.wsgi_app = ProxyFix(app.wsgi_app) + app.config.from_pyfile('config.py') db.init_app(app) diff --git a/acmsite/templates/admin/events.html b/acmsite/templates/admin/events.html index 040c636..c2c6822 100644 --- a/acmsite/templates/admin/events.html +++ b/acmsite/templates/admin/events.html @@ -171,24 +171,34 @@ $.get(`/admin/event/${id}`, (data) => { console.log(data) if (data.status == "error") { - is_new = "yes" + // This is a new event, do nothing! } else { name = data.name, description = data.description, loc = data.location - start = new Date(data.start_time) - start_day = start.toLocaleDateString() + start = new Date(data.start_time) + + var day = ("0" + start.getDate()).slice(-2); + var month = ("0" + (start.getMonth() + 1)).slice(-2); + + start_day = start.getFullYear()+"-"+(month)+"-"+(day); console.log(start_day) start_time = start.toLocaleTimeString() + console.log(start_time) end = new Date(data.end_time) - end_day = end.toLocaleDateString() - end_time = end.toLocaleTimeString() + + var day = ("0" + end.getDate()).slice(-2); + var month = ("0" + (end.getMonth() + 1)).slice(-2); + + end_day = end.getFullYear()+"-"+(month)+"-"+(day); + end_time = `${end.getHours()}:${end.getMinutes()}` } modal.find('#name').val(name) modal.find('#location').val(loc) modal.find('#description').val(description) + console.log(start_day) modal.find('#start_day').val(start_day) modal.find('#start_time').val(start_time) modal.find('#end_day').val(end_day) diff --git a/acmsite/templates/admin/users.html b/acmsite/templates/admin/users.html index a13e3b6..619db9b 100644 --- a/acmsite/templates/admin/users.html +++ b/acmsite/templates/admin/users.html @@ -10,6 +10,7 @@ Created Last Login Officer? + Options @@ -20,6 +21,22 @@ {{ u.created }} {{ u.last_login }} {{ u.is_admin }} + + + {% endfor %} diff --git a/requirements.txt b/requirements.txt index 075aaac..dd6257e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,3 +26,4 @@ ulid==1.1 urllib3==2.2.1 Werkzeug==2.3.7 WTForms==3.1.2 +flask_wtf