Merge branch '21-reorganising-static-folder' into 'development'

Resolve "Reorganising static folder" Closes #21 See merge request !31

Merge branch '21-reorganising-static-folder' into 'development'
Resolve "Reorganising static folder" Closes #21 See merge request !31
3d6972c8 · Arianne Bayliss · 937cabdb · e6dd6702 · 3d6972c8 · 3d6972c8
Commit 3d6972c8 authored 2 years ago by Arianne Bayliss
--- a/static/Manage_Coworking_Spaces.css
+++ b/static/Manage_Coworking_Spaces.css
--- a/static/landingstyle.css
+++ b/static/landingstyle.css
--- a/static/locations.css
+++ b/static/locations.css
--- a/static/make_booking.css
+++ b/static/make_booking.css
--- a/static/Manage_Coworking_Spaces.js
+++ b/static/Manage_Coworking_Spaces.js
--- a/static/locations.js
+++ b/static/locations.js
--- a/static/Manage_Coworking_Spaces.html
+++ b/static/Manage_Coworking_Spaces.html
@@ -3,7 +3,7 @@
  <head>
    <meta charSet="UTF-8">
    <title> Manage Coworking Spaces </title>
-    <link rel="stylesheet" href="Manage_Coworking_Spaces.css">
+    <link rel="stylesheet" href="CSS/Manage_Coworking_Spaces.css">

  </head>
  <body onLoad="pageLoad()">
@@ -12,7 +12,7 @@
      <div id="headerDiv">
        <a href="Manage_Coworking_Spaces.html">
          <img id="headerImg" class="headerImg"
-          src="Tramshed-Logo-Main-Black.png"></img></a>
+          src="Media/Tramshed-Logo-Main-Black.png"></img></a>
        <a id="headerText" class="headerText"
        href="Manage_Coworking_Spaces.html">
          Manage Coworking Spaces</a>
@@ -21,7 +21,7 @@
        <ul class="Left">
          <li><a href="Manage_Coworking_Spaces.html">
            <img id="navImg" class="navImg"
-            src="Tramshed-Logo-Main-White.png"></img></a></li>
+            src="Media/Tramshed-Logo-Main-White.png"></img></a></li>
          <li><a href="Manage_Coworking_Spaces.html">Left</a></li>
          <li><a href="Manage_Coworking_Spaces.html">Home</a></li>
          <li><a href="Manage_Coworking_Spaces.html">Left</a></li>
@@ -87,6 +87,6 @@
      </nav>
    </footer>

-    <script src="Manage_Coworking_Spaces.js"></script>
+    <script src="JS/Manage_Coworking_Spaces.js"></script>
  </body>
 </html>
--- a/static/Tramshed-Logo-Main-Black.png
+++ b/static/Tramshed-Logo-Main-Black.png
--- a/static/Tramshed-Logo-Main-White.png
+++ b/static/Tramshed-Logo-Main-White.png
--- a/static/logo.jpg
+++ b/static/logo.jpg
--- a/static/tramshed.jpg
+++ b/static/tramshed.jpg
--- a/static/landingpage.html
+++ b/static/landingpage.html
@@ -20,7 +20,7 @@
 </header>
 <header class="masthead bg-dark text-white text-left">
  <div class="container-fluid">
-      <img id="logo" src="logo.png"/>
+      <img id="logo" src="Media/logo.png"/>
      <h1 id="header">Tramshed Tech</h1>
  </div>
 </header>
@@ -33,7 +33,7 @@
  <link href="https://fonts.googleapis.com/css2?family=Sora:wght@800&display=swap" rel="stylesheet">
  <link rel="stylesheet" href="landingstyle.css">
  <title>Tramshed Tech</title>
-  <img id="tramshed" src="tramshed.jpg">
+  <img id="tramshed" src="Media/tramshed.jpg">
  <div class="bg-dark p-3">
    <div id="buttons" class="flex-container">
          <button onclick="window.location.href='locations.html';" type="button" class="btn btn-light">

--- a/static/locations.html
+++ b/static/locations.html
 <!DOCTYPE html>
 <html>
  <head>
-    <link rel="stylesheet" href= "css/locations.css">
+    <link rel="stylesheet" href= "CSS/locations.css">
    <title> Locations </title>
  </head>
  <body>
@@ -74,6 +74,6 @@
      </div>

    </section>
-  <script src="C:\Users\c22086220\OneDrive - Cardiff University\Desktop\our locations\JScript\locations.js"> </script>
+  <script src="JS/locations.js"> </script>

  </body>
--- a/static/make_booking.html
+++ b/static/make_booking.html
 <!DOCTYPE html>
 <html>
 <head>
-<link rel="stylesheet" href="make_booking.css">
+<link rel="stylesheet" href="CSS/make_booking.css">

 <title>Make a Booking</title>
 </head>