From cd503caa68c52f98f41d5fecc2afd8c31156f4db Mon Sep 17 00:00:00 2001 From: stilbruch Date: Wed, 23 Mar 2022 16:39:16 -0500 Subject: Move some templates and update form logic --- app/routes.py | 12 +++--- app/templates/base.html | 69 -------------------------------- app/templates/base/form.html | 33 ++++++++++++++++ app/templates/base/home.html | 5 --- app/templates/base/index.html | 5 --- app/templates/base/layout.html | 69 ++++++++++++++++++++++++++++++++ app/templates/home.html | 5 +++ app/templates/index.html | 5 +++ app/templates/user/login.html | 79 ++++++++++++++----------------------- app/templates/user/register.html | 85 ++++++++++++++++------------------------ 10 files changed, 180 insertions(+), 187 deletions(-) delete mode 100644 app/templates/base.html create mode 100644 app/templates/base/form.html delete mode 100644 app/templates/base/home.html delete mode 100644 app/templates/base/index.html create mode 100644 app/templates/base/layout.html create mode 100644 app/templates/home.html create mode 100644 app/templates/index.html diff --git a/app/routes.py b/app/routes.py index 7ae1fb1..c1424b5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -28,8 +28,7 @@ def login(): login_user(user) return redirect(url_for('home')) else: - flash("invalid login") - return redirect(url_for('register')) + flash("Invalid username or password", "danger") return render_template('user/login.html', form=form) @@ -46,8 +45,6 @@ def register(): password = form.password.data email = form.email.data - print("register") - if form.validate_on_submit(): # Valid submission user = User.query.filter_by(username=username).first() @@ -56,8 +53,9 @@ def register(): user = User(username, password, email) db.session.add(user) db.session.commit() + return redirect(url_for('login')) + else: + flash("User already exists", "danger") - return redirect(url_for('login')) - else: - return render_template('user/register.html', form=form) + return render_template('user/register.html', form=form) diff --git a/app/templates/base.html b/app/templates/base.html deleted file mode 100644 index c539baa..0000000 --- a/app/templates/base.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - Strenghty 💪 - - - - - - {% block content %}{% endblock %} - - - - diff --git a/app/templates/base/form.html b/app/templates/base/form.html new file mode 100644 index 0000000..830afbe --- /dev/null +++ b/app/templates/base/form.html @@ -0,0 +1,33 @@ +{% extends 'base/layout.html' %} + +{% block content %} +
+
+
+
+
+
+

{% block title %}{% endblock %}

+ + + {% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %} + {% for category, message in messages %} +
+ {{ message }} +
+ {% endfor %} + {% endif %} + {% endwith %} + +
+ {{ form.csrf_token }} + {% block form %}{% endblock %} +
+
+
+
+
+
+
+{% endblock %} diff --git a/app/templates/base/home.html b/app/templates/base/home.html deleted file mode 100644 index 14dd441..0000000 --- a/app/templates/base/home.html +++ /dev/null @@ -1,5 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} - User Homepage -{% endblock %} diff --git a/app/templates/base/index.html b/app/templates/base/index.html deleted file mode 100644 index 3e91518..0000000 --- a/app/templates/base/index.html +++ /dev/null @@ -1,5 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} - Index Page -{% endblock %} diff --git a/app/templates/base/layout.html b/app/templates/base/layout.html new file mode 100644 index 0000000..c539baa --- /dev/null +++ b/app/templates/base/layout.html @@ -0,0 +1,69 @@ + + + + + + + + + + Strenghty 💪 + + + + + + {% block content %}{% endblock %} + + + + diff --git a/app/templates/home.html b/app/templates/home.html new file mode 100644 index 0000000..e640325 --- /dev/null +++ b/app/templates/home.html @@ -0,0 +1,5 @@ +{% extends 'base/layout.html' %} + +{% block content %} + User Homepage +{% endblock %} diff --git a/app/templates/index.html b/app/templates/index.html new file mode 100644 index 0000000..04b89ef --- /dev/null +++ b/app/templates/index.html @@ -0,0 +1,5 @@ +{% extends 'base/layout.html' %} + +{% block content %} + Index Page +{% endblock %} diff --git a/app/templates/user/login.html b/app/templates/user/login.html index 9aaf33c..6bd4c1c 100644 --- a/app/templates/user/login.html +++ b/app/templates/user/login.html @@ -1,54 +1,35 @@ -{% extends 'base.html' %} +{% extends 'base/form.html' %} -{% block content %} -
-
-
-
-
-
-
-

Log in

+{% block title %}Login{% endblock %} - - -
- {{ form.csrf_token }} -
- -
- - - - -
-
-
- -
- - - - -
-
-
- -
-
- -
-
-
-
-
-
-
+{% block form %} +
+ +
+ + + + +
+
+
+ +
+ + + +
+
+ +
+
+ +
{% endblock %} diff --git a/app/templates/user/register.html b/app/templates/user/register.html index 6341671..26e5dd0 100644 --- a/app/templates/user/register.html +++ b/app/templates/user/register.html @@ -1,57 +1,38 @@ -{% extends 'base.html' %} +{% extends 'base/form.html' %} -{% block content %} -
-
-
-
-
-
-
-

Sign up

+{% block title %}Sign Up{% endblock %} - - -
- {{ form.csrf_token }} -
- -
- - - - -
-
-
- -
- - - - -
-
-
- -
- - - - -
-
-
- -
-
-
-
-
-
-
+{% block form %} +
+ +
+ + + + +
+
+
+ +
+ + + +
+
+ +
+ + + + +
+
+
+ +
{% endblock %} -- cgit v1.2.3