IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into model-transaction-link

Browse Source
This commit is contained in:
Moriz Wahl 2022-03-09 14:30:53 +01:00 committed by GitHub
commit ea38251c0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/App.vue
View File

@ -40,3 +40,8 @@ export default {
}, },
} }
</script> </script>
<style>
.pointer {
cursor: pointer;
}
</style>

2
frontend/src/components/GddTransactionList.vue
View File

@ -13,7 +13,7 @@
</div> </div>
<div v-for="({ id, typeId }, index) in transactions" :key="id"> <div v-for="({ id, typeId }, index) in transactions" :key="id">
<transaction-list-item :typeId="typeId"> <transaction-list-item :typeId="typeId" class="pointer">
<template #DECAY> <template #DECAY>
<transaction-decay class="list-group-item" v-bind="transactions[index]" /> <transaction-decay class="list-group-item" v-bind="transactions[index]" />
</template> </template>

4
frontend/src/components/Transactions/TransactionCreation.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-creation"> <div class="transaction-slot-creation">
<div @click="visible = !visible"> <div @click="visible = !visible">
<!-- Collaps Icon --> <!-- Collaps Icon -->
<div class="text-right" style="width: 95%; position: absolute"> <div class="text-right" style="width: 95%; position: absolute">
@ -75,7 +75,7 @@
</b-row> </b-row>
</div> </div>
<b-collapse class="pb-4 pt-5" v-model="visible"> <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
<decay-information-before-startblock v-if="decay.start === null" /> <decay-information-before-startblock v-if="decay.start === null" />
<decay-information-decay-startblock <decay-information-decay-startblock
v-else-if="isStartBlock" v-else-if="isStartBlock"

4
frontend/src/components/Transactions/TransactionDecay.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-decay"> <div class="transaction-slot-decay">
<div @click="visible = !visible"> <div @click="visible = !visible">
<!-- Collaps Icon --> <!-- Collaps Icon -->
<div class="text-right" style="width: 95%; position: absolute"> <div class="text-right" style="width: 95%; position: absolute">
@ -38,7 +38,7 @@
</b-row> </b-row>
</div> </div>
<b-collapse class="pb-4 pt-5" v-model="visible"> <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
<decay-information-decay :balance="balance" :decay="decay" /> <decay-information-decay :balance="balance" :decay="decay" />
</b-collapse> </b-collapse>
</div> </div>

4
frontend/src/components/Transactions/TransactionReceive.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-receive"> <div class="transaction-slot-receive">
<div @click="visible = !visible"> <div @click="visible = !visible">
<!-- Collaps Icon --> <!-- Collaps Icon -->
<div class="text-right" style="width: 95%; position: absolute"> <div class="text-right" style="width: 95%; position: absolute">
@ -78,7 +78,7 @@
</b-row> </b-row>
</div> </div>
<b-collapse class="pb-4 pt-5" v-model="visible"> <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
<decay-information-before-startblock v-if="decay.start === null" /> <decay-information-before-startblock v-if="decay.start === null" />
<decay-information-decay-startblock <decay-information-decay-startblock
v-else-if="isStartBlock" v-else-if="isStartBlock"

4
frontend/src/components/Transactions/TransactionSend.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-send"> <div class="transaction-slot-send">
<div @click="visible = !visible"> <div @click="visible = !visible">
<!-- Collaps Icon --> <!-- Collaps Icon -->
<div class="text-right" style="width: 95%; position: absolute"> <div class="text-right" style="width: 95%; position: absolute">
@ -75,7 +75,7 @@
</b-row> </b-row>
</div> </div>
<b-collapse class="pb-4 pt-5" v-model="visible"> <b-collapse :class="visible ? 'bg-secondary' : ''" class="pb-4 pt-5" v-model="visible">
<decay-information-before-startblock v-if="decay.start === null" /> <decay-information-before-startblock v-if="decay.start === null" />
<decay-information-decay-startblock <decay-information-decay-startblock
v-else-if="isStartBlock" v-else-if="isStartBlock"