From 1f8e8069cb4e00be0f85ea25e420686c2b2798a4 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Wed, 22 Jul 2020 00:36:29 +0200
Subject: [PATCH] Rename baseUri to BASE_URI, some smaller adjustments

---
 frontend/src/App.vue                          | 10 ++---
 frontend/src/globals.js                       |  1 +
 frontend/src/variables.js                     |  1 -
 frontend/src/views/About.vue                  |  2 +-
 frontend/src/views/CreateTimeTrackAccount.vue |  4 +-
 frontend/src/views/CreateTimerecord.vue       |  8 ++--
 frontend/src/views/EditUser.vue               |  4 +-
 frontend/src/views/Home.vue                   |  8 ++--
 frontend/src/views/SignIn.vue                 |  9 +----
 frontend/src/views/StatisticOverview.vue      | 40 +++++++++++--------
 frontend/src/views/TimeRecordItem.vue         |  7 +---
 frontend/src/views/TimeRecords.vue            |  4 +-
 frontend/src/views/TimeTrackAccounts.vue      |  4 +-
 frontend/src/views/Users.vue                  |  4 +-
 frontend/src/views/charts/AccountPie.vue      |  6 +--
 frontend/src/views/charts/MonthSummary.vue    |  4 +-
 frontend/src/views/charts/RevenuePie.vue      |  6 +--
 frontend/src/views/charts/WeekSummary.vue     |  4 +-
 frontend/src/views/charts/WorkPausePie.vue    |  4 +-
 19 files changed, 62 insertions(+), 68 deletions(-)
 create mode 100644 frontend/src/globals.js
 delete mode 100644 frontend/src/variables.js

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 40616cb..f0df9eb 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -138,7 +138,7 @@
 
 <script>
   import SignIn from "./views/SignIn.vue";
-  import {baseUri} from "./variables.js";
+  import {BASE_URI} from "./globals.js";
 
   if (!sessionStorage.getItem("loggedin")) {
     sessionStorage.setItem("loggedin", false);
@@ -175,7 +175,7 @@
           }
         };
 
-        xhttp.open("POST", baseUri + "/login", false);
+        xhttp.open("POST", BASE_URI + "/login", false);
         xhttp.send(
           '{"username": "' +
           loginData.username +
@@ -200,7 +200,7 @@
               location.reload();
             }
           };
-          whoxhttp.open("GET", baseUri + "/whoami", false);
+          whoxhttp.open("GET", BASE_URI + "/whoami", false);
           whoxhttp.setRequestHeader("Authorization", sessionStorage.getItem("jwt"));
           whoxhttp.send(null);
           location.reload();
@@ -216,7 +216,7 @@
             document.getElementById("loginError").innerHTML = "The username already exist";
           }
         };
-        xhttp.open("POST", baseUri + "/sign-up", true);
+        xhttp.open("POST", BASE_URI + "/sign-up", true);
         xhttp.setRequestHeader("Content-Type", "application/json");
         xhttp.send(
           "{" +
@@ -250,7 +250,7 @@
         };
         xhttp.open(
           "GET",
-          baseUri +
+          BASE_URI +
           "/users/search/byUsername?username=" +
           sessionStorage.getItem("username"),
           false
diff --git a/frontend/src/globals.js b/frontend/src/globals.js
new file mode 100644
index 0000000..281ab22
--- /dev/null
+++ b/frontend/src/globals.js
@@ -0,0 +1 @@
+export const BASE_URI = 'http://plesk.icaotix.de:5000'
diff --git a/frontend/src/variables.js b/frontend/src/variables.js
deleted file mode 100644
index 17dc89a..0000000
--- a/frontend/src/variables.js
+++ /dev/null
@@ -1 +0,0 @@
-export const baseUri = 'http://plesk.icaotix.de:5000'
diff --git a/frontend/src/views/About.vue b/frontend/src/views/About.vue
index 6ade561..cb33648 100644
--- a/frontend/src/views/About.vue
+++ b/frontend/src/views/About.vue
@@ -29,7 +29,7 @@
   };
 </script>
 
-<style>
+<style scoped>
   p {
     font-size: 20pt;
   }
diff --git a/frontend/src/views/CreateTimeTrackAccount.vue b/frontend/src/views/CreateTimeTrackAccount.vue
index 4197d02..54df62d 100644
--- a/frontend/src/views/CreateTimeTrackAccount.vue
+++ b/frontend/src/views/CreateTimeTrackAccount.vue
@@ -37,7 +37,7 @@
   </v-container>
 </template>
 <script>
