Merge branch 'addedHtmlPagesAndUserInterface' into 'main'

Added html pages and user interface See merge request !10

Merge branch 'addedHtmlPagesAndUserInterface' into 'main'
Added html pages and user interface See merge request !10
c1a4ed26 · Beaumont Mogridge · 4ce78538 · 517f902a · c1a4ed26 · c1a4ed26
Commit c1a4ed26 authored 3 years ago by Beaumont Mogridge
--- a/main.py
+++ b/main.py
@@ -11,6 +11,15 @@ def home():
 		workspaces = database.get_workspaces()
 		return render_template("home.html", workspaces = workspaces)
+@app.route("/about", methods = ["GET"])
+def about():
+	return render_template("about.html")
+@app.route("/contact-us", methods = ["GET"])
+def contact():
+	return render_template("contact-us.html")
 @app.route("/map", methods = ["GET"])
 def map():
 	if request.method == "GET":

--- a/static/style.css
+++ b/static/style.css
@@ -35,8 +35,14 @@ body {
  background-color: #f5f5f5
 }
-h1
+header {
-{ color: blue;}
+  background-color: #f5f5f5;
+  font-size: 30px;
+}
 nav li {
  display: inline;
@@ -48,7 +54,7 @@ nav li {
 nav li:last-child {
  color: red;
-background-color: red;
+background-color:#5F9EA0;
  border-right: none;
  border-top-left-radius: 1000%;
  border-bottom-left-radius: 1000%;
@@ -58,7 +64,7 @@ nav ul {
  margin: 0;
  padding: 0;
  overflow: hidden;
-  background-color: #333;
+  background-color: black;
 }

--- a/templates/about.html
+++ b/templates/about.html
+{% extends "main.html" %}
+{% block title %}Map{% endblock %}
+{% block mainBlock %}
+<header> About Us </header>
+<p>text about us.</p>
+{% endblock %}
--- a/templates/contact-us.html
+++ b/templates/contact-us.html
+{% extends "main.html" %}
+{% block title %}Map{% endblock %}
+{% block mainBlock %}
+<header> Contact Us </header>
+<p>text about contact info.</p>
+{% endblock %}
--- a/templates/main.html
+++ b/templates/main.html
@@ -14,9 +14,10 @@
 	<title>{% block title %}{% endblock %} - Tramshed Workspaces</title>
 </head>
 <div class="parallax">
 <body class="body">
-  	<img src="/static/Tramshed_Logo.jpg" alt="Logo" height="50" width="100">
+  <header><img src="/static/Tramshed_Logo.jpg" alt="Logo"  height="50" width="100" >Welcome</header>
 <!-- navigation -->
 	<nav>
 <ul>