From fc974111775ca72912d00332a6433a4b42c422b1 Mon Sep 17 00:00:00 2001 From: paulmart-n Date: Thu, 14 Dec 2023 21:43:13 +0100 Subject: [PATCH] Errorpage + RAPLA-Styling --- routing.py | 19 ++--- static/cal.css | 40 +++++----- static/cal.css.map | 2 +- static/cal.scss | 41 +++++----- static/style.css | 11 ++- static/style.css.map | 2 +- static/style.scss | 141 +++++++++++++++++++++++++++++++++ templates/dashboard.html | 49 ++++++++++-- templates/display-message.html | 4 + templates/index.html | 8 +- templates/plan-anon.html | 1 - 11 files changed, 254 insertions(+), 64 deletions(-) create mode 100644 static/style.scss create mode 100644 templates/display-message.html diff --git a/routing.py b/routing.py index 305f8dc..b273f32 100644 --- a/routing.py +++ b/routing.py @@ -224,7 +224,7 @@ def getRapla(): User.query.filter_by(id=current_user.id).first().kurs = file[5:-5] db.session.commit() else: - return redirect(url_for("error", ecode=file + 900)) + return redirect(url_for("error", ecode=900)) return redirect(url_for("welcome")) @@ -309,29 +309,30 @@ def logout(): return red -@app.route("/backendpoc/error") -def error(ecode): +@app.route("/error") +def error(): """ Error Page für custom-Errors. \n TODO: Funktion depreciaten. Ersetzen durch Errors auf den entsprechenden Seiten. - :param ecode: :return: """ - if ecode == 900: + error = request.args.get("ecode") + if error == "900": msg = "Ungültige RAPLA-URL! Sicher, dass der Link zum DHBW-Rapla führt?" - elif ecode == 899: + elif error == "899": msg = "Der Kalender wurde nicht gefunden! Sicher, dass der Link korrekt ist?" else: - msg = "Unbekannter Fehler!" - return render_template('index.html', message=msg, headermessage="DualHub") + msg = str(error) + return render_template('display-message.html', message=msg) +@app.route("/error") @app.errorhandler(HTTPException) def handle(e): """" HTTP-Exception-Handler """ - return render_template('index.html', message=e, headermessage="DualHub") + return render_template('display-message.html', message=e) if __name__ == "__main__": diff --git a/static/cal.css b/static/cal.css index 2d7efd0..a9e71b2 100644 --- a/static/cal.css +++ b/static/cal.css @@ -6,12 +6,12 @@ --timeHeight: 60px; --halfTimeHeight: 30px; --quartTimeHeight: 15px; - --calBgColor: #fff1f8; - --eventBorderColor: #f2d3d8; - --eventColor1: #ffd6d1; + --calBgColor: #3f2d2d; + --eventBorderColor: #000000; + --eventColor1: #b82424; --eventColor2: #fafaa3; - --eventColor3: #e2f8ff; - --eventColor4: #d1ffe6; + --eventColor3: #1894bb; + --eventColor4: rgba(184, 36, 36, 0.65); } .calendar { @@ -22,11 +22,12 @@ } select { - width: 300px; + width: 100%; height: 40px; border-radius: 5px; + color: white; border-color: transparent; - background-color: var(--eventColor4); + background-color: var(--calBgColor); text-align: center; } @@ -39,15 +40,15 @@ select { .changeweek { font-size: 2.5em; - color: black; text-decoration: none; font-weight: 600; + color: white; } .changeweek:hover { color: transparent; -webkit-text-fill-color: transparent; - -webkit-text-stroke: 2px black; + -webkit-text-stroke: 3px white; } h2 { @@ -69,7 +70,8 @@ h2 { button { border-radius: 5px; - border-color: black; + border-color: white; + color: white; border-style: solid; background: transparent; font-weight: 600; @@ -112,6 +114,7 @@ option { display: grid; grid-template-rows: repeat(var(--numQuartHours), var(--quartTimeHeight)); border-radius: 5px; + color: black; background: var(--calBgColor); } @@ -138,7 +141,8 @@ option { border-radius: 5px; padding: 0.5rem; margin: 0 0.5rem; - background: white; + color: white; + background: var(--eventColor4); position: relative; } @@ -148,7 +152,9 @@ option { } body { - font-family: system-ui, sans-serif; + font-family: "Asap", "Calibri", "Arial", sans-serif; + color: white; + background-color: black; } .date { @@ -184,6 +190,7 @@ nav ul { left: 0; height: 100%; overflow-y: auto; + font-size: 150%; } nav li { @@ -208,7 +215,7 @@ nav li.start a { padding-top: 30px; } -nav a.top.selected { +nav a.selected { color: red; background-color: black; } @@ -217,11 +224,6 @@ nav li.top.selected { border-color: red; } -nav li a.selected { - background-color: white; - color: black; -} - nav li a { display: block; color: white; @@ -236,7 +238,7 @@ nav li a:hover { nav li .bottom { position: absolute; bottom: 0; - width: 100%; + width: 200px; } .start-0100 { diff --git a/static/cal.css.map b/static/cal.css.map index e6696f0..8d8c183 100644 --- a/static/cal.css.map +++ b/static/cal.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["cal.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAMF;EACE;EACA;EACA;EACA;;;AAGF;AAAA;EAEE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;AAAA;EAEE;;;AAKF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAKF;EACI;EACA;;;AAIJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACF;;;AAGF;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AASJ;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA","file":"cal.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["cal.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAMF;EACE;EACA;EACA;EACA;;;AAGF;AAAA;EAEE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;AAAA;EAEE;;;AAKF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAKF;EACI;EACA;;;AAIJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAIJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AASJ;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA","file":"cal.css"} \ No newline at end of file diff --git a/static/cal.scss b/static/cal.scss index 53c7421..851529a 100644 --- a/static/cal.scss +++ b/static/cal.scss @@ -6,12 +6,12 @@ --timeHeight: 60px; --halfTimeHeight: 30px; --quartTimeHeight: 15px; - --calBgColor: #fff1f8; - --eventBorderColor: #f2d3d8; - --eventColor1: #ffd6d1; + --calBgColor: #3f2d2d; + --eventBorderColor: #000000; + --eventColor1: #b82424; --eventColor2: #fafaa3; - --eventColor3: #e2f8ff; - --eventColor4: #d1ffe6; + --eventColor3: #1894bb; + --eventColor4: rgba(184, 36, 36, 0.65); } .calendar { @@ -22,11 +22,12 @@ } select { - width: 300px; + width: 100%; height: 40px; border-radius: 5px; + color: white; border-color: transparent; - background-color: var(--eventColor4); + background-color: var(--calBgColor); text-align: center; } @@ -39,15 +40,15 @@ select { .changeweek { font-size: 2.5em; - color: black; text-decoration: none; font-weight: 600; + color: white; } .changeweek:hover { color: transparent; -webkit-text-fill-color: transparent; - -webkit-text-stroke: 2px black; + -webkit-text-stroke: 3px white; } h2 { @@ -69,7 +70,8 @@ h2 { button { border-radius: 5px; - border-color: black; + border-color: white; + color: white; border-style: solid; background: transparent; font-weight: 600; @@ -111,6 +113,7 @@ option { display: grid; grid-template-rows: repeat(var(--numQuartHours), var(--quartTimeHeight)); border-radius: 5px; + color: black; background: var(--calBgColor); } @@ -140,7 +143,8 @@ option { border-radius: 5px; padding: 0.5rem; margin: 0 0.5rem; - background: white; + color: white; + background: var(--eventColor4); position: relative; } @@ -152,7 +156,9 @@ option { // Global / Etc body { - font-family: system-ui, sans-serif; + font-family: "Asap", "Calibri", "Arial", sans-serif; + color: white; + background-color: black; } .date { @@ -191,6 +197,7 @@ nav ul { left: 0; height: 100%; overflow-y: auto; + font-size: 150%; } nav li { @@ -215,19 +222,15 @@ nav li.start a { padding-top: 30px; } -nav a.top.selected { +nav a.selected { color: red; - background-color: black + background-color: black } nav li.top.selected { border-color: red; } -nav li a.selected { - background-color: white; - color: black -} nav li a { display: block; @@ -243,7 +246,7 @@ nav li a:hover { nav li .bottom { position: absolute; bottom: 0; - width: 100%; + width: 200px; } diff --git a/static/style.css b/static/style.css index e562daa..dc4ec43 100644 --- a/static/style.css +++ b/static/style.css @@ -46,7 +46,7 @@ nav li.start a { padding-top: 30px; } -nav a.top.selected { +nav a.selected { color: red; } @@ -56,7 +56,6 @@ nav li.top.selected { nav li a.selected { background-color: black; - color: white; } nav li a { @@ -73,7 +72,7 @@ nav li a:hover { nav li .bottom { position: absolute; bottom: 0; - width: 100%; + width: 200px; } .cs1 { @@ -105,10 +104,14 @@ nav li .bottom { width: calc(100% / var(--numBoxes)); height: 300px; border: 5px solid red; - margin: 5px; + margin: 7px; border-radius: 10px; } +.box:hover { + transform: scale(101%); +} + .cs1 h1 { margin-left: 0; } diff --git a/static/style.css.map b/static/style.css.map index a84c854..b426341 100644 --- a/static/style.css.map +++ b/static/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AAAA;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAIJ;EACI;EACA;;;AAGJ;AACA;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAIJ;EACI;;;AAGJ;EACI;EACA;EACA;EACH;;;AAKD;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AAAA;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAIJ;EACI;EACA;;;AAGJ;AACA;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACH;;;AAKD;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA","file":"style.css"} \ No newline at end of file diff --git a/static/style.scss b/static/style.scss new file mode 100644 index 0000000..be6fe11 --- /dev/null +++ b/static/style.scss @@ -0,0 +1,141 @@ +:root { + --numBoxes: 2; + --numRows: 2; +} + +body { + background-color: black; + font-family: "Asap", "Calibri", "Arial", sans-serif; + font-size: 150%; + margin: 0; + color: white; +} + +nav ul { + list-style-type: none; + margin: 0; + padding: 0; + width: 200px; + background-color: #333; + position: fixed; + top: 0; + left: 0; + height: 100%; + overflow-y: auto; +} + +nav li { + border-top: none; +} + +nav li.top { + border-style: solid; + border-radius: 5px; + border-color: white; + margin: 10px; + text-align: center; +} + +nav a.top:hover { + background: transparent; +} + +nav li.start a { + border-top: 3px solid white; + margin-top: 20px; + padding-top: 30px; +} + +nav a.selected { + color: red; +} + +nav li.top.selected { + border-color: red; +} + +nav li a.selected { + background-color: black; +} + +nav li a { + display: block; + color: white; + padding: 12px 16px; + text-decoration: none; +} + +nav li a:hover { + background-color: red; +} + +nav li .bottom { + position: absolute; + bottom: 0; + width: 200px; +} + +.cs1 { + margin-left: 220px; + padding: 20px; +} + +.cs { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + padding: 20px; +} + + +.container { + display: flex; + flex-direction: column; +} + +/* Reihen */ +.row { + display: flex; + justify-content: space-evenly; + margin-bottom: 10px; +} + +.box { + width: calc(100%/var(--numBoxes)); + height: 300px; + border: 5px solid red; + margin: 7px; + border-radius: 10px; +} + +.box:hover { + transform: scale(101%); +} + +.cs1 h1 { + margin-left: 0; +} + +.notification-icon { + position: fixed; + top: 10px; + right: 10px; + width:50px; + +} + + +input { + width: 150px; + height: 50px +} + +input[type=url], input[type=email], input[type=password] { + width: 500px; +} + +select { + width: 200px; + height: 50px +} diff --git a/templates/dashboard.html b/templates/dashboard.html index 00f76ad..ef30b76 100644 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -5,18 +5,53 @@

