Errorpage + RAPLA-Styling

# Conflicts:
#	static/style.css
#	templates/index.html

init-sql.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #Erstellt alle benötigten MySQL-Tabellen.
 
-mysql -e "USE paulmrtn_DUALHUB; CREATE TABLE user ( id int NOT NULL, email VARCHAR(255), password VARCHAR(255), name VARCHAR(255), kurs VARCHAR (15), PRIMARY KEY (ID), UNIQUE (ID, EMAIL) );"
+mysql -e "USE paulmrtn_DUALHUB; CREATE TABLE user ( id int NOT NULL, email VARCHAR(255), name VARCHAR(255), kurs VARCHAR (15), PRIMARY KEY (ID), UNIQUE (ID, EMAIL) );"
 mysql -e "USE paulmrtn_DUALHUB; CREATE TABLE dualis ( uid int NOT NULL, token  VARCHAR(255), result_list VARCHAR(15), token_created INT, PRIMARY KEY (uid));"
 mysql -e "USE paulmrtn_DUALHUB; CREATE TABLE meals (  id int NOT NULL, date date, name VARCHAR(200), vegetarian tinyint(1), vegan tinyint(1), schwein tinyint(1), PRIMARY KEY (id));"

init.py

@@ -43,7 +43,6 @@ class User(UserMixin, db.Model):
     """
     id = db.Column(db.Integer, primary_key=True)
     email = db.Column(db.String(255), unique=True)
-    password = db.Column(db.String(255))
     name = db.Column(db.String(255))
     kurs = db.Column(db.String(15))
 

routing.py

@@ -25,20 +25,30 @@ def index():
     return redirect(url_for("login"))
 
 
-@app.route("/welcome")
+@app.route("/dashboard")
 @login_required
 def welcome():
     """
-    Interim Homepage
+    Dashboard
     :return HTML:
     """
+    if not current_user.kurs:
+        return redirect(url_for("getKurs", next=url_for(request.endpoint)))
+    sel = request.args.get("sel")
+    if not sel:
+        sel="theorie"
     kurs = current_user.kurs
     name = current_user.name
-    return render_template('index.html', headermessage='DualHub', message="Hallo, "
-                                                                          + name + " (" + kurs + ")")
+    if sel == "theorie":
+        t = ""
+        p = "hidden"
+    else:
+        t = "hidden"
+        p = ""
+    return render_template('dashboard.html', kurs=kurs, name=name, theorie=t, praxis=p)
 
 
-@app.route("/backendpoc/noten")
+@app.route("/theorie/noten")
 @login_required
 def displayNoten():
     """
@@ -46,6 +56,8 @@ def displayNoten():
     :return HTML:
     """
     d = Dualis.query.filter_by(uid=current_user.id).first()
+    if not d.result_list:
+        return redirect(url_for("getSemester", next=url_for(request.endpoint)))
     t = d.token
     sem = d.result_list
     c = request.cookies.get("cnsc")
@@ -53,10 +65,10 @@ def displayNoten():
     if timeout:
         return timeout
     res = fetchDUALIS.getResults(t, c, sem)
-    return render_template("noten.html", noten=res, semester=fetchDUALIS.getSem(t, c), sel=sem)
+    return render_template("noten.html", noten=res, semester=fetchDUALIS.getSem(t, c), sel=sem, s="n", praxis="hidden")
 
 
-@app.route("/backendpoc/plan", methods=["GET"])
+@app.route("/plan", methods=["GET"])
 @login_required
 def displayRapla():
     """
@@ -64,6 +76,8 @@ def displayRapla():
     TODO: Persönliche Filter, Notizen, Essensvorlieben etc. berücksichtigen.
     :return HTML:
     """
+    if not current_user.kurs:
+        return redirect(url_for("getKurs", next=url_for(request.endpoint)))
     week = request.args.get("week")
     if week:
         week = datetime.datetime.strptime(week, "%Y-%m-%d")
@@ -74,10 +88,11 @@ def displayRapla():
         samstag = False
     events = getWeek(week, fetchRAPLA.getIcal(current_user.kurs), samstag)
     return render_template("plan-user.html", events=events[0], eventdays=events[1],
-                           name=current_user.name, prev=str(events[2])[:10], next=str(events[3])[:10], mon=events[4])
+                           name=current_user.name, prev=str(events[2])[:10], next=str(events[3])[:10], mon=events[4],
+                           s="p", praxis="hidden")
 
 
-@app.route("/backendpoc/plan/<string:kurs>")
+@app.route("/plan/<string:kurs>")
 def displayPlan(kurs):
     """
     Zeigt den Stundenplan ohne Login an. \n
