From 10090756a13bafdf594dbc16b6af732acf52b1be Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Feb 2022 13:55:45 +0100
Subject: [PATCH 1/4] avoid moment, use minus signs

---
 frontend/src/components/DecayInformation.vue  |  66 +++++-----
 frontend/src/components/Transaction.vue       |   2 +-
 frontend/src/i18n.js                          |   8 +-
 frontend/src/plugins/dashboard-plugin.js      |   3 -
 .../AccountOverview/GddTransactionList.vue    | 118 +++++++++---------
 frontend/test/testSetup.js                    |   3 -
 6 files changed, 93 insertions(+), 107 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 28af9b2b4..901b8f52b 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="decayinformation">
     <span v-if="decaytyp === 'short'">
-      {{ decay ? ' - ' + $n(decay.balance, 'decimal') + ' ' + decayStartBlockTextShort : '' }}
+      {{ decay ? ' − ' + $n(decay.balance, 'decimal') : '' }}
     </span>
 
     <div v-if="decaytyp === 'new'">
@@ -21,12 +21,11 @@
             <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
             <div>
               {{ $t('decay.decay_introduced') }} :
-              {{ $d($moment.unix(decay.decayStart), 'long') }}
             </div>
           </div>
           <div>
             <span v-if="decay.decayStart">
