Merge pull request 'release v2.0.0' (!4) from develop into master

Reviewed-on: Flaschengeist/flaschengeist-frontend#4

.npmignore

@@ -0,0 +1,3 @@
+yarn-error.log
+.woodpecker/
+

.woodpecker/deploy.yml

@@ -0,0 +1,15 @@
+pipeline:
+  deploy:
+    when:
+      event: tag
+      tag: "@flaschengeist/api-v*"
+    image: node:lts-alpine
+    commands:
+      - cd api
+      - echo "//registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN" > .npmrc
+      - yarn publish --non-interactive
+    secrets: [ node_auth_token ]
+
+depends_on:
+  - lint
+

.woodpecker/lint.yml

@@ -0,0 +1,9 @@
+pipeline:
+  lint:
+    when:
+      branch: [main, develop]
+    image: node:lts-alpine
+    commands:
+      - yarn install
+      - yarn lint
+

README.md

@@ -1,4 +1,6 @@
 # Flaschengeist (frontend)
+![status-badge](https://ci.os-sc.org/api/badges/Flaschengeist/flaschengeist-frontend/status.svg)
+
 
 Modular student club administration system, licensed under the MIT license.
 

api/components/UserAvatar.vue

@@ -1,6 +1,6 @@
 <template>
   <q-avatar>
-    <slot :avatarURL="avatarURL(modelValue)">
+    <slot :avatar-u-r-l="avatarURL(modelValue)">
       <q-img :src="avatarURL(modelValue)" style="min-width: 100%; min-height: 100%">
         <template #error>
           <img :src="fallback" style="height: 100%" />

api/package.json

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

api/src/stores/main.ts

@@ -4,7 +4,7 @@ import { AxiosResponse } from 'axios';
 import { api } from '../internal';
 import { defineStore } from 'pinia';
 import { PersistentStorage } from '../utils/persistent';
-
+import { LocalStorage, SessionStorage } from 'quasar';
 function reviveSession() {
   return PersistentStorage.get<FG.Session>('fg_session').then((s) => fixSession(s || undefined));
 }
@@ -154,6 +154,8 @@ export const useMainStore = defineStore({
     handleLoggedOut() {
       this.$reset();
       void clearPersistant();
+      LocalStorage.clear();
+      SessionStorage.clear();
     },
   },
 });

api/src/utils/persistent.ts

@@ -1,35 +1,35 @@
 import { LocalStorage, Platform } from 'quasar';
-import { Storage } from '@capacitor/storage';
+import { Preferences } from '@capacitor/preferences';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type PersitentTypes = Date | RegExp | number | boolean | string | object;
 
 export class PersistentStorage {
   static clear() {
-    if (Platform.is.capacitor) return Storage.clear();
+    if (Platform.is.capacitor) return Preferences.clear();
     else return Promise.resolve(LocalStorage.clear());
   }
 
   static remove(key: string) {
-    if (Platform.is.capacitor) return Storage.remove({ key: key });
+    if (Platform.is.capacitor) return Preferences.remove({ key: key });
     else return Promise.resolve(LocalStorage.remove(key));
   }
 
   static set(key: string, value: PersitentTypes) {
-    if (Platform.is.capacitor) return Storage.set({ key, value: JSON.stringify(value) });
+    if (Platform.is.capacitor) return Preferences.set({ key, value: JSON.stringify(value) });
     else return Promise.resolve(LocalStorage.set(key, value));
   }
 
   static get<T extends PersitentTypes>(key: string) {
     if (Platform.is.capacitor)
-      return Storage.get({ key }).then((v) =>
+      return Preferences.get({ key }).then((v) =>
         v.value === null ? null : (JSON.parse(v.value) as T)
       );
     else return Promise.resolve(LocalStorage.getItem<T>(key));
   }
 
   static keys() {
-    if (Platform.is.capacitor) return Storage.keys().then((v) => v.keys);
+    if (Platform.is.capacitor) return Preferences.keys().then((v) => v.keys);
     else return Promise.resolve(LocalStorage.getAllKeys());
   }
 }

api/tsconfig.json

@@ -3,14 +3,7 @@
   "target": "esnext",
   "compilerOptions": {
     "baseUrl": "./",
-    "lib": [
+    "lib": ["es2020", "dom"],
-      "es2020",
+    "types": ["@flaschengeist/types", "@quasar/app", "node"]
-      "dom"
+  }
-    ],
-    "types": [
-      "@flaschengeist/types",
-      "@quasar/app",
-      "node"
-    ]
- }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "license": "MIT",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0",
   "productName": "flaschengeist-frontend",
   "name": "flaschengeist",
   "author": "Tim Gröger <flaschengeist@wu5.de>",
