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

remove last month label, matching stands and button size

Browse Source
This commit is contained in:
ogerly 2023-01-16 14:24:02 +01:00
parent 8514e9af9d
commit 41f7dfe56f
6 changed files with 65 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/components/GddSend/TransactionConfirmationLink.vue
View File

@ -35,12 +35,15 @@
<b-col offset="2">{{ $t('form.new_balance') }}</b-col> <b-col offset="2">{{ $t('form.new_balance') }}</b-col>
<b-col>{{ (balance - amount) | GDD }}</b-col> <b-col>{{ (balance - amount) | GDD }}</b-col>
</b-row> </b-row>
<b-row class="mt-5 p-5"> <b-row class="mt-5">
<b-col> <b-col cols="12" md="6" lg="6">
<b-button @click="$emit('on-back')">{{ $t('back') }}</b-button> <b-button block @click="$emit('on-back')" class="mb-3 mb-md-0 mb-lg-0">
{{ $t('back') }}
</b-button>
</b-col> </b-col>
<b-col class="text-right"> <b-col cols="12" md="6" lg="6" class="text-lg-right">
<b-button <b-button
block
class="send-button" class="send-button"
variant="gradido" variant="gradido"
:disabled="disabled" :disabled="disabled"

13
frontend/src/components/GddSend/TransactionConfirmationSend.vue
View File

@ -17,7 +17,7 @@
</b-col> </b-col>
</b-row> </b-row>
<b-row class="mt-5 pr-3 text-color-gdd-yellow h3"> <b-row class="mt-5 text-color-gdd-yellow h3">
<b-col cols="2" class="text-right"> <b-col cols="2" class="text-right">
<b-icon class="text-color-gdd-yellow" icon="droplet-half"></b-icon> <b-icon class="text-color-gdd-yellow" icon="droplet-half"></b-icon>
</b-col> </b-col>
@ -39,12 +39,15 @@
<b-col offset="2">{{ $t('form.new_balance') }}</b-col> <b-col offset="2">{{ $t('form.new_balance') }}</b-col>
<b-col>{{ (balance - amount) | GDD }}</b-col> <b-col>{{ (balance - amount) | GDD }}</b-col>
</b-row> </b-row>
<b-row class="mt-5 p-5"> <b-row class="mt-5">
<b-col> <b-col cols="12" md="6" lg="6">
<b-button @click="$emit('on-back')">{{ $t('back') }}</b-button> <b-button block @click="$emit('on-back')" class="mb-3 mb-md-0 mb-lg-0">
{{ $t('back') }}
</b-button>
</b-col> </b-col>
<b-col class="text-right"> <b-col cols="12" md="6" lg="6" class="text-lg-right">
<b-button <b-button
block
variant="gradido" variant="gradido"
:disabled="disabled" :disabled="disabled"
@click="$emit('send-transaction'), (disabled = true)" @click="$emit('send-transaction'), (disabled = true)"

16
frontend/src/components/GddSend/TransactionForm.vue
View File

@ -92,14 +92,20 @@
<div v-if="!!isBalanceDisabled" class="text-danger mt-5"> <div v-if="!!isBalanceDisabled" class="text-danger mt-5">
{{ $t('form.no_gdd_available') }} {{ $t('form.no_gdd_available') }}
</div> </div>
<b-row v-else class="test-buttons mt-5"> <b-row v-else class="test-buttons mt-3">
<b-col> <b-col cols="12" md="6" lg="6">
<b-button type="reset" variant="secondary" @click="onReset"> <b-button
block
type="reset"
variant="secondary"
@click="onReset"
class="mb-3 mb-md-0 mb-lg-0"
>
{{ $t('form.reset') }} {{ $t('form.reset') }}
</b-button> </b-button>
</b-col> </b-col>
<b-col class="text-right"> <b-col cols="12" md="6" lg="6" class="text-lg-right">
<b-button type="submit" variant="gradido"> <b-button block type="submit" variant="gradido">
{{ $t('form.check_now') }} {{ $t('form.check_now') }}
</b-button> </b-button>
</b-col> </b-col>

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

@ -26,45 +26,46 @@
</template> </template>
</transaction-list-item> </transaction-list-item>
</div> </div>
<div v-if="transactionCount > 0" class="h4 m-3">{{ $t('lastMonth') }}</div> <div class="mt-3">
<div v-for="({ id, typeId }, index) in transactions" :key="`l2-` + id"> <div v-for="({ id, typeId }, index) in transactions" :key="`l2-` + id">
<transaction-list-item <transaction-list-item
v-if="typeId !== 'DECAY'" v-if="typeId !== 'DECAY'"
:typeId="typeId" :typeId="typeId"
class="pointer mb-4 bg-white appBoxShadow gradido-border-radius p-3 test-list-group-item" class="pointer mb-3 bg-white appBoxShadow gradido-border-radius p-3 test-list-group-item"
> >
<template #SEND> <template #SEND>
<transaction-send <transaction-send
v-bind="transactions[index]" v-bind="transactions[index]"
:previousBookedBalance="previousBookedBalance(index)" :previousBookedBalance="previousBookedBalance(index)"
v-on="$listeners" v-on="$listeners"
/> />
</template> </template>
<template #RECEIVE> <template #RECEIVE>
<transaction-receive <transaction-receive
v-bind="transactions[index]" v-bind="transactions[index]"
:previousBookedBalance="previousBookedBalance(index)" :previousBookedBalance="previousBookedBalance(index)"
v-on="$listeners" v-on="$listeners"
/> />
</template> </template>
<template #CREATION> <template #CREATION>
<transaction-creation <transaction-creation
v-bind="transactions[index]" v-bind="transactions[index]"
:previousBookedBalance="previousBookedBalance(index)" :previousBookedBalance="previousBookedBalance(index)"
v-on="$listeners" v-on="$listeners"
/> />
</template> </template>
<template #LINK_SUMMARY> <template #LINK_SUMMARY>
<transaction-link-summary <transaction-link-summary
v-bind="transactions[index]" v-bind="transactions[index]"
:transactionLinkCount="transactionLinkCount" :transactionLinkCount="transactionLinkCount"
@update-transactions="updateTransactions" @update-transactions="updateTransactions"
/> />
</template> </template>
</transaction-list-item> </transaction-list-item>
</div>
</div> </div>
</div> </div>
<b-pagination <b-pagination

2
frontend/src/layouts/DashboardLayout.vue
View File

@ -50,7 +50,7 @@
</b-col> </b-col>
<b-col cols="12"> <b-col cols="12">
<!-- router-view --> <!-- router-view -->
<div class="main-content mt-3"> <div class="main-content mt-lg-3 mt-0">
<fade-transition :duration="200" origin="center top" mode="out-in"> <fade-transition :duration="200" origin="center top" mode="out-in">
<router-view <router-view
ref="router-view" ref="router-view"

2
frontend/src/pages/Send.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<gdd-send :currentTransactionStep="currentTransactionStep" class="pt-3 mt--3"> <gdd-send :currentTransactionStep="currentTransactionStep">
<template #transactionForm> <template #transactionForm>
<transaction-form <transaction-form
v-bind="transactionData" v-bind="transactionData"