-              {{ $d($moment.unix(decay.decayStart), 'long') }}
+              {{ $d(new Date(decay.decayStart * 1000), 'long') }}
               {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
             </span>
           </div>
@@ -59,7 +58,7 @@
           <div>{{ $t('decay.decay') }}</div>
         </b-col>
         <b-col cols="6">
-          <div>- {{ $n(decay.balance, 'decimal') }}</div>
+          <div>− {{ $n(decay.balance, 'decimal') }}</div>
         </b-col>
       </b-row>
       <hr class="mt-2 mb-2" />
@@ -75,7 +74,7 @@
           <div v-if="type === 'receive'">{{ $t('decay.received') }}</div>
         </b-col>
         <b-col cols="6">
-          <div v-if="type === 'send'">- {{ $n(balance, 'decimal') }}</div>
+          <div v-if="type === 'send'">− {{ $n(balance, 'decimal') }}</div>
           <div v-if="type === 'receive'">+ {{ $n(balance, 'decimal') }}</div>
         </b-col>
       </b-row>
@@ -85,7 +84,7 @@
           <div>{{ $t('decay.decay') }}</div>
         </b-col>
         <b-col cols="6">
-          <div>- {{ $n(decay.balance, 'decimal') }}</div>
+          <div>− {{ $n(decay.balance, 'decimal') }}</div>
         </b-col>
       </b-row>
       <!-- Total-->
@@ -95,13 +94,13 @@
         </b-col>
         <b-col cols="6">
           <div v-if="type === 'send'">
-            <b>- {{ $n(balance + decay.balance, 'decimal') }}</b>
+            <b>− {{ $n(balance + decay.balance, 'decimal') }}</b>
           </div>
           <div v-if="type === 'receive'">
             <b>{{ $n(balance - decay.balance, 'decimal') }}</b>
           </div>
           <div v-if="type === 'creation'">
-            <b>- {{ $n(balance - decay.balance, 'decimal') }}</b>
+            <b>− {{ $n(balance - decay.balance, 'decimal') }}</b>
           </div>
         </b-col>
       </b-row>
@@ -109,33 +108,26 @@
   </div>
 </template>
 <script>
-export default {
-  name: 'DecayInformation',
-  props: {
-    balance: { type: Number },
-    type: { type: String, default: '' },
-    decay: {
-      balance: '',
-      decayDuration: '',
-      decayStart: 0,
-      decayEnd: 0,
-      decayStartBlock: 0,
-    },
-    decaytyp: { type: String, default: '' },
-  },
-  computed: {
-    decayStartBlockTextShort() {
-      return this.decay.decayStartBlock
-        ? this.$t('decay.decayStart') + this.$d(this.$moment.unix(this.decay.decayStartBlock))
-        : ''
-    },
-    duration() {
-      return this.$moment.duration(
-        this.$moment
-          .unix(new Date(this.decay.decayEnd))
-          .diff(this.$moment.unix(new Date(this.decay.decayStart))),
-      )._data
-    },
-  },
-}
+ import { duration } from 'moment'
+ 
+ export default {
+   name: 'DecayInformation',
+   props: {
+     balance: { type: Number },
+     type: { type: String, default: '' },
+     decay: {
+       balance: '',
+       decayDuration: '',
+       decayStart: 0,
+       decayEnd: 0,
+       decayStartBlock: 0,
+     },
+     decaytyp: { type: String, default: '' },
+   },
+   computed: {
+     duration() {
+       return duration((this.decay.decayEnd - this.decay.decayStart) * 1000)._data
+     },
+   },
+ }
 </script>
diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index f1deca565..1dcfee13a 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -50,7 +50,7 @@
             {{ $t('form.date') }}
           </b-col>
           <b-col cols="6">
-            {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+            {{ $d(new Date(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
           </b-col>
         </b-row>
 
diff --git a/frontend/src/i18n.js b/frontend/src/i18n.js
index 98e4ec971..0ce43310b 100644
--- a/frontend/src/i18n.js
+++ b/frontend/src/i18n.js
@@ -69,8 +69,8 @@ const dateTimeFormats = {
     },
     long: {
       year: 'numeric',
-      month: 'short',
-      day: 'numeric',
+      month: 'long',
+      day: 'long',
       weekday: 'short',
       hour: 'numeric',
       minute: 'numeric',
@@ -84,9 +84,9 @@ const dateTimeFormats = {
     },
     long: {
       day: 'numeric',
-      month: 'short',
+      month: 'long',
       year: 'numeric',
-      weekday: 'short',
+      weekday: 'long',
       hour: 'numeric',
       minute: 'numeric',
     },
diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js
index 4825377c7..983210027 100755
--- a/frontend/src/plugins/dashboard-plugin.js
+++ b/frontend/src/plugins/dashboard-plugin.js
@@ -11,8 +11,6 @@ import '@/assets/scss/gradido.scss'
 import FlatPickr from 'vue-flatpickr-component'
 import 'flatpickr/dist/flatpickr.css'
 
-import VueMoment from 'vue-moment'
-
 import Loading from 'vue-loading-overlay'
 import 'vue-loading-overlay/dist/vue-loading.css'
 
@@ -24,7 +22,6 @@ export default {
     Vue.use(GlobalDirectives)
     Vue.use(BootstrapVue)
     Vue.use(IconsPlugin)
-    Vue.use(VueMoment)
     Vue.use(PortalVue)
     Vue.use(FlatPickr)
     Vue.use(Loading)
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index f6c046fe6..d39d5ea88 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -77,7 +77,7 @@
                   </b-col>
                   <b-col cols="7">
                     <div class="gdd-transaction-list-item-date">
-                      {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+                      {{ $d(new Date(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
                     </div>
                   </b-col>
                 </b-row>
@@ -142,66 +142,66 @@
 </template>
 
 <script>
-import PaginationButtons from '../../../components/PaginationButtons'
-import DecayInformation from '../../../components/DecayInformation'
+ import PaginationButtons from '../../../components/PaginationButtons'
+ import DecayInformation from '../../../components/DecayInformation'
 
-const iconsByType = {
-  send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '-' },
-  receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent', operator: '+' },
-  creation: { icon: 'gift', classes: 'gradido-global-color-accent', operator: '+' },
-  decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray', operator: '-' },
-}
+ const iconsByType = {
+   send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '−' },
+   receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent', operator: '+' },
+   creation: { icon: 'gift', classes: 'gradido-global-color-accent', operator: '+' },
+   decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray', operator: '−' },
+ }
 
-export default {
-  name: 'gdd-transaction-list',
-  components: {
-    PaginationButtons,
-    DecayInformation,
-  },
-  data() {
-    return {
-      currentPage: 1,
-    }
-  },
-  props: {
-    transactions: { default: () => [] },
-    pageSize: { type: Number, default: 25 },
-    timestamp: { type: Number, default: 0 },
-    transactionCount: { type: Number, default: 0 },
-    showPagination: { type: Boolean, default: false },
-  },
-  methods: {
-    updateTransactions() {
-      this.$emit('update-transactions', {
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-      })
-      window.scrollTo(0, 0)
-    },
-    getProperties(givenType) {
-      const type = iconsByType[givenType]
-      if (type)
-        return {
-          icon: type.icon,
-          class: type.classes + ' m-mb-1 font2em',
-          operator: type.operator,
-        }
-      this.throwError('no icon to given type')
-    },
-    throwError(msg) {
-      throw new Error(msg)
-    },
-  },
-  watch: {
-    currentPage() {
-      this.updateTransactions()
-    },
-    timestamp: {
-      immediate: true,
-      handler: 'updateTransactions',
-    },
-  },
-}
+ export default {
+   name: 'gdd-transaction-list',
+   components: {
+     PaginationButtons,
+     DecayInformation,
+   },
+   data() {
+     return {
+       currentPage: 1,
+     }
+   },
+   props: {
+     transactions: { default: () => [] },
+     pageSize: { type: Number, default: 25 },
+     timestamp: { type: Number, default: 0 },
+     transactionCount: { type: Number, default: 0 },
+     showPagination: { type: Boolean, default: false },
+   },
+   methods: {
+     updateTransactions() {
+       this.$emit('update-transactions', {
+         currentPage: this.currentPage,
+         pageSize: this.pageSize,
+       })
+       window.scrollTo(0, 0)
+     },
+     getProperties(givenType) {
+       const type = iconsByType[givenType]
+       if (type)
+         return {
+           icon: type.icon,
+           class: type.classes + ' m-mb-1 font2em',
+           operator: type.operator,
+         }
+       this.throwError('no icon to given type')
+     },
+     throwError(msg) {
+       throw new Error(msg)
+     },
+   },
+   watch: {
+     currentPage() {
+       this.updateTransactions()
+     },
+     timestamp: {
+       immediate: true,
+       handler: 'updateTransactions',
+     },
+   },
+ }
 </script>
 <style>
 .el-table .cell {
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index 2e26db998..76066e776 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -10,8 +10,6 @@ import { messages } from 'vee-validate/dist/locale/en.json'
 import RegeneratorRuntime from 'regenerator-runtime'
 import VueQrcode from 'vue-qrcode'
 
-import VueMoment from 'vue-moment'
-
 // import clickOutside from '@/directives/click-ouside.js'
 import { focus } from 'vue-focus'
 
@@ -45,7 +43,6 @@ global.localVue.use(Vuex)
 global.localVue.use(IconsPlugin)
 global.localVue.use(RegeneratorRuntime)
 global.localVue.use(VueQrcode)
-global.localVue.use(VueMoment)
 global.localVue.component('validation-provider', ValidationProvider)
 global.localVue.component('validation-observer', ValidationObserver)
 // global.localVue.directive('click-outside', clickOutside)

From 804f9837f43010d040d06be5b9099990c545b8f1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Feb 2022 14:07:10 +0100
Subject: [PATCH 2/4] linting

---
 frontend/src/components/DecayInformation.vue  |  48 ++++----
 .../AccountOverview/GddTransactionList.vue    | 116 +++++++++---------
 2 files changed, 81 insertions(+), 83 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 901b8f52b..24b9b8381 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -19,9 +19,7 @@
         <b-col cols="6">
           <div v-if="decay.decayStartBlock > 0">
             <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
-            <div>
-              {{ $t('decay.decay_introduced') }} :
-            </div>
+            <div>{{ $t('decay.decay_introduced') }} :</div>
           </div>
           <div>
             <span v-if="decay.decayStart">
@@ -108,26 +106,26 @@
   </div>
 </template>
 <script>
- import { duration } from 'moment'
- 
- export default {
-   name: 'DecayInformation',
-   props: {
-     balance: { type: Number },
-     type: { type: String, default: '' },
-     decay: {
-       balance: '',
-       decayDuration: '',
-       decayStart: 0,
-       decayEnd: 0,
-       decayStartBlock: 0,
-     },
-     decaytyp: { type: String, default: '' },
-   },
-   computed: {
-     duration() {
-       return duration((this.decay.decayEnd - this.decay.decayStart) * 1000)._data
-     },
-   },
- }
+import { duration } from 'moment'
+
+export default {
+  name: 'DecayInformation',
+  props: {
+    balance: { type: Number },
+    type: { type: String, default: '' },
+    decay: {
+      balance: '',
+      decayDuration: '',
+      decayStart: 0,
+      decayEnd: 0,
+      decayStartBlock: 0,
+    },
+    decaytyp: { type: String, default: '' },
+  },
+  computed: {
+    duration() {
+      return duration((this.decay.decayEnd - this.decay.decayStart) * 1000)._data
+    },
+  },
+}
 </script>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index d39d5ea88..4e2df58d1 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -142,66 +142,66 @@
 </template>
 
 <script>
- import PaginationButtons from '../../../components/PaginationButtons'
- import DecayInformation from '../../../components/DecayInformation'
+import PaginationButtons from '../../../components/PaginationButtons'
+import DecayInformation from '../../../components/DecayInformation'
 
- const iconsByType = {
-   send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '−' },
-   receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent', operator: '+' },
-   creation: { icon: 'gift', classes: 'gradido-global-color-accent', operator: '+' },
-   decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray', operator: '−' },
- }
+const iconsByType = {
+  send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '−' },
+  receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent', operator: '+' },
+  creation: { icon: 'gift', classes: 'gradido-global-color-accent', operator: '+' },
+  decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray', operator: '−' },
+}
 
- export default {
-   name: 'gdd-transaction-list',
-   components: {
-     PaginationButtons,
-     DecayInformation,
-   },
-   data() {
-     return {
-       currentPage: 1,
-     }
-   },
-   props: {
-     transactions: { default: () => [] },
-     pageSize: { type: Number, default: 25 },
-     timestamp: { type: Number, default: 0 },
-     transactionCount: { type: Number, default: 0 },
-     showPagination: { type: Boolean, default: false },
-   },
-   methods: {
-     updateTransactions() {
-       this.$emit('update-transactions', {
-         currentPage: this.currentPage,
-         pageSize: this.pageSize,
-       })
-       window.scrollTo(0, 0)
-     },
-     getProperties(givenType) {
-       const type = iconsByType[givenType]
-       if (type)
-         return {
-           icon: type.icon,
-           class: type.classes + ' m-mb-1 font2em',
-           operator: type.operator,
-         }
-       this.throwError('no icon to given type')
-     },
-     throwError(msg) {
-       throw new Error(msg)
-     },
-   },
-   watch: {
-     currentPage() {
-       this.updateTransactions()
-     },
-     timestamp: {
-       immediate: true,
-       handler: 'updateTransactions',
-     },
-   },
- }
+export default {
+  name: 'gdd-transaction-list',
+  components: {
+    PaginationButtons,
+    DecayInformation,
+  },
+  data() {
+    return {
+      currentPage: 1,
+    }
+  },
+  props: {
+    transactions: { default: () => [] },
+    pageSize: { type: Number, default: 25 },
+    timestamp: { type: Number, default: 0 },
+    transactionCount: { type: Number, default: 0 },
+    showPagination: { type: Boolean, default: false },
+  },
+  methods: {
+    updateTransactions() {
+      this.$emit('update-transactions', {
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+      })
+      window.scrollTo(0, 0)
+    },
+    getProperties(givenType) {
+      const type = iconsByType[givenType]
+      if (type)
+        return {
+          icon: type.icon,
+          class: type.classes + ' m-mb-1 font2em',
+          operator: type.operator,
+        }
+      this.throwError('no icon to given type')
+    },
+    throwError(msg) {
+      throw new Error(msg)
+    },
+  },
+  watch: {
+    currentPage() {
+      this.updateTransactions()
+    },
+    timestamp: {
+      immediate: true,
+      handler: 'updateTransactions',
+    },
+  },
+}
 </script>
 <style>
 .el-table .cell {

From ab33b953fb7eb68bac20ba2ad9f00ecbb50c5f2c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Feb 2022 15:08:43 +0100
Subject: [PATCH 3/4] use vue-moment again

---
 frontend/src/components/DecayInformation.vue | 4 +---
 frontend/src/plugins/dashboard-plugin.js     | 3 +++
 frontend/test/testSetup.js                   | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 24b9b8381..0daa45a18 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -106,8 +106,6 @@
   </div>
 </template>
 <script>
-import { duration } from 'moment'
-
 export default {
   name: 'DecayInformation',
   props: {
@@ -124,7 +122,7 @@ export default {
   },
   computed: {
     duration() {
-      return duration((this.decay.decayEnd - this.decay.decayStart) * 1000)._data
+      return this.$moment.duration((this.decay.decayEnd - this.decay.decayStart) * 1000)._data
     },
   },
 }
diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js
index 983210027..4825377c7 100755
--- a/frontend/src/plugins/dashboard-plugin.js
+++ b/frontend/src/plugins/dashboard-plugin.js
@@ -11,6 +11,8 @@ import '@/assets/scss/gradido.scss'
 import FlatPickr from 'vue-flatpickr-component'
 import 'flatpickr/dist/flatpickr.css'
 
+import VueMoment from 'vue-moment'
+
 import Loading from 'vue-loading-overlay'
 import 'vue-loading-overlay/dist/vue-loading.css'
 
@@ -22,6 +24,7 @@ export default {
     Vue.use(GlobalDirectives)
     Vue.use(BootstrapVue)
     Vue.use(IconsPlugin)
+    Vue.use(VueMoment)
     Vue.use(PortalVue)
     Vue.use(FlatPickr)
     Vue.use(Loading)
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index 76066e776..2e26db998 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -10,6 +10,8 @@ import { messages } from 'vee-validate/dist/locale/en.json'
 import RegeneratorRuntime from 'regenerator-runtime'
 import VueQrcode from 'vue-qrcode'
 
+import VueMoment from 'vue-moment'
+
 // import clickOutside from '@/directives/click-ouside.js'
 import { focus } from 'vue-focus'
 
@@ -43,6 +45,7 @@ global.localVue.use(Vuex)
 global.localVue.use(IconsPlugin)
 global.localVue.use(RegeneratorRuntime)
 global.localVue.use(VueQrcode)
+global.localVue.use(VueMoment)
 global.localVue.component('validation-provider', ValidationProvider)
 global.localVue.component('validation-observer', ValidationObserver)
 // global.localVue.directive('click-outside', clickOutside)

From 8f8c9ab534d587c3a12eb1f0d2679d5b7f270bc2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Feb 2022 15:58:20 +0100
Subject: [PATCH 4/4] fix tests (check for minus signs)

---
 .../Pages/AccountOverview/GddTransactionList.spec.js      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
index b116de9e8..772a42f5f 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
@@ -145,7 +145,7 @@ describe('GddTransactionList', () => {
 
         it('has a minus operator', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
-            '-',
+            '−',
           )
         })
 
@@ -175,7 +175,7 @@ describe('GddTransactionList', () => {
 
         it('shows the decay calculation', () => {
           expect(transaction.findAll('div.gdd-transaction-list-item-decay').at(0).text()).toContain(
-            '- 0.5',
+            '− 0.5',
           )
         })
       })
@@ -265,7 +265,7 @@ describe('GddTransactionList', () => {
 
         it('shows the decay calculation', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-decay').at(0).text()).toContain(
-            '- 1.5',
+            '− 1.5',
           )
         })
       })
@@ -286,7 +286,7 @@ describe('GddTransactionList', () => {
 
         it('has a minus operator', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
-            '-',
+            '−',
           )
         })