Launch prep

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, "
+    if sel == "theorie":
-                                                                          + name + " (" + kurs + ")")
+        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():
     """
@@ -214,16 +228,16 @@ def getRapla():
     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)
+    else:
-    hashpw = generate_password_hash(password, method="pbkdf2:sha256")
+        hashid = int(hashlib.sha1(email.encode("utf-8")).hexdigest(), 16) % (10 ** 8)
-    pname = email.find(".") + 1
+        pname = email.find(".") + 1
-    ename = min(email[pname:].find("."), email[pname:].find("@"))
+        ename = min(email[pname:].find("."), email[pname:].find("@"))
-    name = email[pname:pname + ename].capitalize()
+        name = email[pname:pname + ename].capitalize()
-    new_user = User(email=email, password=hashpw, name=name, id=hashid)
+        new_user = User(email=email, name=name, id=hashid)
-    db.session.add(new_user)
+        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()))
+        new_dualis = Dualis(uid=hashid, token=t[0], token_created=int(time.time()))
-    db.session.add(new_dualis)
+        db.session.add(new_dualis)
-    db.session.commit()
+        db.session.commit()
-    login_user(new_user)
+        login_user(new_user)
-    newcookie = cookie
+        success.set_cookie("cnsc", value=cookie, httponly=True, secure=True)
-    success.set_cookie("cnsc", value=newcookie, httponly=True, secure=True)
     return success
 
 
-@app.route("/backendpoc/log-out")
+@app.route("/log-out")
 @login_required
 def logout():
     """

static/cal.css

@@ -168,6 +168,77 @@ 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;
+}
+
+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.top.selected {
+  color: red;
+  background-color: black;
+}
+
+nav li.top.selected {
+  border-color: red;
+}
+
+nav li a.selected {
+  background-color: white;
+  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: 100%;
+}
+
 .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;;;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"}

static/cal.scss

@@ -172,6 +172,81 @@ 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;
+}
+
+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.top.selected {
+    color: red;
+  background-color: black
+}
+
+nav li.top.selected {
+    border-color: red;
+}
+
+nav li a.selected {
+    background-color: white;
+    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: 100%;
+}
+
+
   // Place on Timeline
 
 

static/style.css

@@ -1,84 +1,137 @@
+:root {
+  --numBoxes: 2;
+  --numRows: 2;
+}
+
 body {
-    background-color: black;
+  background-color: black;
-    margin: 0;
+  font-family: "Asap", "Calibri", "Arial", sans-serif;
+  font-size: 150%;
+  margin: 0;
+  color: white;
 }
 
 nav ul {
-    list-style-type: none;
+  list-style-type: none;
-    margin: 0;
+  margin: 0;
-    padding: 0;
+  padding: 0;
-    width: 200px;
+  width: 200px;
-    background-color: #333;
+  background-color: #333;
-    position: fixed;
+  position: fixed;
-    top: 0;
+  top: 0;
-    left: 0;
+  left: 0;
-    height: 100%;
+  height: 100%;
-    overflow-y: auto;
+  overflow-y: auto;
 }
 
 nav li {
-    border-top: none;
+  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;
+  border-top: 3px solid white;
+  margin-top: 20px;
+  padding-top: 30px;
+}
+
+nav a.top.selected {
+  color: red;
+}
+
+nav li.top.selected {
+  border-color: red;
+}
+
+nav li a.selected {
+  background-color: black;
+  color: white;
 }
 
 nav li a {
-    display: block;
+  display: block;
-    color: white;
+  color: white;
-    padding: 12px 16px;
+  padding: 12px 16px;
-    text-decoration: none;
+  text-decoration: none;
-    margin-top: 5px;
 }
 
 nav li a:hover {
-    background-color: red;
+  background-color: red;
+}
+
+nav li .bottom {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
 }
 
 .cs1 {
-    margin-left: 220px;
+  margin-left: 220px;
-    padding: 20px;
+  padding: 20px;
 }
 
 .cs {
-    display: flex;
+  display: flex;
-    justify-content: center;
+  justify-content: center;
-    align-items: center;
+  align-items: center;
-    flex-direction: column;
+  flex-direction: column;
-    margin-left: 220px;
+  padding: 20px;
-    padding: 20px;
 }
 
