Fixed soft removed documents never getting permanently removed

Added an autofocus field to most forms
Improved class level viewer and tree node view
2020-06-05 23:08:31 +02:00 · 2020-06-05 22:39:21 +02:00 · 2020-06-05 22:25:22 +02:00 · 2020-06-05 22:20:40 +02:00 · 2020-06-05 21:48:28 +02:00 · 2020-06-05 16:14:26 +02:00
54 changed files with 825 additions and 188 deletions
--- a/app/imports/api/creature/Creatures.js
+++ b/app/imports/api/creature/Creatures.js
@@ -65,24 +65,31 @@ let CreatureSchema = new SimpleSchema({
    type: String,
    optional: true,
  },
-
 	// Mechanics
 	deathSave: {
 		type: deathSaveSchema,
 		defaultValue: {},
 	},
-	xp: {
+  // Stats that are computed and denormalised outside of recomputation
+  denormalizedStats: {
+    type: Object,
+    defaultValue: {},
+  },
+  // Sum of all XP gained by this character
+	'denormalizedStats.xp': {
 		type: SimpleSchema.Integer,
 		defaultValue: 0,
 	},
-	weightCarried: {
+  // Sum of all levels granted by milestone XP
+  'denormalizedStats.milestoneLevels': {
+    type: SimpleSchema.Integer,
+    defaultValue: 0,
+  },
+  // Sum of all weights of items and containers that are carried
+	'denormalizedStats.weightCarried': {
 		type: Number,
 		defaultValue: 0,
 	},
-	level: {
-		type: SimpleSchema.Integer,
-		defaultValue: 0,
-	},
 	type: {
 		type: String,
 		defaultValue: 'pc',
--- a/app/imports/api/creature/computation/ComputationMemo.js
+++ b/app/imports/api/creature/computation/ComputationMemo.js
@@ -3,7 +3,7 @@ import { includes, cloneDeep } from 'lodash';
 // The computation memo is an in-memory data structure used only during the
 // computation process
 export default class ComputationMemo {
-  constructor(props){
+  constructor(props, creature){
    this.statsByVariableName = {};
    this.extraStatsByVariableName = {};
    this.statsById = {};
@@ -51,6 +51,15 @@ export default class ComputationMemo {
        this.addClassLevel(prop);
      }
    });
+    for (let name in creature.denormalizedStats){
+      if (!this.statsByVariableName[name]){
+        this.statsByVariableName[name] = {
+          variableName: name,
+          value: creature.denormalizedStats[name],
+          computationDetails: propDetailsByType.denormalizedStat(),
+        }
+      }
+    }
  }
  registerProperty(prop){
    this.originalPropsById[prop._id] = cloneDeep(prop);
@@ -251,4 +260,10 @@ const propDetailsByType = {
      disabledByToggle: false,
    };
  },
+  denormalizedStat(){
+    return {
+      toggleAncestors: [],
+      disabledByToggle: false,
+    };
+  }
 }
--- a/app/imports/api/creature/computation/recomputeCreature.js
+++ b/app/imports/api/creature/computation/recomputeCreature.js
@@ -6,7 +6,8 @@ import computeMemo from '/imports/api/creature/computation/computeMemo.js';
 import getActiveProperties from '/imports/api/creature/getActiveProperties.js';
 import writeAlteredProperties from '/imports/api/creature/computation/writeAlteredProperties.js';
 import writeCreatureVariables from '/imports/api/creature/computation/writeCreatureVariables.js';
-import { recomputeDamageMultipliersById } from '/imports/api/creature/damageMultiplierDenormalise/recomputeDamageMultipliers.js'
+import { recomputeDamageMultipliersById } from '/imports/api/creature/damageMultiplierDenormalise/recomputeDamageMultipliers.js';
+import Creatures from '/imports/api/creature/Creatures.js';

 export const recomputeCreature = new ValidatedMethod({

@@ -17,8 +18,9 @@ export const recomputeCreature = new ValidatedMethod({
  }).validator(),

  run({charId}) {
+    let creature = Creatures.findOne(charId);
    // Permission
-    assertEditPermission(charId, this.userId);
+    assertEditPermission(creature, this.userId);
    // Work, call this direcly if you are already in a method that has checked
    // for permission to edit a given character
    recomputeCreatureById(charId);
@@ -35,6 +37,11 @@ const calculationPropertyTypes = [
  'toggle',
 ];

+export function recomputeCreatureById(creatureId){
+  let creature = Creatures.findOne(creatureId);
+  recomputeCreatureByDoc(creature);
+}
+
 /**
 * This function is the heart of DiceCloud. It recomputes a creature's stats,
 * distilling down effects and proficiencies into the final stats that make up
@@ -71,14 +78,15 @@ const calculationPropertyTypes = [
 *   - Mark the stat as computed
 * - Write the computed results back to the database
 */
-export function recomputeCreatureById(creatureId){
+function recomputeCreatureByDoc(creature){
+  const creatureId = creature._id;
  let props = getActiveProperties({
    ancestorId: creatureId,
    filter: {type: {$in: calculationPropertyTypes}},
    includeUntoggled: true,
    // TODO filter out expensive fields, particularly icon field
  });
-  let computationMemo = new ComputationMemo(props);
+  let computationMemo = new ComputationMemo(props, creature);
  computeMemo(computationMemo);
  writeAlteredProperties(computationMemo);
  writeCreatureVariables(computationMemo, creatureId);
--- a/app/imports/api/creature/experience/Experiences.js
+++ b/app/imports/api/creature/experience/Experiences.js
@@ -0,0 +1,181 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+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 { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
+
+let Experiences = new Mongo.Collection('experiences');
+
+let ExperienceSchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+	},
+	// The amount of XP this experience gives
+	xp: {
+		type: SimpleSchema.Integer,
+		optional: true,
+    min: 0,
+	},
+  // Setting levels instead of value grants whole levels
+  levels: {
+    type: SimpleSchema.Integer,
+    optional: true,
+    min: 0,
+    index: 1,
+  },
+	// The real-world date that it occured, usually sorted by date
+	date: {
+		type: Date,
+		autoValue: function() {
+			// If the date isn't set, set it to now
+			if (!this.isSet) {
+				return new Date();
+			}
+		},
+    index: 1,
+	},
+  creatureId: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    index: 1,
+  },
+});
+
+Experiences.attachSchema(ExperienceSchema);
+
+const insertExperienceForCreature = function({experience, creatureId, userId}){
+  assertEditPermission(creatureId, userId);
+  if (experience.xp){
+    Creatures.update(creatureId, {$inc: {
+      'denormalizedStats.xp': experience.xp
+    }});
+  }
+  if (experience.levels) {
+    Creatures.update(creatureId, {$inc: {
+      'denormalizedStats.milestoneLevels': experience.levels
+    }});
+  }
+  experience.creatureId = creatureId;
+  let id = Experiences.insert(experience);
+  recomputeCreatureById(creatureId);
+  return id;
+};
+
+const insertExperience = new ValidatedMethod({
+  name: 'Experiences.methods.insert',
+  validate: new SimpleSchema({
+    experience: {
+      type: ExperienceSchema.omit('creatureId'),
+    },
+    creatureIds: {
+      type: Array,
+      max: 12,
+    },
+    'creatureIds.$': {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+  run({experience, creatureIds}) {
+    let userId = this.userId;
+    if (!userId) {
+      throw new Meteor.Error('Experiences.methods.insert.denied',
+      'You need to be logged in to insert an experience');
+    }
+    let tier = getUserTier(this.userId);
+    if (!tier.paidBenefits){
+      throw new Meteor.Error('Experiences.methods.insert.denied',
+      `The ${tier.name} tier does not allow you to grant experience`);
+    }
+    let insertedIds = [];
+    creatureIds.forEach(creatureId => {
+      let id = insertExperienceForCreature({experience, creatureId, userId});
+      insertedIds.push(id);
+    });
+    return insertedIds;
+  },
+});
+
+const removeExperience = new ValidatedMethod({
+  name: 'Experiences.methods.remove',
+  validate: new SimpleSchema({
+    experienceId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+  run({experienceId}) {
+    let userId = this.userId;
+    if (!userId) {
+      throw new Meteor.Error('Experiences.methods.remove.denied',
+      'You need to be logged in to remove an experience');
+    }
+    let tier = getUserTier(this.userId);
+    if (!tier.paidBenefits){
+      throw new Meteor.Error('Experiences.methods.remove.denied',
+      `The ${tier.name} tier does not allow you to remove  an experience`);
+    }
+    let experience = Experiences.findOne(experienceId);
+    if (!experience) return;
+    let creatureId = experience.creatureId
+    assertEditPermission(creatureId, userId);
+    if (experience.xp){
+      Creatures.update(creatureId, {$inc: {
+        'denormalizedStats.xp': -experience.xp
+      }});
+    }
+    if (experience.levels) {
+      Creatures.update(creatureId, {$inc: {
+        'denormalizedStats.milestoneLevels': -experience.levels
+      }});
+    }
+    experience.creatureId = creatureId;
+    let numRemoved = Experiences.remove(experienceId);
+    recomputeCreatureById(creatureId);
+    return numRemoved;
+  },
+});
+
+const recomputeExperiences = new ValidatedMethod({
+  name: 'Experiences.methods.recompute',
+  validate: new SimpleSchema({
+    creatureId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+  run({creatureId}) {
+    let userId = this.userId;
+    if (!userId) {
+      throw new Meteor.Error('Experiences.methods.recompute.denied',
+      'You need to be logged in to recompute a creature\'s experiences');
+    }
+    let tier = getUserTier(this.userId);
+    if (!tier.paidBenefits){
+      throw new Meteor.Error('Experiences.methods.recompute.denied',
+      `The ${tier.name} tier does not allow you to recompute a creature's experiences`);
+    }
+    assertEditPermission(creatureId, userId);
+
+    let xp = 0;
+    let milestoneLevels = 0;
+    Experiences.find({
+      creatureId
+    }, {
+      fields: {xp: 1, levels: 1}
+    }).forEach(experience => {
+      xp += experience.xp || 0;
+      milestoneLevels += experience.levels || 0;
+    });
+    Creatures.update(creatureId, {$set: {
+      'denormalizedStats.xp': xp,
+      'denormalizedStats.milestoneLevels': milestoneLevels
+    }});
+    recomputeCreatureById(creatureId);
+  },
+});
+
+export default Experiences;
+export { ExperienceSchema, insertExperience, removeExperience, recomputeExperiences };
--- a/app/imports/api/creature/journal/JournalEntry.js
+++ b/app/imports/api/creature/journal/JournalEntry.js
@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';

 let ExperienceSchema = new SimpleSchema({
-	name: {
+	title: {
 		type: String,
 		optional: true,
 	},
@@ -10,11 +10,6 @@ let ExperienceSchema = new SimpleSchema({
 		type: String,
 		optional: true,
 	},
-	// The amount of XP this experience gives
-	value: {
-		type: SimpleSchema.Integer,
-		optional: true,
-	},
 	// The real-world date that it occured
 	date: {
 		type: Date,
@@ -30,6 +25,20 @@ let ExperienceSchema = new SimpleSchema({
 		type: String,
 		optional: true,
 	},
+  // Tags to better find this entry later
+  tags: {
+    type: Array,
+    defaultValue: [],
+  },
+  'tags.$': {
+    type: String,
+  },
+  // ID of the journal this entry belongs to
+  journalId: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    index: 1,
+  }
 });

 export { ExperienceSchema };
--- a/app/imports/api/creature/removeCreature.js
+++ b/app/imports/api/creature/removeCreature.js
@@ -1,14 +1,17 @@
 import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import Creatures from '/imports/api/creature/Creatures.js';
 import CreatureProperties from '/imports/api/creature/CreatureProperties.js'
 import { assertOwnership } from '/imports/api/creature/creaturePermissions.js';
+import Experiences from '/imports/api/creature/experience/Experiences.js';

-function removeRelatedDocuments(charId){
-  CreatureProperties.remove({'ancestors.id': charId});
-};
+function removeRelatedDocuments(creatureId){
+  CreatureProperties.remove({'ancestors.id': creatureId});
+  Experiences.remove({creatureId});
+}

 const removeCreature = new ValidatedMethod({
-  name: "Creatures.methods.removeCreature", // DDP method name
+  name: 'Creatures.methods.removeCreature', // DDP method name
  validate: new SimpleSchema({
    charId: {
      type: String,
--- a/app/imports/api/properties/computedPropertySchemasIndex.js
+++ b/app/imports/api/properties/computedPropertySchemasIndex.js
@@ -9,7 +9,6 @@ import { ContainerSchema } from '/imports/api/properties/Containers.js';
 import { DamageSchema } from '/imports/api/properties/Damages.js';
 import { DamageMultiplierSchema } from '/imports/api/properties/DamageMultipliers.js';
 import { ComputedEffectSchema } from '/imports/api/properties/Effects.js';
-import { ExperienceSchema } from '/imports/api/properties/Experiences.js';
 import { FeatureSchema } from '/imports/api/properties/Features.js';
 import { FolderSchema } from '/imports/api/properties/Folders.js';
 import { ItemSchema } from '/imports/api/properties/Items.js';
@@ -33,7 +32,6 @@ const propertySchemasIndex = {
  damage: DamageSchema,
  damageMultiplier: DamageMultiplierSchema,
  effect: ComputedEffectSchema,
-  experience: ExperienceSchema,
  feature: FeatureSchema,
  folder: FolderSchema,
  note: NoteSchema,
--- a/app/imports/api/properties/propertySchemasIndex.js
+++ b/app/imports/api/properties/propertySchemasIndex.js
@@ -8,7 +8,6 @@ import { ClassLevelSchema } from '/imports/api/properties/ClassLevels.js';
 import { DamageSchema } from '/imports/api/properties/Damages.js';
 import { DamageMultiplierSchema } from '/imports/api/properties/DamageMultipliers.js';
 import { EffectSchema } from '/imports/api/properties/Effects.js';
-import { ExperienceSchema } from '/imports/api/properties/Experiences.js';
 import { FeatureSchema } from '/imports/api/properties/Features.js';
 import { FolderSchema } from '/imports/api/properties/Folders.js';
 import { NoteSchema } from '/imports/api/properties/Notes.js';
@@ -33,7 +32,6 @@ const propertySchemasIndex = {
  damage: DamageSchema,
  damageMultiplier: DamageMultiplierSchema,
  effect: EffectSchema,
-  experience: ExperienceSchema,
  feature: FeatureSchema,
  folder: FolderSchema,
  note: NoteSchema,
--- a/app/imports/constants/PROPERTIES.js
+++ b/app/imports/constants/PROPERTIES.js
@@ -3,10 +3,6 @@ const PROPERTIES = Object.freeze({
    icon: '$vuetify.icons.action',
    name: 'Action'
  },
-  adjustment: {
-    icon: '$vuetify.icons.attribute_damage',
-    name: 'Attribute damage'
-  },
  attack: {
    icon: '$vuetify.icons.attack',
    name: 'Attack'
@@ -15,6 +11,10 @@ const PROPERTIES = Object.freeze({
    icon: '$vuetify.icons.attribute',
    name: 'Attribute'
  },
+  adjustment: {
+    icon: '$vuetify.icons.attribute_damage',
+    name: 'Attribute damage'
+  },
  buff: {
    icon: '$vuetify.icons.buff',
    name: 'Buff'
@@ -23,6 +23,10 @@ const PROPERTIES = Object.freeze({
    icon: '$vuetify.icons.class_level',
    name: 'Class level'
  },
+  container: {
+    icon: 'work',
+    name: 'Container'
+  },
  damage: {
    icon: '$vuetify.icons.damage',
    name: 'Damage'
@@ -35,10 +39,6 @@ const PROPERTIES = Object.freeze({
    icon: '$vuetify.icons.effect',
    name: 'Effect'
  },
-  experience: {
-    icon: '$vuetify.icons.experience',
-    name: 'Experience'
-  },
  feature: {
    icon: 'subject',
    name: 'Feature'
@@ -47,6 +47,10 @@ const PROPERTIES = Object.freeze({
    icon: 'folder',
    name: 'Folder'
  },
+  item: {
+    icon: '$vuetify.icons.item',
+    name: 'Item'
+  },
  note: {
    icon: 'note',
    name: 'Note'
@@ -75,14 +79,6 @@ const PROPERTIES = Object.freeze({
    icon: '$vuetify.icons.spell',
    name: 'Spell'
  },
-  container: {
-    icon: 'work',
-    name: 'Container'
-  },
-  item: {
-    icon: '$vuetify.icons.item',
-    name: 'Item'
-  },
  toggle: {
    icon: '$vuetify.icons.toggle',
    name: 'Toggle'
--- a/app/imports/constants/SVG_ICONS.js
+++ b/app/imports/constants/SVG_ICONS.js
@@ -11,6 +11,10 @@ const SVG_ICONS = Object.freeze({
    name: 'attribute_damage',
    shape: 'M 150,53.907593 V 396.625 H 86.563 L 258.093,497.188 429.656,396.626 H 366.22 V 53.908593 Z M 260.25,94.782 c 0.684,-0.028 1.34,-0.018 2,0.094 34.59085,1.140414 45.59236,58.23402 22.719,86.438 41.13,7.74 60.86,67.412 48.75,125.75 h -33.033 l -7.562,101.563 h -72.5 l -6.688,-101.563 h -31.593 c -10.68,-56.805 3.537,-119.376 48.47,-126.343 -23.10419,-27.90601 -9.69693,-87.09653 27.375,-85.845 0.677,0 1.378,-0.066 2.062,-0.094 z',
  },
+  'baby-face': {
+    name: 'baby_face',
+    shape: 'M254.443 49.593c-9.011.085-18 1.243-25.056 3.412-7.057 2.17-11.811 5.395-13.676 8.17-7.133 10.617-9.076 19.519-8.1 27.63.977 8.11 5.102 15.92 12.159 23.443 9.846 10.495 25.39 19.81 42.857 26.955-7.836-14.753-11.888-28.818-10.357-42.717 1.826-16.589 11.956-31.077 29.351-43.768-.63-.174-1.186-.377-1.85-.533-7.244-1.703-16.316-2.676-25.328-2.592zm37.79 17.461c-14.638 10.454-20.887 20.609-22.075 31.4-1.474 13.394 5.377 30.64 20.887 52.175l14.023 19.468c12.6-8.667 25.012-12.72 36.782-12.959a54.52 54.52 0 0 1 5.888.2c15.544 1.368 29.047 8.774 41.418 17.423l-10.312 14.752c-11.223-7.846-21.99-13.307-32.684-14.248-10.693-.94-22.044 2.044-36.463 13.838l-11.394-13.932a102.983 102.983 0 0 1 5.824-4.43l-22.74-6.167c-28.693-7.783-56.841-20.93-74.742-40.012-8.951-9.54-15.368-20.858-16.903-33.607-.569-4.726-.43-9.582.42-14.502C121.752 105.216 73 177.51 73 262.775c0 110.751 82.246 199.637 183 199.637s183-88.886 183-199.637c0-97.123-63.252-177.427-146.768-195.72zM170.15 157.138c13.872.282 28.637 5.837 43.547 18.033l-11.394 13.932c-14.419-11.794-25.77-14.779-36.463-13.838-10.693.941-21.46 6.402-32.684 14.248l-10.312-14.752c12.371-8.649 25.874-16.055 41.418-17.424a54.52 54.52 0 0 1 5.888-.199zm-2.15 40c26.955 0 49 22.045 49 49s-22.045 48.998-49 48.998c-26.386 0-48.053-21.125-48.957-47.3a32.955 32.955 0 0 1 0-3.395c.904-26.175 22.571-47.303 48.957-47.303zm176 0c26.955 0 49 22.045 49 49s-22.045 48.998-49 48.998c-26.386 0-48.053-21.125-48.957-47.3a32.955 32.955 0 0 1 0-3.395c.904-26.175 22.571-47.303 48.957-47.303zm-176 17.998c-1.378 0-2.73.097-4.059.268C176.22 220.226 185 232.224 185 246.138c0 13.914-8.78 25.91-21.059 30.733 1.329.17 2.681.267 4.059.267 17.228 0 31-13.772 31-31s-13.772-31.002-31-31.002zm176 0c-1.378 0-2.73.097-4.059.268C352.22 220.226 361 232.224 361 246.138c0 13.914-8.78 25.91-21.059 30.733 1.329.17 2.681.267 4.059.267 17.228 0 31-13.772 31-31s-13.772-31.002-31-31.002zm-284.746 3.006c-14.197 2.45-23.466 7.41-29.065 13.145-7.967 8.162-9.918 18.531-7.39 30.328 3.681 17.18 18.154 35.225 36.076 43.775A235.517 235.517 0 0 1 55 262.775c0-15.287 1.47-30.215 4.254-44.633zm393.492 0A235.355 235.355 0 0 1 457 262.775c0 14.575-1.339 28.823-3.875 42.615 17.922-8.55 32.395-26.595 36.076-43.775 2.528-11.797.577-22.166-7.39-30.328-5.599-5.735-14.868-10.695-29.065-13.145zM152 231.136c-8.391 0-15 6.61-15 15.002 0 3.263 1.008 6.248 2.723 8.688l23.545-18.65c-2.732-3.099-6.734-5.04-11.268-5.04zm176 0c-8.391 0-15 6.61-15 15.002 0 3.263 1.008 6.248 2.723 8.688l23.545-18.65c-2.732-3.099-6.734-5.04-11.268-5.04zm-98.41 49.95c8 6.34 13.916 10.984 18.228 13.718 4.313 2.735 6.56 3.356 8.182 3.356 1.623 0 3.87-.621 8.182-3.356 4.312-2.734 10.228-7.378 18.228-13.718l11.18 14.103c-8 6.34-14.084 11.208-19.772 14.815-5.687 3.606-11.44 6.154-17.818 6.154-6.377 0-12.13-2.548-17.818-6.154-5.688-3.607-11.772-8.474-19.772-14.815zm-82.393 51.1h217.606l-4.336 12.046s-8.333 23.283-25.164 46.664C318.472 414.277 292.167 439.09 256 439.09c-36.167 0-62.472-24.812-79.303-48.193-16.83-23.38-25.164-46.664-25.164-46.664zM218 350.137v32h32v-32z',
+  },
  'back-and-forth': {
    name: 'effect',
    shape: 'M241.844 28.625l-21.188 5.063L33.25 78.53l-9.594 2.282 2.813 9.47 54.718 184.03 6.156 20.782 10.875-18.75 36.624-63.125 39.344 22.655 9.375-16.188-47.47-27.312L128 187.72l-4.656 8.06-30.406 52.47-45.75-153.844 156.625-37.47-30.344 52.345-4.69 8.126 8.126 4.656L332.75 211.75l-17.594 30.344 16.22 9.312 22.25-38.375 4.687-8.124-8.125-4.656-155.844-89.688 36.594-63.093 10.906-18.845zm-28.25 176.47l-57.438 99.31 155.22 89.5 8.093 4.658-4.69 8.093-44.06 76.25 218.81-52.5-63.874-215.47-44.094 76.25-4.656 8.064-8.094-4.656-155.218-89.5z',
--- a/app/imports/server/cron/deleteSoftRemovedDocuments.js
+++ b/app/imports/server/cron/deleteSoftRemovedDocuments.js
@@ -1,11 +1,18 @@
+import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
+import { assertAdmin } from '/imports/api/sharing/sharingPermissions.js';
+import { SyncedCron } from 'meteor/percolate:synced-cron';

-let collections = [LibraryNodes];
+Meteor.startup(() => {
+	const collections = [
+		CreatureProperties,
+    LibraryNodes,
+	];

-if (Meteor.isServer) Meteor.startup(() => {
 	/**
 	 * Deletes all soft removed documents that were removed more than 30 minutes ago
 	 * and were not restored
+	 * @return {Number} Number of documents removed
 	 */
 	const deleteOldSoftRemovedDocs = function(){
 		const now = new Date();
@@ -14,30 +21,30 @@ if (Meteor.isServer) Meteor.startup(() => {
 			collection.remove({
 				removed: true,
 				removedAt: {$lt: thirtyMinutesAgo} // dates *before* 30 minutes ago
-			}, error => {
-				if (error) console.error(error);
+			}, function(error){
+				if (error){
+					console.error(error);
+				}
 			});
 		});
-		return;
 	};

 	SyncedCron.add({
-		name: "Delete all soft removed items that haven't been restored",
+		name: 'deleteSoftRemovedDocs',
 		schedule: function(parser) {
-			return parser.text('every 6 hours');
+			return parser.text('every 2 hours');
 		},
-		job: function() {
-			deleteOldSoftRemovedDocs();
-		}
+		job: deleteOldSoftRemovedDocs,
 	});

+	SyncedCron.start();
+
 	// Add a method to manually trigger removal
 	Meteor.methods({
 		deleteOldSoftRemovedDocs() {
-			const user = Meteor.users.findOne(this.userId);
-			if (user && _.contains(user.roles, "admin")){
-				return deleteOldSoftRemovedDocs();
-			}
+      assertAdmin(this.userId);
+			this.unblock();
+			deleteOldSoftRemovedDocs();
 		},
 	});
 });
--- a/app/imports/server/publications/experiences.js
+++ b/app/imports/server/publications/experiences.js
@@ -0,0 +1,32 @@
+import SimpleSchema from 'simpl-schema';
+import Creatures from '/imports/api/creature/Creatures.js';
+import Experiences from '/imports/api/creature/experience/Experiences.js';
+
+let schema = new SimpleSchema({
+  creatureId: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+  },
+});
+
+Meteor.publish('experiences', function(creatureId){
+  schema.validate({ creatureId });
+  this.autorun(function (){
+    let userId = this.userId;
+    let creatureCursor = Creatures.find({
+      _id: creatureId,
+      $or: [
+        {readers: userId},
+        {writers: userId},
+        {owner: userId},
+        {public: true},
+      ],
+    });
+    if (!creatureCursor.count()) return this.ready();
+    return [
+      Experiences.find({
+        creatureId,
+      }),
+    ];
+  });
+});
--- a/app/imports/server/publications/index.js
+++ b/app/imports/server/publications/index.js
@@ -1,5 +1,6 @@
 import '/imports/server/publications/characterList.js';
 import '/imports/server/publications/library.js';
 import '/imports/server/publications/singleCharacter.js';
+import '/imports/server/publications/experiences.js';
 import '/imports/server/publications/users.js';
 import '/imports/server/publications/icons.js';
--- a/app/imports/ui/components/global/SmartInputMixin.js
+++ b/app/imports/ui/components/global/SmartInputMixin.js
@@ -93,6 +93,9 @@ export default {
      this.safeValue = null;
      this.$nextTick(() => this.safeValue = this.value);
    },
+    focus(){
+      this.$refs.input.focus();
+    }
  },
  computed: {
    errors(){
--- a/app/imports/ui/components/global/TextField.vue
+++ b/app/imports/ui/components/global/TextField.vue
@@ -1,5 +1,6 @@
 <template lang="html">
  <v-text-field
+    ref="input"
    v-bind="$attrs"
    :loading="loading"
    :error-messages="errors"
--- a/app/imports/ui/components/tree/TreeNodeList.vue
+++ b/app/imports/ui/components/tree/TreeNodeList.vue
@@ -107,7 +107,6 @@
 				let allowed = isParentAllowed({parentType, childType});
 				return allowed;
 			},
-      log: console.log,
 		},
 	};
 </script>
--- a/app/imports/ui/creature/character/characterSheetTabs/PersonaTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/PersonaTab.vue
@@ -20,6 +20,70 @@
          </v-card-text>
        </v-card>
      </div>
+      <div>
+        <v-card class="class-details">
+          <v-card-title
+            v-if="creature.variables.level"
+            class="title"
+          >
+            Level {{ creature.variables.level.value }}
+          </v-card-title>
+          <v-list>
+            <v-list-tile>
+              <v-list-tile-content>
+                <v-list-tile-title
+                  v-if="
+                    creature.variables.milestoneLevels &&
+                      creature.variables.milestoneLevels.value
+                  "
+                >
+                  {{ creature.variables.milestoneLevels.value }} Milestone levels
+                </v-list-tile-title>
+                <v-list-tile-title v-else>
+                  {{
+                    creature.variables.xp &&
+                      creature.variables.xp.value ||
+                      0
+                  }} XP
+                </v-list-tile-title>
+              </v-list-tile-content>
+              <v-list-tile-action>
+                <v-btn
+                  flat
+                  icon
+                  data-id="experience-info-button"
+                  @click="showExperienceList"
+                >
+                  <v-icon>info</v-icon>
+                </v-btn>
+              </v-list-tile-action>
+              <v-list-tile-action>
+                <v-btn
+                  flat
+                  icon
+                  data-id="experience-add-button"
+                  @click="addExperience"
+                >
+                  <v-icon>add</v-icon>
+                </v-btn>
+              </v-list-tile-action>
+            </v-list-tile>
+            <v-list-tile
+              v-for="classLevel in highestClassLevels"
+              :key="classLevel._id"
+            >
+              <v-list-tile-content>
+                <v-list-tile-title>
+                  {{ classLevel.name }}
+                </v-list-tile-title>
+              </v-list-tile-content>
+              <v-list-tile-avatar>
+                {{ classLevel.level }}
+              </v-list-tile-avatar>
+            </v-list-tile>
+          </v-list>
+        </v-card>
+      </div>
      <div
        v-for="note in notes"
        :key="note._id"
@@ -37,6 +101,7 @@ import Creatures from '/imports/api/creature/Creatures.js';
 import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 import NoteCard from '/imports/ui/properties/components/persona/NoteCard.vue';
+import getActiveProperties from '/imports/api/creature/getActiveProperties.js'

 export default {
 	components: {
@@ -44,7 +109,10 @@ export default {
 		NoteCard,
 	},
 	props: {
-		creatureId: String,
+		creatureId: {
+      type: String,
+      required: true,
+    },
 	},
 	meteor: {
 		notes(){
@@ -58,8 +126,34 @@ export default {
 		},
 		creature(){
 			return Creatures.findOne(this.creatureId);
-		}
+		},
+    classLevels(){
+      return getActiveProperties({
+        ancestorId: this.creatureId,
+        filter: {type: 'classLevel'},
+      });
+    },
 	},
+  computed: {
+    highestClassLevels(){
+      let highestLevels = {};
+      let highestLevelsList = [];
+      this.classLevels.forEach(classLevel => {
+        let name = classLevel.vairableName;
+        if (
+          !highestLevels[name] ||
+          highestLevels[name].level < classLevel.level
+        ){
+          highestLevels[name] = classLevel;
+        }
+      });
+      for (let name in highestLevels){
+        highestLevelsList.push(highestLevels[name]);
+      }
+      highestLevelsList.sort((a, b) => a.level - b.level);
+      return highestLevelsList;
+    },
+  },
 	methods: {
 		showCharacterForm(){
 			this.$store.commit('pushDialogStack', {
@@ -70,6 +164,28 @@ export default {
 				},
 			});
 		},
+    addExperience(){
+      this.$store.commit('pushDialogStack', {
+				component: 'experience-insert-dialog',
+				elementId: 'experience-add-button',
+				data: {
+					creatureIds: [this.creatureId],
+          startAsMilestone: this.creature.variables.milestoneLevels &&
+            !!this.creature.variables.milestoneLevels.value,
+				},
+			});
+    },
+    showExperienceList(){
+      this.$store.commit('pushDialogStack', {
+				component: 'experience-list-dialog',
+				elementId: 'experience-info-button',
+				data: {
+					creatureId: this.creatureId,
+          startAsMilestone: this.creature.variables.milestoneLevels &&
+            !!this.creature.variables.milestoneLevels.value,
+				},
+			});
+    },
 	},
 };
 </script>
--- a/app/imports/ui/creature/experiences/ExperienceForm.vue
+++ b/app/imports/ui/creature/experiences/ExperienceForm.vue
@@ -0,0 +1,68 @@
+<template lang="html">
+  <div class="experience-form">
+    <div class="layout column align-center">
+      <smart-switch
+        label="Milestone"
+        class="mx-3"
+        :value="milestone"
+        @change="makeMilestone"
+      />
+      <text-field
+        v-if="milestone"
+        label="Levels"
+        type="number"
+        class="base-value-field text-xs-center large-format no-flex"
+        :value="model.levels"
+        :error-messages="errors.levels"
+        @change="change('levels', ...arguments)"
+      />
+      <text-field
+        v-else
+        type="number"
+        class="base-value-field text-xs-center large-format no-flex"
+        suffix="XP"
+        autofocus
+        :value="model.xp"
+        :error-messages="errors.xp"
+        @change="change('xp', ...arguments)"
+      />
+    </div>
+    <text-field
+      label="Name"
+      :autofocus="milestone"
+      :value="model.name"
+      :error-messages="errors.name"
+      @change="change('name', ...arguments)"
+    />
+  </div>
+</template>
+
+<script>
+import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+
+export default {
+  mixins: [propertyFormMixin],
+  props: {
+    startAsMilestone: {
+      type: Boolean,
+    },
+  },
+  data(){return {
+    milestone: this.startAsMilestone,
+  }},
+  methods: {
+    makeMilestone(milestone, ack){
+      this.milestone = milestone;
+      if (milestone){
+        this.change('xp', undefined);
+        this.change('levels', 1, ack);
+      } else {
+        this.change('levels', undefined, ack);
+      }
+    }
+  }
+}
+</script>
+
+<style lang="css" scoped>
+</style>
--- a/app/imports/ui/creature/experiences/ExperienceInsertDialog.vue
+++ b/app/imports/ui/creature/experiences/ExperienceInsertDialog.vue
@@ -0,0 +1,83 @@
+<template lang="html">
+  <dialog-base>
+    <experience-form
+      :start-as-milestone="startAsMilestone"
+      :model="model"
+      :errors="errors"
+      @change="change"
+      @push="push"
+      @pull="pull"
+    />
+    <div
+      slot="actions"
+      class="layout row justify-end"
+    >
+      <v-btn
+        flat
+        :disabled="!valid"
+        @click="insertExperience"
+      >
+        Insert
+      </v-btn>
+    </div>
+  </dialog-base>
+</template>
+
+<script>
+import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import ExperienceForm from '/imports/ui/creature/experiences/ExperienceForm.vue';
+import { ExperienceSchema, insertExperience } from '/imports/api/creature/experience/Experiences.js';
+import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
+
+export default {
+  components: {
+		DialogBase,
+    ExperienceForm,
+	},
+  mixins: [schemaFormMixin],
+  provide: {
+    context: {
+      debounceTime: 0,
+    },
+  },
+  props: {
+    creatureIds: {
+      type: Array,
+      required: true,
+    },
+    startAsMilestone: {
+      type: Boolean,
+    },
+  },
+  data(){
+    let schema = ExperienceSchema.omit('creatureId');
+    let startingModel = {};
+    if (this.startAsMilestone){
+      startingModel.levels = 1;
+    }
+    return {
+      model: schema.clean(startingModel),
+      schema: schema,
+      validationContext: schema.newContext(),
+      debounceTime: 0,
+    };
+  },
+  methods:{
+    insertExperience(){
+      let experience = this.schema.clean(this.model);
+      let id = insertExperience.call({
+        experience,
+        creatureIds: this.creatureIds,
+      }, (error) =>  {
+        if (error){
+          console.error(error);
+        }
+      });
+      this.$store.dispatch('popDialogStack', id);
+    }
+  }
+}
+</script>
+
+<style lang="css" scoped>
+</style>
--- a/app/imports/ui/creature/experiences/ExperienceListDialog.vue
+++ b/app/imports/ui/creature/experiences/ExperienceListDialog.vue
@@ -0,0 +1,174 @@
+<template lang="html">
+  <dialog-base>
+    <template slot="toolbar">
+      <v-toolbar-title>
+        Experiences
+      </v-toolbar-title>
+      <v-spacer />
+      <v-btn
+        icon
+        flat
+        data-id="experience-add-button"
+        @click="addExperience"
+      >
+        <v-icon>add</v-icon>
+      </v-btn>
+      <v-btn
+        icon
+        flat
+        @click="recompute"
+      >
+        <v-icon>refresh</v-icon>
+      </v-btn>
+    </template>
+    <div
+      v-if="!$subReady.experiences"
+      class="layout column align-center justify-center fill-height"
+    >
+      <v-progress-circular
+        indeterminate
+        size="240"
+      />
+    </div>
+    <div
+      v-else-if="experiences.length === 0"
+      class="layout column align-center justify-center fill-height"
+    >
+      <v-icon style="font-size: 240px; width: 240px; height: 240px;">
+        $vuetify.icons.baby_face
+      </v-icon>
+      <p class="headline">
+        No experiences
+      </p>
+    </div>
+    <v-list v-else>
+      <v-slide-x-transition
+        group
+        mode="out"
+      >
+        <v-list-tile
+          v-for="experience in experiences"
+          :key="experience._id"
+          :data-id="experience._id"
+        >
+          <v-list-tile-action class="mr-3">
+            <v-list-tile-action-text>
+              {{ formatDate(experience.date) }}
+            </v-list-tile-action-text>
+          </v-list-tile-action>
+          <v-list-tile-content>
+            <template v-if="experience.name">
+              <v-list-tile-title>
+                {{ experience.name }}
+              </v-list-tile-title>
+              <v-list-tile-sub-title>
+                {{ xpText(experience) }}
+              </v-list-tile-sub-title>
+            </template>
+            <template v-else>
+              <v-list-tile-title>
+                {{ xpText(experience) }}
+              </v-list-tile-title>
+            </template>
+          </v-list-tile-content>
+          <v-list-tile-action>
+            <v-btn
+              icon
+              flat
+              :loading="experiencesRemovalLoading.has(experience._id)"
+              @click="removeExperience(experience._id)"
+            >
+              <v-icon>delete</v-icon>
+            </v-btn>
+          </v-list-tile-action>
+        </v-list-tile>
+      </v-slide-x-transition>
+    </v-list>
+  </dialog-base>
+</template>
+
+<script>
+import { format } from 'date-fns';
+import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import Experiences, { removeExperience, recomputeExperiences } from '/imports/api/creature/experience/Experiences.js';
+
+export default {
+  components: {
+    DialogBase,
+  },
+  props: {
+    creatureId: {
+      type: String,
+      required: true,
+    },
+    startAsMilestone: {
+      type: Boolean,
+    },
+  },
+  data(){ return {
+    experiencesRemovalLoading: new Set(),
+    recomputeLoading: false,
+  }},
+  meteor: {
+    $subscribe: {
+      'experiences'(){
+        return [this.creatureId];
+      },
+    },
+    experiences(){
+      return Experiences.find({
+        creatureId: this.creatureId
+      }, {
+        sort: {date: 1}
+      });
+    }
+  },
+  methods: {
+    xpText(experience){
+      let xpText = [];
+      if (experience.levels === 1){
+        xpText.push('1 Milestone level');
+      } else if (experience.levels){
+        xpText.push(`${experience.levels} Milestone levels`);
+      }
+      if (experience.xp || !experience.levels){
+        xpText.push(`${experience.xp || 0} XP`);
+      }
+      return xpText.join(', ');
+    },
+    formatDate(date){
+      return format(date, 'YYYY-MM-DD');
+    },
+    removeExperience(experienceId){
+      this.experiencesRemovalLoading.add(experienceId);
+      removeExperience.call({experienceId}, (error) => {
+        this.experiencesRemovalLoading.delete(experienceId);
+        if (error) console.error(error);
+      });
+    },
+    recompute(){
+      this.recomputeLoading = true;
+      recomputeExperiences.call({creatureId: this.creatureId}, error => {
+        this.recomputeLoading = false;
+        if (error) console.error(error);
+      });
+    },
+    addExperience(){
+      this.$store.commit('pushDialogStack', {
+        component: 'experience-insert-dialog',
+        elementId: 'experience-add-button',
+        data: {
+          creatureIds: [this.creatureId],
+          startAsMilestone: this.startAsMilestone,
+        },
+        callback(id){
+          return id;
+        }
+      });
+    },
+  },
+}
+</script>
+
+<style lang="css" scoped>
+</style>
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -3,6 +3,8 @@ import CreaturePropertyCreationDialog from '/imports/ui/creature/creaturePropert
 import CreaturePropertyDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue'
 import CreaturePropertyFromLibraryDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue'
 import DeleteConfirmationDialog from '/imports/ui/dialogStack/DeleteConfirmationDialog.vue';
+import ExperienceInsertDialog from  '/imports/ui/creature/experiences/ExperienceInsertDialog.vue';
+import ExperienceListDialog from  '/imports/ui/creature/experiences/ExperienceListDialog.vue';
 import InviteDialog from '/imports/ui/user/InviteDialog.vue';
 import LibraryCreationDialog from '/imports/ui/library/LibraryCreationDialog.vue';
 import LibraryEditDialog from '/imports/ui/library/LibraryEditDialog.vue';
@@ -13,13 +15,14 @@ import ShareDialog from '/imports/ui/sharing/ShareDialog.vue';
 import TierTooLowDialog from '/imports/ui/user/TierTooLowDialog.vue';
 import UsernameDialog from '/imports/ui/user/UsernameDialog.vue';

-
 export default {
  CreatureFormDialog,
  CreaturePropertyCreationDialog,
  CreaturePropertyDialog,
  CreaturePropertyFromLibraryDialog,
  DeleteConfirmationDialog,
+  ExperienceInsertDialog,
+  ExperienceListDialog,
  InviteDialog,
  LibraryCreationDialog,
  LibraryEditDialog,
--- a/app/imports/ui/icons/IconAdmin.vue
+++ b/app/imports/ui/icons/IconAdmin.vue
@@ -40,9 +40,6 @@
      searchString: '',
      testIcon: undefined,
    }},
-    mounted(){
-      console.log(this.$vuetify);
-    },
    methods: {
      fileChanged (file) {
        importIcons(file);
--- a/app/imports/ui/layouts/AppLayout.vue
+++ b/app/imports/ui/layouts/AppLayout.vue
@@ -119,9 +119,6 @@
        'toggleDrawer',
      ]),
    },
-    mounted(){
-      console.log(this.$route);
-    }
  };
 </script>

--- a/app/imports/ui/library/LibraryAndNode.vue
+++ b/app/imports/ui/library/LibraryAndNode.vue
@@ -101,7 +101,6 @@ export default {
            selection: this.selection,
          },
          callback: result => {
-            console.log(result)
            if (result){
              this.selected = id;
            }
--- a/app/imports/ui/library/SingleLibraryToolbarItems.vue
+++ b/app/imports/ui/library/SingleLibraryToolbarItems.vue
@@ -29,7 +29,6 @@ export default {
  }},
  meteor: {
    library(){
-      console.log(this.$route);
      return Libraries.findOne(this.$route.params.id);
    },
    subscribed(){
@@ -41,7 +40,6 @@ export default {
      let userId = Meteor.userId();
      let library = this.library;
      if (!library) return;
-      console.log({library, userId});
      if (
        library.readers.includes(userId) ||
        library.writers.includes(userId) ||
@@ -55,10 +53,8 @@ export default {
    canEdit(){
      try {
        assertDocEditPermission(this.library, Meteor.userId());
-        console.log('can edit');
        return true
      } catch (e) {
-        console.log(e);
        return false;
      }
    }
--- a/app/imports/ui/properties/forms/ActionForm.vue
+++ b/app/imports/ui/properties/forms/ActionForm.vue
@@ -1,6 +1,7 @@
 <template lang="html">
  <div :class="attackForm ? 'attack-form' : 'action-form'">
    <text-field
+      ref="focusFirst"
      label="Name"
      :value="model.name"
      :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -2,6 +2,7 @@
  <div class="attribute-form">
    <div class="layout column align-center">
      <text-field
+        ref="focusFirst"
        label="Base Value"
        class="base-value-field"
        hint="This is the value of the attribute before effects are applied"
--- a/app/imports/ui/properties/forms/BuffForm.vue
+++ b/app/imports/ui/properties/forms/BuffForm.vue
@@ -1,6 +1,7 @@
 <template lang="html">
  <div class="buff-form">
    <text-field
+      ref="focusFirst"
      label="Name"
      :value="model.name"
      :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/ClassLevelForm.vue
+++ b/app/imports/ui/properties/forms/ClassLevelForm.vue
@@ -12,6 +12,7 @@
    </div>
    <div class="layout row wrap">
      <text-field
+        ref="focusFirst"
        label="Name"
        :value="model.name"
        :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/ContainerForm.vue
+++ b/app/imports/ui/properties/forms/ContainerForm.vue
@@ -2,6 +2,7 @@
  <div class="attribute-form">
    <div class="layout row justify-space-between wrap">
      <text-field
+        ref="focusFirst"
        label="Name"
        :value="model.name"
        :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/DamageForm.vue
+++ b/app/imports/ui/properties/forms/DamageForm.vue
@@ -2,6 +2,7 @@
  <div>
    <div class="layout row">
      <text-field
+        ref="focusFirst"
        label="Damage"
        style="flex-basis: 300px;"
        :value="model.amount"
--- a/app/imports/ui/properties/forms/DamageMultiplierForm.vue
+++ b/app/imports/ui/properties/forms/DamageMultiplierForm.vue
@@ -1,6 +1,7 @@
 <template lang="html">
  <div class="attribute-form">
    <text-field
+      ref="focusFirst"
      label="Name"
      :value="model.name"
      :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/EffectForm.vue
+++ b/app/imports/ui/properties/forms/EffectForm.vue
@@ -1,6 +1,7 @@
 <template lang="html">
  <div class="effect-form">
    <text-field
+      ref="focusFirst"
      label="Name"
      :value="model.name"
      :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/ExperienceForm.vue
+++ b/app/imports/ui/properties/forms/ExperienceForm.vue
@@ -1,57 +0,0 @@
-<template lang="html">
-  <div class="class-form">
-    <div class="layout row wrap">
-      <text-field
-        label="Title"
-        style="flex-basis: 300px;"
-        :value="model.name"
-        :error-messages="errors.name"
-        @change="change('name', ...arguments)"
-      />
-      <text-field
-        label="In-World date"
-        :value="model.worldDate"
-        style="flex-basis: 300px;"
-        hint="The date in-game that the experience occured"
-        :error-messages="errors.worldDate"
-        @change="change('worldDate', ...arguments)"
-      />
-      <date-picker
-        label="Real date"
-        :value="model.date"
-        style="flex-basis: 300px;"
-        hint="Real life date"
-        :error-messages="errors.date"
-        @change="change('date', ...arguments)"
-      />
-    </div>
-    <text-area
-      label="Description"
-      :value="model.description"
-      :error-messages="errors.description"
-      @change="change('description', ...arguments)"
-    />
-    <div class="layout column align-end">
-      <text-field
-        label="XP gained"
-        type="number"
-        class="base-value-field text-xs-center large-format no-flex"
-        hint="The number of experience points gained from this entry"
-        :value="model.value"
-        :error-messages="errors.value"
-        @change="change('value', ...arguments)"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-
-export default {
-  mixins: [propertyFormMixin],
-};
-</script>
-
-<style lang="css" scoped>
-</style>
--- a/app/imports/ui/properties/forms/FeatureForm.vue
+++ b/app/imports/ui/properties/forms/FeatureForm.vue
@@ -1,6 +1,7 @@
 <template lang="html">
  <div class="feature-form">
    <text-field
+      ref="focusFirst"
      label="Name"
      :value="model.name"
      :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/FolderForm.vue
+++ b/app/imports/ui/properties/forms/FolderForm.vue
@@ -2,6 +2,7 @@
  <div class="folder-form">
    <div class="layout row wrap">
      <text-field
+        ref="focusFirst"
        label="Name"
        style="flex-basis: 300px;"
        :value="model.name"
--- a/app/imports/ui/properties/forms/ItemForm.vue
+++ b/app/imports/ui/properties/forms/ItemForm.vue
@@ -20,6 +20,7 @@
    </div>
    <div class="layout row wrap">
      <text-field
+        ref="focusFirst"
        label="Name"
        :value="model.name"
        :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/NoteForm.vue
+++ b/app/imports/ui/properties/forms/NoteForm.vue
@@ -1,6 +1,7 @@
 <template lang="html">
  <div class="feature-form">
    <text-field
+      ref="focusFirst"
      label="Name"
      :value="model.name"
      :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/ProficiencyForm.vue
+++ b/app/imports/ui/properties/forms/ProficiencyForm.vue
@@ -1,6 +1,7 @@
 <template lang="html">
  <div>
    <text-field
+      ref="focusFirst"
      label="Name"
      :value="model.name"
      :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/RollForm.vue
+++ b/app/imports/ui/properties/forms/RollForm.vue
@@ -1,6 +1,7 @@
 <template lang="html">
  <div class="roll-form">
    <text-field
+      ref="focusFirst"
      label="Roll"
      :value="model.roll"
      :error-messages="errors.roll"
--- a/app/imports/ui/properties/forms/SavingThrowForm.vue
+++ b/app/imports/ui/properties/forms/SavingThrowForm.vue
@@ -1,6 +1,7 @@
 <template lang="html">
  <div class="saving-throw-form">
    <text-field
+      ref="focusFirst"
      label="Name"
      :value="model.name"
      :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/SkillForm.vue
+++ b/app/imports/ui/properties/forms/SkillForm.vue
@@ -2,6 +2,7 @@
  <div class="skill-form">
    <div class="layout row wrap">
      <text-field
+        ref="focusFirst"
        label="Name"
        :value="model.name"
        :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/SpellForm.vue
+++ b/app/imports/ui/properties/forms/SpellForm.vue
@@ -1,6 +1,7 @@
 <template lang="html">
  <div class="attribute-form">
    <text-field
+      ref="focusFirst"
      label="Name"
      :value="model.name"
      :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/SpellListForm.vue
+++ b/app/imports/ui/properties/forms/SpellListForm.vue
@@ -2,6 +2,7 @@
  <div class="attribute-form">
    <div class="layout row wrap">
      <text-field
+        ref="focusFirst"
        label="Name"
        :value="model.name"
        :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/ToggleForm.vue
+++ b/app/imports/ui/properties/forms/ToggleForm.vue
@@ -1,6 +1,7 @@
 <template lang="html">
  <div class="feature-form">
    <text-field
+      ref="focusFirst"
      label="Name"
      :value="model.name"
      :error-messages="errors.name"
--- a/app/imports/ui/properties/forms/shared/propertyFormIndex.js
+++ b/app/imports/ui/properties/forms/shared/propertyFormIndex.js
@@ -8,7 +8,6 @@ import ContainerForm from '/imports/ui/properties/forms/ContainerForm.vue';
 import DamageForm from '/imports/ui/properties/forms/DamageForm.vue';
 import DamageMultiplierForm from '/imports/ui/properties/forms/DamageMultiplierForm.vue';
 import EffectForm from '/imports/ui/properties/forms/EffectForm.vue';
-import ExperienceForm from '/imports/ui/properties/forms/ExperienceForm.vue';
 import FeatureForm from '/imports/ui/properties/forms/FeatureForm.vue';
 import FolderForm from '/imports/ui/properties/forms/FolderForm.vue';
 import ItemForm from '/imports/ui/properties/forms/ItemForm.vue';
@@ -31,7 +30,6 @@ export default {
  classLevel: ClassLevelForm,
  damage: DamageForm,
  damageMultiplier: DamageMultiplierForm,
-  experience:ExperienceForm,
  effect: EffectForm,
  feature: FeatureForm,
  folder: FolderForm,
--- a/app/imports/ui/properties/forms/shared/propertyFormMixin.js
+++ b/app/imports/ui/properties/forms/shared/propertyFormMixin.js
@@ -9,6 +9,11 @@ export default {
      default: () => ({}),
    },
  },
+  mounted(){
+    if (this.$refs.focusFirst){
+      setTimeout(() => this.$refs.focusFirst.focus(), 300);
+    }
+  },
  methods: {
    change(path, value, ack){
      if (!Array.isArray(path)){
@@ -16,5 +21,5 @@ export default {
      }
      this.$emit('change', {path, value, ack});
    }
-  }
+  },
 }
--- a/app/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
+++ b/app/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
@@ -0,0 +1,21 @@
+<template lang="html">
+  <div class="layout row align-center justify-start">
+    <property-icon
+      class="mr-2"
+      :model="model"
+      :color="model.color"
+      :class="selected && 'primary--text'"
+    />
+    <div class="text-no-wrap text-truncate">
+      {{ title }} {{ model.level }}
+    </div>
+  </div>
+</template>
+
+<script>
+import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+
+export default {
+  mixins: [treeNodeViewMixin],
+}
+</script>
--- a/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
+++ b/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
@@ -3,10 +3,12 @@ import AdjustmentTreeNode from '/imports/ui/properties/treeNodeViews/AdjustmentT
 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';

 export default {
  default: DefaultTreeNode,
  adjustment: AdjustmentTreeNode,
+  classLevel: ClassLevelTreeNode,
  damage: DamageTreeNode,
  effect: EffectTreeNode,
  item: ItemTreeNode,
--- a/app/imports/ui/properties/viewers/ClassLevelViewer.vue
+++ b/app/imports/ui/properties/viewers/ClassLevelViewer.vue
@@ -1,23 +1,14 @@
 <template lang="html">
-	<div class="class-level-viewer">
-		<div>
-			<span class="name headline">
-				{{model.name}}
-			</span>
-			<span
-				class="display-2"
-				v-if="model.level"
-			>
-				{{model.level}}
-			</span>
-		</div>
-		<p class="my-2">
-			<code>{{model.variableName}}</code>
-		</p>
-		<p class="my-2" v-if="model.baseClass">
-			Base class: <code>{{model.baseClass}}</code>
-		</p>
-	</div>
+  <div class="class-level-viewer">
+    <div>
+      <span class="name headline">
+        {{ model.name }} {{ model.level }}
+      </span>
+    </div>
+    <p class="my-2">
+      <code>{{ model.variableName }}</code>
+    </p>
+  </div>
 </template>

 <script>
--- a/app/imports/ui/properties/viewers/ExperienceViewer.vue
+++ b/app/imports/ui/properties/viewers/ExperienceViewer.vue
@@ -1,34 +0,0 @@
-<template lang="html">
-  <div class="experience-viewer">
-    <div
-      v-if="model.value"
-      class="display-1"
-    >
-      {{ model.value }} XP
-    </div>
-    <div class="headline layout row mb-3">
-      <property-name :value="model.name" />
-      <v-spacer />
-      <div>
-        {{ model.worldDate }}
-      </div>
-    </div>
-    <p>
-      {{ model.date }}
-    </p>
-    <property-description
-      v-if="model.description"
-      :value="model.description"
-    />
-  </div>
-</template>
-
-<script>
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-export default {
-	mixins: [propertyViewerMixin],
-}
-</script>
-
-<style lang="css" scoped>
-</style>
--- a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
+++ b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
@@ -8,7 +8,6 @@ import ClassLevelViewer from '/imports/ui/properties/viewers/ClassLevelViewer.vu
 import DamageViewer from '/imports/ui/properties/viewers/DamageViewer.vue';
 import DamageMultiplierViewer from '/imports/ui/properties/viewers/DamageMultiplierViewer.vue';
 import EffectViewer from '/imports/ui/properties/viewers/EffectViewer.vue';
-import ExperienceViewer from '/imports/ui/properties/viewers/ExperienceViewer.vue';
 import FeatureViewer from '/imports/ui/properties/viewers/FeatureViewer.vue';
 import FolderViewer from '/imports/ui/properties/viewers/FolderViewer.vue';
 import ItemViewer from '/imports/ui/properties/viewers/ItemViewer.vue';
@@ -29,7 +28,6 @@ export default {
  classLevel: ClassLevelViewer,
  damage: DamageViewer,
  damageMultiplier: DamageMultiplierViewer,
-  experience: ExperienceViewer,
  effect: EffectViewer,
  feature: FeatureViewer,
  folder: FolderViewer,
--- a/app/imports/ui/vueSetup.js
+++ b/app/imports/ui/vueSetup.js
@@ -22,7 +22,6 @@ for (const name in SVG_ICONS) {
    }
  }
 }
-console.log(icons);

 Vue.use(VueMeteorTracker);
 Vue.config.meteor.freeze = true
--- a/app/server/main.js
+++ b/app/server/main.js
@@ -1,4 +1,4 @@
 import '/imports/server/publications/index.js';
-import '/imports/api/parenting/deleteRemovedDocuments.js';
 import '/imports/server/config/simpleSchemaDebug.js';
+import '/imports/server/cron/deleteSoftRemovedDocuments.js';
 import '/imports/api/parenting/organizeMethods.js';
Author	SHA1	Message	Date
Stefan Zermatten	b4da32f9ab	Fixed soft removed documents never getting permanently removed	2020-06-05 23:08:31 +02:00
Stefan Zermatten	986fe8fd93	Added an autofocus field to most forms	2020-06-05 22:39:21 +02:00
Stefan Zermatten	dd4596851e	Improved class level viewer and tree node view	2020-06-05 22:25:22 +02:00
Stefan Zermatten	bc3fc9574a	Added loading and empty state to experience list	2020-06-05 22:20:40 +02:00
Stefan Zermatten	db1ae5db3d	Iterated on XP system	2020-06-05 21:48:28 +02:00
Stefan Zermatten	d1e7eb2fa0	Added basic XP system	2020-06-05 16:14:26 +02:00
Stefan Zermatten	efb8b87a2d	Alphabetized properties by displayed name	2020-05-31 22:39:15 +02:00
Stefan Zermatten	b04b915c7b	Removed stray logging	2020-05-31 22:36:27 +02:00