update to version to 2.0.0

api/package.json

@@ -1,6 +1,6 @@
 {
   "license": "MIT",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0",
   "name": "@flaschengeist/api",
   "author": "Tim Gröger <flaschengeist@wu5.de>",
   "homepage": "https://flaschengeist.dev/Flaschengeist",
@@ -11,11 +11,11 @@
   "main": "./src/index.ts",
   "peerDependencies": {
     "@quasar/app-webpack": "^3.7.2",
-    "flaschengeist": "^2.0.0-alpha.1",
+    "flaschengeist": "^2.0.0",
     "pinia": "^2.0.8"
   },
   "devDependencies": {
-    "@flaschengeist/types": "^1.0.0-alpha.10",
+    "@flaschengeist/types": "^1.0.0",
     "@types/node": "^14.18.0",
     "typescript": "^4.5.4"
   },

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "license": "MIT",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0",
   "productName": "flaschengeist-frontend",
   "name": "flaschengeist",
   "author": "Tim Gröger <flaschengeist@wu5.de>",
@@ -15,11 +15,11 @@
     "lint": "eslint --ext .js,.ts,.vue ./src ./api"
   },
   "dependencies": {
-    "@flaschengeist/api": "^1.0.0-alpha.8",
-    "@flaschengeist/balance": "^1.0.0-alpha.2",
-    "@flaschengeist/pricelist-old": "^1.0.0-alpha.1",
-    "@flaschengeist/schedule": "^1.0.0-alpha.8",
-    "@flaschengeist/users": "^1.0.0-alpha.4",
+    "@flaschengeist/api": "^1.0.0",
+    "@flaschengeist/balance": "^1.0.0",
+    "@flaschengeist/pricelist-old": "^1.0.0",
+    "@flaschengeist/schedule": "^1.0.0",
+    "@flaschengeist/users": "^1.0.0",
     "axios": "^1.4.0",
     "pinia": "^2.0.8",
     "quasar": "^2.11.10",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@capacitor/core": "^5.0.0",
     "@capacitor/preferences": "^5.0.0",
-    "@flaschengeist/types": "^1.0.0-alpha.10",
+    "@flaschengeist/types": "^1.0.0",
     "@quasar/app-webpack": "^3.7.2",
     "@quasar/extras": "^1.16.3",
     "@types/node": "^14.18.0",

src-capacitor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flaschengeist",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0",
   "description": "Modular student club administration system",
   "author": "Tim Gröger <flaschengeist@wu5.de>",
   "private": true,

src/components/Notification.vue

@@ -14,7 +14,7 @@
       class="q-ma-xs"
       title="Löschen"
       style="position: absolute; top: 0; right: 0; z-index: 999"
-      @click="dismiss"
+      @click.stop.prevent="dismiss"
     />
     <q-card-section class="q-pa-xs">
       <div class="text-overline">{{ dateString }}</div>
@@ -34,7 +34,7 @@
         flat
         dense
         size="sm"
-        @click="accept"
+        @click.stop.prevent="accept"
       />
       <q-btn
         v-if="modelValue.reject"
@@ -44,7 +44,7 @@
         flat
         dense
         size="sm"
-        @click="reject"
+        @click.stop.prevent="reject"
       />
     </q-card-actions>
   </q-card>

src/layouts/MainLayout.vue

@@ -2,7 +2,7 @@
   <q-layout view="hHh Lpr lff">
     <q-header elevated class="bg-primary text-white">
       <q-toolbar>
-        <q-btn dense flat round icon="mdi-menu" @click="openMenu" />
+        <q-btn dense flat round icon="mdi-menu" @click="openMenu(true)" />
 
         <q-toolbar-title>
           <router-link :to="{ name: 'dashboard' }" style="text-decoration: none; color: inherit">
@@ -56,32 +56,44 @@
       side="left"
       bordered
       :mini="leftDrawerMini"
-      @click.capture="openMenu"
+      @click.capture="openMenuMini"
     >
       <!-- Plugins -->
-      <essential-expansion-link
-        v-for="(entry, index) in mainLinks"
-        :key="'plugin' + index"
-        :entry="entry"
-        @add-short-cut="addShortcut"
-      />
-      <q-separator />
-      <essential-link
-        v-for="(entry, index) in essentials"
-        :key="'essential' + index"
-        :entry="entry"
-      />
-      <div v-if="platform.is.capacitor">
+      <q-scroll-area class="fit">
+        <essential-expansion-link
+          v-for="(entry, index) in mainLinks"
+          :key="'plugin' + index"
+          :entry="entry"
+          @add-short-cut="addShortcut"
+        />
         <q-separator />
-        <q-item clickable tag="a" target="self" @click="logout">
-          <q-item-section avatar>
-            <q-icon name="mdi-exit-to-app" />
-          </q-item-section>
+        <essential-link
+          v-for="(entry, index) in essentials"
+          :key="'essential' + index"
+          :entry="entry"
+        />
+        <div v-if="platform.is.capacitor">
+          <q-separator />
+          <q-item clickable tag="a" target="self" @click="logout">
+            <q-item-section avatar>
+              <q-icon name="mdi-exit-to-app" />
+            </q-item-section>
 
-          <q-item-section>
-            <q-item-label>Logout</q-item-label>
-          </q-item-section>
-        </q-item>
+            <q-item-section>
+              <q-item-label>Logout</q-item-label>
+            </q-item-section>
+          </q-item>
+        </div>
+      </q-scroll-area>
+      <div class="q-mini-drawer-hide absolute" style="top: 15px; right: -17px">
+        <q-btn
+          dense
+          round
+          unelevated
+          color="accent"
+          icon="mdi-chevron-left"
+          @click="openMenuMini(true)"
+        />
       </div>
     </q-drawer>
     <q-page-container>
@@ -125,7 +137,7 @@ export default defineComponent({
     const mainStore = useMainStore();
     const flaschengeist = inject<FG_Plugin.Flaschengeist>('flaschengeist');
     const leftDrawer = ref(!Platform.is.mobile);
-    const leftDrawerMini = ref(false);
+    const leftDrawerMini = ref(true);
     const mainLinks = flaschengeist?.menuLinks || [];
     const notifications = computed(() => mainStore.notifications.slice().reverse());
     const polling = ref(NaN);
@@ -138,9 +150,11 @@ export default defineComponent({
       void mainStore.getShortcuts();
     });
     onBeforeUnmount(() => window.clearInterval(polling.value));
-
+    /*
     function openMenu(event: { target: HTMLInputElement }) {
-      if (event.target.nodeName === 'DIV') leftDrawerMini.value = false;
+      console.log(event.target.nodeName);
+      if (event.target.nodeName === 'DIV' || event.target.nodeName === 'I')
+        leftDrawerMini.value = false;
       else {
         if (!leftDrawer.value || leftDrawerMini.value) {
           leftDrawer.value = true;
@@ -151,7 +165,13 @@ export default defineComponent({
         }
       }
     }
-
+*/
+    function openMenu(value = !leftDrawer.value) {
+      leftDrawer.value = value;
+    }
+    function openMenuMini(value = !leftDrawerMini.value) {
+      leftDrawerMini.value = value;
+    }
     function logout() {
       void router.push({ name: 'login', params: { logout: 'logout' } });
       void mainStore.logout();
@@ -214,6 +234,7 @@ export default defineComponent({
       notifications,
       noPermission,
       openMenu,
+      openMenuMini,
       remove,
       requestPermission,
       useNative,