@@ -102,14 +117,13 @@ def displayPlan(kurs):
         if not samstag:
             samstag = False
         events = getWeek(week, plan, samstag)
-        print(events)
         return render_template("plan-anon.html", events=events[0], eventdays=events[1], kurs=kurs,
                                prev=str(events[2])[:10], next=str(events[3])[:10], mon=events[4])
     else:
         return redirect(url_for("login"))
 
 
-@app.route("/backendpoc/set-up")
+@app.route("/set-up")
 def redKurs():
     """
     Setup beginnt mit Kurs.
@@ -118,7 +132,7 @@ def redKurs():
     return redirect(url_for("getKurs"))
 
 
-@app.route("/backendpoc/set-up/kurs")
+@app.route("/set-up/kurs")
 @login_required
 def getKurs():
     """
@@ -147,10 +161,10 @@ def getKurs():
     else:
         e = True
         kurs = ""
-    return render_template('kurs.html', detected=(kurs, e))
+    return render_template('kurs.html', detected=(kurs, e), s="s",  theorie="hidden", praxis="hidden")
 
 
-@app.route("/backendpoc/set-up/semester")
+@app.route("/set-up/semester")
 @login_required
 def getSemester():
     """
@@ -160,10 +174,10 @@ def getSemester():
     t = Dualis.query.filter_by(uid=current_user.id).first().token
     c = request.cookies.get("cnsc")
 
-    return render_template("semester.html", semester=fetchDUALIS.getSem(t, c))
+    return render_template("semester.html", semester=fetchDUALIS.getSem(t, c), s="s",  theorie="hidden", praxis="hidden")
 
 
-@app.route("/backendpoc/set-up/semester", methods=["POST"])
+@app.route("/set-up/semester", methods=["POST"])
 @login_required
 def setSemester():
     """
@@ -179,7 +193,7 @@ def setSemester():
     return redirect(n)
 
 
-@app.route("/backendpoc/set-up/rapla")
+@app.route("/set-up/rapla")
 @login_required
 def chooseRaplas():
     """
@@ -187,10 +201,10 @@ def chooseRaplas():
     :return HTML:
     """
     r = getRaplas()
-    return render_template("rapla.html", raplas=r)
+    return render_template("rapla.html", raplas=r, s="s",  theorie="hidden", praxis="hidden")
 
 
-@app.route("/backendpoc/set-up/rapla", methods=["POST"])
+@app.route("/set-up/rapla", methods=["POST"])
 @login_required
 def getRapla():
     """
@@ -210,20 +224,20 @@ 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"))
 
 
-@app.route("/backendpoc/log-in")
+@app.route("/log-in")
 def login():
     """
     Login-Maske.
     :return HTML:
     """
-    return render_template("login.html")
+    return render_template("login.html", theorie="hidden", praxis="hidden", s="s")
 
 
-@app.route("/backendpoc/log-in", methods=["POST"])
+@app.route("/log-in", methods=["POST"])
 def login_post():
     """
     Verarbeitet die Eingabe von login(). \n
@@ -240,58 +254,42 @@ def login_post():
         success = make_response(redirect(url_for("getKurs")))
 
     user = User.query.filter_by(email=email).first()
-    newcookie = ""
-    if user:
-        dualis = Dualis.query.filter_by(uid=user.id).first()
-        if check_password_hash(user.password, password):
-            cookie = request.cookies.get("cnsc")
-            if not dualis.token or not fetchDUALIS.checkLifetime(dualis.token_created) or not cookie:
-                new_token = fetchDUALIS.checkUser(email, password)
-                dualis.token = new_token[0]
-                newcookie = requesthelpers.getCookie(new_token[1].cookies)
-                dualis.token_created = time.time()
-                db.session.commit()
-        else:
-            t = fetchDUALIS.checkUser(email, password)
-            if t[0] == -2:
-                return redirect(url_for("login", code=-2))
-            else:
-                user.password = generate_password_hash(password, method="pbkdf2:sha256")
-                dualis.token = t[0]
-                newcookie = requesthelpers.getCookie(t[1].cookies)
-                dualis.token_created = time.time()
-                db.session.commit()
-        login_user(user)
-        if user.kurs:
-            if not n:
-                success = make_response(redirect(url_for("welcome")))
-            success.set_cookie("cnsc", value=newcookie, httponly=True, secure=True)
-        return success
-
     t = fetchDUALIS.checkUser(email, password)
     if t[0] == -2:
         return redirect(url_for("login", code=-2))
