Merge branch 'development' of...

Merge branch 'development' of https://git.cardiff.ac.uk/c22064609/tramshed-tech-client-project-team-15 into 2-as-a-user-i-want-to-be-authorized-if-i-am-a-member

Merge branch 'development' of...
Merge branch 'development' of https://git.cardiff.ac.uk/c22064609/tramshed-tech-client-project-team-15 into 2-as-a-user-i-want-to-be-authorized-if-i-am-a-member
bfb159fa · Arianne Bayliss · b9cf69a6 · eeda094a · bfb159fa
Commit bfb159fa authored 2 years ago by Arianne Bayliss
--- a/static/locations.html
+++ b/static/locations.html
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="stylesheet" href= "CSS/locations.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
+    <title> Locations </title>
+  </head>
+  <body>
+   <section>
+      <h1><img src="Media/logo.png" class="logo"/> Our Locations </h1>
+          <button>
+             <span></span>
+             <span></span>
+             <span></span>
+          </button>
+          <nav>
+             <ul>
+                <li><a href="landingpage.html"> Home </a></li>
+                <li><a href="#"> ### </a></li>
+                <li><a href="#"> ### </a></li>
+              </ul>
+          </nav>
+        <div class="contain">
+          <ul class= "list">
+        <li>
+      <div class="container">
+          <img src="https://images.squarespace-cdn.com/content/v1/55439320e4b0f92b5d6c4c8b/1646867535415-4JI39H286BUMT26H4FHN/C36A1915.jpg?format=2500w" alt="codebase" class="image"  >
+           <h2> Codebase </h2>
+           <p>"brief description"</p>
+           <div class= star>
+           <span class="fa fa-star fa-3x checked" ></span>
+     <span class="fa fa-star fa-3x checked"></span>
+     <span class="fa fa-star fa-3x checked"></span>
+     <span class="fa fa-star fa-3x" ></span>
+     <span class="fa fa-star fa-3x" ></span>
+     </div>
+          <div class="middle">
+              <div class="text"> Codebase </div>
+          </div>
+      </div>
+        </li>
+
+        <li>
+          <div class="container">
+          <img src="https://wearecatalyst.org/wp-content/uploads/2022/05/Catalyst03.jpg" alt="catalyst" class="image" >
+             <h2> Catalyst </h2>
+             <p>"brief description"</p>
+             <div class= star>
+             <span class="fa fa-star fa-3x checked" ></span>
+       <span class="fa fa-star fa-3x checked"></span>
+       <span class="fa fa-star fa-3x checked"></span>
+       <span class="fa fa-star fa-3x" ></span>
+       <span class="fa fa-star fa-3x" ></span>
+       </div>
+            <div class="middle">
+              <div class="text"> Catalyst </div>
+            </div>
+          </div>
+        </li>
+        <li>
+          <div class="container">
+          <img src="https://images.squarespace-cdn.com/content/v1/5709040420c647579532dbb4/1594914119071-OWI9G22S295OCMSWL0VL/_K5L1162.jpg?format=2500w" alt="c4di" Class="image"  >
+          <h2> C4DI </h2>
+          <p>"brief description"</p>
+          <div class= star>
+          <span class="fa fa-star fa-3x checked" ></span>
+    <span class="fa fa-star fa-3x checked"></span>
+    <span class="fa fa-star fa-3x checked"></span>
+    <span class="fa fa-star fa-3x" ></span>
+    <span class="fa fa-star fa-3x" ></span>
+    </div>
+          <div class="middle">
+              <div class="text"> C4DI </div>
+            </div>
+          </div>
+        </li>
+
+        <li>
+          <div class="container">
+          <img src="https://dogpatchlabs.wpenginepowered.com/wp-content/uploads/2022/09/ian_browne.jpg" alt="dogpatch" class="image" >
+          <h2> Dogpatch </h2>
+          <p>"brief description"</p>
+          <div class= star>
+          <span class="fa fa-star fa-3x checked" ></span>
+    <span class="fa fa-star fa-3x checked"></span>
+    <span class="fa fa-star fa-3x checked"></span>
+    <span class="fa fa-star fa-3x" ></span>
+    <span class="fa fa-star fa-3x" ></span>
+    </div>
+          <div class="middle">
+              <div class="text"> Dogpatch </div>
+            </div>
+          </div>
+        </li>
+
+          <li>
+            <div class="container">
+            <img src="https://stationf.co/img/misc/create-zone.jpg" alt="station-F" class="image"  >
+            <h2>Station F </h2>
+            <p>"brief description"</p>
+            <div class= star>
+            <span class="fa fa-star fa-3x checked" ></span>
+      <span class="fa fa-star fa-3x checked"></span>
+      <span class="fa fa-star fa-3x checked"></span>
+      <span class="fa fa-star fa-3x" ></span>
+      <span class="fa fa-star fa-3x" ></span>
+      </div>
+            <div class="middle">
+                <div class="text"> Station F </div>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </div>
+    </section>
+    <footer>
+    </footer>
+  <script src="JS/locations.js"> </script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>
+
+  </body>