diff --git a/project_server.py b/project_server.py
index d709010e14e748dbf47d179730473d5c3b694ef5..d5abe52e2e1f0cc754c8d6cd332dd520074e4734 100644
--- a/project_server.py
+++ b/project_server.py
@@ -7,6 +7,11 @@ DATABASE = "project_db.db"
ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'])
+
+@app.route("/", methods=['GET'])
+def returnTemplate():
+ return render_template("test.html")
+
@app.route("/SearchRecord", methods=['POST'])
def searchRecord():
diff --git a/static/CSS/loginstyle.css b/static/CSS/loginstyle.css
index 9bc8eac8b095916148d36dd41afcb9869d2add21..2c44a02a44c292502c7c4862d8e8b78d86024f40 100644
--- a/static/CSS/loginstyle.css
+++ b/static/CSS/loginstyle.css
@@ -22,4 +22,8 @@ body{
font-family: 'Sora', sans-serif;
background-color: #212529;
color: white;
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
diff --git a/static/JS/Manage_Coworking_Spaces.js b/static/JS/Manage_Coworking_Spaces.js
index c3efb0f50541ce04eecd8d3f6dde8f3fc20fd81b..c20755b76708e03d8d46a91898f0b26f2b98ca6a 100644
--- a/static/JS/Manage_Coworking_Spaces.js
+++ b/static/JS/Manage_Coworking_Spaces.js
@@ -145,7 +145,7 @@ function deleteRecord(e) {
// Creating a form data-type to transfer multiple parameters to the server.
var params = 'recordName='+recordName;
-
+
var xhttp = new XMLHttpRequest();
xhttp.open("POST", '/DeleteRecord', true);
xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
diff --git a/static/login.html b/static/login.html
index 060be73a5618b16c5248fe2e75269bef986009f1..5bbe1b72a5529fc7b8b0ff4c1c3fa16cd0b44f59 100644
--- a/static/login.html
+++ b/static/login.html
@@ -25,13 +25,21 @@
<form>
<!-- Email input -->
<div class="form-outline mb-4">
+<<<<<<< HEAD
<input type="email" id="recordEmail" class="form-control" />
+=======
+ <input type="email" id="form2Example1" class="form-control" />
+>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
<label class="form-label" for="form2Example1">Email address</label>
</div>
<!-- Password input -->
<div class="form-outline mb-4">
+<<<<<<< HEAD
<input type="password" id="recordPassword" class="form-control" />
+=======
+ <input type="password" id="form2Example2" class="form-control" />
+>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
<label class="form-label" for="form2Example2">Password</label>
</div>
@@ -60,4 +68,8 @@
<p>Not a member? <a href="#!">Register</a></p>
</form>
</body>
-</html>
\ No newline at end of file
+<<<<<<< HEAD
+</html>
+=======
+</html>
+>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
diff --git a/templates/base_template.html b/templates/base_template.html
new file mode 100644
index 0000000000000000000000000000000000000000..0b285b1ecc1f90b004c53bc499cf740df1758916
--- /dev/null
+++ b/templates/base_template.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html lang="EN" dir="ltr">
+ <head>
+ <meta charSet="UTF-8">
+ <title> Manage Coworking Spaces </title>
+ <link rel="stylesheet" href="/static/CSS/Manage_Coworking_Spaces.css">
+
+ </head>
+ <body onLoad="pageLoad()">
+
+ <header id="pageHeader" class="pageHeader">
+ <div id="headerDiv">
+ <a href="Manage_Coworking_Spaces.html">
+ <img id="headerImg" class="headerImg"
+ src="Media/Tramshed-Logo-Main-Black.png"></img></a>
+ <a id="headerText" class="headerText"
+ href="Manage_Coworking_Spaces.html">
+ Manage Coworking Spaces</a>
+ </div>
+ <nav id="headerNav" class="navBar">
+ <ul class="Left">
+ <li><a href="Manage_Coworking_Spaces.html">
+ <img id="navImg" class="navImg"
+ src="Media/Tramshed-Logo-Main-White.png"></img></a></li>
+ <li><a href="Manage_Coworking_Spaces.html">Home</a></li>
+ <li><a href="Manage_Coworking_Spaces.html">Locations</a></li>
+ </ul>
+ <ul class="Right">
+ <li><a href="Manage_Coworking_Spaces.html">Manage</a></li>
+ <li><a href="Manage_Coworking_Spaces.html">Login</a></li>
+ <li><div class="navHamburger">
+ <span></span>
+ <span></span>
+ <span></span>
+ </div></li>
+ </ul>
+ </nav>
+ </header>
+
+ <main id="pageMain">
+ <br><br>
+ {%block mainblock%}
+ {%endblock%}
+ </main>
+
+ <footer id="pageFooter">
+ <nav id="footerNav" class="navBar">
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces.html">Left</a></li>
+ </ul>
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces.html">Center</a></li>
+ </ul>
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces.html">Right</a></li>
+ </ul>
+ </nav>
+ </footer>
+
+ <script src="/static/JS/Manage_Coworking_Spaces.js"></script>
+ </body>
+</html>
diff --git a/templates/test.html b/templates/test.html
new file mode 100644
index 0000000000000000000000000000000000000000..1a4bf463bb740559d292fedbe9529176cd2c941e
--- /dev/null
+++ b/templates/test.html
@@ -0,0 +1,4 @@
+{%extends "base_template.html"%}
+{%block mainblock%}
+ test
+{%endblock%}