From bee90a7a809dadf4d1aa7f9fbc57f8eb7d18c102 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 28 Nov 2022 14:49:38 +0200
Subject: [PATCH 01/11] Fixed rests on attributes with undefined damage

---
 app/imports/api/creature/creatures/methods/restCreature.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/imports/api/creature/creatures/methods/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js
index 7e7edb1e..2451547b 100644
--- a/app/imports/api/creature/creatures/methods/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -83,13 +83,13 @@ export function resetProperties(creatureId, resetFilter, actionContext) {
   const attributeFilter = {
     ...filter,
     type: 'attribute',
-    damage: { $ne: 0 },
+    damage: { $nin: [0, undefined] },
   }
   CreatureProperties.find(attributeFilter).forEach(prop => {
     damagePropertyWork({
       prop,
       operation: 'increment',
-      value: -prop.damage,
+      value: -prop.damage ?? 0,
       actionContext,
       logFunction(increment) {
         actionContext.addLog({

From ec8b9c209c7948d24b945c40b821d902bf312334 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 28 Nov 2022 14:50:41 +0200
Subject: [PATCH 02/11] fixed rests on actions with undefined usesUsed

---
 app/imports/api/creature/creatures/methods/restCreature.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/api/creature/creatures/methods/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js
index 2451547b..bb351c03 100644
--- a/app/imports/api/creature/creatures/methods/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -105,7 +105,7 @@ export function resetProperties(creatureId, resetFilter, actionContext) {
     type: {
       $in: ['action', 'spell']
     },
-    usesUsed: { $ne: 0 },
+    usesUsed: { $nin: [0, undefined] },
   };
   CreatureProperties.find(actionFilter, {
     fields: { name: 1, usesUsed: 1 }

From fb98544ae112e041e9fec3e7e70ced53aca8be44 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 28 Nov 2022 15:39:47 +0200
Subject: [PATCH 03/11] Fixed drag and drop on Firefox

---
 app/imports/client/ui/components/global/DragHandle.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/imports/client/ui/components/global/DragHandle.vue b/app/imports/client/ui/components/global/DragHandle.vue
index 8c06cc0f..7ec3b784 100644
--- a/app/imports/client/ui/components/global/DragHandle.vue
+++ b/app/imports/client/ui/components/global/DragHandle.vue
@@ -2,8 +2,8 @@
   <v-icon
     class="handle"
     v-bind="$attrs"
-    @click.stop="() => { }"
-    @touchstart.native.stop="() => { }"
+    @click.native="e => { }"
+    @touchstart.native.stop="e => { }"
     @touchend.native="portalEvent"
   >
     mdi-drag

From 684d672028e779eadf74221177ef70c41a837739 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 28 Nov 2022 15:40:47 +0200
Subject: [PATCH 04/11] Removed column layout hacks Fixes drag fallbacks not
 being in front of cards Might fix flashy shit on ios

---
 app/imports/client/ui/components/ColumnLayout.vue | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/imports/client/ui/components/ColumnLayout.vue b/app/imports/client/ui/components/ColumnLayout.vue
index 8d3fc918..c3bda533 100644
--- a/app/imports/client/ui/components/ColumnLayout.vue
+++ b/app/imports/client/ui/components/ColumnLayout.vue
@@ -39,17 +39,6 @@ export default {
 
 .column-layout>div,
 .column-layout>span>div {
-  /*
-      Table and width set because firefox does not support break-inside: avoid
-    */
-  display: table;
-  table-layout: fixed;
-  width: 100%;
-  backface-visibility: hidden;
-  -webkit-backface-visibility: hidden;
-  transform: translateX(0);
-  -webkit-transform: translateX(0);
-  -webkit-column-break-inside: avoid;
   page-break-inside: avoid;
   break-inside: avoid;
   padding: 4px;

From bf8eb52a9629c87bbfe89c17652d0a96816a94b7 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 28 Nov 2022 16:54:21 +0200
Subject: [PATCH 05/11] bumped number of writers limit from 20 to 32

---
 app/imports/constants/STORAGE_LIMITS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/constants/STORAGE_LIMITS.js b/app/imports/constants/STORAGE_LIMITS.js
index cbc647e6..f9fd1f6c 100644
--- a/app/imports/constants/STORAGE_LIMITS.js
+++ b/app/imports/constants/STORAGE_LIMITS.js
@@ -30,7 +30,7 @@ const STORAGE_LIMITS = Object.freeze({
   rollCount: 64,
   statsToTarget: 64,
   tagCount: 64,
-  writersCount: 20,
+  writersCount: 32,
   libraryCollectionCount: 32,
   pointBuyRowsCount: 32,
 });

From 69b3ba781d97b36aa38cdb6c5c04ab5bb234b11a Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 28 Nov 2022 23:41:10 +0200
Subject: [PATCH 06/11] Disabled tabletop routing for now

---
 app/imports/client/ui/router.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/imports/client/ui/router.js b/app/imports/client/ui/router.js
index f26f720d..749ab231 100644
--- a/app/imports/client/ui/router.js
+++ b/app/imports/client/ui/router.js
@@ -189,7 +189,9 @@ RouterFactory.configure(router => {
     meta: {
       title: 'Print Character Sheet',
     },
-  }, {
+  },
+  /* Not ready for prime time <3
+  {
     path: '/tabletops',
     name: 'tabletops',
     component: Tabletops,
@@ -203,7 +205,9 @@ RouterFactory.configure(router => {
       rightDrawer: TabletopRightDrawer,
     },
     beforeEnter: ensureLoggedIn,
-  }, {
+  },
+  */
+  {
     path: '/friends',
     components: {
       default: NotImplemented,

From 7ffd0bf61dc058ec3ccce6d696c52d45752356c0 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 29 Nov 2022 11:48:20 +0200
Subject: [PATCH 07/11] Fixed menus in dialogs in firefox Also improved look of
 scrollbars incl. dark mode

---
 .../client/ui/dialogStack/DialogStack.vue     | 13 ++-----
 app/imports/client/ui/styles/body.css         | 37 +++++++++++++++++++
 app/imports/client/ui/styles/stylesIndex.js   |  1 +
 3 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 app/imports/client/ui/styles/body.css

diff --git a/app/imports/client/ui/dialogStack/DialogStack.vue b/app/imports/client/ui/dialogStack/DialogStack.vue
index ac3a945b..2e425b0d 100644
--- a/app/imports/client/ui/dialogStack/DialogStack.vue
+++ b/app/imports/client/ui/dialogStack/DialogStack.vue
@@ -63,21 +63,14 @@
     },
     watch: {
       dialogs(newDialogs) {
-        let el = document.documentElement;
+        const el = document.documentElement;
         if (newDialogs.length) {
           this.top = el.scrollTop;
           if (el.scrollHeight > el.clientHeight){
-            el.style.position = 'fixed';
-            el.style.top = `${-this.top}px`;
-            el.style.left = 0;
-            el.style.right = 0;
-            el.style.overflowY = 'scroll';
+            el.style.overflowY = 'hidden';
+            el.scrollTop = this.top;
           }
         } else {
-          el.style.position = null;
-          el.style.top = null;
-          el.style.left = null;
-          el.style.right = null;
           el.style.overflowY = null;
           el.scrollTop = this.top;
         }
diff --git a/app/imports/client/ui/styles/body.css b/app/imports/client/ui/styles/body.css
new file mode 100644
index 00000000..d70859e8
--- /dev/null
+++ b/app/imports/client/ui/styles/body.css
@@ -0,0 +1,37 @@
+html {
+  --scrollbarBG: #f0f0f0;
+  --thumbBG: #cdcdcd;
+  scrollbar-gutter: stable;
+  background-color: var(--scrollbarBG);
+}
+
+html:has(#app.theme--dark) {
+  --scrollbarBG: #212121;
+  --thumbBG: #404040;
+}
+
+#app.theme--dark {
+  --scrollbarBG: #212121;
+  --thumbBG: #404040;
+}
+
+* {
+  scrollbar-width: thin;
+  scrollbar-color: var(--thumbBG) var(--scrollbarBG);
+}
+
+::-webkit-scrollbar {
+  width: 8px;
+}
+
+::-webkit-scrollbar-track {
+  background-color: var(--scrollbarBG);
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: var(--thumbBG);
+}
+
+::-webkit-scrollbar-corner {
+  background-color: rgba(0, 0, 0, 0);
+}
\ No newline at end of file
diff --git a/app/imports/client/ui/styles/stylesIndex.js b/app/imports/client/ui/styles/stylesIndex.js
index f9a49d9c..add626e2 100644
--- a/app/imports/client/ui/styles/stylesIndex.js
+++ b/app/imports/client/ui/styles/stylesIndex.js
@@ -1,3 +1,4 @@
+import './body.css';
 import './cardColors.css';
 import './cardTitles.css';
 import './centeredInputs.css';

From 704314a7eb7e4b2e4ebc37e556d7fd343ce4ea04 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 29 Nov 2022 11:48:28 +0200
Subject: [PATCH 08/11] Udpated npm packages

---
 app/package-lock.json | 114 +++++++++++++++++++++---------------------
 app/package.json      |  14 +++---
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/app/package-lock.json b/app/package-lock.json
index e158d2fc..daa63a7f 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "dicecloud",
-  "version": "2.0.43",
+  "version": "2.0.45",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -56,11 +56,11 @@
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz",
-      "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==",
+      "version": "7.20.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz",
+      "integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==",
       "requires": {
-        "regenerator-runtime": "^0.13.10"
+        "regenerator-runtime": "^0.13.11"
       }
     },
     "@chenfengyuan/vue-countdown": {
@@ -185,14 +185,14 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.43.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.43.0.tgz",
-      "integrity": "sha512-wNPzG+eDR6+hhW4yobEmpR36jrqqQv1vxBq5LJO3fBAktjkvekfr4BRl+3Fn1CM/A+s8/EiGUbOMDoYqWdbtXA==",
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.44.0.tgz",
+      "integrity": "sha512-j5ULd7FmmekcyWeArx+i8x7sdRHzAtXTkmDPthE4amxZOWKFK7bomoJ4r7PJ8K7PoMzD16U8MmuZFAonr1ERvw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.43.0",
-        "@typescript-eslint/type-utils": "5.43.0",
-        "@typescript-eslint/utils": "5.43.0",
+        "@typescript-eslint/scope-manager": "5.44.0",
+        "@typescript-eslint/type-utils": "5.44.0",
+        "@typescript-eslint/utils": "5.44.0",
         "debug": "^4.3.4",
         "ignore": "^5.2.0",
         "natural-compare-lite": "^1.4.0",
@@ -222,14 +222,14 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.43.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.43.0.tgz",
-      "integrity": "sha512-2iHUK2Lh7PwNUlhFxxLI2haSDNyXvebBO9izhjhMoDC+S3XI9qt2DGFUsiJ89m2k7gGYch2aEpYqV5F/+nwZug==",
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.44.0.tgz",
+      "integrity": "sha512-H7LCqbZnKqkkgQHaKLGC6KUjt3pjJDx8ETDqmwncyb6PuoigYajyAwBGz08VU/l86dZWZgI4zm5k2VaKqayYyA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.43.0",
-        "@typescript-eslint/types": "5.43.0",
-        "@typescript-eslint/typescript-estree": "5.43.0",
+        "@typescript-eslint/scope-manager": "5.44.0",
+        "@typescript-eslint/types": "5.44.0",
+        "@typescript-eslint/typescript-estree": "5.44.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
@@ -245,23 +245,23 @@
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.43.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.43.0.tgz",
-      "integrity": "sha512-XNWnGaqAtTJsUiZaoiGIrdJYHsUOd3BZ3Qj5zKp9w6km6HsrjPk/TGZv0qMTWyWj0+1QOqpHQ2gZOLXaGA9Ekw==",
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.44.0.tgz",
+      "integrity": "sha512-2pKml57KusI0LAhgLKae9kwWeITZ7IsZs77YxyNyIVOwQ1kToyXRaJLl+uDEXzMN5hnobKUOo2gKntK9H1YL8g==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.43.0",
-        "@typescript-eslint/visitor-keys": "5.43.0"
+        "@typescript-eslint/types": "5.44.0",
+        "@typescript-eslint/visitor-keys": "5.44.0"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.43.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.43.0.tgz",
-      "integrity": "sha512-K21f+KY2/VvYggLf5Pk4tgBOPs2otTaIHy2zjclo7UZGLyFH86VfUOm5iq+OtDtxq/Zwu2I3ujDBykVW4Xtmtg==",
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.44.0.tgz",
+      "integrity": "sha512-A1u0Yo5wZxkXPQ7/noGkRhV4J9opcymcr31XQtOzcc5nO/IHN2E2TPMECKWYpM3e6olWEM63fq/BaL1wEYnt/w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.43.0",
-        "@typescript-eslint/utils": "5.43.0",
+        "@typescript-eslint/typescript-estree": "5.44.0",
+        "@typescript-eslint/utils": "5.44.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -278,19 +278,19 @@
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.43.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.43.0.tgz",
-      "integrity": "sha512-jpsbcD0x6AUvV7tyOlyvon0aUsQpF8W+7TpJntfCUWU1qaIKu2K34pMwQKSzQH8ORgUrGYY6pVIh1Pi8TNeteg==",
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.44.0.tgz",
+      "integrity": "sha512-Tp+zDnHmGk4qKR1l+Y1rBvpjpm5tGXX339eAlRBDg+kgZkz9Bw+pqi4dyseOZMsGuSH69fYfPJCBKBrbPCxYFQ==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.43.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.43.0.tgz",
-      "integrity": "sha512-BZ1WVe+QQ+igWal2tDbNg1j2HWUkAa+CVqdU79L4HP9izQY6CNhXfkNwd1SS4+sSZAP/EthI1uiCSY/+H0pROg==",
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.44.0.tgz",
+      "integrity": "sha512-M6Jr+RM7M5zeRj2maSfsZK2660HKAJawv4Ud0xT+yauyvgrsHu276VtXlKDFnEmhG+nVEd0fYZNXGoAgxwDWJw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.43.0",
-        "@typescript-eslint/visitor-keys": "5.43.0",
+        "@typescript-eslint/types": "5.44.0",
+        "@typescript-eslint/visitor-keys": "5.44.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -319,16 +319,16 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.43.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.43.0.tgz",
-      "integrity": "sha512-8nVpA6yX0sCjf7v/NDfeaOlyaIIqL7OaIGOWSPFqUKK59Gnumd3Wa+2l8oAaYO2lk0sO+SbWFWRSvhu8gLGv4A==",
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.44.0.tgz",
+      "integrity": "sha512-fMzA8LLQ189gaBjS0MZszw5HBdZgVwxVFShCO3QN+ws3GlPkcy9YuS3U4wkT6su0w+Byjq3mS3uamy9HE4Yfjw==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.43.0",
-        "@typescript-eslint/types": "5.43.0",
-        "@typescript-eslint/typescript-estree": "5.43.0",
+        "@typescript-eslint/scope-manager": "5.44.0",
+        "@typescript-eslint/types": "5.44.0",
+        "@typescript-eslint/typescript-estree": "5.44.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0",
         "semver": "^7.3.7"
@@ -355,12 +355,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.43.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.43.0.tgz",
-      "integrity": "sha512-icl1jNH/d18OVHLfcwdL3bWUKsBeIiKYTGxMJCoGe7xFht+E4QgzOqoWYrU8XSLJWhVw8nTacbm03v23J/hFTg==",
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.44.0.tgz",
+      "integrity": "sha512-a48tLG8/4m62gPFbJ27FxwCOqPKxsb8KC3HkmYoq2As/4YyjQl1jDbRr1s63+g4FS/iIehjmN3L5UjmKva1HzQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.43.0",
+        "@typescript-eslint/types": "5.44.0",
         "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
@@ -530,9 +530,9 @@
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
     },
     "aws-sdk": {
-      "version": "2.1258.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1258.0.tgz",
-      "integrity": "sha512-siqNFXlhJZVN1BizPZebJViFXtTUPgcA+yLfHKl2eC4Ied7kE7spOjZmAzpuiGUTzFagk1oWCaJ1Hit4llIoGg==",
+      "version": "2.1262.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1262.0.tgz",
+      "integrity": "sha512-XbaK/XUIxwLEBnHANhJ0RTZtiU288lFRj5FllSihQ5Kb0fibKyW8kJFPsY+NzzDezLH5D3WdGbTKb9fycn5TbA==",
       "requires": {
         "buffer": "4.9.2",
         "events": "1.1.1",
@@ -1575,9 +1575,9 @@
       "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
     },
     "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",
+      "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA=="
     },
     "ignore-styles": {
       "version": "5.0.1",
@@ -1850,9 +1850,9 @@
       }
     },
     "marked": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.2.tgz",
-      "integrity": "sha512-JjBTFTAvuTgANXx82a5vzK9JLSMoV6V3LBVn4Uhdso6t7vXrGx7g1Cd2r6NYSsxrYbQGFCMqBDhFHyK5q2UvcQ=="
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.3.tgz",
+      "integrity": "sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw=="
     },
     "merge2": {
       "version": "1.4.1",
@@ -3018,9 +3018,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
-      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
     },
     "regexpp": {
       "version": "3.2.0",
diff --git a/app/package.json b/app/package.json
index 82d80adf..c0c21d4f 100644
--- a/app/package.json
+++ b/app/package.json
@@ -20,10 +20,10 @@
     "npm": "6.13.x"
   },
   "dependencies": {
-    "@babel/runtime": "^7.20.1",
+    "@babel/runtime": "^7.20.6",
     "@chenfengyuan/vue-countdown": "^1.1.5",
     "@tozd/vue-observer-utils": "^0.5.0",
-    "aws-sdk": "^2.1258.0",
+    "aws-sdk": "^2.1262.0",
     "bcrypt": "^5.1.0",
     "chroma-js": "^2.4.2",
     "css-box-shadow": "^1.0.0-3",
@@ -31,10 +31,10 @@
     "ddp-rate-limiter-mixin": "^1.1.10",
     "discord.js": "^12.5.3",
     "dompurify": "^2.4.1",
-    "ignore": "^5.2.0",
+    "ignore": "^5.2.1",
     "ignore-styles": "^5.0.1",
     "lodash": "^4.17.20",
-    "marked": "^4.2.2",
+    "marked": "^4.2.3",
     "meteor-node-stubs": "^1.2.5",
     "minify-css-string": "^1.0.0",
     "moo": "^0.5.2",
@@ -58,8 +58,8 @@
     "vuex": "^3.1.3"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.43.0",
+    "@typescript-eslint/eslint-plugin": "^5.44.0",
+    "@typescript-eslint/parser": "^5.44.0",
     "@vue/compiler-dom": "^3.2.45",
     "chai": "^4.3.7",
     "eslint": "^7.32.0",
@@ -118,4 +118,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}

From e87772c2a3ca93de6decb81af4c8abc4d609e3dd Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 29 Nov 2022 12:06:27 +0200
Subject: [PATCH 09/11] Fixed folder groupStats behaviour when !groupStats

---
 .../ui/creature/character/characterSheetTabs/ActionsTab.vue   | 1 +
 .../ui/creature/character/characterSheetTabs/FeaturesTab.vue  | 1 +
 .../ui/creature/character/characterSheetTabs/InventoryTab.vue | 1 +
 .../ui/creature/character/characterSheetTabs/JournalTab.vue   | 1 +
 .../ui/creature/character/characterSheetTabs/SpellsTab.vue    | 1 +
 .../ui/creature/character/characterSheetTabs/StatsTab.vue     | 4 ++--
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue
index 4eb82fb7..13b5b4fa 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue
@@ -61,6 +61,7 @@ export default {
       const folderIds = CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'folder',
+        groupStats: true,
         hideStatsGroup: true,
         removed: { $ne: true },
         inactive: { $ne: true },
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
index 5e4bda72..4a8a22ff 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
@@ -59,6 +59,7 @@ export default {
       const folderIds = CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'folder',
+        groupStats: true,
         hideStatsGroup: true,
         removed: { $ne: true },
         inactive: { $ne: true },
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
index 64eddd1b..b87f2dd9 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
@@ -145,6 +145,7 @@ export default {
       return CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'folder',
+        groupStats: true,
         hideStatsGroup: true,
         removed: { $ne: true },
         inactive: { $ne: true },
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
index d4834bb5..36502e54 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
@@ -63,6 +63,7 @@ export default {
       const folderIds = CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'folder',
+        groupStats: true,
         hideStatsGroup: true,
         removed: { $ne: true },
         inactive: { $ne: true },
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
index db5d3af3..549d742c 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
@@ -81,6 +81,7 @@ export default {
       return CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'folder',
+        groupStats: true,
         hideStatsGroup: true,
         removed: { $ne: true },
         inactive: { $ne: true },
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
index e751f8e8..7f350a16 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -427,10 +427,10 @@ const propertyHandlers = {
   folder(prop) {
     let skipChildren;
     let propPath = null;
-    if (prop.hideStatsGroup) {
+    if (prop.groupStats && prop.hideStatsGroup) {
       skipChildren = true;
     }
-    if (prop.tab === 'stats') {
+    if (prop.groupStats && prop.tab === 'stats') {
       propPath = ['folder', prop.location]
     }
     return { skipChildren, propPath }

From c237162475835de52f1651019702dd0bf19e8541 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 29 Nov 2022 14:05:24 +0200
Subject: [PATCH 10/11] Fixed sidebar party closing on route change

---
 .../ui/creature/creatureList/CreatureFolderHeader.vue |  2 +-
 .../ui/creature/creatureList/CreatureFolderList.vue   |  5 ++++-
 .../ui/creature/creatureList/CreatureListTile.vue     |  2 ++
 app/imports/client/ui/layouts/Sidebar.vue             | 11 ++++++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue b/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue
index 1b22dcdc..f7e9ff61 100644
--- a/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue
@@ -1,5 +1,5 @@
 <template lang="html">
-  <v-list-item-content style="min-height: 60px;">
+  <v-list-item-content :style="dense ? undefined : 'min-height: 60px;'">
     <v-list-item-title class="d-flex align-center">
       <div
         v-if="!renaming"
diff --git a/app/imports/client/ui/creature/creatureList/CreatureFolderList.vue b/app/imports/client/ui/creature/creatureList/CreatureFolderList.vue
index 783e968d..7bd8152c 100644
--- a/app/imports/client/ui/creature/creatureList/CreatureFolderList.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureFolderList.vue
@@ -1,6 +1,8 @@
 <template lang="html">
   <v-list
     expand
+    :nav="nav"
+    :dense="dense"
     class="creature-folder-list"
   >
     <creature-list
@@ -14,7 +16,7 @@
       v-for="folder in folders"
       :key="folder._id"
       v-model="openFolders[folder._id]"
-      group="folder"
+      :dense="dense"
     >
       <template #activator>
         <creature-folder-header
@@ -60,6 +62,7 @@ export default {
       default: undefined,
     },
     dense: Boolean,
+    nav: Boolean,
   },
   data(){return{
     openFolders: {},
diff --git a/app/imports/client/ui/creature/creatureList/CreatureListTile.vue b/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
index 2685ff13..48c19bea 100644
--- a/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
@@ -5,10 +5,12 @@
   <v-list-item
     v-bind="$attrs"
     :class="isSelected && 'primary--text v-list-item--active'"
+    :dense="dense"
     v-on="selection ? { click() {$emit('click')} } : {}"
   >
     <v-list-item-avatar
       :color="isSelected ? 'red darken-1' : model.color || 'grey'"
+      :size="dense ? 30 : undefined"
       class="white--text"
       style="transition: background 0.3s;"
     >
diff --git a/app/imports/client/ui/layouts/Sidebar.vue b/app/imports/client/ui/layouts/Sidebar.vue
index 01cbc7ce..cf450971 100644
--- a/app/imports/client/ui/layouts/Sidebar.vue
+++ b/app/imports/client/ui/layouts/Sidebar.vue
@@ -11,7 +11,10 @@
         Sign in
       </v-btn>
     </v-layout>
-    <v-list>
+    <v-list
+      nav
+      class="links"
+    >
       <v-list-item v-if="signedIn">
         <v-list-item-content>
           <v-list-item-title>
@@ -138,3 +141,9 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.links .v-list-item:not(:last-child):not(:only-child) {
+  margin-bottom: 4px;
+}
+</style>

From 5815c7ca34a691f93bf610222b7d32992741666b Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 29 Nov 2022 14:10:28 +0200
Subject: [PATCH 11/11] Padded character list to reveal add folder button It
 was hiding behind FAB

---
 app/imports/client/ui/pages/CharacterList.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/imports/client/ui/pages/CharacterList.vue b/app/imports/client/ui/pages/CharacterList.vue
index 20290aee..a30578df 100644
--- a/app/imports/client/ui/pages/CharacterList.vue
+++ b/app/imports/client/ui/pages/CharacterList.vue
@@ -4,7 +4,10 @@
     style="height: 100%"
   >
     <v-container>
-      <v-row justify="center">
+      <v-row
+        justify="center"
+        class="mb-16"
+      >
         <v-col
           cols="12"
           xl="8"