Merge branch 'master' into users_soft_delete

2025-12-13 07:45:54 +00:00 · 2022-02-18 15:54:05 +01:00 · 2022-02-18 15:54:05 +01:00 · 9582710a03
commit 9582710a03
parent 185c38c12a d00e7cef1f
12 changed files with 99 additions and 43 deletions
--- a/admin/src/components/ContentFooter.vue
+++ b/admin/src/components/ContentFooter.vue
@ -1,15 +1,45 @@
 <template>
-  <div class="">
+  <div>
    <hr />
-    <br />
-    <div class="text-center">
-      {{ $t('gradido_admin_footer') }}
-      <div><small>Version: 1.0.0</small></div>
-    </div>
+    <b-row align-v="center" class="mt-4 justify-content-lg-between">
+      <b-col>
+        <div class="copyright text-center text-lg-center text-muted">
+          © {{ year }}
+          <a
+            :href="`https://gradido.net/${$i18n.locale}`"
+            class="font-weight-bold ml-1"
+            target="_blank"
+          >
+            {{ $t('gradido_admin_footer') }}
+          </a>
+          |
+          <a href="https://github.com/gradido/gradido/releases/latest" target="_blank">
+            App version {{ version }}
+          </a>
+          <a
+            v-if="hash"
+            :href="'https://github.com/gradido/gradido/commit/' + hash"
+            target="_blank"
+          >
+            ({{ shortHash }})
+          </a>
+        </div>
+      </b-col>
+    </b-row>
  </div>
 </template>
 <script>
+import CONFIG from '../config'
+
 export default {
  name: 'ContentFooter',
+  data() {
+    return {
+      year: new Date().getFullYear(),
+      version: CONFIG.APP_VERSION,
+      hash: CONFIG.BUILD_COMMIT,
+      shortHash: CONFIG.BUILD_COMMIT_SHORT,
+    }
+  },
 }
 </script>
--- a/admin/src/components/NotFoundPage.spec.js
+++ b/admin/src/components/NotFoundPage.spec.js
@ -3,11 +3,15 @@ import NotFoundPage from './NotFoundPage'

 const localVue = global.localVue

+const mocks = {
+  $t: jest.fn((t) => t),
+}
+
 describe('NotFoundPage', () => {
  let wrapper

  const Wrapper = () => {
-    return mount(NotFoundPage, { localVue })
+    return mount(NotFoundPage, { localVue, mocks })
  }

  describe('mount', () => {
@ -18,5 +22,9 @@ describe('NotFoundPage', () => {
    it('has a svg', () => {
      expect(wrapper.find('svg').exists()).toBeTruthy()
    })
+
+    it('has a back button', () => {
+      expect(wrapper.find('.test-back').exists()).toBeTruthy()
+    })
  })
 })
--- a/admin/src/components/NotFoundPage.vue
+++ b/admin/src/components/NotFoundPage.vue
@ -4,7 +4,7 @@
    <div class="header py-1 py-lg-1 pt-lg-3">
      <b-container>
        <div class="header-body text-center mb-3">
-          <a href="login" to="login">
+          <a href="#!" @click="goback">
            <div class="container">
              <div class="row">
                <div class="col-sm-12 col-md-12 mt-5 mb-5">
@ -1185,6 +1185,11 @@
        </div>
      </b-container>
    </div>
+    <div class="text-center">
+      <b-button class="test-back" variant="light" @click="goback">
+        {{ $t('back') }}
+      </b-button>
+    </div>
  </div>
 </template>

@ -1213,6 +1218,11 @@ export default {
      },
    }
  },
+  methods: {
+    goback() {
+      this.$router.go(-1)
+    },
+  },
 }
 </script>
 <style>
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@ -1,5 +1,6 @@
 {
  "all_emails": "Alle Nutzer",
+  "back": "zurück",
  "bookmark": "bookmark",
  "confirmed": "bestätigt",
  "creation": "Schöpfung",
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@ -1,5 +1,6 @@
 {
  "all_emails": "All users",
+  "back": "back",
  "bookmark": "Remember",
  "confirmed": "confirmed",
  "creation": "Creation",
--- 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'">
@ -19,14 +19,11 @@
        <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') }} :
-              {{ $d($moment.unix(decay.decayStart), 'long') }}
-            </div>
+            <div>{{ $t('decay.decay_introduced') }} :</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 +56,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 +72,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 +82,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 +92,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>
@ -124,17 +121,8 @@ export default {
    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
+      return this.$moment.duration((this.decay.decayEnd - this.decay.decayStart) * 1000)._data
    },
  },
 }
--- 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>

--- 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',
    },
--- a/frontend/src/views/NotFoundPage.spec.js
+++ b/frontend/src/views/NotFoundPage.spec.js
@ -3,11 +3,15 @@ import NotFoundPage from './NotFoundPage'

 const localVue = global.localVue

+const mocks = {
+  $t: jest.fn((t) => t),
+}
+
 describe('NotFoundPage', () => {
  let wrapper

  const Wrapper = () => {
-    return mount(NotFoundPage, { localVue })
+    return mount(NotFoundPage, { localVue, mocks })
  }

  describe('mount', () => {
@ -18,5 +22,9 @@ describe('NotFoundPage', () => {
    it('has a svg', () => {
      expect(wrapper.find('svg').exists()).toBeTruthy()
    })
+
+    it('has a back button', () => {
+      expect(wrapper.find('.test-back').exists()).toBeTruthy()
+    })
  })
 })
--- a/frontend/src/views/NotFoundPage.vue
+++ b/frontend/src/views/NotFoundPage.vue
@ -4,7 +4,7 @@
    <div class="header py-1 py-lg-1 pt-lg-3">
      <b-container>
        <div class="header-body text-center mb-3">
-          <a href="login" to="login">
+          <a href="#!" @click="goback">
            <div class="container">
              <div class="row">
                <div class="col-sm-12 col-md-12 mt-5 mb-5">
@ -1185,6 +1185,11 @@
        </div>
      </b-container>
    </div>
+    <div class="text-center">
+      <b-button class="test-back" variant="light" @click="goback">
+        {{ $t('back') }}
+      </b-button>
+    </div>
  </div>
 </template>

@ -1213,6 +1218,11 @@ export default {
      },
    }
  },
+  methods: {
+    goback() {
+      this.$router.go(-1)
+    },
+  },
 }
 </script>
 <style>
--- 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(
-            '-',
+            '−',
          )
        })

--- 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>
@ -146,10 +146,10 @@ import PaginationButtons from '../../../components/PaginationButtons'
 import DecayInformation from '../../../components/DecayInformation'

 const iconsByType = {
-  send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '-' },
+  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: '-' },
+  decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray', operator: '−' },
 }

 export default {