From eabc5207620062e55c683530da7026fa70d74147 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <rpm@fthiessen.de>
Date: Tue, 24 Nov 2020 18:42:43 +0100
Subject: [PATCH] Move non-component helper files to utils

---
 .prettierrc                                   |  3 ++-
 .prettierrc.js                                |  3 ++-
 src/components/navigation/EssentialLink.vue   |  2 +-
 src/components/navigation/ShortCutLink.vue    |  2 +-
 src/layouts/MainLayout.vue                    | 27 ++++---------------
 src/pages/Dashboard.vue                       |  2 +-
 .../components/settings/MainUserSettings.vue  |  2 +-
 src/plugins/user/pages/AdminSettings.vue      |  2 +-
 src/plugins/user/pages/Settings.vue           | 20 ++++----------
 src/{components => utils}/loading.ts          |  0
 src/{components => utils}/permission.ts       |  0
 11 files changed, 19 insertions(+), 44 deletions(-)
 rename src/{components => utils}/loading.ts (100%)
 rename src/{components => utils}/permission.ts (100%)

diff --git a/.prettierrc b/.prettierrc
index 650cb88..93b86b7 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,4 +1,5 @@
 {
   "singleQuote": true,
-  "semi": true
+  "semi": true,
+  "printWidth": 100
 }
diff --git a/.prettierrc.js b/.prettierrc.js
index 6013476..06acdd3 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,4 +1,5 @@
 module.exports = {
   singleQuote: true,
-  semi: true
+  semi: true,
+  printWidth: 100
 };
diff --git a/src/components/navigation/EssentialLink.vue b/src/components/navigation/EssentialLink.vue
index 205d384..ddc7434 100644
--- a/src/components/navigation/EssentialLink.vue
+++ b/src/components/navigation/EssentialLink.vue
@@ -15,7 +15,7 @@
 
 <script lang="ts">
 import { computed, defineComponent } from '@vue/composition-api';
