diff --git a/app/imports/api/creature/creatureCollections.js b/app/imports/api/creature/creatureCollections.js index 783433a6..473fc66c 100644 --- a/app/imports/api/creature/creatureCollections.js +++ b/app/imports/api/creature/creatureCollections.js @@ -14,8 +14,8 @@ import Rolls from '/imports/api/creature/properties/Rolls.js'; import Skills from '/imports/api/creature/properties/Skills.js'; import SpellLists from '/imports/api/creature/properties/SpellLists.js'; import Spells from '/imports/api/creature/properties/Spells.js'; -import Containers from '/imports/api/inventory/Containers.js'; -import Items from '/imports/api/inventory/Items.js'; +import Containers from '/imports/api/creature/properties/inventory/Containers.js'; +import Items from '/imports/api/creature/properties/inventory/Items.js'; // All theses collections have the field {charId: String} // Collate them here in case we need to do something on all the collections of diff --git a/app/imports/api/creature/insertCreature.js b/app/imports/api/creature/insertCreature.js index 1313de67..6eeb0df3 100644 --- a/app/imports/api/creature/insertCreature.js +++ b/app/imports/api/creature/insertCreature.js @@ -3,8 +3,8 @@ import Attributes from '/imports/api/creature/properties/Attributes.js'; import Skills from '/imports/api/creature/properties/Skills.js'; import DamageMultipliers from '/imports/api/creature/properties/DamageMultipliers.js'; import Effects from '/imports/api/creature/properties/Effects.js'; -import Containers from '/imports/api/inventory/Containers.js'; -import Items from '/imports/api/inventory/Items.js'; +import Containers from '/imports/api/creature/properties/inventory/Containers.js'; +import Items from '/imports/api/creature/properties/inventory/Items.js'; import Classes from '/imports/api/creature/properties/Classes.js'; const addDefaultDocs = function(docs){ diff --git a/app/imports/api/mixins/creaturePermissionMixin.js b/app/imports/api/creature/mixins/creaturePermissionMixin.js similarity index 100% rename from app/imports/api/mixins/creaturePermissionMixin.js rename to app/imports/api/creature/mixins/creaturePermissionMixin.js diff --git a/app/imports/api/mixins/propagateInheritanceUpdateMixin.js b/app/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js similarity index 93% rename from app/imports/api/mixins/propagateInheritanceUpdateMixin.js rename to app/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js index fb0ef8c4..89001640 100644 --- a/app/imports/api/mixins/propagateInheritanceUpdateMixin.js +++ b/app/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js @@ -1,8 +1,8 @@ import { updateChildren, updateDecendents, -} from '/imports/api/parenting/parenting.js'; -import { inheritedFields } from '/imports/api/parenting/ChildSchema.js'; +} from '/imports/api/creature/parenting/parenting.js'; +import { inheritedFields } from '/imports/api/creature/parenting/ChildSchema.js'; import MONGO_OPERATORS from '/imports/constants/MONGO_OPERATORS.js'; // This mixin can be safely applied to all update methods which are validated diff --git a/app/imports/api/mixins/recomputeCreatureMixin.js b/app/imports/api/creature/mixins/recomputeCreatureMixin.js similarity index 100% rename from app/imports/api/mixins/recomputeCreatureMixin.js rename to app/imports/api/creature/mixins/recomputeCreatureMixin.js diff --git a/app/imports/api/mixins/setDocToLastMixin.js b/app/imports/api/creature/mixins/setDocToLastMixin.js similarity index 92% rename from app/imports/api/mixins/setDocToLastMixin.js rename to app/imports/api/creature/mixins/setDocToLastMixin.js index db056d9b..944cfa69 100644 --- a/app/imports/api/mixins/setDocToLastMixin.js +++ b/app/imports/api/creature/mixins/setDocToLastMixin.js @@ -1,5 +1,5 @@ import SimpleSchema from 'simpl-schema'; -import { setDocToLastOrder } from '/imports/api/order/order.js'; +import { setDocToLastOrder } from '/imports/api/creature/order/order.js'; export function setDocToLastMixin(methodOptions){ // Make sure the doc has a charId diff --git a/app/imports/api/mixins/simpleSchemaMixin.js b/app/imports/api/creature/mixins/simpleSchemaMixin.js similarity index 100% rename from app/imports/api/mixins/simpleSchemaMixin.js rename to app/imports/api/creature/mixins/simpleSchemaMixin.js diff --git a/app/imports/api/mixins/updateSchemaMixin.js b/app/imports/api/creature/mixins/updateSchemaMixin.js similarity index 100% rename from app/imports/api/mixins/updateSchemaMixin.js rename to app/imports/api/creature/mixins/updateSchemaMixin.js diff --git a/app/imports/api/order/order.js b/app/imports/api/creature/order/order.js similarity index 100% rename from app/imports/api/order/order.js rename to app/imports/api/creature/order/order.js diff --git a/app/imports/api/parenting/ChildSchema.js b/app/imports/api/creature/parenting/ChildSchema.js similarity index 100% rename from app/imports/api/parenting/ChildSchema.js rename to app/imports/api/creature/parenting/ChildSchema.js diff --git a/app/imports/api/parenting/SoftRemovableSchema.js b/app/imports/api/creature/parenting/SoftRemovableSchema.js similarity index 100% rename from app/imports/api/parenting/SoftRemovableSchema.js rename to app/imports/api/creature/parenting/SoftRemovableSchema.js diff --git a/app/imports/api/parenting/deleteRemovedDocuments.js b/app/imports/api/creature/parenting/deleteRemovedDocuments.js similarity index 100% rename from app/imports/api/parenting/deleteRemovedDocuments.js rename to app/imports/api/creature/parenting/deleteRemovedDocuments.js diff --git a/app/imports/api/parenting/fetchDocByRef.js b/app/imports/api/creature/parenting/fetchDocByRef.js similarity index 79% rename from app/imports/api/parenting/fetchDocByRef.js rename to app/imports/api/creature/parenting/fetchDocByRef.js index dfa485dc..a0df45b4 100644 --- a/app/imports/api/parenting/fetchDocByRef.js +++ b/app/imports/api/creature/parenting/fetchDocByRef.js @@ -1,4 +1,4 @@ -import getCollectionByName from '/imports/api/parenting/getCollectionByName.js'; +import getCollectionByName from '/imports/api/creature/parenting/getCollectionByName.js'; const docNotFoundError = function({id, collection}){ throw new Meteor.Error('document-not-found', diff --git a/app/imports/api/parenting/getCollectionByName.js b/app/imports/api/creature/parenting/getCollectionByName.js similarity index 100% rename from app/imports/api/parenting/getCollectionByName.js rename to app/imports/api/creature/parenting/getCollectionByName.js diff --git a/app/imports/api/parenting/parenting.js b/app/imports/api/creature/parenting/parenting.js similarity index 97% rename from app/imports/api/parenting/parenting.js rename to app/imports/api/creature/parenting/parenting.js index 04fd6a4e..ac9db565 100644 --- a/app/imports/api/parenting/parenting.js +++ b/app/imports/api/creature/parenting/parenting.js @@ -1,5 +1,5 @@ -import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js'; -import getCollectionByName from '/imports/api/parenting/getCollectionByName.js'; +import fetchDocByRef from '/imports/api/creature/parenting/fetchDocByRef.js'; +import getCollectionByName from '/imports/api/creature/parenting/getCollectionByName.js'; import SimpleSchema from 'simpl-schema'; // n = collections.length diff --git a/app/imports/api/parenting/softRemove.js b/app/imports/api/creature/parenting/softRemove.js similarity index 88% rename from app/imports/api/parenting/softRemove.js rename to app/imports/api/creature/parenting/softRemove.js index 71eb3b18..33e63f47 100644 --- a/app/imports/api/parenting/softRemove.js +++ b/app/imports/api/creature/parenting/softRemove.js @@ -1,5 +1,5 @@ -import getCollectionByName from '/imports/api/parenting/getCollectionByName.js'; -import updateDecendents from '/imports/api/parenting/parenting.js'; +import getCollectionByName from '/imports/api/creature/parenting/getCollectionByName.js'; +import updateDecendents from '/imports/api/creature/parenting/parenting.js'; // 1 + n database hits export function softRemove({_id, collection}){ diff --git a/app/imports/api/creature/properties/Actions.js b/app/imports/api/creature/properties/Actions.js index 409c9459..d62b59c9 100644 --- a/app/imports/api/creature/properties/Actions.js +++ b/app/imports/api/creature/properties/Actions.js @@ -6,12 +6,12 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.js' import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js'; // Mixins -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let Actions = new Mongo.Collection('actions'); diff --git a/app/imports/api/creature/properties/Attributes.js b/app/imports/api/creature/properties/Attributes.js index 75619fe4..aaec6397 100644 --- a/app/imports/api/creature/properties/Attributes.js +++ b/app/imports/api/creature/properties/Attributes.js @@ -6,16 +6,16 @@ import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js'; import getModifierFields from '/imports/api/getModifierFields.js'; // Mixins -import recomputeCreatureMixin from '/imports/api/mixins/recomputeCreatureMixin.js'; -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; +import recomputeCreatureMixin from '/imports/api/creature/mixins/recomputeCreatureMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin -} from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; +} from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; let Attributes = new Mongo.Collection('attributes'); diff --git a/app/imports/api/creature/properties/Buffs.js b/app/imports/api/creature/properties/Buffs.js index 29359715..bee26fae 100644 --- a/app/imports/api/creature/properties/Buffs.js +++ b/app/imports/api/creature/properties/Buffs.js @@ -4,12 +4,12 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.js' import { EffectSchema } from '/imports/api/creature/properties/Effects.js'; // Mixins -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let Buffs = new Mongo.Collection('buffs'); diff --git a/app/imports/api/creature/properties/ClassLevels.js b/app/imports/api/creature/properties/ClassLevels.js index b9aa42d2..34265a21 100644 --- a/app/imports/api/creature/properties/ClassLevels.js +++ b/app/imports/api/creature/properties/ClassLevels.js @@ -4,12 +4,12 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.js' import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js'; // Mixins -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let ClassLevels = new Mongo.Collection("classLevels"); diff --git a/app/imports/api/creature/properties/Classes.js b/app/imports/api/creature/properties/Classes.js index 7f12f41a..98eae814 100644 --- a/app/imports/api/creature/properties/Classes.js +++ b/app/imports/api/creature/properties/Classes.js @@ -5,12 +5,12 @@ import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js"; import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js'; // Mixins -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let Classes = new Mongo.Collection("classes"); diff --git a/app/imports/api/creature/properties/DamageMultipliers.js b/app/imports/api/creature/properties/DamageMultipliers.js index 24badb1a..24f5283e 100644 --- a/app/imports/api/creature/properties/DamageMultipliers.js +++ b/app/imports/api/creature/properties/DamageMultipliers.js @@ -4,13 +4,13 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.js' import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js'; // Mixins -import recomputeCreatureMixin from '/imports/api/mixins/recomputeCreatureMixin.js'; -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import recomputeCreatureMixin from '/imports/api/creature/mixins/recomputeCreatureMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let DamageMultipliers = new Mongo.Collection("damageMultipliers"); diff --git a/app/imports/api/creature/properties/Effects.js b/app/imports/api/creature/properties/Effects.js index 81118182..c166b674 100644 --- a/app/imports/api/creature/properties/Effects.js +++ b/app/imports/api/creature/properties/Effects.js @@ -3,13 +3,13 @@ import schema from '/imports/api/schema.js'; import { PropertySchema } from '/imports/api/creature/properties/Properties.js' // Mixins -import recomputeCreatureMixin from '/imports/api/mixins/recomputeCreatureMixin.js'; -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import recomputeCreatureMixin from '/imports/api/creature/mixins/recomputeCreatureMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let Effects = new Mongo.Collection('effects'); diff --git a/app/imports/api/creature/properties/Experiences.js b/app/imports/api/creature/properties/Experiences.js index 9c9937b5..57748eef 100644 --- a/app/imports/api/creature/properties/Experiences.js +++ b/app/imports/api/creature/properties/Experiences.js @@ -4,13 +4,13 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.js' import recomputeCreatureXP from '/imports/api/creature/creatureComputation.js'; // Mixins -import recomputeCreatureMixin from '/imports/api/mixins/recomputeCreatureMixin.js'; -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import recomputeCreatureMixin from '/imports/api/creature/mixins/recomputeCreatureMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let Experiences = new Mongo.Collection("experience"); diff --git a/app/imports/api/creature/properties/Features.js b/app/imports/api/creature/properties/Features.js index 2c2ffa2e..3e807d33 100644 --- a/app/imports/api/creature/properties/Features.js +++ b/app/imports/api/creature/properties/Features.js @@ -4,12 +4,12 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.js' import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js'; // Mixins -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let Features = new Mongo.Collection('features'); diff --git a/app/imports/api/creature/properties/Folders.js b/app/imports/api/creature/properties/Folders.js index 3fb32e40..5eace789 100644 --- a/app/imports/api/creature/properties/Folders.js +++ b/app/imports/api/creature/properties/Folders.js @@ -3,12 +3,12 @@ import schema from '/imports/api/schema.js'; import { PropertySchema } from '/imports/api/creature/properties/Properties.js' // Mixins -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let Folders = new Mongo.Collection('folders'); diff --git a/app/imports/api/creature/properties/Notes.js b/app/imports/api/creature/properties/Notes.js index f2070aa2..56e557a7 100644 --- a/app/imports/api/creature/properties/Notes.js +++ b/app/imports/api/creature/properties/Notes.js @@ -4,12 +4,12 @@ import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js"; import { PropertySchema } from '/imports/api/creature/properties/Properties.js' // Mixins -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let Notes = new Mongo.Collection("notes"); diff --git a/app/imports/api/creature/properties/Proficiencies.js b/app/imports/api/creature/properties/Proficiencies.js index a50d3a42..25c5bff2 100644 --- a/app/imports/api/creature/properties/Proficiencies.js +++ b/app/imports/api/creature/properties/Proficiencies.js @@ -3,13 +3,13 @@ import schema from '/imports/api/schema.js'; import { PropertySchema } from '/imports/api/creature/properties/Properties.js' // Mixins -import recomputeCreatureMixin from '/imports/api/mixins/recomputeCreatureMixin.js'; -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import recomputeCreatureMixin from '/imports/api/creature/mixins/recomputeCreatureMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let Proficiencies = new Mongo.Collection("proficiencies"); diff --git a/app/imports/api/creature/properties/Properties.js b/app/imports/api/creature/properties/Properties.js index f10afc30..44b8f3a9 100644 --- a/app/imports/api/creature/properties/Properties.js +++ b/app/imports/api/creature/properties/Properties.js @@ -1,13 +1,13 @@ import SimpleSchema from 'simpl-schema'; -import SoftRemovableSchema from '/imports/api/parenting/SoftRemovableSchema.js'; -import ChildSchema from '/imports/api/parenting/ChildSchema.js'; -import softRemove from '/imports/api/parenting/softRemove.js'; -import getCollectionByName from '/imports/api/parenting/getCollectionByName.js'; +import SoftRemovableSchema from '/imports/api/creature/parenting/SoftRemovableSchema.js'; +import ChildSchema from '/imports/api/creature/parenting/ChildSchema.js'; +import softRemove from '/imports/api/creature/parenting/softRemove.js'; +import getCollectionByName from '/imports/api/creature/parenting/getCollectionByName.js'; // Mixins -import recomputeCreatureMixin from '/imports/api/mixins/recomputeCreatureMixin.js'; -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; +import recomputeCreatureMixin from '/imports/api/creature/mixins/recomputeCreatureMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; const PropertySchema = new SimpleSchema({ charId: { diff --git a/app/imports/api/creature/properties/Rolls.js b/app/imports/api/creature/properties/Rolls.js index 2d498300..b46d2fcd 100644 --- a/app/imports/api/creature/properties/Rolls.js +++ b/app/imports/api/creature/properties/Rolls.js @@ -4,12 +4,12 @@ import AdjustmentSchema from '/imports/api/creature/subSchemas/AdjustmentSchema. import StoredBuffSchema from '/imports/api/creature/properties/Buffs.js'; // Mixins -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let Rolls = new Mongo.Collection('rolls'); diff --git a/app/imports/api/creature/properties/Skills.js b/app/imports/api/creature/properties/Skills.js index 7a1404af..0cdf1332 100644 --- a/app/imports/api/creature/properties/Skills.js +++ b/app/imports/api/creature/properties/Skills.js @@ -4,13 +4,13 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.js' import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js'; // Mixins -import recomputeCreatureMixin from '/imports/api/mixins/recomputeCreatureMixin.js'; -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import recomputeCreatureMixin from '/imports/api/creature/mixins/recomputeCreatureMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let Skills = new Mongo.Collection("skills"); diff --git a/app/imports/api/creature/properties/SpellLists.js b/app/imports/api/creature/properties/SpellLists.js index b5f8a5d9..d99d587e 100644 --- a/app/imports/api/creature/properties/SpellLists.js +++ b/app/imports/api/creature/properties/SpellLists.js @@ -4,12 +4,12 @@ import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js"; import { PropertySchema } from '/imports/api/creature/properties/Properties.js' // Mixins -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; let SpellLists = new Mongo.Collection("spellLists"); diff --git a/app/imports/api/creature/properties/Spells.js b/app/imports/api/creature/properties/Spells.js index 8290fc0d..e49befc4 100644 --- a/app/imports/api/creature/properties/Spells.js +++ b/app/imports/api/creature/properties/Spells.js @@ -4,12 +4,12 @@ import schema from '/imports/api/schema.js'; import { PropertySchema } from '/imports/api/creature/properties/Properties.js' // Mixins -import creaturePermissionMixin from '/imports/api/mixins/creaturePermissionMixin.js'; -import { setDocToLastMixin } from '/imports/api/mixins/setDocToLastMixin.js'; -import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js'; -import simpleSchemaMixin from '/imports/api/mixins/simpleSchemaMixin.js'; -import propagateInheritanceUpdateMixin from '/imports/api/mixins/propagateInheritanceUpdateMixin.js'; -import updateSchemaMixin from '/imports/api/mixins/updateSchemaMixin.js'; +import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js'; +import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js'; +import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/creature/parenting/parenting.js'; +import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; +import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js'; +import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js'; const magicSchools = [ 'Abjuration', diff --git a/app/imports/api/inventory/Containers.js b/app/imports/api/creature/properties/inventory/Containers.js similarity index 92% rename from app/imports/api/inventory/Containers.js rename to app/imports/api/creature/properties/inventory/Containers.js index efd13b41..de98e06c 100644 --- a/app/imports/api/inventory/Containers.js +++ b/app/imports/api/creature/properties/inventory/Containers.js @@ -2,7 +2,7 @@ import SimpleSchema from 'simpl-schema'; import schema from '/imports/api/schema.js'; import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js"; import { PropertySchema } from '/imports/api/creature/properties/Properties.js' -import ChildSchema from '/imports/api/parenting/ChildSchema.js'; +import ChildSchema from '/imports/api/creature/parenting/ChildSchema.js'; //set up the collection for containers let Containers = new Mongo.Collection("containers"); diff --git a/app/imports/api/inventory/Items.js b/app/imports/api/creature/properties/inventory/Items.js similarity index 94% rename from app/imports/api/inventory/Items.js rename to app/imports/api/creature/properties/inventory/Items.js index a87291f1..4cd0de05 100644 --- a/app/imports/api/inventory/Items.js +++ b/app/imports/api/creature/properties/inventory/Items.js @@ -2,7 +2,7 @@ import SimpleSchema from 'simpl-schema'; import schema from '/imports/api/schema.js'; import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js"; import { PropertySchema } from '/imports/api/creature/properties/Properties.js' -import ChildSchema from '/imports/api/parenting/ChildSchema.js'; +import ChildSchema from '/imports/api/creature/parenting/ChildSchema.js'; Items = new Mongo.Collection("items"); diff --git a/app/imports/api/library/LibraryNodes.js b/app/imports/api/library/LibraryNodes.js index c379a6ce..bfc26fd0 100644 --- a/app/imports/api/library/LibraryNodes.js +++ b/app/imports/api/library/LibraryNodes.js @@ -1,5 +1,5 @@ import schema from '/imports/api/schema.js'; -import ChildSchema from '/imports/api/parenting/ChildSchema.js'; +import ChildSchema from '/imports/api/creature/parenting/ChildSchema.js'; import librarySchemas from '/imports/api/library/librarySchemas.js'; let LibraryNodes = new Mongo.Collection('libraryNodes'); diff --git a/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue b/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue index 2215dd89..ce88f1e5 100644 --- a/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue +++ b/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue @@ -14,7 +14,7 @@ adjustAttribute } from '/imports/api/creature/properties/Attributes.js'; import Effects from '/imports/api/creature/properties/Effects.js'; - import { setName } from '/imports/api/parenting/parenting.js'; + import { setName } from '/imports/api/creature/parenting/parenting.js'; export default { components: { diff --git a/app/server/main.js b/app/server/main.js index 89d78f45..8e5a6dda 100644 --- a/app/server/main.js +++ b/app/server/main.js @@ -1,5 +1,5 @@ import "/imports/server/publications/index.js"; import "/imports/api/creature/creatureComputation.js"; -import "/imports/api/parenting/deleteRemovedDocuments.js"; +import "/imports/api/creature/parenting/deleteRemovedDocuments.js"; import "/imports/server/config/accountsMeldConfig.js"; import "/imports/server/config/simpleSchemaDebug.js";