From c65c8f329923128d838c1e94a476b6b7442a581f Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 29 Apr 2021 16:13:22 +0200
Subject: [PATCH 01/42] Added note to attempt to keep children of reference
 nodes

---
 .../methods/insertPropertyFromLibraryNode.js                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js b/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js
index 52a858c1..3af576c8 100644
--- a/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js
+++ b/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js
@@ -192,6 +192,9 @@ function reifyNodeReferences(nodes, visitedRefs = new Set(), depth = 0){
       return true;
     });
 
+    // TODO: Force the referencedNode to take the old id of the reference
+    // such that the reference's children can be kept
+    
     // Give the new referenced sub-tree new ids
     renewDocIds({
       docArray: addedNodes,

From 1ad1d1f23dfee876e522a6915953aaa962f0c9f3 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 1 Jun 2021 12:34:51 +0200
Subject: [PATCH 02/42] Migrated from Google material design icons to vuetify
 default MDI

---
 app/client/head.html                          |  3 ++-
 app/imports/constants/PROPERTIES.js           | 20 ++++++++---------
 app/imports/constants/SVG_ICONS.js            |  4 ----
 app/imports/ui/components/ColorPicker.vue     |  6 ++---
 app/imports/ui/components/IncrementButton.vue |  2 +-
 app/imports/ui/components/IncrementMenu.vue   | 14 ++++++------
 .../ui/components/global/DatePicker.vue       |  2 +-
 .../ui/components/global/IconPicker.vue       | 14 ++++++------
 app/imports/ui/components/propertyToolbar.vue | 14 ++++++------
 .../ui/components/snackbars/SnackbarQueue.vue |  2 +-
 app/imports/ui/components/tree/TreeNode.vue   |  4 ++--
 app/imports/ui/creature/RestButton.vue        |  2 +-
 .../creature/character/CharacterSheetFab.vue  |  6 ++---
 .../character/CharacterSheetToolbar.vue       | 10 ++++-----
 .../characterSheetTabs/CharacterTab.vue       |  4 ++--
 .../character/characterSheetTabs/StatsTab.vue |  2 +-
 .../character/characterSheetTabs/TreeTab.vue  |  2 +-
 .../creatureProperties/Breadcrumbs.vue        |  2 +-
 .../CreaturePropertyDialog.vue                |  2 +-
 .../experiences/ExperienceListDialog.vue      |  6 ++---
 .../ui/creature/slots/SlotFillDialog.vue      |  2 +-
 app/imports/ui/creature/slots/Slots.vue       |  4 ++--
 app/imports/ui/dialogStack/DialogBase.vue     |  2 +-
 .../ui/documentation/FunctionReference.vue    |  2 +-
 app/imports/ui/layouts/Sidebar.vue            | 19 +++++++++-------
 .../ui/library/InsertLibraryNodeButton.vue    |  2 +-
 app/imports/ui/library/LibraryBrowser.vue     |  4 ++--
 app/imports/ui/library/LibraryEditDialog.vue  |  4 ++--
 .../ui/library/SingleLibraryToolbar.vue       |  4 ++--
 app/imports/ui/log/CharacterLog.vue           |  2 +-
 app/imports/ui/pages/Account.vue              |  6 ++---
 app/imports/ui/pages/CharacterList.vue        |  2 +-
 app/imports/ui/pages/Friends.vue              |  2 +-
 app/imports/ui/pages/Home.vue                 |  6 ++---
 app/imports/ui/pages/Tabletops.vue            |  2 +-
 .../components/attributes/HitDiceListTile.vue |  4 ++--
 .../components/attributes/ResourceCard.vue    |  4 ++--
 .../attributes/SpellSlotListTile.vue          |  4 ++--
 .../components/inventory/ItemListTile.vue     |  2 +-
 .../components/skills/SkillListTile.vue       |  8 +++----
 .../components/skills/SkillProficiency.vue    |  8 +++----
 .../spells/CastSpellWithSlotDialog.vue        |  4 ++--
 .../components/spells/SpellListCard.vue       |  2 +-
 .../components/spells/SpellListTile.vue       |  4 ++--
 .../forms/AttributesConsumedListForm.vue      |  2 +-
 .../ui/properties/forms/EffectForm.vue        |  2 +-
 .../forms/ItemsConsumedListForm.vue           |  2 +-
 .../ui/properties/forms/ReferenceForm.vue     |  4 ++--
 .../ui/properties/forms/ResourcesForm.vue     |  2 +-
 .../forms/shared/ProficiencySelect.vue        | 12 +++++-----
 .../ui/properties/shared/ProficiencyIcon.vue  |  6 ++---
 .../treeNodeViews/DamageTreeNode.vue          |  2 +-
 .../ui/properties/viewers/SkillViewer.vue     |  8 +++----
 app/imports/ui/sharing/ShareDialog.vue        |  8 +++----
 app/imports/ui/tabletop/TabletopComponent.vue |  2 +-
 .../ui/user/DeleteUserAccountDialog.vue       |  6 ++---
 app/imports/ui/utility/getEffectIcon.js       | 22 +++++++++----------
 app/imports/ui/vuetify.js                     |  2 +-
 58 files changed, 152 insertions(+), 152 deletions(-)

diff --git a/app/client/head.html b/app/client/head.html
index 4984d688..85ef16df 100644
--- a/app/client/head.html
+++ b/app/client/head.html
@@ -1,5 +1,6 @@
 <head>
-  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900" rel="stylesheet">
+  <link href="https://cdn.jsdelivr.net/npm/@mdi/font@5.x/css/materialdesignicons.min.css" rel="stylesheet">
   <meta name="viewport" content="width=device-width initial-scale=1.0, user-scalable=no">
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="apple-mobile-web-app-capable" content="yes">
diff --git a/app/imports/constants/PROPERTIES.js b/app/imports/constants/PROPERTIES.js
index bb60d32e..f06cc7b2 100644
--- a/app/imports/constants/PROPERTIES.js
+++ b/app/imports/constants/PROPERTIES.js
@@ -24,11 +24,11 @@ const PROPERTIES = Object.freeze({
     name: 'Class level'
   },
   constant: {
-    icon: 'anchor',
+    icon: 'mdi-anchor',
     name: 'Constant'
   },
   container: {
-    icon: 'work',
+    icon: 'mdi-bag-personal-outline',
     name: 'Container'
   },
   damage: {
@@ -44,23 +44,23 @@ const PROPERTIES = Object.freeze({
     name: 'Effect'
   },
   feature: {
-    icon: 'subject',
+    icon: 'mdi-text-subject',
     name: 'Feature'
   },
   folder: {
-    icon: 'folder',
+    icon: 'mdi-folder-outline',
     name: 'Folder'
   },
   item: {
-    icon: '$vuetify.icons.item',
+    icon: 'mdi-cube-outline',
     name: 'Item'
   },
   note: {
-    icon: 'note',
+    icon: 'mdi-note-outline',
     name: 'Note'
   },
   proficiency: {
-    icon: 'radio_button_checked',
+    icon: 'mdi-brightness-1',
     name: 'Proficiency'
   },
   roll: {
@@ -68,7 +68,7 @@ const PROPERTIES = Object.freeze({
     name: 'Roll'
   },
   reference: {
-    icon: 'link',
+    icon: 'mdi-vector-link',
     name: 'Reference',
     libraryOnly: true,
   },
@@ -81,11 +81,11 @@ const PROPERTIES = Object.freeze({
     name: 'Skill'
   },
   propertySlot: {
-    icon: 'tab_unselected',
+    icon: 'mdi-power-socket-eu',
     name: 'Slot'
   },
   slotFiller: {
-    icon: 'picture_in_picture',
+    icon: 'mdi-power-plug-outline',
     name: 'Slot filler'
   },
   spellList: {
diff --git a/app/imports/constants/SVG_ICONS.js b/app/imports/constants/SVG_ICONS.js
index d988a2ee..00ab7353 100644
--- a/app/imports/constants/SVG_ICONS.js
+++ b/app/imports/constants/SVG_ICONS.js
@@ -35,10 +35,6 @@ const SVG_ICONS = Object.freeze({
     name: 'cash',
     shape:'M251.813 20.5c-.78-.008-1.558.003-2.344.03-11.005.39-22.285 5.142-32.376 17.814l-5.156 6.468-7.063-4.343c-13.67-8.436-30.948-11.566-45.5-8.75-14.552 2.814-26.03 10.716-31.344 25.374l-3.624 9.968L115 62.22c-16.243-8.34-24.717-8.468-31.75-5.314-5.606 2.515-11.456 8.555-18.094 17.375L147.594 138c12.92 4.168 31.79 4.086 50.75-.813 18.95-4.895 37.863-14.44 51.625-27.406l31.124-76.905c-6.596-6.452-16.42-11.52-26.938-12.28-.778-.058-1.563-.087-2.344-.095zM265 121.28l-.594.595c-16.8 16.497-39.04 27.636-61.375 33.406-6.883 1.78-13.784 3.075-20.56 3.814-3.682 6.112-6.727 12.262-9.19 18.47l.532-.033c1.4 24.178 11.835 42.98 26.75 60.876l-14.343 11.97c-8.29-9.947-15.738-20.762-21.282-32.814-.92 23.227 4.222 47.218 12.78 72.22l-17.687 6.062c-15.615-45.618-20.942-92.383 1-136.375-7.386-.588-14.426-1.96-20.905-4.25l-.344-.126c-4.26 4.08-8.35 8.368-12.25 12.875-31.64 36.583-49.03 85.3-39.936 123.25 4.87 20.324 13.632 39.513 26.156 55.874 3.653-.298 7.256-.49 10.78-.53 11.585-.138 22.4 1.094 32.032 3.623 3.04.798 5.98 1.776 8.813 2.875 7.484-.797 15.245-1.218 23.22-1.218 28.474 0 54.303 5.297 73.843 14.47 7.586 3.56 14.44 7.848 20 12.81-.047-.742-.063-1.493-.063-2.25 0-4.568.85-8.905 2.438-13-8.938-8.382-14.532-18.546-14.532-30.187 0-16.12 10.75-29.346 26.22-39 .012-4.624.893-9.02 2.53-13.156-10.165-8.73-16.655-19.555-16.655-32.092 0-7.917 2.594-15.142 7.063-21.594-4.47-6.452-7.063-13.677-7.063-21.594 0-3.813.598-7.456 1.72-10.938-9.688-8.603-15.814-19.182-15.814-31.375 0-12.108 6.054-22.594 15.626-31.156-5.94-4.6-12.232-8.505-18.906-11.5zm111.438 2.345c-26.022 0-49.507 5.433-65.688 13.563-16.18 8.13-23.78 18.062-23.78 26.75 0 8.687 7.6 18.65 23.78 26.78 16.18 8.13 39.666 13.532 65.688 13.532 11.222 0 21.978-1.018 31.875-2.813v-17.03c13.862-2.068 25.41-5.9 32.812-10.782v17.563c.328-.16.678-.307 1-.47 16.18-8.13 23.813-18.093 23.813-26.78 0-8.687-7.632-18.62-23.813-26.75-16.18-8.13-39.666-13.563-65.688-13.563zm96.5 67.625c-3.334 3.582-7.283 6.86-11.657 9.844l.25 29.03c12.545-7.523 18.5-16.197 18.5-23.874 0-4.788-2.31-9.965-7.092-15zm-171.844 15.47c.265 8.576 7.887 18.325 23.78 26.31 16.182 8.13 39.667 13.532 65.688 13.532 16.316 0 31.636-2.13 44.782-5.718l.625-27.28c-17.166 6.025-37.58 9.374-59.533 9.374-28.558 0-54.474-5.69-74.062-15.532-.435-.218-.852-.464-1.28-.687zm1.97 34.81c-1.345 2.694-2.002 5.352-2.002 7.907 0 8.688 7.632 18.652 23.813 26.782 16.18 8.13 39.666 13.53 65.688 13.53 13.194 0 25.73-1.384 37-3.813v-24.062c-11.556 2.212-24.002 3.375-37 3.375-28.56 0-54.506-5.69-74.094-15.53-4.828-2.426-9.34-5.17-13.408-8.19zm174.967 0c-4.067 3.02-8.58 5.764-13.405 8.19-1.382.693-2.806 1.346-4.25 2V274c13.335-7.677 19.656-16.654 19.656-24.563 0-2.548-.662-5.218-2-7.906zm7.5 36.75c-2.03 2.028-4.236 3.956-6.624 5.783v32.468c10.314-7.004 15.25-14.77 15.25-21.75 0-5.266-2.816-10.994-8.625-16.5zm-170.124 14.064c-.13.817-.22 1.64-.22 2.437.002 8.69 7.633 18.62 23.814 26.75 16.18 8.13 39.666 13.564 65.688 13.564 14.953 0 29.064-1.775 41.437-4.844v-29.875c-16.304 5.196-35.265 8.063-55.563 8.063-28.558 0-54.505-5.69-74.093-15.532-.36-.18-.708-.378-1.064-.562zm-13.594 21.312c-8.665 6.538-12.843 13.626-12.843 20.03 0 8.69 7.63 18.653 23.81 26.783 16.182 8.13 39.667 13.53 65.69 13.53 9.54 0 18.72-.71 27.342-2.03v-18.19c-.377.003-.747 0-1.125 0-28.558 0-54.505-5.688-74.093-15.53-12.46-6.26-22.86-14.558-28.78-24.594zm162.532 30.688c-7.93 2.796-16.566 5.006-25.72 6.594V363c1.92-.813 3.78-1.65 5.532-2.53 9.82-4.935 16.47-10.537 20.188-16.126zM473.5 362.5c-3.77 3.77-8.21 7.184-13.125 10.25v28.688c13.335-7.678 19.656-16.655 19.656-24.563 0-4.59-2.138-9.537-6.53-14.375zm-348.72 2.813c-10.14.115-21.222 1.413-32.624 4.062-22.803 5.3-42.462 15.006-55.25 25.688-12.788 10.68-17.74 21.388-16.28 29.125 1.46 7.736 9.393 14.833 24.78 18.875 15.388 4.04 36.854 4.204 59.657-1.094 9.19-2.136 17.857-4.97 25.78-8.314V413.03c14.53-6.486 25.467-14.375 30.376-21.905V415.5c12.102-10.422 16.83-20.828 15.405-28.375-1.46-7.735-9.425-14.802-24.813-18.844-7.693-2.02-16.89-3.083-27.03-2.967zm64.657 5.218c2.71 3.895 4.61 8.28 5.532 13.158 1.128 5.983.634 11.85-1.126 17.53 9.822 2.56 18.812 6.073 26.656 10.47 4.39 2.46 8.47 5.268 12.125 8.343 9.022-2.163 16.573-5.152 21.938-8.686v20.53c16.183-7.61 23.5-16.89 23.5-24.312 0-7.43-7.334-16.726-23.563-24.343-16.054-7.537-39.295-12.58-65.063-12.69zm111.72 4.94c-.044.467-.094.944-.094 1.405 0 8.688 7.63 18.65 23.812 26.78 16.18 8.13 39.666 13.533 65.688 13.533 13.194 0 25.73-1.384 37-3.813V386.53c-14.77 4-31.43 6.19-49.094 6.19-28.56 0-54.507-5.72-74.095-15.564-1.086-.546-2.165-1.11-3.22-1.687zM304 412.81c-1.958 3.257-2.938 6.484-2.938 9.563 0 8.688 7.632 18.65 23.813 26.78 16.18 8.13 39.666 13.533 65.688 13.533 13.194 0 25.73-1.384 37-3.813V432.5c-11.556 2.212-24.002 3.375-37 3.375-28.56 0-54.506-5.69-74.094-15.53-4.47-2.246-8.643-4.777-12.47-7.533zm173.125 0c-3.832 2.762-8.025 5.283-12.5 7.532-1.382.694-2.806 1.347-4.25 2v24.594c13.335-7.678 19.656-16.655 19.656-24.563 0-3.077-.953-6.308-2.905-9.563zM184.5 418.22c-3.47 4.383-7.572 8.55-12.188 12.405-15.66 13.082-37.66 23.643-63 29.53-9.14 2.125-18.11 3.472-26.75 4.126 3.2 5.317 8.83 10.542 17.063 15.158 13.698 7.677 33.69 12.843 55.875 12.843 10.077 0 19.68-1.084 28.47-2.967v-20.844c13.858-2.068 25.41-5.903 32.81-10.783v18.407c10.023-6.95 14.845-14.89 14.845-22.375 0-8.723-6.552-18.043-20.25-25.72-7.35-4.12-16.532-7.518-26.875-9.78z',
   },
-  'cube': {
-    name: 'item',
-    shape: 'M256 24.585L51.47 118.989 256 213.394l204.53-94.405zM38.998 133.054v258.353L247 487.415V229.063zm434.004 0L265 229.062v258.353l208.002-96.008z',
-  },
   'electric': {
     name: 'action',
     shape: 'M376 211H256V16L136 301h120v195z',
diff --git a/app/imports/ui/components/ColorPicker.vue b/app/imports/ui/components/ColorPicker.vue
index eb385581..23b8463b 100644
--- a/app/imports/ui/components/ColorPicker.vue
+++ b/app/imports/ui/components/ColorPicker.vue
@@ -10,7 +10,7 @@
         icon
         v-on="on"
       >
-        <v-icon>format_paint</v-icon>
+        <v-icon>mdi-format-paint</v-icon>
       </v-btn>
     </template>
     <v-card class="overflow-hidden">
@@ -30,7 +30,7 @@
                 v-if="kebabColor === colorOption"
                 :class="{dark: isDark(colorOption, shade)}"
               >
-                check
+                mdi-check
               </v-icon>
             </v-scroll-y-transition>
           </div>
@@ -58,7 +58,7 @@
                   v-if="kebabShade === shadeOption"
                   :class="isDark(color, shade) ? 'dark' : 'light'"
                 >
-                  check
+                  mdi-check
                 </v-icon>
               </v-scroll-y-transition>
             </div>
diff --git a/app/imports/ui/components/IncrementButton.vue b/app/imports/ui/components/IncrementButton.vue
index 3189010c..3d7ad623 100644
--- a/app/imports/ui/components/IncrementButton.vue
+++ b/app/imports/ui/components/IncrementButton.vue
@@ -14,7 +14,7 @@
         @click.stop
       >
         <slot>
-          <v-icon>add</v-icon>
+          <v-icon>mdi-plus</v-icon>
         </slot>
       </v-btn>
     </template>
diff --git a/app/imports/ui/components/IncrementMenu.vue b/app/imports/ui/components/IncrementMenu.vue
index 24d46b91..b8f0ccb3 100644
--- a/app/imports/ui/components/IncrementMenu.vue
+++ b/app/imports/ui/components/IncrementMenu.vue
@@ -15,14 +15,14 @@
         class="filled"
         @click="toggleAdd(); $nextTick(() => $refs.editInput.focus())"
       >
-        <v-icon>add</v-icon>
+        <v-icon>mdi-plus</v-icon>
       </v-btn>
       <v-btn
         :disabled="context.editPermission === false"
         class="filled"
         @click="toggleSubtract(); $nextTick(() => $refs.editInput.focus())"
       >
-        <v-icon>remove</v-icon>
+        <v-icon>mdi-minus</v-icon>
       </v-btn>
     </v-btn-toggle>
     <v-text-field
@@ -48,7 +48,7 @@
       class="mx-2 filled"
       @click="commitEdit"
     >
-      <v-icon>done</v-icon>
+      <v-icon>mdi-check</v-icon>
     </v-btn>
     <v-btn
       :small="!flat"
@@ -58,7 +58,7 @@
       class="filled"
       @click="cancelEdit"
     >
-      <v-icon>close</v-icon>
+      <v-icon>mdi-close</v-icon>
     </v-btn>
     <v-spacer />
   </v-layout>
@@ -117,11 +117,11 @@
 			operationIcon(operation) {
 				switch (operation) {
 					case 'set':
-						return 'forward';
+						return 'mdi-forward';
 					case 'add':
-            return 'add';
+            return 'mdi-plus';
 					case 'subtract':
-						return 'remove';
+						return 'mdi-minus';
 				}
 			},
 			toggleAdd(){
diff --git a/app/imports/ui/components/global/DatePicker.vue b/app/imports/ui/components/global/DatePicker.vue
index 808eb998..7b70e44a 100644
--- a/app/imports/ui/components/global/DatePicker.vue
+++ b/app/imports/ui/components/global/DatePicker.vue
@@ -11,7 +11,7 @@
       <v-text-field
         :value="formattedSafeValue"
         v-bind="$attrs"
-        prepend-icon="event"
+        prepend-icon="mdi-calendar"
         readonly
         :loading="loading"
         :error-messages="errors"
diff --git a/app/imports/ui/components/global/IconPicker.vue b/app/imports/ui/components/global/IconPicker.vue
index d44570ad..d86419de 100644
--- a/app/imports/ui/components/global/IconPicker.vue
+++ b/app/imports/ui/components/global/IconPicker.vue
@@ -24,29 +24,29 @@
             v-else
             large
           >
-            highlight_alt
+            mdi-select-search
           </v-icon>
         </v-btn>
       </div>
     </template>
     <v-card>
       <v-card-text>
-        <div class="layout">
+        <div class="layout row align-center">
           <text-field
             ref="iconSearchField"
             label="Search icons"
-            append-icon="search"
+            append-icon="mdi-search"
             clearable
+            hide-details
+            class="ma-2"
             :value="searchString"
             @change="search"
           />
           <v-btn
-            icon
+            text
             @click="select()"
           >
-            <v-icon>
-              cancel
-            </v-icon>
+            clear
           </v-btn>
         </div>
         <v-layout
diff --git a/app/imports/ui/components/propertyToolbar.vue b/app/imports/ui/components/propertyToolbar.vue
index 0bd2c669..c6b474be 100644
--- a/app/imports/ui/components/propertyToolbar.vue
+++ b/app/imports/ui/components/propertyToolbar.vue
@@ -10,7 +10,7 @@
       icon
       @click="back"
     >
-      <v-icon>arrow_back</v-icon>
+      <v-icon>mdi-arrow-left</v-icon>
     </v-btn>
     <property-icon
       :model="model"
@@ -50,7 +50,7 @@
               data-id="property-toolbar-menu-button"
               v-on="on"
             >
-              <v-icon>more_vert</v-icon>
+              <v-icon>mdi-dots-vertical</v-icon>
             </v-btn>
           </template>
           <v-list>
@@ -64,7 +64,7 @@
                 </v-list-item-title>
               </v-list-item-content>
               <v-list-item-action>
-                <v-icon>file_copy</v-icon>
+                <v-icon>mdi-content-copy</v-icon>
               </v-list-item-action>
             </v-list-item>
             <v-list-item
@@ -77,7 +77,7 @@
                 </v-list-item-title>
               </v-list-item-content>
               <v-list-item-action>
-                <v-icon>send</v-icon>
+                <v-icon>mdi-send</v-icon>
               </v-list-item-action>
             </v-list-item>
             <v-list-item
@@ -90,7 +90,7 @@
                 </v-list-item-title>
               </v-list-item-content>
               <v-list-item-action>
-                <v-icon>delete</v-icon>
+                <v-icon>mdi-delete</v-icon>
               </v-list-item-action>
             </v-list-item>
           </v-list>
@@ -112,13 +112,13 @@
           v-if="editing"
           key="doneIcon"
         >
-          done
+          mdi-check
         </v-icon>
         <v-icon
           v-else
           key="createIcon"
         >
-          create
+          mdi-pencil
         </v-icon>
       </v-slide-y-transition>
     </v-btn>
diff --git a/app/imports/ui/components/snackbars/SnackbarQueue.vue b/app/imports/ui/components/snackbars/SnackbarQueue.vue
index 0cd0ecd6..78a6c550 100644
--- a/app/imports/ui/components/snackbars/SnackbarQueue.vue
+++ b/app/imports/ui/components/snackbars/SnackbarQueue.vue
@@ -32,7 +32,7 @@
         v-bind="attrs"
         @click="closeSnackbar"
       >
-        <v-icon>close</v-icon>
+        <v-icon>mdi-close</v-icon>
       </v-btn>
     </template>
   </v-snackbar>
diff --git a/app/imports/ui/components/tree/TreeNode.vue b/app/imports/ui/components/tree/TreeNode.vue
index 321347df..c535eb3e 100644
--- a/app/imports/ui/components/tree/TreeNode.vue
+++ b/app/imports/ui/components/tree/TreeNode.vue
@@ -18,7 +18,7 @@
         @click.stop="expanded = !expanded"
       >
         <v-icon v-if="canExpand && (hasChildren || organize)">
-          chevron_right
+          mdi-chevron-right
         </v-icon>
       </v-btn>
       <div
@@ -31,7 +31,7 @@
           :class="selected && 'primary--text'"
           :disabled="expanded"
         >
-          drag_handle
+          mdi-drag
         </v-icon>
         <!--{{node && node.order}}-->
         <tree-node-view
diff --git a/app/imports/ui/creature/RestButton.vue b/app/imports/ui/creature/RestButton.vue
index 81974af2..ffd19676 100644
--- a/app/imports/ui/creature/RestButton.vue
+++ b/app/imports/ui/creature/RestButton.vue
@@ -7,7 +7,7 @@
     @click="rest"
   >
     <v-icon left>
-      {{ type === 'shortRest' ? 'snooze' : 'bedtime' }}
+      {{ type === 'shortRest' ? 'mdi-music-rest-quarter' : 'mdi-bed' }}
     </v-icon>
     {{ type === 'shortRest' ? 'Short Rest' : 'Long Rest' }}
   </v-btn>
diff --git a/app/imports/ui/creature/character/CharacterSheetFab.vue b/app/imports/ui/creature/character/CharacterSheetFab.vue
index abcd83c4..bd8de830 100644
--- a/app/imports/ui/creature/character/CharacterSheetFab.vue
+++ b/app/imports/ui/creature/character/CharacterSheetFab.vue
@@ -20,7 +20,7 @@
             style="transition: transform 0.2s ease-in-out"
             :style="fab && 'transform: rotate(45deg)'"
           >
-            add
+            mdi-plus
           </v-icon>
         </transition>
       </v-btn>
@@ -42,7 +42,7 @@
         color="primary"
         data-id="insert-creature-property-btn"
         label="New Property"
-        icon="create"
+        icon="mdi-pencil"
         :disabled="!editPermission"
         @click="insertTreeProperty"
       />
@@ -51,7 +51,7 @@
         color="primary"
         data-id="insert-creature-property-from-library-btn"
         label="Property From Library"
-        icon="book"
+        icon="mdi-library-shelves"
         :disabled="!editPermission"
         @click="propertyFromLibrary"
       />
diff --git a/app/imports/ui/creature/character/CharacterSheetToolbar.vue b/app/imports/ui/creature/character/CharacterSheetToolbar.vue
index 71b9b067..67a18d33 100644
--- a/app/imports/ui/creature/character/CharacterSheetToolbar.vue
+++ b/app/imports/ui/creature/character/CharacterSheetToolbar.vue
@@ -37,30 +37,30 @@
                 icon
                 v-on="on"
               >
-                <v-icon>more_vert</v-icon>
+                <v-icon>mdi-dots-vertical</v-icon>
               </v-btn>
             </template>
             <v-list v-if="editPermission">
               <v-list-item @click="deleteCharacter">
                 <v-list-item-title>
-                  <v-icon>delete</v-icon> Delete
+                  <v-icon>mdi-delete</v-icon> Delete
                 </v-list-item-title>
               </v-list-item>
               <v-list-item @click="showCharacterForm">
                 <v-list-item-title>
-                  <v-icon>create</v-icon> Edit details
+                  <v-icon>mdi-pencil</v-icon> Edit details
                 </v-list-item-title>
               </v-list-item>
               <v-list-item @click="showShareDialog">
                 <v-list-item-title>
-                  <v-icon>share</v-icon> Sharing
+                  <v-icon>mdi-share-variant</v-icon> Sharing
                 </v-list-item-title>
               </v-list-item>
             </v-list>
             <v-list v-else>
               <v-list-item @click="unshareWithMe">
                 <v-list-item-title>
-                  <v-icon>delete</v-icon> Unshare with me
+                  <v-icon>mdi-delete</v-icon> Unshare with me
                 </v-list-item-title>
               </v-list-item>
             </v-list>
diff --git a/app/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue b/app/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue
index fcfb2200..f3242ee1 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue
@@ -73,7 +73,7 @@
                   data-id="experience-info-button"
                   @click="showExperienceList"
                 >
-                  <v-icon>info</v-icon>
+                  <v-icon>mdi-information-outline</v-icon>
                 </v-btn>
               </v-list-item-action>
               <v-list-item-action>
@@ -82,7 +82,7 @@
                   data-id="experience-add-button"
                   @click="addExperience"
                 >
-                  <v-icon>add</v-icon>
+                  <v-icon>mdi-plus</v-icon>
                 </v-btn>
               </v-list-item-action>
             </v-list-item>
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index 0add6e64..273a534b 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -45,7 +45,7 @@
                   icon
                   @click.stop="softRemove(buff._id)"
                 >
-                  <v-icon>delete</v-icon>
+                  <v-icon>mdi-delete</v-icon>
                 </v-btn>
               </v-list-item-action>
             </v-list-item>
diff --git a/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue b/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue
index 3c35ae41..b02a814c 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue
@@ -28,7 +28,7 @@
               slot="extension"
               v-model="filterString"
               :items="filterOptions"
-              prepend-inner-icon="search"
+              prepend-inner-icon="mdi-search"
               class="mx-4"
               hide-no-data
               hide-selected
diff --git a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue b/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
index c7f85f46..2cd94af0 100644
--- a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
+++ b/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
@@ -8,7 +8,7 @@
         v-if="index !== 0"
         :key="index"
       >
-        chevron_right
+        mdi-chevron-right
       </v-icon>
       <span
         v-if="noLinks"
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
index 83270559..0bdd9375 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
+++ b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
@@ -53,7 +53,7 @@
           data-id="insert-creature-property-btn"
           @click="addProperty"
         >
-          <v-icon>add</v-icon>
+          <v-icon>mdi-plus</v-icon>
           Property
         </v-btn>
       </template>
diff --git a/app/imports/ui/creature/experiences/ExperienceListDialog.vue b/app/imports/ui/creature/experiences/ExperienceListDialog.vue
index 61e46ef1..8fa8d1e2 100644
--- a/app/imports/ui/creature/experiences/ExperienceListDialog.vue
+++ b/app/imports/ui/creature/experiences/ExperienceListDialog.vue
@@ -10,13 +10,13 @@
         data-id="experience-add-button"
         @click="addExperience"
       >
-        <v-icon>add</v-icon>
+        <v-icon>mdi-plus</v-icon>
       </v-btn>
       <v-btn
         icon
         @click="recompute"
       >
-        <v-icon>refresh</v-icon>
+        <v-icon>mdi-refresh</v-icon>
       </v-btn>
     </template>
     <div
@@ -76,7 +76,7 @@
               :loading="experiencesRemovalLoading.has(experience._id)"
               @click="removeExperience(experience._id)"
             >
-              <v-icon>delete</v-icon>
+              <v-icon>mdi-delete</v-icon>
             </v-btn>
           </v-list-item-action>
         </v-list-item>
diff --git a/app/imports/ui/creature/slots/SlotFillDialog.vue b/app/imports/ui/creature/slots/SlotFillDialog.vue
index 29c98f91..bda05e19 100644
--- a/app/imports/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/ui/creature/slots/SlotFillDialog.vue
@@ -9,7 +9,7 @@
       </v-toolbar-title>
       <v-spacer />
       <text-field
-        prepend-inner-icon="search"
+        prepend-inner-icon="mdi-search"
         regular
         hide-details
         :value="searchValue"
diff --git a/app/imports/ui/creature/slots/Slots.vue b/app/imports/ui/creature/slots/Slots.vue
index 1e4d5211..1d7e1bb0 100644
--- a/app/imports/ui/creature/slots/Slots.vue
+++ b/app/imports/ui/creature/slots/Slots.vue
@@ -31,7 +31,7 @@
               small
               @click.stop="remove(child)"
             >
-              <v-icon>delete</v-icon>
+              <v-icon>mdi-delete</v-icon>
             </v-btn>
           </v-list-item-action>
         </v-list-item>
@@ -44,7 +44,7 @@
         style="background-color: inherit;"
         @click="fillSlot(slot)"
       >
-        <v-icon>add</v-icon>
+        <v-icon>mdi-plus</v-icon>
       </v-btn>
     </div>
   </div>
diff --git a/app/imports/ui/dialogStack/DialogBase.vue b/app/imports/ui/dialogStack/DialogBase.vue
index fda72bdd..426c7a54 100644
--- a/app/imports/ui/dialogStack/DialogBase.vue
+++ b/app/imports/ui/dialogStack/DialogBase.vue
@@ -18,7 +18,7 @@
           icon
           @click="back"
         >
-          <v-icon>arrow_back</v-icon>
+          <v-icon>mdi-arrow-left</v-icon>
         </v-btn>
         <slot name="toolbar" />
       </v-toolbar>
diff --git a/app/imports/ui/documentation/FunctionReference.vue b/app/imports/ui/documentation/FunctionReference.vue
index 078f526f..b8172fbd 100644
--- a/app/imports/ui/documentation/FunctionReference.vue
+++ b/app/imports/ui/documentation/FunctionReference.vue
@@ -18,7 +18,7 @@
             <code>{{ example.input }}</code>
           </td>
           <td>
-            <v-icon>arrow_right_alt</v-icon>
+            <v-icon>mdi-arrow-right-thick</v-icon>
           </td>
           <td>
             <code>{{ example.result }}</code>
diff --git a/app/imports/ui/layouts/Sidebar.vue b/app/imports/ui/layouts/Sidebar.vue
index bab7781d..8a8f7c7b 100644
--- a/app/imports/ui/layouts/Sidebar.vue
+++ b/app/imports/ui/layouts/Sidebar.vue
@@ -28,7 +28,7 @@
                 to="/account"
                 v-on="on"
               >
-                <v-icon>settings</v-icon>
+                <v-icon>mdi-cog</v-icon>
               </v-btn>
             </template>
             <span>Account Settings</span>
@@ -48,6 +48,9 @@
         <v-list-item-title>
           {{ link.title }}
         </v-list-item-title>
+        <v-icon v-if="link.href">
+          mdi-open-in-new
+        </v-icon>
       </v-list-item>
       <v-divider />
     </v-list>
@@ -125,15 +128,15 @@
       links(){
         let isLoggedIn = !!Meteor.userId();
         let links = [
-          {title: 'Home', icon: 'home', to: '/'},
-          {title: 'Characters', icon: 'portrait', to: '/characterList', requireLogin: true},
-          {title: 'Library', icon: 'book', to: '/library', requireLogin: true},
+          {title: 'Home', icon: 'mdi-home', to: '/'},
+          {title: 'Characters', icon: 'mdi-account-group', to: '/characterList', requireLogin: true},
+          {title: 'Library', icon: 'mdi-library-shelves', to: '/library', requireLogin: true},
           //{title: 'Tabletops', icon: 'api', to: '/tabletops', requireLogin: true},
           //{title: 'Friends', icon: 'people', to: '/friends', requireLogin: true},
-          {title: 'Feedback', icon: 'bug_report', to: '/feedback'},
-          {title: 'About', icon: 'subject', to: '/about'},
-          {title: 'Patreon', icon: '', href: 'https://www.patreon.com/dicecloud'},
-          {title: 'Github', icon: '', href: 'https://github.com/ThaumRystra/DiceCloud/tree/version-2'},
+          {title: 'Feedback', icon: 'mdi-bug', to: '/feedback'},
+          {title: 'About', icon: 'mdi-sign-text', to: '/about'},
+          {title: 'Patreon', icon: 'mdi-patreon', href: 'https://www.patreon.com/dicecloud'},
+          {title: 'Github', icon: 'mdi-github', href: 'https://github.com/ThaumRystra/DiceCloud/tree/version-2'},
         ];
         return links.filter(link => !link.requireLogin || isLoggedIn);
       },
diff --git a/app/imports/ui/library/InsertLibraryNodeButton.vue b/app/imports/ui/library/InsertLibraryNodeButton.vue
index a881d367..c9e4ba0f 100644
--- a/app/imports/ui/library/InsertLibraryNodeButton.vue
+++ b/app/imports/ui/library/InsertLibraryNodeButton.vue
@@ -7,7 +7,7 @@
     data-id="insert-library-node-button"
     @click="insertLibraryNode"
   >
-    <v-icon>add</v-icon>
+    <v-icon>mdi-plus</v-icon>
     <slot />
   </v-btn>
 </template>
diff --git a/app/imports/ui/library/LibraryBrowser.vue b/app/imports/ui/library/LibraryBrowser.vue
index 0af63ee8..1b205920 100644
--- a/app/imports/ui/library/LibraryBrowser.vue
+++ b/app/imports/ui/library/LibraryBrowser.vue
@@ -38,7 +38,7 @@
               small
               @click="$router.push(`/library/${library._id}`)"
             >
-              <v-icon>arrow_forward</v-icon>
+              <v-icon>mdi-arrow-right</v-icon>
             </v-btn>
           </v-layout>
           <library-contents-container
@@ -61,7 +61,7 @@
       data-id="insert-library-button"
       @click="insertLibrary"
     >
-      <v-icon>add</v-icon>
+      <v-icon>mdi-plus</v-icon>
       New library
     </v-btn>
   </div>
diff --git a/app/imports/ui/library/LibraryEditDialog.vue b/app/imports/ui/library/LibraryEditDialog.vue
index 735cedee..1c65dba3 100644
--- a/app/imports/ui/library/LibraryEditDialog.vue
+++ b/app/imports/ui/library/LibraryEditDialog.vue
@@ -10,14 +10,14 @@
         data-id="share-library-button"
         @click="share"
       >
-        <v-icon>share</v-icon>
+        <v-icon>mdi-share-variant</v-icon>
       </v-btn>
       <v-btn
         icon
         data-id="delete-library-button"
         @click="remove"
       >
-        <v-icon>delete</v-icon>
+        <v-icon>mdi-delete</v-icon>
       </v-btn>
     </template>
     <template v-if="model">
diff --git a/app/imports/ui/library/SingleLibraryToolbar.vue b/app/imports/ui/library/SingleLibraryToolbar.vue
index 9c275b3b..24d19b75 100644
--- a/app/imports/ui/library/SingleLibraryToolbar.vue
+++ b/app/imports/ui/library/SingleLibraryToolbar.vue
@@ -12,7 +12,7 @@
       icon
       @click="$router.push('/library')"
     >
-      <v-icon>arrow_back</v-icon>
+      <v-icon>mdi-arrow-left</v-icon>
     </v-btn>
     <v-toolbar-title>
       {{ library && library.name }}
@@ -32,7 +32,7 @@
       data-id="library-edit-button"
       @click="editLibrary(library._id)"
     >
-      <v-icon>settings</v-icon>
+      <v-icon>mdi-cog</v-icon>
     </v-btn>
   </v-app-bar>
 </template>
diff --git a/app/imports/ui/log/CharacterLog.vue b/app/imports/ui/log/CharacterLog.vue
index f9d9b622..28c6d8a6 100644
--- a/app/imports/ui/log/CharacterLog.vue
+++ b/app/imports/ui/log/CharacterLog.vue
@@ -21,7 +21,7 @@
         class="mx-2 mb-2"
         persistent-hint
         style="flex-grow: 0"
-        append-outer-icon="send"
+        append-outer-icon="mdi-send"
         :hint="inputHint"
         :error-messages="inputError"
         :disabled="!editPermission"
diff --git a/app/imports/ui/pages/Account.vue b/app/imports/ui/pages/Account.vue
index e230c464..f09d1d51 100644
--- a/app/imports/ui/pages/Account.vue
+++ b/app/imports/ui/pages/Account.vue
@@ -42,7 +42,7 @@
                   v-on="on"
                   @click="changeUsername"
                 >
-                  <v-icon>create</v-icon>
+                  <v-icon>mdi-pencil</v-icon>
                 </v-btn>
               </template>
               <span>Change Username</span>
@@ -77,7 +77,7 @@
                   v-on="on"
                   @click="updatePatreon"
                 >
-                  <v-icon>refresh</v-icon>
+                  <v-icon>mdi-refresh</v-icon>
                 </v-btn>
               </template>
               <span>Refresh Patreon status</span>
@@ -136,7 +136,7 @@
                 </v-list-item-title>
               </v-list-item-content>
               <v-list-item-action>
-                <v-icon>mail_outline</v-icon>
+                <v-icon>mdi-email-outline</v-icon>
               </v-list-item-action>
             </v-list-item>
             <v-divider
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index f6ef8523..bc288b68 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -22,7 +22,7 @@
       data-id="new-character-button"
       @click="insertCharacter"
     >
-      <v-icon>add</v-icon>
+      <v-icon>mdi-plus</v-icon>
     </v-btn>
   </div>
 </template>
diff --git a/app/imports/ui/pages/Friends.vue b/app/imports/ui/pages/Friends.vue
index ba98ea17..5a7abd9d 100644
--- a/app/imports/ui/pages/Friends.vue
+++ b/app/imports/ui/pages/Friends.vue
@@ -10,7 +10,7 @@
         right
         fab
       >
-        <v-icon>add</v-icon>
+        <v-icon>mdi-plus</v-icon>
       </v-btn>
     </v-sheet>
   </div>
diff --git a/app/imports/ui/pages/Home.vue b/app/imports/ui/pages/Home.vue
index 3a516202..1b638bc8 100644
--- a/app/imports/ui/pages/Home.vue
+++ b/app/imports/ui/pages/Home.vue
@@ -37,7 +37,7 @@
             x-large
             class="ma-2"
           >
-            money_off
+            mdi-currency-usd-off
           </v-icon>
           <h3 class="mb-2">
             Free, open source, community funded
@@ -55,7 +55,7 @@
             x-large
             class="ma-2"
           >
-            ballot
+            mdi-ballot-outline
           </v-icon>
           <h3 class="mb-2">
             Character sheets optimised for one ruleset
@@ -73,7 +73,7 @@
             x-large
             class="ma-2"
           >
-            scatter_plot
+            mdi-file-tree-outline
           </v-icon>
           <h3 class="mb-2">
             Inventory manager
diff --git a/app/imports/ui/pages/Tabletops.vue b/app/imports/ui/pages/Tabletops.vue
index 8cd5c4ad..24f68157 100644
--- a/app/imports/ui/pages/Tabletops.vue
+++ b/app/imports/ui/pages/Tabletops.vue
@@ -28,7 +28,7 @@
       :loading="addTabletopLoading"
       @click="addTabletop"
     >
-      <v-icon>add</v-icon>
+      <v-icon>mdi-plus</v-icon>
     </v-btn>
   </single-card-layout>
 </template>
diff --git a/app/imports/ui/properties/components/attributes/HitDiceListTile.vue b/app/imports/ui/properties/components/attributes/HitDiceListTile.vue
index c1e7d431..6a0f1644 100644
--- a/app/imports/ui/properties/components/attributes/HitDiceListTile.vue
+++ b/app/imports/ui/properties/components/attributes/HitDiceListTile.vue
@@ -19,7 +19,7 @@
             :disabled="currentValue >= model.value || context.editPermission === false"
             @click="increment(1)"
           >
-            <v-icon>arrow_drop_up</v-icon>
+            <v-icon>mdi-chevron-up</v-icon>
           </v-btn>
           <v-btn
             icon
@@ -27,7 +27,7 @@
             :disabled="currentValue <= 0 || context.editPermission === false"
             @click="increment(-1)"
           >
-            <v-icon>arrow_drop_down</v-icon>
+            <v-icon>mdi-chevron-down</v-icon>
           </v-btn>
         </v-layout>
 
diff --git a/app/imports/ui/properties/components/attributes/ResourceCard.vue b/app/imports/ui/properties/components/attributes/ResourceCard.vue
index c63f77f4..a9546d18 100644
--- a/app/imports/ui/properties/components/attributes/ResourceCard.vue
+++ b/app/imports/ui/properties/components/attributes/ResourceCard.vue
@@ -11,7 +11,7 @@
           :disabled="currentValue >= value || context.editPermission === false"
           @click="increment(1)"
         >
-          <v-icon>arrow_drop_up</v-icon>
+          <v-icon>mdi-chevron-up</v-icon>
         </v-btn>
         <v-btn
           icon
@@ -19,7 +19,7 @@
           :disabled="currentValue <= 0 || context.editPermission === false"
           @click="increment(-1)"
         >
-          <v-icon>arrow_drop_down</v-icon>
+          <v-icon>mdi-chevron-down</v-icon>
         </v-btn>
       </div>
       <div
diff --git a/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue b/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
index d5687581..4156f467 100644
--- a/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
+++ b/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
@@ -30,8 +30,8 @@
           >
             {{
               i > model.currentValue ?
-                'radio_button_unchecked' :
-                'radio_button_checked'
+                'mdi-radiobox-blank' :
+                'mdi-radiobox-marked'
             }}
           </v-icon>
         </div>
diff --git a/app/imports/ui/properties/components/inventory/ItemListTile.vue b/app/imports/ui/properties/components/inventory/ItemListTile.vue
index 9729ddc9..8a7a599d 100644
--- a/app/imports/ui/properties/components/inventory/ItemListTile.vue
+++ b/app/imports/ui/properties/components/inventory/ItemListTile.vue
@@ -41,7 +41,7 @@
         style="height: 100%; width: 40px; cursor: move;"
         class="handle"
       >
-        drag_indicator
+        mdi-drag
       </v-icon>
     </v-list-item-action>
   </v-list-item>
diff --git a/app/imports/ui/properties/components/skills/SkillListTile.vue b/app/imports/ui/properties/components/skills/SkillListTile.vue
index b428a073..0ab9be72 100644
--- a/app/imports/ui/properties/components/skills/SkillListTile.vue
+++ b/app/imports/ui/properties/components/skills/SkillListTile.vue
@@ -53,15 +53,15 @@ export default {
 	computed: {
 		icon(){
       if (this.model.proficiency == 0.49){
-				return 'brightness_3';
+				return 'mdi-brightness-3';
 			} else if (this.model.proficiency == 0.5){
-				return 'brightness_2';
+				return 'mdi-brightness-2';
 			} else if (this.model.proficiency == 1) {
-				return 'brightness_1'
+				return 'mdi-brightness-1'
 			} else if (this.model.proficiency == 2){
 				return 'album'
 			} else {
-				return 'radio_button_unchecked';
+				return 'mdi-radiobox-blank';
 			}
 		},
 		displayedModifier(){
diff --git a/app/imports/ui/properties/components/skills/SkillProficiency.vue b/app/imports/ui/properties/components/skills/SkillProficiency.vue
index a2782b73..6a504aa8 100644
--- a/app/imports/ui/properties/components/skills/SkillProficiency.vue
+++ b/app/imports/ui/properties/components/skills/SkillProficiency.vue
@@ -59,15 +59,15 @@
     computed: {
       icon(){
         if (this.model.value == 0.49){
-          return 'brightness_3';
+          return 'mdi-brightness-3';
         } else if (this.model.value == 0.5) {
-          return 'brightness_2'
+          return 'mdi-brightness-2'
         } else if (this.model.value == 1) {
-          return 'brightness_1'
+          return 'mdi-brightness-1'
         } else if (this.model.value == 2){
           return 'album'
         } else {
-          return 'radio_button_unchecked';
+          return 'mdi-radiobox-blank';
         }
       },
       proficiencyText(){
diff --git a/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue b/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue
index 8306bf94..f9a9470e 100644
--- a/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue
+++ b/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue
@@ -8,7 +8,7 @@
       <text-field
         ref="focusFirst"
         label="Name"
-        prepend-inner-icon="search"
+        prepend-inner-icon="mdi-search"
         regular
         hide-details
         :value="searchValue"
@@ -27,7 +27,7 @@
             :class="{'primary--text': filtersApplied}"
             v-on="on"
           >
-            <v-icon>filter_list</v-icon>
+            <v-icon>mdi-filter</v-icon>
           </v-btn>
         </template>
         <v-list>
diff --git a/app/imports/ui/properties/components/spells/SpellListCard.vue b/app/imports/ui/properties/components/spells/SpellListCard.vue
index 83995482..ff8a7b07 100644
--- a/app/imports/ui/properties/components/spells/SpellListCard.vue
+++ b/app/imports/ui/properties/components/spells/SpellListCard.vue
@@ -21,7 +21,7 @@
             v-on="on"
             @click.stop
           >
-            <v-icon>more_vert</v-icon>
+            <v-icon>mdi-dots-vertical</v-icon>
           </v-btn>
         </template>
         <v-list class="pa-2">
diff --git a/app/imports/ui/properties/components/spells/SpellListTile.vue b/app/imports/ui/properties/components/spells/SpellListTile.vue
index 78da4462..fc04f786 100644
--- a/app/imports/ui/properties/components/spells/SpellListTile.vue
+++ b/app/imports/ui/properties/components/spells/SpellListTile.vue
@@ -32,7 +32,7 @@
         style="height: 100%; width: 40px; cursor: move;"
         class="handle"
       >
-        drag_indicator
+        mdi-drag
       </v-icon>
       <v-btn
         v-else-if="showInfoButton"
@@ -41,7 +41,7 @@
         :data-id="`spell-info-btn-${model._id}`"
         @click.stop="$emit('show-info')"
       >
-        <v-icon>info</v-icon>
+        <v-icon>mdi-information</v-icon>
       </v-btn>
     </v-list-item-action>
   </v-list-item>
diff --git a/app/imports/ui/properties/forms/AttributesConsumedListForm.vue b/app/imports/ui/properties/forms/AttributesConsumedListForm.vue
index 4c32001a..d86652bc 100644
--- a/app/imports/ui/properties/forms/AttributesConsumedListForm.vue
+++ b/app/imports/ui/properties/forms/AttributesConsumedListForm.vue
@@ -19,7 +19,7 @@
             class="ma-3"
             @click="$emit('pull', {path: [i]})"
           >
-            <v-icon>delete</v-icon>
+            <v-icon>mdi-delete</v-icon>
           </v-btn>
         </div>
       </div>
diff --git a/app/imports/ui/properties/forms/EffectForm.vue b/app/imports/ui/properties/forms/EffectForm.vue
index 6157b74e..8200a4a4 100644
--- a/app/imports/ui/properties/forms/EffectForm.vue
+++ b/app/imports/ui/properties/forms/EffectForm.vue
@@ -9,7 +9,7 @@
     />
     <smart-select
       label="Operation"
-      append-icon="arrow_drop_down"
+      append-icon="mdi-menu-down"
       class="mx-2"
       :error-messages="errors.operation"
       :menu-props="{transition: 'slide-y-transition', lazy: true}"
diff --git a/app/imports/ui/properties/forms/ItemsConsumedListForm.vue b/app/imports/ui/properties/forms/ItemsConsumedListForm.vue
index 89e955e5..69d05fcd 100644
--- a/app/imports/ui/properties/forms/ItemsConsumedListForm.vue
+++ b/app/imports/ui/properties/forms/ItemsConsumedListForm.vue
@@ -19,7 +19,7 @@
             class="ma-3"
             @click="$emit('pull', {path: [i]})"
           >
-            <v-icon>delete</v-icon>
+            <v-icon>mdi-delete</v-icon>
           </v-btn>
         </div>
       </div>
diff --git a/app/imports/ui/properties/forms/ReferenceForm.vue b/app/imports/ui/properties/forms/ReferenceForm.vue
index 27df3b78..fde536d6 100644
--- a/app/imports/ui/properties/forms/ReferenceForm.vue
+++ b/app/imports/ui/properties/forms/ReferenceForm.vue
@@ -13,8 +13,8 @@
       "
       :hint="model.cache.library && model.cache.library.name"
       :error-messages="model.cache.error || errors.ref"
-      prepend-inner-icon="link"
-      append-icon="refresh"
+      prepend-inner-icon="mdi-vector-link"
+      append-icon="mdi-refresh"
       data-id="change-ref"
       @click="changeReference"
       @click:prepend-inner="changeReference"
diff --git a/app/imports/ui/properties/forms/ResourcesForm.vue b/app/imports/ui/properties/forms/ResourcesForm.vue
index f56c63d2..201915e4 100644
--- a/app/imports/ui/properties/forms/ResourcesForm.vue
+++ b/app/imports/ui/properties/forms/ResourcesForm.vue
@@ -34,7 +34,7 @@
             outlined
             v-on="on"
           >
-            <v-icon>add</v-icon>
+            <v-icon>mdi-plus</v-icon>
           </v-btn>
         </template>
         <v-list>
diff --git a/app/imports/ui/properties/forms/shared/ProficiencySelect.vue b/app/imports/ui/properties/forms/shared/ProficiencySelect.vue
index 8183c00b..42475c22 100644
--- a/app/imports/ui/properties/forms/shared/ProficiencySelect.vue
+++ b/app/imports/ui/properties/forms/shared/ProficiencySelect.vue
@@ -1,6 +1,6 @@
 <template lang="html">
   <smart-select
-    append-icon="arrow_drop_down"
+    append-icon="mdi-menu-down"
     :clearable="clearable"
     class="ml-3"
     v-bind="$attrs"
@@ -23,15 +23,15 @@
 	const ICON_SPIN_DURATION = 300;
 	let proficiencyIcon = function(value){
     if (value == 0.49){
-			return 'brightness_3';
+			return 'mdi-brightness-3';
 		} else if (value == 0.5){
-			return 'brightness_2';
+			return 'mdi-brightness-2';
 		} else if (value == 1) {
-			return 'brightness_1'
+			return 'mdi-brightness-1'
 		} else if (value == 2){
 			return 'album'
 		} else {
-			return 'radio_button_unchecked';
+			return 'mdi-radiobox-blank';
 		}
 	};
 
@@ -47,7 +47,7 @@
       },
 		},
 		data(){ return {
-			displayedIcon: 'radio_button_unchecked',
+			displayedIcon: 'mdi-radiobox-blank',
 			iconClass: '',
 			values: [
 				{value: 1, text: 'Proficient'},
diff --git a/app/imports/ui/properties/shared/ProficiencyIcon.vue b/app/imports/ui/properties/shared/ProficiencyIcon.vue
index 1c332fff..0a5f1d94 100644
--- a/app/imports/ui/properties/shared/ProficiencyIcon.vue
+++ b/app/imports/ui/properties/shared/ProficiencyIcon.vue
@@ -13,13 +13,13 @@ export default {
 		displayedIcon(){
 			let value = this.value;
 			if (value == 0.5){
-				return 'brightness_2';
+				return 'mdi-brightness-2';
 			} else if (value == 1) {
-				return 'brightness_1'
+				return 'mdi-brightness-1'
 			} else if (value == 2){
 				return 'album'
 			} else {
-				return 'radio_button_unchecked';
+				return 'mdi-radiobox-blank';
 			}
 		}
 	}
diff --git a/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue b/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue
index c7765108..813c6782 100644
--- a/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue
+++ b/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue
@@ -28,7 +28,7 @@ export default {
   computed: {
 		icon(){
       if (this.model.damageType === 'healing'){
-        return 'group_work'
+        return 'mdi-hospital-box-outline'
       } else {
         return getPropertyIcon('damage');
       }
diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/ui/properties/viewers/SkillViewer.vue
index 45d402c3..236a68c7 100644
--- a/app/imports/ui/properties/viewers/SkillViewer.vue
+++ b/app/imports/ui/properties/viewers/SkillViewer.vue
@@ -110,15 +110,15 @@ export default {
 		},
     icon(){
 			if (this.model.proficiency == 0.49){
-				return 'brightness_3';
+				return 'mdi-brightness-3';
 			} else if (this.model.proficiency == 0.5){
-				return 'brightness_2';
+				return 'mdi-brightness-2';
 			} else if (this.model.proficiency == 1) {
-				return 'brightness_1'
+				return 'mdi-brightness-1'
 			} else if (this.model.proficiency == 2){
 				return 'album'
 			} else {
-				return 'radio_button_unchecked';
+				return 'mdi-radiobox-blank';
 			}
 		},
   },
diff --git a/app/imports/ui/sharing/ShareDialog.vue b/app/imports/ui/sharing/ShareDialog.vue
index 2fc10970..ecedf571 100644
--- a/app/imports/ui/sharing/ShareDialog.vue
+++ b/app/imports/ui/sharing/ShareDialog.vue
@@ -62,7 +62,7 @@
                   icon
                   v-on="on"
                 >
-                  <v-icon>more_vert</v-icon>
+                  <v-icon>mdi-dots-vertical</v-icon>
                 </v-btn>
               </template>
               <v-list>
@@ -71,7 +71,7 @@
                   @click="updateSharing(user._id, 'writer')"
                 >
                   <v-list-item-action>
-                    <v-icon>create</v-icon>
+                    <v-icon>mdi-pencil</v-icon>
                   </v-list-item-action>
                   <v-list-item-title>Can edit</v-list-item-title>
                 </v-list-item>
@@ -80,13 +80,13 @@
                   @click="updateSharing(user._id, 'reader')"
                 >
                   <v-list-item-action>
-                    <v-icon>remove_red_eye</v-icon>
+                    <v-icon>mdi-eye</v-icon>
                   </v-list-item-action>
                   <v-list-item-title>View only</v-list-item-title>
                 </v-list-item>
                 <v-list-item @click="updateSharing(user._id, 'none')">
                   <v-list-item-action>
-                    <v-icon>delete</v-icon>
+                    <v-icon>mdi-delete</v-icon>
                   </v-list-item-action>
                   <v-list-item-title>Remove</v-list-item-title>
                 </v-list-item>
diff --git a/app/imports/ui/tabletop/TabletopComponent.vue b/app/imports/ui/tabletop/TabletopComponent.vue
index 5f00c26b..e74f55eb 100644
--- a/app/imports/ui/tabletop/TabletopComponent.vue
+++ b/app/imports/ui/tabletop/TabletopComponent.vue
@@ -14,7 +14,7 @@
         @click="addCreature"
       >
         <div class="flex layout justify-center align-center">
-          <v-icon>add</v-icon>
+          <v-icon>mdi-plus</v-icon>
         </div>
         <v-card-title>
           Add creature
diff --git a/app/imports/ui/user/DeleteUserAccountDialog.vue b/app/imports/ui/user/DeleteUserAccountDialog.vue
index 680cd846..931dc992 100644
--- a/app/imports/ui/user/DeleteUserAccountDialog.vue
+++ b/app/imports/ui/user/DeleteUserAccountDialog.vue
@@ -7,7 +7,7 @@
       <h2>Are you sure you want to delete your account?</h2>
       <v-alert
         :value="true"
-        icon="warning"
+        icon="mdi-alert"
         color="error"
         outlined
       >
@@ -55,14 +55,14 @@
           label="Type your username or email"
           style="width: 350px;"
           :error-messages="usernameInputValid ? undefined : ' '"
-          :append-icon="usernameInputValid ? 'done' : undefined"
+          :append-icon="usernameInputValid ? 'mdi-check' : undefined"
         />
         <v-text-field
           v-model="verificationInput"
           label="To verify type 'delete my account'"
           style="width: 350px;"
           :error-messages="verificationInputValid ? undefined : ' '"
-          :append-icon="verificationInputValid ? 'done' : undefined"
+          :append-icon="verificationInputValid ? 'mdi-check' : undefined"
         />
         <v-btn
           class="mt-4"
diff --git a/app/imports/ui/utility/getEffectIcon.js b/app/imports/ui/utility/getEffectIcon.js
index bd30e5d5..87bd7d2f 100644
--- a/app/imports/ui/utility/getEffectIcon.js
+++ b/app/imports/ui/utility/getEffectIcon.js
@@ -1,15 +1,15 @@
 export default function getEffectIcon(op, value){
   switch(op) {
-    case 'base': return 'forward';
-    case 'add': return value < 0 ? 'remove' : 'add';
-    case 'mul': return 'clear';
-    case 'min': return 'unfold_more';
-    case 'max': return 'unfold_less';
-    case 'set': return 'push_pin';
-    case 'advantage': return 'arrow_upward';
-    case 'disadvantage': return 'arrow_downward';
-    case 'passiveAdd': return value < 0 ? 'remove_circle_outline' : 'add_circle_outline';
-    case 'fail': return 'block';
-    case 'conditional': return '*' ;
+    case 'base': return 'mdi-forward';
+    case 'add': return value < 0 ? 'mdi-minus' : 'mdi-plus';
+    case 'mul': return 'mdi-close';
+    case 'min': return 'mdi-arrow-expand-up';
+    case 'max': return 'mdi-arrow-expand-down';
+    case 'set': return 'mdi-pin';
+    case 'advantage': return 'mdi-chevron-double-up';
+    case 'disadvantage': return 'mdi-chevron-double-down';
+    case 'passiveAdd': return value < 0 ? 'mdi-minus-circle-outline' : 'mdi-plus-circle-outline';
+    case 'fail': return 'mdi-cancel';
+    case 'conditional': return 'mdi-asterisk' ;
   }
 }
diff --git a/app/imports/ui/vuetify.js b/app/imports/ui/vuetify.js
index 8a27dd60..cf671e62 100644
--- a/app/imports/ui/vuetify.js
+++ b/app/imports/ui/vuetify.js
@@ -22,7 +22,7 @@ let vuetify = new Vuetify({
     //options: { customProperties: true },
   },
   icons: {
-    iconfont: 'md',
+    iconfont: 'mdi',
     values: icons,
   }
 });

From 7056c5b37b1e2386868998be5628bff903b0de8c Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 10 Jun 2021 12:25:17 +0200
Subject: [PATCH 03/42] Added character slot limitations to tiers; added
 no-patreon tier for self hosting

---
 app/imports/api/users/patreon/tiers.js | 29 ++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/imports/api/users/patreon/tiers.js b/app/imports/api/users/patreon/tiers.js
index 8b16bfec..120b2593 100644
--- a/app/imports/api/users/patreon/tiers.js
+++ b/app/imports/api/users/patreon/tiers.js
@@ -1,58 +1,78 @@
 import { findLast } from 'lodash';
 import getEntitledCents from '/imports/api/users/patreon/getEntitledCents.js';
 import Invites from '/imports/api/users/Invites.js';
+const patreonDisabled = !!process.env.DISABLE_PATREON;
 
-const TIERS = [
+const TIERS = Object.freeze([
   {
     name: 'Commoner',
     minimumEntitledCents: 0,
     invites: 0,
+    characterSlots: 5,
     paidBenefits: false,
   }, {
     name: 'Dreamer',
     minimumEntitledCents: 100,
     invites: 0,
+    characterSlots: 5,
     paidBenefits: false,
   }, {
     name: 'Wanderer',
     minimumEntitledCents: 300,
     invites: 0,
+    characterSlots: 5,
     paidBenefits: false,
   }, {
     //cost per user $5
     name: 'Adventurer',
     minimumEntitledCents: 500,
     invites: 0,
+    characterSlots: 20,
     paidBenefits: true,
   }, {
     //cost per user $3.33
     name: 'Hero',
     minimumEntitledCents: 1000,
     invites: 2,
+    characterSlots: 50,
     paidBenefits: true,
   }, {
     //cost per user $3.333
     name: 'Legend',
     minimumEntitledCents: 2000,
     invites: 5,
+    characterSlots: 120,
     paidBenefits: true,
   }, {
     //cost per user $3.125
     name: 'Paragon',
     minimumEntitledCents: 5000,
     invites: 15,
+    characterSlots: -1, // Unlimited characters
     paidBenefits: true,
   },
-];
+]);
 
-const GUEST_TIER = {
+// Companion tier should be equivalent to the Adventurer tier
+const GUEST_TIER = Object.freeze({
   name: 'Companion',
   guest: true,
   invites: 0,
+  characterSlots: 20,
   paidBenefits: true,
-}
+});
+
+// When patreon features are disabled, give all the users the same tier
+// with no limitations
+const PATREON_DISABLED_TIER = Object.freeze({
+  name: 'Outlander',
+  invites: 0,
+  characterSlots: -1, // Can have infinitely many characters
+  paidBenefits: true,
+});
 
 export function getTierByEntitledCents(entitledCents = 0){
+  if (patreonDisabled) return PATREON_DISABLED_TIER;
   return findLast(TIERS, tier => entitledCents >= tier.minimumEntitledCents);
 }
 
@@ -66,6 +86,7 @@ export function getUserTier(user){
     });
     if (!user) throw 'User not found';
   }
+  if (patreonDisabled) return PATREON_DISABLED_TIER;
   const entitledCents = getEntitledCents(user);
   const tier = getTierByEntitledCents(entitledCents);
   if (tier.paidBenefits) return tier;

From 9994c1f32aaa4241cd2674de36dce679bece2009 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 10 Jun 2021 15:18:54 +0200
Subject: [PATCH 04/42] New users now get subscribed to the default libraries
 as defined by env

---
 app/imports/api/users/Users.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/imports/api/users/Users.js b/app/imports/api/users/Users.js
index 9bd75ac7..7b784909 100644
--- a/app/imports/api/users/Users.js
+++ b/app/imports/api/users/Users.js
@@ -2,6 +2,7 @@ import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import '/imports/api/users/deleteMyAccount.js';
+const defaultLibraries = process.env.DEFAULT_LIBRARIES && process.env.DEFAULT_LIBRARIES.split(',') || [];
 
 const userSchema = new SimpleSchema({
 	username: {
@@ -63,7 +64,7 @@ const userSchema = new SimpleSchema({
 	},
 	subscribedLibraries: {
 		type: Array,
-		defaultValue: [],
+		defaultValue: defaultLibraries,
 		max: 100,
 	},
 	'subscribedLibraries.$': {

From 64fceb9c386ef703ab5c1e64a839204cc4176b56 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 10 Jun 2021 15:19:14 +0200
Subject: [PATCH 05/42] Added environmental variables to readme for
 self-hosting

---
 README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.md b/README.md
index c1dd7f4c..e7d3b9f3 100644
--- a/README.md
+++ b/README.md
@@ -66,5 +66,20 @@ You should see this:
 => App running at: http://localhost:3000/
 ```
 
+Environmental Variables
+-----------------------
+
+```
+MAIL_URL=smtp://<your smtp mail url>
+METEOR_SETTINGS={ "public": { "environment": "production", "patreon": { "clientId": "<your patreon client ID>", "campaignId": "<your campaign id>" } }, "patreon": { "clientSecret": "<your client secret>", "creatorAccessToken": "<your creator access token>" } }
+MONGO_OPLOG_URL=mongodb+srv://<your url for the oplog account of your mongo database>
+MONGO_URL=mongodb+srv://<your url for the read/write account of your mongo database>
+NPM_CONFIG_PRODUCTION=true
+PROJECT_DIR=app
+ROOT_URL=https://<url of your DiceCloud instance>
+DEFAULT_LIBRARIES=<comma separated list of library ids that will be subscribed by default: "abc123,def456">
+DISABLE_PATREON=<"true" if you want to prevent features being locked behind Patreon tiers>
+```
+
 Now, visiting [](http://localhost:3000/) should show you an empty instance of
 DiceCloud running.

From e3fc56a844bbec093be1c87cdd26794172e63034 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 11 Jun 2021 12:03:31 +0200
Subject: [PATCH 06/42] Added backend architecture to archive and restore
 creatures.

---
 .../api/creature/archive/ArchivedCreatures.js | 57 ++++++++++++++++
 .../archive/methods/archiveCreatures.js       | 66 +++++++++++++++++++
 .../api/creature/archive/methods/index.js     |  2 +
 .../archive/methods/restoreCreatures.js       | 63 ++++++++++++++++++
 .../server/publications/archivedCreatures.js  | 18 +++++
 app/imports/server/publications/index.js      |  5 +-
 6 files changed, 209 insertions(+), 2 deletions(-)
 create mode 100644 app/imports/api/creature/archive/ArchivedCreatures.js
 create mode 100644 app/imports/api/creature/archive/methods/archiveCreatures.js
 create mode 100644 app/imports/api/creature/archive/methods/index.js
 create mode 100644 app/imports/api/creature/archive/methods/restoreCreatures.js
 create mode 100644 app/imports/server/publications/archivedCreatures.js

diff --git a/app/imports/api/creature/archive/ArchivedCreatures.js b/app/imports/api/creature/archive/ArchivedCreatures.js
new file mode 100644
index 00000000..4a572482
--- /dev/null
+++ b/app/imports/api/creature/archive/ArchivedCreatures.js
@@ -0,0 +1,57 @@
+import SimpleSchema from 'simpl-schema';
+
+// Archived creatures is an immutable collection of creatures that are no longer
+// in use and can be safely archived by the mongoDB hosting service.
+// It keeps the working datasets like creatureProperties much smaller
+// than they would otherwise be.
+let ArchivedCreatures = new Mongo.Collection('archivedCreatures');
+
+// We use blackbox objects for everything:
+// - saves time checking every object against a schema
+// - doesn't accidentaly create indices defined in subschemas
+// - The objects we are archiving have already been checked against their
+//   own schemas
+let ArchivedCreatureSchema = new SimpleSchema({
+  owner: {
+		type: String,
+		regEx: SimpleSchema.RegEx.Id,
+    // The primary index on this collection
+		index: 1,
+	},
+  archiveDate: {
+    type: Date,
+    // Indexed so the archiving system can archive documents when they
+    // get to a certain age
+    index: 1,
+  },
+	creature: {
+    type: Object,
+    blackbox: true,
+  },
+  properties: {
+    type: Array,
+  },
+  'properties.$': {
+    type: Object,
+    blackbox: true,
+  },
+  experiences: {
+    type: Array,
+  },
+  'experiences.$': {
+    type: Object,
+    blackbox: true,
+  },
+  logs: {
+    type: Array,
+  },
+  'logs.$': {
+    type: Object,
+    blackbox: true,
+  },
+});
+
+ArchivedCreatures.attachSchema(ArchivedCreatureSchema);
+
+import '/imports/api/creature/archive/methods/index.js';
+export default ArchivedCreatures;
diff --git a/app/imports/api/creature/archive/methods/archiveCreatures.js b/app/imports/api/creature/archive/methods/archiveCreatures.js
new file mode 100644
index 00000000..a63c6563
--- /dev/null
+++ b/app/imports/api/creature/archive/methods/archiveCreatures.js
@@ -0,0 +1,66 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import { assertOwnership } from '/imports/api/creature/creaturePermissions.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
+import Experiences from '/imports/api/creature/experience/Experiences.js';
+import { removeCreatureWork } from '/imports/api/creature/removeCreature.js';
+import ArchivedCreatures from '/imports/api/creature/archive/ArchivedCreatures.js';
+
+function archiveCreature(creatureId){
+  // Build the archive document
+  const creature = Creatures.findOne(creatureId);
+  const properties = CreatureProperties.find({'ancestors.id': creatureId});
+  const experiences = Experiences.find({creatureId});
+  const logs = CreatureLogs.find({creatureId});
+  let archiveCreature = {
+    owner: creature.owner,
+    archiveDate: new Date(),
+    creature,
+    properties,
+    experiences,
+    logs,
+  };
+
+  // Insert it
+  let id = ArchivedCreatures.insert(archiveCreature);
+
+  // Remove the original creature
+  removeCreatureWork(creatureId);
+
+  return id;
+}
+
+const archiveCreatures = new ValidatedMethod({
+  name: 'Creatures.methods.archiveCreatures',
+  validate: new SimpleSchema({
+    creatureIds: {
+      type: Array,
+      max: 10,
+    },
+    'creatureIds.$': {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 1,
+    timeInterval: 5000,
+  },
+  run({creatureIds}) {
+    for (let id in creatureIds){
+      assertOwnership(id, this.userId)
+    }
+    let archivedIds = [];
+    for (let id in creatureIds){
+      let archivedId = archiveCreature(id);
+      archivedIds.push(archivedId);
+    }
+    return archivedIds;
+  },
+});
+
+export default archiveCreatures;
diff --git a/app/imports/api/creature/archive/methods/index.js b/app/imports/api/creature/archive/methods/index.js
new file mode 100644
index 00000000..62d8bd8d
--- /dev/null
+++ b/app/imports/api/creature/archive/methods/index.js
@@ -0,0 +1,2 @@
+import '/imports/api/creature/archive/methods/archiveCreatures.js';
+import '/imports/api/creature/archive/methods/restoreCreatures.js';
diff --git a/app/imports/api/creature/archive/methods/restoreCreatures.js b/app/imports/api/creature/archive/methods/restoreCreatures.js
new file mode 100644
index 00000000..6a84ccf8
--- /dev/null
+++ b/app/imports/api/creature/archive/methods/restoreCreatures.js
@@ -0,0 +1,63 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import { assertOwnership } from '/imports/api/sharing/sharingPermissions.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
+import Experiences from '/imports/api/creature/experience/Experiences.js';
+import ArchivedCreatures from '/imports/api/creature/archive/ArchivedCreatures.js';
+
+function restoreCreature(archiveId){
+  // Get the archive
+  const archivedCreature = ArchivedCreatures.findOne(archiveId);
+
+  // Insert the creature sub documents
+  // They still have their original _id's
+  Creatures.insert(archivedCreature.creature);
+  CreatureProperties.batchInsert(archivedCreature.properties);
+  Experiences.batchInsert(archivedCreature.experiences);
+  CreatureLogs.batchInsert(archivedCreature.logs);
+  // Do not recompute. The creature was in a computed and ordered state when
+  // we archived it, just restore everything as-is
+
+  // Remove the archived creature
+  ArchivedCreatures.remove(archiveId);
+
+  return archivedCreature.creature._id;
+}
+
+const restoreCreatures = new ValidatedMethod({
+  name: 'Creatures.methods.restoreCreatures',
+  validate: new SimpleSchema({
+    archiveIds: {
+      type: Array,
+      max: 10,
+    },
+    'archiveIds.$': {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 1,
+    timeInterval: 5000,
+  },
+  run({archiveIds}) {
+    for (let id in archiveIds){
+      let archivedCreature = ArchivedCreatures.findOne(id, {
+        fields: {owner: 1}
+      });
+      assertOwnership(archivedCreature, this.userId)
+    }
+    let creatureIds = [];
+    for (let id in archiveIds){
+      let creatureId = restoreCreature(id);
+      creatureIds.push(creatureId);
+    }
+    return creatureIds;
+  },
+});
+
+export default restoreCreatures;
diff --git a/app/imports/server/publications/archivedCreatures.js b/app/imports/server/publications/archivedCreatures.js
new file mode 100644
index 00000000..155a887b
--- /dev/null
+++ b/app/imports/server/publications/archivedCreatures.js
@@ -0,0 +1,18 @@
+import ArchivedCreatures from '/imports/api/creature/archive/ArchivedCreatures.js';
+
+Meteor.publish('archivedCreatures', function(){
+  this.autorun(function (){
+    var userId = this.userId;
+    if (!userId) {
+      return [];
+    }
+    return ArchivedCreatures.find({
+        owner: userId,
+      }, {
+        fields: {
+          creature: 1,
+        }
+      }
+    );
+  });
+});
diff --git a/app/imports/server/publications/index.js b/app/imports/server/publications/index.js
index c11cb255..adff4e49 100644
--- a/app/imports/server/publications/index.js
+++ b/app/imports/server/publications/index.js
@@ -6,5 +6,6 @@ import '/imports/server/publications/experiences.js';
 import '/imports/server/publications/users.js';
 import '/imports/server/publications/icons.js';
 import '/imports/server/publications/tabletops.js';
-import '/imports/server/publications/slotFillers.js'
-import '/imports/server/publications/ownedDocuments.js'
+import '/imports/server/publications/slotFillers.js';
+import '/imports/server/publications/ownedDocuments.js';
+import '/imports/server/publications/archivedCreatures.js';

From 81d52a18478a20dfaedd1df0acd788d8a00743d1 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 18 Jun 2021 10:43:27 +0200
Subject: [PATCH 07/42] Enabled editing of attribute damage in library forms

---
 app/imports/ui/library/LibraryNodeDialog.vue      |  3 ++-
 app/imports/ui/library/LibraryNodeInsertForm.vue  |  3 ++-
 app/imports/ui/properties/forms/AttributeForm.vue | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/imports/ui/library/LibraryNodeDialog.vue b/app/imports/ui/library/LibraryNodeDialog.vue
index 03e88fec..d446ef4d 100644
--- a/app/imports/ui/library/LibraryNodeDialog.vue
+++ b/app/imports/ui/library/LibraryNodeDialog.vue
@@ -113,13 +113,14 @@
     },
     reactiveProvide: {
       name: 'context',
-      include: ['editPermission'],
+      include: ['editPermission', 'isLibraryForm'],
     },
     data(){return {
       editing: !!this.startInEditTab,
       // CurrentId lags behind Id by one tick so that events fired by destroying
       // forms keyed to the old ID are applied before the new ID overwrites it
       currentId: undefined,
+      isLibraryForm: true,
     }},
     watch: {
       _id: {
diff --git a/app/imports/ui/library/LibraryNodeInsertForm.vue b/app/imports/ui/library/LibraryNodeInsertForm.vue
index 86f1b1bf..8e8b8c2f 100644
--- a/app/imports/ui/library/LibraryNodeInsertForm.vue
+++ b/app/imports/ui/library/LibraryNodeInsertForm.vue
@@ -58,7 +58,7 @@ export default {
 	},
   reactiveProvide: {
     name: 'context',
-    include: ['debounceTime'],
+    include: ['debounceTime', 'isLibraryForm'],
   },
 	data(){return {
 		model: {
@@ -67,6 +67,7 @@ export default {
 		schema: undefined,
 		validationContext: undefined,
     debounceTime: 0,
+    isLibraryForm: true,
 	};},
 	watch: {
 		type(newType){
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index a92b7c37..bd639b2d 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -62,7 +62,7 @@
       @change="change('description', ...arguments)"
     />
     <calculation-error-list :calculations="model.descriptionCalculations" />
-
+    {{ cntxt }}
     <form-section
       name="Advanced"
       standalone
@@ -94,7 +94,7 @@
             class="damage-field text-center"
             style="max-width: 300px;"
             hint="The attribute's final value is reduced by this amount"
-            disabled
+            :disabled="!context.isLibraryForm"
             :value="model.damage"
             :error-messages="errors.damage"
             @change="change('damage', ...arguments)"
@@ -124,6 +124,9 @@
   import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
 
 	export default {
+    inject: {
+      context: { default: {} }
+    },
 		components: {
 			FormSection,
       CalculationErrorList,
@@ -179,6 +182,12 @@
 			});
 			return data;
 		},
+    computed: {
+      cntxt(){
+        console.log(this.context);
+        return this.context;
+      }
+    },
     watch: {
       'model.attributeType': function(newVal, oldVal){
         if (newVal === 'hitDice' && !this.model.hitDiceSize){
@@ -187,7 +196,7 @@
           this.$emit('change', {path: ['hitDiceSize'], value: undefined});
         }
       },
-    },
+    }
 	};
 </script>
 

From 1a2d4b22bb2e01ff06e9d30eb3e73d7d279d475b Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 18 Jun 2021 10:48:12 +0200
Subject: [PATCH 08/42] Renamed parties to creatureFolders

---
 .../CreatureFolders.js}                              | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
 rename app/imports/api/creature/{Parties.js => creatureFolders/CreatureFolders.js} (56%)

diff --git a/app/imports/api/creature/Parties.js b/app/imports/api/creature/creatureFolders/CreatureFolders.js
similarity index 56%
rename from app/imports/api/creature/Parties.js
rename to app/imports/api/creature/creatureFolders/CreatureFolders.js
index e0f90c60..7d7071b6 100644
--- a/app/imports/api/creature/Parties.js
+++ b/app/imports/api/creature/creatureFolders/CreatureFolders.js
@@ -1,8 +1,8 @@
 import SimpleSchema from 'simpl-schema';
 
-let Parties = new Mongo.Collection('parties');
+let CreatureFolders = new Mongo.Collection('parties');
 
-let partySchema = new SimpleSchema({
+let creatureFolderSchema = new SimpleSchema({
 	name: {
 		type: String,
 		defaultValue: 'New Party',
@@ -21,8 +21,12 @@ let partySchema = new SimpleSchema({
 		type: String,
 		regEx: SimpleSchema.RegEx.Id,
 	},
+  archived: {
+    type: Boolean,
+    defaultValue: true,
+  },
 });
 
-Parties.attachSchema(partySchema);
+CreatureFolders.attachSchema(creatureFolderSchema);
 
-export default Parties;
+export default CreatureFolders;

From cf05aea80a2488e25301f9ba40726d4e59eb8b4c Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 18 Jun 2021 10:49:01 +0200
Subject: [PATCH 09/42] Fixed Parties references

---
 app/imports/server/publications/characterList.js | 2 +-
 app/imports/ui/layouts/Sidebar.vue               | 2 +-
 app/imports/ui/pages/CharacterList.vue           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/imports/server/publications/characterList.js b/app/imports/server/publications/characterList.js
index 34bdd0da..5929970c 100644
--- a/app/imports/server/publications/characterList.js
+++ b/app/imports/server/publications/characterList.js
@@ -1,5 +1,5 @@
 import Creatures from '/imports/api/creature/Creatures.js';
-import Parties from '/imports/api/creature/Parties.js';
+import Parties from '/imports/api/creature/creatureFolders/CreatureFolders.js';
 
 Meteor.publish('characterList', function(){
   this.autorun(function (){
diff --git a/app/imports/ui/layouts/Sidebar.vue b/app/imports/ui/layouts/Sidebar.vue
index 8a8f7c7b..5e4b8e9c 100644
--- a/app/imports/ui/layouts/Sidebar.vue
+++ b/app/imports/ui/layouts/Sidebar.vue
@@ -111,7 +111,7 @@
 
 <script lang="js">
   import Creatures from '/imports/api/creature/Creatures.js';
-  import Parties from '/imports/api/creature/Parties.js';
+  import Parties from '/imports/api/creature/creatureFolders/CreatureFolders.js';
 
   export default {
     meteor: {
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index bc288b68..db02e7ca 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -29,7 +29,7 @@
 
 <script lang="js">
   import Creatures, {insertCreature} from '/imports/api/creature/Creatures.js';
-  import Parties from '/imports/api/creature/Parties.js';
+  import Parties from '/imports/api/creature/creatureFolders/CreatureFolders.js';
   import { getUserTier } from '/imports/api/users/patreon/tiers.js';
   import CreatureListTile from '/imports/ui/creature/CreatureListTile.vue';
 

From 6b2d74a1653ed8827c35d66640446d6e396d1e9c Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 18 Jun 2021 12:59:39 +0200
Subject: [PATCH 10/42] Fixed parties -> creatureFolders publications and ui

---
 app/imports/api/creature/creatureFolders/CreatureFolders.js | 6 +++++-
 app/imports/server/publications/characterList.js            | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/imports/api/creature/creatureFolders/CreatureFolders.js b/app/imports/api/creature/creatureFolders/CreatureFolders.js
index 7d7071b6..81d4779a 100644
--- a/app/imports/api/creature/creatureFolders/CreatureFolders.js
+++ b/app/imports/api/creature/creatureFolders/CreatureFolders.js
@@ -1,6 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 
-let CreatureFolders = new Mongo.Collection('parties');
+let CreatureFolders = new Mongo.Collection('creatureFolders');
 
 let creatureFolderSchema = new SimpleSchema({
 	name: {
@@ -25,6 +25,10 @@ let creatureFolderSchema = new SimpleSchema({
     type: Boolean,
     defaultValue: true,
   },
+  order: {
+    type: Number,
+    defaultValue: 0,
+  },
 });
 
 CreatureFolders.attachSchema(creatureFolderSchema);
diff --git a/app/imports/server/publications/characterList.js b/app/imports/server/publications/characterList.js
index 5929970c..3ff5dbf1 100644
--- a/app/imports/server/publications/characterList.js
+++ b/app/imports/server/publications/characterList.js
@@ -1,5 +1,5 @@
 import Creatures from '/imports/api/creature/Creatures.js';
-import Parties from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
 
 Meteor.publish('characterList', function(){
   this.autorun(function (){
@@ -36,7 +36,7 @@ Meteor.publish('characterList', function(){
           }
         }
       ),
-      Parties.find({owner: userId}),
+      CreatureFolders.find({owner: userId}),
     ];
   });
 });

From 69f4bbf360e8f6a3458f1a1893e0fcb288f55669 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 20 Jun 2021 12:41:08 +0200
Subject: [PATCH 11/42] Added CRUD API and UI for creature folders

---
 .../creatureFolders/CreatureFolders.js        |   6 +-
 .../creatureFolders/methods.js/index.js       |   3 +
 .../methods.js/insertCreatureFolder.js        |  45 ++++++
 .../methods.js/removeCreatureFolder.js        |  31 ++++
 .../methods.js/reorderCreatureFolder.js       |  43 ++++++
 .../methods.js/updateCreatureFolderName.js    |  31 ++++
 app/imports/ui/layouts/Sidebar.vue            |  26 +---
 app/imports/ui/pages/CharacterList.vue        | 142 +++++++++++++++---
 8 files changed, 282 insertions(+), 45 deletions(-)
 create mode 100644 app/imports/api/creature/creatureFolders/methods.js/index.js
 create mode 100644 app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js
 create mode 100644 app/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js
 create mode 100644 app/imports/api/creature/creatureFolders/methods.js/reorderCreatureFolder.js
 create mode 100644 app/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js

diff --git a/app/imports/api/creature/creatureFolders/CreatureFolders.js b/app/imports/api/creature/creatureFolders/CreatureFolders.js
index 81d4779a..a61140c1 100644
--- a/app/imports/api/creature/creatureFolders/CreatureFolders.js
+++ b/app/imports/api/creature/creatureFolders/CreatureFolders.js
@@ -5,7 +5,7 @@ let CreatureFolders = new Mongo.Collection('creatureFolders');
 let creatureFolderSchema = new SimpleSchema({
 	name: {
 		type: String,
-		defaultValue: 'New Party',
+		defaultValue: 'Folder',
 		trim: false,
 		optional: true,
 	},
@@ -20,10 +20,11 @@ let creatureFolderSchema = new SimpleSchema({
 	owner: {
 		type: String,
 		regEx: SimpleSchema.RegEx.Id,
+    index: 1,
 	},
   archived: {
     type: Boolean,
-    defaultValue: true,
+    optional: true,
   },
   order: {
     type: Number,
@@ -33,4 +34,5 @@ let creatureFolderSchema = new SimpleSchema({
 
 CreatureFolders.attachSchema(creatureFolderSchema);
 
+import '/imports/api/creature/creatureFolders/methods.js/index.js';
 export default CreatureFolders;
diff --git a/app/imports/api/creature/creatureFolders/methods.js/index.js b/app/imports/api/creature/creatureFolders/methods.js/index.js
new file mode 100644
index 00000000..687f1d97
--- /dev/null
+++ b/app/imports/api/creature/creatureFolders/methods.js/index.js
@@ -0,0 +1,3 @@
+import '/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js';
+import '/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js';
+import '/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js';
\ No newline at end of file
diff --git a/app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js b/app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js
new file mode 100644
index 00000000..7c5d4e15
--- /dev/null
+++ b/app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js
@@ -0,0 +1,45 @@
+import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+
+const insertCreatureFolder = new ValidatedMethod({
+  name: 'creatureFolders.methods.insert',
+  validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run() {
+    // Ensure logged in
+    let userId = this.userId;
+    if (!userId) {
+      throw new Meteor.Error('creatureFolders.methods.insert.denied',
+      'You need to be logged in to insert a folder');
+    }
+    // Limit folders to 50 per user
+    let existingFolders = CreatureFolders.find({
+      owner: userId
+    }, {
+      fields: {order: 1},
+      sort: {order :-1}
+    });
+    if (existingFolders.count() >= 50){
+      throw new Meteor.Error('creatureFolders.methods.insert.denied',
+      'You can not have more than 50 folders');
+    }
+    // Make the new folder the last in the order
+    let order = 0;
+    let lastFolder = existingFolders.fetch()[0];
+    if (lastFolder){
+      order = (lastFolder.order || 0) + 1;
+    }
+    // Insert
+    return CreatureFolders.insert({
+      owner: userId,
+      order,
+    });
+  },
+});
+
+export default insertCreatureFolder;
diff --git a/app/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js b/app/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js
new file mode 100644
index 00000000..71006cb7
--- /dev/null
+++ b/app/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js
@@ -0,0 +1,31 @@
+import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+
+const removeCreatureFolder = new ValidatedMethod({
+  name: 'creatureFolders.methods.remove',
+  validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id}) {
+    // Ensure logged in
+    let userId = this.userId;
+    if (!userId) {
+      throw new Meteor.Error('creatureFolders.methods.updateName.denied',
+      'You need to be logged in to remove a folder');
+    }
+    // Check that this folder is owned by the user
+    let existingFolder = CreatureFolders.findOne(_id);
+    if (existingFolder.owner !== userId){
+      throw new Meteor.Error('creatureFolders.methods.updateName.denied',
+      'This folder does not belong to you');
+    }
+    // Remove
+    return CreatureFolders.remove(_id);
+  },
+});
+
+export default removeCreatureFolder;
\ No newline at end of file
diff --git a/app/imports/api/creature/creatureFolders/methods.js/reorderCreatureFolder.js b/app/imports/api/creature/creatureFolders/methods.js/reorderCreatureFolder.js
new file mode 100644
index 00000000..92ecb418
--- /dev/null
+++ b/app/imports/api/creature/creatureFolders/methods.js/reorderCreatureFolder.js
@@ -0,0 +1,43 @@
+import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+
+const reorderCreatureFolder = new ValidatedMethod({
+  name: 'creatureFolders.methods.reorder',
+  validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id, order}) {
+    // Ensure logged in
+    let userId = this.userId;
+    if (!userId) {
+      throw new Meteor.Error('creatureFolders.methods.reorder.denied',
+      'You need to be logged in to reorder a folder');
+    }
+    // Check that this folder is owned by the user
+    let existingFolder = CreatureFolders.findOne(_id);
+    if (existingFolder.owner !== userId){
+      throw new Meteor.Error('creatureFolders.methods.reorder.denied',
+      'This folder does not belong to you');
+    }
+    // First give it the new order, it should end in 0.5 putting it between two other docs
+    CreatureFolders.update(_id, {$set: {order}});
+    this.unblock();
+    // Reorder all the folders with integer numbers in this new order
+    CreatureFolders.find({
+      owner: userId
+    }, {
+      fields: {order: 1,},
+      sort: {order: -1}
+    }).forEach((folder, index) => {
+      if (folder.order !== index){
+        CreatureFolders.update(_id, {$set: {order: index}})
+      }
+    });
+  },
+});
+
+export default reorderCreatureFolder;
diff --git a/app/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js b/app/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js
new file mode 100644
index 00000000..d798e59a
--- /dev/null
+++ b/app/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js
@@ -0,0 +1,31 @@
+import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+
+const updateCreatureFolderName = new ValidatedMethod({
+  name: 'creatureFolders.methods.updateName',
+  validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id, name}) {
+    // Ensure logged in
+    let userId = this.userId;
+    if (!userId) {
+      throw new Meteor.Error('creatureFolders.methods.updateName.denied',
+      'You need to be logged in to update a folder');
+    }
+    // Check that this folder is owned by the user
+    let existingFolder = CreatureFolders.findOne(_id);
+    if (existingFolder.owner !== userId){
+      throw new Meteor.Error('creatureFolders.methods.updateName.denied',
+      'This folder does not belong to you');
+    }
+    // Update
+    return CreatureFolders.update(_id, {$set: {name}});
+  },
+});
+
+export default updateCreatureFolderName;
\ No newline at end of file
diff --git a/app/imports/ui/layouts/Sidebar.vue b/app/imports/ui/layouts/Sidebar.vue
index 5e4b8e9c..38d1bd3e 100644
--- a/app/imports/ui/layouts/Sidebar.vue
+++ b/app/imports/ui/layouts/Sidebar.vue
@@ -76,6 +76,7 @@
           {{ character.name }}
         </v-list-item-title>
       </v-list-item>
+      <!--
       <v-list-group
         v-for="party in parties"
         :key="party._id"
@@ -105,6 +106,7 @@
           </v-list-item-title>
         </v-list-item>
       </v-list-group>
+    -->
     </v-list>
   </div>
 </template>
@@ -140,31 +142,9 @@
         ];
         return links.filter(link => !link.requireLogin || isLoggedIn);
       },
-      parties(){
-        const userId = Meteor.userId();
-        return Parties.find(
-          {owner: userId},
-          {sort: {name: 1}},
-        ).map(party => {
-          party.characterDocs = Creatures.find(
-            {
-              _id: {$in: party.Creatures},
-              $or: [{readers: userId}, {writers: userId}, {owner: userId}],
-            }, {
-              sort: {name: 1},
-              fields: {name: 1, urlName: 1},
-            }
-          ).map(char => {
-            char.url = `/character/${char._id}/${char.urlName || '-'}`;
-            char.initial = char.name && char.name[0] || '?';
-            return char;
-          });
-          return party;
-        });
-      },
       CreaturesWithNoParty() {
         var userId = Meteor.userId();
-        var charArrays = Parties.find({owner: userId}).map(p => p.Creatures);
+        var charArrays = Parties.find({owner: userId}).map(p => p.creatures);
         var partyChars = _.uniq(_.flatten(charArrays));
         return Creatures.find(
           {
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index db02e7ca..c3b595dd 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -3,16 +3,78 @@
     class="card-background pa-4"
     style="height: 100%"
   >
-    <v-card>
+    <v-card :class="{'mb-4': folders && folders.length}">
       <v-list v-if="CreaturesWithNoParty.length">
         <creature-list-tile
-          v-for="character in CreaturesWithNoParty"
-          :key="character._id"
-          :to="character.url"
-          :model="character"
+          v-for="creature in CreaturesWithNoParty"
+          :key="creature._id"
+          :to="creature.url"
+          :model="creature"
         />
       </v-list>
     </v-card>
+    <v-expansion-panels v-if="folders && folders.length">
+      <v-expansion-panel
+        v-for="folder in folders"
+        :key="folder._id"
+      >
+        <v-expansion-panel-header>
+          <template #default="{ open }">
+            <div v-if="renamingFolder !== folder._id">
+              {{ folder.name }}
+            </div>
+            <text-field
+              v-else
+              :ref="`name-input-${folder._id}`"
+              regular
+              hide-details
+              dense
+              :value="folder.name"
+              @change="(value, ack) => renameFolder(folder._id, value, ack)"
+              @click.native.stop="()=>{}"
+            />
+            <v-btn
+              v-if="renamingFolder === folder._id || open"
+              icon
+              style="flex-grow: 0"
+              @click.stop="renamingFolder !== folder._id ? renamingFolder = folder._id : renamingFolder = undefined"
+            >
+              <v-icon v-if="renamingFolder !== folder._id">
+                mdi-pencil
+              </v-icon>
+              <v-icon v-else>
+                mdi-check
+              </v-icon>
+            </v-btn>
+            <v-btn
+              v-if="open"
+              icon
+              style="flex-grow: 0"
+              @click.stop="removeFolder(folder._id)"
+            >
+              <v-icon>mdi-delete</v-icon>
+            </v-btn>
+          </template>
+        </v-expansion-panel-header>
+        <v-expansion-panel-content>
+          <v-list v-if="folder.creatures">
+            <creature-list-tile
+              v-for="creature in folder.creatures"
+              :key="creature._id"
+              :to="creature.url"
+              :model="creature"
+            />
+          </v-list>
+        </v-expansion-panel-content>
+      </v-expansion-panel>
+    </v-expansion-panels>
+    <v-btn
+      text
+      :loading="loadingInsertFolder"
+      @click="insertFolder"
+    >
+      add folder
+    </v-btn>
     <v-btn
       color="accent"
       fab
@@ -28,11 +90,16 @@
 </template>
 
 <script lang="js">
+  import Vue from 'vue';
   import Creatures, {insertCreature} from '/imports/api/creature/Creatures.js';
-  import Parties from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+  import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
   import { getUserTier } from '/imports/api/users/patreon/tiers.js';
   import CreatureListTile from '/imports/ui/creature/CreatureListTile.vue';
-
+  import insertCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js';
+  import updateCreatureFolderName from '/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js';
+  import removeCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js';
+  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+  
   const characterTransform = function(char){
     char.url = `/character/${char._id}/${char.urlName || '-'}`;
     char.initial = char.name && char.name[0] || '?';
@@ -44,42 +111,54 @@
     },
     data(){ return{
       fab: false,
+      loadingInsertFolder: false,
+      renamingFolder: undefined,
     }},
     meteor: {
       $subscribe: {
         'characterList': [],
       },
-      parties(){
+      folders(){
         const userId = Meteor.userId();
-        let parties =  Parties.find(
-          {owner: userId},
-          {sort: {name: 1}},
-        ).map(party => {
-          party.characterDocs = Creatures.find(
+        let folders =  CreatureFolders.find(
+          {owner: userId, archived: {$ne: true}},
+          {sort: {order: 1}},
+        ).map(folder => {
+          folder.creatures = Creatures.find(
             {
-              _id: {$in: party.Creatures},
+              _id: {$in: folder.creatures || []},
               $or: [{readers: userId}, {writers: userId}, {owner: userId}],
             }, {
               sort: {name: 1},
             }
           ).map(characterTransform);
-          return party;
+          return folder;
         });
-        return parties;
+        return folders;
       },
       CreaturesWithNoParty() {
         var userId = Meteor.userId();
-        var charArrays = Parties.find({owner: userId}).map(p => p.Creatures);
-        var partyChars = _.uniq(_.flatten(charArrays));
+        var charArrays = CreatureFolders.find({owner: userId}).map(p => p.creatures);
+        var folderChars = _.uniq(_.flatten(charArrays));
         return Creatures.find(
           {
-            _id: {$nin: partyChars},
+            _id: {$nin: folderChars},
             $or: [{readers: userId}, {writers: userId}, {owner: userId}],
           },
           {sort: {name: 1}}
         ).map(characterTransform);
       },
     },
+    watch:{
+      renamingFolder(newId){
+        if(newId){
+          Vue.nextTick(() => {
+            let input = this.$refs[`name-input-${newId}`];
+            input[0].focus();
+          });
+        }
+      }
+    },
     methods: {
       insertCharacter(){
         let tier = getUserTier(Meteor.userId());
@@ -103,6 +182,29 @@
           });
         }
       },
-    }
+      insertFolder(){
+        loadingInsertFolder = true;
+        insertCreatureFolder.call(error => {
+          loadingInsertFolder = false;
+          if (!error) return;
+          console.error(error);
+          snackbar({
+            text: error.reason,
+          });
+        });
+      },
+      renameFolder(_id, name, ack){
+        updateCreatureFolderName.call({_id, name}, ack);
+      },
+      removeFolder(_id){
+        removeCreatureFolder.call({_id}, error => {
+          if (!error) return;
+          console.error(error);
+          snackbar({
+            text: error.reason,
+          });
+        });
+      },
+    },
   };
 </script>

From 814e371148cdb19c52ed303b4c8bbcb74e91df67 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 20 Jun 2021 13:32:28 +0200
Subject: [PATCH 12/42] Can now move creatures between folders using drag and
 drop

---
 .../creatureFolders/CreatureFolders.js        |  1 -
 .../creatureFolders/methods.js/index.js       |  3 +-
 .../methods.js/insertCreatureFolder.js        |  1 +
 .../methods.js/moveCreatureToFolder.js        | 45 +++++++++
 .../ui/creature/creatureList/CreatureList.vue | 91 +++++++++++++++++++
 .../{ => creatureList}/CreatureListTile.vue   |  9 +-
 app/imports/ui/pages/CharacterList.vue        | 52 +++++------
 .../ui/tabletop/SelectCreaturesDialog.vue     |  2 +-
 .../ui/user/DeleteUserAccountDialog.vue       |  2 +-
 9 files changed, 172 insertions(+), 34 deletions(-)
 create mode 100644 app/imports/api/creature/creatureFolders/methods.js/moveCreatureToFolder.js
 create mode 100644 app/imports/ui/creature/creatureList/CreatureList.vue
 rename app/imports/ui/creature/{ => creatureList}/CreatureListTile.vue (84%)

diff --git a/app/imports/api/creature/creatureFolders/CreatureFolders.js b/app/imports/api/creature/creatureFolders/CreatureFolders.js
index a61140c1..3d00b3a9 100644
--- a/app/imports/api/creature/creatureFolders/CreatureFolders.js
+++ b/app/imports/api/creature/creatureFolders/CreatureFolders.js
@@ -5,7 +5,6 @@ let CreatureFolders = new Mongo.Collection('creatureFolders');
 let creatureFolderSchema = new SimpleSchema({
 	name: {
 		type: String,
-		defaultValue: 'Folder',
 		trim: false,
 		optional: true,
 	},
diff --git a/app/imports/api/creature/creatureFolders/methods.js/index.js b/app/imports/api/creature/creatureFolders/methods.js/index.js
index 687f1d97..26782576 100644
--- a/app/imports/api/creature/creatureFolders/methods.js/index.js
+++ b/app/imports/api/creature/creatureFolders/methods.js/index.js
@@ -1,3 +1,4 @@
 import '/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js';
 import '/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js';
-import '/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js';
\ No newline at end of file
+import '/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js';
+import '/imports/api/creature/creatureFolders/methods.js/moveCreatureToFolder.js';
diff --git a/app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js b/app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js
index 7c5d4e15..8df44d40 100644
--- a/app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js
+++ b/app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js
@@ -36,6 +36,7 @@ const insertCreatureFolder = new ValidatedMethod({
     }
     // Insert
     return CreatureFolders.insert({
+      name: 'Folder',
       owner: userId,
       order,
     });
diff --git a/app/imports/api/creature/creatureFolders/methods.js/moveCreatureToFolder.js b/app/imports/api/creature/creatureFolders/methods.js/moveCreatureToFolder.js
new file mode 100644
index 00000000..46f9b696
--- /dev/null
+++ b/app/imports/api/creature/creatureFolders/methods.js/moveCreatureToFolder.js
@@ -0,0 +1,45 @@
+import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+
+const moveCreatureToFolder = new ValidatedMethod({
+  name: 'creatureFolders.methods.moveCreatureToFolder',
+  validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({creatureId, folderId}) {
+    // Ensure logged in
+    let userId = this.userId;
+    if (!userId) {
+      throw new Meteor.Error('creatureFolders.methods.updateName.denied',
+      'You need to be logged in to remove a folder');
+    }
+    // Check that this folder is owned by the user
+    if (folderId){
+      let existingFolder = CreatureFolders.findOne(folderId);
+      if (existingFolder.owner !== userId){
+        throw new Meteor.Error('creatureFolders.methods.updateName.denied',
+        'This folder does not belong to you');
+      }
+    }
+    // Remove from other folders
+    CreatureFolders.update({
+      owner: userId
+    }, {
+      $pull: {creatures: creatureId},
+    }, {
+      multi: true,
+    });
+    if (folderId){
+      // Add to this folder
+      CreatureFolders.update(folderId, {
+        $addToSet: {creatures: creatureId},
+      });
+    }
+  },
+});
+
+export default moveCreatureToFolder;
diff --git a/app/imports/ui/creature/creatureList/CreatureList.vue b/app/imports/ui/creature/creatureList/CreatureList.vue
new file mode 100644
index 00000000..eaf1476d
--- /dev/null
+++ b/app/imports/ui/creature/creatureList/CreatureList.vue
@@ -0,0 +1,91 @@
+<template lang="html">
+  <v-list>
+    <draggable
+      v-model="dataCreatures"
+      style="min-height: 24px;"
+      :sort="false"
+      :group="`creature-list`"
+      ghost-class="ghost"
+      draggable=".creature"
+      handle=".handle"
+      :animation="200"
+      @change="change"
+    >
+      <creature-list-tile
+        v-for="creature in dataCreatures"
+        :key="creature._id"
+        class="creature"
+        :to="creature.url"
+        :model="creature"
+      />
+    </draggable>
+  </v-list>
+</template>
+
+<script lang="js">
+  import CreatureListTile from '/imports/ui/creature/creatureList/CreatureListTile.vue';
+  import draggable from 'vuedraggable';
+  import moveCreatureToFolder from '/imports/api/creature/creatureFolders/methods.js/moveCreatureToFolder.js';
+  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+
+  export default {
+    components: {
+      CreatureListTile,
+      draggable,
+    },
+    props: {
+      creatures: {
+        type: Array,
+        required: true,
+      },
+      folderId: {
+        type: String,
+        default: null,
+      },
+    },
+    data(){return {
+      dataCreatures: [],
+    }},
+    watch:{
+      creatures(newValue){
+        this.dataCreatures = newValue;
+      },
+    },
+    mounted(){
+      this.dataCreatures = this.creatures;
+    },
+    methods: {
+      change({added, moved}){
+        let event = added || moved;
+        if (event){
+          // If this item is now adjacent to another, set the order accordingly
+          let order;
+          let before = this.dataCreatures[event.newIndex - 1];
+          let after = this.dataCreatures[event.newIndex + 1];
+          if (before && before._id){
+            order = before.order + 0.5;
+          } else if (after && after._id) {
+            order = after.order - 0.5;
+          } else {
+            order = -0.5;
+          }
+          let doc = event.element;
+          console.log({doc, order, newIndex: event.newIndex, before, after});
+          moveCreatureToFolder.call({
+            creatureId: doc._id,
+            folderId: this.folderId
+          }, error => {
+            if (!error) return;
+            console.error(error);
+            snackbar({
+              text: error.reason,
+            });
+          });
+        }
+      },
+    }
+  }
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/creature/CreatureListTile.vue b/app/imports/ui/creature/creatureList/CreatureListTile.vue
similarity index 84%
rename from app/imports/ui/creature/CreatureListTile.vue
rename to app/imports/ui/creature/creatureList/CreatureListTile.vue
index ea2772c4..29c67e97 100644
--- a/app/imports/ui/creature/CreatureListTile.vue
+++ b/app/imports/ui/creature/creatureList/CreatureListTile.vue
@@ -21,11 +21,18 @@
         {{ model.alignment }} {{ model.gender }} {{ model.race }}
       </v-list-item-subtitle>
     </v-list-item-content>
-    <v-list-item-action v-if="selection">
+    <v-list-item-action>
       <v-checkbox
+        v-if="selection"
         :input-value="selected && selected.has(model._id)"
         @change="$emit('select')"
       />
+      <v-icon
+        style="height: 100%; width: 40px; cursor: move;"
+        class="handle"
+      >
+        mdi-drag
+      </v-icon>
     </v-list-item-action>
   </v-list-item>
 </template>
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index c3b595dd..53cc878d 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -4,16 +4,12 @@
     style="height: 100%"
   >
     <v-card :class="{'mb-4': folders && folders.length}">
-      <v-list v-if="CreaturesWithNoParty.length">
-        <creature-list-tile
-          v-for="creature in CreaturesWithNoParty"
-          :key="creature._id"
-          :to="creature.url"
-          :model="creature"
-        />
-      </v-list>
+      <creature-list :creatures="CreaturesWithNoParty" />
     </v-card>
-    <v-expansion-panels v-if="folders && folders.length">
+    <v-expansion-panels
+      v-if="folders && folders.length"
+      multiple
+    >
       <v-expansion-panel
         v-for="folder in folders"
         :key="folder._id"
@@ -57,24 +53,22 @@
           </template>
         </v-expansion-panel-header>
         <v-expansion-panel-content>
-          <v-list v-if="folder.creatures">
-            <creature-list-tile
-              v-for="creature in folder.creatures"
-              :key="creature._id"
-              :to="creature.url"
-              :model="creature"
-            />
-          </v-list>
+          <creature-list
+            :creatures="folder.creatures"
+            :folder-id="folder._id"
+          />
         </v-expansion-panel-content>
       </v-expansion-panel>
     </v-expansion-panels>
-    <v-btn
-      text
-      :loading="loadingInsertFolder"
-      @click="insertFolder"
-    >
-      add folder
-    </v-btn>
+    <div class="layout justify-end mt-2">
+      <v-btn
+        text
+        :loading="loadingInsertFolder"
+        @click="insertFolder"
+      >
+        add folder
+      </v-btn>
+    </div>
     <v-btn
       color="accent"
       fab
@@ -93,13 +87,13 @@
   import Vue from 'vue';
   import Creatures, {insertCreature} from '/imports/api/creature/Creatures.js';
   import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+  import CreatureList from '/imports/ui/creature/creatureList/CreatureList.vue';
   import { getUserTier } from '/imports/api/users/patreon/tiers.js';
-  import CreatureListTile from '/imports/ui/creature/CreatureListTile.vue';
   import insertCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js';
   import updateCreatureFolderName from '/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js';
   import removeCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js';
   import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
-  
+
   const characterTransform = function(char){
     char.url = `/character/${char._id}/${char.urlName || '-'}`;
     char.initial = char.name && char.name[0] || '?';
@@ -107,7 +101,7 @@
   };
   export default {
     components: {
-      CreatureListTile,
+      CreatureList,
     },
     data(){ return{
       fab: false,
@@ -183,9 +177,9 @@
         }
       },
       insertFolder(){
-        loadingInsertFolder = true;
+        this.loadingInsertFolder = true;
         insertCreatureFolder.call(error => {
-          loadingInsertFolder = false;
+          this.loadingInsertFolder = false;
           if (!error) return;
           console.error(error);
           snackbar({
diff --git a/app/imports/ui/tabletop/SelectCreaturesDialog.vue b/app/imports/ui/tabletop/SelectCreaturesDialog.vue
index 851b26a7..2a647119 100644
--- a/app/imports/ui/tabletop/SelectCreaturesDialog.vue
+++ b/app/imports/ui/tabletop/SelectCreaturesDialog.vue
@@ -32,7 +32,7 @@
 <script lang="js">
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 import Creatures from '/imports/api/creature/Creatures.js';
-import CreatureListTile from '/imports/ui/creature/CreatureListTile.vue';
+import CreatureListTile from '/imports/ui/creature/creatureList/CreatureListTile.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/user/DeleteUserAccountDialog.vue b/app/imports/ui/user/DeleteUserAccountDialog.vue
index 931dc992..30779f14 100644
--- a/app/imports/ui/user/DeleteUserAccountDialog.vue
+++ b/app/imports/ui/user/DeleteUserAccountDialog.vue
@@ -92,7 +92,7 @@
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 import Creatures from '/imports/api/creature/Creatures.js';
 import Libraries from '/imports/api/library/Libraries.js';
-import CreatureListTile from '/imports/ui/creature/CreatureListTile.vue';
+import CreatureListTile from '/imports/ui/creature/creatureList/CreatureListTile.vue';
 
 export default {
 	components: {

From c5aca81131c7bc8702df7390bd740ce09527297b Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 20 Jun 2021 13:35:23 +0200
Subject: [PATCH 13/42] Removed stray console logs

---
 app/imports/ui/creature/creatureList/CreatureList.vue | 1 -
 app/imports/ui/properties/forms/AttributeForm.vue     | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/app/imports/ui/creature/creatureList/CreatureList.vue b/app/imports/ui/creature/creatureList/CreatureList.vue
index eaf1476d..8b98d8d0 100644
--- a/app/imports/ui/creature/creatureList/CreatureList.vue
+++ b/app/imports/ui/creature/creatureList/CreatureList.vue
@@ -70,7 +70,6 @@
             order = -0.5;
           }
           let doc = event.element;
-          console.log({doc, order, newIndex: event.newIndex, before, after});
           moveCreatureToFolder.call({
             creatureId: doc._id,
             folderId: this.folderId
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index bd639b2d..86a60e3b 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -182,12 +182,6 @@
 			});
 			return data;
 		},
-    computed: {
-      cntxt(){
-        console.log(this.context);
-        return this.context;
-      }
-    },
     watch: {
       'model.attributeType': function(newVal, oldVal){
         if (newVal === 'hitDice' && !this.model.hitDiceSize){

From 848e961e3bb9625b4e32864e19fa79e196447c64 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 21 Jun 2021 15:20:04 +0200
Subject: [PATCH 14/42] Refactored creature methods to their own folders

---
 .../api/creature/actions/castSpellWithSlot.js |  4 +-
 app/imports/api/creature/actions/doAction.js  |  4 +-
 app/imports/api/creature/actions/doCheck.js   |  4 +-
 .../archive/methods/archiveCreatures.js       |  6 +-
 .../archive/methods/restoreCreatures.js       |  2 +-
 .../creatureComputation.test.js               |  0
 .../engine/writeCreatureVariables.js          |  2 +-
 .../computation/methods/recomputeCreature.js  |  4 +-
 .../getRootCreatureAncestor.js                |  2 +-
 .../methods/damagePropertiesByName.js         |  2 +-
 .../creatureProperties/methods/dealDamage.js  |  2 +-
 .../api/creature/{ => creatures}/Creatures.js | 97 +------------------
 .../{ => creatures}/creaturePermissions.js    |  2 +-
 .../defaultCharacterProperties.js             |  0
 .../api/creature/creatures/methods/index.js   |  4 +
 .../creatures/methods/insertCreature.js       | 56 +++++++++++
 .../{ => creatures/methods}/removeCreature.js |  4 +-
 .../{ => creatures/methods}/restCreature.js   |  4 +-
 .../creatures/methods/updateCreature.js       | 45 +++++++++
 .../denormalise/recomputeDamageMultipliers.js |  4 +-
 .../denormalise/recomputeInventory.js         |  2 +-
 .../api/creature/experience/Experiences.js    |  4 +-
 app/imports/api/creature/log/CreatureLogs.js  |  4 +-
 .../mixins/creaturePermissionMixin.js         |  2 +-
 app/imports/api/tabletop/Messages.js          |  2 +-
 app/imports/api/tabletop/Tabletops.js         |  2 +-
 app/imports/api/users/deleteMyAccount.js      |  4 +-
 .../server/publications/characterList.js      |  2 +-
 .../server/publications/experiences.js        |  4 +-
 .../server/publications/ownedDocuments.js     |  2 +-
 .../server/publications/singleCharacter.js    |  4 +-
 app/imports/server/publications/tabletops.js  |  2 +-
 .../ui/creature/CreatureFormDialog.vue        |  6 +-
 app/imports/ui/creature/RestButton.vue        |  2 +-
 .../character/CharacterDeleteDialog.vue       |  4 +-
 .../ui/creature/character/CharacterSheet.vue  |  4 +-
 .../character/CharacterSheetToolbar.vue       |  6 +-
 .../characterSheetTabs/CharacterTab.vue       |  2 +-
 .../characterSheetTabs/InventoryTab.vue       |  2 +-
 .../character/characterSheetTabs/StatsTab.vue |  2 +-
 .../CreaturePropertyDialog.vue                |  4 +-
 .../ui/creature/slots/SlotFillDialog.vue      |  2 +-
 app/imports/ui/layouts/Sidebar.vue            |  2 +-
 app/imports/ui/log/CharacterLog.vue           |  4 +-
 app/imports/ui/pages/CharacterList.vue        |  3 +-
 .../attributes/HealthBarCardContainer.vue     |  2 +-
 .../ui/properties/viewers/SkillViewer.vue     |  2 +-
 .../ui/tabletop/SelectCreaturesDialog.vue     |  2 +-
 app/imports/ui/tabletop/TabletopComponent.vue |  2 +-
 .../ui/user/DeleteUserAccountDialog.vue       |  2 +-
 50 files changed, 174 insertions(+), 161 deletions(-)
 rename app/imports/api/creature/{ => computation}/creatureComputation.test.js (100%)
 rename app/imports/api/creature/{ => creatures}/Creatures.js (54%)
 rename app/imports/api/creature/{ => creatures}/creaturePermissions.js (92%)
 rename app/imports/api/creature/{ => creatures}/defaultCharacterProperties.js (100%)
 create mode 100644 app/imports/api/creature/creatures/methods/index.js
 create mode 100644 app/imports/api/creature/creatures/methods/insertCreature.js
 rename app/imports/api/creature/{ => creatures/methods}/removeCreature.js (88%)
 rename app/imports/api/creature/{ => creatures/methods}/restCreature.js (97%)
 create mode 100644 app/imports/api/creature/creatures/methods/updateCreature.js

diff --git a/app/imports/api/creature/actions/castSpellWithSlot.js b/app/imports/api/creature/actions/castSpellWithSlot.js
index 1a84e84c..c0ccfc31 100644
--- a/app/imports/api/creature/actions/castSpellWithSlot.js
+++ b/app/imports/api/creature/actions/castSpellWithSlot.js
@@ -2,9 +2,9 @@ import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
-import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
 import { doActionWork } from '/imports/api/creature/actions/doAction.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
diff --git a/app/imports/api/creature/actions/doAction.js b/app/imports/api/creature/actions/doAction.js
index 2b8209b5..fb8d89fd 100644
--- a/app/imports/api/creature/actions/doAction.js
+++ b/app/imports/api/creature/actions/doAction.js
@@ -2,10 +2,10 @@ import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
-import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
 import { nodesToTree } from '/imports/api/parenting/parenting.js';
 import applyProperties from '/imports/api/creature/actions/applyProperties.js';
diff --git a/app/imports/api/creature/actions/doCheck.js b/app/imports/api/creature/actions/doCheck.js
index 76e421a3..410462a7 100644
--- a/app/imports/api/creature/actions/doCheck.js
+++ b/app/imports/api/creature/actions/doCheck.js
@@ -1,8 +1,8 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import Creatures from '/imports/api/creature/Creatures.js';
-import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import roll from '/imports/parser/roll.js';
 
 const doCheck = new ValidatedMethod({
diff --git a/app/imports/api/creature/archive/methods/archiveCreatures.js b/app/imports/api/creature/archive/methods/archiveCreatures.js
index a63c6563..bc401d61 100644
--- a/app/imports/api/creature/archive/methods/archiveCreatures.js
+++ b/app/imports/api/creature/archive/methods/archiveCreatures.js
@@ -1,12 +1,12 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import { assertOwnership } from '/imports/api/creature/creaturePermissions.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import { assertOwnership } from '/imports/api/creature/creatures/creaturePermissions.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';
-import { removeCreatureWork } from '/imports/api/creature/removeCreature.js';
+import { removeCreatureWork } from '/imports/api/creature/creatures/methods/removeCreature.js';
 import ArchivedCreatures from '/imports/api/creature/archive/ArchivedCreatures.js';
 
 function archiveCreature(creatureId){
diff --git a/app/imports/api/creature/archive/methods/restoreCreatures.js b/app/imports/api/creature/archive/methods/restoreCreatures.js
index 6a84ccf8..e27093d8 100644
--- a/app/imports/api/creature/archive/methods/restoreCreatures.js
+++ b/app/imports/api/creature/archive/methods/restoreCreatures.js
@@ -2,7 +2,7 @@ import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertOwnership } from '/imports/api/sharing/sharingPermissions.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';
diff --git a/app/imports/api/creature/creatureComputation.test.js b/app/imports/api/creature/computation/creatureComputation.test.js
similarity index 100%
rename from app/imports/api/creature/creatureComputation.test.js
rename to app/imports/api/creature/computation/creatureComputation.test.js
diff --git a/app/imports/api/creature/computation/engine/writeCreatureVariables.js b/app/imports/api/creature/computation/engine/writeCreatureVariables.js
index 11749005..c8ccb7d8 100644
--- a/app/imports/api/creature/computation/engine/writeCreatureVariables.js
+++ b/app/imports/api/creature/computation/engine/writeCreatureVariables.js
@@ -1,5 +1,5 @@
 import { pick, forOwn } from 'lodash';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import VERSION from '/imports/constants/VERSION.js';
 
 export default function writeCreatureVariables(memo, creatureId, fullRecompute = true) {
diff --git a/app/imports/api/creature/computation/methods/recomputeCreature.js b/app/imports/api/creature/computation/methods/recomputeCreature.js
index 74e78ba5..781304ae 100644
--- a/app/imports/api/creature/computation/methods/recomputeCreature.js
+++ b/app/imports/api/creature/computation/methods/recomputeCreature.js
@@ -1,7 +1,7 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
-import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import ComputationMemo from '/imports/api/creature/computation/engine/ComputationMemo.js';
 import getComputationProperties from '/imports/api/creature/computation/engine/getComputationProperties.js';
 import computeMemo from '/imports/api/creature/computation/engine/computeMemo.js';
@@ -11,7 +11,7 @@ import { recomputeDamageMultipliersById } from '/imports/api/creature/denormalis
 import recomputeSlotFullness from '/imports/api/creature/denormalise/recomputeSlotFullness.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import getDependentProperties from '/imports/api/creature/computation/engine/getDependentProperties.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
 
 export const recomputeCreature = new ValidatedMethod({
diff --git a/app/imports/api/creature/creatureProperties/getRootCreatureAncestor.js b/app/imports/api/creature/creatureProperties/getRootCreatureAncestor.js
index d1768254..c4e2c862 100644
--- a/app/imports/api/creature/creatureProperties/getRootCreatureAncestor.js
+++ b/app/imports/api/creature/creatureProperties/getRootCreatureAncestor.js
@@ -1,4 +1,4 @@
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 
 export default function getRootCreatureAncestor(property){
   return Creatures.findOne(property.ancestors[0].id);
diff --git a/app/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js b/app/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js
index 302fc8ce..2a67299c 100644
--- a/app/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js
+++ b/app/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js
@@ -2,7 +2,7 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 import { recomputePropertyDependencies } from '/imports/api/creature/computation/methods/recomputeCreature.js';
diff --git a/app/imports/api/creature/creatureProperties/methods/dealDamage.js b/app/imports/api/creature/creatureProperties/methods/dealDamage.js
index 270221b9..ea3f3607 100644
--- a/app/imports/api/creature/creatureProperties/methods/dealDamage.js
+++ b/app/imports/api/creature/creatureProperties/methods/dealDamage.js
@@ -2,7 +2,7 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 import { recomputeCreatureByDependencies } from '/imports/api/creature/computation/methods/recomputeCreature.js';
diff --git a/app/imports/api/creature/Creatures.js b/app/imports/api/creature/creatures/Creatures.js
similarity index 54%
rename from app/imports/api/creature/Creatures.js
rename to app/imports/api/creature/creatures/Creatures.js
index 422d2f7c..8863dbb0 100644
--- a/app/imports/api/creature/Creatures.js
+++ b/app/imports/api/creature/creatures/Creatures.js
@@ -1,16 +1,7 @@
-import { ValidatedMethod } from 'meteor/mdg:validated-method';
-import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
 import deathSaveSchema from '/imports/api/properties/subSchemas/DeathSavesSchema.js'
 import ColorSchema from '/imports/api/properties/subSchemas/ColorSchema.js';
 import SharingSchema from '/imports/api/sharing/SharingSchema.js';
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import {assertEditPermission} from '/imports/api/sharing/sharingPermissions.js';
-import { assertUserHasPaidBenefits } from '/imports/api/users/patreon/tiers.js';
-import defaultCharacterProperties from '/imports/api/creature/defaultCharacterProperties.js';
-import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
-import '/imports/api/creature/removeCreature.js';
-import '/imports/api/creature/restCreature.js';
 
 //set up the collection for creatures
 let Creatures = new Mongo.Collection('creatures');
@@ -176,92 +167,8 @@ CreatureSchema.extend(SharingSchema);
 
 Creatures.attachSchema(CreatureSchema);
 
-const insertCreature = new ValidatedMethod({
 
-  name: 'creatures.insertCreature',
-
-  validate: null,
-
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-
-  run() {
-    if (!this.userId) {
-      throw new Meteor.Error('Creatures.methods.insert.denied',
-      'You need to be logged in to insert a creature');
-    }
-    assertUserHasPaidBenefits(this.userId);
-
-		// Create the creature document
-    let creatureId = Creatures.insert({
-			owner: this.userId,
-		});
-
-    // Insert the default properties
-    // Not batchInsert because we want the properties cleaned by the schema
-    let baseId;
-    defaultCharacterProperties(creatureId).forEach(prop => {
-      let id = CreatureProperties.insert(prop);
-      if (prop.name === 'Ruleset'){
-        baseId = id;
-      }
-    });
-
-    if (Meteor.isServer){
-      // Insert the 5e ruleset as the default base
-      insertPropertyFromLibraryNode.call({
-        nodeId: 'iHbhfcg3AL5isSWbw',
-        parentRef: {id: baseId, collection: 'creatureProperties'},
-        order: 0.5,
-      });
-    }
-
-		this.unblock();
-		return creatureId;
-  },
-});
-
-const updateCreature = new ValidatedMethod({
-  name: 'creatures.update',
-  validate({_id, path}){
-		if (!_id) return false;
-		// Allowed fields
-		let allowedFields = [
-      'name',
-      'alignment',
-      'gender',
-      'picture',
-      'avatarPicture',
-      'color',
-      'settings',
-    ];
-		if (!allowedFields.includes(path[0])){
-			throw new Meteor.Error('Creatures.methods.update.denied',
-      'This field can\'t be updated using this method');
-		}
-  },
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-  run({_id, path, value}) {
-		let creature = Creatures.findOne(_id);
-    assertEditPermission(creature, this.userId);
-    if (value === undefined || value === null){
-      Creatures.update(_id, {
-        $unset: {[path.join('.')]: 1},
-      });
-    } else {
-      Creatures.update(_id, {
-        $set: {[path.join('.')]: value},
-      });
-    }
-  },
-});
+import '/imports/api/creature/creatures/methods/index.js';
 
 export default Creatures;
-export { CreatureSchema, insertCreature, updateCreature };
+export { CreatureSchema };
diff --git a/app/imports/api/creature/creaturePermissions.js b/app/imports/api/creature/creatures/creaturePermissions.js
similarity index 92%
rename from app/imports/api/creature/creaturePermissions.js
rename to app/imports/api/creature/creatures/creaturePermissions.js
index 8496d519..380a5258 100644
--- a/app/imports/api/creature/creaturePermissions.js
+++ b/app/imports/api/creature/creatures/creaturePermissions.js
@@ -1,4 +1,4 @@
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import {
   assertEditPermission as editPermission,
   assertViewPermission as viewPermission,
diff --git a/app/imports/api/creature/defaultCharacterProperties.js b/app/imports/api/creature/creatures/defaultCharacterProperties.js
similarity index 100%
rename from app/imports/api/creature/defaultCharacterProperties.js
rename to app/imports/api/creature/creatures/defaultCharacterProperties.js
diff --git a/app/imports/api/creature/creatures/methods/index.js b/app/imports/api/creature/creatures/methods/index.js
new file mode 100644
index 00000000..42e9c99e
--- /dev/null
+++ b/app/imports/api/creature/creatures/methods/index.js
@@ -0,0 +1,4 @@
+import '/imports/api/creature/creatures/methods/insertCreature.js';
+import '/imports/api/creature/creatures/methods/removeCreature.js';
+import '/imports/api/creature/creatures/methods/restCreature.js';
+import '/imports/api/creature/creatures/methods/updateCreature.js';
diff --git a/app/imports/api/creature/creatures/methods/insertCreature.js b/app/imports/api/creature/creatures/methods/insertCreature.js
new file mode 100644
index 00000000..c0cc80c9
--- /dev/null
+++ b/app/imports/api/creature/creatures/methods/insertCreature.js
@@ -0,0 +1,56 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertUserHasPaidBenefits } from '/imports/api/users/patreon/tiers.js';
+import defaultCharacterProperties from '/imports/api/creature/creatures/defaultCharacterProperties.js';
+import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
+
+const insertCreature = new ValidatedMethod({
+
+  name: 'creatures.insertCreature',
+
+  validate: null,
+
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+
+  run() {
+    if (!this.userId) {
+      throw new Meteor.Error('Creatures.methods.insert.denied',
+      'You need to be logged in to insert a creature');
+    }
+    assertUserHasPaidBenefits(this.userId);
+
+		// Create the creature document
+    let creatureId = Creatures.insert({
+			owner: this.userId,
+		});
+
+    // Insert the default properties
+    // Not batchInsert because we want the properties cleaned by the schema
+    let baseId;
+    defaultCharacterProperties(creatureId).forEach(prop => {
+      let id = CreatureProperties.insert(prop);
+      if (prop.name === 'Ruleset'){
+        baseId = id;
+      }
+    });
+
+    if (Meteor.isServer){
+      // Insert the 5e ruleset as the default base
+      insertPropertyFromLibraryNode.call({
+        nodeId: 'iHbhfcg3AL5isSWbw',
+        parentRef: {id: baseId, collection: 'creatureProperties'},
+        order: 0.5,
+      });
+    }
+
+		return creatureId;
+  },
+});
+
+export default insertCreature;
diff --git a/app/imports/api/creature/removeCreature.js b/app/imports/api/creature/creatures/methods/removeCreature.js
similarity index 88%
rename from app/imports/api/creature/removeCreature.js
rename to app/imports/api/creature/creatures/methods/removeCreature.js
index c8542343..66eaa0b4 100644
--- a/app/imports/api/creature/removeCreature.js
+++ b/app/imports/api/creature/creatures/methods/removeCreature.js
@@ -1,8 +1,8 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import { assertOwnership } from '/imports/api/creature/creaturePermissions.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import { assertOwnership } from '/imports/api/creature/creatures/creaturePermissions.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';
diff --git a/app/imports/api/creature/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js
similarity index 97%
rename from app/imports/api/creature/restCreature.js
rename to app/imports/api/creature/creatures/methods/restCreature.js
index c4c814ed..a0464a00 100644
--- a/app/imports/api/creature/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -1,9 +1,9 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { recomputeCreatureById } from '/imports/api/creature/computation/methods/recomputeCreature.js';
 
 const restCreature = new ValidatedMethod({
diff --git a/app/imports/api/creature/creatures/methods/updateCreature.js b/app/imports/api/creature/creatures/methods/updateCreature.js
new file mode 100644
index 00000000..6530ccae
--- /dev/null
+++ b/app/imports/api/creature/creatures/methods/updateCreature.js
@@ -0,0 +1,45 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import {assertEditPermission} from '/imports/api/sharing/sharingPermissions.js';
+
+const updateCreature = new ValidatedMethod({
+  name: 'creatures.update',
+  validate({_id, path}){
+		if (!_id) return false;
+		// Allowed fields
+		let allowedFields = [
+      'name',
+      'alignment',
+      'gender',
+      'picture',
+      'avatarPicture',
+      'color',
+      'settings',
+    ];
+		if (!allowedFields.includes(path[0])){
+			throw new Meteor.Error('Creatures.methods.update.denied',
+      'This field can\'t be updated using this method');
+		}
+  },
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id, path, value}) {
+		let creature = Creatures.findOne(_id);
+    assertEditPermission(creature, this.userId);
+    if (value === undefined || value === null){
+      Creatures.update(_id, {
+        $unset: {[path.join('.')]: 1},
+      });
+    } else {
+      Creatures.update(_id, {
+        $set: {[path.join('.')]: value},
+      });
+    }
+  },
+});
+
+export default updateCreature;
diff --git a/app/imports/api/creature/denormalise/recomputeDamageMultipliers.js b/app/imports/api/creature/denormalise/recomputeDamageMultipliers.js
index ccaed171..b31b1ece 100644
--- a/app/imports/api/creature/denormalise/recomputeDamageMultipliers.js
+++ b/app/imports/api/creature/denormalise/recomputeDamageMultipliers.js
@@ -1,8 +1,8 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
-import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 
 export const recomputeDamageMultipliers = new ValidatedMethod({
diff --git a/app/imports/api/creature/denormalise/recomputeInventory.js b/app/imports/api/creature/denormalise/recomputeInventory.js
index dd7f7237..ae3871ec 100644
--- a/app/imports/api/creature/denormalise/recomputeInventory.js
+++ b/app/imports/api/creature/denormalise/recomputeInventory.js
@@ -1,5 +1,5 @@
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { nodesToTree } from '/imports/api/parenting/parenting.js';
 
 export default function recomputeInventory(creatureId){
diff --git a/app/imports/api/creature/experience/Experiences.js b/app/imports/api/creature/experience/Experiences.js
index 3584bc93..fe16563f 100644
--- a/app/imports/api/creature/experience/Experiences.js
+++ b/app/imports/api/creature/experience/Experiences.js
@@ -2,8 +2,8 @@ import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
-import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { recomputeCreatureById } from '/imports/api/creature/computation/methods/recomputeCreature.js';
 
 let Experiences = new Mongo.Collection('experiences');
diff --git a/app/imports/api/creature/log/CreatureLogs.js b/app/imports/api/creature/log/CreatureLogs.js
index aec3a4c8..62489cde 100644
--- a/app/imports/api/creature/log/CreatureLogs.js
+++ b/app/imports/api/creature/log/CreatureLogs.js
@@ -1,9 +1,9 @@
 import SimpleSchema from 'simpl-schema';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import LogContentSchema from '/imports/api/creature/log/LogContentSchema.js';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import {assertEditPermission} from '/imports/api/creature/creaturePermissions.js';
+import {assertEditPermission} from '/imports/api/creature/creatures/creaturePermissions.js';
 import {
   parse,
   CompilationContext,
diff --git a/app/imports/api/creature/mixins/creaturePermissionMixin.js b/app/imports/api/creature/mixins/creaturePermissionMixin.js
index 887879b2..18b96fbd 100644
--- a/app/imports/api/creature/mixins/creaturePermissionMixin.js
+++ b/app/imports/api/creature/mixins/creaturePermissionMixin.js
@@ -2,7 +2,7 @@ import {
   assertEditPermission,
   assertViewPermission,
   assertOwnership,
-} from '/imports/api/creature/creaturePermissions.js';
+} from '/imports/api/creature/creatures/creaturePermissions.js';
 
 // Checks if the method has permission to run on the document. If the document
 // has a charId, that creature is checked, otherwise if it has an _id and the
diff --git a/app/imports/api/tabletop/Messages.js b/app/imports/api/tabletop/Messages.js
index badf61e6..b2dc0280 100644
--- a/app/imports/api/tabletop/Messages.js
+++ b/app/imports/api/tabletop/Messages.js
@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import Tabletops, { assertUserInTabletop } from '/imports/api/tabletop/Tabletops.js';
 
 let Messages = new Mongo.Collection('messages');
diff --git a/app/imports/api/tabletop/Tabletops.js b/app/imports/api/tabletop/Tabletops.js
index 29c3f04d..cf991b55 100644
--- a/app/imports/api/tabletop/Tabletops.js
+++ b/app/imports/api/tabletop/Tabletops.js
@@ -2,7 +2,7 @@ import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertUserHasPaidBenefits } from '/imports/api/users/patreon/tiers.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 
 let Tabletops = new Mongo.Collection('tabletops');
 
diff --git a/app/imports/api/users/deleteMyAccount.js b/app/imports/api/users/deleteMyAccount.js
index 6a5aa8c1..d887b8c0 100644
--- a/app/imports/api/users/deleteMyAccount.js
+++ b/app/imports/api/users/deleteMyAccount.js
@@ -1,8 +1,8 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import Libraries, {removeLibaryWork} from '/imports/api/library/Libraries.js';
-import Creatures from '/imports/api/creature/Creatures.js';
-import {removeCreatureWork} from '/imports/api/creature/removeCreature.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import {removeCreatureWork} from '/imports/api/creature/creatures/methods/removeCreature.js';
 
 Meteor.users.deleteMyAccount = new ValidatedMethod({
 	name: 'users.deleteMyAccount',
diff --git a/app/imports/server/publications/characterList.js b/app/imports/server/publications/characterList.js
index 3ff5dbf1..660d10f2 100644
--- a/app/imports/server/publications/characterList.js
+++ b/app/imports/server/publications/characterList.js
@@ -1,4 +1,4 @@
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
 
 Meteor.publish('characterList', function(){
diff --git a/app/imports/server/publications/experiences.js b/app/imports/server/publications/experiences.js
index ef847bd2..ca01450c 100644
--- a/app/imports/server/publications/experiences.js
+++ b/app/imports/server/publications/experiences.js
@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';
-import { assertViewPermission } from '/imports/api/creature/creaturePermissions.js';
+import { assertViewPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 
 let schema = new SimpleSchema({
   creatureId: {
diff --git a/app/imports/server/publications/ownedDocuments.js b/app/imports/server/publications/ownedDocuments.js
index 317b4e83..2683977a 100644
--- a/app/imports/server/publications/ownedDocuments.js
+++ b/app/imports/server/publications/ownedDocuments.js
@@ -1,4 +1,4 @@
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import Libraries from '/imports/api/library/Libraries.js';
 
 Meteor.publish('ownedDocuments', function(){
diff --git a/app/imports/server/publications/singleCharacter.js b/app/imports/server/publications/singleCharacter.js
index 1ad7027b..105ffed2 100644
--- a/app/imports/server/publications/singleCharacter.js
+++ b/app/imports/server/publications/singleCharacter.js
@@ -1,8 +1,8 @@
 import SimpleSchema from 'simpl-schema';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
-import { assertViewPermission } from '/imports/api/creature/creaturePermissions.js';
+import { assertViewPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import recomputeInvetory from '/imports/api/creature/denormalise/recomputeInventory.js';
 import { recomputeCreatureById } from '/imports/api/creature/computation/methods/recomputeCreature.js';
 import VERSION from '/imports/constants/VERSION.js';
diff --git a/app/imports/server/publications/tabletops.js b/app/imports/server/publications/tabletops.js
index b6fc4ea1..30345f79 100644
--- a/app/imports/server/publications/tabletops.js
+++ b/app/imports/server/publications/tabletops.js
@@ -1,5 +1,5 @@
 import Tabletops from '/imports/api/tabletop/Tabletops.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import Messages from '/imports/api/tabletop/Messages.js';
 
 Meteor.publish('tabletops', function(){
diff --git a/app/imports/ui/creature/CreatureFormDialog.vue b/app/imports/ui/creature/CreatureFormDialog.vue
index 05ad4239..7f680da9 100644
--- a/app/imports/ui/creature/CreatureFormDialog.vue
+++ b/app/imports/ui/creature/CreatureFormDialog.vue
@@ -29,11 +29,11 @@
 </template>
 
 <script lang="js">
-import Creatures from '/imports/api/creature/Creatures.js';
-import {updateCreature} from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import updateCreature from '/imports/api/creature/creatures/methods/updateCreature.js';
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 import CreatureForm from '/imports/ui/creature/CreatureForm.vue'
-import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import ColorPicker from '/imports/ui/components/ColorPicker.vue';
 
 export default {
diff --git a/app/imports/ui/creature/RestButton.vue b/app/imports/ui/creature/RestButton.vue
index ffd19676..d7a887f7 100644
--- a/app/imports/ui/creature/RestButton.vue
+++ b/app/imports/ui/creature/RestButton.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import restCreature from '/imports/api/creature/restCreature.js';
+import restCreature from '/imports/api/creature/creatures/methods/restCreature.js';
 
 export default {
   inject: {
diff --git a/app/imports/ui/creature/character/CharacterDeleteDialog.vue b/app/imports/ui/creature/character/CharacterDeleteDialog.vue
index 2e10de67..a8345316 100644
--- a/app/imports/ui/creature/character/CharacterDeleteDialog.vue
+++ b/app/imports/ui/creature/character/CharacterDeleteDialog.vue
@@ -31,9 +31,9 @@
 </template>
 
 <script lang="js">
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import removeCreature from '/imports/api/creature/removeCreature.js';
+import removeCreature from '/imports/api/creature/creatures/methods/removeCreature.js';
 import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/CharacterSheet.vue b/app/imports/ui/creature/character/CharacterSheet.vue
index d036d8b5..495c7bfa 100644
--- a/app/imports/ui/creature/character/CharacterSheet.vue
+++ b/app/imports/ui/creature/character/CharacterSheet.vue
@@ -69,14 +69,14 @@
 <script lang="js">
   //TODO add a "no character found" screen if shown on a false address
   // or on a character the user does not have permission to view
-	import Creatures from '/imports/api/creature/Creatures.js';
+	import Creatures from '/imports/api/creature/creatures/Creatures.js';
 	import StatsTab from '/imports/ui/creature/character/characterSheetTabs/StatsTab.vue';
 	import FeaturesTab from '/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue';
 	import InventoryTab from '/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue';
 	import SpellsTab from '/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue';
 	import CharacterTab from '/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue';
   import TreeTab from '/imports/ui/creature/character/characterSheetTabs/TreeTab.vue';
-  import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+  import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
   import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
   import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
 
diff --git a/app/imports/ui/creature/character/CharacterSheetToolbar.vue b/app/imports/ui/creature/character/CharacterSheetToolbar.vue
index 67a18d33..693fcd57 100644
--- a/app/imports/ui/creature/character/CharacterSheetToolbar.vue
+++ b/app/imports/ui/creature/character/CharacterSheetToolbar.vue
@@ -122,10 +122,10 @@
 </template>
 
 <script lang="js">
-import Creatures from '/imports/api/creature/Creatures.js';
-import removeCreature from '/imports/api/creature/removeCreature.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import removeCreature from '/imports/api/creature/creatures/methods/removeCreature.js';
 import { mapMutations } from 'vuex';
-import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { updateUserSharePermissions } from '/imports/api/sharing/sharing.js';
 import isDarkColor from '/imports/ui/utility/isDarkColor.js';
 import CharacterSheetFab from '/imports/ui/creature/character/CharacterSheetFab.vue';
diff --git a/app/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue b/app/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue
index f3242ee1..f5cd1ff5 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script lang="js">
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 import NoteCard from '/imports/ui/properties/components/persona/NoteCard.vue';
diff --git a/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
index 7833cd37..1c78e5f2 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
@@ -99,7 +99,7 @@
 
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 import ContainerCard from '/imports/ui/properties/components/inventory/ContainerCard.vue';
 import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index 273a534b..55f1864d 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -320,7 +320,7 @@
 </template>
 
 <script lang="js">
-  import Creatures from '/imports/api/creature/Creatures.js';
+  import Creatures from '/imports/api/creature/creatures/Creatures.js';
 	import softRemoveProperty from '/imports/api/creature/creatureProperties/methods/softRemoveProperty.js';
   import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 	import AttributeCard from '/imports/ui/properties/components/attributes/AttributeCard.vue';
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
index 0bdd9375..48641e43 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
+++ b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
@@ -82,7 +82,7 @@ import softRemoveProperty from '/imports/api/creature/creatureProperties/methods
 import restoreProperty from '/imports/api/creature/creatureProperties/methods/restoreProperty.js';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 import duplicateProperty from '/imports/api/creature/creatureProperties/methods/duplicateProperty.js';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import PropertyToolbar from '/imports/ui/components/propertyToolbar.vue';
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
@@ -91,7 +91,7 @@ import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormI
 import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
 import CreaturePropertiesTree from '/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
 import getPropertyTitle from '/imports/ui/properties/shared/getPropertyTitle.js';
-import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { get, findLast } from 'lodash';
 import equipItem from '/imports/api/creature/creatureProperties/methods/equipItem.js';
 import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
diff --git a/app/imports/ui/creature/slots/SlotFillDialog.vue b/app/imports/ui/creature/slots/SlotFillDialog.vue
index bda05e19..5af45199 100644
--- a/app/imports/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/ui/creature/slots/SlotFillDialog.vue
@@ -153,7 +153,7 @@
 </template>
 
 <script lang="js">
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
diff --git a/app/imports/ui/layouts/Sidebar.vue b/app/imports/ui/layouts/Sidebar.vue
index 38d1bd3e..6fd514f7 100644
--- a/app/imports/ui/layouts/Sidebar.vue
+++ b/app/imports/ui/layouts/Sidebar.vue
@@ -112,7 +112,7 @@
 </template>
 
 <script lang="js">
-  import Creatures from '/imports/api/creature/Creatures.js';
+  import Creatures from '/imports/api/creature/creatures/Creatures.js';
   import Parties from '/imports/api/creature/creatureFolders/CreatureFolders.js';
 
   export default {
diff --git a/app/imports/ui/log/CharacterLog.vue b/app/imports/ui/log/CharacterLog.vue
index 28c6d8a6..b6c7ded3 100644
--- a/app/imports/ui/log/CharacterLog.vue
+++ b/app/imports/ui/log/CharacterLog.vue
@@ -34,8 +34,8 @@
 
 <script lang="js">
 import CreatureLogs, { logRoll } from '/imports/api/creature/log/CreatureLogs.js';
-import Creatures from '/imports/api/creature/Creatures.js';
-import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { parse, prettifyParseError } from '/imports/parser/parser.js';
 import LogEntry from '/imports/ui/log/LogEntry.vue';
 
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index 53cc878d..e6509cc3 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -85,7 +85,8 @@
 
 <script lang="js">
   import Vue from 'vue';
-  import Creatures, {insertCreature} from '/imports/api/creature/Creatures.js';
+  import Creatures from '/imports/api/creature/creatures/Creatures.js';
+  import insertCreature from '/imports/api/creature/creatures/methods/insertCreature.js';
   import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
   import CreatureList from '/imports/ui/creature/creatureList/CreatureList.vue';
   import { getUserTier } from '/imports/api/users/patreon/tiers.js';
diff --git a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
index c8dc4b06..9b8440e7 100644
--- a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
+++ b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="js">
-  import Creatures from '/imports/api/creature/Creatures.js';
+  import Creatures from '/imports/api/creature/creatures/Creatures.js';
   import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 
 	import HealthBarCard from '/imports/ui/properties/components/attributes/HealthBarCard.vue';
diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/ui/properties/viewers/SkillViewer.vue
index 236a68c7..42c6d794 100644
--- a/app/imports/ui/properties/viewers/SkillViewer.vue
+++ b/app/imports/ui/properties/viewers/SkillViewer.vue
@@ -88,7 +88,7 @@ import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import AttributeEffect from '/imports/ui/properties/components/attributes/AttributeEffect.vue';
 import SkillProficiency from '/imports/ui/properties/components/skills/SkillProficiency.vue';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/tabletop/SelectCreaturesDialog.vue b/app/imports/ui/tabletop/SelectCreaturesDialog.vue
index 2a647119..9488101e 100644
--- a/app/imports/ui/tabletop/SelectCreaturesDialog.vue
+++ b/app/imports/ui/tabletop/SelectCreaturesDialog.vue
@@ -31,7 +31,7 @@
 
 <script lang="js">
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureListTile from '/imports/ui/creature/creatureList/CreatureListTile.vue';
 
 export default {
diff --git a/app/imports/ui/tabletop/TabletopComponent.vue b/app/imports/ui/tabletop/TabletopComponent.vue
index e74f55eb..f4297bc6 100644
--- a/app/imports/ui/tabletop/TabletopComponent.vue
+++ b/app/imports/ui/tabletop/TabletopComponent.vue
@@ -38,7 +38,7 @@ import { addCreaturesToTabletop } from '/imports/api/tabletop/Tabletops.js';
 import TabletopCreatureCard from '/imports/ui/tabletop/TabletopCreatureCard.vue';
 import TabletopMap from '/imports/ui/tabletop/TabletopMap.vue';
 import TabletopLog from '/imports/ui/tabletop/TabletopLog.vue';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import TabletopActionCards from '/imports/ui/tabletop/TabletopActionCards.vue';
 import MiniCharacterSheet from '/imports/ui/creature/character/MiniCharacterSheet.vue';
 
diff --git a/app/imports/ui/user/DeleteUserAccountDialog.vue b/app/imports/ui/user/DeleteUserAccountDialog.vue
index 30779f14..c9e7a633 100644
--- a/app/imports/ui/user/DeleteUserAccountDialog.vue
+++ b/app/imports/ui/user/DeleteUserAccountDialog.vue
@@ -90,7 +90,7 @@
 
 <script lang="js">
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import Creatures from '/imports/api/creature/Creatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import Libraries from '/imports/api/library/Libraries.js';
 import CreatureListTile from '/imports/ui/creature/creatureList/CreatureListTile.vue';
 

From a451afcbaf60a4426b604cbec354208a8cfc843a Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 21 Jun 2021 16:06:10 +0200
Subject: [PATCH 15/42] Prevented new characters being added if you are at your
 character limit

---
 .../api/creature/creatures/methods/index.js   |  1 +
 .../creatures/methods/insertCreature.js       | 18 ++++-
 .../CharacterListToolbarItems.vue             | 30 +++++++++
 app/imports/ui/pages/CharacterList.vue        | 65 +++++++++++++------
 app/imports/ui/router.js                      |  2 +
 5 files changed, 94 insertions(+), 22 deletions(-)
 create mode 100644 app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue

diff --git a/app/imports/api/creature/creatures/methods/index.js b/app/imports/api/creature/creatures/methods/index.js
index 42e9c99e..2cd1b752 100644
--- a/app/imports/api/creature/creatures/methods/index.js
+++ b/app/imports/api/creature/creatures/methods/index.js
@@ -1,4 +1,5 @@
 import '/imports/api/creature/creatures/methods/insertCreature.js';
 import '/imports/api/creature/creatures/methods/removeCreature.js';
 import '/imports/api/creature/creatures/methods/restCreature.js';
+import '/imports/api/creature/creatures/methods/transferCreatureOwnership.js';
 import '/imports/api/creature/creatures/methods/updateCreature.js';
diff --git a/app/imports/api/creature/creatures/methods/insertCreature.js b/app/imports/api/creature/creatures/methods/insertCreature.js
index c0cc80c9..41a8c83f 100644
--- a/app/imports/api/creature/creatures/methods/insertCreature.js
+++ b/app/imports/api/creature/creatures/methods/insertCreature.js
@@ -2,7 +2,7 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import { assertUserHasPaidBenefits } from '/imports/api/users/patreon/tiers.js';
+import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 import defaultCharacterProperties from '/imports/api/creature/creatures/defaultCharacterProperties.js';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
 
@@ -23,7 +23,21 @@ const insertCreature = new ValidatedMethod({
       throw new Meteor.Error('Creatures.methods.insert.denied',
       'You need to be logged in to insert a creature');
     }
-    assertUserHasPaidBenefits(this.userId);
+    let tier = getUserTier(this.userId);
+
+    let currentCharacterCount = Creatures.find({
+      owner: this.userId,
+    }, {
+      fields: {_id: 1},
+    }).count();
+
+    if (
+      tier.characterSlots !== -1 &&
+      currentCharacterCount >= tier.characterSlots
+    ){
+      throw new Meteor.Error('Creatures.methods.insert.denied',
+      `You are already at your limit of ${tier.characterSlots} characters`)
+    }
 
 		// Create the creature document
     let creatureId = Creatures.insert({
diff --git a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue b/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
new file mode 100644
index 00000000..7cc764c5
--- /dev/null
+++ b/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
@@ -0,0 +1,30 @@
+<template lang="html">
+  <div>
+    {{ creatureCount }} /
+    <v-icon v-if="characterSlots === -1">
+      mdi-infinity
+    </v-icon>
+    <template v-else>
+      {{ characterSlots }}
+    </template>
+  </div>
+</template>
+
+<script lang="js">
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+
+export default {
+  meteor: {
+    creatureCount(){
+      return Creatures.find({owner: Meteor.userId()}).count();
+    },
+    characterSlots(){
+      return getUserTier(Meteor.userId()).characterSlots;
+    }
+  },
+}
+</script>
+
+<style lang="css">
+</style>
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index e6509cc3..04bd7720 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -3,6 +3,13 @@
     class="card-background pa-4"
     style="height: 100%"
   >
+    <v-alert
+      v-if="exceededCharacterSpace"
+      type="error"
+    >
+      You have exceeded your maximum number of character slots, archive or delete
+      some characters.
+    </v-alert>
     <v-card :class="{'mb-4': folders && folders.length}">
       <creature-list :creatures="CreaturesWithNoParty" />
     </v-card>
@@ -76,6 +83,7 @@
       bottom
       right
       data-id="new-character-button"
+      :disabled="!hasCharacterSpace"
       @click="insertCharacter"
     >
       <v-icon>mdi-plus</v-icon>
@@ -143,6 +151,28 @@
           {sort: {name: 1}}
         ).map(characterTransform);
       },
+      creatureCount(){
+        let userId = Meteor.userId();
+        return Creatures.find({
+          owner: userId,
+        }, {
+          fields: {_id: 1},
+        }).count();
+      },
+      tier(){
+        let userId = Meteor.userId();
+        return getUserTier(userId);
+      },
+      hasCharacterSpace(){
+        let tier = this.tier;
+        let currentCharacterCount = this.creatureCount;
+        return tier.characterSlots === -1 || currentCharacterCount < tier.characterSlots
+      },
+      exceededCharacterSpace(){
+        let tier = this.tier;
+        let currentCharacterCount = this.creatureCount;
+        return tier.characterSlots !== -1 && currentCharacterCount > tier.characterSlots
+      }
     },
     watch:{
       renamingFolder(newId){
@@ -156,26 +186,21 @@
     },
     methods: {
       insertCharacter(){
-        let tier = getUserTier(Meteor.userId());
-        if (tier.paidBenefits){
-          insertCreature.call((error, result) => {
-            if (error){
-              console.error(error);
-            } else {
-              this.$store.commit(
-                'setTabForCharacterSheet',
-                {id: result, tab: 4}
-              );
-              this.$store.commit('setShowDetailsDialog', true);
-              this.$router.push({ path: `/character/${result}`});
-            }
-          });
-        } else {
-          this.$store.commit('pushDialogStack', {
-            component: 'tier-too-low-dialog',
-            elementId: 'new-character-button',
-          });
-        }
+        insertCreature.call((error, result) => {
+          if (error){
+            console.error(error);
+            snackbar({
+              text: error.reason,
+            });
+          } else {
+            this.$store.commit(
+              'setTabForCharacterSheet',
+              {id: result, tab: 4}
+            );
+            this.$store.commit('setShowDetailsDialog', true);
+            this.$router.push({ path: `/character/${result}`});
+          }
+        });
       },
       insertFolder(){
         this.loadingInsertFolder = true;
diff --git a/app/imports/ui/router.js b/app/imports/ui/router.js
index 591f7045..8590f16c 100644
--- a/app/imports/ui/router.js
+++ b/app/imports/ui/router.js
@@ -5,6 +5,7 @@ import { acceptInviteToken } from '/imports/api/users/Invites.js';
 import Home from '/imports/ui/pages/Home.vue';
 import About from '/imports/ui/pages/About.vue';
 import CharacterList from '/imports/ui/pages/CharacterList.vue';
+import CharacterListToolbarItems from '/imports/ui/creature/creatureList/CharacterListToolbarItems.vue';
 import Library from '/imports/ui/pages/Library.vue';
 import SingleLibraryToolbar from '/imports/ui/library/SingleLibraryToolbar.vue';
 import CharacterSheetPage from '/imports/ui/pages/CharacterSheetPage.vue';
@@ -104,6 +105,7 @@ RouterFactory.configure(factory => {
       path: '/characterList',
       components: {
         default: CharacterList,
+        toolbarItems: CharacterListToolbarItems,
       },
       meta: {
         title: 'Character List',

From 5f5fe801f6af3e0017986b83932a8ab61e05a49b Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 21 Jun 2021 16:06:29 +0200
Subject: [PATCH 16/42] Added method to transfer character ownership

---
 .../methods/transferCreatureOwnership.js      | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 app/imports/api/creature/creatures/methods/transferCreatureOwnership.js

diff --git a/app/imports/api/creature/creatures/methods/transferCreatureOwnership.js b/app/imports/api/creature/creatures/methods/transferCreatureOwnership.js
new file mode 100644
index 00000000..c7012d03
--- /dev/null
+++ b/app/imports/api/creature/creatures/methods/transferCreatureOwnership.js
@@ -0,0 +1,55 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import { assertOwnership } from '/imports/api/creature/creatures/creaturePermissions.js';
+import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+
+const transferCreatureOwnership = new ValidatedMethod({
+
+  name: 'creatures.methods.transferOwnership',
+
+  validate: new SimpleSchema({
+    creatureId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+    userId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+
+  run({creatureId, userId}) {
+    assertOwnership(creatureId, this.userId);
+
+    let tier = getUserTier(userId);
+    let currentCharacterCount = Creatures.find({
+      owner: userId,
+    }, {
+      fields: {_id: 1},
+    }).count();
+
+    if (
+      tier.characterSlots !== -1 &&
+      currentCharacterCount >= tier.characterSlots
+    ){
+      throw new Meteor.Error('Creatures.methods.transferOwnership.denied',
+      'The new owner is already at their character limit')
+    }
+
+    Creatures.update(creatureId, {
+      $set: {owner: userId},
+    });
+
+		return creatureId;
+  },
+});
+
+export default transferCreatureOwnership;

From 54bf21c57c41d3088547292bd8da7a638aff240c Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 21 Jun 2021 16:32:24 +0200
Subject: [PATCH 17/42] Edit permission is no longer patreon-only

---
 app/imports/api/sharing/sharingPermissions.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/imports/api/sharing/sharingPermissions.js b/app/imports/api/sharing/sharingPermissions.js
index 94b42355..16831209 100644
--- a/app/imports/api/sharing/sharingPermissions.js
+++ b/app/imports/api/sharing/sharingPermissions.js
@@ -1,6 +1,5 @@
 import { _ } from 'meteor/underscore';
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
-import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 
 function assertIdValid(userId){
   if (!userId || typeof userId !== 'string'){
@@ -48,13 +47,6 @@ export function assertEditPermission(doc, userId) {
     return true;
   }
 
-  // Ensure the user is of a tier with paid benefits
-  let tier = getUserTier(user);
-  if (!tier.paidBenefits){
-    throw new Meteor.Error('Edit permission denied',
-      `The ${tier.name} tier does not allow you to edit this document`);
-  }
-
   // Ensure the user is authorized for this specific document
   if (
     doc.owner === userId ||

From 66dc0ee34f5279f08412341aa0b67e64a9397c84 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 21 Jun 2021 16:37:02 +0200
Subject: [PATCH 18/42] Added icon to indicate sharing status of characters

---
 app/imports/ui/components/SharedIcon.vue      | 47 +++++++++++++++++++
 .../character/CharacterSheetToolbar.vue       |  3 ++
 .../creatureList/CreatureListTile.vue         |  8 ++++
 3 files changed, 58 insertions(+)
 create mode 100644 app/imports/ui/components/SharedIcon.vue

diff --git a/app/imports/ui/components/SharedIcon.vue b/app/imports/ui/components/SharedIcon.vue
new file mode 100644
index 00000000..568bd91c
--- /dev/null
+++ b/app/imports/ui/components/SharedIcon.vue
@@ -0,0 +1,47 @@
+<template lang="html">
+  <v-tooltip
+    v-if="accessRights === 'reader' || accessRights === 'writer'"
+    bottom
+  >
+    <template #activator="{ on }">
+      <v-icon
+        style="opacity: 0.4"
+        v-on="on"
+      >
+        {{ accessRights === 'reader' ? 'mdi-file-eye' : 'mdi-file-edit' }}
+      </v-icon>
+    </template>
+    <span>{{ accessText }}</span>
+  </v-tooltip>
+</template>
+
+<script lang="js">
+export default {
+  props:{
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  meteor:{
+    accessRights(){
+      let userId = Meteor.userId();
+      if (this.model.owner === userId) return 'owner'
+      else if (this.model.writers.includes(userId)) return 'writer';
+      else if (this.model.readers.includes(userId)) return 'reader';
+      else if (this.model.public) return 'public';
+      else return 'denied'
+    },
+    accessText(){
+      switch (this.accessRights){
+        case 'writer': return 'Shared with edit permission';
+        case 'reader': return 'Shared as view-only';
+        case 'public': return 'Shared as publicly viewable';
+      }
+    }
+  }
+}
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/creature/character/CharacterSheetToolbar.vue b/app/imports/ui/creature/character/CharacterSheetToolbar.vue
index 693fcd57..fe6106e2 100644
--- a/app/imports/ui/creature/character/CharacterSheetToolbar.vue
+++ b/app/imports/ui/creature/character/CharacterSheetToolbar.vue
@@ -26,6 +26,7 @@
     >
       <div :key="$route.meta.title">
         <template v-if="creature">
+          <shared-icon :model="creature" />
           <v-menu
             bottom
             left
@@ -130,6 +131,7 @@ import { updateUserSharePermissions } from '/imports/api/sharing/sharing.js';
 import isDarkColor from '/imports/ui/utility/isDarkColor.js';
 import CharacterSheetFab from '/imports/ui/creature/character/CharacterSheetFab.vue';
 import getThemeColor from '/imports/ui/utility/getThemeColor.js';
+import SharedIcon from '/imports/ui/components/SharedIcon.vue';
 
 export default {
   inject: {
@@ -137,6 +139,7 @@ export default {
   },
   components: {
     CharacterSheetFab,
+    SharedIcon,
   },
   computed: {
     creatureId(){
diff --git a/app/imports/ui/creature/creatureList/CreatureListTile.vue b/app/imports/ui/creature/creatureList/CreatureListTile.vue
index 29c67e97..d98825d3 100644
--- a/app/imports/ui/creature/creatureList/CreatureListTile.vue
+++ b/app/imports/ui/creature/creatureList/CreatureListTile.vue
@@ -21,6 +21,9 @@
         {{ model.alignment }} {{ model.gender }} {{ model.race }}
       </v-list-item-subtitle>
     </v-list-item-content>
+    <v-list-item-action>
+      <shared-icon :model="model" />
+    </v-list-item-action>
     <v-list-item-action>
       <v-checkbox
         v-if="selection"
@@ -38,7 +41,12 @@
 </template>
 
 <script lang="js">
+import SharedIcon from '/imports/ui/components/SharedIcon.vue';
+
 export default {
+  components: {
+    SharedIcon,
+  },
   props: {
     model: {
       type: Object,

From e96755927fa6a7a20fe29da0766ab5fcfcdcd77b Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 21 Jun 2021 16:42:47 +0200
Subject: [PATCH 19/42] Added archive dialog, empty for now

---
 .../ui/creature/archive/ArchiveDialog.vue     | 28 +++++++++++++++++++
 .../CharacterListToolbarItems.vue             | 17 +++++++++++
 .../ui/dialogStack/DialogComponentIndex.js    |  2 ++
 3 files changed, 47 insertions(+)
 create mode 100644 app/imports/ui/creature/archive/ArchiveDialog.vue

diff --git a/app/imports/ui/creature/archive/ArchiveDialog.vue b/app/imports/ui/creature/archive/ArchiveDialog.vue
new file mode 100644
index 00000000..a9c8e8c5
--- /dev/null
+++ b/app/imports/ui/creature/archive/ArchiveDialog.vue
@@ -0,0 +1,28 @@
+<template lang="html">
+  <dialog-base>
+    <div>
+      TODO
+    </div>
+    <v-spacer slot="actions" />
+    <v-btn
+      slot="actions"
+      text
+      @click="$store.dispatch('popDialogStack')"
+    >
+      Done
+    </v-btn>
+  </dialog-base>
+</template>
+
+<script lang="js">
+import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+
+export default {
+  components: {
+    DialogBase,
+  },
+}
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue b/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
index 7cc764c5..c7669f15 100644
--- a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
+++ b/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
@@ -7,6 +7,15 @@
     <template v-else>
       {{ characterSlots }}
     </template>
+    <v-btn
+      icon
+      data-id="open-archive-btn"
+      @click="openArchive"
+    >
+      <v-icon>
+        mdi-archive
+      </v-icon>
+    </v-btn>
   </div>
 </template>
 
@@ -23,6 +32,14 @@ export default {
       return getUserTier(Meteor.userId()).characterSlots;
     }
   },
+  methods: {
+    openArchive(){
+      this.$store.commit('pushDialogStack', {
+        component: 'archive-dialog',
+        elementId: 'open-archive-btn',
+      });
+    }
+  }
 }
 </script>
 
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index 53724f22..69dc4dee 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -1,3 +1,4 @@
+import ArchiveDialog from '/imports/ui/creature/archive/ArchiveDialog.vue';
 import CastSpellWithSlotDialog from '/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue';
 import CreatureFormDialog from '/imports/ui/creature/CreatureFormDialog.vue';
 import CreaturePropertyCreationDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue';
@@ -22,6 +23,7 @@ import TierTooLowDialog from '/imports/ui/user/TierTooLowDialog.vue';
 import UsernameDialog from '/imports/ui/user/UsernameDialog.vue';
 
 export default {
+  ArchiveDialog,
   CastSpellWithSlotDialog,
   CreatureFormDialog,
   CreaturePropertyCreationDialog,

From 3db589f775196d74d29d11f2f2ae7ffc0ded7127 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Jun 2021 14:59:02 +0200
Subject: [PATCH 20/42] Fixed button property for new Vuetify version

---
 app/imports/ui/creature/experiences/ExperienceListDialog.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/imports/ui/creature/experiences/ExperienceListDialog.vue b/app/imports/ui/creature/experiences/ExperienceListDialog.vue
index 8fa8d1e2..b90450f7 100644
--- a/app/imports/ui/creature/experiences/ExperienceListDialog.vue
+++ b/app/imports/ui/creature/experiences/ExperienceListDialog.vue
@@ -72,7 +72,6 @@
           <v-list-item-action>
             <v-btn
               icon
-              flat
               :loading="experiencesRemovalLoading.has(experience._id)"
               @click="removeExperience(experience._id)"
             >

From 86d9383af075fdc77d01188d7e8d9aff5f8b36d4 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Jun 2021 14:59:18 +0200
Subject: [PATCH 21/42] Archive UI

---
 .../archive/methods/archiveCreatures.js       |  10 +-
 .../archive/methods/restoreCreatures.js       |  30 ++-
 .../server/publications/archivedCreatures.js  |   1 +
 .../ui/creature/archive/ArchiveDialog.vue     | 195 +++++++++++++++++-
 .../creature/creatureList/ArchiveButton.vue   |  38 ++++
 .../CharacterListToolbarItems.vue             |  22 +-
 .../creatureList/CreatureFolderHeader.vue     | 102 +++++++++
 .../creatureList/CreatureFolderList.vue       |  64 ++++++
 .../ui/creature/creatureList/CreatureList.vue |  55 +++--
 .../creatureList/CreatureListTile.vue         |  46 +++--
 app/imports/ui/pages/CharacterList.vue        | 171 ++++++---------
 11 files changed, 547 insertions(+), 187 deletions(-)
 create mode 100644 app/imports/ui/creature/creatureList/ArchiveButton.vue
 create mode 100644 app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
 create mode 100644 app/imports/ui/creature/creatureList/CreatureFolderList.vue

diff --git a/app/imports/api/creature/archive/methods/archiveCreatures.js b/app/imports/api/creature/archive/methods/archiveCreatures.js
index bc401d61..304cce11 100644
--- a/app/imports/api/creature/archive/methods/archiveCreatures.js
+++ b/app/imports/api/creature/archive/methods/archiveCreatures.js
@@ -12,9 +12,9 @@ import ArchivedCreatures from '/imports/api/creature/archive/ArchivedCreatures.j
 function archiveCreature(creatureId){
   // Build the archive document
   const creature = Creatures.findOne(creatureId);
-  const properties = CreatureProperties.find({'ancestors.id': creatureId});
-  const experiences = Experiences.find({creatureId});
-  const logs = CreatureLogs.find({creatureId});
+  const properties = CreatureProperties.find({'ancestors.id': creatureId}).fetch();
+  const experiences = Experiences.find({creatureId}).fetch();
+  const logs = CreatureLogs.find({creatureId}).fetch();
   let archiveCreature = {
     owner: creature.owner,
     archiveDate: new Date(),
@@ -51,11 +51,11 @@ const archiveCreatures = new ValidatedMethod({
     timeInterval: 5000,
   },
   run({creatureIds}) {
-    for (let id in creatureIds){
+    for (let id of creatureIds){
       assertOwnership(id, this.userId)
     }
     let archivedIds = [];
-    for (let id in creatureIds){
+    for (let id of creatureIds){
       let archivedId = archiveCreature(id);
       archivedIds.push(archivedId);
     }
diff --git a/app/imports/api/creature/archive/methods/restoreCreatures.js b/app/imports/api/creature/archive/methods/restoreCreatures.js
index e27093d8..b4ec2c44 100644
--- a/app/imports/api/creature/archive/methods/restoreCreatures.js
+++ b/app/imports/api/creature/archive/methods/restoreCreatures.js
@@ -7,6 +7,7 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';
 import ArchivedCreatures from '/imports/api/creature/archive/ArchivedCreatures.js';
+import { removeCreatureWork } from '/imports/api/creature/creatures/methods/removeCreature.js';
 
 function restoreCreature(archiveId){
   // Get the archive
@@ -15,15 +16,28 @@ function restoreCreature(archiveId){
   // Insert the creature sub documents
   // They still have their original _id's
   Creatures.insert(archivedCreature.creature);
-  CreatureProperties.batchInsert(archivedCreature.properties);
-  Experiences.batchInsert(archivedCreature.experiences);
-  CreatureLogs.batchInsert(archivedCreature.logs);
+  try {
+    // Add all the properties
+    if (archivedCreature.properties && archivedCreature.properties.length){
+      CreatureProperties.batchInsert(archivedCreature.properties);
+    }
+    if (archivedCreature.experiences && archivedCreature.experiences.length){
+      Experiences.batchInsert(archivedCreature.experiences);
+    }
+    if (archivedCreature.logs && archivedCreature.logs.length){
+      CreatureLogs.batchInsert(archivedCreature.logs);
+    }
+    // Remove the archived creature
+    ArchivedCreatures.remove(archiveId);
+  } catch (e) {
+    // If the above fails, delete the inserted creature
+    removeCreatureWork(archivedCreature.creature._id);
+    throw e;
+  }
+
   // Do not recompute. The creature was in a computed and ordered state when
   // we archived it, just restore everything as-is
 
-  // Remove the archived creature
-  ArchivedCreatures.remove(archiveId);
-
   return archivedCreature.creature._id;
 }
 
@@ -45,14 +59,14 @@ const restoreCreatures = new ValidatedMethod({
     timeInterval: 5000,
   },
   run({archiveIds}) {
-    for (let id in archiveIds){
+    for (let id of archiveIds){
       let archivedCreature = ArchivedCreatures.findOne(id, {
         fields: {owner: 1}
       });
       assertOwnership(archivedCreature, this.userId)
     }
     let creatureIds = [];
-    for (let id in archiveIds){
+    for (let id of archiveIds){
       let creatureId = restoreCreature(id);
       creatureIds.push(creatureId);
     }
diff --git a/app/imports/server/publications/archivedCreatures.js b/app/imports/server/publications/archivedCreatures.js
index 155a887b..93043407 100644
--- a/app/imports/server/publications/archivedCreatures.js
+++ b/app/imports/server/publications/archivedCreatures.js
@@ -11,6 +11,7 @@ Meteor.publish('archivedCreatures', function(){
       }, {
         fields: {
           creature: 1,
+          owner: 1,
         }
       }
     );
diff --git a/app/imports/ui/creature/archive/ArchiveDialog.vue b/app/imports/ui/creature/archive/ArchiveDialog.vue
index a9c8e8c5..03b687f2 100644
--- a/app/imports/ui/creature/archive/ArchiveDialog.vue
+++ b/app/imports/ui/creature/archive/ArchiveDialog.vue
@@ -1,26 +1,213 @@
 <template lang="html">
   <dialog-base>
-    <div>
-      TODO
-    </div>
+    <template #toolbar>
+      <v-toolbar-title>
+        {{ mode === 'archive' ? 'Archive' : 'Restore' }}
+      </v-toolbar-title>
+      <v-spacer />
+      <v-btn-toggle
+        v-model="mode"
+        mandatory
+      >
+        <v-btn value="archive">
+          <span>Archive</span>
+          <v-icon right>
+            mdi-archive-arrow-down
+          </v-icon>
+        </v-btn>
+        <v-btn value="restore">
+          <span>Restore</span>
+          <v-icon right>
+            mdi-archive-arrow-up-outline
+          </v-icon>
+        </v-btn>
+      </v-btn-toggle>
+    </template>
+    <creature-folder-list
+      selection
+      :creatures="mode === 'archive' ? CreaturesWithNoParty : archiveCreaturesWithNoParty"
+      :folders="mode === 'archive' ? folders : archivefolders"
+      :selected-creature="selectedCreature"
+      @creature-selected="id => selectedCreature = id"
+    />
     <v-spacer slot="actions" />
+    <v-btn
+      slot="actions"
+      text
+      :loading="archiveActionLoading"
+      :disabled="!numSelected"
+      color="primary"
+      @click="archiveAction"
+    >
+      {{ mode === 'archive' ? 'Archive' : 'Restore' }}
+      <template v-if="numSelected > 1">
+        {{ numSelected }} characters
+      </template>
+      <template v-else-if="numSelected === 1">
+        character
+      </template>
+    </v-btn>
     <v-btn
       slot="actions"
       text
       @click="$store.dispatch('popDialogStack')"
     >
-      Done
+      Close
     </v-btn>
   </dialog-base>
 </template>
 
 <script lang="js">
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import ArchivedCreatures from '/imports/api/creature/archive/ArchivedCreatures.js';
+import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolderList.vue';
+import archiveCreatures from '/imports/api/creature/archive/methods/archiveCreatures.js';
+import restoreCreatures from '/imports/api/creature/archive/methods/restoreCreatures.js';
+import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+
+const characterTransform = function(char){
+  char.url = `/character/${char._id}/${char.urlName || '-'}`;
+  char.initial = char.name && char.name[0] || '?';
+  return char;
+};
+
+const creatureFields = {
+  'color': 1,
+  'avatarPicture': 1,
+  'name': 1,
+  'initial': 1,
+  'alignment': 1,
+  'gender': 1,
+  'race': 1,
+  'readers': 1,
+  'writers': 1,
+  'owner': 1,
+};
 
 export default {
   components: {
     DialogBase,
+    CreatureFolderList,
   },
+  data(){return {
+    selectedCreature: null,
+    mode: 'archive',
+    archiveActionLoading: false,
+  }},
+  computed: {
+    numSelected(){
+      return this.selectedCreature ? 1 : 0;
+    },
+  },
+  watch: {
+    mode(){
+      this.selectedCreature = null;
+    },
+  },
+  methods: {
+    archiveAction(){
+      if (!this.selectedCreature) return;
+      this.archiveActionLoading = true;
+      if (this.mode === 'archive'){
+        archiveCreatures.call({
+          creatureIds: [this.selectedCreature],
+        }, error => {
+          this.archiveActionLoading = false;
+          if (!error) return;
+          console.error(error);
+          snackbar({text: error.reason});
+        });
+      } else if (this.mode === 'restore'){
+        let archiveId = ArchivedCreatures.findOne({
+          'creature._id': this.selectedCreature
+        })._id;
+        restoreCreatures.call({
+          archiveIds: [archiveId],
+        }, error => {
+          this.archiveActionLoading = false;
+          if (!error) return;
+          console.error(error);
+          snackbar({text: error.reason});
+        });
+      }
+      this.selectedCreature = null;
+    }
+  },
+  meteor: {
+    $subscribe: {
+      'archivedCreatures': [],
+    },
+    folders(){
+      const userId = Meteor.userId();
+      let folders =  CreatureFolders.find(
+        {owner: userId, archived: {$ne: true}},
+        {sort: {order: 1}},
+      ).map(folder => {
+        folder.creatures = Creatures.find(
+          {
+            _id: {$in: folder.creatures || []},
+            owner: userId,
+          }, {
+            sort: {name: 1},
+            fields: creatureFields,
+          }
+        ).map(characterTransform);
+        return folder;
+      });
+      folders = folders.filter(folder => !!folder.creatures.length);
+      return folders;
+    },
+    CreaturesWithNoParty() {
+      var userId = Meteor.userId();
+      var charArrays = CreatureFolders.find({owner: userId}).map(p => p.creatures);
+      var folderChars = _.uniq(_.flatten(charArrays));
+      return Creatures.find(
+        {
+          _id: {$nin: folderChars},
+          owner: userId,
+        }, {
+          sort: {name: 1},
+          fields: creatureFields,
+        }
+      ).map(characterTransform);
+    },
+    archivefolders(){
+      const userId = Meteor.userId();
+      let folders =  CreatureFolders.find(
+        {owner: userId},
+        {sort: {order: 1}},
+      ).map(folder => {
+        folder.creatures = ArchivedCreatures.find(
+          {
+            'creature._id': {$in: folder.creatures || []},
+            owner: userId,
+          }, {
+            sort: {'creature.name': 1},
+            fields: {creature: 1},
+          }
+        ).map(arc => characterTransform(arc.creature));
+        return folder;
+      });
+      folders = folders.filter(folder => !!folder.creatures.length);
+      return folders;
+    },
+    archiveCreaturesWithNoParty() {
+      var userId = Meteor.userId();
+      var charArrays = CreatureFolders.find({owner: userId}).map(p => p.creatures);
+      var folderChars = _.uniq(_.flatten(charArrays));
+      return ArchivedCreatures.find(
+        {
+          'creature._id': {$nin: folderChars},
+          owner: userId,
+        }, {
+          sort: {'creature.name': 1},
+          fields: {creature: 1},
+        }
+      ).map(arc => characterTransform(arc.creature));
+    },
+  }
 }
 </script>
 
diff --git a/app/imports/ui/creature/creatureList/ArchiveButton.vue b/app/imports/ui/creature/creatureList/ArchiveButton.vue
new file mode 100644
index 00000000..4aa46887
--- /dev/null
+++ b/app/imports/ui/creature/creatureList/ArchiveButton.vue
@@ -0,0 +1,38 @@
+<template lang="html">
+  <v-btn
+    :icon="!text"
+    :text="text"
+    :data-id="randomId"
+    v-bind="$attrs"
+    @click="openArchive"
+  >
+    <template v-if="text">
+      Archive Characters
+    </template>
+    <v-icon :right="text">
+      mdi-archive
+    </v-icon>
+  </v-btn>
+</template>
+
+<script lang="js">
+export default {
+  props: {
+    text: Boolean,
+  },
+  data(){return {
+    randomId: Random.id(),
+  }},
+  methods: {
+    openArchive(){
+      this.$store.commit('pushDialogStack', {
+        component: 'archive-dialog',
+        elementId: this.randomId,
+      });
+    }
+  }
+}
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue b/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
index c7669f15..5c678946 100644
--- a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
+++ b/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
@@ -7,23 +7,19 @@
     <template v-else>
       {{ characterSlots }}
     </template>
-    <v-btn
-      icon
-      data-id="open-archive-btn"
-      @click="openArchive"
-    >
-      <v-icon>
-        mdi-archive
-      </v-icon>
-    </v-btn>
+    <archive-button />
   </div>
 </template>
 
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+import ArchiveButton from '/imports/ui/creature/creatureList/ArchiveButton.vue';
 
 export default {
+  components: {
+    ArchiveButton,
+  },
   meteor: {
     creatureCount(){
       return Creatures.find({owner: Meteor.userId()}).count();
@@ -32,14 +28,6 @@ export default {
       return getUserTier(Meteor.userId()).characterSlots;
     }
   },
-  methods: {
-    openArchive(){
-      this.$store.commit('pushDialogStack', {
-        component: 'archive-dialog',
-        elementId: 'open-archive-btn',
-      });
-    }
-  }
 }
 </script>
 
diff --git a/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue b/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
new file mode 100644
index 00000000..e146ec2f
--- /dev/null
+++ b/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
@@ -0,0 +1,102 @@
+<template lang="html">
+  <v-list-item style="min-height: 60px;">
+    <v-list-item-content>
+      <v-list-item-title>
+        <template v-if="!renaming">
+          {{ model.name }}
+        </template>
+        <text-field
+          v-if="renaming"
+          ref="name-input"
+          regular
+          hide-details
+          dense
+          :value="model.name"
+          @change="renameFolder"
+          @click.native.stop="()=>{}"
+        />
+      </v-list-item-title>
+    </v-list-item-content>
+    <v-list-item-action v-if="!selection && (renaming || open)">
+      <v-btn
+        icon
+        style="flex-grow: 0"
+        @click.stop="renaming = !renaming"
+      >
+        <v-icon v-if="renaming">
+          mdi-check
+        </v-icon>
+        <v-icon v-else>
+          mdi-pencil
+        </v-icon>
+      </v-btn>
+    </v-list-item-action>
+    <v-list-item-action v-if="!selection && open">
+      <v-btn
+        icon
+        style="flex-grow: 0"
+        @click.stop="removeFolder"
+      >
+        <v-icon>mdi-delete</v-icon>
+      </v-btn>
+    </v-list-item-action>
+  </v-list-item>
+</template>
+
+<script lang="js">
+  import Vue from 'vue';
+  import updateCreatureFolderName from '/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js';
+  import removeCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js';
+  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+
+  export default {
+    props: {
+      model: {
+        type: Object,
+        required: true,
+      },
+      open: Boolean,
+      selection: Boolean,
+    },
+    data(){return {
+      renaming: false,
+    }},
+    watch: {
+      renaming(value){
+        if (!value) return;
+        Vue.nextTick(() => {
+          this.$refs['name-input'].focus();
+        });
+      },
+    },
+    methods:{
+      renameFolder(name, ack){
+        updateCreatureFolderName.call({
+          _id: this.model._id,
+          name
+        }, error => {
+          ack(error);
+          if (!error) return;
+          console.error(error);
+          snackbar({
+            text: error.reason,
+          });
+        });
+      },
+      removeFolder(){
+        removeCreatureFolder.call({
+          _id: this.model._id
+        }, error => {
+          if (!error) return;
+          console.error(error);
+          snackbar({
+            text: error.reason,
+          });
+        });
+      },
+    }
+  }
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/creature/creatureList/CreatureFolderList.vue b/app/imports/ui/creature/creatureList/CreatureFolderList.vue
new file mode 100644
index 00000000..1735458d
--- /dev/null
+++ b/app/imports/ui/creature/creatureList/CreatureFolderList.vue
@@ -0,0 +1,64 @@
+<template lang="html">
+  <v-list expand>
+    <creature-list
+      :creatures="creatures"
+      :selection="selection"
+      :selected-creature="selectedCreature"
+      @creature-selected="id => $emit('creature-selected', id)"
+    />
+    <v-list-group
+      v-for="folder in folders"
+      :key="folder._id"
+      v-model="openFolders[folder._id]"
+      group="folder"
+    >
+      <template #activator>
+        <creature-folder-header
+          :open="openFolders[folder._id]"
+          :model="folder"
+          :selection="selection"
+        />
+      </template>
+      <creature-list
+        :creatures="folder.creatures"
+        :folder-id="folder._id"
+        :selection="selection"
+        :selected-creature="selectedCreature"
+        @creature-selected="id => $emit('creature-selected', id)"
+      />
+    </v-list-group>
+  </v-list>
+</template>
+
+<script lang="js">
+import CreatureFolderHeader from '/imports/ui/creature/creatureList/CreatureFolderHeader.vue';
+import CreatureList from '/imports/ui/creature/creatureList/CreatureList.vue';
+
+export default {
+  components: {
+    CreatureFolderHeader,
+    CreatureList,
+  },
+  props:{
+    creatures: {
+      type: Array,
+      default: () => [],
+    },
+    folders: {
+      type: Array,
+      default: () => [],
+    },
+    selection: Boolean,
+    selectedCreature: {
+      type: String,
+      default: undefined,
+    },
+  },
+  data(){return{
+    openFolders: {},
+  }},
+}
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/creature/creatureList/CreatureList.vue b/app/imports/ui/creature/creatureList/CreatureList.vue
index 8b98d8d0..a2f30a33 100644
--- a/app/imports/ui/creature/creatureList/CreatureList.vue
+++ b/app/imports/ui/creature/creatureList/CreatureList.vue
@@ -1,25 +1,26 @@
 <template lang="html">
-  <v-list>
-    <draggable
-      v-model="dataCreatures"
-      style="min-height: 24px;"
-      :sort="false"
-      :group="`creature-list`"
-      ghost-class="ghost"
-      draggable=".creature"
-      handle=".handle"
-      :animation="200"
-      @change="change"
-    >
-      <creature-list-tile
-        v-for="creature in dataCreatures"
-        :key="creature._id"
-        class="creature"
-        :to="creature.url"
-        :model="creature"
-      />
-    </draggable>
-  </v-list>
+  <draggable
+    v-model="dataCreatures"
+    style="min-height: 24px;"
+    :sort="false"
+    :group="`creature-list`"
+    ghost-class="ghost"
+    draggable=".creature"
+    handle=".handle"
+    :animation="200"
+    @change="draggableChange"
+  >
+    <creature-list-tile
+      v-for="creature in dataCreatures"
+      :key="creature._id"
+      class="creature"
+      :model="creature"
+      :selection="selection"
+      :is-selected="selectedCreature === creature._id"
+      v-bind="selection ? {} : {to: creature.url}"
+      @click="$emit('creature-selected', creature._id)"
+    />
+  </draggable>
 </template>
 
 <script lang="js">
@@ -42,6 +43,11 @@
         type: String,
         default: null,
       },
+      selection: Boolean,
+      selectedCreature: {
+        type: String,
+        default: undefined,
+      },
     },
     data(){return {
       dataCreatures: [],
@@ -55,9 +61,10 @@
       this.dataCreatures = this.creatures;
     },
     methods: {
-      change({added, moved}){
+      draggableChange({added, moved}){
         let event = added || moved;
         if (event){
+          /*
           // If this item is now adjacent to another, set the order accordingly
           let order;
           let before = this.dataCreatures[event.newIndex - 1];
@@ -69,6 +76,7 @@
           } else {
             order = -0.5;
           }
+          */
           let doc = event.element;
           moveCreatureToFolder.call({
             creatureId: doc._id,
@@ -82,6 +90,9 @@
           });
         }
       },
+      selectionChange(index){
+        this.$emit('creatureSelected', this.dataCreatures[index]._id)
+      },
     }
   }
 </script>
diff --git a/app/imports/ui/creature/creatureList/CreatureListTile.vue b/app/imports/ui/creature/creatureList/CreatureListTile.vue
index d98825d3..e858a2a8 100644
--- a/app/imports/ui/creature/creatureList/CreatureListTile.vue
+++ b/app/imports/ui/creature/creatureList/CreatureListTile.vue
@@ -2,16 +2,31 @@
   lang="html"
   functional
 >
-  <v-list-item v-bind="$attrs">
-    <v-list-item-avatar :color="model.color || 'grey'">
-      <img
-        v-if="model.avatarPicture"
-        :src="model.avatarPicture"
-        :alt="model.name"
-      >
-      <template v-else>
-        {{ model.initial }}
-      </template>
+  <v-list-item
+    v-bind="$attrs"
+    :class="isSelected && 'primary--text v-list-item--active'"
+    v-on="selection ? { click() {$emit('click')} } : {}"
+  >
+    <v-list-item-avatar
+      :color="isSelected ? 'red darken-1' : model.color || 'grey'"
+      class="white--text"
+      style="transition: background 0.3s;"
+    >
+      <v-fade-transition leave-absolute>
+        <v-icon v-if="isSelected">
+          mdi-check
+        </v-icon>
+        <img
+          v-else-if="model.avatarPicture"
+          :src="model.avatarPicture"
+          :alt="model.name"
+        >
+        <template v-else>
+          <span>
+            {{ model.initial }}
+          </span>
+        </template>
+      </v-fade-transition>
     </v-list-item-avatar>
     <v-list-item-content>
       <v-list-item-title>
@@ -25,12 +40,8 @@
       <shared-icon :model="model" />
     </v-list-item-action>
     <v-list-item-action>
-      <v-checkbox
-        v-if="selection"
-        :input-value="selected && selected.has(model._id)"
-        @change="$emit('select')"
-      />
       <v-icon
+        v-if="!selection"
         style="height: 100%; width: 40px; cursor: move;"
         class="handle"
       >
@@ -53,10 +64,7 @@ export default {
       required: true,
     },
     selection: Boolean,
-    selected: {
-      type: Set,
-      default: () => new Set(),
-    },
+    isSelected: Boolean,
   }
 }
 </script>
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index 04bd7720..69d2484d 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -1,107 +1,74 @@
 <template>
   <div
-    class="card-background pa-4"
+    class="card-background"
     style="height: 100%"
   >
-    <v-alert
-      v-if="exceededCharacterSpace"
-      type="error"
-    >
-      You have exceeded your maximum number of character slots, archive or delete
-      some characters.
-    </v-alert>
-    <v-card :class="{'mb-4': folders && folders.length}">
-      <creature-list :creatures="CreaturesWithNoParty" />
-    </v-card>
-    <v-expansion-panels
-      v-if="folders && folders.length"
-      multiple
-    >
-      <v-expansion-panel
-        v-for="folder in folders"
-        :key="folder._id"
-      >
-        <v-expansion-panel-header>
-          <template #default="{ open }">
-            <div v-if="renamingFolder !== folder._id">
-              {{ folder.name }}
-            </div>
-            <text-field
-              v-else
-              :ref="`name-input-${folder._id}`"
-              regular
-              hide-details
-              dense
-              :value="folder.name"
-              @change="(value, ack) => renameFolder(folder._id, value, ack)"
-              @click.native.stop="()=>{}"
+    <v-container>
+      <v-row justify="center">
+        <v-col
+          cols="12"
+          xl="8"
+        >
+          <v-alert
+            v-if="characterSpaceLeft < 0"
+            type="error"
+          >
+            You have exceeded your maximum number of character slots, archive or delete
+            some characters.
+          </v-alert>
+          <v-alert
+            v-else-if="characterSpaceLeft === 0"
+            type="info"
+          >
+            You have hit your maximum number of characters.
+            <archive-button
+              small
+              text
+              class="mx-2"
             />
+          </v-alert>
+          <v-card :class="{'mb-4': folders && folders.length}">
+            <creature-folder-list
+              :creatures="CreaturesWithNoParty"
+              :folders="folders"
+            />
+          </v-card>
+          <div class="layout justify-end mt-2">
             <v-btn
-              v-if="renamingFolder === folder._id || open"
-              icon
-              style="flex-grow: 0"
-              @click.stop="renamingFolder !== folder._id ? renamingFolder = folder._id : renamingFolder = undefined"
+              text
+              :loading="loadingInsertFolder"
+              @click="insertFolder"
             >
-              <v-icon v-if="renamingFolder !== folder._id">
-                mdi-pencil
-              </v-icon>
-              <v-icon v-else>
-                mdi-check
-              </v-icon>
+              add folder
             </v-btn>
-            <v-btn
-              v-if="open"
-              icon
-              style="flex-grow: 0"
-              @click.stop="removeFolder(folder._id)"
-            >
-              <v-icon>mdi-delete</v-icon>
-            </v-btn>
-          </template>
-        </v-expansion-panel-header>
-        <v-expansion-panel-content>
-          <creature-list
-            :creatures="folder.creatures"
-            :folder-id="folder._id"
-          />
-        </v-expansion-panel-content>
-      </v-expansion-panel>
-    </v-expansion-panels>
-    <div class="layout justify-end mt-2">
-      <v-btn
-        text
-        :loading="loadingInsertFolder"
-        @click="insertFolder"
-      >
-        add folder
-      </v-btn>
-    </div>
-    <v-btn
-      color="accent"
-      fab
-      fixed
-      bottom
-      right
-      data-id="new-character-button"
-      :disabled="!hasCharacterSpace"
-      @click="insertCharacter"
-    >
-      <v-icon>mdi-plus</v-icon>
-    </v-btn>
+          </div>
+          <v-btn
+            color="accent"
+            fab
+            fixed
+            bottom
+            right
+            data-id="new-character-button"
+            :disabled="characterSpaceLeft <= 0"
+            @click="insertCharacter"
+          >
+            <v-icon>mdi-plus</v-icon>
+          </v-btn>
+        </v-col>
+      </v-row>
+    </v-container>
   </div>
 </template>
 
 <script lang="js">
-  import Vue from 'vue';
   import Creatures from '/imports/api/creature/creatures/Creatures.js';
   import insertCreature from '/imports/api/creature/creatures/methods/insertCreature.js';
   import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
-  import CreatureList from '/imports/ui/creature/creatureList/CreatureList.vue';
   import { getUserTier } from '/imports/api/users/patreon/tiers.js';
   import insertCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js';
-  import updateCreatureFolderName from '/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js';
-  import removeCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js';
   import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+  import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolderList.vue';
+  import ArchiveButton from '/imports/ui/creature/creatureList/ArchiveButton.vue';
 
   const characterTransform = function(char){
     char.url = `/character/${char._id}/${char.urlName || '-'}`;
@@ -110,7 +77,8 @@
   };
   export default {
     components: {
-      CreatureList,
+      CreatureFolderList,
+      ArchiveButton,
     },
     data(){ return{
       fab: false,
@@ -163,26 +131,17 @@
         let userId = Meteor.userId();
         return getUserTier(userId);
       },
-      hasCharacterSpace(){
+      characterSpaceLeft(){
         let tier = this.tier;
         let currentCharacterCount = this.creatureCount;
-        return tier.characterSlots === -1 || currentCharacterCount < tier.characterSlots
+        if (tier.characterSlots === -1) return Number.POSITIVE_INFINITY;
+        return tier.characterSlots - currentCharacterCount
       },
       exceededCharacterSpace(){
         let tier = this.tier;
         let currentCharacterCount = this.creatureCount;
         return tier.characterSlots !== -1 && currentCharacterCount > tier.characterSlots
-      }
-    },
-    watch:{
-      renamingFolder(newId){
-        if(newId){
-          Vue.nextTick(() => {
-            let input = this.$refs[`name-input-${newId}`];
-            input[0].focus();
-          });
-        }
-      }
+      },
     },
     methods: {
       insertCharacter(){
@@ -213,18 +172,6 @@
           });
         });
       },
-      renameFolder(_id, name, ack){
-        updateCreatureFolderName.call({_id, name}, ack);
-      },
-      removeFolder(_id){
-        removeCreatureFolder.call({_id}, error => {
-          if (!error) return;
-          console.error(error);
-          snackbar({
-            text: error.reason,
-          });
-        });
-      },
     },
   };
 </script>

From a6fbf71b36a8c3907c98b03c2ed580027cae9616 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Jun 2021 15:13:59 +0200
Subject: [PATCH 22/42] Added folders to the sidebar character list

---
 .../creatureList/CreatureFolderHeader.vue     |  54 +++++-----
 .../creatureList/CreatureFolderList.vue       |   8 +-
 .../ui/creature/creatureList/CreatureList.vue |   2 +
 .../creatureList/CreatureListTile.vue         |   7 +-
 app/imports/ui/layouts/Sidebar.vue            | 101 +++++++-----------
 5 files changed, 81 insertions(+), 91 deletions(-)

diff --git a/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue b/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
index e146ec2f..1b2d6bd3 100644
--- a/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
+++ b/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
@@ -13,33 +13,38 @@
           dense
           :value="model.name"
           @change="renameFolder"
-          @click.native.stop="()=>{}"
+          @click.native.stop=""
+          @input.native.stop=""
+          @keydown.native.stop=""
+          @keyup.native.stop=""
         />
       </v-list-item-title>
     </v-list-item-content>
-    <v-list-item-action v-if="!selection && (renaming || open)">
-      <v-btn
-        icon
-        style="flex-grow: 0"
-        @click.stop="renaming = !renaming"
-      >
-        <v-icon v-if="renaming">
-          mdi-check
-        </v-icon>
-        <v-icon v-else>
-          mdi-pencil
-        </v-icon>
-      </v-btn>
-    </v-list-item-action>
-    <v-list-item-action v-if="!selection && open">
-      <v-btn
-        icon
-        style="flex-grow: 0"
-        @click.stop="removeFolder"
-      >
-        <v-icon>mdi-delete</v-icon>
-      </v-btn>
-    </v-list-item-action>
+    <template v-if="!selection && !dense">
+      <v-list-item-action v-if="renaming || open">
+        <v-btn
+          icon
+          style="flex-grow: 0"
+          @click.stop="renaming = !renaming"
+        >
+          <v-icon v-if="renaming">
+            mdi-check
+          </v-icon>
+          <v-icon v-else>
+            mdi-pencil
+          </v-icon>
+        </v-btn>
+      </v-list-item-action>
+      <v-list-item-action v-if="open">
+        <v-btn
+          icon
+          style="flex-grow: 0"
+          @click.stop="removeFolder"
+        >
+          <v-icon>mdi-delete</v-icon>
+        </v-btn>
+      </v-list-item-action>
+    </template>
   </v-list-item>
 </template>
 
@@ -57,6 +62,7 @@
       },
       open: Boolean,
       selection: Boolean,
+      dense: Boolean,
     },
     data(){return {
       renaming: false,
diff --git a/app/imports/ui/creature/creatureList/CreatureFolderList.vue b/app/imports/ui/creature/creatureList/CreatureFolderList.vue
index 1735458d..d98e2103 100644
--- a/app/imports/ui/creature/creatureList/CreatureFolderList.vue
+++ b/app/imports/ui/creature/creatureList/CreatureFolderList.vue
@@ -1,9 +1,12 @@
 <template lang="html">
-  <v-list expand>
+  <v-list
+    expand
+  >
     <creature-list
       :creatures="creatures"
       :selection="selection"
       :selected-creature="selectedCreature"
+      :dense="dense"
       @creature-selected="id => $emit('creature-selected', id)"
     />
     <v-list-group
@@ -17,6 +20,7 @@
           :open="openFolders[folder._id]"
           :model="folder"
           :selection="selection"
+          :dense="dense"
         />
       </template>
       <creature-list
@@ -24,6 +28,7 @@
         :folder-id="folder._id"
         :selection="selection"
         :selected-creature="selectedCreature"
+        :dense="dense"
         @creature-selected="id => $emit('creature-selected', id)"
       />
     </v-list-group>
@@ -53,6 +58,7 @@ export default {
       type: String,
       default: undefined,
     },
+    dense: Boolean,
   },
   data(){return{
     openFolders: {},
diff --git a/app/imports/ui/creature/creatureList/CreatureList.vue b/app/imports/ui/creature/creatureList/CreatureList.vue
index a2f30a33..1cdcdf96 100644
--- a/app/imports/ui/creature/creatureList/CreatureList.vue
+++ b/app/imports/ui/creature/creatureList/CreatureList.vue
@@ -18,6 +18,7 @@
       :selection="selection"
       :is-selected="selectedCreature === creature._id"
       v-bind="selection ? {} : {to: creature.url}"
+      :dense="dense"
       @click="$emit('creature-selected', creature._id)"
     />
   </draggable>
@@ -48,6 +49,7 @@
         type: String,
         default: undefined,
       },
+      dense: Boolean,
     },
     data(){return {
       dataCreatures: [],
diff --git a/app/imports/ui/creature/creatureList/CreatureListTile.vue b/app/imports/ui/creature/creatureList/CreatureListTile.vue
index e858a2a8..187f3115 100644
--- a/app/imports/ui/creature/creatureList/CreatureListTile.vue
+++ b/app/imports/ui/creature/creatureList/CreatureListTile.vue
@@ -32,16 +32,16 @@
       <v-list-item-title>
         {{ model.name }}
       </v-list-item-title>
-      <v-list-item-subtitle>
+      <v-list-item-subtitle v-if="!dense">
         {{ model.alignment }} {{ model.gender }} {{ model.race }}
       </v-list-item-subtitle>
     </v-list-item-content>
-    <v-list-item-action>
+    <v-list-item-action v-if="!dense">
       <shared-icon :model="model" />
     </v-list-item-action>
     <v-list-item-action>
       <v-icon
-        v-if="!selection"
+        v-if="!selection && !dense"
         style="height: 100%; width: 40px; cursor: move;"
         class="handle"
       >
@@ -65,6 +65,7 @@ export default {
     },
     selection: Boolean,
     isSelected: Boolean,
+    dense: Boolean,
   }
 }
 </script>
diff --git a/app/imports/ui/layouts/Sidebar.vue b/app/imports/ui/layouts/Sidebar.vue
index 6fd514f7..66777361 100644
--- a/app/imports/ui/layouts/Sidebar.vue
+++ b/app/imports/ui/layouts/Sidebar.vue
@@ -54,68 +54,28 @@
       </v-list-item>
       <v-divider />
     </v-list>
-    <v-list
-      avatar
-    >
-      <v-list-item
-        v-for="character in CreaturesWithNoParty"
-        :key="character._id"
-        :to="character.url"
-      >
-        <v-list-item-avatar :color="character.color || 'grey'">
-          <img
-            v-if="character.avatarPicture"
-            :src="character.avatarPicture"
-            :alt="character.name"
-          >
-          <template v-else>
-            {{ character.initial }}
-          </template>
-        </v-list-item-avatar>
-        <v-list-item-title>
-          {{ character.name }}
-        </v-list-item-title>
-      </v-list-item>
-      <!--
-      <v-list-group
-        v-for="party in parties"
-        :key="party._id"
-      >
-        <v-list-item slot="activator">
-          <v-list-item-title>
-            {{ party.name }}
-          </v-list-item-title>
-        </v-list-item>
-        <v-list-item
-          v-for="character in characterDocs"
-          :key="character._id"
-          :to="character.url"
-        >
-          <v-list-item-avatar :color="character.color || 'grey'">
-            <img
-              v-if="character.avatarPicture"
-              :src="character.avatarPicture"
-              :alt="character.name"
-            >
-            <template v-else>
-              {{ character.initial }}
-            </template>
-          </v-list-item-avatar>
-          <v-list-item-title>
-            {{ character.name }}
-          </v-list-item-title>
-        </v-list-item>
-      </v-list-group>
-    -->
-    </v-list>
+    <creature-folder-list
+      dense
+      :creatures="CreaturesWithNoParty"
+      :folders="folders"
+    />
   </div>
 </template>
 
 <script lang="js">
   import Creatures from '/imports/api/creature/creatures/Creatures.js';
-  import Parties from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+  import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+  import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolderList.vue';
 
+  const characterTransform = function(char){
+    char.url = `/character/${char._id}/${char.urlName || '-'}`;
+    char.initial = char.name && char.name[0] || '?';
+    return char;
+  };
   export default {
+    components: {
+      CreatureFolderList
+    },
     meteor: {
       $subscribe: {
         'characterList': [],
@@ -142,21 +102,36 @@
         ];
         return links.filter(link => !link.requireLogin || isLoggedIn);
       },
+      folders(){
+        const userId = Meteor.userId();
+        let folders =  CreatureFolders.find(
+          {owner: userId, archived: {$ne: true}},
+          {sort: {order: 1}},
+        ).map(folder => {
+          folder.creatures = Creatures.find(
+            {
+              _id: {$in: folder.creatures || []},
+              $or: [{readers: userId}, {writers: userId}, {owner: userId}],
+            }, {
+              sort: {name: 1},
+            }
+          ).map(characterTransform);
+          return folder;
+        });
+        folders = folders.filter(folder => !!folder.creatures.length);
+        return folders;
+      },
       CreaturesWithNoParty() {
         var userId = Meteor.userId();
-        var charArrays = Parties.find({owner: userId}).map(p => p.creatures);
-        var partyChars = _.uniq(_.flatten(charArrays));
+        var charArrays = CreatureFolders.find({owner: userId}).map(p => p.creatures);
+        var folderChars = _.uniq(_.flatten(charArrays));
         return Creatures.find(
           {
-            _id: {$nin: partyChars},
+            _id: {$nin: folderChars},
             $or: [{readers: userId}, {writers: userId}, {owner: userId}],
           },
           {sort: {name: 1}}
-        ).map(char => {
-          char.url = `/character/${char._id}/${char.urlName || '-'}`;
-          char.initial = char.name && char.name[0] || '?';
-          return char;
-        });
+        ).map(characterTransform);
       },
     },
   };

From 29a4575760c5c24d9cd9751c9c27694058e3172d Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Jun 2021 15:19:46 +0200
Subject: [PATCH 23/42] Fixed a stray empty list item action taking space on
 creatures in lists

---
 app/imports/ui/creature/creatureList/CreatureListTile.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/imports/ui/creature/creatureList/CreatureListTile.vue b/app/imports/ui/creature/creatureList/CreatureListTile.vue
index 187f3115..2bb28101 100644
--- a/app/imports/ui/creature/creatureList/CreatureListTile.vue
+++ b/app/imports/ui/creature/creatureList/CreatureListTile.vue
@@ -39,9 +39,8 @@
     <v-list-item-action v-if="!dense">
       <shared-icon :model="model" />
     </v-list-item-action>
-    <v-list-item-action>
+    <v-list-item-action v-if="!selection && !dense">
       <v-icon
-        v-if="!selection && !dense"
         style="height: 100%; width: 40px; cursor: move;"
         class="handle"
       >

From f3b9b624866cc1a285685555227a166fe6b99b57 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 12:50:56 +0200
Subject: [PATCH 24/42] Fixed styling of inventory for denser item list tiles

---
 app/imports/ui/styles/denseLists.css |  4 ++++
 app/imports/ui/styles/stylesIndex.js | 15 ++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 app/imports/ui/styles/denseLists.css

diff --git a/app/imports/ui/styles/denseLists.css b/app/imports/ui/styles/denseLists.css
new file mode 100644
index 00000000..fce3f341
--- /dev/null
+++ b/app/imports/ui/styles/denseLists.css
@@ -0,0 +1,4 @@
+.v-list--dense .v-list-item__avatar, .v-list--dense .v-list-item__action {
+  margin-top: 0;
+  margin-bottom: 0;
+}
diff --git a/app/imports/ui/styles/stylesIndex.js b/app/imports/ui/styles/stylesIndex.js
index 7c571afe..a49f5cd0 100644
--- a/app/imports/ui/styles/stylesIndex.js
+++ b/app/imports/ui/styles/stylesIndex.js
@@ -1,8 +1,9 @@
-import './speedDial.css';
-import './inheritBackgrounds.css';
-import './centeredInputs.css';
-import './largeFormatInputs.css';
-import './fitAvatars.css';
-import './lineClamp.css';
-import './toolbarFlex.css';
 import './cardColors.css';
+import './centeredInputs.css';
+import './denseLists.css';
+import './fitAvatars.css';
+import './inheritBackgrounds.css';
+import './largeFormatInputs.css';
+import './lineClamp.css';
+import './speedDial.css';
+import './toolbarFlex.css';

From 2ecb0e26714d4bbb3fc2ec44192e015b2500b0f0 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 13:39:08 +0200
Subject: [PATCH 25/42] Fix: DC missing from spell list viewer in library

---
 app/imports/ui/properties/viewers/SpellListViewer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/ui/properties/viewers/SpellListViewer.vue b/app/imports/ui/properties/viewers/SpellListViewer.vue
index fb79795e..e690248a 100644
--- a/app/imports/ui/properties/viewers/SpellListViewer.vue
+++ b/app/imports/ui/properties/viewers/SpellListViewer.vue
@@ -8,7 +8,7 @@
     />
     <property-field
       name="Spell Save DC"
-      :value="'dcResult' in model ? model.dcResult : model.dcResult"
+      :value="'dcResult' in model ? model.dcResult : model.dc"
     />
     <property-field
       name="Attack roll bonus"

From 0d21ab758e84b922bd6496cf115f175985ce823e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 14:12:20 +0200
Subject: [PATCH 26/42] Fixed negative base values being ignored

---
 .../creature/computation/engine/EffectAggregator.js |  8 ++++++--
 .../api/creature/computation/engine/combineStat.js  | 13 +++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/imports/api/creature/computation/engine/EffectAggregator.js b/app/imports/api/creature/computation/engine/EffectAggregator.js
index 649d6e31..d27ea651 100644
--- a/app/imports/api/creature/computation/engine/EffectAggregator.js
+++ b/app/imports/api/creature/computation/engine/EffectAggregator.js
@@ -1,6 +1,6 @@
 export default class EffectAggregator{
   constructor(){
-    this.base = 0;
+    this.base = undefined;
     this.add = 0;
     this.mul = 1;
     this.min = Number.NEGATIVE_INFINITY;
@@ -20,7 +20,11 @@ export default class EffectAggregator{
     switch(effect.operation){
       case 'base':
         // Take the largest base value
-        this.base = result > this.base ? result : this.base;
+        if(Number.isFinite(this.base)){
+          this.base = Math.max(this.base, result);
+        } else {
+          this.base = result;
+        }
         break;
       case 'add':
         // Add all adds together
diff --git a/app/imports/api/creature/computation/engine/combineStat.js b/app/imports/api/creature/computation/engine/combineStat.js
index 23225a42..69dc752a 100644
--- a/app/imports/api/creature/computation/engine/combineStat.js
+++ b/app/imports/api/creature/computation/engine/combineStat.js
@@ -14,7 +14,14 @@ export default function combineStat(stat, aggregator, memo){
 }
 
 function getAggregatorResult(stat, aggregator){
-  let base = Math.max(aggregator.base, stat.baseValue || 0);
+  let base;
+  if (!Number.isFinite(aggregator.base)){
+    base = stat.baseValue || 0;
+  } else if (!Number.isFinite(stat.baseValue)){
+    base = aggregator.base || 0;
+  } else {
+    base = Math.max(aggregator.base, stat.baseValue);
+  }
   let result = (base + aggregator.add) * aggregator.mul;
   if (result < aggregator.min) {
     result = aggregator.min;
@@ -28,6 +35,7 @@ function getAggregatorResult(stat, aggregator){
   if (!stat.decimal && Number.isFinite(result)){
     result = Math.floor(result);
   }
+  console.log({result, agg: aggregator.base, statBase: stat.baseValue, base, name: stat.name, stat});
   return result;
 }
 
@@ -137,7 +145,8 @@ function combineSkill(stat, aggregator, memo){
   }
 
   // Combine everything to get the final result
-  let result = (aggregator.base + stat.abilityMod + profBonus + aggregator.add) * aggregator.mul;
+  let base = aggregator.base || 0;
+  let result = (base + stat.abilityMod + profBonus + aggregator.add) * aggregator.mul;
   if (result < aggregator.min) result = aggregator.min;
   if (result > aggregator.max) result = aggregator.max;
   if (aggregator.set !== undefined) {

From 8804c80a56be504a67e28e98a2164bd5a8e8b7a5 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 14:15:17 +0200
Subject: [PATCH 27/42] Fixed skills not showing their base value in the
 effects list

---
 app/imports/ui/properties/viewers/SkillViewer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/ui/properties/viewers/SkillViewer.vue
index 42c6d794..5b03002f 100644
--- a/app/imports/ui/properties/viewers/SkillViewer.vue
+++ b/app/imports/ui/properties/viewers/SkillViewer.vue
@@ -139,7 +139,7 @@ export default {
         let creatureId = this.context.creatureId;
         return CreatureProperties.find({
           'ancestors.id': creatureId,
-          type: 'attribute',
+          type: 'skill',
           variableName: this.model.variableName,
           removed: {$ne: true},
           inactive: {$ne: true},

From e8c6f26a0ba3593ffe5d33e421feb65cc4dc955a Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 14:39:05 +0200
Subject: [PATCH 28/42] fix skills UI bugs and icon consistency for skills

---
 .../components/skills/SkillListTile.vue       | 24 +++++---------
 .../components/skills/SkillProficiency.vue    | 13 ++------
 .../forms/shared/ProficiencySelect.vue        | 17 ++--------
 .../ui/properties/shared/ProficiencyIcon.vue  | 18 ++++-------
 .../treeNodeViews/ProficiencyTreeNode.vue     | 32 +++++++++++++++++++
 .../treeNodeViews/treeNodeViewIndex.js        |  2 ++
 .../properties/viewers/ProficiencyViewer.vue  |  7 ++--
 .../ui/properties/viewers/SkillViewer.vue     | 13 ++------
 app/imports/ui/utility/getProficiencyIcon.js  | 13 ++++++++
 9 files changed, 74 insertions(+), 65 deletions(-)
 create mode 100644 app/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
 create mode 100644 app/imports/ui/utility/getProficiencyIcon.js

diff --git a/app/imports/ui/properties/components/skills/SkillListTile.vue b/app/imports/ui/properties/components/skills/SkillListTile.vue
index 0ab9be72..1ca8f98a 100644
--- a/app/imports/ui/properties/components/skills/SkillListTile.vue
+++ b/app/imports/ui/properties/components/skills/SkillListTile.vue
@@ -4,9 +4,10 @@
     style="min-height: 36px;"
     v-on="hasClickListener ? {click} : {}"
   >
-    <v-icon class="prof-icon">
-      {{ icon }}
-    </v-icon>
+    <proficiency-icon
+      :value="model.proficiency"
+      class="prof-icon"
+    />
     <v-list-item-content class="py-1">
       <v-list-item-title>
         <span
@@ -41,8 +42,12 @@
 
 <script lang="js">
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
 
 export default {
+  components: {
+    ProficiencyIcon,
+  },
 	props: {
     model: {
       type: Object,
@@ -51,19 +56,6 @@ export default {
     hideModifier: Boolean,
 	},
 	computed: {
-		icon(){
-      if (this.model.proficiency == 0.49){
-				return 'mdi-brightness-3';
-			} else if (this.model.proficiency == 0.5){
-				return 'mdi-brightness-2';
-			} else if (this.model.proficiency == 1) {
-				return 'mdi-brightness-1'
-			} else if (this.model.proficiency == 2){
-				return 'album'
-			} else {
-				return 'mdi-radiobox-blank';
-			}
-		},
 		displayedModifier(){
 			let mod = this.model.value;
 			if (this.model.fail){
diff --git a/app/imports/ui/properties/components/skills/SkillProficiency.vue b/app/imports/ui/properties/components/skills/SkillProficiency.vue
index 6a504aa8..9d55716a 100644
--- a/app/imports/ui/properties/components/skills/SkillProficiency.vue
+++ b/app/imports/ui/properties/components/skills/SkillProficiency.vue
@@ -43,6 +43,7 @@
 <script lang="js">
   import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
   import Breadcrumbs from '/imports/ui/creature/creatureProperties/Breadcrumbs.vue';
+  import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
 
   export default {
     components: {
@@ -58,17 +59,7 @@
     },
     computed: {
       icon(){
-        if (this.model.value == 0.49){
-          return 'mdi-brightness-3';
-        } else if (this.model.value == 0.5) {
-          return 'mdi-brightness-2'
-        } else if (this.model.value == 1) {
-          return 'mdi-brightness-1'
-        } else if (this.model.value == 2){
-          return 'album'
-        } else {
-          return 'mdi-radiobox-blank';
-        }
+        return getProficiencyIcon(this.model.value);
       },
       proficiencyText(){
         switch (this.model.value){
diff --git a/app/imports/ui/properties/forms/shared/ProficiencySelect.vue b/app/imports/ui/properties/forms/shared/ProficiencySelect.vue
index 42475c22..51e1dc4c 100644
--- a/app/imports/ui/properties/forms/shared/ProficiencySelect.vue
+++ b/app/imports/ui/properties/forms/shared/ProficiencySelect.vue
@@ -20,20 +20,9 @@
 </template>
 
 <script lang="js">
+  import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
+
 	const ICON_SPIN_DURATION = 300;
-	let proficiencyIcon = function(value){
-    if (value == 0.49){
-			return 'mdi-brightness-3';
-		} else if (value == 0.5){
-			return 'mdi-brightness-2';
-		} else if (value == 1) {
-			return 'mdi-brightness-1'
-		} else if (value == 2){
-			return 'album'
-		} else {
-			return 'mdi-radiobox-blank';
-		}
-	};
 
 	export default {
 		props: {
@@ -60,7 +49,7 @@
 			'value': {
 				immediate: true,
 				handler(newValue){
-					let newIcon = proficiencyIcon(newValue);
+					let newIcon = getProficiencyIcon(newValue);
 					this.iconClass='leaving';
 					setTimeout(() => {
 						this.displayedIcon = newIcon;
diff --git a/app/imports/ui/properties/shared/ProficiencyIcon.vue b/app/imports/ui/properties/shared/ProficiencyIcon.vue
index 0a5f1d94..91249fc3 100644
--- a/app/imports/ui/properties/shared/ProficiencyIcon.vue
+++ b/app/imports/ui/properties/shared/ProficiencyIcon.vue
@@ -5,22 +5,18 @@
 </template>
 
 <script lang="js">
+import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
+
 export default {
 	props: {
-		value: Number,
+		value: {
+      type: Number,
+      default: undefined,
+    },
 	},
 	computed: {
 		displayedIcon(){
-			let value = this.value;
-			if (value == 0.5){
-				return 'mdi-brightness-2';
-			} else if (value == 1) {
-				return 'mdi-brightness-1'
-			} else if (value == 2){
-				return 'album'
-			} else {
-				return 'mdi-radiobox-blank';
-			}
+      return getProficiencyIcon(this.value);
 		}
 	}
 }
diff --git a/app/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue b/app/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
new file mode 100644
index 00000000..18d5f2b2
--- /dev/null
+++ b/app/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
@@ -0,0 +1,32 @@
+<template lang="html">
+  <div class="layout align-center justify-start">
+    <proficiency-icon
+      v-if="!hideIcon"
+      class="mr-2"
+      :class="selected && 'primary--text'"
+      :color="model.color"
+      :value="model.value"
+    />
+    <div class="text-no-wrap text-truncate">
+      <template v-if="model.stats && model.stats.length">
+        {{ model.stats.join(', ') }}
+      </template>
+      <template v-else>
+        {{ title }}
+      </template>
+    </div>
+  </div>
+</template>
+
+<script lang="js">
+// Most of this was copied from EffectViewer and should probably be generalised
+import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
+
+export default {
+  components: {
+    ProficiencyIcon,
+  },
+  mixins: [treeNodeViewMixin]
+}
+</script>
diff --git a/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js b/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
index 86fe7968..3ce03502 100644
--- a/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
+++ b/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
@@ -4,6 +4,7 @@ import ItemTreeNode from '/imports/ui/properties/treeNodeViews/ItemTreeNode.vue'
 import DamageTreeNode from '/imports/ui/properties/treeNodeViews/DamageTreeNode.vue';
 import EffectTreeNode from '/imports/ui/properties/treeNodeViews/EffectTreeNode.vue';
 import ClassLevelTreeNode from '/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue';
+import ProficiencyTreeNode from '/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue';
 import ReferenceTreeNode from '/imports/ui/properties/treeNodeViews/ReferenceTreeNode.vue';
 
 export default {
@@ -13,5 +14,6 @@ export default {
   damage: DamageTreeNode,
   effect: EffectTreeNode,
   item: ItemTreeNode,
+  proficiency: ProficiencyTreeNode,
   reference: ReferenceTreeNode,
 }
diff --git a/app/imports/ui/properties/viewers/ProficiencyViewer.vue b/app/imports/ui/properties/viewers/ProficiencyViewer.vue
index b5c31f00..a7c44e1b 100644
--- a/app/imports/ui/properties/viewers/ProficiencyViewer.vue
+++ b/app/imports/ui/properties/viewers/ProficiencyViewer.vue
@@ -1,10 +1,12 @@
 <template lang="html">
   <div class="proficiency-viewer">
+    <div class="text-h5">
+      {{ model.stats && model.stats.join(' ') }}
+    </div>
     <div class="text-h5 layout">
-      {{ model.skill }}
       <proficiency-icon
         :value="model.value"
-        class="ml-3 mr-1"
+        class="mr-1"
       />
       <div>
         {{ proficiencyText }}
@@ -16,6 +18,7 @@
 <script lang="js">
 import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
 import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
+
 export default {
   components: {
     ProficiencyIcon,
diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/ui/properties/viewers/SkillViewer.vue
index 5b03002f..df8be16a 100644
--- a/app/imports/ui/properties/viewers/SkillViewer.vue
+++ b/app/imports/ui/properties/viewers/SkillViewer.vue
@@ -89,6 +89,7 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import AttributeEffect from '/imports/ui/properties/components/attributes/AttributeEffect.vue';
 import SkillProficiency from '/imports/ui/properties/components/skills/SkillProficiency.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
 
 export default {
   components: {
@@ -109,17 +110,7 @@ export default {
 			}
 		},
     icon(){
-			if (this.model.proficiency == 0.49){
-				return 'mdi-brightness-3';
-			} else if (this.model.proficiency == 0.5){
-				return 'mdi-brightness-2';
-			} else if (this.model.proficiency == 1) {
-				return 'mdi-brightness-1'
-			} else if (this.model.proficiency == 2){
-				return 'album'
-			} else {
-				return 'mdi-radiobox-blank';
-			}
+      return getProficiencyIcon(this.model.proficiency);
 		},
   },
   methods: {
diff --git a/app/imports/ui/utility/getProficiencyIcon.js b/app/imports/ui/utility/getProficiencyIcon.js
new file mode 100644
index 00000000..4756cd9b
--- /dev/null
+++ b/app/imports/ui/utility/getProficiencyIcon.js
@@ -0,0 +1,13 @@
+export default function getProficiencyIcon(proficiency){
+  if (proficiency == 0.49){
+    return 'mdi-brightness-3';
+  } else if (proficiency == 0.5){
+    return 'mdi-brightness-2';
+  } else if (proficiency == 1) {
+    return 'mdi-brightness-1'
+  } else if (proficiency == 2){
+    return 'mdi-album'
+  } else {
+    return 'mdi-radiobox-blank';
+  }
+}

From 0ad4c7118933db6d003db1720cf72f119bc8b5ac Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 14:45:24 +0200
Subject: [PATCH 29/42] Fixed some missing icons

---
 .../ui/properties/components/actions/ItemConsumedView.vue     | 2 +-
 app/imports/ui/properties/components/skills/SkillListTile.vue | 4 ++--
 app/imports/ui/properties/treeNodeViews/ItemTreeNode.vue      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/imports/ui/properties/components/actions/ItemConsumedView.vue b/app/imports/ui/properties/components/actions/ItemConsumedView.vue
index 5552ba75..ae6b50e7 100644
--- a/app/imports/ui/properties/components/actions/ItemConsumedView.vue
+++ b/app/imports/ui/properties/components/actions/ItemConsumedView.vue
@@ -53,7 +53,7 @@
             </span>
           </div>
           <v-icon v-if="context.editPermission">
-            arrow_drop_down
+            mdi-menu-down
           </v-icon>
         </div>
       </template>
diff --git a/app/imports/ui/properties/components/skills/SkillListTile.vue b/app/imports/ui/properties/components/skills/SkillListTile.vue
index 1ca8f98a..847fc56f 100644
--- a/app/imports/ui/properties/components/skills/SkillListTile.vue
+++ b/app/imports/ui/properties/components/skills/SkillListTile.vue
@@ -20,13 +20,13 @@
           v-if="model.advantage > 0"
           size="20px"
         >
-          arrow_upward
+          mdi-chevron-double-up
         </v-icon>
         <v-icon
           v-if="model.advantage < 0"
           size="20px"
         >
-          arrow_downward
+          mdi-chevron-double-down
         </v-icon>
         {{ model.name }}
         <template v-if="model.conditionalBenefits && model.conditionalBenefits.length">
diff --git a/app/imports/ui/properties/treeNodeViews/ItemTreeNode.vue b/app/imports/ui/properties/treeNodeViews/ItemTreeNode.vue
index 27306603..b2261c1d 100644
--- a/app/imports/ui/properties/treeNodeViews/ItemTreeNode.vue
+++ b/app/imports/ui/properties/treeNodeViews/ItemTreeNode.vue
@@ -13,7 +13,7 @@
       :class="selected && 'primary--text'"
       small
     >
-      pan_tool
+      mdi-account-arrow-left
     </v-icon>
     <div
       class="text-no-wrap text-truncate"

From d43d364175ca3e80962cddc257d2431f5554b7f6 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 14:46:37 +0200
Subject: [PATCH 30/42] Removed stray console log

---
 app/imports/api/creature/computation/engine/combineStat.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/imports/api/creature/computation/engine/combineStat.js b/app/imports/api/creature/computation/engine/combineStat.js
index 69dc752a..53e48cd4 100644
--- a/app/imports/api/creature/computation/engine/combineStat.js
+++ b/app/imports/api/creature/computation/engine/combineStat.js
@@ -35,7 +35,6 @@ function getAggregatorResult(stat, aggregator){
   if (!stat.decimal && Number.isFinite(result)){
     result = Math.floor(result);
   }
-  console.log({result, agg: aggregator.base, statBase: stat.baseValue, base, name: stat.name, stat});
   return result;
 }
 

From 5cf78932e614b1c44f799e0d9e3b84a2ffb2ef24 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 14:47:41 +0200
Subject: [PATCH 31/42] removed stray debug text

---
 app/imports/ui/properties/forms/AttributeForm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index 86a60e3b..a7641e9b 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -62,7 +62,6 @@
       @change="change('description', ...arguments)"
     />
     <calculation-error-list :calculations="model.descriptionCalculations" />
-    {{ cntxt }}
     <form-section
       name="Advanced"
       standalone

From 8eaad3600f637d0b1946c6bea27d1a6363be78dd Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 14:56:12 +0200
Subject: [PATCH 32/42] Fixed computation error with base values

---
 .../creature/computation/engine/EffectAggregator.js    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/imports/api/creature/computation/engine/EffectAggregator.js b/app/imports/api/creature/computation/engine/EffectAggregator.js
index d27ea651..83e30f32 100644
--- a/app/imports/api/creature/computation/engine/EffectAggregator.js
+++ b/app/imports/api/creature/computation/engine/EffectAggregator.js
@@ -20,10 +20,12 @@ export default class EffectAggregator{
     switch(effect.operation){
       case 'base':
         // Take the largest base value
-        if(Number.isFinite(this.base)){
-          this.base = Math.max(this.base, result);
-        } else {
-          this.base = result;
+        if (Number.isFinite(result)){
+          if(Number.isFinite(this.base)){
+            this.base = Math.max(this.base, result);
+          } else {
+            this.base = result;
+          }
         }
         break;
       case 'add':

From 039b7046b28a3a0045ca4ae5f82ac84fd6289f86 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 17:03:32 +0200
Subject: [PATCH 33/42] Fixed attributes not hiding when redundant

---
 .../computation/engine/computeStat.js         | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/imports/api/creature/computation/engine/computeStat.js b/app/imports/api/creature/computation/engine/computeStat.js
index e2812dc2..3b411e8d 100644
--- a/app/imports/api/creature/computation/engine/computeStat.js
+++ b/app/imports/api/creature/computation/engine/computeStat.js
@@ -102,24 +102,31 @@ export default function computeStat(stat, memo){
         prop: statInstance,
         memo
       });
-      statInstance.baseValue = +result.value;
+      result.value = +result.value;
+      if (!isNaN(result.value)){
+        statInstance.baseValue = result.value;
+      } else {
+        statInstance.baseValue = undefined;
+      }
       statInstance.dependencies = union(statInstance.dependencies, dependencies);
       if (context.errors.length){
         statInstance.baseValueErrors = context.errors;
       }
       // Apply all the base values
-      effects.push({
-        operation: 'base',
-        calculation: statInstance.baseValueCalculation,
-        result: statInstance.baseValue,
-        stats: [statInstance.variableName],
-        dependencies: statInstance.overridden ?
+      if (Number.isFinite(statInstance.baseValue)){
+        effects.push({
+          operation: 'base',
+          calculation: statInstance.baseValueCalculation,
+          result: statInstance.baseValue,
+          stats: [statInstance.variableName],
+          dependencies: statInstance.overridden ?
           union(statInstance.dependencies, [statInstance._id]) :
           [],
-        computationDetails: {
-          computed: true,
-        },
-      });
+          computationDetails: {
+            computed: true,
+          },
+        });
+      }
     }
   });
 

From c3c079731e68288b9066e0b5e0db3723e97d42cc Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 17:13:18 +0200
Subject: [PATCH 34/42] Fixed equipment creating ghost items on drag if the
 equipment folder is deleted from the character

---
 .../characterSheetTabs/InventoryTab.vue        | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
index 1c78e5f2..1b79ed03 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
@@ -183,10 +183,24 @@ export default {
 			});
     },
     equipmentParentRef(){
-      return getParentRefByTag(this.creatureId, BUILT_IN_TAGS.equipment);
+      return getParentRefByTag(
+        this.creatureId, BUILT_IN_TAGS.equipment
+      ) || getParentRefByTag(
+        this.creatureId, BUILT_IN_TAGS.inventory
+      ) || {
+        id: this.creatureId,
+        collection: 'creatures'
+      };
     },
     carriedParentRef(){
-      return getParentRefByTag(this.creatureId, BUILT_IN_TAGS.carried);
+      return getParentRefByTag(
+        this.creatureId, BUILT_IN_TAGS.carried
+      ) || getParentRefByTag(
+        this.creatureId, BUILT_IN_TAGS.inventory
+      ) || {
+        id: this.creatureId,
+        collection: 'creatures'
+      };
     },
 	},
 	computed: {

From 80ba44a28f30cbc498b5b87a327f49c17fb47e7d Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 17:56:35 +0200
Subject: [PATCH 35/42] Added ancestor references to action context so that
 #spellList references work, closes #270

---
 .../api/creature/actions/applyProperties.js       |  1 +
 .../api/creature/actions/castSpellWithSlot.js     |  5 ++++-
 app/imports/api/creature/actions/doAction.js      | 11 ++++++++---
 .../api/creature/actions/getAncestorContext.js    | 15 +++++++++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 app/imports/api/creature/actions/getAncestorContext.js

diff --git a/app/imports/api/creature/actions/applyProperties.js b/app/imports/api/creature/actions/applyProperties.js
index fadde1ae..e4e72c47 100644
--- a/app/imports/api/creature/actions/applyProperties.js
+++ b/app/imports/api/creature/actions/applyProperties.js
@@ -62,6 +62,7 @@ function applyPropertyAndWalkChildren({prop, children, targets, ...options}){
 export default function applyProperties({ forest, targets, ...options}){
   forest.forEach(node => {
     let prop = node.node;
+    options.actionContext[`#${prop.type}`] = prop;
     let children = node.children;
     if (shouldSplit(prop) && targets.length){
       targets.forEach(target => {
diff --git a/app/imports/api/creature/actions/castSpellWithSlot.js b/app/imports/api/creature/actions/castSpellWithSlot.js
index c0ccfc31..1b1408ff 100644
--- a/app/imports/api/creature/actions/castSpellWithSlot.js
+++ b/app/imports/api/creature/actions/castSpellWithSlot.js
@@ -8,6 +8,7 @@ import { assertEditPermission } from '/imports/api/creature/creatures/creaturePe
 import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
 import { doActionWork } from '/imports/api/creature/actions/doAction.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import getAncestorContext from '/imports/api/creature/actions/getAncestorContext.js';
 
 const castSpellWithSlot = new ValidatedMethod({
   name: 'creatureProperties.castSpellWithSlot',
@@ -61,9 +62,11 @@ const castSpellWithSlot = new ValidatedMethod({
         value: 1,
       });
     }
+    let actionContext = getAncestorContext(spell);
+
 		doActionWork({
       action: spell,
-      context: {slotLevel},
+      actionContext: {slotLevel, ...actionContext},
       creature,
       targets: target ? [target] : [],
       method: this,
diff --git a/app/imports/api/creature/actions/doAction.js b/app/imports/api/creature/actions/doAction.js
index fb8d89fd..27d560db 100644
--- a/app/imports/api/creature/actions/doAction.js
+++ b/app/imports/api/creature/actions/doAction.js
@@ -11,6 +11,7 @@ import { nodesToTree } from '/imports/api/parenting/parenting.js';
 import applyProperties from '/imports/api/creature/actions/applyProperties.js';
 import recomputeInventory from '/imports/api/creature/denormalise/recomputeInventory.js';
 import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
+import getAncestorContext from '/imports/api/creature/actions/getAncestorContext.js';
 
 const doAction = new ValidatedMethod({
   name: 'creatureProperties.doAction',
@@ -36,6 +37,10 @@ const doAction = new ValidatedMethod({
     let action = CreatureProperties.findOne(actionId);
 		// Check permissions
     let creature = getRootCreatureAncestor(action);
+
+    // Build ancestor context
+    let actionContext = getAncestorContext(action);
+
     assertEditPermission(creature, this.userId);
     let targets = [];
     targetIds.forEach(targetId => {
@@ -43,7 +48,7 @@ const doAction = new ValidatedMethod({
       assertEditPermission(target, this.userId);
       targets.push(target);
     });
-		doActionWork({action, creature, targets, method: this});
+		doActionWork({action, creature, targets, actionContext, method: this});
 
     // The acting creature might have used ammo
     recomputeInventory(creature._id);
@@ -64,7 +69,7 @@ export function doActionWork({
   action,
   creature,
   targets,
-  context = {},
+  actionContext = {},
   method
 }){
   // Create the log
@@ -83,7 +88,7 @@ export function doActionWork({
   }];
   applyProperties({
     forest: startingForest,
-    actionContext: context,
+    actionContext,
     creature,
     targets,
     log,
diff --git a/app/imports/api/creature/actions/getAncestorContext.js b/app/imports/api/creature/actions/getAncestorContext.js
new file mode 100644
index 00000000..9508107b
--- /dev/null
+++ b/app/imports/api/creature/actions/getAncestorContext.js
@@ -0,0 +1,15 @@
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+
+export default function getAncestorContext(prop){
+  // Build ancestor context
+  const actionContext = {};
+  let ancestorIds = prop.ancestors.map(ref => ref.id);
+  CreatureProperties.find({
+    _id: {$in: ancestorIds}
+  }, {
+    sort: {order: 1},
+  }).forEach(ancestor => {
+    actionContext[`#${ancestor.type}`] = ancestor;
+  });
+  return actionContext;
+}

From 822fa4619fb2ca19d8665744466800b695f77ab5 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 18:00:21 +0200
Subject: [PATCH 36/42] Fixed missing icons in calculation errors

---
 .../ui/properties/forms/shared/CalculationErrorList.vue     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/imports/ui/properties/forms/shared/CalculationErrorList.vue b/app/imports/ui/properties/forms/shared/CalculationErrorList.vue
index 29574ad7..e993706e 100644
--- a/app/imports/ui/properties/forms/shared/CalculationErrorList.vue
+++ b/app/imports/ui/properties/forms/shared/CalculationErrorList.vue
@@ -51,11 +51,11 @@ export default {
   methods: {
     errorIcon(type){
       if (type === 'subsitution'){
-        return 'info';
+        return 'mdi-information';
       } else if (type === 'evaluation'){
-        return 'warning';
+        return 'mdi-alert-circle';
       } else {
-        return 'error'
+        return 'mdi-alert'
       }
     },
     errorColor(type){

From 4e87737a3eb4a0486e42e960d8fc4e4322cd5160 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 18:11:48 +0200
Subject: [PATCH 37/42] Fixed add-property button not re-appearing when adding
 a reference property

---
 app/imports/ui/dialogStack/DialogStack.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/imports/ui/dialogStack/DialogStack.vue b/app/imports/ui/dialogStack/DialogStack.vue
index 64b5af32..9a28588f 100644
--- a/app/imports/ui/dialogStack/DialogStack.vue
+++ b/app/imports/ui/dialogStack/DialogStack.vue
@@ -55,6 +55,9 @@
       VLayout,
       ...DialogComponentIndex,
     },
+    data(){return {
+      hiddenElements: [],
+    }},
     computed: {
       dialogs(){
         return this.$store.state.dialogStack.dialogs;
@@ -130,7 +133,7 @@
         // hide the source
         source.style.transition = 'none';
         source.style.opacity = '0';
-        this.hiddenElement = source;
+        this.hiddenElements.push(source);
 
         // Instantly mock the source
         target.style.transition = 'none';
@@ -153,6 +156,7 @@
       },
       doLeave(target, done){
         let elementId;
+        let hiddenElement = this.hiddenElements.pop();
         let returnElementId = this.$store.state.dialogStack.currentReturnElement;
         if (returnElementId) {
           elementId = returnElementId;
@@ -166,7 +170,7 @@
         let source = this.getTopElementByDataId(elementId);
         if (!source){
           console.warn(`Can't find source for ${elementId}`);
-          if (this.hiddenElement) this.hiddenElement.style.opacity = null;
+          if (hiddenElement) hiddenElement.style.opacity = null;
           done();
           return;
         }
@@ -180,10 +184,10 @@
         // If the source and the hidden Element are different
         // hide the source and reveal the hidden element
         let originalSourceTransition = source.style.transition;
-        if (this.hiddenElement !== source){
+        if (hiddenElement !== source){
           source.style.transition = 'none';
           source.style.opacity = '0';
-          this.hiddenElement.style.opacity = null;
+          hiddenElement.style.opacity = null;
         }
         setTimeout(() => {
           source.style.opacity = null;

From 7e97bcb6d89a3e81ddaa5ba6ba45b6498bf571d8 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 13 Jul 2021 12:04:36 +0200
Subject: [PATCH 38/42] Updated packages

---
 app/.meteor/packages  |  50 ++++-----
 app/.meteor/release   |   2 +-
 app/.meteor/versions  |  54 +++++-----
 app/package-lock.json | 233 ++++++++++++++++++++++--------------------
 app/package.json      |  22 ++--
 5 files changed, 189 insertions(+), 172 deletions(-)

diff --git a/app/.meteor/packages b/app/.meteor/packages
index 2c8bea0d..d0f672c2 100644
--- a/app/.meteor/packages
+++ b/app/.meteor/packages
@@ -3,42 +3,42 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-accounts-password@1.7.0
-random@1.2.0
+accounts-password
+random
 dburles:collection-helpers
-reactive-var@1.0.11
-underscore@1.0.10
+reactive-var
+underscore
 momentjs:moment
 dburles:mongo-collection-instances
-accounts-google@1.3.3
-email@2.0.0
+accounts-google
+email
 meteorhacks:subs-manager
 chuangbo:marked
-meteor-base@1.4.0
-mobile-experience@1.1.0
-mongo@1.11.0
-session@1.2.0
-tracker@1.2.0
-logging@1.2.0
-reload@1.3.1
-ejson@1.1.1
-check@1.3.1
-standard-minifier-js@2.6.0
-shell-server@0.5.0
+meteor-base
+mobile-experience
+mongo
+session
+tracker
+logging
+reload
+ejson
+check
+standard-minifier-js
+shell-server
 templates:array
-ecmascript@0.15.1
-es5-shim@4.8.0
-reactive-dict@1.3.0
+ecmascript
+es5-shim
+reactive-dict
 percolate:synced-cron
 ongoworks:speakingurl
-service-configuration@1.0.11
-dynamic-import@0.6.0
-ddp-rate-limiter@1.0.9
-rate-limit@1.0.9
+service-configuration
+dynamic-import
+ddp-rate-limiter
+rate-limit
 mdg:validated-method
 akryum:vue-router2
 static-html
-aldeed:collection2@3.0.0
+aldeed:collection2
 aldeed:schema-index
 zer0th:meteor-vuetify-loader
 accounts-patreon
diff --git a/app/.meteor/release b/app/.meteor/release
index d8fd7cf5..59245ca5 100644
--- a/app/.meteor/release
+++ b/app/.meteor/release
@@ -1 +1 @@
-METEOR@2.2
+METEOR@2.2.1
diff --git a/app/.meteor/versions b/app/.meteor/versions
index 77db19b5..586384a6 100644
--- a/app/.meteor/versions
+++ b/app/.meteor/versions
@@ -1,7 +1,7 @@
 accounts-base@1.9.0
 accounts-google@1.3.3
 accounts-oauth@1.2.0
-accounts-password@1.7.0
+accounts-password@1.7.1
 accounts-patreon@0.1.0
 akryum:npm-check@0.1.2
 akryum:vue-component@0.15.2
@@ -9,19 +9,19 @@ akryum:vue-component-dev-client@0.4.7
 akryum:vue-component-dev-server@0.1.4
 akryum:vue-router2@0.2.3
 akryum:vue-sass@0.1.2
-aldeed:collection2@3.3.0
+aldeed:collection2@3.4.1
 aldeed:schema-index@3.0.0
 allow-deny@1.1.0
 autoupdate@1.7.0
-babel-compiler@7.6.1
+babel-compiler@7.6.2
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
-blaze-tools@1.1.1
+blaze-tools@1.1.2
 boilerplate-generator@1.7.1
-bozhao:link-accounts@2.3.2
+bozhao:link-accounts@2.4.0
 caching-compiler@1.2.2
-caching-html-compiler@1.2.0
+caching-html-compiler@1.2.1
 callback-hook@1.3.0
 check@1.3.1
 chuangbo:marked@0.3.5_1
@@ -30,17 +30,17 @@ coffeescript-compiler@2.4.1
 dburles:collection-helpers@1.1.0
 dburles:mongo-collection-instances@0.3.5
 ddp@1.4.0
-ddp-client@2.4.0
+ddp-client@2.4.1
 ddp-common@1.4.0
 ddp-rate-limiter@1.0.9
-ddp-server@2.3.2
+ddp-server@2.3.3
 deps@1.0.12
 diff-sequence@1.1.1
 dynamic-import@0.6.0
 ecmascript@0.15.1
 ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.11.0
-ecmascript-runtime-server@0.10.0
+ecmascript-runtime-client@0.11.1
+ecmascript-runtime-server@0.10.1
 ejson@1.1.1
 email@2.0.0
 es5-shim@4.8.0
@@ -48,10 +48,10 @@ fetch@0.1.1
 geojson-utils@1.0.10
 google-oauth@1.3.0
 hot-code-push@1.0.4
-html-tools@1.1.1
-htmljs@1.1.0
-http@1.4.3
-id-map@1.1.0
+html-tools@1.1.2
+htmljs@1.1.1
+http@1.4.4
+id-map@1.1.1
 inter-process-messaging@0.1.1
 lai:collection-extensions@0.2.1_1
 launch-screen@1.2.1
@@ -63,8 +63,8 @@ meteor@1.9.3
 meteor-base@1.4.0
 meteorhacks:subs-manager@1.6.4
 mikowals:batch-insert@1.2.0
-minifier-css@1.5.3
-minifier-js@2.6.0
+minifier-css@1.5.4
+minifier-js@2.6.1
 minimongo@1.6.2
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
@@ -72,11 +72,11 @@ modern-browsers@0.1.5
 modules@0.16.0
 modules-runtime@0.12.0
 momentjs:moment@2.29.1
-mongo@1.11.0
+mongo@1.11.1
 mongo-decimal@0.1.2
 mongo-dev-server@1.1.0
-mongo-id@1.0.7
-npm-bcrypt@0.9.3
+mongo-id@1.0.8
+npm-bcrypt@0.9.4
 npm-mongo@3.9.0
 oauth@1.3.2
 oauth2@1.3.0
@@ -98,7 +98,7 @@ promise@0.11.2
 raix:eventemitter@1.0.0
 random@1.2.0
 rate-limit@1.0.9
-react-fast-refresh@0.1.0
+react-fast-refresh@0.1.1
 reactive-dict@1.3.0
 reactive-var@1.0.11
 reload@1.3.1
@@ -112,18 +112,18 @@ shell-server@0.5.0
 simple:json-routes@2.1.0
 simple:rest@1.1.1
 simple:rest-method-mixin@1.0.1
-socket-stream-client@0.3.1
-spacebars-compiler@1.2.1
+socket-stream-client@0.3.3
+spacebars-compiler@1.3.0
 srp@1.1.0
-standard-minifier-js@2.6.0
-static-html@1.3.0
+standard-minifier-js@2.6.1
+static-html@1.3.2
 templates:array@1.0.3
-templating-tools@1.2.0
-tmeasday:check-npm-versions@1.0.1
+templating-tools@1.2.1
+tmeasday:check-npm-versions@1.0.2
 tracker@1.2.0
 typescript@4.2.2
 underscore@1.0.10
-url@1.3.1
+url@1.3.2
 webapp@1.10.1
 webapp-hashing@1.1.0
 zer0th:meteor-vuetify-loader@0.1.30
diff --git a/app/package-lock.json b/app/package-lock.json
index 3cad2697..bd1818bd 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -31,9 +31,9 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.13.10",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz",
-      "integrity": "sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==",
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
+      "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
@@ -171,9 +171,9 @@
       }
     },
     "anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
       "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
@@ -378,19 +378,19 @@
       "dev": true
     },
     "chokidar": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
       "dev": true,
       "requires": {
-        "anymatch": "~3.1.1",
+        "anymatch": "~3.1.2",
         "braces": "~3.0.2",
-        "fsevents": "~2.3.1",
-        "glob-parent": "~5.1.0",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
+        "readdirp": "~3.6.0"
       }
     },
     "chownr": {
@@ -601,18 +601,18 @@
       "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo="
     },
     "discord.js": {
-      "version": "12.5.1",
-      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.5.1.tgz",
-      "integrity": "sha512-VwZkVaUAIOB9mKdca0I5MefPMTQJTNg0qdgi1huF3iwsFwJ0L5s/Y69AQe+iPmjuV6j9rtKoG0Ta0n9vgEIL6w==",
+      "version": "12.5.3",
+      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.5.3.tgz",
+      "integrity": "sha512-D3nkOa/pCkNyn6jLZnAiJApw2N9XrIsXUAdThf01i7yrEuqUmDGc7/CexVWwEcgbQR97XQ+mcnqJpmJ/92B4Aw==",
       "requires": {
         "@discordjs/collection": "^0.1.6",
         "@discordjs/form-data": "^3.0.1",
         "abort-controller": "^3.0.0",
         "node-fetch": "^2.6.1",
-        "prism-media": "^1.2.2",
+        "prism-media": "^1.2.9",
         "setimmediate": "^1.0.5",
         "tweetnacl": "^1.0.3",
-        "ws": "^7.3.1"
+        "ws": "^7.4.4"
       }
     },
     "doctrine": {
@@ -625,9 +625,9 @@
       }
     },
     "dompurify": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.7.tgz",
-      "integrity": "sha512-jdtDffdGNY+C76jvodNTu9jt5yYj59vuTUyx+wXdzcSwAGTYZDAQkQ7Iwx9zcGrA4ixC1syU4H3RZROqRxokxg=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.0.tgz",
+      "integrity": "sha512-VV5C6Kr53YVHGOBKO/F86OYX6/iLTw2yVSI721gKetxpHCK/V5TaLEf9ODjRgl1KLSWRMY6cUhAbv/c+IUnwQw=="
     },
     "ecc-jsbn": {
       "version": "0.1.2",
@@ -739,61 +739,36 @@
       }
     },
     "eslint-plugin-vue": {
-      "version": "7.0.0-alpha.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.0.0-alpha.0.tgz",
-      "integrity": "sha512-ZN1BBBBVSOql81bd4VmhI7VaTEUNWp1uLiOg+FaVpfDyWfKeIH2eY/znoYIdxHeO6M+uCCUFXE1cRGd35T24gQ==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.13.0.tgz",
+      "integrity": "sha512-u0+jL8h2MshRuMTCLslktxRsPTjlENNcNufhgHu01N982DmHVdeFniyMPoVLLRjACQOwdz3FdlsgYGBMBG+AKg==",
       "dev": true,
       "requires": {
-        "eslint-utils": "^2.0.0",
+        "eslint-utils": "^2.1.0",
         "natural-compare": "^1.4.0",
-        "semver": "^5.6.0",
-        "vue-eslint-parser": "^7.0.0"
+        "semver": "^7.3.2",
+        "vue-eslint-parser": "^7.8.0"
       },
       "dependencies": {
         "eslint-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
-          "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
           "dev": true,
           "requires": {
             "eslint-visitor-keys": "^1.1.0"
           }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
         }
       }
     },
     "eslint-plugin-vuetify": {
-      "version": "1.0.0-beta.8",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vuetify/-/eslint-plugin-vuetify-1.0.0-beta.8.tgz",
-      "integrity": "sha512-C0EtBYPVRhZnv/fPs32/v8QD73tkphU7tZymbfKb9M20Gr2vkTg9qnnt4Gv1JJpDhDxfOD/8uY4K5oeCbgBc8w==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vuetify/-/eslint-plugin-vuetify-1.0.1.tgz",
+      "integrity": "sha512-mf1gpx3dvCOhVZiK4eET3QIFR3sdcJ+LLfGxGDQ9APnKwN+iSJ3E0TKztIKWW6Yo7A/FH5OcwJZCS7ZnTMZ7Bg==",
       "dev": true,
       "requires": {
-        "eslint-plugin-vue": "^6.2.2",
+        "eslint-plugin-vue": "^7.0.0",
         "requireindex": "^1.2.0"
-      },
-      "dependencies": {
-        "eslint-plugin-vue": {
-          "version": "6.2.2",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz",
-          "integrity": "sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==",
-          "dev": true,
-          "requires": {
-            "natural-compare": "^1.4.0",
-            "semver": "^5.6.0",
-            "vue-eslint-parser": "^7.0.0"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
       }
     },
     "eslint-scope": {
@@ -1064,9 +1039,9 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
@@ -1530,9 +1505,9 @@
       "integrity": "sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="
     },
     "mem": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-6.0.1.tgz",
-      "integrity": "sha512-uIRYASflIsXqvKe+7aXbLrydaRzz4qiK6amqZDQI++eRtW3UoKtnDcGeCAOREgll7YMxO5E4VB9+3B0LFmy96g==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-6.1.1.tgz",
+      "integrity": "sha512-Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q==",
       "dev": true,
       "requires": {
         "map-age-cleaner": "^0.1.3",
@@ -2196,9 +2171,9 @@
       }
     },
     "mimic-fn": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.0.0.tgz",
-      "integrity": "sha512-PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
+      "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
       "dev": true
     },
     "minimatch": {
@@ -2438,9 +2413,9 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
       "dev": true
     },
     "pngjs": {
@@ -2455,9 +2430,9 @@
       "dev": true
     },
     "prism-media": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.9.tgz",
-      "integrity": "sha512-UHCYuqHipbTR1ZsXr5eg4JUmHER8Ss4YEb9Azn+9zzJ7/jlTtD1h0lc4g6tNx3eMlB8Mp6bfll0LPMAV4R6r3Q=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.3.1.tgz",
+      "integrity": "sha512-nyYAa3KB4qteJIqdguKmwxTJgy55xxUtkJ3uRnOvO5jO+frci+9zpRXw6QZVcfDeva3S654fU9+26P2OSTzjHw=="
     },
     "process-nextick-args": {
       "version": "2.0.1",
@@ -2535,9 +2510,9 @@
       }
     },
     "readdirp": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
@@ -2655,12 +2630,12 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.32.8",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
-      "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==",
+      "version": "1.35.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.35.2.tgz",
+      "integrity": "sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw==",
       "dev": true,
       "requires": {
-        "chokidar": ">=2.0.0 <4.0.0"
+        "chokidar": ">=3.0.0 <4.0.0"
       }
     },
     "semver": {
@@ -2702,9 +2677,9 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "simpl-schema": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/simpl-schema/-/simpl-schema-1.10.2.tgz",
-      "integrity": "sha512-s53RTUqy4sLR9ah8Jqgs2yqyQeImYDPWGqBxcboJRj4FN3Z022r1TEeYkN0k6sxVtE1E+dXk0aFEbRnEiFHB8w==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/simpl-schema/-/simpl-schema-1.12.0.tgz",
+      "integrity": "sha512-lzXC3L8jJbPhNXGR3cjlyIauqqrC5WUJS4O34Ym/wLIvb8K3ZieK+1OfTzs4mBpDc3Y8u53gQFAr1X37DmTcEg==",
       "requires": {
         "clone": "^2.1.2",
         "message-box": "^0.2.7",
@@ -2961,9 +2936,9 @@
       "dev": true
     },
     "underscore": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
-      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
     },
     "uri-js": {
       "version": "4.2.2",
@@ -3005,27 +2980,69 @@
       "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
     },
     "vue-eslint-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz",
-      "integrity": "sha512-yR0dLxsTT7JfD2YQo9BhnQ6bUTLsZouuzt9SKRP7XNaZJV459gvlsJo4vT2nhZ/2dH9j3c53bIx9dnqU2prM9g==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.8.0.tgz",
+      "integrity": "sha512-ehmmrLZNYLUoKayvVW8l8HyPQIfuYZHiJoQLRP3dapDlTU7bGs4tqIKVGdAEpMuXS/b4R/PImCt7Tkj4UhX1SQ==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
-        "eslint-scope": "^5.0.0",
+        "eslint-scope": "^5.1.1",
         "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.2",
-        "esquery": "^1.0.1",
-        "lodash": "^4.17.15"
+        "espree": "^6.2.1",
+        "esquery": "^1.4.0",
+        "lodash": "^4.17.21",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
           }
+        },
+        "esquery": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+          "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+          "dev": true,
+          "requires": {
+            "estraverse": "^5.1.0"
+          },
+          "dependencies": {
+            "estraverse": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+              "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+              "dev": true
+            }
+          }
+        },
+        "esrecurse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+          "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+          "dev": true,
+          "requires": {
+            "estraverse": "^5.2.0"
+          },
+          "dependencies": {
+            "estraverse": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+              "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+              "dev": true
+            }
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
         }
       }
     },
@@ -3043,9 +3060,9 @@
       "integrity": "sha512-hx2JtRPRvne9NY4s1r7ASsCaO8CIby30qwC1kGQRxsrWApO3he+rziGOzTDSfvmr852zWMb11n6qAwHCz6C/vw=="
     },
     "vue-router": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz",
-      "integrity": "sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw=="
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.2.tgz",
+      "integrity": "sha512-807gn82hTnjCYGrnF3eNmIw/dk7/GE4B5h69BlyCK9KHASwSloD1Sjcn06zg9fVG4fYH2DrsNBZkpLtb25WtaQ=="
     },
     "vuedraggable": {
       "version": "2.24.3",
@@ -3056,9 +3073,9 @@
       }
     },
     "vuetify": {
-      "version": "2.4.8",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.4.8.tgz",
-      "integrity": "sha512-rJYyzSO4Qsm/Q79W4FAUedgIDzUvx2uXzXXQ7OB2z9kAAkVOpTdMFY0CnpBcvlYbXOYy/mJ81/yUCV1ZAvJ3FQ=="
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.5.6.tgz",
+      "integrity": "sha512-2T8ML5PYuJ/AdMVH3ZIvzHnsM0nX8t4Xzj+0HFFGfLT7jLlptCFpG+JE8+kyrgGZlbUgulyOwCUu8hJkVsReFA=="
     },
     "vuetify-upload-button": {
       "version": "2.0.2",
@@ -3153,9 +3170,9 @@
       }
     },
     "ws": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
-      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
+      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="
     },
     "y18n": {
       "version": "4.0.1",
diff --git a/app/package.json b/app/package.json
index 0a67fbd5..3f1f728c 100644
--- a/app/package.json
+++ b/app/package.json
@@ -17,7 +17,7 @@
     "npm": "6.13.x"
   },
   "dependencies": {
-    "@babel/runtime": "^7.9.2",
+    "@babel/runtime": "^7.14.6",
     "@chenfengyuan/vue-countdown": "^1.1.5",
     "@tozd/vue-observer-utils": "^0.5.0",
     "animejs": "^2.2.0",
@@ -26,8 +26,8 @@
     "css-box-shadow": "^1.0.0-3",
     "date-fns": "^1.30.1",
     "ddp-rate-limiter-mixin": "^1.1.10",
-    "discord.js": "^12.2.0",
-    "dompurify": "^2.0.10",
+    "discord.js": "^12.5.3",
+    "dompurify": "^2.3.0",
     "ignore": "^5.1.8",
     "ignore-styles": "^5.0.1",
     "lodash": "^4.17.20",
@@ -37,25 +37,25 @@
     "nearley": "^2.19.1",
     "qrcode": "^1.4.4",
     "request": "^2.88.2",
-    "simpl-schema": "^1.5.7",
+    "simpl-schema": "^1.12.0",
     "source-map-support": "^0.5.16",
     "styles": "^0.2.1",
-    "underscore": "^1.10.2",
+    "underscore": "^1.13.1",
     "vue": "2.6.10",
     "vue-meteor-tracker": "^2.0.0-beta.5",
     "vue-reactive-provide": "^0.3.0",
-    "vue-router": "^3.1.6",
+    "vue-router": "^3.5.2",
     "vuedraggable": "^2.23.2",
-    "vuetify": "^2.4.8",
+    "vuetify": "^2.5.6",
     "vuetify-upload-button": "^2.0.2",
     "vuex": "^3.1.3"
   },
   "devDependencies": {
     "eslint": "^6.8.0",
-    "eslint-plugin-vue": "^7.0.0-alpha.0",
-    "eslint-plugin-vuetify": "^1.0.0-beta.8",
-    "mem": "^6.0.1",
-    "sass": "^1.32.8"
+    "eslint-plugin-vue": "^7.13.0",
+    "eslint-plugin-vuetify": "^1.0.1",
+    "mem": "^6.1.1",
+    "sass": "^1.35.2"
   },
   "eslintConfig": {
     "extends": [

From 28d67409aa0d344d0e2e7bf93b8b33013ea42f6a Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 13 Jul 2021 12:23:28 +0200
Subject: [PATCH 39/42] Changed some patreon nudging

---
 app/imports/ui/pages/CharacterList.vue   | 13 +++++++
 app/imports/ui/user/TierTooLowDialog.vue | 48 +++++++++++++++++++++---
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index 69d2484d..39b7ef08 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -26,6 +26,19 @@
               text
               class="mx-2"
             />
+            or
+            <v-btn
+              href="https://www.patreon.com/join/dicecloud/"
+              class="ma-4"
+              target="_blank"
+              small
+              text
+            >
+              Increase Patreon tier
+              <v-icon right>
+                mdi-patreon
+              </v-icon>
+            </v-btn>
           </v-alert>
           <v-card :class="{'mb-4': folders && folders.length}">
             <creature-folder-list
diff --git a/app/imports/ui/user/TierTooLowDialog.vue b/app/imports/ui/user/TierTooLowDialog.vue
index 46aeb934..d1831c81 100644
--- a/app/imports/ui/user/TierTooLowDialog.vue
+++ b/app/imports/ui/user/TierTooLowDialog.vue
@@ -12,12 +12,27 @@
         You need to be at least Adventurer tier (or be invited by a Patron of
         a higher tier) to perform this action
       </h3>
-      <v-btn
-        href="https://www.patreon.com/join/dicecloud/checkout?rid=3002853"
-        color="accent"
+      <div
+        class="d-flex"
       >
-        Join now
-      </v-btn>
+        <v-btn
+          href="https://www.patreon.com/join/dicecloud/"
+          color="accent"
+          class="ma-4"
+          target="_blank"
+        >
+          Join now
+        </v-btn>
+        <template v-if="!user.services.patreon">
+          <v-btn
+            color="primary"
+            class="ma-4"
+            @click="linkWithPatreon"
+          >
+            Link Patreon Account
+          </v-btn>
+        </template>
+      </div>
     </v-layout>
     <v-spacer slot="actions" />
     <v-btn
@@ -33,17 +48,38 @@
 <script lang="js">
 import TIERS, { getUserTier } from '/imports/api/users/patreon/tiers.js';
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import linkWithPatreon from '/imports/api/users/linkWithPatreon.js'
 
 export default {
   components: {
     DialogBase,
   },
+  data(){return {
+    linkPatreonError: '',
+  }},
   meteor: {
     tier(){
       let user = Meteor.user();
       if (!user) return TIERS[0];
       return getUserTier(user);
-    }
+    },
+    user(){
+      return Meteor.user();
+    },
   },
+  methods: {
+    linkWithPatreon(){
+      this.linkPatreonError = '';
+      linkWithPatreon(error => {
+        if (error) {
+          this.linkPatreonError = error;
+        } else {
+          Meteor.call('updateMyPatreonDetails', error => {
+            if (error) this.linkPatreonError = error;
+          });
+        }
+      });
+    },
+  }
 }
 </script>

From 51c709f7a5d03e3aa1ae32e7acdc48868c3583ae Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 13 Jul 2021 12:23:56 +0200
Subject: [PATCH 40/42] Changed tier limitations for closed beta

---
 app/imports/api/users/patreon/tiers.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/imports/api/users/patreon/tiers.js b/app/imports/api/users/patreon/tiers.js
index 120b2593..7f9ad0d6 100644
--- a/app/imports/api/users/patreon/tiers.js
+++ b/app/imports/api/users/patreon/tiers.js
@@ -8,40 +8,40 @@ const TIERS = Object.freeze([
     name: 'Commoner',
     minimumEntitledCents: 0,
     invites: 0,
-    characterSlots: 5,
+    characterSlots: 0, //5,
     paidBenefits: false,
   }, {
     name: 'Dreamer',
     minimumEntitledCents: 100,
     invites: 0,
-    characterSlots: 5,
+    characterSlots: 0, //5,
     paidBenefits: false,
   }, {
     name: 'Wanderer',
     minimumEntitledCents: 300,
     invites: 0,
-    characterSlots: 5,
+    characterSlots: 0, //5,
     paidBenefits: false,
   }, {
     //cost per user $5
     name: 'Adventurer',
     minimumEntitledCents: 500,
     invites: 0,
-    characterSlots: 20,
+    characterSlots: -1, //20,
     paidBenefits: true,
   }, {
     //cost per user $3.33
     name: 'Hero',
     minimumEntitledCents: 1000,
     invites: 2,
-    characterSlots: 50,
+    characterSlots: -1, //50,
     paidBenefits: true,
   }, {
     //cost per user $3.333
     name: 'Legend',
     minimumEntitledCents: 2000,
     invites: 5,
-    characterSlots: 120,
+    characterSlots: -1, //120,
     paidBenefits: true,
   }, {
     //cost per user $3.125

From a0b53af6d7e24f85d10568a9491c7272c65b3d0a Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 13 Jul 2021 12:25:15 +0200
Subject: [PATCH 41/42] Fixed awkward padding in character limit alert

---
 app/imports/ui/pages/CharacterList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index 39b7ef08..7ebb9cb4 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -29,7 +29,7 @@
             or
             <v-btn
               href="https://www.patreon.com/join/dicecloud/"
-              class="ma-4"
+              class="mx-2"
               target="_blank"
               small
               text

From 3fa2cca7aefe55f8e2df9c223b05e2871e6a4cd1 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 13 Jul 2021 12:39:56 +0200
Subject: [PATCH 42/42] Locked dark mode to paid accounts only

---
 app/imports/ui/layouts/AppLayout.vue | 5 ++++-
 app/imports/ui/pages/Account.vue     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/imports/ui/layouts/AppLayout.vue b/app/imports/ui/layouts/AppLayout.vue
index 3098a9bf..8d958e86 100644
--- a/app/imports/ui/layouts/AppLayout.vue
+++ b/app/imports/ui/layouts/AppLayout.vue
@@ -72,6 +72,7 @@
   import DialogStack from '/imports/ui/dialogStack/DialogStack.vue';
   import { mapMutations } from 'vuex';
   import SnackbarQueue from '/imports/ui/components/snackbars/SnackbarQueue.vue';
+  import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 
   export default {
     components: {
@@ -96,7 +97,9 @@
 		meteor: {
 			darkMode(){
 				let user = Meteor.user();
-				return user && user.darkMode;
+        if (!user) return;
+        let tier = getUserTier(user);
+				return tier.paidBenefits && user.darkMode;
 			},
 		},
 		watch: {
diff --git a/app/imports/ui/pages/Account.vue b/app/imports/ui/pages/Account.vue
index f09d1d51..122ae952 100644
--- a/app/imports/ui/pages/Account.vue
+++ b/app/imports/ui/pages/Account.vue
@@ -15,6 +15,8 @@
           <smart-switch
             :value="darkMode"
             label="Dark mode"
+            :disabled="!tier.paidBenefits"
+            :error-messages="tier.paidBenefits ? undefined : 'Patreon reward'"
             @change="setDarkMode"
           />
         </v-list-item>
@@ -188,7 +190,7 @@
         return user && user.emails;
       },
       darkMode(){
-        return this.user && this.user.darkMode;
+        return this.user && this.tier.paidBenefits && this.user.darkMode;
       },
       invites(){
         let usernames = {};
@@ -220,6 +222,7 @@
         return getEntitledCents(this.user);
       },
       tier(){
+        if (!this.user) return {};
         return getUserTier(this.user);
       },
     },