Fixing conflicts

920eb783 · Rhiannon Austin · ce95164c · 5637dcc9 · 920eb783 · 920eb783
Commit 920eb783 authored Dec 13, 2021 by Rhiannon Austin
--- a/templates/contact-us.html
+++ b/templates/contact-us.html
+{% extends "main.html" %}
+{% block title %}Map{% endblock %}
+{% block mainBlock %}
+<header> Contact <header> 
+  <p> tact info.</p>
+{% endblock %}
--- a/templates/home.html
+++ b/templates/home.html
@@ -3,16 +3,23 @@
 {% block mainBlock %}
 <ul>
 	{% for workspace in workspaces %}
-	<li><a href="{{ workspace.website }}">{{ workspace.name }}</a>
-	<img src="{{ workspace.main_photo }}"></li>
-	<ul>
-		<li>{{ workspace.address }}</li>
-		<li>{{ workspace.description }}</li>
-		<li>{{ workspace.email }}</li>
-		<li>{{ workspace.phone_number }}</li>
-		<li>{{ workspace.opening_hours }}</li>
-		<li>{{ workspace.checkin_instructions }}</li>
-	</ul>
+	<div class="workspace-item">
+		<div class="image-col">
+			<a href="/workspace/{{ workspace.id }}"><img class="image" src="{{ workspace.main_photo }}"></a>
+		</div>
+		<div class="main-col">
+			<div><a href="/workspace/{{ workspace.id }}" class="title">{{ workspace.name }}</a></div>
+			<div>
+				<span class="meta"><a href="mailto:{{ workspace.email }}">{{ workspace.email }}</a></li> <span class="dot">&middot;</span>
+				<span class="meta"><a href="tel:{{ workspace.phone_number }}">{{ workspace.phone_number }}</a></span> <span class="dot">&middot;</span>
+				<span class="meta"><a href="{{ workspace.website }}" target="_blank">{{ workspace.website }}</a></span>
+			</div>
+			<div>
+				<span class="meta">{{ workspace.address }}</span> <span class="dot">&middot;</span>
+				<span class="meta">{{ workspace.opening_hours }}</span>
+			</div>
+		</div>
+	</div>
 	{% endfor %}
 </ul>
 {% endblock %}
\ No newline at end of file
--- a/templates/main.html
+++ b/templates/main.html
@@ -2,8 +2,6 @@
 <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"
@@ -11,19 +9,23 @@
 "sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
 		crossorigin="anonymous">

+	<link rel="stylesheet" href="/static/style.css">
+
 	<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>
-  <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>
+  <li><a href="/">Home</a></li>
+  <li><a href="/map">Map</a></li>
+  <li><a href="/contact-us">Contact Us</a></li>
+	<li><a href="/Locations">Locations</a></li>
+  <li style="float:right"><a class="active" href="/about">About</a></li>
 </ul>
 	</nav>
 	{% block mainBlock %}{% endblock %}

--- a/templates/map.html
+++ b/templates/map.html
+{% extends "main.html" %}
+{% block title %}Map{% endblock %}
+{% block mainBlock %}
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
+	integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
+	crossorigin=""/>
+<script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
+	integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
+	crossorigin=""></script>
+<noscript>JavaScript must be supported and enabled in the browser to support interactive maps!</noscript>
+<script>var mapData = {{ json|safe }};</script>
+<div id="map"></div>
+<script src="/static/scripts/map.js"></script>
+{% endblock %}
\ No newline at end of file
--- a/workspaces.json
+++ b/workspaces.json
+[{
+	"name": "CodeBase",
+	"address": "CodeBase Edinburgh, 37a Castle Terrace, Edinburgh, EH1 2EL",
+	"main_photo": "https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1505921023376-PAHUDHVOOKIYF4XQPHOO/5951229048_3e3d50fcb1_o.jpg?format=750w",
+	"additional_photos": ["https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1636387943314-W9JWMS6ZX4DEZSPUV7T0/Copy+of+Unfiltered_square+%281%29.png?format=500w"],
+	"description": "We've been exploring the world of startups...",
+	"website": "https://www.thisiscodebase.com",
+	"email": "hannah@thisiscodebase.com",
+	"phone_number": "+44 131 560 2003",
+	"opening_hours": "Monday - Friday, 9am - 5pm",
+	"checkin_instructions": "Tramsched members should contact Hannah using the email address listed.",
+	"latlong": [55.9471623, -3.203928]
+}]
\ No newline at end of file