From 6374c8d983960e91409d4aed061bdd7489ae65d8 Mon Sep 17 00:00:00 2001 From: Raphael Maenle Date: Sat, 6 Jun 2020 23:49:39 +0200 Subject: [PATCH] fixes routing bug and provides temporary fix for css overlap --- server/routes.py | 4 ++-- server/static/css/main.css | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/routes.py b/server/routes.py index 177ce13..817cd7d 100644 --- a/server/routes.py +++ b/server/routes.py @@ -185,13 +185,13 @@ def callback(): # Begin user session by logging the user in login_user(user) - return flask.redirect(flask.url_for('index')) + return flask.redirect(flask.url_for('account')) @app.route("/logout") @login_required def logout(): logout_user() - return redirect(url_for("index")) + return redirect(url_for("startpage")) @app.route("/device//calendarevents.json") diff --git a/server/static/css/main.css b/server/static/css/main.css index 0ef2e23..c1b76d4 100644 --- a/server/static/css/main.css +++ b/server/static/css/main.css @@ -4,6 +4,7 @@ body { font-family: "Trebuchet MS", Helvetica, sans-serif; padding: 0; + margin: 0; height: calc(100% - 0.5rem) }