From cb35125bd1d50a938c9897c1114e270c5ff5fea7 Mon Sep 17 00:00:00 2001
From: a2-imeri <alfret2.imeri@live.uwe.ac.uk>
Date: Thu, 20 Apr 2023 10:10:57 +0100
Subject: [PATCH] Fix merge issue
---
store/routes.py | 22 ++++++++++++++--------
store/templates/items.html | 2 +-
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/store/routes.py b/store/routes.py
index e63b9cc..f4108d5 100644
--- a/store/routes.py
+++ b/store/routes.py
@@ -112,14 +112,20 @@ def item_set_page(item_id):
def register():
form = RegistrationForm()
if form.validate_on_submit():
- flash("RAN")
- user = User.create_user(
- form.username.data,
- form.password.data,
- form.email.data,
- form.phone_number.data,
- form.securityQ1.data,
- )
+ if User.checkIfUserExist(User, form.username.data):
+ error = "The username you chose is already taken."
+ return render_template(
+ "userContent/register.html", title="Register", error=error
+ )
+
+ else:
+ user = User.create_user(
+ form.username.data,
+ form.password.data,
+ form.email.data,
+ form.phone_number.data,
+ form.securityQ1.data,
+ )
return redirect(url_for("index"))
return render_template("userContent/register.html", form=form)
diff --git a/store/templates/items.html b/store/templates/items.html
index 7f7c464..0ed6553 100644
--- a/store/templates/items.html
+++ b/store/templates/items.html
@@ -52,4 +52,4 @@
<p>No items available</p>
{% endif %}
</div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
--
GitLab