-  import {baseUri} from "../variables";
+  import {BASE_URI} from "../globals";
 
   export default {
     name: "CreateTimeTrackAccount",
@@ -58,7 +58,7 @@
               suc = true;
             }
           };
-          xhttp.open("POST", baseUri + "/accounts", false);
+          xhttp.open("POST", BASE_URI + "/accounts", false);
           xhttp.setRequestHeader("Content-Type", "application/json");
 
           xhttp.setRequestHeader("Authorization", sessionStorage.getItem("jwt"));
diff --git a/frontend/src/views/CreateTimerecord.vue b/frontend/src/views/CreateTimerecord.vue
index 2f473a0..78c02c2 100644
--- a/frontend/src/views/CreateTimerecord.vue
+++ b/frontend/src/views/CreateTimerecord.vue
@@ -142,7 +142,7 @@
   </v-container>
 </template>
 <script>
-  import {baseUri} from "../variables";
+  import {BASE_URI} from "../globals";
 
   export default {
     name: "CreateTimeTrackAccount",
@@ -175,7 +175,7 @@
         };
         accountxhttp.open(
           "GET",
-          baseUri +
+          BASE_URI +
           "/accounts/search/findByUsernameAndName?username=" +
           sessionStorage.getItem("username") +
           "&account=" +
@@ -196,7 +196,7 @@
               suc = true;
             }
           };
-          xhttp.open("POST", baseUri + "/records", false);
+          xhttp.open("POST", BASE_URI + "/records", false);
           xhttp.setRequestHeader("Content-Type", "application/json");
           xhttp.setRequestHeader("Authorization", sessionStorage.getItem("jwt"));
           xhttp.send(
@@ -228,7 +228,7 @@
       };
       accountsxhttp.open(
         "GET",
-        baseUri +
+        BASE_URI +
         "/accounts/search/findByUsername?username=" +
         sessionStorage.getItem("username"),
         false
diff --git a/frontend/src/views/EditUser.vue b/frontend/src/views/EditUser.vue
index 5801fe2..972e176 100644
--- a/frontend/src/views/EditUser.vue
+++ b/frontend/src/views/EditUser.vue
@@ -71,7 +71,7 @@
   </v-container>
 </template>
 <script>
-  import {baseUri} from "../variables";
+  import {BASE_URI} from "../globals";
 
   export default {
     name: "Edituser",
@@ -156,7 +156,7 @@
               document.getElementById("locationnotcomplete").innerHTML = "Only numeric values are allowed";
             }
           };
-          xhttp.open("POST", baseUri + "/locations", false);
+          xhttp.open("POST", BASE_URI + "/locations", false);
           xhttp.setRequestHeader("Content-Type", "application/json");
 
           xhttp.setRequestHeader("Authorization", sessionStorage.getItem("jwt"));
diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index bce02bd..237135a 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -66,7 +66,7 @@
 </template>
 
 <script>
-  import {baseUri} from "../variables.js";
+  import {BASE_URI} from "../globals.js";
 
   export default {
     name: "Home",
@@ -92,7 +92,7 @@
             today = today._embedded.records;
           }
         };
-        xhttp.open("GET", baseUri + "/records/search/today", false);
+        xhttp.open("GET", BASE_URI + "/records/search/today", false);
         xhttp.setRequestHeader("Authorization", sessionStorage.getItem("jwt"));
         xhttp.send(null);
 
@@ -123,7 +123,7 @@
         };
         accountxhttp.open(
           "GET",
-          baseUri +
+          BASE_URI +
           "/accounts/search/findByUsername?username=" +
           sessionStorage.getItem("username"),
           false
@@ -145,7 +145,7 @@
         };
         locationxhttp.open(
           "GET",
-          baseUri + "/users/" + sessionStorage.getItem("userIDOwn") + "/location",
+          BASE_URI + "/users/" + sessionStorage.getItem("userIDOwn") + "/location",
           false
         );
 
diff --git a/frontend/src/views/SignIn.vue b/frontend/src/views/SignIn.vue
index 6d094b8..f7ca91c 100644
--- a/frontend/src/views/SignIn.vue
+++ b/frontend/src/views/SignIn.vue
@@ -44,14 +44,7 @@
                     </div>
 
                     <div class="text-center mt-10">
-                      <v-btn
-                        class="primary--text"
-                        rounded
-                        outlined
-                        dark
-                        @click="step++"
-                      >Create Account
-                      </v-btn>
+                      <v-btn class="primary--text" rounded outlined dark @click="step++">Create Account</v-btn>
                     </div>
                   </v-card-text>
                 </v-col>
