From 438f128641ee2b3306029639f9924757775a9e62 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 30 Jul 2019 13:07:31 +0200 Subject: [PATCH] Moved parenting folder from /api/creatures/ to /api/ --- .../creature/mixins/propagateInheritanceUpdateMixin.js | 4 ++-- app/imports/api/creature/mixins/setDocToLastMixin.js | 2 +- app/imports/api/creature/properties/Actions.js | 2 +- app/imports/api/creature/properties/Attributes.js | 2 +- app/imports/api/creature/properties/Buffs.js | 2 +- app/imports/api/creature/properties/ClassLevels.js | 2 +- app/imports/api/creature/properties/Classes.js | 2 +- app/imports/api/creature/properties/DamageMultipliers.js | 2 +- app/imports/api/creature/properties/Effects.js | 2 +- app/imports/api/creature/properties/Experiences.js | 2 +- app/imports/api/creature/properties/Features.js | 2 +- app/imports/api/creature/properties/Folders.js | 2 +- app/imports/api/creature/properties/Notes.js | 2 +- app/imports/api/creature/properties/Proficiencies.js | 2 +- app/imports/api/creature/properties/Properties.js | 8 ++++---- app/imports/api/creature/properties/Rolls.js | 2 +- app/imports/api/creature/properties/Skills.js | 2 +- app/imports/api/creature/properties/SpellLists.js | 2 +- app/imports/api/creature/properties/Spells.js | 2 +- .../api/creature/properties/inventory/Containers.js | 2 +- app/imports/api/creature/properties/inventory/Items.js | 2 +- app/imports/api/library/LibraryNodes.js | 2 +- app/imports/api/{creature => }/parenting/ChildSchema.js | 0 .../api/{creature => }/parenting/SoftRemovableSchema.js | 0 .../{creature => }/parenting/deleteRemovedDocuments.js | 0 app/imports/api/{creature => }/parenting/fetchDocByRef.js | 2 +- .../api/{creature => }/parenting/getCollectionByName.js | 0 app/imports/api/{order => parenting}/order.js | 0 app/imports/api/{creature => }/parenting/parenting.js | 4 ++-- app/imports/api/{creature => }/parenting/softRemove.js | 4 ++-- .../properties/attributes/AttributeDialogContainer.vue | 2 +- app/imports/ui/library/LibraryContentsContainer.vue | 1 - app/imports/ui/pages/Library.vue | 2 +- app/server/main.js | 2 +- 34 files changed, 34 insertions(+), 35 deletions(-) rename app/imports/api/{creature => }/parenting/ChildSchema.js (100%) rename app/imports/api/{creature => }/parenting/SoftRemovableSchema.js (100%) rename app/imports/api/{creature => }/parenting/deleteRemovedDocuments.js (100%) rename app/imports/api/{creature => }/parenting/fetchDocByRef.js (79%) rename app/imports/api/{creature => }/parenting/getCollectionByName.js (100%) rename app/imports/api/{order => parenting}/order.js (100%) rename app/imports/api/{creature => }/parenting/parenting.js (97%) rename app/imports/api/{creature => }/parenting/softRemove.js (88%) diff --git a/app/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js b/app/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js index 89001640..fb0ef8c4 100644 --- a/app/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js +++ b/app/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js @@ -1,8 +1,8 @@ import { updateChildren, updateDecendents, -} from '/imports/api/creature/parenting/parenting.js'; -import { inheritedFields } from '/imports/api/creature/parenting/ChildSchema.js'; +} from '/imports/api/parenting/parenting.js'; +import { inheritedFields } from '/imports/api/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/creature/mixins/setDocToLastMixin.js b/app/imports/api/creature/mixins/setDocToLastMixin.js index db056d9b..53a4a0f9 100644 --- a/app/imports/api/creature/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/parenting/order.js'; export function setDocToLastMixin(methodOptions){ // Make sure the doc has a charId diff --git a/app/imports/api/creature/properties/Actions.js b/app/imports/api/creature/properties/Actions.js index 292f5637..b07cb3d3 100644 --- a/app/imports/api/creature/properties/Actions.js +++ b/app/imports/api/creature/properties/Actions.js @@ -8,7 +8,7 @@ import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js'; // Mixins 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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Attributes.js b/app/imports/api/creature/properties/Attributes.js index 3821a5b1..f2b0b350 100644 --- a/app/imports/api/creature/properties/Attributes.js +++ b/app/imports/api/creature/properties/Attributes.js @@ -12,7 +12,7 @@ import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixi import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin -} from '/imports/api/creature/parenting/parenting.js'; +} from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Buffs.js b/app/imports/api/creature/properties/Buffs.js index 8b0d5907..68785485 100644 --- a/app/imports/api/creature/properties/Buffs.js +++ b/app/imports/api/creature/properties/Buffs.js @@ -6,7 +6,7 @@ import { EffectSchema } from '/imports/api/creature/properties/Effects.js'; // Mixins 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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/ClassLevels.js b/app/imports/api/creature/properties/ClassLevels.js index 3b622a32..c224edd3 100644 --- a/app/imports/api/creature/properties/ClassLevels.js +++ b/app/imports/api/creature/properties/ClassLevels.js @@ -6,7 +6,7 @@ import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js'; // Mixins 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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Classes.js b/app/imports/api/creature/properties/Classes.js index 98eae814..1eb6a7f8 100644 --- a/app/imports/api/creature/properties/Classes.js +++ b/app/imports/api/creature/properties/Classes.js @@ -7,7 +7,7 @@ import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js'; // Mixins 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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/DamageMultipliers.js b/app/imports/api/creature/properties/DamageMultipliers.js index 75da5661..c652a0af 100644 --- a/app/imports/api/creature/properties/DamageMultipliers.js +++ b/app/imports/api/creature/properties/DamageMultipliers.js @@ -7,7 +7,7 @@ import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Effects.js b/app/imports/api/creature/properties/Effects.js index 0e5691eb..b568e096 100644 --- a/app/imports/api/creature/properties/Effects.js +++ b/app/imports/api/creature/properties/Effects.js @@ -6,7 +6,7 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Experiences.js b/app/imports/api/creature/properties/Experiences.js index 42698978..502f7d81 100644 --- a/app/imports/api/creature/properties/Experiences.js +++ b/app/imports/api/creature/properties/Experiences.js @@ -7,7 +7,7 @@ import recomputeCreatureXP from '/imports/api/creature/creatureComputation.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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Features.js b/app/imports/api/creature/properties/Features.js index 3e807d33..a035d664 100644 --- a/app/imports/api/creature/properties/Features.js +++ b/app/imports/api/creature/properties/Features.js @@ -6,7 +6,7 @@ import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js'; // Mixins 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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Folders.js b/app/imports/api/creature/properties/Folders.js index c5b61cca..94413cd0 100644 --- a/app/imports/api/creature/properties/Folders.js +++ b/app/imports/api/creature/properties/Folders.js @@ -5,7 +5,7 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.js' // Mixins 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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Notes.js b/app/imports/api/creature/properties/Notes.js index 56e557a7..a2609727 100644 --- a/app/imports/api/creature/properties/Notes.js +++ b/app/imports/api/creature/properties/Notes.js @@ -6,7 +6,7 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.js' // Mixins 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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Proficiencies.js b/app/imports/api/creature/properties/Proficiencies.js index 9bcd7939..f61ddfd2 100644 --- a/app/imports/api/creature/properties/Proficiencies.js +++ b/app/imports/api/creature/properties/Proficiencies.js @@ -6,7 +6,7 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Properties.js b/app/imports/api/creature/properties/Properties.js index 44b8f3a9..4af269ed 100644 --- a/app/imports/api/creature/properties/Properties.js +++ b/app/imports/api/creature/properties/Properties.js @@ -1,8 +1,8 @@ import SimpleSchema from 'simpl-schema'; -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'; +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'; // Mixins import recomputeCreatureMixin from '/imports/api/creature/mixins/recomputeCreatureMixin.js'; diff --git a/app/imports/api/creature/properties/Rolls.js b/app/imports/api/creature/properties/Rolls.js index 6934ac70..9682df4c 100644 --- a/app/imports/api/creature/properties/Rolls.js +++ b/app/imports/api/creature/properties/Rolls.js @@ -6,7 +6,7 @@ import StoredBuffSchema from '/imports/api/creature/properties/Buffs.js'; // Mixins 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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Skills.js b/app/imports/api/creature/properties/Skills.js index 1b5e57eb..e0df4832 100644 --- a/app/imports/api/creature/properties/Skills.js +++ b/app/imports/api/creature/properties/Skills.js @@ -7,7 +7,7 @@ import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/SpellLists.js b/app/imports/api/creature/properties/SpellLists.js index 9089ddc1..d6007069 100644 --- a/app/imports/api/creature/properties/SpellLists.js +++ b/app/imports/api/creature/properties/SpellLists.js @@ -6,7 +6,7 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.js' // Mixins 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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/Spells.js b/app/imports/api/creature/properties/Spells.js index 298723e4..740b291f 100644 --- a/app/imports/api/creature/properties/Spells.js +++ b/app/imports/api/creature/properties/Spells.js @@ -6,7 +6,7 @@ import { PropertySchema } from '/imports/api/creature/properties/Properties.js' // Mixins 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 { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/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'; diff --git a/app/imports/api/creature/properties/inventory/Containers.js b/app/imports/api/creature/properties/inventory/Containers.js index 1d55d346..3e3eba44 100644 --- a/app/imports/api/creature/properties/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/creature/parenting/ChildSchema.js'; +import ChildSchema from '/imports/api/parenting/ChildSchema.js'; //set up the collection for containers let Containers = new Mongo.Collection("containers"); diff --git a/app/imports/api/creature/properties/inventory/Items.js b/app/imports/api/creature/properties/inventory/Items.js index 4cd0de05..a87291f1 100644 --- a/app/imports/api/creature/properties/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/creature/parenting/ChildSchema.js'; +import ChildSchema from '/imports/api/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 3ad52403..ee241085 100644 --- a/app/imports/api/library/LibraryNodes.js +++ b/app/imports/api/library/LibraryNodes.js @@ -1,6 +1,6 @@ import SimpleSchema from 'simpl-schema'; import schema from '/imports/api/schema.js'; -import ChildSchema from '/imports/api/creature/parenting/ChildSchema.js'; +import ChildSchema from '/imports/api/parenting/ChildSchema.js'; import librarySchemas from '/imports/api/library/librarySchemas.js'; import Libraries from '/imports/api/library/Libraries.js'; import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js'; diff --git a/app/imports/api/creature/parenting/ChildSchema.js b/app/imports/api/parenting/ChildSchema.js similarity index 100% rename from app/imports/api/creature/parenting/ChildSchema.js rename to app/imports/api/parenting/ChildSchema.js diff --git a/app/imports/api/creature/parenting/SoftRemovableSchema.js b/app/imports/api/parenting/SoftRemovableSchema.js similarity index 100% rename from app/imports/api/creature/parenting/SoftRemovableSchema.js rename to app/imports/api/parenting/SoftRemovableSchema.js diff --git a/app/imports/api/creature/parenting/deleteRemovedDocuments.js b/app/imports/api/parenting/deleteRemovedDocuments.js similarity index 100% rename from app/imports/api/creature/parenting/deleteRemovedDocuments.js rename to app/imports/api/parenting/deleteRemovedDocuments.js diff --git a/app/imports/api/creature/parenting/fetchDocByRef.js b/app/imports/api/parenting/fetchDocByRef.js similarity index 79% rename from app/imports/api/creature/parenting/fetchDocByRef.js rename to app/imports/api/parenting/fetchDocByRef.js index a0df45b4..dfa485dc 100644 --- a/app/imports/api/creature/parenting/fetchDocByRef.js +++ b/app/imports/api/parenting/fetchDocByRef.js @@ -1,4 +1,4 @@ -import getCollectionByName from '/imports/api/creature/parenting/getCollectionByName.js'; +import getCollectionByName from '/imports/api/parenting/getCollectionByName.js'; const docNotFoundError = function({id, collection}){ throw new Meteor.Error('document-not-found', diff --git a/app/imports/api/creature/parenting/getCollectionByName.js b/app/imports/api/parenting/getCollectionByName.js similarity index 100% rename from app/imports/api/creature/parenting/getCollectionByName.js rename to app/imports/api/parenting/getCollectionByName.js diff --git a/app/imports/api/order/order.js b/app/imports/api/parenting/order.js similarity index 100% rename from app/imports/api/order/order.js rename to app/imports/api/parenting/order.js diff --git a/app/imports/api/creature/parenting/parenting.js b/app/imports/api/parenting/parenting.js similarity index 97% rename from app/imports/api/creature/parenting/parenting.js rename to app/imports/api/parenting/parenting.js index ac9db565..04fd6a4e 100644 --- a/app/imports/api/creature/parenting/parenting.js +++ b/app/imports/api/parenting/parenting.js @@ -1,5 +1,5 @@ -import fetchDocByRef from '/imports/api/creature/parenting/fetchDocByRef.js'; -import getCollectionByName from '/imports/api/creature/parenting/getCollectionByName.js'; +import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js'; +import getCollectionByName from '/imports/api/parenting/getCollectionByName.js'; import SimpleSchema from 'simpl-schema'; // n = collections.length diff --git a/app/imports/api/creature/parenting/softRemove.js b/app/imports/api/parenting/softRemove.js similarity index 88% rename from app/imports/api/creature/parenting/softRemove.js rename to app/imports/api/parenting/softRemove.js index 33e63f47..71eb3b18 100644 --- a/app/imports/api/creature/parenting/softRemove.js +++ b/app/imports/api/parenting/softRemove.js @@ -1,5 +1,5 @@ -import getCollectionByName from '/imports/api/creature/parenting/getCollectionByName.js'; -import updateDecendents from '/imports/api/creature/parenting/parenting.js'; +import getCollectionByName from '/imports/api/parenting/getCollectionByName.js'; +import updateDecendents from '/imports/api/parenting/parenting.js'; // 1 + n database hits export function softRemove({_id, collection}){ diff --git a/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue b/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue index ce88f1e5..2215dd89 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/creature/parenting/parenting.js'; + import { setName } from '/imports/api/parenting/parenting.js'; export default { components: { diff --git a/app/imports/ui/library/LibraryContentsContainer.vue b/app/imports/ui/library/LibraryContentsContainer.vue index 32b68745..47d5a06a 100644 --- a/app/imports/ui/library/LibraryContentsContainer.vue +++ b/app/imports/ui/library/LibraryContentsContainer.vue @@ -7,7 +7,6 @@ :organize="organize" @moved="moved" /> - diff --git a/app/imports/ui/pages/Library.vue b/app/imports/ui/pages/Library.vue index 4c096e24..dc9e9caa 100644 --- a/app/imports/ui/pages/Library.vue +++ b/app/imports/ui/pages/Library.vue @@ -26,7 +26,7 @@ import LibraryContentsContainer from '/imports/ui/library/LibraryContentsContainer.vue'; import LibraryNodes, { insertNode } from '/imports/api/library/LibraryNodes.js'; import Libraries from '/imports/api/library/Libraries.js'; - import { setDocToLastOrder } from '/imports/api/order/order.js'; + import { setDocToLastOrder } from '/imports/api/parenting/order.js'; export default { components: { diff --git a/app/server/main.js b/app/server/main.js index 8e5a6dda..89d78f45 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/creature/parenting/deleteRemovedDocuments.js"; +import "/imports/api/parenting/deleteRemovedDocuments.js"; import "/imports/server/config/accountsMeldConfig.js"; import "/imports/server/config/simpleSchemaDebug.js";