From 63dd7be629f8f4aa208d35f8fa470453d0d78651 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 23 Dec 2021 10:10:53 +0100
Subject: [PATCH 01/11] button not registered email moved

---
 admin/src/pages/UserSearch.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 3bb194959..77b18518e 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -1,5 +1,11 @@
 <template>
   <div class="user-search">
+    <div style="text-align: right">
+     <b-button block variant="danger" @click="unconfirmedRegisterMails">
+        <b-icon icon="envelope" variant="light"></b-icon>
+        Anzeigen aller nicht registrierten E-Mails.
+      </b-button>
+    </div>
     <label>Usersuche</label>
     <b-input
       type="text"
@@ -16,10 +22,6 @@
       :criteria="criteria"
     />
     <div>
-      <b-button block variant="danger" @click="unconfirmedRegisterMails">
-        <b-icon icon="envelope" variant="light"></b-icon>
-        Anzeigen aller nicht registrierten E-Mails.
-      </b-button>
     </div>
   </div>
 </template>

From 787039e4af6a7ede568e58b63196c98aeb190610 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 23 Dec 2021 12:13:11 +0100
Subject: [PATCH 02/11] open creation with month name

---
 admin/src/components/UserTable.vue |  4 ++++
 admin/src/pages/UserSearch.vue     | 36 +++++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index eae328adf..3a82663ce 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -36,6 +36,10 @@
       hover
       stacked="md"
     >
+      <template #cell(creation)="data">
+        <div v-html="data.value"></div>
+      </template>
+
       <template #cell(edit_creation)="row">
         <b-button variant="info" size="md" @click="rowToogleDetails(row, 0)" class="mr-2">
           <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 77b18518e..c5bb8113b 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="user-search">
     <div style="text-align: right">
-     <b-button block variant="danger" @click="unconfirmedRegisterMails">
+      <b-button block variant="danger" @click="unconfirmedRegisterMails">
         <b-icon icon="envelope" variant="light"></b-icon>
         Anzeigen aller nicht registrierten E-Mails.
       </b-button>
@@ -21,8 +21,7 @@
       :fieldsTable="fields"
       :criteria="criteria"
     />
-    <div>
-    </div>
+    <div></div>
   </div>
 </template>
 <script>
@@ -43,9 +42,27 @@ export default {
         { key: 'lastName', label: 'Lastname' },
         {
           key: 'creation',
-          label: 'Creation',
+          label: 'open Creation',
           formatter: (value, key, item) => {
-            return String(value)
+            return (
+              `
+            <div>` +
+              this.$moment().subtract(2, 'month').format('MMMM') +
+              ` - ` +
+              String(value[0]) +
+              ` GDD</div>
+            <div>` +
+              this.$moment().subtract(1, 'month').format('MMMM') +
+              ` - ` +
+              String(value[1]) +
+              ` GDD</div>
+            <div>` +
+              this.$moment().format('MMMM') +
+              ` - ` +
+              String(value[2]) +
+              ` GDD</div>
+            `
+            )
           },
         },
         { key: 'show_details', label: 'Details' },
@@ -55,6 +72,15 @@ export default {
       searchResult: [],
       massCreation: [],
       criteria: '',
+      currentMonth: {
+        short: this.$moment().format('MMMM'),
+      },
+      lastMonth: {
+        short: this.$moment().subtract(1, 'month').format('MMMM'),
+      },
+      beforeLastMonth: {
+        short: this.$moment().subtract(2, 'month').format('MMMM'),
+      },
     }
   },
 

From bd5bbb3d554469e47dfbcd20dbd5f5d110f333df Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 23 Dec 2021 12:38:10 +0100
Subject: [PATCH 03/11] Generate text automatically when a creation is made

