Merge remote-tracking branch 'origin/development' into development

README.md

@@ -30,6 +30,8 @@ You can run this service individually by executing `docker-compose up database`.
 
 This is the system's API. The current version is v1 and documentation can be found in the `server/v1` directory. 
 
+You can look at the API documentation [here](https://github.com/Mooney91/vteam6-HT23/blob/main/server/v1/API.md).
+
 You can run this service individually by executing `docker-compose up database server`. The database for the server/API to function.
 
 ## admin-interface (Administrative Interface)

admin-interface/src/App.vue

@@ -9,35 +9,32 @@ import NavigationItem from './components/NavigationItem.vue'
  * @component
  */
 export default {
-    name: 'App',
-    components: {
-        TitleItem,
-        NavigationItem,
-        RouterView
-    },
-    /* Data function that returns the backend.
-     * @function
-     * @returns {Object} The initial data object.
-     */
-    data()  {
-        return {
-            backend: "http://localhost:1337"
-        }
+  name: 'App',
+  components: {
+    TitleItem,
+    NavigationItem,
+    RouterView
+  },
+  /* Data function that returns the backend.
+   * @function
+   * @returns {Object} The initial data object.
+   */
+  data() {
+    return {
+      backend: 'http://localhost:1337'
     }
+  }
 }
-
 </script>
 
 <template>
-    <div class="main">
-        <TitleItem />
-        <NavigationItem />
-        <div class = "content">
-            <RouterView :backend="backend" :key="componentKey"/>
-        </div>
+  <div class="main">
+    <TitleItem />
+    <NavigationItem />
+    <div class="content">
+      <RouterView :backend="backend" :key="componentKey" />
     </div>
+  </div>
 </template>
 
-<style scoped>
-
-</style>
+<style scoped></style>

admin-interface/src/assets/button.css

@@ -0,0 +1,32 @@
+.city-button {
+  border-color: #000000;
+  border-width: 2px;
+  margin: 5px;
+  background-color: #f1f1f1;
+}
+
+.title-page-button {
+  border-color: #000000;
+  border-width: 2px;
+  margin: 5px;
+  background-color: #f1f1f1;
+  height: 100px;
+  width: 100px;
+}
+
+.title-page-button {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr 1fr;
+  grid-gap: 5px;
+}
+
+.title-page-button div {
+  border-color: #000000;
+  border-width: 1px;
+  border-style: solid;
+  margin: 5px;
+  background-color: #f1f1f1;
+  height: 100px;
+  width: 100px;
+  aspect-ratio: 1;
+}

admin-interface/src/assets/form.css

@@ -1,21 +1,21 @@
 .form {
-    display: block;
+  display: block;
 }
 
 .add-form {
-    height: 100%;
-    padding: 10px;
-    margin: 5px;
-    background-color: #90ee90;
-    border-radius: 25px;
-    display: block
+  height: 100%;
+  padding: 10px;
+  margin: 5px;
+  background-color: #90ee90;
+  border-radius: 25px;
+  display: block;
 }
 
 .edit-form {
-    height: 100%;
-    padding: 10px;
-    margin: 5px;
-    background-color: #ffa07a;
-    border-radius: 25px;
-    display: block
-}
+  height: 100%;
+  padding: 10px;
+  margin: 5px;
+  background-color: #ffa07a;
+  border-radius: 25px;
+  display: block;
+}

admin-interface/src/assets/header.css

@@ -1,33 +1,29 @@
 .header {
-    position: sticky; 
-    top: 0;
-    height: 50px;
-    grid-area: header;
-    background-color: #333;
-    color: #fff;
-    padding: 10px;
-    vertical-align: middle;
-    z-index: 100;
-    display: flex;
-    align-items: center;
+  position: sticky;
+  top: 0;
+  height: 50px;
+  grid-area: header;
+  background-color: #333;
+  color: #fff;
+  padding: 10px;
+  vertical-align: middle;
+  z-index: 100;
+  display: flex;
+  align-items: center;
 }
 
-/* .title {
-    grid-area: header;
-} */
-
 .login-button {
-    grid-area: login;
-    vertical-align: middle;
-    float: right;
-    color: #000000;
-    padding: 16px;
-    text-decoration: none;
-    background-color:#f1f1f1;
-    margin-left: auto;
+  grid-area: login;
+  vertical-align: middle;
+  float: right;
+  color: #000000;
+  padding: 16px;
+  text-decoration: none;
+  background-color: #f1f1f1;
+  margin-left: auto;
 }
 
 .login-button:hover {
-    background-color: #555;
-    color: white;
-  }
+  background-color: #555;
+  color: white;
+}

admin-interface/src/assets/image.css

@@ -1,47 +1,53 @@
 .add {
-    vertical-align: middle;
-    padding-right: 5px;
-    filter: invert(25%) sepia(68%) saturate(6837%) hue-rotate(116deg) brightness(94%) contrast(103%);
+  vertical-align: middle;
+  padding-right: 5px;
+  filter: invert(25%) sepia(68%) saturate(6837%) hue-rotate(116deg) brightness(94%) contrast(103%);
 }
 
 .edit {
-    filter: invert(62%) sepia(100%) saturate(1821%) hue-rotate(1deg) brightness(104%) contrast(103%);
+  filter: invert(62%) sepia(100%) saturate(1821%) hue-rotate(1deg) brightness(104%) contrast(103%);
 }
 
 .delete {
-    filter: invert(11%) sepia(98%) saturate(6844%) hue-rotate(7deg) brightness(109%) contrast(116%);
+  filter: invert(11%) sepia(98%) saturate(6844%) hue-rotate(7deg) brightness(109%) contrast(116%);
 }
 
 .charging {
-    filter: invert(60%) sepia(40%) saturate(1687%) hue-rotate(2deg) brightness(106%) contrast(104%);
-    height: 25px;
-    width: 25px;
+  filter: invert(60%) sepia(40%) saturate(1687%) hue-rotate(2deg) brightness(106%) contrast(104%);
+  height: 25px;
+  width: 25px;
 }
 
 .parking {
-    filter: invert(20%) sepia(91%) saturate(1754%) hue-rotate(180deg) brightness(95%) contrast(101%);
-    height: 25px;
-    width: 25px;
+  filter: invert(20%) sepia(91%) saturate(1754%) hue-rotate(180deg) brightness(95%) contrast(101%);
+  height: 25px;
+  width: 25px;
 }
 
 .scooter {
-    filter: invert(4%) sepia(97%) saturate(6587%) hue-rotate(341deg) brightness(112%) contrast(101%);
-    height: 25px;
-    width: 25px;
+  filter: invert(4%) sepia(97%) saturate(6587%) hue-rotate(341deg) brightness(112%) contrast(101%);
+  height: 25px;
+  width: 25px;
 }
 
 .custom-icon {
-    background: none;
-    border: none;
+  background: none;
+  border: none;
 }
 
 .map-icon {
-    filter: invert(0%) sepia(91%) saturate(7463%) hue-rotate(105deg) brightness(113%) contrast(108%);
-    height: 125px;
-    width: auto;
-    text-align: center;
+  filter: invert(0%) sepia(91%) saturate(7463%) hue-rotate(105deg) brightness(113%) contrast(108%);
+  height: 125px;
+  width: auto;
+  text-align: center;
 }
 
 .map-icon:hover {
-    filter: invert(100%) sepia(0%) saturate(31%) hue-rotate(156deg) brightness(107%) contrast(108%);
-}
+  filter: invert(100%) sepia(0%) saturate(31%) hue-rotate(156deg) brightness(107%) contrast(108%);
+}
+
+.home-images {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}