diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index ead23829b..cb4f0711b 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -5,7 +5,6 @@
- {{ $t('delete_user') }}
{{ item.deletedAt ? $t('undelete_user') : $t('delete_user') }}
@@ -46,7 +45,7 @@ export default {
},
})
.then((result) => {
- this.$toasted.success('user is deleted')
+ this.$toasted.success(this.$t('user_deleted'))
this.$emit('updateDeletedAt', {
userId: this.item.userId,
deletedAt: result.data.deleteUser,
@@ -54,7 +53,7 @@ export default {
this.checked = false
})
.catch((error) => {
- this.$toasted.error('user deleted error', error)
+ this.$toasted.error('error', error)
})
},
unDeleteUser() {
@@ -66,16 +65,15 @@ export default {
},
})
.then((result) => {
- this.$toasted.success('user is undeleted')
+ this.$toasted.success(this.$t('user_recovered'))
this.$emit('updateDeletedAt', {
userId: this.item.userId,
deletedAt: result.data.unDeleteUser,
})
- // this.item.deletedAt = null
this.checked = false
})
.catch((error) => {
- this.$toasted.error('user undeleted error', error)
+ this.$toasted.error('error', error)
})
},
},
diff --git a/admin/src/components/Overlay.spec.js b/admin/src/components/Overlay.spec.js
new file mode 100644
index 000000000..6a857068f
--- /dev/null
+++ b/admin/src/components/Overlay.spec.js
@@ -0,0 +1,31 @@
+import { mount } from '@vue/test-utils'
+import Overlay from './Overlay.vue'
+
+const localVue = global.localVue
+
+const propsData = {
+ item: {},
+}
+
+const mocks = {
+ $t: jest.fn((t) => t),
+ $d: jest.fn((d) => String(d)),
+}
+
+describe('Overlay', () => {
+ let wrapper
+
+ const Wrapper = () => {
+ return mount(Overlay, { localVue, mocks, propsData })
+ }
+
+ describe('mount', () => {
+ beforeEach(() => {
+ wrapper = Wrapper()
+ })
+
+ it('has a DIV element with the class.component-overlay', () => {
+ expect(wrapper.find('.component-overlay').exists()).toBeTruthy()
+ })
+ })
+})
diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue
new file mode 100644
index 000000000..bf477c491
--- /dev/null
+++ b/admin/src/components/Overlay.vue
@@ -0,0 +1,67 @@
+
+
+
+ {{ $t('overlay.confirm.title') }}
+
+
+
+ {{ $t('transactionlist.amount') }}
+
+ {{ item.amount }} GDD
+
+
+
+ {{ $t('creation_for_month') }}
+
+ {{ $d(new Date(item.date), 'month') }} {{ $d(new Date(item.date), 'year') }}
+
+
+
+ {{ $t('transactionlist.memo') }}
+ {{ item.memo }}
+
+
+ {{ $t('name') }}
+ {{ item.firstName }} {{ item.lastName }}
+
+
+ {{ $t('e_mail') }}
+ {{ item.email }}
+
+
+
+
+ {{ $t('overlay.confirm.text') }}
+
+ {{ $t('overlay.confirm.question') }}
+
+
+
+
+
+ {{ $t('overlay.confirm.cancel') }}
+
+
+
+
+ {{ $t('overlay.confirm.yes') }}
+
+
+
+
+
+
+
+
diff --git a/admin/src/components/RowDetails.vue b/admin/src/components/RowDetails.vue
index 034114baa..84dfebbb5 100644
--- a/admin/src/components/RowDetails.vue
+++ b/admin/src/components/RowDetails.vue
@@ -1,8 +1,5 @@
-
-
-
{
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', () => {
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index d0b1e489b..54580c366 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -1,18 +1,7 @@
-
-
- {{ $t('overlay.confirm.title') }}
- {{ $t('overlay.confirm.text') }}
-
- {{ $t('overlay.confirm.question') }}
-
- {{ $t('overlay.confirm.no') }}
-
-
- {{ $t('overlay.confirm.yes') }}
-
-
+
+