From 26f537f6e31cda22fe3cec1976a374b9c146f5c5 Mon Sep 17 00:00:00 2001
From: ogerly
Date: Fri, 11 Feb 2022 14:00:53 +0100
Subject: [PATCH 01/23] confirm pending creation box, confirmbutton right
---
admin/src/components/UserTable.vue | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index fb24cf0f1..932ea2d22 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -13,18 +13,23 @@
{{ overlayText.text2 }}
-
-
+
+
+
{{ overlayText.button_cancel }}
-
-
+
{{ overlayText.button_ok }}
-
+
+
+
+
+
From bc68db6b21301f531a8dac36af2a28a8ee86c40b Mon Sep 17 00:00:00 2001
From: ogerly
Date: Fri, 11 Feb 2022 14:01:31 +0100
Subject: [PATCH 02/23] confirm pending creation box, confirmbutton right, yarn
lint
---
admin/src/components/UserTable.vue | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 932ea2d22..e2222fc0c 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -15,21 +15,23 @@
-
- {{ overlayText.button_cancel }}
-
-
- {{ overlayText.button_ok }}
-
+
+
+ {{ overlayText.button_cancel }}
+
+
+
+
+ {{ overlayText.button_ok }}
+
+
-
-
From 7834054a77dcb3e47383c4da017112d15afa0fe2 Mon Sep 17 00:00:00 2001
From: ogerly
Date: Fri, 11 Feb 2022 15:08:09 +0100
Subject: [PATCH 03/23] add components Overlay.vue, add localize for
Overlay.vue
---
admin/src/components/Overlay.vue | 66 +++++++++++++++++++++++++++++
admin/src/components/UserTable.vue | 68 ++++--------------------------
admin/src/locales/de.json | 4 +-
admin/src/locales/en.json | 3 +-
4 files changed, 80 insertions(+), 61 deletions(-)
create mode 100644 admin/src/components/Overlay.vue
diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue
new file mode 100644
index 000000000..e9af36cdd
--- /dev/null
+++ b/admin/src/components/Overlay.vue
@@ -0,0 +1,66 @@
+
+
+
+ {{ $t('overlay.confirm.title') }}
+
+
+ {{ $t('overlay.confirm.text') }}
+
+
+
+ {{ $t('name') }}
+ {{ items.firstName }} {{ items.lastName }}
+
+
+ {{ $t('e_mail') }}
+ {{ items.email }}
+
+
+ {{ $t('transactionlist.amount') }}
+ {{ items.amount }} GDD
+
+
+ {{ $t('transactionlist.memo') }}
+ {{ items.memo }}
+
+
+ {{ $t('creation_for_month') }}
+ {{ items.date }}
+
+
+
+
+
+
+ {{ $t('overlay.confirm.question') }}
+
+
+
+
+
+ {{ $t('overlay.confirm.cancel') }}
+
+
+
+
+ {{ $t('overlay.confirm.yes') }}
+
+
+
+
+
+
+
+
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index e2222fc0c..de59cb277 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -1,38 +1,7 @@
-
-
- {{ overlayText.header }}
-
-
- {{ overlayText.text1 }}
-
-
-
-
-
- {{ overlayText.text2 }}
-
-
-
-
-
- {{ overlayText.button_cancel }}
-
-
-
-
- {{ overlayText.button_ok }}
-
-
-
-
-
+
+
@@ -159,7 +128,7 @@
variant="success"
v-show="type === 'PageCreationConfirm'"
size="md"
- @click="overlayShow('confirm', row.item)"
+ @click="overlayShow(row.item)"
class="mr-2"
>
@@ -170,6 +139,7 @@
From 73bded2bf610c0fe5172973b6ca781c138bfac30 Mon Sep 17 00:00:00 2001
From: Alexander Friedland
Date: Tue, 15 Feb 2022 14:06:30 +0100
Subject: [PATCH 15/23] Update admin/src/components/Overlay.vue
Co-authored-by: Moriz Wahl
---
admin/src/components/Overlay.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue
index 5890d8b41..aaf50b2f7 100644
--- a/admin/src/components/Overlay.vue
+++ b/admin/src/components/Overlay.vue
@@ -18,7 +18,7 @@
{{ $t('transactionlist.memo') }}
- {{ items.memo }}
+ {{ item.memo }}
{{ $t('name') }}
From 13e0d99dbf5987667366c641ffb1133fe3cb709f Mon Sep 17 00:00:00 2001
From: Alexander Friedland
Date: Tue, 15 Feb 2022 14:06:38 +0100
Subject: [PATCH 16/23] Update admin/src/components/Overlay.vue
Co-authored-by: Moriz Wahl
---
admin/src/components/Overlay.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue
index aaf50b2f7..25ca9d254 100644
--- a/admin/src/components/Overlay.vue
+++ b/admin/src/components/Overlay.vue
@@ -26,7 +26,7 @@
{{ $t('e_mail') }}
- {{ items.email }}
+ {{ item.email }}
From 71e1cd50e987802396f3d4823c282d61814c0c58 Mon Sep 17 00:00:00 2001
From: Alexander Friedland
Date: Tue, 15 Feb 2022 14:06:45 +0100
Subject: [PATCH 17/23] Update admin/src/pages/CreationConfirm.vue
Co-authored-by: Moriz Wahl
---
admin/src/pages/CreationConfirm.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 304d628b5..2334a5a8b 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -2,7 +2,7 @@
From 39e38bea2c901f697b9d3af1429d909590528b6c Mon Sep 17 00:00:00 2001
From: Alexander Friedland
Date: Tue, 15 Feb 2022 14:06:56 +0100
Subject: [PATCH 18/23] Update admin/src/components/Overlay.vue
Co-authored-by: Moriz Wahl
---
admin/src/components/Overlay.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue
index 25ca9d254..af1c428b4 100644
--- a/admin/src/components/Overlay.vue
+++ b/admin/src/components/Overlay.vue
@@ -47,7 +47,7 @@
size="md"
variant="success"
class="m-3 text-right"
- @click="$emit('confirm-creation', items)"
+ @click="$emit('confirm-creation', item)"
>
{{ $t('overlay.confirm.yes') }}
From 0d3efa9900985207a78f2f80ce938a23949dd146 Mon Sep 17 00:00:00 2001
From: Alexander Friedland
Date: Tue, 15 Feb 2022 14:07:06 +0100
Subject: [PATCH 19/23] Update admin/src/components/Overlay.vue
Co-authored-by: Moriz Wahl
---
admin/src/components/Overlay.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue
index af1c428b4..6a4e3e94a 100644
--- a/admin/src/components/Overlay.vue
+++ b/admin/src/components/Overlay.vue
@@ -22,7 +22,7 @@
{{ $t('name') }}
- {{ items.firstName }} {{ items.lastName }}
+ {{ item.firstName }} {{ item.lastName }}
{{ $t('e_mail') }}
From 9f87e7a8c6d0d5d32998247b2b0d536442016396 Mon Sep 17 00:00:00 2001
From: Alexander Friedland
Date: Tue, 15 Feb 2022 14:07:22 +0100
Subject: [PATCH 20/23] Update admin/src/components/Overlay.vue
Co-authored-by: Moriz Wahl
---
admin/src/components/Overlay.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue
index 6a4e3e94a..b6afb28e4 100644
--- a/admin/src/components/Overlay.vue
+++ b/admin/src/components/Overlay.vue
@@ -7,7 +7,7 @@
{{ $t('transactionlist.amount') }}
- {{ items.amount }} GDD
+ {{ item.amount }} GDD
From e83e65aca73b055722f08e127bf018c2e8014cb0 Mon Sep 17 00:00:00 2001
From: Alexander Friedland
Date: Tue, 15 Feb 2022 14:07:32 +0100
Subject: [PATCH 21/23] Update admin/src/components/Overlay.vue
Co-authored-by: Moriz Wahl
---
admin/src/components/Overlay.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue
index b6afb28e4..bf477c491 100644
--- a/admin/src/components/Overlay.vue
+++ b/admin/src/components/Overlay.vue
@@ -13,7 +13,7 @@
{{ $t('creation_for_month') }}
- {{ $d(new Date(items.date), 'month') }} {{ $d(new Date(items.date), 'year') }}
+ {{ $d(new Date(item.date), 'month') }} {{ $d(new Date(item.date), 'year') }}
From e67427f8f143a1f494316815907ad7b4a477c63a Mon Sep 17 00:00:00 2001
From: Moriz Wahl
Date: Wed, 23 Feb 2022 09:24:46 +0100
Subject: [PATCH 22/23] linting
---
admin/src/pages/CreationConfirm.vue | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 2334a5a8b..54580c366 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -1,11 +1,7 @@
-
+
Date: Wed, 23 Feb 2022 09:40:30 +0100
Subject: [PATCH 23/23] fix tests
---
admin/src/components/Overlay.spec.js | 2 +-
admin/src/pages/CreationConfirm.spec.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/components/Overlay.spec.js b/admin/src/components/Overlay.spec.js
index 9aa338bd9..6a857068f 100644
--- a/admin/src/components/Overlay.spec.js
+++ b/admin/src/components/Overlay.spec.js
@@ -4,7 +4,7 @@ import Overlay from './Overlay.vue'
const localVue = global.localVue
const propsData = {
- items: {},
+ item: {},
}
const mocks = {
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 067aedd61..f0412678b 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -132,8 +132,8 @@ describe('CreationConfirm', () => {
await wrapper.find('#overlay').findAll('button').at(0).trigger('click')
})
- it('closes the overlay', () => {
- expect(wrapper.find('#overlay').isVisible()).toBeFalsy()
+ it('closes the overlay', async () => {
+ expect(wrapper.find('#overlay').exists()).toBeFalsy()
})
it('still has 2 items in the table', () => {