From d6f25b6f982ce4e00da2bcb288a16c10feece7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 20 Apr 2022 09:31:17 +0200
Subject: [PATCH] all headings centre col 12, all b-row in offset 1 and col 11

---
 .../DecayInformation-Decay.vue                | 16 ++--
 .../DecayInformation-DecayStartblock.vue      | 83 ++++++++++++-------
 .../DecayInformation-Long.vue                 | 44 +++++-----
 .../src/components/TransactionCollapse.vue    |  2 +-
 .../TransactionRows/DurationRow.vue           | 44 ++++++++++
 .../Transactions/TransactionDecay.vue         |  2 +-
 frontend/src/config/index.js                  |  2 +-
 7 files changed, 133 insertions(+), 60 deletions(-)
 create mode 100644 frontend/src/components/TransactionRows/DurationRow.vue

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
index 67847f6cf..60eb66077 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="decayinformation-decay">
     <b-row>
-      <b-col cols="1"></b-col>
-      <b-col cols="11">
-        <div class="d-flex">
-          <div class="text-center pb-3 gradido-max-width">
-            <b-icon icon="droplet-half" class="mr-2" />
-            <b>{{ $t('decay.calculation_decay') }}</b>
-          </div>
+      <b-col>
+        <div class="text-center pb-3">
+          <b-icon icon="droplet-half" class="mr-2" />
+          <b>{{ $t('decay.calculation_decay') }}</b>
         </div>
-
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col offset="1" cols="11">
         <b-row>
           <b-col cols="5" class="text-right">
             <div>{{ $t('decay.decay') }}</div>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index 3d42f11f8..0df254bb4 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -1,53 +1,78 @@
 <template>
   <div class="decayinformation-startblock">
     <b-row>
-      <b-col cols="12" class="text-center">
-        <div>
-          <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
-          <div>{{ $t('decay.decay_introduced') }}</div>
-        </div>
-        <div>
-          <span v-if="decay.start">
-            {{ $d(new Date(decay.start), 'long') }}
-          </span>
+      <b-col cols="12">
+        <div class="text-center pb-3">
+          <b-icon icon="droplet-half" class="mr-2" />
+          <b>{{ $t('decay.Starting_block_decay') }}</b>
         </div>
       </b-col>
     </b-row>
+    <b-row>
+      <b-col offset="1" cols="11">
+        <b-row>
+          <b-col cols="5">
+            <div class="text-right">
+              <div>{{ $t('decay.decay_introduced') }}</div>
+            </div>
+          </b-col>
+          <b-col cols="5">
+            <div>
+              <span v-if="decay.start">
+                {{ $d(new Date(decay.start), 'long') }}
+              </span>
+            </div>
+          </b-col>
+        </b-row>
+        <duration-row :decayStart="decay.start" :decayEnd="decay.end" />
 
-    <!-- Decay-->
-    <b-row>
-      <b-col cols="6" class="text-right">{{ $t('decay.decay') }}</b-col>
-      <b-col cols="6">{{ decay.decay | GDD }}</b-col>
+        <!-- Decay-->
+        <b-row>
+          <b-col cols="5" class="text-right">{{ $t('decay.decay') }}</b-col>
+          <b-col cols="7">{{ decay.decay | GDD }}</b-col>
+        </b-row>
+      </b-col>
     </b-row>
-    <hr class="mt-2 mb-2" />
+    <hr class="mt-3 mb-3" />
+
     <b-row>
-      <b-col class="text-center pt-3 pb-2">
+      <b-col class="text-center pb-3">
         <b>{{ $t('decay.calculation_total') }}</b>
       </b-col>
     </b-row>
+
     <!-- Type-->
     <b-row>
-      <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-      <b-col cols="6" class="text-right">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
-      <b-col cols="6">{{ amount | GDD }}</b-col>
-    </b-row>
-    <!-- Decay-->
-    <b-row>
-      <b-col cols="6" class="text-right">{{ $t('decay.decay') }}</b-col>
-      <b-col cols="6">{{ decay.decay | GDD }}</b-col>
-    </b-row>
-    <!-- Total-->
-    <b-row>
-      <b-col cols="6" class="text-right">{{ $t('decay.total') }}</b-col>
-      <b-col cols="6">
-        <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
+      <b-col offset="1" cols="11">
+        <b-row>
+          <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
+          <b-col cols="5" class="text-right">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
+          <b-col cols="7">{{ amount | GDD }}</b-col>
+        </b-row>
+        <!-- Decay-->
+        <b-row>
+          <b-col cols="5" class="text-right">{{ $t('decay.decay') }}</b-col>
+          <b-col cols="7">{{ decay.decay | GDD }}</b-col>
+        </b-row>
+        <!-- Total-->
+        <b-row>
+          <b-col cols="5" class="text-right">{{ $t('decay.total') }}</b-col>
+          <b-col cols="7">
+            <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
+          </b-col>
+        </b-row>
       </b-col>
     </b-row>
   </div>
 </template>
 <script>
