From c0138b3811826f68b52e7e38b5a453bb2a5f0ca8 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 20 Jan 2022 17:17:22 +0100 Subject: [PATCH 01/18] fix: Set Locale after Login --- frontend/src/views/Pages/Login.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 4d2b75d2a..1c2f4c8d0 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -64,6 +64,7 @@ import InputPassword from '../../components/Inputs/InputPassword' import InputEmail from '../../components/Inputs/InputEmail' import { login } from '../../graphql/queries' import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo' +import { localeChanged } from 'vee-validate' export default { name: 'login', @@ -101,6 +102,8 @@ export default { data: { login }, } = result this.$store.dispatch('login', login) + this.$i18n.locale = login.language + localeChanged(login.language) this.$router.push('/overview') loader.hide() }) From 54cc6c9327c74223fe7f68ed19519def860066e8 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 21 Jan 2022 02:58:05 +0100 Subject: [PATCH 02/18] adjusted backend .env.template to recognize community variables --- backend/.env.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/.env.template b/backend/.env.template index 9ff9beb01..4caebf107 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -27,9 +27,9 @@ EMAIL_LINK_SETPASSWORD=$EMAIL_LINK_SETPASSWORD #KLICKTIPP_APIKEY_DE= #KLICKTIPP_APIKEY_EN= #KLICKTIPP=true -COMMUNITY_NAME= -COMMUNITY_URL= -COMMUNITY_REGISTER_URL= -COMMUNITY_DESCRIPTION= +COMMUNITY_NAME=$COMMUNITY_NAME +COMMUNITY_URL=$COMMUNITY_URL +COMMUNITY_REGISTER_URL=$COMMUNITY_REGISTER_URL +COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION WEBHOOK_ELOPAGE_SECRET=$WEBHOOK_ELOPAGE_SECRET \ No newline at end of file From f7037c063b0e3c684885e6b9ccb0650072425eae Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 21 Jan 2022 02:58:32 +0100 Subject: [PATCH 03/18] include stage1 example for deployment bare metal .env.dist --- deployment/bare_metal/.env.dist | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index 4e737a95e..f5fa4ce2c 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -30,6 +30,11 @@ TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log WEBHOOK_ELOPAGE_SECRET=secret +COMMUNITY_NAME=Gradido Development Stage1 +COMMUNITY_URL=https://stage1.gradido.net/ +COMMUNITY_REGISTER_URL=https://stage1.gradido.net/register +COMMUNITY_DESCRIPTION=Gradido Development Stage1 Test Community + # frontend GRAPHQL_URI=https://stage1.gradido.net/graphql ADMIN_AUTH_URL=https://stage1.gradido.net/admin/authenticate?token={token} From 2f0f6d7db7776d9918ca3ff25ecca319870bf8ca Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 21 Jan 2022 11:36:50 +0100 Subject: [PATCH 04/18] check array and send the correct parameters to the thx page --- frontend/src/locales/de.json | 2 +- frontend/src/locales/en.json | 2 +- frontend/src/views/Pages/ResetPassword.vue | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 651944547..d92f42f5d 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -198,7 +198,7 @@ }, "thx": { "activateEmail": "Dein Konto wurde noch nicht aktiviert. Bitte überprüfe deine E-Mail und klicke den Aktivierungslink!", - "checkEmail": "Deine E-Mail wurde erfolgreich verifiziert.", + "checkEmail": "Deine E-Mail wurde erfolgreich verifiziert. Du kannst dich jetzt anmelden.", "email": "Wir haben dir eine E-Mail gesendet.", "emailActivated": "Danke dass Du deine E-Mail bestätigt hast.", "errorTitle": "Achtung!", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index c6cbeed69..014d449a0 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -198,7 +198,7 @@ }, "thx": { "activateEmail": "Your account has not been activated yet, please check your emails and click the activation link!", - "checkEmail": "Your email has been successfully verified.", + "checkEmail": "Your email has been successfully verified. You can sign in now.", "email": "We have sent you an email.", "emailActivated": "Thank you your email has been activated.", "errorTitle": "Attention!", diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue index 05d8a0f6e..db4e0d6c8 100644 --- a/frontend/src/views/Pages/ResetPassword.vue +++ b/frontend/src/views/Pages/ResetPassword.vue @@ -92,7 +92,11 @@ export default { }) .then(() => { this.form.password = '' - this.$router.push('/thx/reset') + if (textFields.checkEmail) { + this.$router.push('/thx/checkEmail') + } else { + this.$router.push('/thx/reset') + } }) .catch((error) => { this.$toasted.global.error(error.message) From 26fbadb8649a1fb6e5999b0d631633773f72f2bf Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 21 Jan 2022 12:16:33 +0100 Subject: [PATCH 05/18] fix: Language set Correctly after Page Reload in Admin Interface --- admin/src/main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin/src/main.js b/admin/src/main.js index c0004beca..5495ca996 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -44,6 +44,9 @@ Vue.use(Toasted, { addNavigationGuards(router, store, apolloProvider.defaultClient, i18n) +i18n.locale = + store.state.moderator && store.state.moderator.language ? store.state.moderator.language : 'en' + new Vue({ moment, router, From 40021fb46fdba96825f0bf197d1fe020779a309f Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 21 Jan 2022 13:15:34 +0100 Subject: [PATCH 06/18] check on the checkMail page which url path is attached --- frontend/src/views/Pages/ResetPassword.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue index db4e0d6c8..69bc9e533 100644 --- a/frontend/src/views/Pages/ResetPassword.vue +++ b/frontend/src/views/Pages/ResetPassword.vue @@ -92,9 +92,10 @@ export default { }) .then(() => { this.form.password = '' - if (textFields.checkEmail) { + if (this.$route.path.includes('checkEmail')) { this.$router.push('/thx/checkEmail') - } else { + } + if (this.$route.path.includes('reset')) { this.$router.push('/thx/reset') } }) From 14e51b9f8705dcf4e37b2fca4c5bdbc778a9f75e Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Fri, 21 Jan 2022 19:01:12 +0100 Subject: [PATCH 07/18] Update frontend/src/views/Pages/ResetPassword.vue Co-authored-by: Hannes Heine --- frontend/src/views/Pages/ResetPassword.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue index 69bc9e533..f0ed0c348 100644 --- a/frontend/src/views/Pages/ResetPassword.vue +++ b/frontend/src/views/Pages/ResetPassword.vue @@ -94,8 +94,7 @@ export default { this.form.password = '' if (this.$route.path.includes('checkEmail')) { this.$router.push('/thx/checkEmail') - } - if (this.$route.path.includes('reset')) { + } else if (this.$route.path.includes('reset')) { this.$router.push('/thx/reset') } }) From e17d1b34e2a90a3cd801d56f7d2dc86e8b276b09 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sat, 22 Jan 2022 10:09:04 +0100 Subject: [PATCH 08/18] test fixed for checkMail --- frontend/src/views/Pages/ResetPassword.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/views/Pages/ResetPassword.spec.js index e28d16c3e..4c45e7c2e 100644 --- a/frontend/src/views/Pages/ResetPassword.spec.js +++ b/frontend/src/views/Pages/ResetPassword.spec.js @@ -190,7 +190,7 @@ describe('ResetPassword', () => { }) it('redirects to "/thx/reset"', () => { - expect(routerPushMock).toHaveBeenCalledWith('/thx/reset') + expect(routerPushMock).toHaveBeenCalledWith('/thx/checkEmail') }) }) }) From 0bffe9d63ee10372d962d58e5d9966b3b1da063c Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 24 Jan 2022 12:43:04 +0100 Subject: [PATCH 09/18] change text for test checkMail --- frontend/src/views/Pages/ResetPassword.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/views/Pages/ResetPassword.spec.js index 4c45e7c2e..b86d37bc4 100644 --- a/frontend/src/views/Pages/ResetPassword.spec.js +++ b/frontend/src/views/Pages/ResetPassword.spec.js @@ -189,7 +189,7 @@ describe('ResetPassword', () => { ) }) - it('redirects to "/thx/reset"', () => { + it('redirects to "/thx/heckEmail"', () => { expect(routerPushMock).toHaveBeenCalledWith('/thx/checkEmail') }) }) From 65d23548177205f0e85bbddb75f8f80125684db1 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Mon, 24 Jan 2022 15:58:36 +0100 Subject: [PATCH 10/18] Update frontend/src/views/Pages/ResetPassword.spec.js Co-authored-by: Moriz Wahl --- frontend/src/views/Pages/ResetPassword.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/views/Pages/ResetPassword.spec.js index b86d37bc4..d6319086c 100644 --- a/frontend/src/views/Pages/ResetPassword.spec.js +++ b/frontend/src/views/Pages/ResetPassword.spec.js @@ -189,7 +189,7 @@ describe('ResetPassword', () => { ) }) - it('redirects to "/thx/heckEmail"', () => { + it('redirects to "/thx/checkEmail"', () => { expect(routerPushMock).toHaveBeenCalledWith('/thx/checkEmail') }) }) From d0fdd57b7d241058d41ada30ab44e30627f5cb13 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 24 Jan 2022 16:25:40 +0100 Subject: [PATCH 11/18] bold text if acive page --- frontend/src/components/Menu/Sidebar.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 18ee08dbf..67e3a7d25 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -4,7 +4,7 @@