Willkommen, {{ name }} ({{ kurs }})!

+{% if praxis == "hidden" %}
-
-
-
+
+
+

Aktueller GPA

+
+
+
+
+

Countdown bis zur nächsten Klausur

+
+
-
-
-
+
+
+

Lernplan

+
+
+
+
+

Nächste Vorlesung

+
+
+
+
+

Neueste Chatnachricht

+
+
- +{% else %} +
+
+
+
+

ToDos

+
+
+
+
+

Literatursammlung

+
+
+
+
+{% endif %} {% endblock %} \ No newline at end of file diff --git a/templates/display-message.html b/templates/display-message.html new file mode 100644 index 0000000..8e1253e --- /dev/null +++ b/templates/display-message.html @@ -0,0 +1,4 @@ +{% extends "index.html" %} +{% block content %} +

{{ message }}

+{% endblock %} \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index ba223de..4d3e4a5 100644 --- a/templates/index.html +++ b/templates/index.html @@ -20,10 +20,12 @@ {% endif %}
  • Noten
  • Stundenplan
    • -
  • To Dos
    • +
  • To Dos
  • Konfiguration
    • - {% if request.endpoint[:7] != "login" %} -
  • Log-Out
    • + {% if request.endpoint %} + {% if request.endpoint[:7] != "login" %} +
  • Log-Out
    • + {% endif %} {% endif %} diff --git a/templates/plan-anon.html b/templates/plan-anon.html index cb7b836..e0f1fad 100644 --- a/templates/plan-anon.html +++ b/templates/plan-anon.html @@ -6,5 +6,4 @@

    Vorlesungsplan {{ kurs }}

    {% endblock %} {% block endcontent %} - Einloggen, um alle Features zu nutzen! {% endblock %} \ No newline at end of file