-import { hasPermissions } from 'src/components/permission';
+import { hasPermissions } from 'src/utils/permission';
 
 export default defineComponent({
   name: 'EssentialLink',
diff --git a/src/components/navigation/ShortCutLink.vue b/src/components/navigation/ShortCutLink.vue
index bce332b..e06d77d 100644
--- a/src/components/navigation/ShortCutLink.vue
+++ b/src/components/navigation/ShortCutLink.vue
@@ -4,7 +4,7 @@
 
 <script lang="ts">
 import { computed, defineComponent } from '@vue/composition-api';
-import { hasPermissions } from 'src/components/permission';
+import { hasPermissions } from 'src/utils/permission';
 
 export default defineComponent({
   name: 'ShortCutLink',
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index e155437..3a79cfa 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -1,9 +1,6 @@
 <template>
   <q-layout view="hHh lpr lFf">
-    <q-header
-      elevated
-      class="bg-primary text-white"
-    >
+    <q-header elevated class="bg-primary text-white">
       <q-toolbar>
         <!-- Button um Navigationsleiset ein und auszublenden. Nötig bei Desktop? -->
         <q-btn
@@ -16,16 +13,11 @@
         />
 
         <q-toolbar-title>
-          <router-link
-            :to="{ name: 'dashboard' }"
-            style="text-decoration: none; color: inherit;"
-          >
+          <router-link :to="{ name: 'dashboard' }" style="text-decoration: none; color: inherit">
             <q-avatar>
               <img src="logo.svg" />
             </q-avatar>
-            <span class="gt-xs">
-              Flaschengeist
-            </span>
+            <span class="gt-xs"> Flaschengeist </span>
           </router-link>
         </q-toolbar-title>
 
@@ -39,13 +31,7 @@
             :permissions="shortcut.permissions"
           />
         </div>
-        <q-btn
-          flat
-          round
-          dense
-          icon="mdi-exit-to-app"
-          @click="logout()"
-        />
+        <q-btn flat round dense icon="mdi-exit-to-app" @click="logout()" />
       </q-toolbar>
     </q-header>
 
@@ -83,10 +69,7 @@
         />
       </q-list>
 
-      <div
-        class="q-mini-drawer-hide absolute"
-        style="top: 15px; right: -11px"
-      >
+      <div class="q-mini-drawer-hide absolute" style="top: 15px; right: -11px">
         <q-btn
           size="sm"
           dense
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index 0b27bbe..65ddc78 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -16,7 +16,7 @@
 
 <script lang="ts">
 import { defineComponent, onMounted, ref } from '@vue/composition-api';
-import { hasPermissions } from 'src/components/permission';
+import { hasPermissions } from 'src/utils/permission';
 import { AsyncComponentPromise } from 'vue/types/options';
 
 export default defineComponent({
diff --git a/src/plugins/user/components/settings/MainUserSettings.vue b/src/plugins/user/components/settings/MainUserSettings.vue
index 373243f..4dbd8b6 100644
--- a/src/plugins/user/components/settings/MainUserSettings.vue
+++ b/src/plugins/user/components/settings/MainUserSettings.vue
@@ -118,7 +118,7 @@ import {
 } from '@vue/composition-api';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
-import { hasPermission } from 'src/components/permission';
+import { hasPermission } from 'src/utils/permission';
 import IsoDateInput from 'src/components/utils/IsoDateInput.vue';
 import { Notify } from 'quasar';
 
diff --git a/src/plugins/user/pages/AdminSettings.vue b/src/plugins/user/pages/AdminSettings.vue
index e064415..9780df5 100644
--- a/src/plugins/user/pages/AdminSettings.vue
+++ b/src/plugins/user/pages/AdminSettings.vue
@@ -71,7 +71,7 @@ import UpdateUser from '../components/UpdateUser.vue';
 import NewUser from '../components/NewUser.vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
-import { hasPermission } from 'src/components/permission';
+import { hasPermission } from 'src/utils/permission';
 import { PERMISSIONS } from '../permissions';
 import { Screen } from 'quasar';
 
diff --git a/src/plugins/user/pages/Settings.vue b/src/plugins/user/pages/Settings.vue
index accd224..392273a 100644
--- a/src/plugins/user/pages/Settings.vue
+++ b/src/plugins/user/pages/Settings.vue
@@ -1,23 +1,14 @@
 <template>
   <div>
-    <q-page
-      padding
-      class="fit row justify-center content-center items-center q-gutter-sm"
-    >
+    <q-page padding class="fit row justify-center content-center items-center q-gutter-sm">
       <q-card class="col-12">
-        <q-card-section
-          class="fit row justify-start content-center items-center"
-        >
+        <q-card-section class="fit row justify-start content-center items-center">
           <div class="col-12 text-center text-h6">Benutzereinstellungen</div>
         </q-card-section>
         <MainUserSettings :user="currentUser" @update:user="updateUser" />
       </q-card>
       <div class="col-12 text-left text-h6">Aktive Sessions:</div>
-      <sessions
-        v-for="(session, index) in sessions"
-        :key="'session' + index"
-        :session="session"
-      />
+      <sessions v-for="(session, index) in sessions" :key="'session' + index" :session="session" />
     </q-page>
   </div>
 </template>
@@ -29,16 +20,15 @@ import {
   onBeforeMount,
   ref
 } from '@vue/composition-api';
-import CircularProgress from 'components/loading/CircularProgress.vue';
 import Sessions from '../components/settings/Sessions.vue';
 import MainUserSettings from '../components/settings/MainUserSettings.vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
-import setLoadingBar from 'components/loading';
+import setLoadingBar from 'src/utils/loading';
 
 export default defineComponent({
   // name: 'PageName'
-  components: { CircularProgress, Sessions, MainUserSettings },
+  components: { Sessions, MainUserSettings },
   setup(_, { root }) {
     const store = <Store<StateInterface>>root.$store;
 
diff --git a/src/components/loading.ts b/src/utils/loading.ts
similarity index 100%
rename from src/components/loading.ts
rename to src/utils/loading.ts
diff --git a/src/components/permission.ts b/src/utils/permission.ts
similarity index 100%
rename from src/components/permission.ts
rename to src/utils/permission.ts