techwire/bang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix errors

Browse Source
This commit is contained in:
Alberto Xamin 2020-11-27 18:04:29 +01:00
parent 3062bce6ca
commit 8351bff0d8
No known key found for this signature in database
GPG Key ID: 4F026F48309500A2
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/Chooser.vue
View File

@ -5,7 +5,7 @@
<Card v-for="c in cards" v-bind:key="c" :card="c" @click.native="select(c)" @pointerenter.native="showDesc(c)" @pointerleave.native="desc=''"/> <Card v-for="c in cards" v-bind:key="c" :card="c" @click.native="select(c)" @pointerenter.native="showDesc(c)" @pointerleave.native="desc=''"/>
</div> </div>
<p v-if="hintText">{{hintText}}</p> <p v-if="hintText">{{hintText}}</p>
<div style="margin-top:6pt;" class="button center-stuff" v-if="showCancelBtn" @click="cancel"><span>{{cancelText}}</span></div> <div style="margin-top:6pt;" class="button center-stuff" v-if="showCancelBtn" @click="cancel"><span>{{realCancelText}}</span></div>
<p v-if="desc" style="bottom:10pt;right:0;left:0;position:absolute;margin:16pt;font-size:18pt">{{desc}}</p> <p v-if="desc" style="bottom:10pt;right:0;left:0;position:absolute;margin:16pt;font-size:18pt">{{desc}}</p>
</div> </div>
</template> </template>
@ -30,7 +30,8 @@ export default {
hintText: String, hintText: String,
}, },
data: () => ({ data: () => ({
desc: '' desc: '',
realCancelText: ''
}), }),
computed: { computed: {
showCancelBtn() { showCancelBtn() {
@ -45,8 +46,9 @@ export default {
} }
}, },
mounted() { mounted() {
if (this.cancelText == '') { this.realCancelText = this.cancelText
this.cancelText = this.$t('cancel') if (this.realCancelText == '') {
this.realCancelText = this.$t('cancel')
} }
}, },
} }

11
frontend/src/components/Deck.vue
View File

@ -30,10 +30,7 @@ export default {
name: 'PewPew!', name: 'PewPew!',
icon: '💥', icon: '💥',
}, },
endTurnCard: { endTurnCard: null,
name: this.$t('end_turn'),
icon: '⛔️'
},
lastScrap: null, lastScrap: null,
previousScrap: null, previousScrap: null,
pending_action: false, pending_action: false,
@ -49,6 +46,12 @@ export default {
this.lastScrap = card this.lastScrap = card
} }
}, },
mounted() {
this.endTurnCard = {
name: this.$t('end_turn'),
icon: '⛔️'
}
},
methods: { methods: {
action(pile) { action(pile) {
if (this.pending_action !== false && this.pending_action < 2) { if (this.pending_action !== false && this.pending_action < 2) {