+    if user:
+        dualis = Dualis.query.filter_by(uid=user.id).first()
+        dualis.token = t[0]
+        newcookie = requesthelpers.getCookie(t[1].cookies)
+        dualis.token_created = time.time()
+        db.session.commit()
+        login_user(user)
+        if user.kurs:
+            if not dualis.result_list:
+                success = make_response(redirect(url_for("getSemester")))
+            elif not n:
+                success = make_response(redirect(url_for("welcome")))
+            success.set_cookie("cnsc", value=newcookie, httponly=True, secure=True)
 
-    hashid = int(hashlib.sha1(email.encode("utf-8")).hexdigest(), 16) % (10 ** 8)
-    hashpw = generate_password_hash(password, method="pbkdf2:sha256")
-    pname = email.find(".") + 1
-    ename = min(email[pname:].find("."), email[pname:].find("@"))
-    name = email[pname:pname + ename].capitalize()
-    new_user = User(email=email, password=hashpw, name=name, id=hashid)
-    db.session.add(new_user)
+    else:
+        hashid = int(hashlib.sha1(email.encode("utf-8")).hexdigest(), 16) % (10 ** 8)
+        pname = email.find(".") + 1
+        ename = min(email[pname:].find("."), email[pname:].find("@"))
+        name = email[pname:pname + ename].capitalize()
+        new_user = User(email=email, name=name, id=hashid)
+        db.session.add(new_user)
 
-    cookie = requesthelpers.getCookie(t[1].cookies)
+        cookie = requesthelpers.getCookie(t[1].cookies)
 
-    new_dualis = Dualis(uid=hashid, token=t[0], token_created=int(time.time()))
-    db.session.add(new_dualis)
-    db.session.commit()
-    login_user(new_user)
-    newcookie = cookie
-    success.set_cookie("cnsc", value=newcookie, httponly=True, secure=True)
+        new_dualis = Dualis(uid=hashid, token=t[0], token_created=int(time.time()))
+        db.session.add(new_dualis)
+        db.session.commit()
+        login_user(new_user)
+        success.set_cookie("cnsc", value=cookie, httponly=True, secure=True)
     return success
 
 