- + {{ $t('overview') }} @@ -52,3 +52,8 @@ export default { }, } + From 9df3ca7c01a3a79e7aaf63a971be2f780f7baff0 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 24 Jan 2022 16:42:09 +0100 Subject: [PATCH 12/18] mock path to have differnet include results --- .../src/views/Pages/ResetPassword.spec.js | 126 +++++++++++------- frontend/src/views/Pages/ResetPassword.vue | 2 +- 2 files changed, 81 insertions(+), 47 deletions(-) diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/views/Pages/ResetPassword.spec.js index d6319086c..da8b4bc4f 100644 --- a/frontend/src/views/Pages/ResetPassword.spec.js +++ b/frontend/src/views/Pages/ResetPassword.spec.js @@ -15,54 +15,48 @@ const stubs = { RouterLink: RouterLinkStub, } -const createMockObject = (comingFrom) => { - return { - localVue, - mocks: { - $i18n: { - locale: 'en', - }, - $t: jest.fn((t) => t), - $route: { - params: { - optin: '123', - comingFrom, - }, - path: { - includes: (t) => t, - }, - }, - $toasted: { - global: { - error: toasterMock, - }, - }, - $router: { - push: routerPushMock, - }, - $loading: { - show: jest.fn(() => { - return { hide: jest.fn() } - }), - }, - $apollo: { - mutate: apolloMutationMock, - }, +const mocks = { + $i18n: { + locale: 'en', + }, + $t: jest.fn((t) => t), + $route: { + params: { + optin: '123', }, - stubs, - } + path: { + mock: 'checkEmail', + includes: jest.fn((t) => t === mocks.$route.path.mock), + }, + }, + $toasted: { + global: { + error: toasterMock, + }, + }, + $router: { + push: routerPushMock, + }, + $loading: { + show: jest.fn(() => { + return { hide: jest.fn() } + }), + }, + $apollo: { + mutate: apolloMutationMock, + }, } describe('ResetPassword', () => { let wrapper - const Wrapper = (functionName) => { - return mount(ResetPassword, functionName) + const Wrapper = () => { + return mount(ResetPassword, { localVue, mocks, stubs }) } describe('mount', () => { beforeEach(() => { - wrapper = Wrapper(createMockObject()) + wrapper = Wrapper() }) describe('No valid optin', () => { @@ -86,11 +80,32 @@ describe('ResetPassword', () => { }) describe('Register header', () => { - it('has a welcome message', async () => { - expect(wrapper.find('div.header').text()).toContain('settings.password.reset') - expect(wrapper.find('div.header').text()).toContain( - 'settings.password.reset-password.text', - ) + describe('from reset', () => { + beforeEach(() => { + mocks.$route.path.mock = 'reset' + wrapper = Wrapper() + }) + + it('has a welcome message', async () => { + expect(wrapper.find('div.header').text()).toContain('settings.password.reset') + expect(wrapper.find('div.header').text()).toContain( + 'settings.password.reset-password.text', + ) + }) + }) + + describe('from checkEmail', () => { + beforeEach(() => { + mocks.$route.path.mock = 'checkEmail' + wrapper = Wrapper() + }) + + it('has a welcome message', async () => { + expect(wrapper.find('div.header').text()).toContain('settings.password.set') + expect(wrapper.find('div.header').text()).toContain( + 'settings.password.set-password.text', + ) + }) }) }) @@ -128,7 +143,6 @@ describe('ResetPassword', () => { describe('submit form', () => { beforeEach(async () => { - // wrapper = Wrapper(createMockObject()) await wrapper.findAll('input').at(0).setValue('Aa123456_') await wrapper.findAll('input').at(1).setValue('Aa123456_') await flushPromises() @@ -164,14 +178,14 @@ describe('ResetPassword', () => { }) }) - describe('server response with success', () => { + describe('server response with success on /checkEmail', () => { beforeEach(async () => { + mocks.$route.path.mock = 'checkEmail' apolloMutationMock.mockResolvedValue({ data: { resetPassword: 'success', }, }) - wrapper = Wrapper(createMockObject('checkEmail')) await wrapper.findAll('input').at(0).setValue('Aa123456_') await wrapper.findAll('input').at(1).setValue('Aa123456_') await wrapper.find('form').trigger('submit') @@ -193,6 +207,26 @@ describe('ResetPassword', () => { expect(routerPushMock).toHaveBeenCalledWith('/thx/checkEmail') }) }) + + describe('server response with success on /reset', () => { + beforeEach(async () => { + mocks.$route.path.mock = 'reset' + wrapper = Wrapper() + apolloMutationMock.mockResolvedValue({ + data: { + resetPassword: 'success', + }, + }) + await wrapper.findAll('input').at(0).setValue('Aa123456_') + await wrapper.findAll('input').at(1).setValue('Aa123456_') + await wrapper.find('form').trigger('submit') + await flushPromises() + }) + + it('redirects to "/thx/reset"', () => { + expect(routerPushMock).toHaveBeenCalledWith('/thx/reset') + }) + }) }) }) }) diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue index f0ed0c348..0023c3838 100644 --- a/frontend/src/views/Pages/ResetPassword.vue +++ b/frontend/src/views/Pages/ResetPassword.vue @@ -94,7 +94,7 @@ export default { this.form.password = '' if (this.$route.path.includes('checkEmail')) { this.$router.push('/thx/checkEmail') - } else if (this.$route.path.includes('reset')) { + } else { this.$router.push('/thx/reset') } }) From 1be4d83a3648cdbb63b0feda9260c0a69f61dc87 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 24 Jan 2022 16:58:03 +0100 Subject: [PATCH 13/18] change css for twi elements, sidebar and navbar active only --- frontend/src/components/Menu/Sidebar.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 67e3a7d25..20943d14a 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -53,7 +53,8 @@ export default { } From 6dca1536c829c35d6a9dfe849833218eb90d32ef Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 24 Jan 2022 17:01:26 +0100 Subject: [PATCH 14/18] test that i18n.locale is set to the value in the store --- admin/src/main.test.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/admin/src/main.test.js b/admin/src/main.test.js index 06efa8b65..a5eda5c65 100644 --- a/admin/src/main.test.js +++ b/admin/src/main.test.js @@ -15,7 +15,15 @@ jest.mock('vue-apollo') jest.mock('vuex') jest.mock('vue-i18n') jest.mock('vue-moment') -jest.mock('./store/store') +jest.mock('./store/store', () => { + return { + state: { + moderator: { + language: 'es', + }, + }, + } +}) jest.mock('./i18n') jest.mock('./router/router') @@ -101,4 +109,8 @@ describe('main', () => { }), ) }) + + it('sets the locale from store', () => { + expect(i18n.locale).toBe('es') + }) }) From 6d6cdb1e647d005d3e18a33a1c43934c2c9cf6ad Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 24 Jan 2022 17:26:47 +0100 Subject: [PATCH 15/18] set i18n.locale and localeChanged from vee-validate inside the language mutation of the store --- frontend/src/store/store.js | 4 ++++ frontend/src/store/store.test.js | 18 ++++++++++++++++++ frontend/src/views/Pages/Login.vue | 3 --- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index d219ecacd..1a6521cd7 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -1,11 +1,15 @@ import Vue from 'vue' import Vuex from 'vuex' import createPersistedState from 'vuex-persistedstate' +import { localeChanged } from 'vee-validate' +import i18n from '../i18n.js' Vue.use(Vuex) export const mutations = { language: (state, language) => { + i18n.locale = language + localeChanged(language) state.language = language }, email: (state, email) => { diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js index da108b9ff..4c0c03178 100644 --- a/frontend/src/store/store.test.js +++ b/frontend/src/store/store.test.js @@ -1,8 +1,18 @@ import { mutations, actions } from './store' import Vuex from 'vuex' import Vue from 'vue' +import i18n from '../i18n.js' +import { localeChanged } from 'vee-validate' jest.mock('vuex') +jest.mock('../i18n.js') +jest.mock('vee-validate', () => { + return { + localeChanged: jest.fn(), + } +}) + +i18n.locale = 'blubb' const { language, @@ -29,6 +39,14 @@ describe('Vuex store', () => { language(state, 'de') expect(state.language).toEqual('de') }) + + it('sets the i18n locale', () => { + expect(i18n.locale).toBe('de') + }) + + it('calls localChanged of vee-validate', () => { + expect(localeChanged).toBeCalledWith('de') + }) }) describe('email', () => { diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 1c2f4c8d0..4d2b75d2a 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -64,7 +64,6 @@ import InputPassword from '../../components/Inputs/InputPassword' import InputEmail from '../../components/Inputs/InputEmail' import { login } from '../../graphql/queries' import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo' -import { localeChanged } from 'vee-validate' export default { name: 'login', @@ -102,8 +101,6 @@ export default { data: { login }, } = result this.$store.dispatch('login', login) - this.$i18n.locale = login.language - localeChanged(login.language) this.$router.push('/overview') loader.hide() }) From e8920f4c35de6cd6dbd7ec14722438089a9a4ad2 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 24 Jan 2022 17:39:42 +0100 Subject: [PATCH 16/18] all locale handling is done by store, so that commit the language to store on change is enough. Note that dispatch login calls commit language --- .../src/components/#LanguageSwitchSelect.vue# | 39 +++++++++++++++++++ .../src/components/.#LanguageSwitchSelect.vue | 1 + frontend/src/components/LanguageSwitch.vue | 5 +-- frontend/src/main.js | 2 +- frontend/src/routes/guards.js | 3 +- frontend/src/views/Pages/Register.vue | 3 -- .../UserProfile/UserCard_Language.spec.js | 4 -- .../Pages/UserProfile/UserCard_Language.vue | 3 -- 8 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 frontend/src/components/#LanguageSwitchSelect.vue# create mode 120000 frontend/src/components/.#LanguageSwitchSelect.vue diff --git a/frontend/src/components/#LanguageSwitchSelect.vue# b/frontend/src/components/#LanguageSwitchSelect.vue# new file mode 100644 index 000000000..545cef4e9 --- /dev/null +++ b/frontend/src/components/#LanguageSwitchSelect.vue# @@ -0,0 +1,39 @@ + + diff --git a/frontend/src/components/.#LanguageSwitchSelect.vue b/frontend/src/components/.#LanguageSwitchSelect.vue new file mode 120000 index 000000000..8a9d4d991 --- /dev/null +++ b/frontend/src/components/.#LanguageSwitchSelect.vue @@ -0,0 +1 @@ +moriz@bluestar.2222:1642854724 \ No newline at end of file diff --git a/frontend/src/components/LanguageSwitch.vue b/frontend/src/components/LanguageSwitch.vue index 5e4c71287..2678883c3 100644 --- a/frontend/src/components/LanguageSwitch.vue +++ b/frontend/src/components/LanguageSwitch.vue @@ -12,7 +12,6 @@
diff --git a/frontend/src/components/.#LanguageSwitchSelect.vue b/frontend/src/components/.#LanguageSwitchSelect.vue deleted file mode 120000 index 8a9d4d991..000000000 --- a/frontend/src/components/.#LanguageSwitchSelect.vue +++ /dev/null @@ -1 +0,0 @@ -moriz@bluestar.2222:1642854724 \ No newline at end of file From c51758e597f2ac4503764178872d96dc0ab3a5bc Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 25 Jan 2022 10:38:47 +0100 Subject: [PATCH 18/18] remove division / 100 for GDT --- backend/src/graphql/resolver/TransactionResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 871e1b9d6..88502a7d0 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -503,7 +503,7 @@ export class TransactionResolver { email: userEntity.email, }) if (!resultGDTSum.success) throw new Error(resultGDTSum.data) - transactions.gdtSum = Number(resultGDTSum.data.sum / 100) || 0 + transactions.gdtSum = Number(resultGDTSum.data.sum) || 0 // get balance const balanceRepository = getCustomRepository(BalanceRepository)