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

api/index.ts

@@ -5,3 +5,4 @@ export * from './src/stores/';
 export * from './src/utils/datetime';
 export * from './src/utils/permission';
 export * from './src/utils/validators';
+export * from './src/utils/misc';

api/package.json

@@ -1,6 +1,6 @@
 {
   "license": "MIT",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.4",
   "name": "@flaschengeist/api",
   "author": "Tim Gröger <flaschengeist@wu5.de>",
   "homepage": "https://flaschengeist.dev/Flaschengeist",
@@ -14,18 +14,18 @@
   },
   "main": "./src/index.ts",
   "peerDependencies": {
-    "@quasar/app": "^3.2.2",
+    "@quasar/app": "^3.2.3",
     "flaschengeist": "^2.0.0-alpha.1",
-    "pinia": "^2.0.3"
+    "pinia": "^2.0.4"
   },
   "devDependencies": {
     "@flaschengeist/types": "^1.0.0-alpha.5",
     "@types/node": "^12.20.37",
     "@typescript-eslint/eslint-plugin": "^5.4.0",
     "@typescript-eslint/parser": "^5.4.0",
-    "eslint": "^8.2.0",
+    "eslint": "^8.3.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-vue": "^8.0.3",
+    "eslint-plugin-vue": "^8.1.1",
     "eslint-webpack-plugin": "^3.1.1",
     "prettier": "^2.4.1",
     "typescript": "^4.4.4"

api/src/utils/misc.ts

@@ -0,0 +1,3 @@
+export function clone<T>(o: T): T {
+  return <T>JSON.parse(JSON.stringify(o));
+}

package.json

@@ -19,25 +19,25 @@
     "@flaschengeist/users": "^1.0.0-alpha.1",
     "axios": "^0.24.0",
     "cordova": "^10.0.0",
-    "pinia": "^2.0.3",
+    "pinia": "^2.0.4",
-    "quasar": "^2.3.2"
+    "quasar": "^2.3.3"
   },
   "devDependencies": {
     "@flaschengeist/types": "^1.0.0-alpha.5",
-    "@quasar/app": "^3.2.2",
+    "@quasar/app": "^3.2.3",
-    "@quasar/extras": "^1.12.0",
+    "@quasar/extras": "^1.12.1",
-    "@types/node": "^12.20.37",
+    "@types/node": "^14.17.34",
     "@types/webpack": "^5.28.0",
     "@types/webpack-env": "^1.16.3",
     "@typescript-eslint/eslint-plugin": "^5.4.0",
     "@typescript-eslint/parser": "^5.4.0",
-    "eslint": "^8.2.0",
+    "eslint": "^8.3.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-vue": "^8.0.3",
+    "eslint-plugin-vue": "^8.1.1",
     "eslint-webpack-plugin": "^3.1.1",
     "modify-source-webpack-plugin": "^3.0.0",
     "prettier": "^2.4.1",
-    "typescript": "^4.4.4",
+    "typescript": "^4.5.2",
     "vuedraggable": "^4.1.0"
   },
   "prettier": {
@@ -57,8 +57,8 @@
     "last 6 iOS versions"
   ],
   "engines": {
-    "node": ">= 12.22.1",
+    "node": ">= 14.18.1",
     "npm": ">= 6.14.12",
-    "yarn": ">= 1.21.1"
+    "yarn": ">= 1.22.0"
   }
 }

src/layouts/MainLayout.vue

@@ -105,19 +105,7 @@ export default defineComponent({
     const router = useRouter();
     const mainStore = useMainStore();
     const flaschengeist = inject<FG_Plugin.Flaschengeist>('flaschengeist');
-    const _leftDrawer = ref<boolean|undefined>();
+    const leftDrawer = ref(!Platform.is.mobile);
-    const leftDrawer = computed({
-      get: () => {
-        if (_leftDrawer.value !== undefined) {
-          return _leftDrawer.value
-        }
-        if (Platform.is.mobile) {
-          return false
-        }
-        return true
-      },
-      set: (val) => _leftDrawer.value = val
-  })
     const leftDrawerMini = ref(false);
     const mainLinks = flaschengeist?.menuLinks || [];
     const notifications = computed(() => mainStore.notifications.slice().reverse());