@@ -15,31 +15,37 @@
     "lint": "eslint --ext .js,.ts,.vue ./src ./api"
   },
   "dependencies": {
-    "@flaschengeist/api": "file:./api",
+    "@flaschengeist/api": "^1.0.0",
-    "@flaschengeist/users": "^1.0.0-alpha.3",
+    "@flaschengeist/balance": "^1.0.0",
-    "axios": "^0.24.0",
+    "@flaschengeist/pricelist-old": "^1.0.0",
-    "pinia": "^2.0.6",
+    "@flaschengeist/schedule": "^1.0.0",
-    "quasar": "^2.3.3"
+    "@flaschengeist/users": "^1.0.0",
+    "axios": "^1.4.0",
+    "pinia": "^2.0.8",
+    "quasar": "^2.11.10",
+    "vue": "^3.0.0",
+    "vue-router": "^4.0.0"
   },
   "devDependencies": {
-    "@capacitor/core": "^3.3.2",
+    "@capacitor/core": "^5.0.0",
-    "@capacitor/storage": "^1.2.3",
+    "@capacitor/preferences": "^5.0.0",
-    "@flaschengeist/types": "^1.0.0-alpha.10",
+    "@flaschengeist/types": "^1.0.0",
-    "@quasar/app": "^3.2.4",
+    "@quasar/app-webpack": "^3.7.2",
-    "@quasar/extras": "^1.12.2",
+    "@quasar/extras": "^1.16.3",
     "@types/node": "^14.18.0",
     "@types/webpack": "^5.28.0",
     "@types/webpack-env": "^1.16.3",
-    "@typescript-eslint/eslint-plugin": "^5.5.0",
+    "@typescript-eslint/eslint-plugin": "^5.8.0",
-    "@typescript-eslint/parser": "^5.5.0",
+    "@typescript-eslint/parser": "^5.8.0",
-    "eslint": "^8.4.0",
+    "@vue/devtools": "^6.5.0",
+    "eslint": "^8.5.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "^8.1.1",
+    "eslint-plugin-vue": "^9.14.1",
-    "eslint-webpack-plugin": "^3.1.1",
+    "eslint-webpack-plugin": "^4.0.1",
-    "modify-source-webpack-plugin": "^3.0.0",
+    "modify-source-webpack-plugin": "^4.1.0",
     "prettier": "^2.5.1",
-    "typescript": "^4.5.2",
+    "typescript": "^4.5.4",
     "vuedraggable": "^4.1.0"
   },
   "prettier": {

quasar.conf.js

@@ -9,10 +9,18 @@
 /* eslint-env node */
 /* eslint-disable @typescript-eslint/no-var-requires */
 const ESLintPlugin = require('eslint-webpack-plugin');
-const { ModifySourcePlugin } = require('modify-source-webpack-plugin');
+const { ModifySourcePlugin, ReplaceOperation } = require('modify-source-webpack-plugin');
 const { configure } = require('quasar/wrappers');
 
-module.exports = configure(function (/* ctx */) {
+const operation = () => {
+  const custom_plgns = require('./plugin.config.js');
+  const required_plgns = require('./src/vendor-plugin.config.js');
+  const plugins = [...custom_plgns, ...required_plgns].map((v) => `import("${v}").catch(() => "${v}")`);
+  const replace = new ReplaceOperation('all', `\\/\\* *INSERT_PLUGIN_LIST *\\*\\/`, `${plugins.join(', ')}`);
+  return replace;
+};
+
+module.exports = configure(function(/* ctx */) {
   return {
     // https://quasar.dev/quasar-cli/supporting-ts
     supportTS: {
@@ -81,16 +89,7 @@ module.exports = configure(function (/* ctx */) {
             rules: [
               {
                 test: /plugins\.ts$/,
-                modify: (src, filename) => {
+                operations: [operation()],
-                  const custom_plgns = require('./plugin.config.js');
-                  const required_plgns = require('./src/vendor-plugin.config.js');
-                  return src.replace(
-                    /\/\* *INSERT_PLUGIN_LIST *\*\//,
-                    [...custom_plgns, ...required_plgns]
-                      .map((v) => `import("${v}").catch(() => "${v}")`)
-                      .join(',')
-                  );
-                },
               },
             ],
           },

src-capacitor/capacitor.config.json

@@ -4,6 +4,9 @@
   "bundledWebRuntime": false,
   "npmClient": "yarn",
   "webDir": "www",
+  "android": {
+    "minWebViewVersion": 71
+  },
   "ios": {
     "allowsLinkPreview": false
   }

src-capacitor/index.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Quasar</title>
+
+    <meta charset="utf-8">
+    <meta name="description" content="Quasar Capacitor App">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="msapplication-tap-highlight" content="no">
+    <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, viewport-fit=cover">
+
+    <style>
+      .page {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        height: 100vh;
+        text-align: center;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div class="page">
+      <div>
+        This file will be auto-generated. Do not edit.
+      </div>
+
+      <div>
+        Run "quasar dev" or "quasar build" with Capacitor mode.
+      </div>
+    </div>
+  </body>
+</html>

src-capacitor/package.json

@@ -1,16 +1,16 @@
 {
   "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,
   "dependencies": {
-    "@capacitor/android": "^3.3.2",
+    "@capacitor/android": "^5.0.0-beta.0",
-    "@capacitor/app": "^1.0.0",
+    "@capacitor/app": "^5.0.0",
-    "@capacitor/cli": "^3.0.0",
+    "@capacitor/cli": "^5.0.0",
-    "@capacitor/core": "^3.0.0",
+    "@capacitor/core": "^5.0.0",
-    "@capacitor/ios": "^3.0.0-beta.0",
+    "@capacitor/ios": "^5.0.0",
-    "@capacitor/splash-screen": "^1.0.0",
+    "@capacitor/preferences": "^5.0.0",
-    "@capacitor/storage": "^1.2.3"
+    "@capacitor/splash-screen": "^5.0.0"
   }
-}
+}

src/boot/init.ts

@@ -21,8 +21,8 @@ async function loadBaseUrl() {
     console.warn('Could not load BaseURL', e);
   }
 }
-
+// eslint-disable-next-line
-class BackendError extends Error {}
+class BackendError extends Error { }
 
 /**
  * Loading backend information
@@ -68,8 +68,18 @@ export default boot(async ({ app, router }) => {
     // Handle errors from loading the backend information
     if (error instanceof BackendError || isAxiosError(error)) {
       router.isReady().finally(() => {
-        if (Platform.is.capacitor) void router.push({ name: 'setup_backend' });
+        // if (Platform.is.capacitor) void router.push({ name: 'setup_backend' });
-        else void router.push({ name: 'offline', params: { refresh: 1 } });
+        if (Platform.is.capacitor) {
+          //void router.push({ name: 'setup_backend' })
+          Notify.create({
+            type: 'negative',
+            message:
+              'Backend nicht erreichbar! Prüfe deine Internetverbindung oder probiere es später nochmal.',
+            timeout: 0,
+            icon: 'mdi-alert-circle-outline',
+            closeBtn: true,
+          });
+        } else void router.push({ name: 'offline', params: { refresh: 1 } });
       });
     } else if (typeof error === 'string') {
       // Handle plugin not found errors

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
+      <q-scroll-area class="fit">
-        v-for="(entry, index) in mainLinks"
+        <essential-expansion-link
-        :key="'plugin' + index"
+          v-for="(entry, index) in mainLinks"
-        :entry="entry"
+          :key="'plugin' + index"
-        @add-short-cut="addShortcut"
+          :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-separator />
-        <q-item clickable tag="a" target="self" @click="logout">
+        <essential-link
-          <q-item-section avatar>
+          v-for="(entry, index) in essentials"
-            <q-icon name="mdi-exit-to-app" />
+          :key="'essential' + index"
-          </q-item-section>
+          :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-section>
-            <q-item-label>Logout</q-item-label>
+              <q-item-label>Logout</q-item-label>
-          </q-item-section>
+            </q-item-section>
-        </q-item>
+          </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,

src/pages/Dashboard.vue

@@ -2,9 +2,9 @@
   <q-page
     padding
     style="grid-auto-rows: 1fr"
-    class="fit row justify-around items-start q-col-gutter-sm"
+    class="row justify-center content-center items-center q-col-gutter-lg"
   >
-    <div v-for="(item, index) in widgets" :key="index" class="col-4 full-height col-sm-6 col-xs-12">
+    <div v-for="(item, index) in widgets" :key="index" class="full-height col-sm-6 col-xs-12">
       <component :is="item.widget" />
     </div>
   </q-page>

src/pages/Login.vue

@@ -121,11 +121,24 @@ export default defineComponent({
         if (quasar.platform.is.capacitor)
           await sessionStore.updateSession(14 * 24 * 60 * 60, mainStore.currentSession.token);
         // Redirect user to previous page, if any.
-        const redirect =
+        // there are different redirects possible:
-          router.currentRoute.value.redirectedFrom || 'redirect' in router.currentRoute.value.query
+        // 1. when explicitely entered
-            ? { path: router.currentRoute.value.query.redirect as string }
+        //    a) http://localhost:8080/ -> should be redirected to mainRoute
-            : mainRoute;
+        //    b) http://localhost:8080/in/user/settings -> should be redirected to in/user/settings
-
+        // 2. when automatically logged out:
+        //    http://localhost:8080/login?redirect=/in/user/settings
+        //    -> should be redirected to in/user/settings
+        var redirect;
+        if (router.currentRoute.value.redirectedFrom) {
+          redirect = router.currentRoute.value.redirectedFrom.path;
+          if (redirect === '/') {
+            redirect = mainRoute;
+          }
+        } else if ('redirect' in router.currentRoute.value.query) {
+          redirect = { path: router.currentRoute.value.query.redirect as string };
+        } else {
+          redirect = mainRoute;
+        }
         void router.push(redirect);
       } else {
         // Login failed, notify and reset form

tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@quasar/app/tsconfig-preset",
+  "extends": "@quasar/app-webpack/tsconfig-preset",
   "target": "esnext",
   "compilerOptions": {
     "baseUrl": ".",