diff --git a/frontend/src/views/StatisticOverview.vue b/frontend/src/views/StatisticOverview.vue
index 5946738..08e17f7 100644
--- a/frontend/src/views/StatisticOverview.vue
+++ b/frontend/src/views/StatisticOverview.vue
@@ -1,21 +1,27 @@
 <template>
-  <v-row class="ma-5">
-    <v-col cols="4">
-      <WorkPausePie/>
-    </v-col>
-    <v-col cols="4">
-      <account-pie/>
-    </v-col>
-    <v-col cols="4">
-      <revenue-pie/>
-    </v-col>
-    <v-col cols="12">
-      <MonthSummary/>
-    </v-col>
-    <v-col cols="12">
-      <WeekSummary/>
-    </v-col>
-  </v-row>
+  <div>
+    <v-row class="ma-5">
+      <v-col cols="4">
+        <WorkPausePie/>
+      </v-col>
+      <v-col cols="4">
+        <account-pie/>
+      </v-col>
+      <v-col cols="4">
+        <revenue-pie/>
+      </v-col>
+    </v-row>
+    <v-row class="ma-5">
+      <v-col cols="12">
+        <MonthSummary/>
+      </v-col>
+    </v-row>
+    <v-row class="ma-5">
+      <v-col cols="12">
+        <WeekSummary/>
+      </v-col>
+    </v-row>
+  </div>
 </template>
 
 <script>
diff --git a/frontend/src/views/TimeRecordItem.vue b/frontend/src/views/TimeRecordItem.vue
index 7833fe5..1161122 100644
--- a/frontend/src/views/TimeRecordItem.vue
+++ b/frontend/src/views/TimeRecordItem.vue
@@ -39,12 +39,7 @@
         </v-row>
       </v-list-item-content>
       <v-list-item-action>
-        <v-speed-dial
-          v-model="fab"
-          transition="slide-x-reverse-transition"
-          direction="left"
-          open-on-hover
-        >
+        <v-speed-dial v-model="fab" transition="slide-x-reverse-transition" direction="left" open-on-hover>
           <template v-slot:activator>
             <v-btn v-model="fab" color="background" elevation="0" dark fab>
               <v-icon v-if="fab">mdi-close</v-icon>
diff --git a/frontend/src/views/TimeRecords.vue b/frontend/src/views/TimeRecords.vue
index 7830929..edcaa53 100644
--- a/frontend/src/views/TimeRecords.vue
+++ b/frontend/src/views/TimeRecords.vue
@@ -35,7 +35,7 @@
 
 <script>
   import TimeRecordItem from "./TimeRecordItem.vue";
