From 04ed14775edde726ffc7e697ccaf5253099c4815 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 23 Mar 2021 09:48:36 +0100 Subject: [PATCH 1/7] dev-night-meeting --- frontend/src/App.vue | 1 + .../src/components/SidebarPlugin/SideBar.vue | 2 +- frontend/src/locales/en.json | 2 +- frontend/src/views/KontoOverview/GddSent.vue | 5 +---- .../src/views/KontoOverview/GddStatus.vue | 3 ++- frontend/src/views/Layout/ContentFooter.vue | 8 ++++---- frontend/src/views/Pages/Login.vue | 6 +++--- frontend/src/views/Pages/Register.vue | 2 +- .../Pages/UserProfile/EditProfileForm.vue | 4 ++-- .../src/views/Pages/UserProfile/UserCard.vue | 19 ++++--------------- frontend/src/views/Pages/UserProfileCard.vue | 6 +----- 11 files changed, 21 insertions(+), 37 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 2756c5314..69b838249 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -54,6 +54,7 @@ export default { } \ No newline at end of file diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue new file mode 100644 index 000000000..f716e72a9 --- /dev/null +++ b/frontend/src/views/KontoOverview/GddSend.vue @@ -0,0 +1,204 @@ + + + \ No newline at end of file diff --git a/frontend/src/views/KontoOverview/GddStatus.vue b/frontend/src/views/KontoOverview/GddStatus.vue index c724e33ac..f16631244 100644 --- a/frontend/src/views/KontoOverview/GddStatus.vue +++ b/frontend/src/views/KontoOverview/GddStatus.vue @@ -4,16 +4,14 @@ + class="mb-4 h1"> {{ $n($store.state.user.balance) }} GDD + class="mb-4 h1"> {{ $n($store.state.user.balance_gdt) }} GDT diff --git a/frontend/src/views/KontoOverview/GddTable.vue b/frontend/src/views/KontoOverview/GddTable.vue index c84d9a985..1ddcb3fb3 100644 --- a/frontend/src/views/KontoOverview/GddTable.vue +++ b/frontend/src/views/KontoOverview/GddTable.vue @@ -2,13 +2,13 @@
- +
-

{{ $n((item.balance)/10000) }} GDD

+

{{ $n((item.balance/10000)) }} GDD

{{item.name}}

