diff --git a/main.py b/main.py index 03362b52eb47bbf559c48682ecc3126ab02c34b8..14a2dbdc5a4e8d9261d5e674e5423b851e61a71f 100644 --- 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": diff --git a/static/style.css b/static/style.css index 099283c39bd291ca3fb9935f599ae1db27515911..af58c8b2dcd7bc3516e77342968bb76b5938fec2 100644 --- a/static/style.css +++ b/static/style.css @@ -35,8 +35,14 @@ body { background-color: #f5f5f5 } -h1 -{ color: blue;} +header { + 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; } diff --git a/templates/about.html b/templates/about.html new file mode 100644 index 0000000000000000000000000000000000000000..5dfe09ecd0ee7dfba5d8dd7204a8f59bac22806e --- /dev/null +++ b/templates/about.html @@ -0,0 +1,6 @@ +{% extends "main.html" %} +{% block title %}Map{% endblock %} +{% block mainBlock %} +<header> About Us </header> +<p>text about us.</p> +{% endblock %} diff --git a/templates/contact-us.html b/templates/contact-us.html new file mode 100644 index 0000000000000000000000000000000000000000..76c03cb68c13e596062d704d8eff42a42dfee30e --- /dev/null +++ b/templates/contact-us.html @@ -0,0 +1,6 @@ +{% extends "main.html" %} +{% block title %}Map{% endblock %} +{% block mainBlock %} +<header> Contact Us </header> +<p>text about contact info.</p> +{% endblock %} diff --git a/templates/main.html b/templates/main.html index 4557b91d74188f5b7b04fecb70fa3f43c18c51cc..3c531ed4995ce964ffdadc0357886426be05aac3 100644 --- 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>