From 2d092909c011999346bd57c332283f8d8e8119d1 Mon Sep 17 00:00:00 2001 From: flup3ers Date: Mon, 24 Jun 2019 14:04:34 +0200 Subject: [PATCH 1/5] New branch --- templates/index.html | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/templates/index.html b/templates/index.html index 6f42f26e..dd699091 100644 --- a/templates/index.html +++ b/templates/index.html @@ -4,7 +4,7 @@ - ProMan + Swarm @@ -12,10 +12,27 @@ + + + -

ProMan

-
Boards are loading...
+ + \ No newline at end of file From 2c141dea4b26d3cd127f66af293b31aa56639e9e Mon Sep 17 00:00:00 2001 From: flup3ers Date: Tue, 25 Jun 2019 10:51:32 +0200 Subject: [PATCH 2/5] Add html files and login functions --- main.py | 40 +++++++++++++++- templates/index.html | 103 ++++++++++++++++++++++++++++++++++++---- templates/login.html | 10 ++++ templates/my_page.html | 10 ++++ templates/register.html | 10 ++++ 5 files changed, 163 insertions(+), 10 deletions(-) create mode 100644 templates/login.html create mode 100644 templates/my_page.html create mode 100644 templates/register.html diff --git a/main.py b/main.py index 9e25a1ac..3052295d 100644 --- a/main.py +++ b/main.py @@ -18,7 +18,7 @@ def index(): @json_response def get_boards(): """ - All the boards + All the names boards """ return data_handler.get_boards() @@ -33,6 +33,44 @@ def get_cards_for_board(board_id: int): return data_handler.get_cards_for_board(board_id) +@app.route('/login', methods=['POST', 'GET']) +def login(): + if 'username' in session: + return redirect('/my_page') + else: + if request.method == 'POST': + data = request.form + if data_manager_user_operations.verify_login(data): + return render_template("login.html", message="Oops login or password is not correct") + else: + session['username'] = request.form['username'] + return redirect('/my_page') + return render_template("login.html") + + +@app.route('/logout') +def logout(): + # remove the username from the session if it's there + session.pop('username') + session.pop('email') + session.pop('reputation') + return redirect('/login') + + +@app.route('/register', methods=['POST', 'GET']) +def register(): + data = request.form + if request.method == 'POST': + if data_manager_user_operations.verify_credentials(data): + return render_template("register.html", message=data_manager_user_operations.verify_credentials(data)) + else: + data_manager_user_operations.register(data) + session['username'] = request.form['username'] + session['email'] = request.form['email'] + return redirect('/my_page') + return render_template("register.html") + + def main(): app.run(debug=True) diff --git a/templates/index.html b/templates/index.html index dd699091..885dcb2e 100644 --- a/templates/index.html +++ b/templates/index.html @@ -24,15 +24,100 @@ Swarm - - +