Launch prep
This commit is contained in:
128
routing.py
128
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():
|
||||
"""
|
||||
@ -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)
|
||||
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():
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user