+import DurationRow from '@/components/TransactionRows/DurationRow.vue'
+
 export default {
   name: 'DecayInformation-StartBlock',
+  components: {
+    DurationRow,
+  },
   props: {
     balanceDate: { type: String },
     amount: {
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index 9059ab62e..c4f200291 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -1,15 +1,17 @@
 <template>
   <div class="decayinformation-long">
     <b-row>
-      <b-col cols="1"></b-col>
-      <b-col cols="11">
-        <div class="d-flex">
-          <div class="text-center pb-3 gradido-max-width">
+      <b-col>
+        <div>
+          <div class="text-center pb-3">
             <b-icon icon="droplet-half" class="mr-2" />
             <b>{{ $t('decay.calculation_decay') }}</b>
           </div>
         </div>
-
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col offset="1" cols="11">
         <b-row>
           <b-col cols="5" class="text-right">
             <div>{{ $t('decay.last_transaction') }}</div>
@@ -22,14 +24,7 @@
             </div>
           </b-col>
         </b-row>
-        <b-row>
-          <b-col cols="5" class="text-right">
-            <div>{{ $t('decay.past_time') }}</div>
-          </b-col>
-          <b-col cols="7">
-            <span v-if="duration">{{ durationText }}</span>
-          </b-col>
-        </b-row>
+        <duration-row :decayStart="decay.start" :decayEnd="decay.end" />
 
         <!-- Decay-->
         <b-row>
@@ -38,13 +33,17 @@
           </b-col>
           <b-col cols="7">{{ decay.decay | GDD }}</b-col>
         </b-row>
-        <hr class="mt-2 mb-2" />
-        <b-row>
-          <b-col class="text-center pt-3 pb-2">
-            <b>{{ $t('decay.calculation_total') }}</b>
-          </b-col>
-        </b-row>
-        <!-- Type-->
+      </b-col>
+    </b-row>
+    <hr class="mt-3 mb-3" />
+    <b-row>
+      <b-col class="text-center pb-3">
+        <b>{{ $t('decay.calculation_total') }}</b>
+      </b-col>
+    </b-row>
+    <!-- Type-->
+    <b-row>
+      <b-col offset="1" cols="11">
         <b-row>
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
           <b-col cols="5" class="text-right">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
@@ -69,8 +68,13 @@
   </div>
 </template>
 <script>
+import DurationRow from '@/components/TransactionRows/DurationRow.vue'
+
 export default {
   name: 'DecayInformation-Long',
+  components: {
+    DurationRow,
+  },
   props: {
     amount: { type: String, default: '0' },
     typeId: { type: String, default: '' },
diff --git a/frontend/src/components/TransactionCollapse.vue b/frontend/src/components/TransactionCollapse.vue
index 98358475b..bf9b547df 100644
--- a/frontend/src/components/TransactionCollapse.vue
+++ b/frontend/src/components/TransactionCollapse.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="gdt-transaction-collapse p-2 pt-4 pb-4 mb-4 gradido-no-border gradido-background-f1">
+  <div class="gdt-transaction-collapse p-2 pt-4 pb-4 mb-4 gradido-no-border bg-secondary">
     <b-row class="gdt-list-collapse-header-text text-center pb-3">
       <b-col class="collapse-headline">
         <b>{{ getLinesByType.headline }}</b>
diff --git a/frontend/src/components/TransactionRows/DurationRow.vue b/frontend/src/components/TransactionRows/DurationRow.vue
new file mode 100644
index 000000000..d40d9e35b
--- /dev/null
+++ b/frontend/src/components/TransactionRows/DurationRow.vue
@@ -0,0 +1,44 @@
+<template>
+  <div class="duration-row">
+    <b-row>
+      <b-col cols="5" class="text-right">
+        <div>{{ $t('decay.past_time') }}</div>
+      </b-col>
+      <b-col cols="7">
+        <span v-if="duration">{{ durationText }}</span>
+      </b-col>
+    </b-row>
+  </div>
+</template>
+<script>
+export default {
+  name: 'DurationRow',
+  props: {
+    decayStart: {
+      type: String,
+      required: true,
+    },
+    decayEnd: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    duration() {
+      return this.$moment.duration(new Date(this.decayEnd) - new Date(this.decayStart))._data
+    },
+    durationText() {
+      const order = ['years', 'months', 'days', 'hours', 'minutes', 'seconds']
+      const result = []
+      order.forEach((timeSpan) => {
+        if (this.duration[timeSpan] > 0) {
+          // eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys
+          const locale = this.$t(`time.${timeSpan}`)
+          result.push(`${this.duration[timeSpan]} ${locale}`)
+        }
+      })
+      return result.join(', ')
+    },
+  },
+}
+</script>
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index 372705a4c..7505ac7c1 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -20,7 +20,7 @@
         </b-row>
       </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"
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index d29c4dc09..a11b5d924 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -5,7 +5,7 @@
 const pkg = require('../../package')
 
 const constants = {
-  DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0
+  DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
     EXPECTED: 'v1.2022-03-18',