- i + i
@@ -20,16 +20,16 @@ gdd{{item.balance}} memo{{item.memo}} - {{$t('transaction.more')}} + {{$t('transaction.more')}} {{item}} - + - + @@ -55,7 +55,11 @@ export default { created() { axios.get("http://localhost/state-balances/ajaxListTransactions/"+ this.$store.state.session_id).then((result) => { - //console.log("result",result) + console.log("result",result) + console.log("transactions.length",result.data.count) + +console.log("this.$route.path", this.$route.path); + //console.log("result.state",result.data.state) //console.log("result.data.state == 'success'",result.data.state == "success") @@ -64,6 +68,7 @@ export default { //console.log("result.transactions",typeof(result.data.transactions)) //commit('transactions', result.data.transactions) this.$store.state.user.balance_gdt = result.data.gdtSum + this.items = result.data.transactions this.count = result.data.count diff --git a/frontend/src/views/Layout/AuthLayout.vue b/frontend/src/views/Layout/AuthLayout.vue index 90b519392..74f0066e7 100755 --- a/frontend/src/views/Layout/AuthLayout.vue +++ b/frontend/src/views/Layout/AuthLayout.vue @@ -47,7 +47,7 @@
- © {{year}} Gradido Wallet + © {{year}} Gradido-Akademie
diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue index 4dee33b6e..daf99a384 100644 --- a/frontend/src/views/Layout/AuthLayout_gdd.vue +++ b/frontend/src/views/Layout/AuthLayout_gdd.vue @@ -42,5 +42,7 @@ import ContentFooter from './ContentFooter.vue'; }; diff --git a/frontend/src/views/Layout/ContentFooter.vue b/frontend/src/views/Layout/ContentFooter.vue index ef9d12074..09bbe1435 100755 --- a/frontend/src/views/Layout/ContentFooter.vue +++ b/frontend/src/views/Layout/ContentFooter.vue @@ -3,7 +3,7 @@
- © {{year}} Gradido Wallet + © {{year}} Gradido-Akademie
diff --git a/frontend/src/views/Layout/DashboardLayout.vue b/frontend/src/views/Layout/DashboardLayout.vue index c9a5698c1..90419c9bf 100755 --- a/frontend/src/views/Layout/DashboardLayout.vue +++ b/frontend/src/views/Layout/DashboardLayout.vue @@ -8,6 +8,9 @@ {{ $t('sent')}} + + Transaktionen + {{ $t('site.navbar.my-profil')}} @@ -16,10 +19,12 @@ {{ $t('site.navbar.settings') }} + diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue index ad669c196..addd30e8c 100755 --- a/frontend/src/views/Layout/DashboardNavbar.vue +++ b/frontend/src/views/Layout/DashboardNavbar.vue @@ -25,12 +25,13 @@ title-classes="nav-link pr-0"> - + {{ $store.state.email }} - - + + + + - {{ $store.state.email }} @@ -52,10 +53,12 @@ {{ $t('site.navbar.settings') }} +
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index fac1467de..393a1ca61 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -18,7 +18,7 @@ - +
@@ -47,7 +47,7 @@
- {{ $t('site.login.signin')}} + {{ $t('site.login.signin')}}
diff --git a/frontend/src/views/Pages/Password.vue b/frontend/src/views/Pages/Password.vue index 9b0c02813..4925e65cb 100644 --- a/frontend/src/views/Pages/Password.vue +++ b/frontend/src/views/Pages/Password.vue @@ -16,7 +16,7 @@ - + @@ -30,7 +30,7 @@ {{form}}
- {{ $t('site.password.reset_now')}} + {{ $t('site.password.reset_now')}}
@@ -39,7 +39,7 @@
- {{ $t('back')}} + {{ $t('back')}}
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index be420a581..6601f85c2 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -19,7 +19,7 @@ - +
@@ -74,7 +74,7 @@
- {{ $t('signup')}} + {{ $t('signup')}}
@@ -83,7 +83,7 @@
- {{ $t('back')}} + {{ $t('back')}}
diff --git a/frontend/src/views/Pages/UserProfile/UserCard.vue b/frontend/src/views/Pages/UserProfile/UserCard.vue index da764cfed..3f6e5e273 100755 --- a/frontend/src/views/Pages/UserProfile/UserCard.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard.vue @@ -4,7 +4,7 @@
- +
diff --git a/frontend/src/views/Pages/UserProfileActivity.vue b/frontend/src/views/Pages/UserProfileActivity.vue index 236116f39..e09a354fe 100644 --- a/frontend/src/views/Pages/UserProfileActivity.vue +++ b/frontend/src/views/Pages/UserProfileActivity.vue @@ -1,16 +1,7 @@ diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue new file mode 100644 index 000000000..525ea2525 --- /dev/null +++ b/frontend/src/views/Pages/UserProfileTransactionList.vue @@ -0,0 +1,24 @@ + + + diff --git a/login_server/src/cpp/model/email/Email.cpp b/login_server/src/cpp/model/email/Email.cpp index 2efa473e4..c04ab417c 100644 --- a/login_server/src/cpp/model/email/Email.cpp +++ b/login_server/src/cpp/model/email/Email.cpp @@ -60,7 +60,7 @@ Dario, Gradido Server Admin\n\ const static char EmailText_adminEmailVerification[] = { u8"\ Hallo [first_name] [last_name],\n\ \n\ -Der Admin hat soeben ein Gradido Konto für dich mit dieser E-Mail angelegt.\n\ +Der Admin hat soeben ein Gradido-Konto für dich mit dieser E-Mail angelegt.\n\ Bitte klicke zur Bestätigung auf den Link: [link]\n\ oder kopiere den obigen Link in Dein Browserfenster.\n\ \n\ @@ -72,7 +72,7 @@ const static char EmailText_adminEmailVerificationResend[] = { u8"\ Hallo [first_name] [last_name],\n\ \n\ Der Admin hat ein erneutes zusenden deiner Bestätigungsemail angefordert. \n\ -Du hast vor einer Weile ein Gradido Konto mit dieser E-Mail angelegt, aber es noch nicht bestätigt. \n\ +Du hast vor einer Weile ein Gradido-Konto mit dieser E-Mail angelegt, aber es noch nicht bestätigt. \n\ \n\ Bitte klicke zur Bestätigung auf den Link: [link]\n\ oder kopiere den obigen Link in Dein Browserfenster.\n\ From dfe65cacf9d398080b4c6adfd9a16f7d6fced1ed Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Mar 2021 07:13:51 +0100 Subject: [PATCH 3/7] fix-#66 --- frontend/package.json | 1 - .../public/img/icons/icons-translation.png | Bin 0 -> 16591 bytes frontend/src/App.vue | 15 ++++++++++++- .../src/components/SidebarPlugin/SideBar.vue | 2 +- frontend/src/locales/de.json | 6 +---- frontend/src/locales/en.json | 6 +---- frontend/src/views/Layout/ContentFooter.vue | 21 ++---------------- frontend/src/views/Layout/DashboardLayout.vue | 7 +++--- frontend/yarn.lock | 5 ----- 9 files changed, 22 insertions(+), 41 deletions(-) create mode 100644 frontend/public/img/icons/icons-translation.png diff --git a/frontend/package.json b/frontend/package.json index 7f947a8b5..2ebf5c1a2 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -47,7 +47,6 @@ "vue-clickaway": "^2.2.2", "vue-clipboard2": "^0.3.0", "vue-cookies": "^1.7.4", - "vue-country-flag": "^2.0.3", "vue-flatpickr-component": "^8.1.2", "vue-good-table": "^2.21.3", "vue-i18n": "^8.22.4", diff --git a/frontend/public/img/icons/icons-translation.png b/frontend/public/img/icons/icons-translation.png new file mode 100644 index 0000000000000000000000000000000000000000..3f06d06909a3d38fc34298bbb318997ce2c73017 GIT binary patch literal 16591 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 literal 0 HcmV?d00001 diff --git a/frontend/src/App.vue b/frontend/src/App.vue index cacd67568..dff1e26df 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,6 +1,13 @@ diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 153f68808..cf52833bf 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -11297,11 +11297,6 @@ vue-cookies@^1.7.4: resolved "https://registry.yarnpkg.com/vue-cookies/-/vue-cookies-1.7.4.tgz#d241d0a0431da0795837651d10b4d73e7c8d3e8d" integrity sha512-mOS5Btr8V9zvAtkmQ7/TfqJIropOx7etDAgBywPCmHjvfJl2gFbH2XgoMghleLoyyMTi5eaJss0mPN7arMoslA== -vue-country-flag@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/vue-country-flag/-/vue-country-flag-2.0.3.tgz#f644d8f5150a97f473f0c13e04622c6ede37d1de" - integrity sha512-QZM3hNNhnGU+G1qnpq1BiICE4Zh91UA++/UpM0go8XbxkVxTiPy4asWY07vL/3PtW8M69YqWVbhwG13rzvNwkA== - vue-eslint-parser@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1" From 5d37e67d50ebd2cd57e7f234c9adf2f7807c3df3 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Mar 2021 08:40:09 +0100 Subject: [PATCH 4/7] fix lint --- frontend/src/App.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index dff1e26df..1c4389c91 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -2,11 +2,11 @@
- + Deusch English - +
From 44fb453f9c2be64b2985c0ffd7e3c68dcc531065 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Mar 2021 08:43:38 +0100 Subject: [PATCH 5/7] fix lint 2 --- frontend/src/store/store.js | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index 0b62468fb..e53dcedb6 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -4,7 +4,6 @@ Vue.use(Vuex) import router from '../routes/router.js' import loginAPI from '../apis/loginAPI' import communityAPI from '../apis/communityAPI' -//import CONFIG from '../config' export const store = new Vuex.Store({ state: { @@ -36,7 +35,6 @@ export const store = new Vuex.Store({ } } }, - // Retrieve a state variable getters: { //isLoggedIn: (state /*, getters */) => { // return state.session_id !== null; @@ -81,24 +79,12 @@ export const store = new Vuex.Store({ // Asyncronous actions - used for api calls actions: { login: async ({ dispatch, commit }, data) => { - // console.log('action: login') - - //axios.post("http://localhost/login_api/unsecureLogin/", - // {"email": data.email, "password":data.password }).then((result) => { - // console.log("store login result", result) - const result = await loginAPI.login(data.email,data.password) - // console.log('result.data.state',result.data.state) - // console.log('result.data.session_id',result.data.session_id) - - if( result.success){ commit('session_id', result.result.data.session_id) commit('email', data.email) $cookies.set('gdd_session_id', result.result.data.session_id); $cookies.set('gdd_u', data.email); - - router.push('/overview') } else { // Register failed, we perform a logout @@ -108,8 +94,6 @@ export const store = new Vuex.Store({ //}, (error) => { // console.log(error); //}); - - }, passwordReset: async (data) => { console.log("<<<<<<<<<<< PASSWORT RESET TODO >>>>>>>>>>>", data.email) @@ -151,18 +135,7 @@ export const store = new Vuex.Store({ //console.log('action: ajaxCreate') state.ajaxCreateData.amount = (state.ajaxCreateData.amount)*10000 const result = await communityAPI.create($cookies.get("gdd_session_id", email, amount, memo)) - console.log(result) - //axios.post("http://localhost/transaction-send-coins/ajaxCreate", state.ajaxCreateData).then((result) => { - // //console.log("store ajaxCreate result", result) - // - //if( result.success ){ - // // TODO - //} else { - // //dispatch('logout') - //} - //}, (error) => { - // console.log(error); - //}); + // console.log(result) }, ajaxListTransactions: async ({commit, dispatch, state}) => { // console.log('action: ajaxListTransactions', state.session_id) From f685b93c07f13e28e1890eb06fa24d0fbe35976f Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Mar 2021 10:41:56 +0100 Subject: [PATCH 6/7] fix add-login-fail-message --- frontend/src/components/BaseAlert.vue | 5 ++++ frontend/src/plugins/dashboard-plugin.js | 2 -- frontend/src/store/store.js | 13 ++++++++--- frontend/src/views/Pages/Login.vue | 29 +++++++++++++++++++++--- 4 files changed, 41 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/BaseAlert.vue b/frontend/src/components/BaseAlert.vue index a45139aa1..33567682d 100644 --- a/frontend/src/components/BaseAlert.vue +++ b/frontend/src/components/BaseAlert.vue @@ -40,6 +40,9 @@ components: { FadeTransition }, + created() { + console.log("base-alert gesetzt in =>", this.$route.path ) + }, props: { type: { type: String, @@ -64,7 +67,9 @@ }, methods: { dismissAlert() { + console.log("sdddddddddddddddddddddddd") this.visible = false; + this.$store.state.loginfail = false; } } }; diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js index 67b161292..fc9e5b71d 100755 --- a/frontend/src/plugins/dashboard-plugin.js +++ b/frontend/src/plugins/dashboard-plugin.js @@ -37,7 +37,6 @@ import 'vue-good-table/dist/vue-good-table.css'; import VueMoment from 'vue-moment'; -import CountryFlag from 'vue-country-flag' Object.keys(rules).forEach(rule => { @@ -59,7 +58,6 @@ export default { Vue.use(VueQrcodeReader); Vue.use(VueQrcode); Vue.use(VueFlatPickr); - Vue.use(CountryFlag); configure({ classes: { valid: 'is-valid', diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index e53dcedb6..cc3714fd5 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -12,6 +12,7 @@ export const store = new Vuex.Store({ language: 'en', sizeDE: 'normal', sizeGB: 'big', + loginfail: false, user : { name:"", balance: 0, @@ -55,6 +56,10 @@ export const store = new Vuex.Store({ } }, + loginfail: (state, loginfail) => { + //console.log('mutation: email') + state.loginfail = loginfail + }, email: (state, email) => { //console.log('mutation: email') state.email = email @@ -88,11 +93,13 @@ export const store = new Vuex.Store({ router.push('/overview') } else { // Register failed, we perform a logout - // console.log('action login to logout start') - dispatch('logout') + //alert('>>>>> FAIl LOGIN') + commit('loginfail', true) + + //dispatch('logout') } //}, (error) => { - // console.log(error); + //console.log(error); //}); }, passwordReset: async (data) => { diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 393a1ca61..7ae741057 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -12,7 +12,6 @@
-
@@ -20,12 +19,11 @@ -
{{ $t('login')}}
- + + + + + + + + Leider konnten wir keinen Account finden mit diesen Daten! + + + +
+ + + +
+ + + + + +
{{ $t('site.login.signin')}} @@ -67,6 +86,7 @@