-@app.route("/backendpoc/log-out")
+@app.route("/log-out")
 @login_required
 def logout():
     """
@@ -311,29 +309,30 @@ def logout():
     return red
 
 
-@app.route("/backendpoc/error<int:ecode>")
-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__":

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 {
@@ -168,6 +174,73 @@ body {
   font-weight: 100;
 }
 
+.cs1 {
+  margin-left: 220px;
+  padding: 20px;
+}
+
+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;
+  font-size: 150%;
+}
+
+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;
+  background-color: black;
+}
+
+nav li.top.selected {
+  border-color: red;
+}
+
+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;
+}
+
 .start-0100 {
   grid-row-start: 1;
 }

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;;;AAQF;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"}
+{"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"}

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 {
@@ -172,6 +178,78 @@ body {
   font-weight: 100;
 }
 
+// Navbar
+
+.cs1 {
+    margin-left: 220px;
+    padding: 20px;
+}
+
+
+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;
+    font-size: 150%;
+}
+
+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;
+    background-color: black
+}
+
+nav li.top.selected {
+    border-color: red;
+}
+
+
+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;
+}
+
+
   // Place on Timeline
 
 

static/style.css

@@ -1,107 +1,140 @@
-body
-{
-	background-color: #1d1919; 
-	font-size: 150%;
-	font-family: "Asap","Calibri", "Arial";
-    color: #fff1f1;
-    animation-name: HG;
-    animation-duration: 20s;
-    animation-iteration-count: infinite
+: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
+  width: 150px;
+  height: 50px;
 }
 
 input[type=url], input[type=email], input[type=password] {
-    width: 500px;
+  width: 500px;
 }
 
 select {
-    width: 200px;
-    height: 50px
-}
-
-.cs
-{   
-
-    position: absolute;
-    top: 38%;
-    left:12%;
-    margin: 0;
-    width: 75%;
-    /*border: 3px solid red;*/
-}
-
-.cs h1, .cs h2, .cs form
-{
-    display: flex;
-    text-align: center;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 200%;
-    /*border: 3px solid green;*/
-}
-h1
-{
-    text-align: center;
-	font-weight: bold;
-    font-family: "Asap","Calibri","Arial";
-    font-size: 300%;
-    color: #e7dbdb;
-}
-
-h2
-{
-    font-size: 100%;
-    position: sticky;
-    bottom: 0;
-    text-align: left;
-}
-
-p
-{
-    line-height: 150%;
-}
-
-a:link
-{
-    font-style: italic;
-    text-decoration: none;
-    font-weight: bolder;
-    color: #adadad
-}
-
-a:visited
-{
-    color: #9e9393;
-}
-
-a:hover
-{
-    color: #726868;
-    font-size: 105%;
-    transition: font-size 100ms ease-in;
-}
-
-a, img
-{
-    transition: 100ms ease-out
-}
-
-img
-{
-    width: 30%;
-    height: auto
-}
-
-img:hover
-{
-    width: 32%;
-    height: auto;
-    opacity: 75%;
-    transition: 100ms ease-in; 
+  width: 200px;
+  height: 50px;
 }
 
+/*# sourceMappingURL=style.css.map */

static/style.css.map

@@ -0,0 +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;;;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"}

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
+}

templates/dashboard.html

@@ -0,0 +1,57 @@
+{% extends "index.html" %}
+
+{%  block content %}
+<div class="cs">
+    <h1> Willkommen, {{ name }} ({{ kurs }})!</h1>
+</div>
+
+{% if praxis == "hidden" %}
+<div class="container">
+    <div class="row">
+        <div class="box">
+            <div class="cs">
+                <h2>Aktueller GPA</h2>
+            </div>
+        </div>
+        <div class="box">
+            <div class="cs">
+                <h2>Countdown bis zur nächsten Klausur</h2>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="box">
+            <div class="cs">
+                <h2>Lernplan</h2>
+            </div>
+        </div>
+        <div class="box">
+            <div class="cs">
+                <h2>Nächste Vorlesung</h2>
+            </div>
+        </div>
+        <div class="box">
+            <div class="cs">
+                <h2>Neueste Chatnachricht</h2>
+            </div>
+        </div>
+    </div>
+</div>
+{% else %}
+<div class="container">
+    <div class="row">
+        <div class="box">
+            <div class="cs">
+                <h2>ToDos</h2>
+            </div>
+        </div>
+        <div class="box">
+            <div class="cs">
+                <h2>Literatursammlung</h2>
+            </div>
+        </div>
+    </div>
+</div>
+{% endif %}
+{% endblock %}

templates/display-message.html

@@ -0,0 +1,4 @@
+{% extends "index.html" %}
+{% block content %}
+<h2>{{ message }}</h2>
+{% endblock %}

templates/index.html

@@ -1,16 +1,38 @@
 <!DOCTYPE html>
 <html lang="de">
-	<head>
-        <title> {{headermessage}} 👀</title>
-        <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
+<head>
+    <title>DualHub</title>
+    <link rel="stylesheet" type="text/css" href={{ url_for("static", filename="style.css") }}>
+    <script async src="https://analytics.paulmartin.cloud/script.js" data-website-id="459fa66e-e255-4393-8e89-ead8b1572d0d"></script>
+</head>
+<body>
+<nav>
+    <ul>
+        {% if theorie=="hidden" and praxis=="hidden" %}
+            <li class="top"><a class="top" href={{ url_for("welcome", sel="theorie") }}>Theorie</a></li>
+            <li class="top"><a class="top" href={{ url_for("welcome", sel="praxis") }}>Praxis</a></li>
+        {% elif theorie == "hidden" %}
+            <li class="top"><a class="top" href={{ url_for("welcome", sel="theorie") }}>Theorie</a></li>
+            <li class="top selected"><a class="top selected" href={{ url_for("welcome", sel="praxis") }}>Praxis</a></li>
+        {% else %}
+            <li class="top selected"><a class="top selected" href={{ url_for("welcome", sel="theorie") }}>Theorie</a></li>
+            <li class="top"><a class="top" href={{ url_for("welcome", sel="praxis") }}>Praxis</a></li>
+        {% endif %}
+        <li {{ theorie }}><a {% if s == "n" %} class="selected" {% endif %} href={{ url_for("displayNoten") }}>Noten</a></li>
+        <li {{ theorie }}><a {% if s == "p" %} class="selected" {% endif %} href={{ url_for("displayRapla") }}>Stundenplan</a></li>
+        <li {{ praxis }}><a {% if s == "t" %} class="selected" {% endif %} href="">To Dos</a></li>
+        <li><a {% if s == "s" %} class="selected" {% endif %} href={{ url_for("redKurs") }}>Konfiguration</a></li>
+        {% if request.endpoint %}
+            {% if request.endpoint[:7] != "login" %}
+                <li><a class="bottom" href={{ url_for("logout") }}>Log-Out</a></li>
+            {% endif %}
+        {% endif %}
+    </ul>
+</nav>
 
-        <script async src="https://analytics.paulmartin.cloud/script.js" data-website-id="459fa66e-e255-4393-8e89-ead8b1572d0d"></script>
-
-
-      </head>
-	  <body>
-		<div class="cs">
-			<h1>{{message}}</h1>
-		</div>
-	</body>
+<div class="cs1">
+{% block content %}
+{% endblock %}
+</div>
+</body>
 </html>

templates/kurs.html

@@ -1,22 +1,18 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Kurs wählen</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
-    <script async src="https://analytics.paulmartin.cloud/script.js" data-website-id="459fa66e-e255-4393-8e89-ead8b1572d0d"></script>
-</head>
-<body>
+{% extends "index.html" %}
+{% block content %}
     {%   if not detected[1] %}
         <h1>Wir haben {{ detected[0] }} als deinen Kurs ermittelt. Falls er nicht stimmt, kannst du ihn unten auswählen.</h1>
-        <form action={{ url_for("getSemester") }}>
-            <input type="submit" value="Der Kurs stimmt!">
+        {% if not request.args.get("next") %}
+            <form action={{ url_for("getSemester") }}>
+        {% else %}
+            <form action={{ request.args.get("next") }}>
+        {% endif %}
+                <input type="submit" value="Der Kurs stimmt!">
         </form>
     {% else %}
         <h1>Dein Kurs konnte leider nicht ermittelt werden. Klicke den Button, um direkt zur Auswahl zu kommen.</h1>
     {% endif %}
-    <form action={{ url_for("chooseRaplas") }}>
+    <form action={{ url_for("chooseRaplas", next=request.args.get("next")) }}>
         <input type="submit" value="Manuell auswählen!">
     </form>
-</body>
-</html>
+{% endblock %}

templates/login.html

@@ -1,22 +1,15 @@
-<!DOCTYPE html>
-<html lang="de">
-	<head>
-        <title> Log In 👀</title>
-        <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
-
-        <script async src="https://analytics.paulmartin.cloud/script.js" data-website-id="459fa66e-e255-4393-8e89-ead8b1572d0d"></script>
-
-
-      </head>
-	  <body>
-		<div class="cs">
-            <form method="post" action={{ url_for ("login_post", next=request.args.get("next")) }}>
-                <label for="email" >Dualis-Email: </label>
-                <input class="input" type="email" name="email" placeholder="Email-Adresse" autofocus="">
-                <label for="password">Dualis-Passwort:</label>
-                <input class="input" type="password" name="password" placeholder="Passwort">
-                <button class="button">Login</button>
-            </form>
-		</div>
-	</body>
-</html>
+{% extends "index.html" %}
+{% block content %}
+    <div class="cs">
+        <h1>Einloggen</h1>
+    </div>
+    <div class="cs">
+        <form method="post" action={{ url_for ("login_post", next=request.args.get("next")) }}>
+            <label for="email" >Dualis-Email: </label>
+            <input class="input" type="email" name="email" placeholder="Email-Adresse" autofocus="">
+            <label for="password">Dualis-Passwort:</label>
+            <input class="input" type="password" name="password" placeholder="Passwort">
+            <button class="button">Login</button>
+        </form>
+    </div>
+{% endblock %}

templates/noten.html

@@ -1,15 +1,17 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Noten</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
-    <script async src="https://analytics.paulmartin.cloud/script.js" data-website-id="459fa66e-e255-4393-8e89-ead8b1572d0d"></script>
-</head>
-<body>
+{% extends "index.html" %}
+{% block content %}
+    {%  for i in range (semester|length) %}
+        {% if semester[i][1]==sel %}
+            <h1>Deine Noten im {{ semester[i][0] }}</h1>
+        {% endif %}
+    {% endfor %}
+    <br>
+    <br>
     {% for i in noten %}
         <h2>{{ i[0] }}: {{ i[1].capitalize() }} (Credits: {{ i[2] }})</h2>
     {% endfor %}
+    <br>
+    <br>
     <form method="post" action={{ url_for ("setSemester", next=url_for("displayNoten")) }}>
             <label for="sem">Semester wählen! </label>
             <select name="sem" id="sem">
@@ -19,5 +21,4 @@
             </select>
             <input type="submit" value="Semester setzen!">
         </form>
-</body>
-</html>
+{% endblock %}

templates/plan-anon.html

@@ -1,7 +1,9 @@
 {% extends "plan-general.html"%}
+{% block loginout %}
+    <li><a class="bottom" href={{ url_for("login") }}>Log-In</a></li>
+{% endblock %}
 {% block startcontent %}
     <h2>Vorlesungsplan {{ kurs }}</h2>
 {% endblock %}
 {% block endcontent %}
-    <a href={{ url_for("login") }}>Einloggen, um alle Features zu nutzen!</a>
 {% endblock %}

templates/plan-general.html

@@ -6,6 +6,19 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='cal.css') }}">
 </head>
 <body>
+<nav>
+    <ul>
+        <li class="top selected"><a class="top selected" href={{ url_for("welcome", sel="theorie") }}>Theorie</a></li>
+        <li class="top"><a class="top" href={{ url_for("welcome", sel="praxis") }}>Praxis</a></li>
+        <li {{ theorie }}><a href={{ url_for("displayNoten") }}>Noten</a></li>
+        <li {{ theorie }}><a class="selected" href={{ url_for("displayRapla") }}>Stundenplan</a></li>
+        <li {{ praxis }}><a href={{ url_for("redKurs") }}>To Dos</a></li>
+        <li><a href={{ url_for("redKurs") }}>Konfiguration</a></li>
+        {% block loginout %}
+        {% endblock %}
+    </ul>
+</nav>
+<div class="cs1">
     <div class="customheader">
         {% block startcontent %}
         {% endblock %}
@@ -64,5 +77,6 @@
     </div>
     {% block endcontent %}
     {% endblock %}
+</div>
 </body>
 </html>

templates/plan-user.html

@@ -1,4 +1,7 @@
 {% extends "plan-general.html" %}
+{% block loginout %}
+    <li><a class="bottom" href={{ url_for("logout") }}>Log-Out</a></li>
+{% endblock %}
 {% block startcontent %}
     <h2>{{ name }}s Vorlesungsplan</h2>
 {% endblock %}
@@ -9,5 +12,4 @@
     </div>
 {% endblock %}
 {% block endcontent %}
-    <!-- Button zum Hinzufügen von Kommentaren -->
 {% endblock %}

templates/rapla.html

@@ -1,11 +1,5 @@
-<!DOCTYPE html>
-<html lang="de">
-	<head>
-        <title> RAPLA importieren 👀</title>
-        <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
-        <script async src="https://analytics.paulmartin.cloud/script.js" data-website-id="459fa66e-e255-4393-8e89-ead8b1572d0d"></script>
-      </head>
-    <body>
+{% extends "index.html" %}
+{% block content %}
     <h1>Verfügbare Raplas </h1>
         <form method="post" action={{ url_for ("getRapla") }}>
             <label for="file">Vefügbaren RAPLA wählen! </label>
@@ -20,9 +14,8 @@
         </form>
     <h1>Eigenen Rapla hinzufügen</h1>
     <form method="post" action={{ url_for ("getRapla") }}>
-        <label for="url">Rapla-URL eingeben, falls Du deinen Kurs nicht siehst:</label>
+        <label for="url">Rapla-URL eingeben, falls Du Deinen Kurs nicht siehst:</label>
         <input type="url" name="url" id="url">
         <input type="submit" value="Importieren!">
     </form>
-    </body>
-</html>
+{% endblock %}

templates/semester.html

@@ -1,14 +1,7 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Semester wählen</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
-    <script async src="https://analytics.paulmartin.cloud/script.js" data-website-id="459fa66e-e255-4393-8e89-ead8b1572d0d"></script>
-</head>
-<body>
+{% extends "index.html" %}
+{% block content %}
     <h1>Bitte wähle aus der unten stehenden Liste das Semester, dessen Noten du sehen möchtest.</h1>
-    <form method="post" action={{ url_for ("setSemester") }}>
+    <form method="post" action={{ url_for ("setSemester", next=request.args.get("next")) }}>
         <label for="sem">Semester wählen! </label>
         <select name="sem" id="sem">
             <option value = "none" selected disabled hidden></option>
@@ -18,5 +11,4 @@
         </select>
         <input type="submit" value="Semester setzen!">
     </form>
-</body>
-</html>
+{% endblock %}