From 97c081c0dc29b7262ff73dc79f66a38652e13f59 Mon Sep 17 00:00:00 2001
From: Liam Driscoll <driscolll4@cardiff.ac.uk>
Date: Thu, 8 Dec 2022 18:55:04 +0000
Subject: [PATCH] Merge conflict was unable to be resolved. New merge.
---
project_server.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/project_server.py b/project_server.py
index cf33dbd..accf454 100644
--- a/project_server.py
+++ b/project_server.py
@@ -17,19 +17,17 @@ def connect_db(db_file=DATABASE):
print("Error connecting to database.")
return conn
-<<<<<<< HEAD
-@app.route('/SearchRecord', methods=['POST'])
-=======
@app.route("/", methods=['GET'])
def returnIndex():
- return render_template("test.html")
+ if (request.method == 'GET'):
+ return render_template("test.html")
@app.route("/Manage_Coworking_Spaces", methods=['GET'])
def returnManageCoworkingSpaces():
- return render_template("Manage_Coworking_Spaces.html")
+ if (request.method == 'GET'):
+ return render_template("Manage_Coworking_Spaces.html")
-@app.route("/SearchRecord", methods=['POST'])
->>>>>>> 447d1e30bd664c46c1ad4a89ed35119391ab95a6
+@app.route("/SearchRecord", methods=['POST', 'GET'])
def searchRecord():
if (request.method =='POST'):
--
GitLab