From 68d53bc6bc0dbc236cd1ad2159c14c009d015cbe Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 17 Feb 2022 09:30:17 +0100 Subject: [PATCH 01/11] add go -1 back if 404 page not found in adminarea --- admin/src/components/NotFoundPage.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/src/components/NotFoundPage.vue b/admin/src/components/NotFoundPage.vue index 68a8fb3c4..bc3a02336 100755 --- a/admin/src/components/NotFoundPage.vue +++ b/admin/src/components/NotFoundPage.vue @@ -4,7 +4,7 @@
- +
@@ -1185,6 +1185,9 @@
+
+ zurück +
From f5b533c3fe1b882136b5d312f6f48b7f46df708d Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 17 Feb 2022 09:30:39 +0100 Subject: [PATCH 02/11] add go -1 back if 404 page not found in frontend wallet --- frontend/src/views/NotFoundPage.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/NotFoundPage.vue b/frontend/src/views/NotFoundPage.vue index 68a8fb3c4..ef2359fed 100755 --- a/frontend/src/views/NotFoundPage.vue +++ b/frontend/src/views/NotFoundPage.vue @@ -4,7 +4,7 @@
- +
@@ -1185,6 +1185,9 @@
+
+ zurück +
From 7cb3dd397dac240a163ff4ee5bd406f873ac1397 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 17 Feb 2022 09:32:35 +0100 Subject: [PATCH 03/11] adminarea yarn lint --fix --- admin/src/components/NotFoundPage.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/src/components/NotFoundPage.vue b/admin/src/components/NotFoundPage.vue index bc3a02336..afb603b24 100755 --- a/admin/src/components/NotFoundPage.vue +++ b/admin/src/components/NotFoundPage.vue @@ -4,7 +4,7 @@
- +
@@ -1186,8 +1186,8 @@
- zurück -
+ zurück +
From 4bbc9772ac6b03daf88a4cc9c8040081bccc30c6 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 17 Feb 2022 09:32:57 +0100 Subject: [PATCH 04/11] frontend yarn lint --fix --- frontend/src/views/NotFoundPage.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/NotFoundPage.vue b/frontend/src/views/NotFoundPage.vue index ef2359fed..afb603b24 100755 --- a/frontend/src/views/NotFoundPage.vue +++ b/frontend/src/views/NotFoundPage.vue @@ -1185,9 +1185,9 @@
-
- zurück -
+
+ zurück +
From e5c9822fbe243fd1eb563a05b20f0b8e665ca3a0 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 17 Feb 2022 09:37:50 +0100 Subject: [PATCH 05/11] yarn lint --fix and yarn locales fix in adminarea --- admin/src/components/NotFoundPage.vue | 2 +- admin/src/locales/de.json | 1 + admin/src/locales/en.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/admin/src/components/NotFoundPage.vue b/admin/src/components/NotFoundPage.vue index afb603b24..2efa6a4dc 100755 --- a/admin/src/components/NotFoundPage.vue +++ b/admin/src/components/NotFoundPage.vue @@ -1186,7 +1186,7 @@
- zurück + {{ $t('back') }}
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 956ad7708..90a60475c 100644 --- 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", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index f2795c945..8775393dd 100644 --- 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", From ed6ee0f8235c448510a7af3bd8b945fc5f8ba26b Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 17 Feb 2022 09:39:06 +0100 Subject: [PATCH 06/11] add locales on back button in PageNotFound --- frontend/src/views/NotFoundPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/NotFoundPage.vue b/frontend/src/views/NotFoundPage.vue index afb603b24..2efa6a4dc 100755 --- a/frontend/src/views/NotFoundPage.vue +++ b/frontend/src/views/NotFoundPage.vue @@ -1186,7 +1186,7 @@
- zurück + {{ $t('back') }}
From f7fa134346f673461656a42fa5a7eb5f5786867d Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 17 Feb 2022 09:57:52 +0100 Subject: [PATCH 07/11] yarn test fixed --- frontend/src/views/NotFoundPage.spec.js | 12 ++++++++++-- frontend/src/views/NotFoundPage.vue | 5 ++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/NotFoundPage.spec.js b/frontend/src/views/NotFoundPage.spec.js index 709b24807..c14f03b4f 100644 --- 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', () => { @@ -16,7 +20,11 @@ describe('NotFoundPage', () => { }) it('has a svg', () => { - expect(wrapper.find('svg').exists()).toBeTruthy() + expect(wrapper.find('svg.test-404').exists()).toBeTruthy() + }) + + it('has a back button', () => { + expect(wrapper.find('.test-back').exists()).toBeTruthy() }) }) }) diff --git a/frontend/src/views/NotFoundPage.vue b/frontend/src/views/NotFoundPage.vue index 2efa6a4dc..3fe01d091 100755 --- a/frontend/src/views/NotFoundPage.vue +++ b/frontend/src/views/NotFoundPage.vue @@ -9,6 +9,7 @@
- {{ $t('back') }} + + {{ $t('back') }} +
From f6776576284a19bb110b16744d8e448ef6ba0f25 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 17 Feb 2022 10:01:19 +0100 Subject: [PATCH 08/11] yarn test fixed adminarea --- admin/src/components/NotFoundPage.spec.js | 10 +++++++++- admin/src/components/NotFoundPage.vue | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/admin/src/components/NotFoundPage.spec.js b/admin/src/components/NotFoundPage.spec.js index 709b24807..99eef569b 100644 --- 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() + }) }) }) diff --git a/admin/src/components/NotFoundPage.vue b/admin/src/components/NotFoundPage.vue index 2efa6a4dc..b42c3d8bb 100755 --- a/admin/src/components/NotFoundPage.vue +++ b/admin/src/components/NotFoundPage.vue @@ -1186,7 +1186,9 @@
- {{ $t('back') }} + + {{ $t('back') }} +
From a0b8d8266f3fe291d08cb46223ebf3d249edb390 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 17 Feb 2022 10:01:46 +0100 Subject: [PATCH 09/11] yarn test fixed frontend walet --- frontend/src/views/NotFoundPage.spec.js | 2 +- frontend/src/views/NotFoundPage.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/views/NotFoundPage.spec.js b/frontend/src/views/NotFoundPage.spec.js index c14f03b4f..99eef569b 100644 --- a/frontend/src/views/NotFoundPage.spec.js +++ b/frontend/src/views/NotFoundPage.spec.js @@ -20,7 +20,7 @@ describe('NotFoundPage', () => { }) it('has a svg', () => { - expect(wrapper.find('svg.test-404').exists()).toBeTruthy() + expect(wrapper.find('svg').exists()).toBeTruthy() }) it('has a back button', () => { diff --git a/frontend/src/views/NotFoundPage.vue b/frontend/src/views/NotFoundPage.vue index 3fe01d091..b42c3d8bb 100755 --- a/frontend/src/views/NotFoundPage.vue +++ b/frontend/src/views/NotFoundPage.vue @@ -9,7 +9,6 @@
Date: Thu, 17 Feb 2022 10:41:00 +0100 Subject: [PATCH 10/11] make a function goback() from router go-1 in frontend wallet --- frontend/src/views/NotFoundPage.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/NotFoundPage.vue b/frontend/src/views/NotFoundPage.vue index b42c3d8bb..f01f76044 100755 --- a/frontend/src/views/NotFoundPage.vue +++ b/frontend/src/views/NotFoundPage.vue @@ -4,7 +4,7 @@
- +
@@ -1186,7 +1186,7 @@
- + {{ $t('back') }}
@@ -1218,6 +1218,11 @@ export default { }, } }, + methods: { + goback() { + this.$router.go(-1) + }, + }, }