---
 admin/src/components/CreationFormular.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index efaff3481..78f53e6e5 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -190,6 +190,7 @@ export default {
     // Auswählen eines Zeitraumes
     updateRadioSelected(name, index, openCreation) {
       this.createdIndex = index
+      this.text = 'Schöpfung für ' + name.short + ' ' + this.$moment().format('YYYY')
       // Wenn Mehrfachschöpfung
       if (this.type === 'massCreation') {
         // An Creation.vue emitten und radioSelectedMass aktualisieren

From 0384bdd0ee6d0b6cd44dd24100a3d5ffd779ef04 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 23 Dec 2021 13:37:30 +0100
Subject: [PATCH 04/11] locales init, first step

---
 admin/package.json            |  3 ++-
 admin/scripts/missing-keys.sh | 17 +++++++++++++++++
 admin/scripts/sort.sh         | 25 +++++++++++++++++++++++++
 admin/scripts/sort_filter.jq  | 13 +++++++++++++
 admin/src/i18n.js             |  2 ++
 admin/src/locales/de.json     |  5 ++++-
 admin/src/locales/en.json     |  5 ++++-
 admin/src/locales/index.js    | 16 ++++++++++++++++
 admin/src/pages/Overview.vue  |  4 ++--
 9 files changed, 85 insertions(+), 5 deletions(-)
 create mode 100755 admin/scripts/missing-keys.sh
 create mode 100755 admin/scripts/sort.sh
 create mode 100644 admin/scripts/sort_filter.jq
 create mode 100644 admin/src/locales/index.js

diff --git a/admin/package.json b/admin/package.json
index 9d70c0b06..c94d0a2b0 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -12,7 +12,8 @@
     "dev": "yarn run serve",
     "build": "vue-cli-service build",
     "lint": "eslint --ext .js,.vue .",
-    "test": "jest --coverage"
+    "test": "jest --coverage",
+    "locales": "scripts/missing-keys.sh && scripts/sort.sh"
   },
   "dependencies": {
     "@babel/core": "^7.15.8",
diff --git a/admin/scripts/missing-keys.sh b/admin/scripts/missing-keys.sh
new file mode 100755
index 000000000..6dbaee897
--- /dev/null
+++ b/admin/scripts/missing-keys.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+ROOT_DIR=$(dirname "$0")/..
+
+sorting="jq -f $ROOT_DIR/scripts/sort_filter.jq"
+english="$sorting $ROOT_DIR/src/locales/en.json"
+german="$sorting $ROOT_DIR/src/locales/de.json"
+listPaths="jq -c 'path(..)|[.[]|tostring]|join(\".\")'"
+diffString="<( $english | $listPaths ) <( $german | $listPaths )"
+if eval "diff -q $diffString";
+then
+  : # all good
+else
+  eval "diff -y $diffString | grep '[|<>]'";
+  printf "\nEnglish and German translation keys do not match, see diff above.\n"
+  exit 1
+fi
diff --git a/admin/scripts/sort.sh b/admin/scripts/sort.sh
new file mode 100755
index 000000000..e5c5c41c6
--- /dev/null
+++ b/admin/scripts/sort.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+ROOT_DIR=$(dirname "$0")/..
+
+tmp=$(mktemp)
+exit_code=0
+
+for locale_file in $ROOT_DIR/src/locales/*.json
+do
+  jq -f $(dirname "$0")/sort_filter.jq $locale_file > "$tmp"
+  if [ "$*" == "--fix" ]
+  then
+    mv "$tmp" $locale_file
+  else
+    if diff -q "$tmp" $locale_file > /dev/null ;
+    then
+      : # all good
+    else
+      exit_code=$?
+      echo "$(basename -- $locale_file) is not sorted by keys"
+    fi
+  fi
+done
+
+exit $exit_code
diff --git a/admin/scripts/sort_filter.jq b/admin/scripts/sort_filter.jq
new file mode 100644
index 000000000..9d108f8f0
--- /dev/null
+++ b/admin/scripts/sort_filter.jq
@@ -0,0 +1,13 @@
+def walk(f):
+  . as $in
+  | if type == "object" then
+      reduce keys_unsorted[] as $key
+        ( {}; . + { ($key):  ($in[$key] | walk(f)) } ) | f
+  elif type == "array" then map( walk(f) ) | f
+  else f
+  end;
+
+def keys_sort_by(f):
+  to_entries | sort_by(.key|f ) | from_entries;
+
+walk(if type == "object" then keys_sort_by(ascii_upcase) else . end)
\ No newline at end of file
diff --git a/admin/src/i18n.js b/admin/src/i18n.js
index 7ccfec4c9..b72734d1f 100644
--- a/admin/src/i18n.js
+++ b/admin/src/i18n.js
@@ -5,8 +5,10 @@ Vue.use(VueI18n)
 
 const loadLocaleMessages = () => {
   const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.json$/i)
+  console.log(locales)
   const messages = {}
   locales.keys().forEach((key) => {
+    console.log(key)
     const matched = key.match(/([A-Za-z0-9-_]+)\./i)
     if (matched && matched.length > 1) {
       const locale = matched[1]
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 0967ef424..72d5f685a 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1 +1,4 @@
-{}
+{
+    "open_creations":"offene Schöpfungen",
+    "not_open_creations":"keine offene Schöpfungen"
+}
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 0967ef424..bbde7b043 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1 +1,4 @@
-{}
+{
+    "open_creations":"open creations",
+    "not_open_creations":"not open creations"
+}
\ No newline at end of file
diff --git a/admin/src/locales/index.js b/admin/src/locales/index.js
new file mode 100644
index 000000000..4cb375b40
--- /dev/null
+++ b/admin/src/locales/index.js
@@ -0,0 +1,16 @@
+const locales = [
+  {
+    name: 'English',
+    code: 'en',
+    iso: 'en-US',
+    enabled: true,
+  },
+  {
+    name: 'Deutsch',
+    code: 'de',
+    iso: 'de-DE',
+    enabled: true,
+  },
+]
+
+export default locales
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index 9b609c3ef..ed7ac8ad7 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -3,7 +3,7 @@
     <b-card
       v-show="$store.state.openCreations > 0"
       border-variant="primary"
-      header="offene Schöpfungen"
+      :header="$t('open_creations')"
       header-bg-variant="danger"
       header-text-variant="white"
       align="center"
@@ -17,7 +17,7 @@
     <b-card
       v-show="$store.state.openCreations < 1"
       border-variant="success"
-      header="keine offene Schöpfungen"
+      :header="$t('not_open_creations')"
       header-bg-variant="success"
       header-text-variant="white"
       align="center"

From 79aeb8affbfc85e2d1efd31a4ff68f965b79b212 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Dec 2021 14:06:19 +0100
Subject: [PATCH 05/11] do not transform rquire context when not in test mode

---
 admin/babel.config.js     | 17 ++++++++++++++---
 admin/src/i18n.js         |  4 +---
 admin/src/locales/de.json |  4 ++--
 admin/src/locales/en.json |  6 +++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/admin/babel.config.js b/admin/babel.config.js
index 80b148fd1..742388ea3 100644
--- a/admin/babel.config.js
+++ b/admin/babel.config.js
@@ -1,4 +1,15 @@
-module.exports = {
-  presets: ['@babel/preset-env'],
-  plugins: ['transform-require-context'],
+module.exports = function (api) {
+  api.cache(true)
+
+  const presets = ['@babel/preset-env']
+  const plugins = []
+
+  if (process.env.NODE_ENV === 'test') {
+    plugins.push('transform-require-context')
+  }
+
+  return {
+    presets,
+    plugins,
+  }
 }
diff --git a/admin/src/i18n.js b/admin/src/i18n.js
index b72734d1f..14e81543e 100644
--- a/admin/src/i18n.js
+++ b/admin/src/i18n.js
@@ -4,11 +4,9 @@ import VueI18n from 'vue-i18n'
 Vue.use(VueI18n)
 
 const loadLocaleMessages = () => {
-  const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.json$/i)
-  console.log(locales)
+  const locales = require.context('./locales/', true, /[A-Za-z0-9-_,\s]+\.json$/i)
   const messages = {}
   locales.keys().forEach((key) => {
-    console.log(key)
     const matched = key.match(/([A-Za-z0-9-_]+)\./i)
     if (matched && matched.length > 1) {
       const locale = matched[1]
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 72d5f685a..96a409c60 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1,4 +1,4 @@
 {
-    "open_creations":"offene Schöpfungen",
-    "not_open_creations":"keine offene Schöpfungen"
+  "not_open_creations": "keine offene Schöpfungen",
+  "open_creations": "offene Schöpfungen"
 }
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index bbde7b043..20ab609e0 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1,4 +1,4 @@
 {
-    "open_creations":"open creations",
-    "not_open_creations":"not open creations"
-}
\ No newline at end of file
+  "not_open_creations": "No open creations",
+  "open_creations": "Open creations"
+}

From c544a13ab004212e203c61f76391e3fda274065f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Dec 2021 14:09:42 +0100
Subject: [PATCH 06/11] Add yarn locales to admin test CI workflow

---
 .github/workflows/test.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 526c15cca..f49f690d1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -294,6 +294,35 @@ jobs:
       - name: Admin Interface | Lint
         run: docker run --rm gradido/admin:test yarn run lint
 
+  ##############################################################################
+  # JOB: LOCALES ADMIN ######################################################
+  ##############################################################################
+  locales_admin:
+    name: Locales - Admin
+    runs-on: ubuntu-latest
+    needs: [build_test_admin]
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ##########################################################################
+      # DOWNLOAD DOCKER IMAGE ##################################################
+      ##########################################################################
+      - name: Download Docker Image (Admin Interface)
+        uses: actions/download-artifact@v2
+        with:
+          name: docker-admin-test
+          path: /tmp
+      - name: Load Docker Image
+        run: docker load < /tmp/admin.tar
+      ##########################################################################
+      # LOCALES FRONTEND #######################################################
+      ##########################################################################
+      - name: admin | Locales
+        run: docker run --rm gradido/admin:test yarn run locales
+
   ##############################################################################
   # JOB: LINT BACKEND ##########################################################
   ##############################################################################

From 3fce16b170199eb3d1c03ec1bfb1a3756ad6f460 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Dec 2021 14:24:58 +0100
Subject: [PATCH 07/11] fix test for UserSearch

---
 admin/src/pages/UserSearch.spec.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index 0591ea01b..63fcefb5b 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -26,6 +26,16 @@ const mocks = {
   $toasted: {
     error: toastErrorMock,
   },
+  $moment: jest.fn(() => {
+    return {
+      format: jest.fn((m) => m),
+      subtract: jest.fn(() => {
+        return {
+          format: jest.fn((m) => m),
+        }
+      }),
+    }
+  }),
 }
 
 describe('UserSearch', () => {

From 00236f0f16960cbb7b77059afe9fa5d29c376489 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Dec 2021 14:32:31 +0100
Subject: [PATCH 08/11] Dockerfile ENV to ARG, set arg in CI workflow

---
 .github/workflows/test.yml | 2 +-
 admin/Dockerfile           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f49f690d1..ae4570622 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -47,7 +47,7 @@ jobs:
       ##########################################################################
       - name: Admin | Build `test` image
         run: |
-          docker build --target test -t "gradido/admin:test" admin/
+          docker build --target test -t "gradido/admin:test" admin/ --build-arg NODE_ENV="test"
           docker save "gradido/admin:test" > /tmp/admin.tar
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
diff --git a/admin/Dockerfile b/admin/Dockerfile
index 44ee4850c..41f986f87 100644
--- a/admin/Dockerfile
+++ b/admin/Dockerfile
@@ -13,7 +13,7 @@ ENV BUILD_VERSION="0.0.0.0"
 ## We cannot do `$(git rev-parse --short HEAD)` here so we default to 0000000
 ENV BUILD_COMMIT="0000000"
 ## SET NODE_ENV
-ENV NODE_ENV="production"
+ARG NODE_ENV="production"
 ## App relevant Envs
 ENV PORT="8080"
 

From 4469aed2606bb7097eb6bebe7c7269060c88816f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Dec 2021 14:41:28 +0100
Subject: [PATCH 09/11] add  to mocks

---
 admin/src/pages/Overview.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index 8e6ec1dbd..b0b8dc6fb 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/admin/src/pages/Overview.spec.js
@@ -31,6 +31,7 @@ const mocks = {
       openCreations: 2,
     },
   },
+  $t: jest.fn((t) => t),
 }
 
 describe('Overview', () => {

From 73027b80587e09f8f19eff97168ab5096c9334a5 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 27 Dec 2021 10:14:45 +0100
Subject: [PATCH 10/11] Update admin/src/pages/UserSearch.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 admin/src/pages/UserSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index c5bb8113b..186f2c8ce 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -42,7 +42,7 @@ export default {
         { key: 'lastName', label: 'Lastname' },
         {
           key: 'creation',
-          label: 'open Creation',
+          label: 'Open creations',
           formatter: (value, key, item) => {
             return (
               `

From cfea775447435ce9b4056203d3f1b889e09cd3ef Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 27 Dec 2021 10:56:08 +0100
Subject: [PATCH 11/11] add variable year for formated date and added it to the
 predifined text.

---
 admin/src/components/CreationFormular.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 78f53e6e5..9d1309cae 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -171,14 +171,17 @@ export default {
       currentMonth: {
         short: this.$moment().format('MMMM'),
         long: this.$moment().format('YYYY-MM-DD'),
+        year: this.$moment().format('YYYY'),
       },
       lastMonth: {
         short: this.$moment().subtract(1, 'month').format('MMMM'),
         long: this.$moment().subtract(1, 'month').format('YYYY-MM') + '-01',
+        year: this.$moment().subtract(1, 'month').format('YYYY'),
       },
       beforeLastMonth: {
         short: this.$moment().subtract(2, 'month').format('MMMM'),
         long: this.$moment().subtract(2, 'month').format('YYYY-MM') + '-01',
+        year: this.$moment().subtract(2, 'month').format('YYYY'),
       },
       submitObj: null,
       isdisabled: true,
@@ -190,7 +193,7 @@ export default {
     // Auswählen eines Zeitraumes
     updateRadioSelected(name, index, openCreation) {
       this.createdIndex = index
-      this.text = 'Schöpfung für ' + name.short + ' ' + this.$moment().format('YYYY')
+      this.text = 'Schöpfung für ' + name.short + ' ' + name.year
       // Wenn Mehrfachschöpfung
       if (this.type === 'massCreation') {
         // An Creation.vue emitten und radioSelectedMass aktualisieren