-  import {baseUri} from "../variables.js";
+  import {BASE_URI} from "../globals.js";
 
   export default {
     name: "TimeRecords",
@@ -111,7 +111,7 @@
       };
       xhttp.open(
         "GET",
-        baseUri +
+        BASE_URI +
         "/records/search/allForUser?username=" +
         sessionStorage.getItem("username") +
         "&sort=startdate,desc&page=" +
diff --git a/frontend/src/views/TimeTrackAccounts.vue b/frontend/src/views/TimeTrackAccounts.vue
index 4606f34..d2a0715 100644
--- a/frontend/src/views/TimeTrackAccounts.vue
+++ b/frontend/src/views/TimeTrackAccounts.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-  import {baseUri} from "../variables.js";
+  import {BASE_URI} from "../globals.js";
   import TimeTrackAccountItem from "./TimeTrackAccountItem.vue";
 
   export default {
@@ -67,7 +67,7 @@
       };
       accountxhttp.open(
         "GET",
-        baseUri +
+        BASE_URI +
         "/accounts/search/findByUsername?username=" +
         sessionStorage.getItem("timeTrackAccountListUser"),
         false
diff --git a/frontend/src/views/Users.vue b/frontend/src/views/Users.vue
index 4ab0457..0b98f34 100644
--- a/frontend/src/views/Users.vue
+++ b/frontend/src/views/Users.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-  import {baseUri} from "../variables.js";
+  import {BASE_URI} from "../globals.js";
   import UsersItems from "./UsersItems.vue";
 
   export default {
@@ -82,7 +82,7 @@
           userLinks = usersInformation._links;
         }
       };
-      xhttp.open("GET", baseUri + "/users?page=" + this.page, false);
+      xhttp.open("GET", BASE_URI + "/users?page=" + this.page, false);
 
       xhttp.setRequestHeader("Authorization", sessionStorage.getItem("jwt"));
 
diff --git a/frontend/src/views/charts/AccountPie.vue b/frontend/src/views/charts/AccountPie.vue
index d26e56a..db6bc7a 100644
--- a/frontend/src/views/charts/AccountPie.vue
+++ b/frontend/src/views/charts/AccountPie.vue
@@ -12,7 +12,7 @@
 
 <script>
   import VueApexCharts from "vue-apexcharts";
-  import {baseUri} from "../../variables.js";
+  import {BASE_URI} from "../../globals.js";
   import {timeFormatter} from "./ApexFormatters";
 
   export default {
@@ -97,7 +97,7 @@
       };
       accountxhttp.open(
         "GET",
-        baseUri +
+        BASE_URI +
         "/accounts/search/findByUsername?username=" +
         sessionStorage.getItem("username"),
         false
@@ -144,7 +144,7 @@
         };
         xhttp.open(
           "GET",
-          baseUri +
+          BASE_URI +
           "/records/search/allForUser?username=" +
           sessionStorage.getItem("username") +
           "&projection=overview" +
diff --git a/frontend/src/views/charts/MonthSummary.vue b/frontend/src/views/charts/MonthSummary.vue
index 41713f8..2e51ad6 100644
--- a/frontend/src/views/charts/MonthSummary.vue
+++ b/frontend/src/views/charts/MonthSummary.vue
@@ -13,7 +13,7 @@
 
 <script>
   import VueApexCharts from "vue-apexcharts";
-  import {baseUri} from "../../variables.js";
+  import {BASE_URI} from "../../globals.js";
   import {timeFormatter} from "./ApexFormatters";
 
   export default {
@@ -147,7 +147,7 @@
 
         xhttp.open(
           "GET",
-          baseUri +
+          BASE_URI +
           "/records/search/allBetweenAndUser?start=" +
           this.chartOptions.xaxis.categories[daysToDisplay - 1] +
           "T00:00:01" +
diff --git a/frontend/src/views/charts/RevenuePie.vue b/frontend/src/views/charts/RevenuePie.vue
index 94a7ffa..7a4d6c9 100644
--- a/frontend/src/views/charts/RevenuePie.vue
+++ b/frontend/src/views/charts/RevenuePie.vue
@@ -12,7 +12,7 @@
 
 <script>
   import VueApexCharts from "vue-apexcharts";
-  import {baseUri} from "../../variables.js";
+  import {BASE_URI} from "../../globals.js";
 
   export default {
     components: {
@@ -89,7 +89,7 @@
       };
       accountxhttp.open(
         "GET",
-        baseUri +
+        BASE_URI +
         "/accounts/search/findByUsername?username=" +
         sessionStorage.getItem("username"),
         false
@@ -136,7 +136,7 @@
         };
         xhttp.open(
           "GET",
-          baseUri +
+          BASE_URI +
           "/records/search/allForUser?username=" +
           sessionStorage.getItem("username") +
           "&projection=overview" +
diff --git a/frontend/src/views/charts/WeekSummary.vue b/frontend/src/views/charts/WeekSummary.vue
index 7e3e263..75a8bac 100644
--- a/frontend/src/views/charts/WeekSummary.vue
+++ b/frontend/src/views/charts/WeekSummary.vue
@@ -13,7 +13,7 @@
 
 <script>
   import VueApexCharts from "vue-apexcharts";
-  import {baseUri} from "../../variables.js";
+  import {BASE_URI} from "../../globals.js";
   import {timeFormatter} from "./ApexFormatters";
 
   export default {
@@ -149,7 +149,7 @@
         };
         xhttp.open(
           "GET",
-          baseUri +
+          BASE_URI +
           "/records/search/allBetweenAndUser?start=" +
           this.chartOptions.xaxis.categories[daysToDisplay - 1] +
           "T00:00:01" +
diff --git a/frontend/src/views/charts/WorkPausePie.vue b/frontend/src/views/charts/WorkPausePie.vue
index 6f421b0..1c377fc 100644
--- a/frontend/src/views/charts/WorkPausePie.vue
+++ b/frontend/src/views/charts/WorkPausePie.vue
@@ -12,7 +12,7 @@
 
 <script>
   import VueApexCharts from "vue-apexcharts";
-  import {baseUri} from "../../variables.js";
+  import {BASE_URI} from "../../globals.js";
   import {timeFormatter} from "./ApexFormatters";
 
   export default {
@@ -96,7 +96,7 @@
         };
         xhttp.open(
           "GET",
-          baseUri +
+          BASE_URI +
           "/records/search/allForUser?username=" +
           sessionStorage.getItem("username") +
           "&page=" +