diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 0000000000000000000000000000000000000000..f8b4888565caadc7510be75682268d6c18edd6de --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": null +} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000000000000000000000000000000000000..d282b3b2429acfde2dec7effcded342bf9fd7122 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\README.md", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/client-project-15-main/v16/.suo b/.vs/client-project-15-main/v16/.suo new file mode 100644 index 0000000000000000000000000000000000000000..381e8b772446dfe9b5fc859d6374674e65bc497d Binary files /dev/null and b/.vs/client-project-15-main/v16/.suo differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..539c57ca73138669bcca56622d33f85059855353 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/main.py b/main.py index 14a2dbdc5a4e8d9261d5e674e5423b851e61a71f..ba4680310f17fe96a479bee1a071b0f51a60ee26 100644 --- a/main.py +++ b/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") diff --git a/templates/Locations.html b/templates/Locations.html index 7b8c2f9546ebde6f8369ab7281a2531dcff63c52..62fcfb777eaff82ef2bfd342cb0920b44a6908cf 100644 --- a/templates/Locations.html +++ b/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"> diff --git a/templates/main.html b/templates/main.html index 3c531ed4995ce964ffdadc0357886426be05aac3..d390e91694ef8da99a6929ddf61117fb50c6e727 100644 --- a/templates/main.html +++ b/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>