Compare commits
8 Commits
2.0-beta.6
...
2.0-beta.7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb91fd12df | ||
|
|
19f4735412 | ||
|
|
fb2f1efa72 | ||
|
|
f7ee09470e | ||
|
|
a5c42fea19 | ||
|
|
8f81614294 | ||
|
|
c56cebc652 | ||
|
|
d24fb5661d |
@@ -72,13 +72,11 @@ const calculationPropertyTypes = [
|
||||
* - Write the computed results back to the database
|
||||
*/
|
||||
export function recomputeCreatureById(creatureId){
|
||||
// Skipping computation on the client can result in the server being made to
|
||||
// do work that isn't possible, in exchange for dramatic performance gains
|
||||
if (Meteor.isClient) return;
|
||||
let props = getActiveProperties({
|
||||
ancestorId: creatureId,
|
||||
filter: {type: {$in: calculationPropertyTypes}},
|
||||
includeUntoggled: true,
|
||||
// TODO filter out expensive fields, particularly icon field
|
||||
});
|
||||
let computationMemo = new ComputationMemo(props);
|
||||
computeMemo(computationMemo);
|
||||
|
||||
@@ -18,12 +18,12 @@ let ContainerSchema = new SimpleSchema({
|
||||
weight: {
|
||||
type: Number,
|
||||
min: 0,
|
||||
defaultValue: 0
|
||||
optional: true,
|
||||
},
|
||||
value: {
|
||||
type: Number,
|
||||
min: 0,
|
||||
defaultValue: 0
|
||||
optional: true,
|
||||
},
|
||||
description: {
|
||||
type: String,
|
||||
@@ -32,4 +32,16 @@ let ContainerSchema = new SimpleSchema({
|
||||
},
|
||||
});
|
||||
|
||||
export { ContainerSchema };
|
||||
const ComputedOnlyContainerSchema = new SimpleSchema({
|
||||
// Weight of all the contents, zero if `contentsWeightless` is true
|
||||
contentsWeight:{
|
||||
type: Number,
|
||||
optional: true,
|
||||
},
|
||||
});
|
||||
|
||||
const ComputedContainerSchema = new SimpleSchema()
|
||||
.extend(ComputedOnlyContainerSchema)
|
||||
.extend(ContainerSchema);
|
||||
|
||||
export { ContainerSchema, ComputedContainerSchema };
|
||||
|
||||
@@ -1,42 +1,42 @@
|
||||
const PROPERTIES = Object.freeze({
|
||||
action: {
|
||||
icon: 'offline_bolt',
|
||||
icon: '$vuetify.icons.action',
|
||||
name: 'Action'
|
||||
},
|
||||
adjustment: {
|
||||
icon: 'warning',
|
||||
icon: '$vuetify.icons.attribute_damage',
|
||||
name: 'Attribute damage'
|
||||
},
|
||||
attack: {
|
||||
icon: 'bolt',
|
||||
icon: '$vuetify.icons.attack',
|
||||
name: 'Attack'
|
||||
},
|
||||
attribute: {
|
||||
icon: 'donut_small',
|
||||
icon: '$vuetify.icons.attribute',
|
||||
name: 'Attribute'
|
||||
},
|
||||
buff: {
|
||||
icon: 'star',
|
||||
icon: '$vuetify.icons.buff',
|
||||
name: 'Buff'
|
||||
},
|
||||
classLevel: {
|
||||
icon: 'school',
|
||||
icon: '$vuetify.icons.class_level',
|
||||
name: 'Class level'
|
||||
},
|
||||
damage: {
|
||||
icon: 'report',
|
||||
icon: '$vuetify.icons.damage',
|
||||
name: 'Damage'
|
||||
},
|
||||
damageMultiplier: {
|
||||
icon: 'layers',
|
||||
icon: '$vuetify.icons.damage_multiplier',
|
||||
name: 'Damage multiplier'
|
||||
},
|
||||
effect: {
|
||||
icon: 'show_chart',
|
||||
icon: '$vuetify.icons.effect',
|
||||
name: 'Effect'
|
||||
},
|
||||
experience: {
|
||||
icon: 'add',
|
||||
icon: '$vuetify.icons.experience',
|
||||
name: 'Experience'
|
||||
},
|
||||
feature: {
|
||||
@@ -56,23 +56,23 @@ const PROPERTIES = Object.freeze({
|
||||
name: 'Proficiency'
|
||||
},
|
||||
roll: {
|
||||
icon: 'flare',
|
||||
icon: '$vuetify.icons.roll',
|
||||
name: 'Roll'
|
||||
},
|
||||
savingThrow: {
|
||||
icon: 'all_out',
|
||||
icon: '$vuetify.icons.saving_throw',
|
||||
name: 'Saving throw'
|
||||
},
|
||||
skill: {
|
||||
icon: 'check_box',
|
||||
icon: '$vuetify.icons.skill',
|
||||
name: 'Skill'
|
||||
},
|
||||
spellList: {
|
||||
icon: 'list',
|
||||
icon: '$vuetify.icons.spell_list',
|
||||
name: 'Spell list'
|
||||
},
|
||||
spell: {
|
||||
icon: 'whatshot',
|
||||
icon: '$vuetify.icons.spell',
|
||||
name: 'Spell'
|
||||
},
|
||||
container: {
|
||||
@@ -80,11 +80,11 @@ const PROPERTIES = Object.freeze({
|
||||
name: 'Container'
|
||||
},
|
||||
item: {
|
||||
icon: 'category',
|
||||
icon: '$vuetify.icons.item',
|
||||
name: 'Item'
|
||||
},
|
||||
toggle: {
|
||||
icon: 'power_settings_new',
|
||||
icon: '$vuetify.icons.toggle',
|
||||
name: 'Toggle'
|
||||
},
|
||||
});
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -56,7 +56,7 @@
|
||||
<v-scroll-y-transition>
|
||||
<v-icon
|
||||
v-if="kebabShade === shadeOption"
|
||||
:class="{dark: isDark(color, shade)}"
|
||||
:class="isDark(color, shade) ? 'dark' : 'light'"
|
||||
>
|
||||
check
|
||||
</v-icon>
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
<template lang="html">
|
||||
<v-autocomplete
|
||||
v-model="model"
|
||||
:search-input.sync="searchString"
|
||||
:items="items"
|
||||
:loading="!$subReady.searchIcons || isLoading"
|
||||
item-text="name"
|
||||
item-value="_id"
|
||||
label="Search icons"
|
||||
hide-no-data
|
||||
@input="input"
|
||||
>
|
||||
<template
|
||||
slot="item"
|
||||
slot-scope="{ item, tile }"
|
||||
>
|
||||
<v-list-tile-avatar>
|
||||
<svg class="avatar" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path :d="item.shape"/></svg>
|
||||
</v-list-tile-avatar>
|
||||
<v-list-tile-content>
|
||||
<v-list-tile-title v-text="item.name"></v-list-tile-title>
|
||||
</v-list-tile-content>
|
||||
</template>
|
||||
</v-autocomplete>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Icons from '/imports/api/icons/Icons.js';
|
||||
|
||||
export default {
|
||||
data(){ return {
|
||||
model: this.value,
|
||||
searchString: null,
|
||||
serverSearchString: null,
|
||||
isLoading: false,
|
||||
}},
|
||||
props: {
|
||||
value: String,
|
||||
},
|
||||
watch: {
|
||||
searchString(string){
|
||||
this.isLoading = true;
|
||||
this.searchServer(string)
|
||||
},
|
||||
value(newValue){
|
||||
this.model = newValue;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
searchServer: _.debounce(function(string){
|
||||
this.serverSearchString = string;
|
||||
}, 200),
|
||||
input(e){
|
||||
this.$emit('input', e);
|
||||
}
|
||||
},
|
||||
meteor: {
|
||||
$subscribe: {
|
||||
searchIcons() {
|
||||
this.isLoading = false;
|
||||
return [this.serverSearchString];
|
||||
},
|
||||
},
|
||||
items(){
|
||||
return Icons.find({}, { sort: [['score', 'desc']] }).fetch();
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="css" scoped>
|
||||
.avatar {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
.theme--dark .avatar {
|
||||
fill: white;
|
||||
}
|
||||
</style>
|
||||
@@ -9,6 +9,7 @@
|
||||
:style="`transform: none; ${hasToolbarClickListener ? 'cursor: pointer;' : ''}`"
|
||||
:color="color"
|
||||
:dark="isDark"
|
||||
:light="!isDark"
|
||||
@click="$emit('toolbarclick')"
|
||||
>
|
||||
<slot name="toolbar" />
|
||||
|
||||
@@ -99,6 +99,17 @@ export default {
|
||||
searchString: '',
|
||||
icons: [],
|
||||
};},
|
||||
watch: {
|
||||
menu(value){
|
||||
if (value){
|
||||
setTimeout(() => {
|
||||
if (this.$refs.iconSearchField){
|
||||
this.$refs.iconSearchField.$children[0].focus();
|
||||
}
|
||||
}, 100);
|
||||
}
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
search(value, ack){
|
||||
this.searchString = value;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<template lang="html">
|
||||
<i
|
||||
ref="icon"
|
||||
aria-hidden
|
||||
role="img"
|
||||
class="v-icon"
|
||||
@@ -50,6 +51,9 @@ export default {
|
||||
large: Boolean,
|
||||
xLarge: Boolean,
|
||||
},
|
||||
data(){return {
|
||||
inheritedSize: undefined,
|
||||
}},
|
||||
computed: {
|
||||
isDark () {
|
||||
if (this.dark === true) {
|
||||
@@ -70,6 +74,7 @@ export default {
|
||||
}
|
||||
},
|
||||
size() {
|
||||
if (this.inheritedSize) return this.inheritedSize;
|
||||
if (this.xSmall) return SIZE_MAP['xSmall'];
|
||||
if (this.small) return SIZE_MAP['small'];
|
||||
if (this.medium) return SIZE_MAP['medium'];
|
||||
@@ -77,6 +82,9 @@ export default {
|
||||
if (this.xLarge) return SIZE_MAP['xLarge'];
|
||||
return SIZE_MAP['default'];
|
||||
},
|
||||
},
|
||||
mounted(){
|
||||
this.inheritedSize = this.$refs.icon.style.fontSize;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
<v-toolbar
|
||||
:color="color || 'secondary'"
|
||||
:dark="isDark"
|
||||
:light="!isDark"
|
||||
:flat="flat"
|
||||
>
|
||||
<property-icon
|
||||
|
||||
@@ -53,7 +53,6 @@
|
||||
<script>
|
||||
import Creatures from '/imports/api/creature/Creatures.js';
|
||||
import removeCreature from '/imports/api/creature/removeCreature.js';
|
||||
import isDarkColor from '/imports/ui/utility/isDarkColor.js';
|
||||
import { mapMutations } from 'vuex';
|
||||
import { theme } from '/imports/ui/theme.js';
|
||||
import { recomputeCreature } from '/imports/api/creature/computation/recomputeCreature.js';
|
||||
@@ -134,7 +133,6 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
isDarkColor,
|
||||
},
|
||||
meteor: {
|
||||
$subscribe: {
|
||||
|
||||
@@ -1,8 +1,18 @@
|
||||
<template lang="html">
|
||||
<dialog-base :override-back-button="() => $emit('back')">
|
||||
<v-toolbar-title slot="toolbar">
|
||||
Add {{ propertyName }}
|
||||
</v-toolbar-title>
|
||||
<dialog-base
|
||||
:override-back-button="() => $emit('back')"
|
||||
:color="model.color"
|
||||
>
|
||||
<template slot="toolbar">
|
||||
<v-toolbar-title>
|
||||
Add {{ propertyName }}
|
||||
</v-toolbar-title>
|
||||
<v-spacer />
|
||||
<color-picker
|
||||
:value="model.color"
|
||||
@input="value => change({path: ['color'], value})"
|
||||
/>
|
||||
</template>
|
||||
<component
|
||||
:is="type"
|
||||
v-if="type"
|
||||
@@ -32,11 +42,14 @@
|
||||
import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
|
||||
import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
|
||||
import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
|
||||
import ColorPicker from '/imports/ui/components/ColorPicker.vue';
|
||||
import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
...propertyFormIndex,
|
||||
DialogBase,
|
||||
ColorPicker,
|
||||
},
|
||||
mixins: [schemaFormMixin],
|
||||
props: {
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<v-toolbar
|
||||
:color="computedColor"
|
||||
:dark="isDark"
|
||||
:light="!isDark"
|
||||
class="base-dialog-toolbar"
|
||||
:flat="!offsetTop"
|
||||
>
|
||||
|
||||
@@ -40,6 +40,9 @@
|
||||
searchString: '',
|
||||
testIcon: undefined,
|
||||
}},
|
||||
mounted(){
|
||||
console.log(this.$vuetify);
|
||||
},
|
||||
methods: {
|
||||
fileChanged (file) {
|
||||
importIcons(file);
|
||||
|
||||
30
app/imports/ui/icons/SvgIconByName.vue
Normal file
30
app/imports/ui/icons/SvgIconByName.vue
Normal file
@@ -0,0 +1,30 @@
|
||||
<template lang="html">
|
||||
<svg-icon
|
||||
:shape="shape"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import SvgIcon from '/imports/ui/components/global/SvgIcon.vue'
|
||||
import SVG_ICONS from '/imports/constants/SVG_ICONS.js';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
SvgIcon,
|
||||
},
|
||||
props: {
|
||||
name: {
|
||||
type: String,
|
||||
required: true,
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
shape(){
|
||||
return SVG_ICONS[this.name].shape;
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="css" scoped>
|
||||
</style>
|
||||
@@ -14,7 +14,8 @@
|
||||
<v-toolbar
|
||||
flat
|
||||
:color="selectedNode && selectedNode.color || 'secondary'"
|
||||
:dark="isDarkColor(selectedNode && selectedNode.color || $vuetify.theme.secondary)"
|
||||
:dark="isToolbarDark"
|
||||
:light="!isToolbarDark"
|
||||
>
|
||||
<v-spacer />
|
||||
<v-switch
|
||||
@@ -67,6 +68,14 @@ export default {
|
||||
organize: false,
|
||||
selected: undefined,
|
||||
};},
|
||||
computed: {
|
||||
isToolbarDark(){
|
||||
return isDarkColor(
|
||||
this.selectedNode && this.selectedNode.color ||
|
||||
this.$vuetify.theme.secondary
|
||||
);
|
||||
}
|
||||
},
|
||||
watch:{
|
||||
selectedNode(val){
|
||||
this.$emit('selected', val)
|
||||
@@ -101,7 +110,6 @@ export default {
|
||||
}
|
||||
},
|
||||
getPropertyName,
|
||||
isDarkColor,
|
||||
},
|
||||
meteor: {
|
||||
$subscribe: {
|
||||
|
||||
@@ -1,8 +1,18 @@
|
||||
<template lang="html">
|
||||
<dialog-base :override-back-button="() => $emit('back')">
|
||||
<v-toolbar-title slot="toolbar">
|
||||
Add {{ propertyName }}
|
||||
</v-toolbar-title>
|
||||
<dialog-base
|
||||
:override-back-button="() => $emit('back')"
|
||||
:color="model.color"
|
||||
>
|
||||
<template slot="toolbar">
|
||||
<v-toolbar-title>
|
||||
Add {{ propertyName }}
|
||||
</v-toolbar-title>
|
||||
<v-spacer />
|
||||
<color-picker
|
||||
:value="model.color"
|
||||
@input="value => change({path: ['color'], value})"
|
||||
/>
|
||||
</template>
|
||||
<component
|
||||
:is="type"
|
||||
v-if="type"
|
||||
@@ -32,12 +42,14 @@
|
||||
import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
|
||||
import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
|
||||
import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
|
||||
import ColorPicker from '/imports/ui/components/ColorPicker.vue';
|
||||
import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
...propertyFormIndex,
|
||||
DialogBase,
|
||||
ColorPicker,
|
||||
},
|
||||
mixins: [schemaFormMixin],
|
||||
props: {
|
||||
|
||||
@@ -1,16 +1,25 @@
|
||||
<template lang="html">
|
||||
<v-card :color="model.color" :data-id="model._id" hover @click="clickProperty(model._id)">
|
||||
<v-card-title class="title">
|
||||
{{model.name}}
|
||||
</v-card-title>
|
||||
<v-card-text>
|
||||
<property-description :value="model.description"/>
|
||||
</v-card-text>
|
||||
</v-card>
|
||||
<v-card
|
||||
:color="model.color"
|
||||
:data-id="model._id"
|
||||
hover
|
||||
:dark="model.color && isDark"
|
||||
:light="model.color && !isDark"
|
||||
@click="clickProperty(model._id)"
|
||||
>
|
||||
<v-card-title class="title">
|
||||
{{ model.name }}
|
||||
</v-card-title>
|
||||
<v-card-text>
|
||||
<property-description :value="model.description" />
|
||||
</v-card-text>
|
||||
</v-card>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
|
||||
import isDarkColor from '/imports/ui/utility/isDarkColor.js';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
PropertyDescription,
|
||||
@@ -18,6 +27,11 @@ export default {
|
||||
props: {
|
||||
model: Object,
|
||||
},
|
||||
computed: {
|
||||
isDark(){
|
||||
return isDarkColor(this.model.color);
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
clickProperty(_id){
|
||||
this.$store.commit('pushDialogStack', {
|
||||
|
||||
@@ -1,11 +1,22 @@
|
||||
<template lang="html">
|
||||
<div class="attribute-form">
|
||||
<text-field
|
||||
label="Name"
|
||||
:value="model.name"
|
||||
:error-messages="errors.name"
|
||||
@change="change('name', ...arguments)"
|
||||
/>
|
||||
<div class="layout row justify-space-between wrap">
|
||||
<text-field
|
||||
label="Name"
|
||||
:value="model.name"
|
||||
:error-messages="errors.name"
|
||||
@change="change('name', ...arguments)"
|
||||
/>
|
||||
<div>
|
||||
<smart-switch
|
||||
label="Carried"
|
||||
class="mx-3"
|
||||
:value="model.carried"
|
||||
:error-messages="errors.carried"
|
||||
@change="change('carried', ...arguments)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layout row wrap">
|
||||
<text-field
|
||||
label="Value"
|
||||
@@ -15,17 +26,19 @@
|
||||
hint="The value of the item in gold pieces, using decimals for values less than 1 gp"
|
||||
class="mx-1"
|
||||
style="flex-basis: 300px;"
|
||||
prepend-inner-icon="$vuetify.icons.two_coins"
|
||||
:value="model.value"
|
||||
:error-messages="errors.value"
|
||||
@change="change('value', ...arguments)"
|
||||
/>
|
||||
<text-field
|
||||
label="Weight"
|
||||
suffix="lbs"
|
||||
suffix="lb"
|
||||
type="number"
|
||||
min="0"
|
||||
class="mx-1"
|
||||
style="flex-basis: 300px;"
|
||||
prepend-inner-icon="$vuetify.icons.weight"
|
||||
:value="model.weight"
|
||||
:error-messages="errors.weight"
|
||||
@change="change('weight', ...arguments)"
|
||||
@@ -41,18 +54,16 @@
|
||||
name="Advanced"
|
||||
standalone
|
||||
>
|
||||
<smart-switch
|
||||
label="Carried"
|
||||
:value="model.carried"
|
||||
:error-messages="errors.carried"
|
||||
@change="change('carried', ...arguments)"
|
||||
/>
|
||||
<smart-switch
|
||||
label="Contents are weightless"
|
||||
:value="model.contentsWeightless"
|
||||
:error-messages="errors.contentsWeightless"
|
||||
@change="change('contentsWeightless', ...arguments)"
|
||||
/>
|
||||
<div class="layout row justify-center">
|
||||
<div>
|
||||
<smart-switch
|
||||
label="Contents are weightless"
|
||||
:value="model.contentsWeightless"
|
||||
:error-messages="errors.contentsWeightless"
|
||||
@change="change('contentsWeightless', ...arguments)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</form-section>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -41,17 +41,19 @@
|
||||
hint="The value of the item in gold pieces, using decimals for values less than 1 gp"
|
||||
class="mx-1"
|
||||
style="flex-basis: 300px;"
|
||||
prepend-inner-icon="$vuetify.icons.two_coins"
|
||||
:value="model.value"
|
||||
:error-messages="errors.value"
|
||||
@change="change('value', ...arguments)"
|
||||
/>
|
||||
<text-field
|
||||
label="Weight"
|
||||
suffix="lbs"
|
||||
suffix="lb"
|
||||
type="number"
|
||||
min="0"
|
||||
class="mx-1"
|
||||
style="flex-basis: 300px;"
|
||||
prepend-inner-icon="$vuetify.icons.weight"
|
||||
:value="model.weight"
|
||||
:error-messages="errors.weight"
|
||||
@change="change('weight', ...arguments)"
|
||||
@@ -61,6 +63,7 @@
|
||||
label="Quantity"
|
||||
type="number"
|
||||
min="0"
|
||||
prepend-inner-icon="$vuetify.icons.abacus"
|
||||
:value="model.quantity"
|
||||
:error-messages="errors.quantity"
|
||||
@change="change('quantity', ...arguments)"
|
||||
|
||||
@@ -1,26 +1,48 @@
|
||||
<template lang="html">
|
||||
<div class="container-viewer">
|
||||
<property-name :value="model.name" />
|
||||
<div
|
||||
v-if="!model.carried"
|
||||
class="caption"
|
||||
>
|
||||
Not carried
|
||||
<property-tags :tags="model.tags" />
|
||||
<div class="layout row wrap justify-space-around">
|
||||
<div
|
||||
v-if="model.value !== undefined"
|
||||
class="mr-3 my-3"
|
||||
>
|
||||
<v-layout
|
||||
row
|
||||
align-center
|
||||
>
|
||||
<v-icon
|
||||
class="mr-2"
|
||||
x-large
|
||||
>
|
||||
$vuetify.icons.two_coins
|
||||
</v-icon>
|
||||
<coin-value
|
||||
class="title mr-2"
|
||||
:value="model.value"
|
||||
/>
|
||||
</v-layout>
|
||||
</div>
|
||||
<div
|
||||
v-if="model.weight !== undefined"
|
||||
class="my-3"
|
||||
>
|
||||
<v-layout
|
||||
row
|
||||
align-center
|
||||
justify-end
|
||||
>
|
||||
<span class="title mr-2">
|
||||
{{ model.weight }} lb
|
||||
</span>
|
||||
<v-icon
|
||||
class="ml-2"
|
||||
x-large
|
||||
>
|
||||
$vuetify.icons.weight
|
||||
</v-icon>
|
||||
</v-layout>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-if="model.contentsWeightless"
|
||||
class="caption"
|
||||
>
|
||||
Contents are weightless
|
||||
</div>
|
||||
<property-field
|
||||
name="Weight"
|
||||
:value="`${model.weight} lbs`"
|
||||
/>
|
||||
<property-field
|
||||
name="Value"
|
||||
:value="`${model.value} gp`"
|
||||
/>
|
||||
<property-description
|
||||
v-if="model.description"
|
||||
:value="model.description"
|
||||
@@ -29,8 +51,12 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import CoinValue from '/imports/ui/components/CoinValue.vue';
|
||||
import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
|
||||
export default {
|
||||
components: {
|
||||
CoinValue,
|
||||
},
|
||||
mixins: [propertyViewerMixin],
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,14 +1,9 @@
|
||||
<template lang="html">
|
||||
<div class="item-viewer">
|
||||
<div
|
||||
v-if="tagString"
|
||||
class="tags ma-3"
|
||||
>
|
||||
{{ tagString }}
|
||||
</div>
|
||||
<property-tags :tags="model.tags" />
|
||||
<div
|
||||
v-if="model.quantity > 1 || model.showIncrement"
|
||||
class="layout column justify-center align-center"
|
||||
class="layout row justify-center align-center wrap"
|
||||
>
|
||||
<div class="display-1">
|
||||
{{ model.quantity }}
|
||||
@@ -22,9 +17,7 @@
|
||||
:value="model.quantity"
|
||||
@change="changeQuantity"
|
||||
>
|
||||
<svg-icon
|
||||
:shape="getIcon('abacus').shape"
|
||||
/>
|
||||
<v-icon>$vuetify.icons.abacus</v-icon>
|
||||
</increment-button>
|
||||
</div>
|
||||
<div class="layout row wrap justify-space-around">
|
||||
@@ -38,11 +31,12 @@
|
||||
align-center
|
||||
class="mb-2"
|
||||
>
|
||||
<svg-icon
|
||||
:shape="getIcon('cash').shape"
|
||||
<v-icon
|
||||
class="mr-2"
|
||||
x-large
|
||||
/>
|
||||
>
|
||||
$vuetify.icons.cash
|
||||
</v-icon>
|
||||
<coin-value
|
||||
class="title"
|
||||
:value="totalValue"
|
||||
@@ -52,11 +46,12 @@
|
||||
row
|
||||
align-center
|
||||
>
|
||||
<svg-icon
|
||||
:shape="getIcon('two-coins').shape"
|
||||
<v-icon
|
||||
class="mr-2"
|
||||
x-large
|
||||
/>
|
||||
>
|
||||
$vuetify.icons.two_coins
|
||||
</v-icon>
|
||||
<coin-value
|
||||
class="title mr-2"
|
||||
:value="model.value"
|
||||
@@ -83,11 +78,12 @@
|
||||
<span class="title">
|
||||
{{ totalWeight }} lb
|
||||
</span>
|
||||
<svg-icon
|
||||
:shape="getIcon('injustice').shape"
|
||||
<v-icon
|
||||
class="ml-2"
|
||||
x-large
|
||||
/>
|
||||
>
|
||||
$vuetify.icons.injustice
|
||||
</v-icon>
|
||||
</v-layout>
|
||||
<v-layout
|
||||
row
|
||||
@@ -103,11 +99,12 @@
|
||||
>
|
||||
each
|
||||
</span>
|
||||
<svg-icon
|
||||
:shape="getIcon('weight').shape"
|
||||
<v-icon
|
||||
class="ml-2"
|
||||
x-large
|
||||
/>
|
||||
>
|
||||
$vuetify.icons.weight
|
||||
</v-icon>
|
||||
</v-layout>
|
||||
</div>
|
||||
</div>
|
||||
@@ -135,9 +132,6 @@ export default {
|
||||
context: { default: {} }
|
||||
},
|
||||
computed:{
|
||||
tagString(){
|
||||
return this.model.tags && this.model.tags.join(', ');
|
||||
},
|
||||
totalValue(){
|
||||
return this.model.value * this.model.quantity;
|
||||
},
|
||||
|
||||
30
app/imports/ui/properties/viewers/shared/PropertyTags.vue
Normal file
30
app/imports/ui/properties/viewers/shared/PropertyTags.vue
Normal file
@@ -0,0 +1,30 @@
|
||||
<template lang="html">
|
||||
<div
|
||||
v-if="tagString"
|
||||
class="tags ma-3 "
|
||||
>
|
||||
{{ tagString }}
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props:{
|
||||
tags: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
}
|
||||
},
|
||||
computed:{
|
||||
tagString(){
|
||||
return this.tags.join(', ');
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="css" scoped>
|
||||
.tags {
|
||||
font-style: italic;
|
||||
}
|
||||
</style>
|
||||
@@ -2,6 +2,7 @@ import PropertyName from '/imports/ui/properties/viewers/shared/PropertyName.vue
|
||||
import PropertyVariableName from '/imports/ui/properties/viewers/shared/PropertyVariableName.vue';
|
||||
import PropertyField from '/imports/ui/properties/viewers/shared/PropertyField.vue';
|
||||
import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
|
||||
import PropertyTags from '/imports/ui/properties/viewers/shared/PropertyTags.vue';
|
||||
|
||||
const propertyViewerMixin = {
|
||||
components: {
|
||||
@@ -9,6 +10,7 @@ const propertyViewerMixin = {
|
||||
PropertyVariableName,
|
||||
PropertyField,
|
||||
PropertyDescription,
|
||||
PropertyTags,
|
||||
},
|
||||
props: {
|
||||
model: {
|
||||
|
||||
@@ -12,7 +12,7 @@ function hexToRgb(hex) {
|
||||
g: parseInt(result[2], 16),
|
||||
b: parseInt(result[3], 16)
|
||||
} : null;
|
||||
};
|
||||
}
|
||||
|
||||
export default function isDarkColor(hexColor){
|
||||
let rgb = hexToRgb(hexColor);
|
||||
@@ -22,4 +22,4 @@ export default function isDarkColor(hexColor){
|
||||
/ 1000
|
||||
);
|
||||
return brightness <= 125;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,20 +1,35 @@
|
||||
import Vue from "vue";
|
||||
import Vuex from "vuex";
|
||||
import Vuetify from "vuetify";
|
||||
import store from "/imports/ui/vuexStore.js";
|
||||
import Vue from 'vue';
|
||||
import Vuetify from 'vuetify';
|
||||
import store from '/imports/ui/vuexStore.js';
|
||||
import VueMeteorTracker from 'vue-meteor-tracker';
|
||||
import AppLayout from '/imports/ui/layouts/AppLayout.vue';
|
||||
import ReactiveProvide from 'vue-reactive-provide';
|
||||
import router from "/imports/ui/router.js";
|
||||
import router from '/imports/ui/router.js';
|
||||
import { theme } from '/imports/ui/theme.js';
|
||||
import "vuetify/dist/vuetify.min.css";
|
||||
import 'vuetify/dist/vuetify.min.css';
|
||||
import '/imports/ui/components/global/globalIndex.js';
|
||||
import SvgIconByName from '/imports/ui/icons/SvgIconByName.vue';
|
||||
import SVG_ICONS from '/imports/constants/SVG_ICONS.js';
|
||||
|
||||
let icons = {};
|
||||
|
||||
for (const name in SVG_ICONS) {
|
||||
let icon = SVG_ICONS[name];
|
||||
icons[icon.name] = {
|
||||
component: SvgIconByName,
|
||||
props: {
|
||||
name: name,
|
||||
}
|
||||
}
|
||||
}
|
||||
console.log(icons);
|
||||
|
||||
Vue.use(VueMeteorTracker);
|
||||
Vue.config.meteor.freeze = true
|
||||
Vue.use(Vuetify, {
|
||||
theme,
|
||||
iconfont: "md",
|
||||
iconfont: 'md',
|
||||
icons,
|
||||
});
|
||||
Vue.use(ReactiveProvide, {
|
||||
name: 'reactiveProvide', // default value
|
||||
@@ -27,5 +42,5 @@ Meteor.startup(() => {
|
||||
router,
|
||||
store,
|
||||
...AppLayout,
|
||||
}).$mount("#app");
|
||||
}).$mount('#app');
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user