Skip to content
Snippets Groups Projects
Commit a3092818 authored by Arianne Bayliss's avatar Arianne Bayliss
Browse files

merging

parents e1f7d613 9c7255d5
No related branches found
No related tags found
1 merge request!42Pulled from development/pushed test server code
Hide whitespace changes
Inline Side-by-side
project_server.py
+ 5
− 0
View file @ a3092818
...@@ -7,6 +7,11 @@ DATABASE = "project_db.db" ...@@ -7,6 +7,11 @@ DATABASE = "project_db.db"
ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif']) 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']) @app.route("/SearchRecord", methods=['POST'])
def searchRecord(): def searchRecord():
......
static/CSS/loginstyle.css
+ 5
− 1
View file @ a3092818
...@@ -22,4 +22,8 @@ body{ ...@@ -22,4 +22,8 @@ body{
font-family: 'Sora', sans-serif; font-family: 'Sora', sans-serif;
background-color: #212529; background-color: #212529;
color: white; color: white;
} <<<<<<< HEAD
\ No newline at end of file }
=======
}
>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
static/JS/Manage_Coworking_Spaces.js
+ 1
− 1
View file @ a3092818
...@@ -145,7 +145,7 @@ function deleteRecord(e) { ...@@ -145,7 +145,7 @@ function deleteRecord(e) {
// Creating a form data-type to transfer multiple parameters to the server. // Creating a form data-type to transfer multiple parameters to the server.
var params = 'recordName='+recordName; var params = 'recordName='+recordName;
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
xhttp.open("POST", '/DeleteRecord', true); xhttp.open("POST", '/DeleteRecord', true);
xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
......
static/login.html
+ 13
− 1
View file @ a3092818
...@@ -25,13 +25,21 @@ ...@@ -25,13 +25,21 @@
<form> <form>
<!-- Email input --> <!-- Email input -->
<div class="form-outline mb-4"> <div class="form-outline mb-4">
<<<<<<< HEAD
<input type="email" id="recordEmail" class="form-control" /> <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> <label class="form-label" for="form2Example1">Email address</label>
</div> </div>
<!-- Password input --> <!-- Password input -->
<div class="form-outline mb-4"> <div class="form-outline mb-4">
<<<<<<< HEAD
<input type="password" id="recordPassword" class="form-control" /> <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> <label class="form-label" for="form2Example2">Password</label>
</div> </div>
...@@ -60,4 +68,8 @@ ...@@ -60,4 +68,8 @@
<p>Not a member? <a href="#!">Register</a></p> <p>Not a member? <a href="#!">Register</a></p>
</form> </form>
</body> </body>
</html> <<<<<<< HEAD
\ No newline at end of file </html>
=======
</html>
>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
templates/base_template.html 0 → 100644
+ 62
− 0
View file @ a3092818
<!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>
templates/test.html 0 → 100644
+ 4
− 0
View file @ a3092818
{%extends "base_template.html"%}
{%block mainblock%}
test
{%endblock%}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment