Merge feature-nested-sets into develop
This commit is contained in:
@@ -107,20 +107,20 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import { getPropertyName } from '/imports/constants/PROPERTIES.js';
|
||||
import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
|
||||
import doAction from '/imports/client/ui/creature/actions/doAction';
|
||||
import { getPropertyName } from '/imports/constants/PROPERTIES';
|
||||
import numberToSignedString from '../../../../../api/utility/numberToSignedString';
|
||||
import doAction from '/imports/api/engine/actions/doAction';
|
||||
import ActionConditionView from '/imports/client/ui/properties/components/actions/ActionConditionView.vue';
|
||||
import AttributeConsumedView from '/imports/client/ui/properties/components/actions/AttributeConsumedView.vue';
|
||||
import ItemConsumedView from '/imports/client/ui/properties/components/actions/ItemConsumedView.vue';
|
||||
import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
|
||||
import RollPopup from '/imports/client/ui/components/RollPopup.vue';
|
||||
import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue';
|
||||
import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
|
||||
import TreeNodeList from '/imports/client/ui/components/tree/TreeNodeList.vue';
|
||||
import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
|
||||
import { docsToForest as nodeArrayToTree } from '/imports/api/parenting/parentingFunctions';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
|
||||
import { some } from 'lodash';
|
||||
|
||||
export default {
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import doAction from '/imports/api/engine/actions/doAction.js';
|
||||
import doAction from '/imports/api/engine/actions/doAction';
|
||||
import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
|
||||
<script lang="js">
|
||||
import ItemTreeNode from '/imports/client/ui/properties/treeNodeViews/ItemTreeNode.vue';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
|
||||
import selectAmmoItem from '/imports/api/creature/creatureProperties/methods/selectAmmoItem.js';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
|
||||
import selectAmmoItem from '/imports/api/creature/creatureProperties/methods/selectAmmoItem';
|
||||
import { findIndex } from 'lodash';
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -64,10 +64,10 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
|
||||
import numberToSignedString from '../../../../../api/utility/numberToSignedString';
|
||||
import RollPopup from '/imports/client/ui/components/RollPopup.vue';
|
||||
import doCheck from '/imports/api/engine/actions/doCheck.js';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
|
||||
import doCheck from '/imports/api/engine/actions/doCheck';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<script lang="js">
|
||||
import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
|
||||
import AttributeCardContent from '/imports/client/ui/properties/components/attributes/AttributeCardContent.vue';
|
||||
import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
|
||||
import isDarkColor from '/imports/client/ui/utility/isDarkColor';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -47,10 +47,10 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
|
||||
import numberToSignedString from '../../../../../api/utility/numberToSignedString';
|
||||
import RollPopup from '/imports/client/ui/components/RollPopup.vue';
|
||||
import doCheck from '/imports/api/engine/actions/doCheck.js';
|
||||
import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
|
||||
import doCheck from '/imports/api/engine/actions/doCheck';
|
||||
import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -41,10 +41,10 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
|
||||
import getEffectIcon from '/imports/client/ui/utility/getEffectIcon';
|
||||
import Breadcrumbs from '/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
|
||||
import { isFinite, find } from 'lodash';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
|
||||
import { isFinite } from 'lodash';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
<script lang="js">
|
||||
import IncrementMenu from '/imports/client/ui/components/IncrementMenu.vue';
|
||||
import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
|
||||
import isDarkColor from '/imports/client/ui/utility/isDarkColor';
|
||||
import chroma from 'chroma-js';
|
||||
|
||||
export default {
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import Creatures from '/imports/api/creature/creatures/Creatures.js';
|
||||
import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
|
||||
import Creatures from '/imports/api/creature/creatures/Creatures';
|
||||
import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty';
|
||||
|
||||
import HealthBarCard from '/imports/client/ui/properties/components/attributes/HealthBarCard.vue';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
|
||||
import numberToSignedString from '../../../../../api/utility/numberToSignedString';
|
||||
export default {
|
||||
inject: {
|
||||
context: { default: {} }
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<script lang="js">
|
||||
import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
|
||||
import ResourceCardContent from '/imports/client/ui/properties/components/attributes/ResourceCardContent.vue';
|
||||
import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
|
||||
import isDarkColor from '/imports/client/ui/utility/isDarkColor';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -32,8 +32,8 @@
|
||||
|
||||
<script lang="js">
|
||||
import SpellSlotListTile from '/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue';
|
||||
import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
|
||||
import doCastSpell from '/imports/api/engine/actions/doCastSpell';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -64,9 +64,9 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
|
||||
import numberToSignedString from '/imports/api/utility/numberToSignedString.js';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
|
||||
import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty';
|
||||
import numberToSignedString from '/imports/api/utility/numberToSignedString';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue';
|
||||
|
||||
export default {
|
||||
inject: {
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
|
||||
import getEffectIcon from '/imports/client/ui/utility/getEffectIcon';
|
||||
import { isFinite } from 'lodash';
|
||||
|
||||
export default {
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
|
||||
import propComponents from '/imports/client/ui/properties/components/folders/propertyComponentIndex.js';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
|
||||
import propComponents from '/imports/client/ui/properties/components/folders/propertyComponentIndex';
|
||||
|
||||
export default {
|
||||
props: {
|
||||
|
||||
@@ -63,7 +63,7 @@ import AttributeCardContent from '/imports/client/ui/properties/components/attri
|
||||
import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
|
||||
import FolderGroupChildren from '/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue';
|
||||
|
||||
import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
|
||||
import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
|
||||
import propComponents from '/imports/client/ui/properties/components/folders/propertyComponentIndex.js';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
|
||||
import propComponents from '/imports/client/ui/properties/components/folders/propertyComponentIndex';
|
||||
|
||||
export default {
|
||||
props: {
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
|
||||
import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
|
||||
import { docsToForest as nodeArrayToTree } from '/imports/api/parenting/parentingFunctions';
|
||||
import BuildTreeNodeList from '/imports/client/ui/creature/buildTree/BuildTreeNodeList.vue';
|
||||
|
||||
function traverse(tree, callback, parents = []){
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js'
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties'
|
||||
import FolderGroupCard from '/imports/client/ui/properties/components/folders/FolderGroupCard.vue';
|
||||
import softRemoveProperty from '/imports/api/creature/creatureProperties/methods/softRemoveProperty.js';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
|
||||
import softRemoveProperty from '/imports/api/creature/creatureProperties/methods/softRemoveProperty';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue';
|
||||
|
||||
function getFolders(creatureId, tab, location) {
|
||||
return CreatureProperties.find({
|
||||
|
||||
@@ -45,9 +45,9 @@
|
||||
<script lang="js">
|
||||
import ToolbarCard from '/imports/client/ui/components/ToolbarCard.vue';
|
||||
import ItemList from '/imports/client/ui/properties/components/inventory/ItemList.vue';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
|
||||
import CoinValue from '/imports/client/ui/components/CoinValue.vue';
|
||||
import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
|
||||
import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
<script lang="js">
|
||||
import draggable from 'vuedraggable';
|
||||
import ItemListTile from '/imports/client/ui/properties/components/inventory/ItemListTile.vue';
|
||||
import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
|
||||
import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
|
||||
import { organizeDoc } from '/imports/api/parenting/organizeMethods';
|
||||
import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -42,11 +42,11 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import PROPERTIES from '/imports/constants/PROPERTIES.js';
|
||||
import adjustQuantity from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
import PROPERTIES from '/imports/constants/PROPERTIES';
|
||||
import adjustQuantity from '/imports/api/creature/creatureProperties/methods/adjustQuantity';
|
||||
import IncrementButton from '/imports/client/ui/components/IncrementButton.vue';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
<script lang="js">
|
||||
import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
|
||||
import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
|
||||
import isDarkColor from '/imports/client/ui/utility/isDarkColor';
|
||||
import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
|
||||
|
||||
export default {
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
<script lang="js">
|
||||
import ProficiencyIcon from '/imports/client/ui/properties/shared/ProficiencyIcon.vue';
|
||||
import numberToSignedString from '/imports/api/utility/numberToSignedString.js';
|
||||
import numberToSignedString from '/imports/api/utility/numberToSignedString';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -58,11 +58,11 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
|
||||
import numberToSignedString from '../../../../../api/utility/numberToSignedString';
|
||||
import ProficiencyIcon from '/imports/client/ui/properties/shared/ProficiencyIcon.vue';
|
||||
import RollPopup from '/imports/client/ui/components/RollPopup.vue';
|
||||
import doCheck from '/imports/api/engine/actions/doCheck.js';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
|
||||
import doCheck from '/imports/api/engine/actions/doCheck';
|
||||
import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -41,11 +41,11 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
|
||||
import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin';
|
||||
import Breadcrumbs from '/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue';
|
||||
import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon.js';
|
||||
import numberToSignedString from '/imports/api/utility/numberToSignedString';
|
||||
|
||||
import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
Breadcrumbs,
|
||||
|
||||
@@ -188,8 +188,8 @@
|
||||
<script lang="js">
|
||||
import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
|
||||
import SplitListLayout from '/imports/client/ui/properties/components/attributes/SplitListLayout.vue';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
|
||||
import spellsWithSubheaders from '/imports/client/ui/properties/components/spells/spellsWithSubheaders.js';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
|
||||
import spellsWithSubheaders from '/imports/client/ui/properties/components/spells/spellsWithSubheaders';
|
||||
import SpellSlotListTile from '/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue';
|
||||
import SpellListTile from '/imports/client/ui/properties/components/spells/SpellListTile.vue';
|
||||
import RollPopup from '/imports/client/ui/components/RollPopup.vue';
|
||||
|
||||
@@ -40,8 +40,8 @@
|
||||
<script lang="js">
|
||||
import draggable from 'vuedraggable';
|
||||
import SpellListTile from '/imports/client/ui/properties/components/spells/SpellListTile.vue';
|
||||
import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
|
||||
import spellsWithSubheaders from '/imports/client/ui/properties/components/spells/spellsWithSubheaders.js';
|
||||
import { organizeDoc } from '/imports/api/parenting/organizeMethods';
|
||||
import spellsWithSubheaders from '/imports/client/ui/properties/components/spells/spellsWithSubheaders';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
<script lang="js">
|
||||
import ToolbarCard from '/imports/client/ui/components/ToolbarCard.vue';
|
||||
import SpellList from '/imports/client/ui/properties/components/spells/SpellList.vue';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
|
||||
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@@ -49,8 +49,8 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty';
|
||||
|
||||
export default {
|
||||
mixins: [treeNodeViewMixin],
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import flipToggle from '/imports/api/creature/creatureProperties/methods/flipToggle.js';
|
||||
import flipToggle from '/imports/api/creature/creatureProperties/methods/flipToggle';
|
||||
import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
|
||||
|
||||
export default {
|
||||
|
||||
Reference in New Issue
Block a user