-
 .container {
-    display: flex;
+  display: flex;
-    flex-direction: column; 
+  flex-direction: column;
 }
 
 /* Reihen */
 .row {
-    display: flex;
+  display: flex;
-    justify-content: center;
+  justify-content: space-evenly;
-    margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 
 .box {
-    width: 200px;
+  width: calc(100% / var(--numBoxes));
-    height: 200px;
+  height: 300px;
-    border: 2px solid red;
+  border: 5px solid red;
-    margin: 5px;
+  margin: 5px;
+  border-radius: 10px;
 }
 
-
 .cs1 h1 {
-    color: white; 
+  margin-left: 0;
 }
 
 .notification-icon {
-    position: fixed;
+  position: fixed;
-    top: 10px;
+  top: 10px;
-    right: 10px;
+  right: 10px;
-	width:50px;
+  width: 50px;
-    
 }
+
+input {
+  width: 150px;
+  height: 50px;
+}
+
+input[type=url], input[type=email], input[type=password] {
+  width: 500px;
+}
+
+select {
+  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;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"}

templates/dashboard.html

@@ -0,0 +1,22 @@
+{% extends "index.html" %}
+
+{%  block content %}
+<div class="cs">
+    <h1> Willkommen, {{ name }} ({{ kurs }})!</h1>
+</div>
+
+<div class="container">
+
+    <div class="row">
+        <div class="box"></div>
+        <div class="box"></div>
+    </div>
+
+    <div class="row">
+        <div class="box"></div>
+        <div class="box"></div>
+        <div class="box"></div>
+    </div>
+</div>
+
+{% endblock %}

templates/index.html

@@ -1,47 +1,36 @@
 <!DOCTYPE html>
 <html lang="de">
 <head>
-    <title>DUALHUB👀</title>
+    <title>DualHub</title>
-	<link rel="shortcut icon" type="image/x-icon" href="benachrichtigung.png"> 
+    <link rel="stylesheet" type="text/css" href={{ url_for("static", filename="style.css") }}>
-    <link rel="stylesheet" type="text/css" href="style.css">
+    <script async src="https://analytics.paulmartin.cloud/script.js" data-website-id="459fa66e-e255-4393-8e89-ead8b1572d0d"></script>
-    <script async src="https://analytics.paulmartin.cloud/script.js" data-website-id="1c02dacf-6952-4560-a303-0c25f432c48d"></script>
 </head>
-<!--<link rel="shortcut icon" type="image/x-icon" href="temp.png">-->
 <body>
 <nav>
     <ul>
-        <li><a href="#">Theorie</a></li>
+        {% if theorie=="hidden" and praxis=="hidden" %}
-        <li><a href="#">Praxis</a></li>
+            <li class="top"><a class="top" href={{ url_for("welcome", sel="theorie") }}>Theorie</a></li>
-        <li class="start"><a href="#">Start</a></li>
+            <li class="top"><a class="top" href={{ url_for("welcome", sel="praxis") }}>Praxis</a></li>
-        <li><a href="#">Kursübersicht</a></li>
+        {% elif theorie == "hidden" %}
-        <li><a href="#">aktueller Notenschnitt</a></li>
+            <li class="top"><a class="top" href={{ url_for("welcome", sel="theorie") }}>Theorie</a></li>
-        <li><a href="#">Stundenplan</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={{ url_for("redKurs") }}>To Dos</a></li>
+        <li><a {% if s == "s" %} class="selected" {% endif %} href={{ url_for("redKurs") }}>Konfiguration</a></li>
+        {% if request.endpoint[:7] != "login" %}
+            <li><a class="bottom" href={{ url_for("logout") }}>Log-Out</a></li>
+        {% endif %}
     </ul>
 </nav>
 
-
+<div class="cs1">
-<img src="benachrichtigung.png" alt="Benachrichtigung" class="notification-icon">
+{% block content %}
-<main class="content-section">
+{% endblock %}
-		<div class="cs1">
-    <h1> Willkommen USER</h1>
 </div>
-   <div class="cs">
-            
-            <div class="container">
-               
-                <div class="row">
-                    <div class="box"></div>
-                    <div class="box"></div>
-                </div>
-              
-                <div class="row">
-                    <div class="box"></div>
-                    <div class="box"></div>
-                    <div class="box"></div>
-                </div>
-            </div>
-        </div>
-    </main>
-
 </body>
 </html>

templates/kurs.html

@@ -1,22 +1,18 @@
-<!DOCTYPE html>
+{% extends "index.html" %}
-<html lang="en">
+{% block content %}
-<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>
     {%   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") }}>
+        {% if not request.args.get("next") %}
-            <input type="submit" value="Der Kurs stimmt!">
+            <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>
+{% endblock %}
-</html>

templates/login.html

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

templates/noten.html

@@ -1,15 +1,17 @@
-<!DOCTYPE html>
+{% extends "index.html" %}
-<html lang="en">
+{% block content %}
-<head>
+    {%  for i in range (semester|length) %}
-    <meta charset="UTF-8">
+        {% if semester[i][1]==sel %}
-    <title>Noten</title>
+            <h1>Deine Noten im {{ semester[i][0] }}</h1>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
+        {% endif %}
-    <script async src="https://analytics.paulmartin.cloud/script.js" data-website-id="459fa66e-e255-4393-8e89-ead8b1572d0d"></script>
+    {% endfor %}
-</head>
+    <br>
-<body>
+    <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>
+{% endblock %}
-</html>

templates/plan-anon.html

@@ -1,4 +1,7 @@
 {% 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 %}

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>
+{% extends "index.html" %}
-<html lang="de">
+{% block content %}
-	<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>
     <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>
+{% endblock %}
-</html>

templates/semester.html

@@ -1,14 +1,7 @@
-<!DOCTYPE html>
+{% extends "index.html" %}
-<html lang="en">
+{% block content %}
-<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>
     <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>
+{% endblock %}
-</html>