From 2134d2ef1085679c343288cb07668a9355793d9f Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Mon, 7 Jun 2021 08:39:34 +0000 Subject: [PATCH 01/58] move decay between transactions into the transactions --- .../src/Model/Table/TransactionsTable.php | 109 ++++++++---------- .../AppRequests/list_transactions.ctp | 5 +- 2 files changed, 49 insertions(+), 65 deletions(-) diff --git a/community_server/src/Model/Table/TransactionsTable.php b/community_server/src/Model/Table/TransactionsTable.php index c4bc4b698..e3c36bf8a 100644 --- a/community_server/src/Model/Table/TransactionsTable.php +++ b/community_server/src/Model/Table/TransactionsTable.php @@ -165,40 +165,7 @@ class TransactionsTable extends Table foreach($stateUserTransactions as $i => $su_transaction) { - /*echo "i: $i
"; - echo "state user transaction:
"; - var_dump($su_transaction); - echo "
";*/ - //var_dump($su_transaction); - //die("step"); - // add decay transactions - $prev = null; - if($i > 0 ) { - $prev = $stateUserTransactions[$i-1]; - } - if($prev && $decay == true) - { - - if($prev->balance > 0) { - // var_dump($stateUserTransactions); - $current = $su_transaction; - //echo "decay between " . $prev->transaction_id . " and " . $current->transaction_id . "
"; - $calculated_decay = $stateBalancesTable->calculateDecay($prev->balance, $prev->balance_date, $current->balance_date, true); - $balance = floatval($prev->balance - $calculated_decay['balance']); - // skip small decays (smaller than 0,00 GDD) - - if(abs($balance) >= 100) { - //echo $interval->format('%R%a days'); - //echo "prev balance: " . $prev->balance . ", diff_amount: $diff_amount, summe: " . (-intval($prev->balance - $diff_amount)) . "
"; - $final_transactions[] = [ - 'type' => 'decay', - 'balance' => $balance, - 'decay_duration' => $calculated_decay['interval']->format('%a days, %H hours, %I minutes, %S seconds'), - 'memo' => '' - ]; - } - } - } + // sender or receiver when user has sended money // group name if creation @@ -207,59 +174,74 @@ class TransactionsTable extends Table // date // balance $transaction = $transaction_indiced[$su_transaction->transaction_id]; - /*echo "transaction:
"; - var_dump($transaction); - echo "
";*/ + + $final_transaction = [ + 'transaction_id' => $transaction->id, + 'date' => $transaction->received, + 'memo' => $transaction->memo + ]; + + $prev = null; + if($i > 0 ) { + $prev = $stateUserTransactions[$i-1]; + } + if($prev && $decay == true) + { + if($prev->balance > 0) { + $current = $su_transaction; + $calculated_decay = $stateBalancesTable->calculateDecay($prev->balance, $prev->balance_date, $current->balance_date, true); + $balance = floatval($prev->balance - $calculated_decay['balance']); + + // skip small decays (smaller than 0,00 GDD) + if(abs($balance) >= 100) { + $final_transaction['decay'] = [ + 'balance' => $balance, + 'decay_duration' => $calculated_decay['interval']->format('%a days, %H hours, %I minutes, %S seconds') + ]; + } + } + } + if($su_transaction->transaction_type_id == 1) { // creation $creation = $transaction->transaction_creation; $balance = $stateBalancesTable->calculateDecay($creation->amount, $creation->target_date, $transaction->received); - $final_transactions[] = [ - 'name' => 'Gradido Akademie', - 'type' => 'creation', - 'transaction_id' => $transaction->id, - 'date' => $transaction->received,// $creation->target_date, - 'target_date' => $creation->target_date, - 'creation_amount' => $creation->amount, - 'balance' => $balance, - 'memo' => $transaction->memo - ]; + $final_transaction['name'] = 'Gradido Akademie'; + $final_transaction['type'] = 'creation'; + $final_transaction['target_date'] = $creation->target_date; + $final_transaction['creation_amount'] = $creation->amount; + $final_transaction['balance'] = $balance; + } else if($su_transaction->transaction_type_id == 2) { // transfer or send coins $sendCoins = $transaction->transaction_send_coin; - $type = ''; $otherUser = null; + $final_transaction['balance'] = $sendCoins->amount; $other_user_public = ''; if ($sendCoins->state_user_id == $user['id']) { - $type = 'send'; + $final_transaction['type'] = 'send'; if(isset($involved_users[$sendCoins->receiver_user_id])) { $otherUser = $involved_users[$sendCoins->receiver_user_id]; } - $other_user_public = bin2hex(stream_get_contents($sendCoins->receiver_public_key)); + $final_transaction['pubkey'] = bin2hex(stream_get_contents($sendCoins->receiver_public_key)); } else if ($sendCoins->receiver_user_id == $user['id']) { - $type = 'receive'; + $final_transaction['type'] = 'receive'; if(isset($involved_users[$sendCoins->state_user_id])) { $otherUser = $involved_users[$sendCoins->state_user_id]; } if($sendCoins->sender_public_key) { - $other_user_public = bin2hex(stream_get_contents($sendCoins->sender_public_key)); + $final_transaction['pubkey'] = bin2hex(stream_get_contents($sendCoins->sender_public_key)); } } if(null == $otherUser) { $otherUser = $stateUsersTable->newEntity(); } - $final_transactions[] = [ - 'name' => $otherUser->first_name . ' ' . $otherUser->last_name, - 'email' => $otherUser->email, - 'type' => $type, - 'transaction_id' => $sendCoins->transaction_id, - 'date' => $transaction->received, - 'balance' => $sendCoins->amount, - 'memo' => $transaction->memo, - 'pubkey' => $other_user_public - ]; + $final_transaction['name'] = $otherUser->first_name . ' ' . $otherUser->last_name; + $final_transaction['email'] = $otherUser->email; } - + + $final_transactions[] = $final_transaction; + if($i == $stateUserTransactionsCount-1 && $decay == true) { $calculated_decay = $stateBalancesTable->calculateDecay( $su_transaction->balance, @@ -275,7 +257,6 @@ class TransactionsTable extends Table 'type' => 'decay', 'balance' => $balance, 'decay_duration' => $duration, - 'last_decay' => true, 'memo' => '' ]; } diff --git a/community_server/src/Template/AppRequests/list_transactions.ctp b/community_server/src/Template/AppRequests/list_transactions.ctp index d7a8b1d6f..f978e2e31 100644 --- a/community_server/src/Template/AppRequests/list_transactions.ctp +++ b/community_server/src/Template/AppRequests/list_transactions.ctp @@ -12,13 +12,16 @@ $body['gdtSum'] = $this->element('centToFloat', ['cent' => $body['gdtSum'], 'pre foreach($body['transactions'] as $i => $transaction) { $useCeil = false; - if(isset($transaction['last_decay']) && $transaction['last_decay']) { + if($transaction['type'] == 'decay') { $useCeil = true; } $body['transactions'][$i]['balance'] = $this->element('centToFloat', ['cent' => $transaction['balance'], 'precision' => 4, 'useCeil' => $useCeil]); if(isset($transaction['creation_amount'])) { $body['transactions'][$i]['creation_amount'] = $this->element('centToFloat', ['cent' => $transaction['creation_amount'], 'precision' => 4]); } + if(isset($transaction['decay'])) { + $body['transactions'][$i]['decay']['balance'] = $this->element('centToFloat', ['cent' => $transaction['decay']['balance'], 'precision' => 4]); + } } ?> \ No newline at end of file From 51692acfb8e6846c2307f594f8935dcf729ef0d5 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 15 Jun 2021 12:55:55 +0200 Subject: [PATCH 02/58] reorganisiere Dockerfiles --- login_server/Dockerfile | 81 ------------------- .../alpine/Dockerfile.debug} | 0 .../Dockerfile.dependencies} | 11 +++ .../Dockerfiles/ubuntu/Dockerfile.debug | 39 +++++++++ .../{ => ubuntu}/Dockerfile.dependencies | 9 +++ .../Dockerfiles/ubuntu/Dockerfile.release | 0 .../Dockerfiles/ubuntu/Dockerfile.test | 58 +++++++++++++ 7 files changed, 117 insertions(+), 81 deletions(-) rename login_server/{Dockerfile.alpine-debug => Dockerfiles/alpine/Dockerfile.debug} (100%) rename login_server/Dockerfiles/{Dockerfile.dependencies-alpine => alpine/Dockerfile.dependencies} (86%) create mode 100644 login_server/Dockerfiles/ubuntu/Dockerfile.debug rename login_server/Dockerfiles/{ => ubuntu}/Dockerfile.dependencies (88%) create mode 100644 login_server/Dockerfiles/ubuntu/Dockerfile.release create mode 100644 login_server/Dockerfiles/ubuntu/Dockerfile.test diff --git a/login_server/Dockerfile b/login_server/Dockerfile index 98e576da2..313cdeca6 100644 --- a/login_server/Dockerfile +++ b/login_server/Dockerfile @@ -1,85 +1,4 @@ -######################################################################################################### -# Prepare debug -######################################################################################################### -FROM gradido/login_dependencies:gcc9-debug-3 as prepare_debug - -ENV DOCKER_WORKDIR="/code" -WORKDIR ${DOCKER_WORKDIR} - -RUN echo '/usr/local/lib' >> /etc/ld.so.conf && ldconfig - -COPY ./CMakeLists.txt.lib ./CMakeLists.txt -RUN ln -s /usr/local/googletest ./googletest -COPY ./src ./src -COPY ./cmake/CodeCoverage.cmake ./cmake/CodeCoverage.cmake -COPY ./dependencies/cmake-modules ./dependencies/cmake-modules -COPY ./dependencies/spirit-po ./dependencies/spirit-po -COPY ./dependencies/tinf ./dependencies/tinf -COPY ./scripts ./scripts - - -######################################################################################################### -# Install Coverage tool -######################################################################################################### -FROM prepare_debug as coverage - - -RUN apt-get update && \ - apt-get install -y --no-install-recommends python3-pip && \ - apt-get autoclean && \ - apt-get autoremove && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN pip3 install gcovr setuptools wheel && \ - pip3 install fastcov - - -######################################################################################################### -# Build test -######################################################################################################### -FROM coverage as test - -ENV DOCKER_WORKDIR="/code" -WORKDIR ${DOCKER_WORKDIR} - - -RUN if [ ! -d "./build_cov" ] ; then mkdir build_cov; fi - -RUN cd build_cov && \ - cmake -DCMAKE_BUILD_TYPE=Debug -DCOLLECT_COVERAGE_DATA=ON -DCOVERAGE_TOOL=fastcov .. && \ - make -j$(nproc) Gradido_LoginServer_Test - -#RUN chmod +x build_cov/bin/Gradido_LoginServer_Test -#CMD gdb -ex run ./build_cov/bin/Gradido_LoginServer_Test -#CMD ./build_cov/bin/Gradido_LoginServer_Test - -#ENTRYPOINT make -C build_cov coverage -CMD cd build_cov && make coverage && \ - if [ ! -d "./coverage" ] ; then mkdir coverage; fi && \ - cp coverage.info ./coverage/ - -######################################################################################################### -# Build debug -######################################################################################################### -FROM prepare_debug as debug - -ENV DOCKER_WORKDIR="/code" -WORKDIR ${DOCKER_WORKDIR} - -RUN mkdir build && \ - cd build && \ - cmake -DCMAKE_BUILD_TYPE=Debug .. && \ - make -j$(nproc) Gradido_LoginServer - -RUN cd scripts && \ - chmod +x compile_pot.sh && \ - ./compile_pot.sh - -RUN chmod +x build/bin/Gradido_LoginServer -ENTRYPOINT ["build/bin/Gradido_LoginServer"] - ######################################################################################################### # Build release ######################################################################################################### diff --git a/login_server/Dockerfile.alpine-debug b/login_server/Dockerfiles/alpine/Dockerfile.debug similarity index 100% rename from login_server/Dockerfile.alpine-debug rename to login_server/Dockerfiles/alpine/Dockerfile.debug diff --git a/login_server/Dockerfiles/Dockerfile.dependencies-alpine b/login_server/Dockerfiles/alpine/Dockerfile.dependencies similarity index 86% rename from login_server/Dockerfiles/Dockerfile.dependencies-alpine rename to login_server/Dockerfiles/alpine/Dockerfile.dependencies index c388d528c..098c7a8d7 100644 --- a/login_server/Dockerfiles/Dockerfile.dependencies-alpine +++ b/login_server/Dockerfiles/alpine/Dockerfile.dependencies @@ -1,3 +1,14 @@ +# Login-Server Build dependencies for alpine +# Uploaded to hub.docker.com with the tag: +# gradido/login_dependencies:alpine-debug-3 for debug build +# and +# gradido/login_dependencies:alpine-release-3 for release build +# Update tag when dependencies are added or removed + +# Control Build Type with ARG BUILD_TYPE +# Valid values do you find here: https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html +# Default is set to Debug + ##### BUILD-ENV ##### FROM alpine:3.13.5 as alpine-build diff --git a/login_server/Dockerfiles/ubuntu/Dockerfile.debug b/login_server/Dockerfiles/ubuntu/Dockerfile.debug new file mode 100644 index 000000000..79ed8d802 --- /dev/null +++ b/login_server/Dockerfiles/ubuntu/Dockerfile.debug @@ -0,0 +1,39 @@ + +######################################################################################################### +# Prepare debug +######################################################################################################### +FROM gradido/login_dependencies:gcc9-debug-3 as prepare_debug + +ENV DOCKER_WORKDIR="/code" +WORKDIR ${DOCKER_WORKDIR} + +RUN echo '/usr/local/lib' >> /etc/ld.so.conf && ldconfig + +COPY ./CMakeLists.txt.lib ./CMakeLists.txt +RUN ln -s /usr/local/googletest ./googletest +COPY ./src ./src +COPY ./cmake/CodeCoverage.cmake ./cmake/CodeCoverage.cmake +COPY ./dependencies/cmake-modules ./dependencies/cmake-modules +COPY ./dependencies/spirit-po ./dependencies/spirit-po +COPY ./dependencies/tinf ./dependencies/tinf +COPY ./scripts ./scripts + + +######################################################################################################### +# Build debug +######################################################################################################### +FROM prepare_debug as debug + +ENV DOCKER_WORKDIR="/code" +WORKDIR ${DOCKER_WORKDIR} + +RUN mkdir build && \ + cd build && \ + cmake -DCMAKE_BUILD_TYPE=Debug .. + +RUN cd scripts && \ + chmod +x compile_pot.sh && \ + ./compile_pot.sh + +CMD cd build && cmake .. && make -j$(nproc) Gradido_LoginServer && ./bin/Gradido_LoginServer + diff --git a/login_server/Dockerfiles/Dockerfile.dependencies b/login_server/Dockerfiles/ubuntu/Dockerfile.dependencies similarity index 88% rename from login_server/Dockerfiles/Dockerfile.dependencies rename to login_server/Dockerfiles/ubuntu/Dockerfile.dependencies index bc2cd1fd2..883274628 100644 --- a/login_server/Dockerfiles/Dockerfile.dependencies +++ b/login_server/Dockerfiles/ubuntu/Dockerfile.dependencies @@ -1,3 +1,12 @@ +# Login-Server Build dependencies for ubuntu +# Uploaded to hub.docker.com with the tag: +# gradido/login_dependencies:gcc9-debug-3 for debug build +# Update tag when dependencies are added or removed + +# Control Build Type with ARG BUILD_TYPE +# Valid values do you find here: https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html +# Default is set to Debug + ##### BUILD-ENV ##### FROM gcc:9 as gcc9_build diff --git a/login_server/Dockerfiles/ubuntu/Dockerfile.release b/login_server/Dockerfiles/ubuntu/Dockerfile.release new file mode 100644 index 000000000..e69de29bb diff --git a/login_server/Dockerfiles/ubuntu/Dockerfile.test b/login_server/Dockerfiles/ubuntu/Dockerfile.test new file mode 100644 index 000000000..59caaf3c5 --- /dev/null +++ b/login_server/Dockerfiles/ubuntu/Dockerfile.test @@ -0,0 +1,58 @@ + +######################################################################################################### +# Prepare debug +######################################################################################################### +FROM gradido/login_dependencies:gcc9-debug-3 as prepare_debug + +ENV DOCKER_WORKDIR="/code" +WORKDIR ${DOCKER_WORKDIR} + +RUN echo '/usr/local/lib' >> /etc/ld.so.conf && ldconfig + +COPY ./CMakeLists.txt.lib ./CMakeLists.txt +RUN ln -s /usr/local/googletest ./googletest +COPY ./src ./src +COPY ./cmake/CodeCoverage.cmake ./cmake/CodeCoverage.cmake +COPY ./dependencies/cmake-modules ./dependencies/cmake-modules +COPY ./dependencies/spirit-po ./dependencies/spirit-po +COPY ./dependencies/tinf ./dependencies/tinf +COPY ./scripts ./scripts + + +######################################################################################################### +# Install Coverage tool +######################################################################################################### +FROM prepare_debug as coverage + + +RUN apt-get update && \ + apt-get install -y --no-install-recommends python3-pip && \ + apt-get autoclean && \ + apt-get autoremove && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* +# fastcov need gcovr to work +RUN pip3 install gcovr setuptools wheel && \ + pip3 install fastcov + + +######################################################################################################### +# Build test +######################################################################################################### +FROM coverage as test + +ENV DOCKER_WORKDIR="/code" +WORKDIR ${DOCKER_WORKDIR} + + +RUN if [ ! -d "./build_cov" ] ; then mkdir build_cov; fi + +RUN cd build_cov && \ + cmake -DCMAKE_BUILD_TYPE=Debug -DCOLLECT_COVERAGE_DATA=ON -DCOVERAGE_TOOL=fastcov .. && \ + make -j$(nproc) Gradido_LoginServer_Test + +#ENTRYPOINT make -C build_cov coverage +CMD cd build_cov && make coverage && \ + if [ ! -d "./coverage" ] ; then mkdir coverage; fi && \ + cp coverage.info ./coverage/ + \ No newline at end of file From 6e751af6813a384c197e58602ba21be4fdb1553a Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 15 Jun 2021 12:58:45 +0200 Subject: [PATCH 03/58] update workflow for test --- .github/workflows/test.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 14b507354..ea16c73c8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,13 +50,7 @@ jobs: ########################################################################## - name: login server | Build `release` image run: | - docker build --target release -t "gradido/login_server:release" -f ./login_server/Dockerfile login_server/ - #docker save "gradido/login_server:test" > /tmp/login_server.tar - #- name: Upload Artifact - # uses: actions/upload-artifact@v2 - #with: - # name: docker-login-server-test - #path: /tmp/login_server.tar + docker build -t "gradido/login_server:release" -f ./login_server/Dockerfile login_server/ ############################################################################## # JOB: DOCKER BUILD TEST COMMUNITY SERVER #################################### @@ -251,7 +245,7 @@ jobs: ########################################################################## - name: login server | Build `test` image run: | - docker build --target test -t "gradido/login_server:test" -f ./login_server/Dockerfile login_server/ + docker build -t "gradido/login_server:test" -f ./login_server/Dockerfiles/ubuntu/Dockerfile.test login_server/ ########################################################################## # UNIT TESTS BACKEND LOGIN-SERVER ####################################### ########################################################################## @@ -300,7 +294,7 @@ jobs: run: echo "::set-output name=id::$(docker network ls | grep github_network | awk '{ print $1 }')" id: network - name: Start Login-Server - run: docker run --network ${{ steps.network.outputs.id }} --name=login-server -d gradido/login_server:default + run: docker run --network ${{ steps.network.outputs.id }} --name=login-server -d gradido/login_server:latest - name: get login-server container id run: echo "::set-output name=id::$(docker container ls | grep login_server | awk '{ print $1 }')" id: login_server_container From ba9eac57d7531b159959bab285f7819aa855db7d Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Tue, 15 Jun 2021 11:11:59 +0000 Subject: [PATCH 04/58] show in between decays only if <= 0.01 GDD --- community_server/src/Model/Table/TransactionsTable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community_server/src/Model/Table/TransactionsTable.php b/community_server/src/Model/Table/TransactionsTable.php index 7e59c2d88..03e0e08ad 100644 --- a/community_server/src/Model/Table/TransactionsTable.php +++ b/community_server/src/Model/Table/TransactionsTable.php @@ -184,7 +184,7 @@ class TransactionsTable extends Table $calculated_decay = $stateBalancesTable->calculateDecay($prev->balance, $prev->balance_date, $current->balance_date, true); $balance = floatval($prev->balance - $calculated_decay['balance']); - if($balance) + if($balance > 100) { $final_transactions[] = [ 'type' => 'decay', From 95eac17063f0655d2527bb108da28a7c2d3a7556 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 15 Jun 2021 13:23:27 +0200 Subject: [PATCH 05/58] fix mobile ui form --- .../src/views/Pages/UserProfile/UserCard_FormUserData.vue | 6 +++--- .../views/Pages/UserProfile/UserCard_FormUserPasswort.vue | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue index 254c0cb9e..7c75f59a6 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue @@ -31,7 +31,7 @@ - + {{ $t('form.firstname') }} @@ -42,7 +42,7 @@ - + {{ $t('form.lastname') }} @@ -53,7 +53,7 @@ - + {{ $t('form.description') }} diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue index 4cd266975..5be52ed7b 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue @@ -21,7 +21,7 @@
- + {{ $t('form.password_old') }} @@ -45,7 +45,7 @@ - + {{ $t('form.password_new') }} @@ -68,7 +68,7 @@ - + {{ $t('form.password_new_repeat') }} @@ -92,7 +92,7 @@ - +
    From c2420c75253ba2f846e32013cb8f07ccf11d9f7f Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 15 Jun 2021 13:37:29 +0200 Subject: [PATCH 06/58] Trim Email on Blur --- .../Pages/AccountOverview/GddSend/TransactionForm.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue index 66bc16be4..654599385 100644 --- a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue +++ b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue @@ -40,6 +40,9 @@ From 4d6bc21fb4613aeb55a03a5cad617ac9323d0827 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 15 Jun 2021 14:18:07 +0200 Subject: [PATCH 07/58] Change Password Form --- frontend/src/apis/loginAPI.js | 6 ++-- frontend/src/locales/de.json | 4 ++- frontend/src/locales/en.json | 4 ++- .../src/views/Layout/DashboardLayout_gdd.vue | 3 -- .../UserProfile/UserCard_FormUserPasswort.vue | 30 ++++++++++++------- 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/frontend/src/apis/loginAPI.js b/frontend/src/apis/loginAPI.js index d9d0b2b9c..c72965ea5 100644 --- a/frontend/src/apis/loginAPI.js +++ b/frontend/src/apis/loginAPI.js @@ -34,7 +34,7 @@ const apiPost = async (url, payload) => { return { success: true, result: result.error } } if (result.data.state !== 'success') { - throw new Error(result.data.msg) + throw new Error(result.data.errors) } return { success: true, result } } catch (error) { @@ -113,8 +113,8 @@ const loginAPI = { session_id: sessionId, email, update: { - 'User.password': password, - 'User.passwordNew': passwordNew, + 'User.password_old': password, + 'User.password': passwordNew, }, } return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 8554996bb..4d85269c5 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -39,6 +39,7 @@ "password_new":"neues Passwort", "password_new_repeat":"neues Passwort wiederholen", "change": "ändern", + "change-password": "Passwort ändern", "amount":"Betrag", "memo":"Nachricht für den Empfänger", "message":"Nachricht", @@ -64,7 +65,8 @@ "change_username_info": "Einmal gespeichert, kann der Username ncht mehr geändert werden!" }, "error": { - "error":"Fehler" + "error":"Fehler", + "change-password": "Fehler beim Ändern des Passworts" }, "transaction":{ "show_all":"Alle {count} Transaktionen ansehen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 7b97c2240..987605bd8 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -39,6 +39,7 @@ "password_new":"New password", "password_new_repeat":"Repeat new password", "change": "change", + "change-password": "Change password", "amount":"Amount", "memo":"Message for the recipient", "message":"Message", @@ -64,7 +65,8 @@ "change_username_info": "Once saved, the username cannot be changed again!" }, "error": { - "error":"Error" + "error":"Error", + "change-password": "Error while changing password" }, "transaction":{ "show_all":"View all {count} transactions.", diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 4d65aed70..9990b91f2 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -144,9 +144,6 @@ export default { mounted() { this.initScrollbar() }, - created() { - this.updateTransactions({ firstPage: 1, items: 5 }) - }, }