Merge branch 'main' of git.cardiff.ac.uk:c21070842/client-project-15 into main

.vs/ProjectSettings.json

+{
+  "CurrentProjectSetting": null
+}
\ No newline at end of file

.vs/VSWorkspaceState.json

+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\README.md",
+  "PreviewInSolutionExplorer": false
+}
\ No newline at end of file

main.py

@@ -15,6 +15,10 @@ def home():
 def about():
 	return render_template("about.html")
 
+@app.route("/Locations", methods = ["GET"])
+def Locations():
+	return render_template("Locations.html")
+
 @app.route("/contact-us", methods = ["GET"])
 def contact():
 	return render_template("contact-us.html")

templates/Locations.html

@@ -7,7 +7,11 @@
   <button class="btn" onclick="filterSelection('North-England')"> North England</button>
   <button class="btn" onclick="filterSelection('South-West-England')"> South West England</button>
   <button class="btn" onclick="filterSelection('Midlands')"> Midlands</button>
+<<<<<<< HEAD
   <button class="btn" onclick="filterSelection('Scotland')"> Scotland</button>
+=======
+  <button class="btn" onclick="filterSelection('Scotland')"> Scotland<button>
+>>>>>>> eee8f2dbda7bb480a8543f73de8f7278a1aed2e0
 </div>
 
 <div class="container">

templates/main.html

@@ -24,6 +24,7 @@
   <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>