Merge branch 'WebPages' into 'main'

Web pages See merge request !2

Merge branch 'WebPages' into 'main'
69cbe6fc · Rhiannon Austin · d9b76f3e · ea9adc42 · 69cbe6fc · 69cbe6fc
Commit 69cbe6fc authored 3 years ago by Rhiannon Austin
--- a/database.db
+++ b/database.db
--- a/database.py
+++ b/database.py
@@ -97,4 +97,4 @@ def get_workspaces():
 		conn.execute("SELECT * FROM Workspaces")
 		return [Workspace.from_query(conn, x) for x in conn.cursor.fetchall()]

-print(get_workspaces())
\ No newline at end of file
+print(get_workspaces())
--- a/image-asset.png
+++ b/image-asset.png
--- a/login.html
+++ b/login.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+	<link rel="stylesheet" href="static/style.css">
+
+	<!-- Bootstrap CSS -->
+	<link rel="stylesheet" href=
+"https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
+		integrity=
+"sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
+		crossorigin="anonymous">
+
+	<title>{% block title %}{% endblock %} - Tramshed Workspaces</title>
+</head>
+<form class='myForm'  method="POST" action="">
+ <p>Enter Username: </p>
+ <br>
+<input type = "text" name = "username" placeholder="Username.." ><br>
+<button type = "submit" id='mySubmit'> Submit </button>
+</form>
+<!-- <div class="parallax">
+<body class="body">
+  	<!--<img src="static/Tramshed_Logo.jpg" alt="Logo" height="50" width="100">-->
+<!-- navigation --> -->
+	<nav>
+<ul>
+  <li><a href="#home">Home</a></li>
+  <li><a href="#Map">Map</a></li>
+  <li><a href="#contactUs">Contact Us</a></li>
+  <li style="float:right"><a class="active" href="#about">About</a></li>
+</ul>
+	</nav>
+<!--{% block mainBlock %}{% endblock %}-->
+	</body>
+</html>
--- a/main.py
+++ b/main.py
@@ -9,5 +9,14 @@ def home():
 		workspaces = database.get_workspaces()
 		return render_template("home.html", workspaces = workspaces)

+@app.route('/login.html', methods = ["post"])
+def login():
+	username = request.form.get('username')
+	if username == "admin":
+		return redirect("/templates/home.html")
+	else:
+		message = "Wrong Username"
+		return redirect("/login.html")
+
 if __name__ == "__main__":
 	app.run(debug = True)
--- a/teamcb_720.jpg
+++ b/teamcb_720.jpg
--- a/testwebpage.html
+++ b/testwebpage.html
+<!DOCTYPE html>
+<html lang="en">
+<link rel="stylesheet" href="styles.css">
+<head>
+
+	<link rel="stylesheet" href="style.css">
+
+	<!-- Bootstrap CSS -->
+	<link rel="stylesheet" href=
+"https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
+		integrity=
+"sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
+		crossorigin="anonymous">
+
+	<title>Hello</title>
+</head>
+
+<div class="parallax">
+<body class="body">
+  <h1>Welcome</h1>
+
+	<!-- navigation -->
+	<nav>
+<ul>
+  <li><a href="#home">Home</a></li>
+  <li><a href="#Map">Map</a></li>
+  <li><a href="#contactUs">Contact Us</a></li>
+  <li style="float:right"><a class="active" href="#about">About</a></li>
+</ul>
+	</nav><br><br><br>
+
+	<article class="Data">
+		<p>Name: CodeBase<br>
+			Address: CodeBase Edinburgh, 37a Castle Terrace, Edinburgh, EH1 2EL<br>
+			<img scr="https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1454334295772-Q9VJNUS49N9KFZXUATJU/image-asset.png"alt="Logo" width="100" height="80" style="float:right"/>
+      Description: CodeBase Edinburgh is the UK's largest technology incubator. Home to over 90 companies who have<br>
+			collectively raised over half a billion dollars in investment, it is the centre of the tech scene in city.<br>
+      <a href="https://www.thisiscodebase.com/">Click Here for the Website!</a>
+			<img scr="https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1601374465843-3E9V6AK6SWX7W6LLLN0R/teamcb_720.jpg?format=1000w,%20https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1505921023376-PAHUDHVOOKIYF4XQPHOO/5951229048_3e3d50fcb1_o.jpg"alt="The Team" width="100" height="80" style="float:right"/><br>
+			<a href="mailto:info@thisiscodebase.com">Contact us at our email here!</a><br>
+			Phone Number: 0131 560 2003<br>
+			Opening Hours: Our reception at 37a Castle Terrace is open Monday - Friday, 9am - 5pm.<br>
+			Check-in Instructions: Please go to reception to check in<br>
+		</p>