Merge branch 'master' into stage2

.github/workflows/push.yml

@@ -1,18 +0,0 @@
-name: on-push
-on: push
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build the stack
-        run: |
-         git submodule update --init --recursive
-         docker-compose up -d
-      - name: Test
-        env:
-          GN_INSTANCE_FOLDER: /tmp/gradio-node-instance
-          GN_CONTAINER_NAME: gradido-node-build
-        run: docker run gradido-node-test
-        timeout-minutes: 2
-

.github/workflows/test.yml

@@ -4,34 +4,13 @@ name: gradido test CI
 on: [push]
 
 jobs:
-  ##############################################################################
-  # JOB: PREPARE #####################################################
-  ##############################################################################
-  #prepare:
-  #  name: Prepare
-  #  runs-on: ubuntu-latest
-  #  # needs: [nothing]
-  #  steps:
-  #    ##########################################################################
-  #    # CHECKOUT CODE ##########################################################
-  #    ##########################################################################
-  #    - name: Checkout code
-  #      uses: actions/checkout@v2
-  #    ##########################################################################
-  #    # TODO: DO STUFF ??? #####################################################
-  #    ##########################################################################
-  #    - name: Check translation files
-  #      run: |
-  #        scripts/translations/sort.sh
-  #        scripts/translations/missing-keys.sh
-
   ##############################################################################
   # JOB: DOCKER BUILD TEST FRONTEND ############################################
   ##############################################################################
   build_test_frontend:
     name: Docker Build Test - Frontend
     runs-on: ubuntu-latest
-    #needs: [nothing] # [prepare]
+    #needs: [nothing]
     steps:
       ##########################################################################
       # CHECKOUT CODE ##########################################################
@@ -39,7 +18,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       ##########################################################################
-      # NEO4J ##################################################################
+      # FRONTEND ###############################################################
       ##########################################################################
       - name: Frontend | Build `test` image
         run: |
@@ -78,30 +57,58 @@ jobs:
   #        path: /tmp/backend.tar
 
   ##############################################################################
-  # JOB: DOCKER BUILD TEST WEBAPP ##############################################
+  # JOB: DOCKER BUILD TEST LOGIN SERVER ########################################
   ##############################################################################
-  #build_test_webapp:
-  #  name: Docker Build Test - WebApp
-  #  runs-on: ubuntu-latest
-  #  needs: [prepare]
-  #  steps:
-  #    ##########################################################################
-  #    # CHECKOUT CODE ##########################################################
-  #    ##########################################################################
-  #    - name: Checkout code
-  #      uses: actions/checkout@v2
-  #    ##########################################################################
-  #    # BUILD WEBAPP DOCKER IMAGE (build) ######################################
-  #    ##########################################################################
-  #    - name: webapp | Build `test` image
-  #      run: |
-  #        docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
-  #        docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
-  #    - name: Upload Artifact
-  #      uses: actions/upload-artifact@v2
-  #      with:
-  #        name: docker-webapp-test
-  #        path: /tmp/webapp.tar
+  build_test_login_server:
+    name: Docker Build Test - Login Server
+    runs-on: ubuntu-latest
+    #needs: [nothing]
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      ##########################################################################
+      # BUILD LOGIN SERVER DOCKER IMAGE (build) ################################
+      ##########################################################################
+      - name: login server | Build `test` image
+        run: |
+          docker build --target login_server_debug -t "gradido/loginserver:test" -f ./login_server/Dockerfile.debug login_server/
+          docker save "gradido/loginserver:test" > /tmp/loginserver.tar
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: docker-loginserver-test
+          path: /tmp/loginserver.tar
+
+  ##############################################################################
+  # JOB: DOCKER BUILD TEST COMMUNITY SERVER ####################################
+  ##############################################################################
+  build_test_community_server:
+    name: Docker Build Test - Community Server
+    runs-on: ubuntu-latest
+    #needs: [nothing]
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ##########################################################################
+      # BUILD COMMUNITY SERVER DOCKER IMAGE (build) ############################
+      ##########################################################################
+      - name: community server | Build `test` image
+        run: |
+          docker build -t "gradido/communityserver:test" -f ./community_server/Dockerfile ./
+          docker save "gradido/communityserver:test" > /tmp/communityserver.tar
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: docker-communityserver-test
+          path: /tmp/communityserver.tar
 
   ##############################################################################
   # JOB: LINT FRONTEND #########################################################
@@ -207,38 +214,46 @@ jobs:
   #      run: docker-compose exec -T backend yarn test
 
   ##############################################################################
-  # JOB: UNIT TEST WEBAPP ######################################################
+  # JOB: UNIT TEST FRONTEND  ###################################################
   ##############################################################################
-  #unit_test_webapp:
-  #  name: Unit tests - webapp
+  unit_test_frontend:
+    name: Unit tests - Frontend
+    runs-on: ubuntu-latest
+    needs: [build_test_frontend]
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ##########################################################################
+      # DOWNLOAD DOCKER IMAGES #################################################
+      ##########################################################################
+      - name: Download Docker Image (Webapp)
+        uses: actions/download-artifact@v2
+        with:
+          name: docker-frontend-test
+          path: /tmp
+      - name: Load Docker Image
+        run: docker load < /tmp/frontend.tar
+      ##########################################################################
+      # UNIT TESTS FRONTEND ####################################################
+      ##########################################################################
+      - name: frontend | Unit tests
+        run: docker run --rm gradido/frontend:test yarn run test
+
+
+  #test:
   #  runs-on: ubuntu-latest
-  #  needs: [build_test_webapp]
   #  steps:
-  #    ##########################################################################
-  #    # CHECKOUT CODE ##########################################################
-  #    ##########################################################################
-  #    - name: Checkout code
-  #      uses: actions/checkout@v2
-  #    ##########################################################################
-  #    # DOWNLOAD DOCKER IMAGES #################################################
-  #    ##########################################################################
-  #    - name: Download Docker Image (Webapp)
-  #      uses: actions/download-artifact@v2
-  #      with:
-  #        name: docker-webapp-test
-  #        path: /tmp
-  #    - name: Load Docker Image
-  #      run: docker load < /tmp/webapp.tar
-  #    ##########################################################################
-  #    # UNIT TESTS WEBAPP #####################################################
-  #    ##########################################################################
-  #    # TODO: Why do we need those .envs?
-  #    - name: backend | copy env files webapp
-  #      run: cp webapp/.env.template webapp/.env
-  #    - name: backend | copy env files backend
-  #      run: cp backend/.env.template backend/.env
-  #    - name: backend | docker-compose
-  #      run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
-  #    - name: webapp | Unit tests
-  #      #run: docker run --rm ocelotsocialnetwork/webapp:build yarn run test
-  #      run: docker-compose exec -T webapp yarn test
+  #    - uses: actions/checkout@v2
+  #    - name: Build the stack
+  #      run: |
+  #       git submodule update --init --recursive
+  #       docker-compose up -d
+  #    - name: Test
+  #      env:
+  #        GN_INSTANCE_FOLDER: /tmp/gradio-node-instance
+  #        GN_CONTAINER_NAME: gradido-node-build
+  #      run: docker run gradido-node-test
+  #      timeout-minutes: 2

.gitignore

@@ -1,2 +1,3 @@
 *.log
 /node_modules/*
+.vscode

CHANGELOG.md

@@ -4,4 +4,66 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [0.9.4](https://github.com/gradido/gradido/compare/0.9.3...0.9.4)
+
+- Build on run [`#103`](https://github.com/gradido/gradido/pull/103)
+- update debug docker to use dependencies container pushed to docker hub [`1f002f4`](https://github.com/gradido/gradido/commit/1f002f4ed0b12d4b2bf63efceabe546d0c5b58ea)
+- removed email tasks complete [`8a143be`](https://github.com/gradido/gradido/commit/8a143be8423d7bd894d4f512848895df8b9694b0)
+- build login-server on docker-compose up in a docker volume so it rebuild only neccessary parts if some c++ files have changed [`0da5279`](https://github.com/gradido/gradido/commit/0da527917523530186e6effe63dc001fc99bd3e3)
+
+#### [0.9.3](https://github.com/gradido/gradido/compare/0.9.2...0.9.3)
+
+> 30 March 2021
+
+- new version 0.9.3 [`#110`](https://github.com/gradido/gradido/pull/110)
+- feat: Frontend tests for Content Footer [`#102`](https://github.com/gradido/gradido/pull/102)
+- add check session state json function and doc [`#96`](https://github.com/gradido/gradido/pull/96)
+- activity page stap 2 [`#86`](https://github.com/gradido/gradido/pull/86)
+- qrcode scanner fixed, datum in activitäten fixed, sprache not null fixed [`#88`](https://github.com/gradido/gradido/pull/88)
+- add additional docker container which is running skeema on startup to… [`#83`](https://github.com/gradido/gradido/pull/83)
+- New fix up frontend for presentation [`#85`](https://github.com/gradido/gradido/pull/85)
+- feat: Tougher eslint rules [`#77`](https://github.com/gradido/gradido/pull/77)
+- feat: improve translations [`#81`](https://github.com/gradido/gradido/pull/81)
+- use_correct_send_api [`#80`](https://github.com/gradido/gradido/pull/80)
+- fix bug with access rights [`#78`](https://github.com/gradido/gradido/pull/78)
+- make response.html better accessible [`#75`](https://github.com/gradido/gradido/pull/75)
+- feat: Lokalize Validation Messages [`#67`](https://github.com/gradido/gradido/pull/67)
+- feat: Localize links to gradito.net [`#74`](https://github.com/gradido/gradido/pull/74)
+- fix-padding [`#73`](https://github.com/gradido/gradido/pull/73)
+- Correctly use transactions API in frontend [`#69`](https://github.com/gradido/gradido/pull/69)
+- Qr code scanner [`#72`](https://github.com/gradido/gradido/pull/72)
+- Login fail message [`#71`](https://github.com/gradido/gradido/pull/71)
+- Setup unit tests for frontend [`#55`](https://github.com/gradido/gradido/pull/55)
+- Update doc [`#63`](https://github.com/gradido/gradido/pull/63)
+- Add Feature in user search old frontend because Support has requested the feature long ago [`#56`](https://github.com/gradido/gradido/pull/56)
+- sprache angepasst, for login, pwd, sigin [`#54`](https://github.com/gradido/gradido/pull/54)
+- Improve workflows [`#53`](https://github.com/gradido/gradido/pull/53)
+- setup eslint with tougher rules [`1f13507`](https://github.com/gradido/gradido/commit/1f13507eacfd93c2248fb841de5f481c9eb1e6bd)
+- semicolon rule implemented [`6762a02`](https://github.com/gradido/gradido/commit/6762a028f2a3e4f2713b26bed81029defe686ad7)
+- dev meeting, bernd [`a99de7f`](https://github.com/gradido/gradido/commit/a99de7f5d1f7557c0877eae565aa4263d65aaaf3)
+
+#### [0.9.2](https://github.com/gradido/gradido/compare/0.9.1...0.9.2)
+
+> 18 March 2021
+
+- v0.9.2 [`#51`](https://github.com/gradido/gradido/pull/51)
+- Reload after login fixed [`#50`](https://github.com/gradido/gradido/pull/50)
+- Monorepo login server [`#48`](https://github.com/gradido/gradido/pull/48)
+- Stage0 [`#3`](https://github.com/gradido/gradido/pull/3)
+- Add auto-sign Transaction functionality [`5592275`](https://github.com/gradido/gradido/commit/55922753a7ffd9552be132501d744da491c409b5)
+- read in login the real client ip X-Real-IP from nginx forwarded not from community server [`512d307`](https://github.com/gradido/gradido/commit/512d307a19b955bb6e26ae8b274def354829b50f)
+- move check if all passwords allow direct into pwdValidation so it will work with every code which ask for password [`e2c38c1`](https://github.com/gradido/gradido/commit/e2c38c1a0fc25a4a2bc922c4bbc44d86b6d00d8b)
+
 #### 0.9.1
+
+> 13 March 2021
+
+- Login gbb [`#12`](https://github.com/gradido/gradido/pull/12)
+- Admin prework axios json [`#10`](https://github.com/gradido/gradido/pull/10)
+- Merge pull request #1 from gradido/master [`#8`](https://github.com/gradido/gradido/pull/8)
+- [WIP] 2 create a dockerfile for the frontend application [`#6`](https://github.com/gradido/gradido/pull/6)
+- Master - first step [`#1`](https://github.com/gradido/gradido/pull/1)
+- Add docker compose [`#7`](https://github.com/gradido/gradido/pull/7)
+- style 404 side :) [`c7bdf89`](https://github.com/gradido/gradido/commit/c7bdf8978594b932615e48f9bb1c19d3c3bf3fcf)
+- publish workflow test [`df6f66f`](https://github.com/gradido/gradido/commit/df6f66ffe70baa9ed3f70b460a6c0c14011bb944)
+- many translations. translation structure [`bf68547`](https://github.com/gradido/gradido/commit/bf685479767d19c246c4d6abe3577dc3cb666346)

community_server/mithril_client

@@ -1 +0,0 @@
-Subproject commit f0b1d113cee2a76e9dbb098b315f4acaf38410d0

community_server/src/Controller/Component/JsonRequestClientComponent.php

@@ -60,7 +60,7 @@ class JsonRequestClientComponent extends Component
       ]), '/getRunningUserTasks');
   }
   
-  public function getUsers($session_id, $searchString)
+  public function getUsers($session_id, $searchString, $accountState)
   {
     if($searchString == "") {
         return ['state' => 'error', 'type' => 'parameter error', 'msg' => 'search string is empty'];
@@ -71,7 +71,8 @@ class JsonRequestClientComponent extends Component
     
     return $this->sendRequest(json_encode([
                 'session_id' => $session_id,
-                'search' => $searchString
+                'search' => $searchString,
+                'account_state' => $accountState,
             ]), '/getUsers');
   }
   

community_server/src/Controller/StateBalancesController.php

@@ -197,6 +197,7 @@ class StateBalancesController extends AppController
         if ($result !== true) {
             return $result;
         }
+        
         $user = $session->read('StateUser');
         $update_balance_result = $this->updateBalance($user['id']);
         if($update_balance_result !== true) {
@@ -406,7 +407,7 @@ class StateBalancesController extends AppController
         $this->set('calculated_balance', $calculated_balance);
         
         $this->set('transactions', array_reverse($transactions_reversed));
-        $this->set('transactionExecutingCount', $session->read('Transaction.executing'));
+        $this->set('transactionExecutingCount', $session->read('Transactions.executing'));
         $this->set('balance', $session->read('StateUser.balance'));
         $this->set('timeUsed', microtime(true) - $startTime);
         $this->set('gdtSum', $gdtSum);
@@ -423,6 +424,7 @@ class StateBalancesController extends AppController
         }
         $session = $this->getRequest()->getSession();
         $user = $session->read('StateUser');
+        $this->updateBalances($user['id']);
         
         $public_key_bin = hex2bin($user['public_hex']);
         $stateUserQuery = $this->StateBalances->StateUsers
@@ -580,7 +582,7 @@ class StateBalancesController extends AppController
         return $this->returnJson([
                 'state' => 'success',
                 'transactions' => $transactions,
-                'transactionExecutingCount' => $session->read('Transaction.executing'),
+                'transactionExecutingCount' => $session->read('Transactions.executing'),
                 'count' => count($transactions),
                 'gdtSum' => $gdtSum,
                 'timeUsed' => microtime(true) - $startTime

community_server/src/Controller/StateUserTransactionsController.php

@@ -197,7 +197,7 @@ class StateUserTransactionsController extends AppController
       return $this->returnJson([
           'state' => 'success', 
           'transactions' => $transactions, 
-          'transactionExecutingCount' => $session->read('Transaction.executing'), 
+          'transactionExecutingCount' => $session->read('Transactions.executing'), 
           'count' => $all_user_transactions_count,
           'timeUsed' =>  microtime(true) - $startTime
       ]);

community_server/src/Controller/StateUsersController.php

@@ -70,14 +70,14 @@ class StateUsersController extends AppController
         $this->set(compact('stateUsers'));
     }
 
-    public function listIdentHashes()
+    /*public function listIdentHashes()
     {
         $stateUsers = $this->StateUsers->find('all')->toArray();
         foreach($stateUsers as $i => $user) {
           $stateUsers[$i]->identHash = TransactionCreation::DRMakeStringHash($user->email);
         }
         $this->set('stateUsers', $stateUsers);
-    }
+    }*/
     
     public function login($session_id)
     {
@@ -128,9 +128,14 @@ class StateUsersController extends AppController
         //$this->set('timeUsed', $timeUsed);
         $csfr_token = $this->request->getParam('_csrfToken');
         $this->set(compact('timeUsed', 'searchForm', 'csfr_token'));
-
+        $empty_string = '... empty ...';
         if ($this->request->is('post')) {
+            $finalUserEntrys = [];
           $requestData = $this->request->getData();
+            $account_state = $requestData['account_state'];
+            if($requestData['search'] == '' && $account_state != 'all') {
+                $requestData['search'] = $empty_string;
+            }
 
           if($searchForm->validate($requestData)) {
             //var_dump($requestData);
@@ -140,7 +145,7 @@ class StateUsersController extends AppController
               $searchType = 'email';
             }
             // find users on login server
-            $resultJson = $this->JsonRequestClient->getUsers($session->read('session_id'), $searchString);
+                $resultJson = $this->JsonRequestClient->getUsers($session->read('session_id'), $searchString, $account_state);
             $loginServerUser = [];
             if($resultJson['state'] == 'success') {
               $dataJson = $resultJson['data'];
@@ -168,18 +173,31 @@ class StateUsersController extends AppController
               }
             }
             // find user on community server db
-            $globalSearch = '%' . $searchString . '%';
+                
+                
+                
             $communityUsers = $this->StateUsers
                     ->find('all')
                     ->contain(['StateBalances' => ['fields' => ['amount', 'state_user_id']]]);
 
+                if($account_state == 'email not activated') {
+                    if(count($pubkeySorted) > 0) {
+                        $communityUsers->where(['hex(public_key) IN' => array_keys($pubkeySorted)]);
+                    } else {
+                        $communityUsers = null;
+                    }
+                } else {
+                    $globalSearch = '%' . $searchString . '%';
             $communityUsers->where(['OR' => [
                   'first_name LIKE' => $globalSearch,
                   'last_name  LIKE' => $globalSearch,
                   'email      LIKE' => $globalSearch
             ]]);
+                }
+
                
             //var_dump($communityUsers->toArray());
+                if($communityUsers) {
             foreach($communityUsers as $u) {
               $pubkey_hex = bin2hex(stream_get_contents($u->public_key));
               $u->public_hex = $pubkey_hex;
@@ -188,7 +206,8 @@ class StateUsersController extends AppController
               }
               array_push($pubkeySorted[$pubkey_hex]['community'], $u);
             }
-            $finalUserEntrys = [];
+                }
+                
             // detect states
             foreach($pubkeySorted as $pubhex => $user) {
               $finalUser = [];

community_server/src/Controller/TransactionCreationsController.php

@@ -54,12 +54,12 @@ class TransactionCreationsController extends AppController
         ];
         $transactionCreations = $this->paginate($this->TransactionCreations);
         $identHashes = [];
-        foreach ($transactionCreations as $creation) {
+        /*foreach ($transactionCreations as $creation) {
             $identHash = TransactionCreation::DRMakeStringHash($creation->state_user->email);
             $identHashes[$creation->state_user->id] = $identHash;
-        }
+        }*/
 
-        $this->set(compact('transactionCreations', 'identHashes'));
+        //$this->set(compact('transactionCreations', 'identHashes'));
     }
 
     /**
@@ -125,7 +125,7 @@ class TransactionCreationsController extends AppController
 
                 if (count($receiverProposal) > $receiverIndex) {
                     $pubKeyHex = $receiverProposal[$receiverIndex]['key'];
-                    $identHash = TransactionCreation::DRMakeStringHash($receiverProposal[$receiverIndex]['email']);
+                    //$identHash = TransactionCreation::DRMakeStringHash($receiverProposal[$receiverIndex]['email']);
                 }
                 $builderResult = TransactionCreation::build(
                     $amountCent,
@@ -323,7 +323,7 @@ class TransactionCreationsController extends AppController
         $this->set('firstDayLastMonth', $firstDayLastMonth);
         $this->set('activeUser', $user);
         $this->set('creationForm', $creationForm);
-        $this->set('transactionExecutingCount', $session->read('Transaction.executing'));
+        $this->set('transactionExecutingCount', $session->read('Transactions.executing'));
         $this->set('timeUsed', microtime(true) - $startTime);
         $this->set('countUsers', $countUsers);
         $this->set('limit', $limit);
@@ -373,7 +373,20 @@ class TransactionCreationsController extends AppController
                         $pendings[$id] = $localAmountCent;
                     }
                     $pubKeyHex = bin2hex(stream_get_contents($receiverUser->public_key));
+                    $requestAnswear = $this->JsonRequestClient->sendRequest(json_encode([
+                        'session_id' => $session->read('session_id'),
+                        'email' => $receiverUser->email,
+                        'ask' => ['user.identHash']
+                    ]), '/getUserInfos');
                     
+                    $identHash = 0;
+                    if('success' == $requestAnswear['state'] && 'success' == $requestAnswear['data']['state']) {
+                        $identHash = $requestAnswear['data']['userData']['identHash'];
+                    } else {
+                        $this->Flash->error(__('Error by requesting LoginServer, please try again'));
+                    }
+                    
+                    //$identHash = TransactionCreation::DRMakeStringHash($receiverUser->email);
                     $localTargetDateFrozen = FrozenDate::now();
                     $localTargetDateFrozen = $localTargetDateFrozen
                                              ->year($localTargetDate['year'])

community_server/src/Form/UserSearchForm.php

@@ -11,7 +11,9 @@ class UserSearchForm extends Form
 
     protected function _buildSchema(Schema $schema)
     {
-        return $schema->addField('search', ['type' => 'string']);
+        return $schema
+                ->addField('search', ['type' => 'string'])
+                ->addField('account_state', ['type' => 'select']);
     }
 
     function validationDefault(Validator $validator)

community_server/src/Model/Entity/StateBalance.php

@@ -59,7 +59,8 @@ class StateBalance extends Entity
       if($decay_duration === 0) {
           return $this->amount;
       }
-      return $this->amount * pow(0.99999997802044727, $decay_duration);
+      return $this->amount;
+      //return $this->amount * pow(0.99999997802044727, $decay_duration);
         
     }
     public function partDecay($target_date)
@@ -68,7 +69,8 @@ class StateBalance extends Entity
         if($decay_duration <= 0) {
             return $this->amount;
         }
-        return $this->amount * pow(0.99999997802044727, $decay_duration);
+        return 0;
+        //return $this->amount * pow(0.99999997802044727, $decay_duration);
     }
     
     public function decayDuration($target_date)

community_server/src/Model/Transactions/TransactionBody.php

@@ -3,6 +3,7 @@
 namespace Model\Transactions;
 
 use Cake\ORM\TableRegistry;
+use Cake\I18n\Date;
 
 class TransactionBody extends TransactionBase {
   private $mProtoTransactionBody = null;
@@ -75,6 +76,7 @@ class TransactionBody extends TransactionBase {
       
       $transactionEntity->transaction_type_id = $this->transactionTypeId;
       $transactionEntity->memo = $this->getMemo();
+      $transactionEntity->received = new Date();
       
       if ($transactionsTable->save($transactionEntity)) {
         // success

community_server/src/Model/Transactions/TransactionCreation.php

@@ -63,24 +63,6 @@ class TransactionCreation extends TransactionBase {
         return ['state' => 'success', 'transactionBody' => $transactionBody];
     }
     
-    static protected function DRHashRotateLeft( $hash, $rotateBy )
-    {
-      return ($hash<<$rotateBy)|($hash>>(32-$rotateBy));
-    }
-
-    static public function DRMakeStringHash($str) 
-    {
-      $ret = 0;
-
-      if( $str )
-      {
-        for ($i=0; $i < strlen($str); $i++)
-        {
-          $ret = TransactionCreation::DRHashRotateLeft($ret, 7) + ord($str{$i});
-        }
-      }
-      return $ret;
-    }
     
     public function getAmount() {
       return $this->protoTransactionCreation->getReceiverAmount()->getAmount();
@@ -272,7 +254,7 @@ class TransactionCreation extends TransactionBase {
                 ->setSubject(__('Gradido Schöpfung erhalten'))
                 ->send();
         } catch(Exception $e) {
-          $this->addError('TransactionCreation::sendNotificationEmail', 'error sending notification email: ' . $e->getMessage());
+//          $this->addError('TransactionCreation::sendNotificationEmail', 'error sending notification email: ' . $e->getMessage());
           return false;
         }
       return true;
@@ -303,7 +285,7 @@ class TransactionCreation extends TransactionBase {
       
       // intval
       //$protoCreation->setIdentHash(intval($identHashBytes));
-      $protoCreation->setIdentHash(self::DRMakeStringHash($stateUser->email));
+      //$protoCreation->setIdentHash(self::DRMakeStringHash($stateUser->email));
       return new TransactionCreation($protoCreation);
     }
 }

community_server/src/Model/Transactions/TransactionTransfer.php

@@ -75,7 +75,8 @@ class TransactionTransfer extends TransactionBase {
       foreach($sigPairs as $sigPair) {
           //echo 'sig Pair: '; var_dump($sigPair); echo "<br>";
           $pubkey = bin2hex($sigPair->getPubKey());
-          $hash = TransactionCreation::DRMakeStringHash($pubkey);
+          //$hash = TransactionCreation::DRMakeStringHash($pubkey);
+          $hash = $pubkey;
           if(!isset($sigPubHexs[$hash])) {
             $sigPubHexs[$hash] = [$pubkey];
           } else {
@@ -100,7 +101,8 @@ class TransactionTransfer extends TransactionBase {
           return false;
         }
         // check if signature exist for sender
-        $hash = TransactionCreation::DRMakeStringHash($senderPublicHex);
+        //$hash = TransactionCreation::DRMakeStringHash($senderPublicHex);
+        $hash = $senderPublicHex;
         if(!isset($sigPubHexs[$hash]) || in_array($senderPublicHex, $sigPubHexs[$hash]) === FALSE) {
           $this->addError($functionName, 'missing signature for sender');
           return false;
@@ -253,7 +255,7 @@ class TransactionTransfer extends TransactionBase {
               ->setSubject(__('Gradidos erhalten'))
               ->send();
       } catch(Exception $e) {
-        $this->addError('TransactionTransfer::sendNotificationEmail', 'error sending notification email: ' . $e->getMessage());
+        //$this->addError('TransactionTransfer::sendNotificationEmail', 'error sending notification email: ' . $e->getMessage());
         return false;
       }
       return true;

community_server/src/Template/StateUsers/search.ctp

@@ -11,6 +11,19 @@ $this->assign('title', __('Benutzer suchen'));
 $this->loadHelper('Form', [
     'templates' => 'horizontal_form',
 ]);
+
+$stateOptions = [
+    'all' => __('Alle'),
+    //'account created'=>__('Konto angelegt'),
+    //'account not on login-server' => __('Konto nicht auf Login-Server'),
+    //'email activated' => __('Konto aktiviert'),
+    //'account copied to community' => __('Konto auf Gemeinschafts-Server'),
+    'email not activated' => __('Konto nicht aktiviert'),
+    //'account multiple times on login-server' => __('Konto mehrfach vorhanden'),
+    //'account not on community server' => __('Konto nicht auf Gemeinschafts-Server'),
+    //'no keys' => __('Keine Schlüssel generiert')
+];
+
 ?>
 <?= $this->Html->css([
   'loginServer/style.css',
@@ -41,7 +54,8 @@ $this->loadHelper('Form', [
   <p class="form-header">Benutzer suchen</p>
   <div class="form-body">
     <?= $this->Form->create($searchForm, []) ?>
-        <?= $this->Form->control('search', ['label' => __('Suchbegriff'), 'class' => 'form-control', 'id' => 'inlineFormInputGroup', 'placeholder' => __('Vorname/Nachname/E-Mail')]) ?>
+      <?= $this->Form->control('search', ['label' => __('Suchbegriff'), 'class' => 'form-control', 'id' => 'inlineFormInputGroup', 'placeholder' => __('Vorname/Nachname/E-Mail'), 'required' => false]) ?>
+      <?= $this->Form->control('account_state', ['label' => __('Konto Status'), 'class' => 'form-control', 'type' => 'select', 'options' => $stateOptions]) ?>
     <?= $this->Form->button('<i class="material-icons-outlined">search</i>&nbsp;' . __('Suchen'), ['class' => 'form-button']) ?>
     <?= $this->Form->hidden('order_row', ['id' => 'input-order-row']) ?>
   </div>
@@ -59,7 +73,7 @@ $this->loadHelper('Form', [
     csfr_token = '<?= $csfr_token ?>';
 
 </script>
-<?= $this->Html->script('userSearch') ?>
+<?= $this->Html->script('userSearch.min') ?>
 <!-- npm run build im mithril client! -->
 <!-- keybase://team/gradido/gradido_mithril_user_search -->
 

community_server/webroot/js/userSearch.js

@@ -185,7 +185,7 @@ process.chdir = function (dir) {
 process.umask = function() { return 0; };
 
 },{}],2:[function(require,module,exports){
-(function (setImmediate,clearImmediate){
+(function (setImmediate,clearImmediate){(function (){
 var nextTick = require('process/browser.js').nextTick;
 var apply = Function.prototype.apply;
 var slice = Array.prototype.slice;
@@ -262,9 +262,9 @@ exports.setImmediate = typeof setImmediate === "function" ? setImmediate : funct
 exports.clearImmediate = typeof clearImmediate === "function" ? clearImmediate : function(id) {
   delete immediateIds[id];
 };
-}).call(this,require("timers").setImmediate,require("timers").clearImmediate)
+}).call(this)}).call(this,require("timers").setImmediate,require("timers").clearImmediate)
 },{"process/browser.js":1,"timers":2}],3:[function(require,module,exports){
-(function (global,setImmediate){
+(function (global,setImmediate){(function (){
 new function() {
 
 function Vnode(tag, key, attrs0, children, text, dom) {
@@ -1425,7 +1425,7 @@ m.vnode = Vnode
 if (typeof module !== "undefined") module["exports"] = m
 else window.m = m
 }
-}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("timers").setImmediate)
+}).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("timers").setImmediate)
 },{"timers":2}],4:[function(require,module,exports){
 /*! @preserve
  * numeral.js
@@ -2442,10 +2442,10 @@ return numeral;
 }));
 
 },{}],5:[function(require,module,exports){
-(function (global){
+(function (global){(function (){
 /**!
  * @fileOverview Kickass library to create and place poppers near their reference elements.
- * @version 1.16.0
+ * @version 1.16.1
  * @license
  * Copyright (c) 2016 Federico Zivolo and contributors
  *
@@ -2797,7 +2797,7 @@ function getBordersSize(styles, axis) {
   var sideA = axis === 'x' ? 'Left' : 'Top';
   var sideB = sideA === 'Left' ? 'Right' : 'Bottom';
 
-  return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10);
+  return parseFloat(styles['border' + sideA + 'Width']) + parseFloat(styles['border' + sideB + 'Width']);
 }
 
 function getSize(axis, body, html, computedStyle) {
@@ -2952,8 +2952,8 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
   var scrollParent = getScrollParent(children);
 
   var styles = getStyleComputedProperty(parent);
-  var borderTopWidth = parseFloat(styles.borderTopWidth, 10);
-  var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);
+  var borderTopWidth = parseFloat(styles.borderTopWidth);
+  var borderLeftWidth = parseFloat(styles.borderLeftWidth);
 
   // In cases where the parent is fixed, we must ignore negative scroll in offset calc
   if (fixedPosition && isHTML) {
@@ -2974,8 +2974,8 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
   // differently when margins are applied to it. The margins are included in
   // the box of the documentElement, in the other cases not.
   if (!isIE10 && isHTML) {
-    var marginTop = parseFloat(styles.marginTop, 10);
-    var marginLeft = parseFloat(styles.marginLeft, 10);
+    var marginTop = parseFloat(styles.marginTop);
+    var marginLeft = parseFloat(styles.marginLeft);
 
     offsets.top -= borderTopWidth - marginTop;
     offsets.bottom -= borderTopWidth - marginTop;
@@ -3914,8 +3914,8 @@ function arrow(data, options) {
   // Compute the sideValue using the updated popper offsets
   // take popper margin in account because we don't have this info available
   var css = getStyleComputedProperty(data.instance.popper);
-  var popperMarginSide = parseFloat(css['margin' + sideCapitalized], 10);
-  var popperBorderSide = parseFloat(css['border' + sideCapitalized + 'Width'], 10);
+  var popperMarginSide = parseFloat(css['margin' + sideCapitalized]);
+  var popperBorderSide = parseFloat(css['border' + sideCapitalized + 'Width']);
   var sideValue = center - data.offsets.popper[side] - popperMarginSide - popperBorderSide;
 
   // prevent arrowElement from being placed not contiguously to its popper
@@ -5068,11 +5068,11 @@ return Popper;
 })));
 
 
-}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+}).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 },{}],6:[function(require,module,exports){
-(function (process){
+(function (process){(function (){
 /**!
-* tippy.js v5.1.4
+* tippy.js v5.2.1
 * (c) 2017-2020 atomiks
 * MIT License
 */
@@ -5100,7 +5100,7 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-var version = "5.1.4";
+var version = "5.2.1";
 
 /**
  * Triggers reflow
@@ -5749,7 +5749,6 @@ function bindGlobalEventListeners() {
 var isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';
 var ua = isBrowser ? navigator.userAgent : '';
 var isIE = /MSIE |Trident\//.test(ua);
-var isUCBrowser = /UCBrowser\//.test(ua);
 var isIOS = isBrowser && /iPhone|iPad|iPod/.test(navigator.platform);
 function updateIOSClass(isAdd) {
   var shouldAdd = isAdd && isIOS && currentInput.isTouch;
@@ -5939,8 +5938,9 @@ function updatePopperElement(popper, prevProps, nextProps) {
  */
 
 function updateTransitionEndListener(tooltip, action, listener) {
-  var eventName = isUCBrowser && document.body.style.webkitTransition !== undefined ? 'webkitTransitionEnd' : 'transitionend';
-  tooltip[action + 'EventListener'](eventName, listener);
+  ['transitionend', 'webkitTransitionEnd'].forEach(function (event) {
+    tooltip[action + 'EventListener'](event, listener);
+  });
 }
 /**
  * Adds/removes theme from tooltip's classList
@@ -6070,6 +6070,7 @@ function createTippy(reference, passedProps) {
   var pluginsHooks = plugins.map(function (plugin) {
     return plugin.fn(instance);
   });
+  var hadAriaExpandedAttributeOnCreate = reference.hasAttribute('aria-expanded');
   addListenersToTriggerTarget();
   handleAriaExpandedAttribute();
 
@@ -6090,8 +6091,9 @@ function createTippy(reference, passedProps) {
       instance.clearDelayTimeouts();
     }
   });
-  popper.addEventListener('mouseleave', function () {
+  popper.addEventListener('mouseleave', function (event) {
     if (instance.props.interactive && includes(instance.props.trigger, 'mouseenter')) {
+      debouncedOnMouseMove(event);
       doc.addEventListener('mousemove', debouncedOnMouseMove);
     }
   });
@@ -6170,6 +6172,13 @@ function createTippy(reference, passedProps) {
   }
 
   function handleAriaExpandedAttribute() {
+    // If the user has specified `aria-expanded` on their reference when the
+    // instance was created, we have to assume they're controlling it externally
+    // themselves
+    if (hadAriaExpandedAttributeOnCreate) {
+      return;
+    }
+
     var nodes = normalizeToArray(instance.props.triggerTarget || reference);
     nodes.forEach(function (node) {
       if (instance.props.interactive) {
@@ -6300,7 +6309,11 @@ function createTippy(reference, passedProps) {
           break;
 
         case 'focus':
-          on(isIE ? 'focusout' : 'blur', onBlur);
+          on(isIE ? 'focusout' : 'blur', onBlurOrFocusOut);
+          break;
+
+        case 'focusin':
+          on('focusout', onBlurOrFocusOut);
           break;
       }
     });
@@ -6371,7 +6384,7 @@ function createTippy(reference, passedProps) {
       return el === reference || el === popper;
     });
 
-    if (isCursorOverReferenceOrPopper) {
+    if (event.type === 'mousemove' && isCursorOverReferenceOrPopper) {
       return;
     }
 
@@ -6405,14 +6418,15 @@ function createTippy(reference, passedProps) {
       doc.body.addEventListener('mouseleave', scheduleHide);
       doc.addEventListener('mousemove', debouncedOnMouseMove);
       pushIfUnique(mouseMoveListeners, debouncedOnMouseMove);
+      debouncedOnMouseMove(event);
       return;
     }
 
     scheduleHide(event);
   }
 
-  function onBlur(event) {
-    if (event.target !== getCurrentTarget()) {
+  function onBlurOrFocusOut(event) {
+    if (!includes(instance.props.trigger, 'focusin') && event.target !== getCurrentTarget()) {
       return;
     } // If focus was moved to within the popper
 
@@ -6993,7 +7007,6 @@ exports.hideAll = hideAll;
 exports.includes = includes;
 exports.isBrowser = isBrowser;
 exports.isMouseEvent = isMouseEvent;
-exports.isUCBrowser = isUCBrowser;
 exports.normalizeToArray = normalizeToArray;
 exports.removeProperties = removeProperties;
 exports.setVisibilityState = setVisibilityState;
@@ -7002,11 +7015,11 @@ exports.useIfDefined = useIfDefined;
 exports.warnWhen = warnWhen;
 
 
-}).call(this,require('_process'))
+}).call(this)}).call(this,require('_process'))
 },{"_process":1,"popper.js":5}],7:[function(require,module,exports){
-(function (process){
+(function (process){(function (){
 /**!
-* tippy.js v5.1.4
+* tippy.js v5.2.1
 * (c) 2017-2020 atomiks
 * MIT License
 */
@@ -7256,7 +7269,7 @@ var animateFill = {
     var _instance$popperChild = instance.popperChildren,
         tooltip = _instance$popperChild.tooltip,
         content = _instance$popperChild.content;
-    var backdrop = instance.props.animateFill && !index.isUCBrowser ? createBackdropElement() : null;
+    var backdrop = instance.props.animateFill ? createBackdropElement() : null;
 
     function addBackdropToPopperChildren() {
       instance.popperChildren.backdrop = backdrop;
@@ -7391,7 +7404,7 @@ var followCursor = {
       // scroll for "vertical"
 
 
-      if (getIsEnabled() && (getIsInitialBehavior() || instance.props.followCursor !== true)) {
+      if (getIsEnabled() && getIsInitialBehavior()) {
         instance.popperInstance.disableEventListeners();
       }
     }
@@ -7432,7 +7445,6 @@ var followCursor = {
       var isCursorOverReference = index.closestCallback(event.target, function (el) {
         return el === reference;
       });
-      var rect = reference.getBoundingClientRect();
       var followCursor = instance.props.followCursor;
       var isHorizontal = followCursor === 'horizontal';
       var isVertical = followCursor === 'vertical';
@@ -7456,6 +7468,7 @@ var followCursor = {
           clientWidth: 0,
           clientHeight: 0,
           getBoundingClientRect: function getBoundingClientRect() {
+            var rect = reference.getBoundingClientRect();
             return {
               width: isVerticalPlacement ? size : 0,
               height: isVerticalPlacement ? 0 : size,
@@ -7721,7 +7734,7 @@ exports.inlinePositioning = inlinePositioning;
 exports.sticky = sticky;
 
 
-}).call(this,require('_process'))
+}).call(this)}).call(this,require('_process'))
 },{"./tippy.chunk.cjs.js":6,"_process":1,"popper.js":5}],8:[function(require,module,exports){
 'use strict';
 
@@ -7749,7 +7762,7 @@ function launch() {
   });
 })(document, window, domIsReady);
 
-},{"./texte/de":14,"./view":15,"mithril":3}],9:[function(require,module,exports){
+},{"./texte/de":13,"./view":14,"mithril":3}],9:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -7906,24 +7919,6 @@ exports["default"] = _default;
 },{"mithril":3}],12:[function(require,module,exports){
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = encode;
-
-/* 
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-function encode(receiver, subject, body) {
-  //return encodeURIComponent(receiver + '?subject=' + subject + '&body='  + body)
-  return encodeURIComponent(receiver) + '?subject=' + encodeURIComponent(subject) + '&body=' + encodeURIComponent(body);
-}
-
-},{}],13:[function(require,module,exports){
-"use strict";
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -7949,9 +7944,7 @@ __('account multiple times on login-server');
 __('account not on community server');
 __('no keys');
 */
-var AccountState =
-/*#__PURE__*/
-function () {
+var AccountState = /*#__PURE__*/function () {
   function AccountState(stateName) {
     _classCallCheck(this, AccountState);
 
@@ -8050,7 +8043,7 @@ function () {
 
 exports["default"] = AccountState;
 
-},{"mithril":3}],14:[function(require,module,exports){
+},{"mithril":3}],13:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -8226,7 +8219,6 @@ var _default = {
   DELETE_FROM_COMMUNITY_SUCCESS: 'Benutzer Konto vom Gemeinschafts-Server erfolgreich gelöscht',
   VERIFICATION_EMAIL_RESEND: 'Verification Email erneut zusenden',
   VERIFICATION_EMAIL_RESEND_SUCCESS: 'Verification Email wird erneut zugestellt',
-  MAILTO_VERIFICATION_EMAIL: 'Verification Email selbst verschicken',
   COPY_FAILED: 'Fehler beim Kopieren',
   DELETE_FAILED: 'Fehler beim löschen',
   RESEND_FAILED: 'Senden fehlgeschlagen',
@@ -8240,7 +8232,7 @@ var _default = {
 };
 exports["default"] = _default;
 
-},{}],15:[function(require,module,exports){
+},{}],14:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -8305,7 +8297,7 @@ var _default = {
 };
 exports["default"] = _default;
 
-},{"../model/AccountState":13,"./userTable":23,"mithril":3}],16:[function(require,module,exports){
+},{"../model/AccountState":12,"./userTable":21,"mithril":3}],15:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -8405,7 +8397,7 @@ var _default = {
 };
 exports["default"] = _default;
 
-},{"../../../lib/dialog":11,"mithril":3}],17:[function(require,module,exports){
+},{"../../../lib/dialog":11,"mithril":3}],16:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -8450,7 +8442,7 @@ var _default = {
 };
 exports["default"] = _default;
 
-},{"./actionBase":16,"mithril":3}],18:[function(require,module,exports){
+},{"./actionBase":15,"mithril":3}],17:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -8575,7 +8567,7 @@ var _default = {
 };
 exports["default"] = _default;
 
-},{"../../../lib/dialog":11,"./actionBase":16,"mithril":3}],19:[function(require,module,exports){
+},{"../../../lib/dialog":11,"./actionBase":15,"mithril":3}],18:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -8671,127 +8663,7 @@ var _default = {
 };
 exports["default"] = _default;
 
-},{"../../../lib/dialog":11,"./actionBase":16,"mithril":3}],20:[function(require,module,exports){
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _mithril = _interopRequireDefault(require("mithril"));
-
-var _actionBase = _interopRequireDefault(require("./actionBase"));
-
-var _dialog = _interopRequireDefault(require("../../../lib/dialog"));
-
-var _emailToLink = _interopRequireDefault(require("../../../lib/emailToLink"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-/* 
- * @author: Dario Rekowski
- * 
- * @date: 20.03.20
- *  
- * @brief: getting email verification code in silence
- */
-function oninit(vnode) {
-  vnode.state.loading = true;
-  vnode.state.results = null;
-  vnode.state.additionalUserData = [];
-  vnode.state.serverData = [];
-
-  _mithril["default"].request({
-    method: 'POST',
-    url: window.location.protocol + '//' + document.domain + '/state-users/ajaxGetUserEmailVerificationCode',
-    data: vnode.attrs.user,
-    headers: {
-      'X-CSRF-Token': csfr_token
-    }
-  }).then(function (result) {
-    vnode.state.loading = false;
-
-    if (result.state === 'success') {
-      vnode.state.copyResult = 'success';
-      vnode.state.additionalUserData = result.data.userData;
-      vnode.state.serverData = result.data.server; //console.log("ajax result: %o", result)
-    } else {//console.log("result error")
-      }
-  })["catch"](function (e) {
-    vnode.state.loading = false;
-    console.error("ajax error: %s in file: %s in line: %d", e.message, e.fileName, e.lineNumber);
-  });
-}
-
-function getField(vnode, index) {
-  if (null === vnode.state.results) {
-    return (0, _mithril["default"])('i.spinner-border.spinner-border-sm');
-  } else if (index in vnode.state.results) {
-    return vnode.state.results[index];
-  } else {
-    return '0';
-  }
-}
-
-function view(vnode) {
-  var email = vnode.attrs.user.email;
-  var first_name = vnode.attrs.user.first_name;
-  var last_name = vnode.attrs.user.last_name;
-  var recevier = first_name + ' ' + last_name + ' <' + email + '>';
-  var userData = vnode.state.additionalUserData;
-  var serverData = vnode.state.serverData; //console.log('Server data: %o', serverData)
-  //vnode.state.additionalUserData.verificationCode
-
-  var link = serverData['loginServer.path'] + '/checkEmail/' + userData['EmailVerificationCode.Register'];
-  var body = 'Liebe(r) ' + 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\
-\n\
-Bitte klicke zur Bestätigung auf den Link: ' + link + '\n\
-oder kopiere den obigen Link in Dein Browserfenster.\n\
-\n\
-Mit freundlichen Grüßen\n\
-Dario, Gradido Server Admin\n\
-';
-
-  if (true === vnode.state.loading) {
-    return (0, _mithril["default"])('span', [(0, _mithril["default"])('span', [(0, _mithril["default"])('button.btn.btn-secondary.btn-xs', {
-      title: window.texte.MAILTO_VERIFICATION_EMAIL,
-      disabled: true
-    }, (0, _mithril["default"])('i.spinner-border.spinner-border-sm')), window.texte.MAILTO_VERIFICATION_EMAIL])]);
-  } else {
-    return (0, _mithril["default"])('span', [(0, _mithril["default"])('span', [(0, _mithril["default"])('a.btn.btn-primary.btn-xs', {
-      title: window.texte.MAILTO_VERIFICATION_EMAIL,
-      href: 'mailto:' + (0, _emailToLink["default"])(recevier, 'Gradido: E-Mail Verification', body)
-    }, (0, _mithril["default"])('i.mdi.mdi-email-outline')), window.texte.MAILTO_VERIFICATION_EMAIL])]);
-  }
-
-  return (0, _mithril["default"])('span', [(0, _mithril["default"])('span', [(0, _mithril["default"])('a.btn.btn-secondary.btn-xs', {
-    title: window.texte.MAILTO_VERIFICATION_EMAIL,
-    href: 'mailto:' + (0, _emailToLink["default"])(recevier, 'Gradido: E-Mail Verification', body),
-    disabled: vnode.state.loading === true
-  }, vnode.state.loading === true ? (0, _mithril["default"])('i.spinner-border.spinner-border-sm') : (0, _mithril["default"])('i.mdi.mdi-email-outline')), window.texte.MAILTO_VERIFICATION_EMAIL])]);
-  /*return m('span', [
-    window.texte.RECEIVE_TRANSACTIONS_COUNT,
-    getField(vnode, 'receive'),
-    ', ',
-    window.texte.SENDED_TRANSACTIONS_COUNT,
-    getField(vnode, 'sended'),
-    ', ',
-    window.texte.CREATION_TRANSACTIONS_COUNT,
-    getField(vnode, 'creation')
-  ])*/
-}
-
-var _default = {
-  view: view,
-  oninit: oninit
-};
-exports["default"] = _default;
-
-},{"../../../lib/dialog":11,"../../../lib/emailToLink":12,"./actionBase":16,"mithril":3}],21:[function(require,module,exports){
+},{"../../../lib/dialog":11,"./actionBase":15,"mithril":3}],19:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -8830,12 +8702,12 @@ function oninit(vnode) {
     vnode.state.loading = false;
 
     if (result.state === 'success') {
-      //vnode.state.message = m('div.alert.alert-success', window.texte.DELETE_FROM_COMMUNITY_SUCCESS)
+      vnode.state.message = (0, _mithril["default"])('div.alert.alert-success', window.texte.DELETE_FROM_COMMUNITY_SUCCESS);
       vnode.state.copyResult = 'success';
       vnode.state.results = result.counts;
     } else {
       //console.log("result error")
-      //vnode.state.message  = m('div.alert.alert-danger', window.texte.DELETE_FAILED)
+      vnode.state.message = (0, _mithril["default"])('div.alert.alert-danger', window.texte.DELETE_FAILED);
       vnode.state.copyResult = 'error';
     }
   })["catch"](function (e) {
@@ -8866,7 +8738,7 @@ var _default = {
 };
 exports["default"] = _default;
 
-},{"../../../lib/dialog":11,"./actionBase":16,"mithril":3}],22:[function(require,module,exports){
+},{"../../../lib/dialog":11,"./actionBase":15,"mithril":3}],20:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -8896,7 +8768,7 @@ function view(vnode) {
     ajaxData: vnode.attrs.user,
     alertSuccess: window.texte.VERIFICATION_EMAIL_RESEND_SUCCESS,
     alertFailed: window.texte.RESEND_FAILED,
-    btnColor: 'btn-gradido-orange',
+    btnColor: 'btn-primary',
     btnSymbol: 'mdi-email',
     btnTitle: window.texte.VERIFICATION_EMAIL_RESEND,
     progessText: window.texte.RESEND_IN_PROGRESS
@@ -8908,7 +8780,7 @@ var _default = {
 };
 exports["default"] = _default;
 
-},{"./actionBase":16,"mithril":3}],23:[function(require,module,exports){
+},{"./actionBase":15,"mithril":3}],21:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -8932,6 +8804,10 @@ function oninit(vnode) {
   }
 
   vnode.state.openedUser = -1;
+  vnode.state.order = {
+    field: 'default',
+    dir: 'DESC'
+  };
 }
 
 function openButtonClick(vnode, index) {
@@ -8942,6 +8818,27 @@ function openButtonClick(vnode, index) {
   }
 }
 
+function changeOrder(vnode, fieldName) {
+  var field = vnode.state.order.field;
+  var dir = vnode.state.order.dir;
+
+  if (field != fieldName) {
+    vnode.state.order.field = fieldName;
+    vnode.state.order.dir = 'DESC';
+  } else if (field == fieldName) {
+    var new_dir;
+
+    if (dir == 'DESC') {
+      new_dir = 'ASC';
+    } else {
+      new_dir = 'DESC';
+    }
+
+    vnode.state.order.dir = new_dir;
+  } //console.log("change to %s %s", vnode.state.order.field, vnode.state.order.dir)
+
+}
+
 function updateStateForActiveUser(newState, vnode) {
   //console.log('updateStateForActiveUser')
   if (-1 !== vnode.state.openedUser) {
@@ -8957,12 +8854,154 @@ function deleteActiveUser(vnode) {
   }
 }
 
+function sortByCreated(var1, var2, dir) {
+  if (var1.created == var2.created) {
+    return 0;
+  }
+
+  var var1_date = new Date(var1.created);
+  var var2_date = new Date(var2.created); // kleiner als null => niedriger index, a kommt zuerst, b kommt als nächstes
+  // größer als null => höherer index, b kommt zuerst
+
+  if (dir == 'DESC') {
+    // descending
+    if (var1_date < var2_date) {
+      return 1;
+    } else {
+      return -1;
+    }
+  } else {
+    // ascending
+    if (var1_date < var2_date) {
+      return -1;
+    } else {
+      return 1;
+    }
+  }
+}
+
+function sortyByString(var1, var2, dir, field) {
+  if (var1[field] == var2[field]) {
+    return 0;
+  } // kleiner als null => niedriger index, a kommt zuerst, b kommt als nächstes
+  // größer als null => höherer index, b kommt zuerst
+
+
+  if (dir == 'DESC') {
+    // descending
+    if (var1[field] < var2[field]) {
+      return 1;
+    } else {
+      return -1;
+    }
+  } else {
+    // ascending
+    if (var1[field] < var2[field]) {
+      return -1;
+    } else {
+      return 1;
+    }
+  }
+}
+
+function sortByBalance(var1, var2, dir) {
+  if (var1.balance == var2.balance) {
+    return 0;
+  }
+
+  var var1_balance = parseFloat(var1.balance);
+  var var2_balance = parseFloat(var2.balance); // kleiner als null => niedriger index, a kommt zuerst, b kommt als nächstes
+  // größer als null => höherer index, b kommt zuerst
+
+  if (dir == 'DESC') {
+    // descending
+    if (var1_balance < var2_balance) {
+      return 1;
+    } else {
+      return -1;
+    }
+  } else {
+    // ascending
+    if (var1_balance < var2_balance) {
+      return -1;
+    } else {
+      return 1;
+    }
+  }
+} // js sort work in place, so no copy is created
+
+
+function sort(vnode, user) {
+  var field = vnode.state.order.field;
+  var dir = vnode.state.order.dir;
+
+  if (field == 'created') {
+    user.sort(function (var1, var2) {
+      return sortByCreated(var1, var2, dir);
+    });
+  } else if (field == 'name' || field == 'email' || field == 'pubkeyhex') {
+    user.sort(function (var1, var2) {
+      return sortyByString(var1, var2, dir, field);
+    });
+  } else if (field == 'balance') {
+    user.sort(function (var1, var2) {
+      return sortByBalance(var1, var2, dir);
+    });
+  }
+}
+
+function getArrow(vnode, fieldName) {
+  // Arrow-up: &#8593;
+  // Arrow-down: &#8595;
+  if (vnode.state.order.field == fieldName) {
+    if (vnode.state.order.dir == 'DESC') {
+      return _mithril["default"].trust('&#8595&nbsp;');
+    } else {
+      return _mithril["default"].trust('&#8593&nbsp;');
+    }
+  }
+
+  return _mithril["default"].trust('&nbsp;&nbsp;');
+}
+
 function view(vnode) {
+  // js sort work in place, so me made a deep copy first
+  var user_sorted = JSON.parse(JSON.stringify(vnode.state.orderedUsers));
+
+  if (vnode.state.order.field != 'default') {
+    sort(vnode, user_sorted);
+  }
+
   return (0, _mithril["default"])('table.table.table-hover.table-sm', [(0, _mithril["default"])('thead', (0, _mithril["default"])('tr.solid-header', [(0, _mithril["default"])('th', {
     style: {
       'padding-left': '1.5rem'
     }
-  }), (0, _mithril["default"])('th', window.texte.NAME), (0, _mithril["default"])('th', window.texte.EMAIL), (0, _mithril["default"])('th', window.texte.BALANCE), (0, _mithril["default"])('th', _mithril["default"].trust(window.texte.PUBLIC_KEY)), (0, _mithril["default"])('th', window.texte.CREATED)])), (0, _mithril["default"])('tbody', vnode.state.orderedUsers.map(function (value, index) {
+  }), (0, _mithril["default"])('th', (0, _mithril["default"])('a', {
+    onclick: function onclick() {
+      changeOrder(vnode, 'name');
+    },
+    className: 'grd_clickable'
+  }, [getArrow(vnode, 'name'), window.texte.NAME])), (0, _mithril["default"])('th', (0, _mithril["default"])('a', {
+    onclick: function onclick() {
+      changeOrder(vnode, 'email');
+    },
+    className: 'grd_clickable'
+  }, [getArrow(vnode, 'email'), window.texte.EMAIL])), (0, _mithril["default"])('th', (0, _mithril["default"])('a', {
+    onclick: function onclick() {
+      changeOrder(vnode, 'balance');
+    },
+    className: 'grd_clickable'
+  }, [getArrow(vnode, 'balance'), window.texte.BALANCE])), (0, _mithril["default"])('th', (0, _mithril["default"])('a', {
+    onclick: function onclick() {
+      changeOrder(vnode, 'pubkeyhex');
+    },
+    className: 'grd_clickable'
+  }, [getArrow(vnode, 'pubkeyhex'), _mithril["default"].trust(window.texte.PUBLIC_KEY)])), (0, _mithril["default"])('th', (0, _mithril["default"])('a', {
+    onclick: function onclick() {
+      changeOrder(vnode, 'created');
+    },
+    className: 'grd_clickable'
+  }, [getArrow(vnode, 'created'), window.texte.CREATED]))])), (0, _mithril["default"])('tbody', user_sorted.map(function (value, index) {
     var open = vnode.state.openedUser === index;
     return [(0, _mithril["default"])(_rowView["default"], {
       user: value,
@@ -8989,7 +9028,7 @@ var _default = {
 };
 exports["default"] = _default;
 
-},{"./rowAction":24,"./rowView":25,"mithril":3}],24:[function(require,module,exports){
+},{"./rowAction":22,"./rowView":23,"mithril":3}],22:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -9009,8 +9048,6 @@ var _copyCommunityLogin = _interopRequireDefault(require("./actions/copyCommunit
 
 var _verificationResend = _interopRequireDefault(require("./actions/verificationResend"));
 
-var _mailtoVerificationResend = _interopRequireDefault(require("./actions/mailtoVerificationResend"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var checkTodoAction = new RegExp(/{{([a-z-]*)}}/);
@@ -9034,9 +9071,6 @@ function getAction(name) {
 
     case 'verification-resend':
       return _verificationResend["default"];
-
-    case 'mailto-verification-resend':
-      return _mailtoVerificationResend["default"];
   }
 
   return null;
@@ -9077,7 +9111,7 @@ var _default = {
 };
 exports["default"] = _default;
 
-},{"./actions/copyCommunityLogin":17,"./actions/copyLoginCommunity":18,"./actions/deleteCommunityServer":19,"./actions/mailtoVerificationResend":20,"./actions/userTransactionsOverview":21,"./actions/verificationResend":22,"mithril":3}],25:[function(require,module,exports){
+},{"./actions/copyCommunityLogin":16,"./actions/copyLoginCommunity":17,"./actions/deleteCommunityServer":18,"./actions/userTransactionsOverview":19,"./actions/verificationResend":20,"mithril":3}],23:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -9148,4 +9182,4 @@ var _default = {
 };
 exports["default"] = _default;
 
-},{"../../lib/Gradido":9,"../../lib/Tooltip":10,"../../model/AccountState":13,"mithril":3}]},{},[8]);
+},{"../../lib/Gradido":9,"../../lib/Tooltip":10,"../../model/AccountState":12,"mithril":3}]},{},[8]);

configs/login_server/grd_login.properties

@@ -22,7 +22,10 @@ loginServer.db.user = root
 loginServer.db.password = 
 loginServer.db.port = 3306
 
+frontend.checkEmailPath = http://localhost/account/checkEmail
+
 email.disable = true
+
 #email.username =
 #email.sender =
 #email.admin_receiver = 
@@ -48,4 +51,6 @@ unsecure.allow_passwort_via_json_request = 1
 unsecure.allow_auto_sign_transactions = 1
 unsecure.allow_cors_all = 1
 # default disable, passwords must contain a number, a lower character, a high character, special character, and be at least 8 characters long
+
 unsecure.allow_all_passwords = 1
+

docker-compose.override.yml

@@ -38,6 +38,10 @@ services:
   ## NGINX ################################################
   #########################################################
   nginx:
+    depends_on:
+      - frontend 
+      - community-server
+      - login-server
     volumes: 
       - ./logs:/var/log/nginx 
   
@@ -58,6 +62,21 @@ services:
     volumes:
      - /sessions
      
+  #########################################################
+  ## skeema for updating dbs if changes happend ###########
+  #########################################################
+  skeema: 
+    build:
+      context: .
+      dockerfile: ./skeema/Dockerfile
+      target: skeema_run
+    container_name: skeema
+    depends_on:
+      - mariadb
+    networks: 
+      - internal-net
+   
 volumes:
   frontend_node_modules:
   conan:
+

docu/login_server.api.md

@@ -15,8 +15,10 @@ mit:
 ```ini
 unsercure.allow_cors_all = 1
 ```
-Wird bei allen JSON-Requests zum Header: Access-Control-Allow-Origin:* 
-hinzugefügt. 
+Wird bei allen JSON-Requests zum Header hinzugefügt:
+- Access-Control-Allow-Origin:* 
+- Access-Control-Allow-Headers: "Access-Control-Allow-Headers, Origin,Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers"
+
 
 In diesen Beispielen gehe ich jetzt davon aus, das du das gesamte Gradido Projekt mit Docker gebaut hast und auf dem lokalen Rechner laufen lässt.
 
@@ -82,3 +84,232 @@ Wenn alles okay ist erhältst du:
 ```json
 {"state":"success"}
 ```
+
+## Update User Data
+Update first name, last name, user language and enable/disable user 
+Language currently supported de and en 
+User will be disabled if he wants a account delete but has transactions. 
+Until transactions are saved in real blockchain, we need this data because the public key
+is in db only saved in state_users so we wenn delete this entry, validating all transactions not longer possible.
+Disabled User cannot login and cannot receive transactions. 
+In update Object only one of the sets needs to be there.
+
+Update password can only be used if in Login-Server config:
+```ini 
+unsecure.allow_passwort_via_json_request = 1
+```
+is set 
+
+POST http://localhost/login_api/updateUserInfos
+```json 
+{"session_id": -127182, "email": "max.musterman@gmail.de", "update": {
+	"User.first_name": "Max",
+	"User.last_name" : "Musterman",
+	"User.disabled": 0,
+	"User.language": "de"
+	"User.password": "1234"
+  }
+}
+```
+also valid 
+```json 
+{"session_id": -127182, "email": "max.musterman@gmail.de", "update": {
+	"User.last_name" : "Musterman"
+  }
+}
+```
+
+It returns if everything is okay
+```json 
+{"state":"success", "valid_values": 4, "errors":[]}
+```
+- valid_values: should contain count of entrys in update if no error occured (User.password will not be counted)
+- errors: contain on error string for every entry in update, which type isn't like expected 
+  - password: 
+    - "new password is the same as old password": no change taking place
+	- "password changed, coludn"t load private key for re-encryption": password was successfully changed, is at the moment only a warning as long as user_backups are unencrypted, safe to ignore
+	- "stored pubkey and private key didn't match": error by re-encryption keys, no changes saved 
+	- "User.password isn't valid": if password validation failed, followed by reasons why (additional array in array)
+	  example: 
+	  ```json 
+	  {"errors":[
+		"User.password isn't valid",[
+			"Passwort: Dein Passwort ist zu kurz!\n",
+			"Passwort: Bitte gebe ein gültiges Password ein mit mindestens 8 Zeichen, Groß- und Kleinbuchstaben, mindestens einer Zahl und einem Sonderzeichen (@$!%*?&+-_) ein!\n" 
+	    ]
+	   ],
+	   "state":"success",
+	   "valid_values":0
+	  }
+      ```
+## Retrieve User Data
+Retrieve different user data, in ask only one field is needed, or every possible combination 
+from the available fields
+
+Normal User can only retrieve data for himself, admins (login-server admin) can retrieve data from every user 
+Email is also the email address of user from which data are asked 
+
+POST http://localhost/login_api/getUserInfos 
+```json 
+{"session_id": -127182, "email": "max.musterman@gmail.de", "ask": [
+	"EmailVerificationCode.Register",
+	"loginServer.path",
+	"user.pubkeyhex",
+	"user.first_name",
+	"user.last_name",
+	"user.disabled",
+	"user.email_checked",
+  ]
+}
+```	
+returns if no error occured:
+```json 
+{"state": "success", "userData": { 
+	"EmailVerificationCode.Register": "2718271129122",
+	"pubkeyhex": "131c7f68dd94b2be4c913400ff7ff4cdc03ac2bda99c2d29edcacb3b065c67e6",
+	"first_name": "Max",
+	"last_name": "Musterman",
+	"disabled": 0,
+	"email_checked": 1
+  }, "server": {
+    "loginServer.path": "http://localhost/account"
+  },
+  "errors": []
+}
+```
+
+Return only the fields which are defined in ask 
+- EmailVerificationCode.Register: return the email verification code for check email (create one if none exist), work only if logged in user is admin and the email isn't from him 
+- loginServer.path: the redirect path to login-server, for example for login with login-server html frontend 
+- user.pubkeyhex: public key of user in hex-format
+- user.first_name: first name of user 
+- user.last_name: last name of user 
+- user.disabled: User will be disabled if he wants a account delete but has transactions. 
+Until transactions are saved in real blockchain, we need this data because the public key
+is in db only saved in state_users so we wenn delete this entry, validating all transactions not longer possible.
+Disabled User cannot login and cannot receive transactions. 
+- email_checked: If user has clicked on link in verification email (register), can only transfer gradidos if email_checked is 1
+
+- errors: array of strings if error occure 
+
+## Login by Email Verification Code
+Used for replace http://localhost/account/checkEmail 
+Can be used to set check_email to 1 (will be done automaticly if called with valid email verification code of type register or registerDirect)
+Can be used for password reset (additional step required: call update user info with new password)
+
+GET http://localhost/login_api/loginViaEmailVerificationCode?emailVerificationCode=382738273892983
+
+return 
+```json 
+{"state":"success", "email_verification_code_type":"resetPassword","info":[],"session_id":1853761475}
+```
+- email_verification_code_type
+  - resetPassword: for password resets, will be deleted immediately, is a only one use code 
+  - registerDirect: code generated by register for check email
+  - register: code generated by auto-register via elopage for check email
+- info can contain additional info strings 
+  - "user hasn't password": if user hasn't set a password yet (for example if he was registered via elopage)
+  - "email already activated": if email was already checked 
+- session_id: session_id for new session
+
+## Send Emails
+Let send Login-Server Password reset E-Mail to User 
+Can be also used for admin interface to resend email verification code
+
+POST http://localhost/login_api/sendEmail
+```json
+{"email": "max.musterman@gmail.de", "email_text":7, "email_verification_code_type":"resetPassword" }
+```
+also valid: 
+```json
+{"email": "max.musterman@gmail.de", "email_text":"user reset Password", "email_verification_code_type":"resetPassword" }
+```
+or: 
+```json
+{"session_id": -127182, "email": "max.musterman@gmail.de", "email_text":5, "email_verification_code_type":"register" }
+```
+
+- session_id: not needed for resetPassword emails
+- email_type: choose which email text should be used (number or string can be used)
+  - "email user verification code" (2): default text used when new user has registered 
+  - "email user verification code resend" (3): text used when user hasn't activated his account 7 days after register
+  - "email user verification code resend after long time" (4): text used when user hasn't activated his account more than 7 days after register
+  - "email admin user verification code" (5): used if admin trigger sending the email with email verification code
+  - "email admin user verification code resend" (6): used if admin trigger sending the email with email verification code again
+  - "user reset Password" (7): used for reset password email text 
+  - "email custom tex" (8): used if custom email text should be used (than email_custom_text and email_custom_subject must also be filled)
+- email_verification_code_type
+  - resetPassword: for password resets, will be deleted immediately, is a only one use code, can be used without session_id
+  - registerDirect: code generated by register for check email, can only be used by admins for another user
+  - register: code generated by auto-register via elopage for check email, can only be used by admins for another user
+- email_custom_text (optional): can be used to send email with custom text 
+  placeholder for email text, will be replaced 
+  - [first_name] first name 
+  - [last_name] last name 
+  - [duration] time span since user has created account (ex.: 10 Days) with largest unit, day is last unit
+  - [link] login-server checkEmail link with email verification code (ex.: http://localhost/account/checkEmail/382738273892983)
+  - [code] email verification code if you like to use your one link 
+- email_custom_subject (optional): for custom email the subject
+
+return 
+```json 
+{"state":"success"}
+```
+if everything is okay 
+return 
+```json 
+{"state":"warning", "msg":"email already sended"}
+```
+if emails was successfully sended but was already sended in past also.
+
+return with "state":"error" and additional "msg" if error occured (no email sended): 
+- "email already send less than a hour before": User has already get a password reset email and haven't used the link yet
+- "not supported email type": with "email_verification_code_type":"resetPassword" only email type 7 or 8 allowed 
+- "admin needed": only admins can send email verification emails because this emails normally sended out automaticly
+- "invalid email": if email wasn't found in db
+- "invalid session": if session wasn't found (only checked if session_id is set and != 0)
+- "invalid email type": could not parse email type 
+- "invalid verification code type": could not parse email verification code type 
+- "json exception": error parsing input json, more infos can be found in details
+
+
+## Check Running Transactions / password encryption
+Check if transactions on login-server for user are processed 
+
+GET http://localhost/login_api/getRunningUserTasks?email=max.musterman%40gmail.de
+**OR** 
+POST http://localhost/login_api/getRunningUserTasks
+```json 
+{"email":"max.musterman@gmail.de"}
+```
+
+return 
+```json 
+{
+	"state":"success",
+	"runningTasks": {
+		"password creation": 0,
+		"sign transaction": 1,
+		"prepare transaction": 1,
+		"ready for sign transaction":0
+	}
+}
+```
+return only entrys which > 0
+- password creation: after register or password change, login possible after tasks is finish
+- sign transaction: after check transaction in backend, before transaction is in db
+- prepare transaction: after sending transaction to login-server, before they can be checked
+- ready for sign transaction: transactions ready for signing from user
+
+## Check Session State
+GET http://localhost/login_api/checkSessionState?session_id=-127182
+
+return if session is still open
+```json
+{"state":"success"}
+```
+else return
+```json
+{"state":"not found", "msg": "session not found"}
+```
+

docu/neue-struktur.drawio

@@ -0,0 +1,160 @@
+<mxfile>
+    <diagram id="5IrTVgsBGhx6YnP7yutc" name="Page-1">
+        <mxGraphModel dx="974" dy="537" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+                <mxCell id="6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="2" target="3">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="2" target="4">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="2" value="Frontend" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="60" y="70" width="190" height="210" as="geometry"/>
+                </mxCell>
+                <mxCell id="8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="3" target="5">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="3" target="4">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="3" value="Login Server" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="410" y="70" width="80" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="4" target="5">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="4" target="3">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="4" value="Community Server" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#6a00ff;strokeColor=#3700CC;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="410" y="200" width="80" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="5" value="Node Server" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="610" y="140" width="80" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="13" value="CakePHP&lt;br&gt;Frontend" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#6a00ff;strokeColor=#3700CC;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="410" y="280" width="80" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="14" value="Einzel HTML" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="410" y="30" width="80" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="28" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="17" target="27">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="17" value="Frontend" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="60" y="460" width="190" height="210" as="geometry"/>
+                </mxCell>
+                <mxCell id="18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="20" target="24">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="20" target="23">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="20" value="Login Server" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="540" y="460" width="80" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="23" target="24">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="23" target="20">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="23" value="Community Server" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#6a00ff;strokeColor=#3700CC;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="540" y="590" width="80" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="24" value="Node Server" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="740" y="540" width="80" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="25" value="CakePHP&lt;br&gt;Frontend" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#6a00ff;strokeColor=#3700CC;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="540" y="680" width="80" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="26" value="Einzel HTML" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="540" y="410" width="80" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="29" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="27" target="20">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="30" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="27" target="23">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="27" value="GraphQL" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="320" y="460" width="80" height="210" as="geometry"/>
+                </mxCell>
+                <mxCell id="34" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="31" target="27">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="31" value="Test&lt;br&gt;(Backend)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#e3c800;strokeColor=#B09500;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="320" y="370" width="80" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="33" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="32" target="17">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="32" value="Test&lt;br&gt;(Frontend)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#e3c800;strokeColor=#B09500;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="60" y="370" width="190" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="35" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="36" target="48">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="36" value="Frontend" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="60" y="840" width="190" height="210" as="geometry"/>
+                </mxCell>
+                <mxCell id="60" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="43" target="54">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="64" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="43" target="55">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="43" value="Node Server" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="560" y="902.5" width="85" height="85" as="geometry"/>
+                </mxCell>
+                <mxCell id="53" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="48" target="43">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="48" value="GraphQL" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="320" y="840" width="200" height="210" as="geometry"/>
+                </mxCell>
+                <mxCell id="49" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="50" target="48">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="50" value="Test&lt;br&gt;(Backend)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#e3c800;strokeColor=#B09500;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="320" y="750" width="200" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="51" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="52" target="36">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="52" value="Test&lt;br&gt;(Frontend)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#e3c800;strokeColor=#B09500;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="60" y="750" width="190" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="61" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="54" target="55">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="65" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="54" target="56">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="54" value="Node Server" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="645" y="817.5" width="85" height="85" as="geometry"/>
+                </mxCell>
+                <mxCell id="62" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="55" target="56">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="66" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="55" target="43">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="55" value="Node Server" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="730" y="902.5" width="85" height="85" as="geometry"/>
+                </mxCell>
+                <mxCell id="63" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="56" target="43">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="67" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="56" target="54">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="56" value="Node Server" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
+                    <mxGeometry x="645" y="987.5" width="85" height="85" as="geometry"/>
+                </mxCell>
+            </root>
+        </mxGraphModel>
+    </diagram>
+</mxfile>

frontend/.env.dist

@@ -1,3 +1,4 @@
 LOGIN_API_URL=http://localhost/login_api/
 COMMUNITY_API_STATE_BALANCE_URL=http://localhost/state-balances/
 COMMUNITY_API_TRANSACTION_CREATION_URL=http://localhost/transaction-creations/
+VUE_PATH=/vue

frontend/.eslintignore

@@ -0,0 +1,3 @@
+node_modules
+**/*.min.js
+dist

frontend/.eslintrc.js

@@ -1,14 +1,30 @@
 module.exports = {
   root: true,
   env: {
-    node: true
-  },
-  extends: ['plugin:vue/essential'],
-  rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+    browser: true,
+    node: true,
+    jest: true
   },
   parserOptions: {
     parser: 'babel-eslint'
+  },
+  extends: [
+    'plugin:vue/essential',
+    'plugin:prettier/recommended'
+  ],
+  // required to lint *.vue files
+  plugins: [
+    'vue',
+    'prettier',
+    'jest'
+  ],
+  // add your custom rules here
+  rules: {
+    'no-console': ['error'],
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'vue/component-name-in-template-casing': ['error', 'kebab-case'],
+    'prettier/prettier': ['error', {
+      htmlWhitespaceSensitivity: 'ignore'
+    }],
   }
-};
+}

frontend/.gitignore

@@ -18,3 +18,5 @@ package-lock.json
 *.ntvs*
 *.njsproj
 *.sln
+
+*~

frontend/.prettierrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  semi: false,
+  printWidth: 100,
+  singleQuote: true,
+  trailingComma: "all",
+  tabWidth: 2,
+  bracketSpacing: true
+};

frontend/DEV-README.md

@@ -0,0 +1,21 @@
+DEV README von Alex
+
+default Page:
+´´´
+      <template>
+        <div>default</div>
+      </template>
+
+      <script>
+      export default {
+        name: 'default',
+        data() {
+          return {}
+        },
+        methods: {},
+        watch: {},
+      }
+      </script>
+      
+´´´
+

frontend/babel.config.js

@@ -1,14 +1,12 @@
 module.exports = {
-  "presets": [
-    "@vue/app"
-  ],
-  "plugins": [
+  presets: ['@babel/preset-env'],
+  plugins: [
     [
-      "component",
+      'component',
       {
-        "libraryName": "element-ui",
-        "styleLibraryName": "theme-chalk"
-      }
-    ]
-  ]
+        libraryName: 'element-ui',
+        styleLibraryName: 'theme-chalk',
+      },
+    ],
+  ],
 }

frontend/intelij.webpack.js

@@ -1,12 +1,12 @@
 // This configuration file is not used anywhere in the code, it's a hack to handle InteliJ relative path imports
 // Keep in sync with actual webpack aliases
 
-const path = require('path');
+const path = require('path')
 
 module.exports = {
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, 'src')
-    }
-  }
-};
+      '@': path.resolve(__dirname, 'src'),
+    },
+  },
+}

frontend/jest.config.js

@@ -0,0 +1,24 @@
+module.exports = {
+  verbose: true,
+  collectCoverageFrom: ['**/*.{js,vue}', '!**/node_modules/**', '!**/?(*.)+(spec|test).js?(x)'],
+  moduleFileExtensions: [
+    'js',
+    //'jsx',
+    'json',
+    'vue',
+  ],
+  coverageReporters: ['lcov'],
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/src/$1',
+    '\\.(css|less)$': 'identity-obj-proxy',
+  },
+  transform: {
+    '^.+\\.vue$': '<rootDir>/node_modules/vue-jest',
+    '^.+\\.(js|jsx)?$': '<rootDir>/node_modules/babel-jest',
+  },
+  setupFiles: ['<rootDir>/test/testSetup.js'],
+  testMatch: ['**/?(*.)+(spec|test).js?(x)'],
+  // snapshotSerializers: ['jest-serializer-vue'],
+  transformIgnorePatterns: ['<rootDir>/node_modules/'],
+  preset: '@vue/cli-plugin-unit-jest',
+}

frontend/package.json

@@ -1,17 +1,27 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "0.9.1",
+  "version": "0.9.4",
   "private": true,
   "scripts": {
     "start": "node server.js",
     "serve": "vue-cli-service serve --open",
     "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
+    "lint": "eslint --ext .js,.vue .",
     "dev": "yarn run serve",
-    "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'"
+    "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'",
+    "test": "jest"
   },
   "dependencies": {
+    "@babel/core": "^7.13.13",
+    "@babel/node": "^7.13.13",
+    "@babel/preset-env": "^7.13.12",
+    "@vue/cli-plugin-unit-jest": "^4.5.12",
+    "@vue/test-utils": "^1.1.3",
     "axios": "^0.21.1",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-jest": "^26.6.3",
+    "babel-plugin-require-context-hook": "^1.0.0",
+    "babel-preset-vue": "^2.0.2",
     "bootstrap": "4.3.1",
     "bootstrap-vue": "^2.5.0",
     "chart.js": "^2.9.3",
@@ -22,18 +32,30 @@
     "element-ui": "2.4.11",
     "es6-promise": "^4.1.1",
     "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^7.5.0",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-config-standard": "^16.0.2",
+    "eslint-loader": "^4.0.2",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jest": "^24.3.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-standard": "^5.0.0",
+    "eslint-plugin-vue": "^7.8.0",
     "express": "^4.17.1",
     "flatpickr": "^4.5.7",
     "fuse.js": "^3.2.0",
     "google-maps": "^3.2.1",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^26.6.3",
     "nouislider": "^12.1.0",
     "particles-bg-vue": "1.2.3",
     "perfect-scrollbar": "^1.3.0",
+    "prettier": "^2.2.1",
     "qrcode": "^1.4.4",
     "quill": "^1.3.6",
     "sweetalert2": "^9.5.4",
-    "vee-validate": "^3.2.1",
+    "vee-validate": "^3.4.5",
     "vue": "^2.6.11",
     "vue-bootstrap-typeahead": "^0.2.6",
     "vue-chartjs": "^3.5.0",
@@ -44,6 +66,7 @@
     "vue-flatpickr-component": "^8.1.2",
     "vue-good-table": "^2.21.3",
     "vue-i18n": "^8.22.4",
+    "vue-jest": "^3.0.7",
     "vue-moment": "^4.1.0",
     "vue-qrcode": "^0.3.5",
     "vue-qrcode-reader": "^2.3.16",
@@ -73,6 +96,6 @@
     "last 2 versions",
     "not ie <= 10"
   ],
-  "author": "Bernd Hückstädt - https://www.gradido.net/",
-  "description": "Gradido Wallet"
+  "author": "Gradido-Akademie - https://www.gradido.net/",
+  "description": "Gradido, the Natural Economy of Life, is a way to worldwide prosperity and peace in harmony with nature. - Gradido, die Natürliche Ökonomie des lebens, ist ein Weg zu weltweitem Wohlstand und Frieden in Harmonie mit der Natur."
 }

frontend/public/index.html

@@ -1,11 +1,11 @@
 <!--
 
 =========================================================
-* Gradido Wallet - v0.0.1
+* Gradido Konto - v0.0.1
 =========================================================
 
 * Product Page: https://www.gradido.net
-* Copyright 2020 Bernd Hückstädt - Gradido (https://www.gradido.net)
+* Copyright 2021 Gradido-Akademie - (https://www.gradido.net)
 
 * Coded by www.gradido.net
 
@@ -21,7 +21,7 @@
   <link rel="icon" type="image/png" sizes="96x96" href="<%= webpackConfig.output.publicPath %>favicon.png">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 
-  <title>Gradido Wallet</title>
+  <title>Gradido Account</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
 
   <!-- Fonts -->

frontend/server.js

@@ -1,7 +1,7 @@
-var express = require('express');
-var serveStatic = require('serve-static');
-var app = express();
-app.use(serveStatic(__dirname + "/dist"));
-var port = process.env.PORT || 5000;
-app.listen(port);
+var express = require('express')
+var serveStatic = require('serve-static')
+var app = express()
+app.use(serveStatic(__dirname + '/dist'))
+var port = process.env.PORT || 5000
+app.listen(port)
 // console.log('http://localhost:5000 server started.');

frontend/src/App.vue

@@ -1,37 +1,65 @@
 <template>
-<div id="app" class="font-sans text-gray-800">
-    <header class="">     
+  <div id="app" class="font-sans text-gray-800">
+    <header>
+      <b-col class="text-center">
+        <b-dropdown
+          size="sm"
+          split
+          variant="secondary"
+          :text="$t('language') + ' - ' + $i18n.locale"
+          class="m-md-2"
+        >
+          <b-dropdown-divider></b-dropdown-divider>
+          <b-dropdown-item @click.prevent="setLocale('de')">Deutsch</b-dropdown-item>
+          <b-dropdown-item @click.prevent="setLocale('en')">English</b-dropdown-item>
+        </b-dropdown>
+      </b-col>
     </header>
     <div class="">
       <particles-bg type="custom" :config="config" :bg="true" />
       <router-view />
-       
     </div>
   </div>
 </template>
 
 <script>
-import { ParticlesBg } from "particles-bg-vue";
-import icon from "./icon.js"; 
+import { ParticlesBg } from 'particles-bg-vue'
+import icon from './icon.js'
+import { localeChanged } from 'vee-validate'
 
 export default {
   name: 'app',
   components: {
-      ParticlesBg
-    },
-    created () { 
-      //console.log("this.$cookies.get('gdd_session_id') ", this.$cookies.get('gdd_session_id') )
-       console.log(" $cookies.isKey('gdd_session_id') ", this.$cookies.isKey("gdd_session_id")  )
-      if ( this.$cookies.isKey('gdd_session_id') ) {
-        //this.$store.state.email = this.$cookies.get('gdd_u') 
-         console.log("login to kontooverview")      
-        this.$router.push('/KontoOverview') 
-      }else {
-        console.log("login to LOGIN")
-       this.$router.push("/Login")
+    ParticlesBg,
+  },
+  data() {
+    return {
+      session_id: null,
+      email: '',
+      language: 'en',
+    }
+  },
+  created() {
+    //console.log('xx', $cookies.get('gdd_lang'))
+    //console.log('%cWillkommen bei Gradido %cgreen text', 'font-weight:bold', 'color: green')
+    if ($cookies.isKey('gdd_session_id') == true) {
+      //console.log('%cHey %c' + $cookies.get('gdd_u') + '', 'font-weight:bold', 'color: orange')
+      this.$store.commit('session_id', $cookies.get('gdd_session_id'))
+      this.$store.commit('email', $cookies.get('gdd_u'))
+      if ($cookies.get('gdd_lang') != 'de' || $cookies.get('gdd_lang') != 'de') {
+        this.$store.commit('language', 'de')
+      } else {
+        this.$store.commit('language', $cookies.get('gdd_lang'))
       }
-    },
-     data() {
+
+      this.$i18n.locale = $cookies.get('gdd_lang')
+      this.$router.push('overview')
+    } else {
+      //console.log('app.vue to Logout')
+      this.$store.dispatch('logout')
+    }
+  },
+  data() {
     return {
       config: {
         num: [1, 7],
@@ -43,33 +71,64 @@ export default {
         body: icon,
         alpha: [0.6, 0],
         scale: [0.1, 0.4],
-        position: "all",
-        cross: "dead",
+        position: 'all',
+        cross: 'dead',
         random: 2,
       },
-    };
+    }
+  },
+  methods: {
+    setLocale(locale) {
+      this.$i18n.locale = locale
+      this.$store.commit('language', this.$i18n.locale)
+      localeChanged(locale)
+    },
   },
 }
 </script>
 <style>
-    .btn {
-      background-color: #5A7B02;
-      border-color: #5e72e4;
-    }
-     a, .copyright{
-      color: #5A7B02;    
-    }
-    gradido-global-color-text{color:  #3D443B }
-    gradido-global-color-accent{color:  #047006 }
-    gradido-global-color-6e0a9c9e{color:  #000 } 
-    gradido-global-color-2d0fb154{color:  #047006 }
-    gradido-global-color-16efe88c{color:  #7EBC55 }
-    gradido-global-color-1939326{color:  #F6FFF6 }
-    gradido-global-color-9d79fc1{color:  #047006 }
-    gradido-global-color-6347f4d{color:  #5A7B02 }
-    gradido-global-color-4fbc19a{color:  #014034 }
-    gradido-global-color-d341874{color:  #B6D939 }
-    gradido-global-color-619d338{color:  #8EBFB1 }
-    gradido-global-color-44819a9{color:  #026873 }
-   
+.btn-primary pim {
+  background-color: #5a7b02;
+  border-color: #5e72e4;
+}
+a,
+.copyright {
+  color: #5a7b02;
+}
+gradido-global-color-text {
+  color: #3d443b;
+}
+gradido-global-color-accent {
+  color: #047006;
+}
+gradido-global-color-6e0a9c9e {
+  color: #000;
+}
+gradido-global-color-2d0fb154 {
+  color: #047006;
+}
+gradido-global-color-16efe88c {
+  color: #7ebc55;
+}
+gradido-global-color-1939326 {
+  color: #f6fff6;
+}
+gradido-global-color-9d79fc1 {
+  color: #047006;
+}
+gradido-global-color-6347f4d {
+  color: #5a7b02;
+}
+gradido-global-color-4fbc19a {
+  color: #014034;
+}
+gradido-global-color-d341874 {
+  color: #b6d939;
+}
+gradido-global-color-619d338 {
+  color: #8ebfb1;
+}
+gradido-global-color-44819a9 {
+  color: #026873;
+}
 </style>

frontend/src/apis/communityAPI.js

@@ -1,33 +1,33 @@
-import axios from 'axios';
+import axios from 'axios'
 import CONFIG from '../config'
 
 const apiGet = async (url) => {
   try {
-    const result = await axios.get(url);
-    if(result.status !== 200){
-      throw new Error('HTTP Status Error '+result.status)
+    const result = await axios.get(url)
+    if (result.status !== 200) {
+      throw new Error('HTTP Status Error ' + result.status)
     }
-    if(result.data.state !== 'success'){
+    if (result.data.state !== 'success') {
       throw new Error(result.data.msg)
     }
     return { success: true, result }
-  } catch(error){
-    return { success: false, result: error}
+  } catch (error) {
+    return { success: false, result: error }
   }
 }
 
 const apiPost = async (url, payload) => {
   try {
-    const result = await axios.post(url, payload);
-    if(result.status !== 200){
-      throw new Error('HTTP Status Error '+result.status)
+    const result = await axios.post(url, payload)
+    if (result.status !== 200) {
+      throw new Error('HTTP Status Error ' + result.status)
     }
-    if(result.data.state !== 'success'){
+    if (result.data.state !== 'success') {
       throw new Error(result.data.msg)
     }
     return { success: true, result }
-  } catch(error){
-    return { success: false, result: error}
+  } catch (error) {
+    return { success: false, result: error }
   }
 }
 
@@ -38,17 +38,27 @@ const communityAPI = {
   transactions: async (session_id) => {
     return apiGet(CONFIG.COMMUNITY_API_STATE_BALANCE_URL + 'ajaxListTransactions/' + session_id)
   },
-  create: async (session_id, email, amount, memo, target_date = new Date() ) => {
+  /*create: async (session_id, email, amount, memo, target_date = new Date() ) => {
     const payload = {
       session_id,
       email,
       amount,
       target_date,
       memo,
-      auto_sign: true
+      auto_sign: true,
     }
     return apiPost(CONFIG.COMMUNITY_API_TRANSACTION_CREATION_URL + 'ajaxCreate/', payload)
-  }
+  },*/
+  send: async (session_id, email, amount, memo) => {
+    const payload = {
+      session_id,
+      email,
+      amount,
+      memo,
+      auto_sign: true,
+    }
+    return apiPost(CONFIG.COMMUNITY_API_TRANSACTION_SEND_COINS + 'ajaxCreate/', payload)
+  },
 }
 
 export default communityAPI

frontend/src/apis/loginAPI.js

@@ -1,4 +1,4 @@
-import axios from 'axios';
+import axios from 'axios'
 import CONFIG from '../config'
 
 // control email-text sended with email verification code
@@ -7,18 +7,36 @@ const EMAIL_TYPE = {
   ADMIN: 5, // if user was registered by an admin
 }
 
-const apiPost = async (url, payload) => {
+const apiGet = async (url) => {
   try {
-    const result = await axios.post(url, payload);
-    if(result.status !== 200){
-      throw new Error('HTTP Status Error '+result.status)
+    const result = await axios.get(url)
+    if (result.status !== 200) {
+      throw new Error('HTTP Status Error ' + result.status)
     }
-    if(result.data.state !== 'success'){
+    if (result.data.state !== 'success') {
       throw new Error(result.data.msg)
     }
     return { success: true, result }
-  } catch(error){
-    return { success: false, result: error}
+  } catch (error) {
+    return { success: false, result: error }
+  }
+}
+
+const apiPost = async (url, payload) => {
+  try {
+    const result = await axios.post(url, payload)
+    if (result.status !== 200) {
+      throw new Error('HTTP Status Error ' + result.status)
+    }
+    if (result.data.state === 'warning') {
+      return { success: true, result: error }
+    }
+    if (result.data.state !== 'success') {
+      throw new Error(result.data.msg)
+    }
+    return { success: true, result }
+  } catch (error) {
+    return { success: false, result: error }
   }
 }
 
@@ -31,17 +49,17 @@ const loginAPI = {
     return apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', payload)
   },
   logout: async (session_id) => {
-    const payload= { session_id }
+    const payload = { session_id }
     return apiPost(CONFIG.LOGIN_API_URL + 'logout', payload)
   },
-  create : async (email, first_name, last_name, password) => {
+  create: async (email, first_name, last_name, password) => {
     const payload = {
       email,
       first_name,
       last_name,
       password,
       emailType: EMAIL_TYPE.DEFAULT,
-      login_after_register: true
+      login_after_register: true,
     }
     return apiPost(CONFIG.LOGIN_API_URL + 'createUser', payload)
   },

frontend/src/components/Badge.vue

@@ -1,50 +1,45 @@
 <template>
-  <b-badge
-    :variant="type"
-    :pill="rounded"
-    :size="size"
-    :class="{'badge-circle': circle }">
+  <b-badge :variant="type" :pill="rounded" :size="size" :class="{ 'badge-circle': circle }">
     <slot>
       <i v-if="icon" :class="icon"></i>
     </slot>
   </b-badge>
 </template>
 <script>
-  export default {
-    name: "badge",
-    props: {
-      tag: {
-        type: String,
-        default: "span",
-        description: "Html tag to use for the badge."
-      },
-      rounded: {
-        type: Boolean,
-        default: false,
-        description: "Whether badge is of pill type"
-      },
-      circle: {
-        type: Boolean,
-        default: false,
-        description: "Whether badge is circle"
-      },
-      icon: {
-        type: String,
-        default: "",
-        description: "Icon name. Will be overwritten by slot if slot is used"
-      },
-      type: {
-        type: String,
-        default: "default",
-        description: "Badge type (primary|info|danger|default|warning|success)"
-      },
-      size: {
-        type: String,
-        description: 'Badge size (md, lg)',
-        default: ''
-      }
-    }
-  };
+export default {
+  name: 'badge',
+  props: {
+    tag: {
+      type: String,
+      default: 'span',
+      description: 'Html tag to use for the badge.',
+    },
+    rounded: {
+      type: Boolean,
+      default: false,
+      description: 'Whether badge is of pill type',
+    },
+    circle: {
+      type: Boolean,
+      default: false,
+      description: 'Whether badge is circle',
+    },
+    icon: {
+      type: String,
+      default: '',
+      description: 'Icon name. Will be overwritten by slot if slot is used',
+    },
+    type: {
+      type: String,
+      default: 'default',
+      description: 'Badge type (primary|info|danger|default|warning|success)',
+    },
+    size: {
+      type: String,
+      description: 'Badge size (md, lg)',
+      default: '',
+    },
+  },
+}
 </script>
-<style>
-</style>
+<style></style>

frontend/src/components/BaseAlert.vue

@@ -8,7 +8,6 @@
     >
       <slot v-if="!dismissible"></slot>
       <template v-else>
-
         <template v-if="icon || $slots.icon">
           <slot name="icon">
             <span class="alert-icon" data-notify="icon">
@@ -17,14 +16,16 @@
           </slot>
         </template>
 
-        <span class="alert-text"> <slot></slot> </span>
+        <span class="alert-text"><slot></slot></span>
 
         <slot name="dismiss-icon">
-          <button type="button"
-                  class="close"
-                  data-dismiss="alert"
-                  aria-label="Close"
-                  @click="dismissAlert">
+          <button
+            type="button"
+            class="close"
+            data-dismiss="alert"
+            aria-label="Close"
+            @click="dismissAlert"
+          >
             <span aria-hidden="true">×</span>
           </button>
         </slot>
@@ -33,39 +34,43 @@
   </fade-transition>
 </template>
 <script>
-  import { FadeTransition } from 'vue2-transitions';
+import { FadeTransition } from 'vue2-transitions'
 
-  export default {
-    name: 'base-alert',
-    components: {
-      FadeTransition
+export default {
+  name: 'base-alert',
+  components: {
+    FadeTransition,
+  },
+  created() {
+    //console.log('base-alert gesetzt in =>', this.$route.path)
+  },
+  props: {
+    type: {
+      type: String,
+      default: 'default',
+      description: 'Alert type',
     },
-    props: {
-      type: {
-        type: String,
-        default: 'default',
-        description: 'Alert type'
-      },
-      dismissible: {
-        type: Boolean,
-        default: false,
-        description: 'Whether alert is dismissible (closeable)'
-      },
-      icon: {
-        type: String,
-        default: '',
-        description: 'Alert icon to display'
-      }
+    dismissible: {
+      type: Boolean,
+      default: false,
+      description: 'Whether alert is dismissible (closeable)',
     },
-    data() {
-      return {
-        visible: true
-      };
+    icon: {
+      type: String,
+      default: '',
+      description: 'Alert icon to display',
     },
-    methods: {
-      dismissAlert() {
-        this.visible = false;
-      }
+  },
+  data() {
+    return {
+      visible: true,
     }
-  };
+  },
+  methods: {
+    dismissAlert() {
+      this.visible = false
+      this.$store.state.loginfail = false
+    },
+  },
+}
 </script>

frontend/src/components/BaseButton.vue

@@ -12,7 +12,7 @@
       { 'btn-wd': wide },
       { 'btn-icon btn-fab': icon },
       { 'btn-link': link },
-      { disabled: disabled }
+      { disabled: disabled },
     ]"
   >
     <slot name="loading">
@@ -34,42 +34,42 @@ export default {
     type: {
       type: String,
       default: 'default',
-      description: 'Button type (primary|secondary|danger etc)'
+      description: 'Button type (primary|secondary|danger etc)',
     },
     nativeType: {
       type: String,
       default: 'button',
-      description: 'Button native type (e.g button, input etc)'
+      description: 'Button native type (e.g button, input etc)',
     },
     size: {
       type: String,
       default: '',
-      description: 'Button size (sm|lg)'
+      description: 'Button size (sm|lg)',
     },
     outline: {
       type: Boolean,
-      description: 'Whether button is outlined (only border has color)'
+      description: 'Whether button is outlined (only border has color)',
     },
     link: {
       type: Boolean,
-      description: 'Whether button is a link (no borders or background)'
-    }
+      description: 'Whether button is a link (no borders or background)',
+    },
   },
   methods: {
     handleClick(evt) {
-      this.$emit('click', evt);
-    }
-  }
-};
+      this.$emit('click', evt)
+    },
+  },
+}
 </script>
 <style lang="scss">
-  .base-button {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
+.base-button {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
 
-    i {
-      padding: 0 3px;
-    }
+  i {
+    padding: 0 3px;
   }
+}
 </style>

frontend/src/components/BaseDropdown.vue

@@ -9,22 +9,19 @@
       <component
         :is="titleTag"
         class="btn-rotate"
-        :class="[{'dropdown-toggle': hasToggle}, titleClasses]"
+        :class="[{ 'dropdown-toggle': hasToggle }, titleClasses]"
         :aria-expanded="isOpen"
         data-toggle="dropdown"
       >
         <slot name="title" :is-open="isOpen">
-          <i :class="icon"></i> {{ title }}
+          <i :class="icon"></i>
+          {{ title }}
         </slot>
       </component>
     </slot>
     <ul
       class="dropdown-menu"
-      :class="[
-        { show: isOpen },
-        { 'dropdown-menu-right': menuOnRight },
-        menuClasses
-      ]"
+      :class="[{ show: isOpen }, { 'dropdown-menu-right': menuOnRight }, menuClasses]"
     >
       <slot></slot>
     </ul>
@@ -37,60 +34,60 @@ export default {
     tag: {
       type: String,
       default: 'div',
-      description: 'Dropdown html tag (e.g div, ul etc)'
+      description: 'Dropdown html tag (e.g div, ul etc)',
     },
     titleTag: {
       type: String,
       default: 'button',
-      description: 'Dropdown title (toggle) html tag'
+      description: 'Dropdown title (toggle) html tag',
     },
     title: {
       type: String,
-      description: 'Dropdown title'
+      description: 'Dropdown title',
     },
     direction: {
       type: String,
       default: 'down', // up | down
-      description: 'Dropdown menu direction (up|down)'
+      description: 'Dropdown menu direction (up|down)',
     },
     icon: {
       type: String,
-      description: 'Dropdown icon'
+      description: 'Dropdown icon',
     },
     titleClasses: {
       type: [String, Object, Array],
-      description: 'Title css classes'
+      description: 'Title css classes',
     },
     menuClasses: {
       type: [String, Object],
-      description: 'Menu css classes'
+      description: 'Menu css classes',
     },
     menuOnRight: {
       type: Boolean,
-      description: 'Whether menu should appear on the right'
+      description: 'Whether menu should appear on the right',
     },
     hasToggle: {
       type: Boolean,
       description: 'Whether dropdown has arrow icon shown',
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
-      isOpen: false
-    };
+      isOpen: false,
+    }
   },
   methods: {
     toggleDropDown() {
-      this.isOpen = !this.isOpen;
-      this.$emit('change', this.isOpen);
+      this.isOpen = !this.isOpen
+      this.$emit('change', this.isOpen)
     },
     closeDropDown() {
-      this.isOpen = false;
-      this.$emit('change', false);
-    }
-  }
-};
+      this.isOpen = false
+      this.$emit('change', false)
+    },
+  },
+}
 </script>
 <style lang="scss" scoped>
 .dropdown {

frontend/src/components/BaseHeader.vue

@@ -1,23 +1,22 @@
 <template>
-  <div class="header" :class="{[`bg-${type}`]: type}">
-     <b-container fluid>
+  <div class="header" :class="{ [`bg-${type}`]: type }">
+    <b-container fluid>
       <div class="header-body">
         <slot></slot>
       </div>
-     </b-container>
+    </b-container>
   </div>
 </template>
 <script>
-  export default {
-    name: 'base-header',
-    props: {
-      type: {
-        type: String,
-        default: 'success',
-        description: 'Header background type'
-      }
-    }
-  }
+export default {
+  name: 'base-header',
+  props: {
+    type: {
+      type: String,
+      default: 'success',
+      description: 'Header background type',
+    },
+  },
+}
 </script>
-<style>
-</style>
+<style></style>

frontend/src/components/BasePagination.vue

@@ -1,14 +1,27 @@
 <template>
   <div>
-    <b-pagination first-number last-number :per-page="perPage" :size="size" :value="value" @change="(val) => $emit('change', val)" :align="align" :total-rows="total">
+    <b-pagination
+      first-number
+      last-number
+      :per-page="perPage"
+      :size="size"
+      :value="value"
+      @change="(val) => $emit('change', val)"
+      :align="align"
+      :total-rows="total"
+    >
       <template v-slot:prev-text>
         <a class="page-link" aria-label="Previous">
-          <span aria-hidden="true"><i class="fa fa-angle-left" aria-hidden="true"></i></span>
+          <span aria-hidden="true">
+            <i class="fa fa-angle-left" aria-hidden="true"></i>
+          </span>
         </a>
       </template>
       <template v-slot:next-text>
         <a class="page-link" aria-label="Next">
-          <span aria-hidden="true"><i class="fa fa-angle-right" aria-hidden="true"></i></span>
+          <span aria-hidden="true">
+            <i class="fa fa-angle-right" aria-hidden="true"></i>
+          </span>
         </a>
       </template>
     </b-pagination>
@@ -16,41 +29,39 @@
 </template>
 <script>
 export default {
-  name: "base-pagination",
+  name: 'base-pagination',
   props: {
     pageCount: {
       type: Number,
       default: 0,
-      description:
-        "Pagination page count. This should be specified in combination with perPage"
+      description: 'Pagination page count. This should be specified in combination with perPage',
     },
     perPage: {
       type: Number,
       default: 10,
-      description:
-        "Pagination per page. Should be specified with total or pageCount"
+      description: 'Pagination per page. Should be specified with total or pageCount',
     },
     total: {
       type: Number,
       default: 0,
       description:
-        "Can be specified instead of pageCount. The page count in this case will be total/perPage"
+        'Can be specified instead of pageCount. The page count in this case will be total/perPage',
     },
     value: {
       type: Number,
       default: 1,
-      description: "Pagination value"
+      description: 'Pagination value',
     },
     size: {
       type: String,
-      default: "",
-      description: "Pagination size"
+      default: '',
+      description: 'Pagination size',
     },
     align: {
       type: String,
-      default: "",
-      description: "Pagination alignment (e.g center|start|end)"
-    }
+      default: '',
+      description: 'Pagination alignment (e.g center|start|end)',
+    },
   },
-};
+}
 </script>

frontend/src/components/BaseProgress.vue

@@ -3,82 +3,77 @@
     <div :class="`progress-${type}`" v-if="showLabel">
       <div class="progress-label">
         <slot name="label">
-          <span>{{label}}</span>
+          <span>{{ label }}</span>
         </slot>
       </div>
       <div class="progress-percentage">
         <slot>
-          <span>{{value}}%</span>
+          <span>{{ value }}%</span>
         </slot>
       </div>
     </div>
-    <b-progress
-      :size="size"
-      :class="[progressClasses]"
-      :style="`height: ${height}px`">
+    <b-progress :size="size" :class="[progressClasses]" :style="`height: ${height}px`">
       <b-progress-bar :class="computedClasses" :value="value"></b-progress-bar>
     </b-progress>
   </div>
 </template>
 <script>
-  export default {
-    name: "base-progress",
-    props: {
-      striped: {
-        type: Boolean,
-        description: "Whether progress is striped"
-      },
-      animated: {
-        type: Boolean,
-        description:
-          "Whether progress is animated (works only with `striped` prop together)"
-      },
-      label: {
-        type: String,
-        description: "Progress label (shown on the left above progress)"
-      },
-      height: {
-        type: Number,
-        default: 3,
-        description: "Progress line height"
-      },
-      type: {
-        type: String,
-        default: "default",
-        description: "Progress type (e.g danger, primary etc)"
-      },
-      showLabel: {
-        type: Boolean,
-        default: false
-      },
-      progressClasses: {
-        type: [Array, String],
-        default: '',
-        description: 'Progress css classes'
-      },
-      size: {
-        type: String,
-        default: ''
-      },
-      value: {
-        type: Number,
-        default: 0,
-        validator: value => {
-          return value >= 0 && value <= 100;
-        },
-        description: "Progress value"
-      }
+export default {
+  name: 'base-progress',
+  props: {
+    striped: {
+      type: Boolean,
+      description: 'Whether progress is striped',
     },
-    computed: {
-      computedClasses() {
-        return [
-          { "progress-bar-striped": this.striped },
-          { "progress-bar-animated": this.animated },
-          { [`bg-${this.type}`]: this.type }
-        ];
-      }
-    }
-  };
+    animated: {
+      type: Boolean,
+      description: 'Whether progress is animated (works only with `striped` prop together)',
+    },
+    label: {
+      type: String,
+      description: 'Progress label (shown on the left above progress)',
+    },
+    height: {
+      type: Number,
+      default: 3,
+      description: 'Progress line height',
+    },
+    type: {
+      type: String,
+      default: 'default',
+      description: 'Progress type (e.g danger, primary etc)',
+    },
+    showLabel: {
+      type: Boolean,
+      default: false,
+    },
+    progressClasses: {
+      type: [Array, String],
+      default: '',
+      description: 'Progress css classes',
+    },
+    size: {
+      type: String,
+      default: '',
+    },
+    value: {
+      type: Number,
+      default: 0,
+      validator: (value) => {
+        return value >= 0 && value <= 100
+      },
+      description: 'Progress value',
+    },
+  },
+  computed: {
+    computedClasses() {
+      return [
+        { 'progress-bar-striped': this.striped },
+        { 'progress-bar-animated': this.animated },
+        { [`bg-${this.type}`]: this.type },
+      ]
+    },
+  },
+}
 </script>
-<style>
-</style>
+<style></style>

frontend/src/components/BaseSlider.vue

@@ -2,56 +2,55 @@
   <div class="slider" :disabled="disabled"></div>
 </template>
 <script>
-import noUiSlider from 'nouislider';
+import noUiSlider from 'nouislider'
 
 export default {
   name: 'base-slider',
   props: {
     value: {
       type: [String, Array, Number],
-      description: 'slider value'
+      description: 'slider value',
     },
     disabled: {
       type: Boolean,
       default: false,
-      description: 'whether the slider is disabled'
+      description: 'whether the slider is disabled',
     },
     start: {
       type: [Number, Array],
       default: 0,
       description:
-        '[noUi Slider start](https://refreshless.com/nouislider/slider-options/#section-start)'
+        '[noUi Slider start](https://refreshless.com/nouislider/slider-options/#section-start)',
     },
     connect: {
       type: [Boolean, Array],
       default: () => [true, false],
       description:
-        '[noUi Slider connect](https://refreshless.com/nouislider/slider-options/#section-connect)'
+        '[noUi Slider connect](https://refreshless.com/nouislider/slider-options/#section-connect)',
     },
     range: {
       type: Object,
       default: () => {
         return {
           min: 0,
-          max: 100
-        };
+          max: 100,
+        }
       },
       description:
-        '[noUi Slider range](https://refreshless.com/nouislider/slider-values/#section-range)'
+        '[noUi Slider range](https://refreshless.com/nouislider/slider-values/#section-range)',
     },
     options: {
       type: Object,
       default: () => {
-        return {};
+        return {}
       },
-      description:
-        '[noUi Slider options](https://refreshless.com/nouislider/slider-options/)'
-    }
+      description: '[noUi Slider options](https://refreshless.com/nouislider/slider-options/)',
+    },
   },
   data() {
     return {
-      slider: null
-    };
+      slider: null,
+    }
   },
   methods: {
     createSlider() {
@@ -59,38 +58,35 @@ export default {
         start: this.value || this.start,
         connect: Array.isArray(this.value) ? true : this.connect,
         range: this.range,
-        ...this.options
-      });
-      const slider = this.$el.noUiSlider;
+        ...this.options,
+      })
+      const slider = this.$el.noUiSlider
       slider.on('slide', () => {
-        let value = slider.get();
+        let value = slider.get()
         if (value !== this.value) {
-          this.$emit('input', value);
+          this.$emit('input', value)
         }
-      });
-    }
+      })
+    },
   },
   mounted() {
-    this.createSlider();
+    this.createSlider()
   },
   watch: {
     value(newValue, oldValue) {
-      const slider = this.$el.noUiSlider;
-      const sliderValue = slider.get();
+      const slider = this.$el.noUiSlider
+      const sliderValue = slider.get()
       if (newValue !== oldValue && sliderValue !== newValue) {
         if (Array.isArray(sliderValue) && Array.isArray(newValue)) {
-          if (
-            oldValue.length === newValue.length &&
-            oldValue.every((v, i) => v === newValue[i])
-          ) {
-            slider.set(newValue);
+          if (oldValue.length === newValue.length && oldValue.every((v, i) => v === newValue[i])) {
+            slider.set(newValue)
           }
         } else {
-          slider.set(newValue);
+          slider.set(newValue)
         }
       }
-    }
-  }
-};
+    },
+  },
+}
 </script>
 <style></style>

frontend/src/components/BaseTable.vue

@@ -10,10 +10,7 @@
     <tbody :class="tbodyClasses">
       <tr v-for="(item, index) in data" :key="index">
         <slot :row="item" :index="index">
-          <td
-            v-for="(column, index) in columns"
-            :key="index"
-          >
+          <td v-for="(column, index) in columns" :key="index">
             {{ itemValue(item, column) }}
           </td>
         </slot>
@@ -28,42 +25,42 @@ export default {
     columns: {
       type: Array,
       default: () => [],
-      description: 'Table columns'
+      description: 'Table columns',
     },
     data: {
       type: Array,
       default: () => [],
-      description: 'Table data'
+      description: 'Table data',
     },
     type: {
       type: String, // striped | hover
       default: '',
-      description: 'Whether table is striped or hover type'
+      description: 'Whether table is striped or hover type',
     },
     theadClasses: {
       type: String,
       default: '',
-      description: '<thead> css classes'
+      description: '<thead> css classes',
     },
     tbodyClasses: {
       type: String,
       default: '',
-      description: '<tbody> css classes'
-    }
+      description: '<tbody> css classes',
+    },
   },
   computed: {
     tableClass() {
-      return this.type && `table-${this.type}`;
-    }
+      return this.type && `table-${this.type}`
+    },
   },
   methods: {
     hasValue(item, column) {
-      return item[column.toLowerCase()] !== 'undefined';
+      return item[column.toLowerCase()] !== 'undefined'
     },
     itemValue(item, column) {
-      return item[column.toLowerCase()];
-    }
-  }
-};
+      return item[column.toLowerCase()]
+    },
+  },
+}
 </script>
 <style></style>

frontend/src/components/Breadcrumb/Breadcrumb.vue

@@ -1,7 +1,6 @@
 <template>
   <nav aria-label="breadcrumb">
-    <b-breadcrumb
-        :class="[{[`bg-${type}`]: type}, listClasses]">
+    <b-breadcrumb :class="[{ [`bg-${type}`]: type }, listClasses]">
       <slot></slot>
     </b-breadcrumb>
   </nav>
@@ -13,14 +12,14 @@ export default {
     type: {
       type: String,
       default: '',
-      description: 'Breadcrumb background type'
+      description: 'Breadcrumb background type',
     },
     listClasses: {
       type: [String, Object],
       default: '',
-      description: 'Breadcrumb list classes'
-    }
-  }
-};
+      description: 'Breadcrumb list classes',
+    },
+  },
+}
 </script>
 <style></style>

frontend/src/components/Breadcrumb/BreadcrumbItem.vue

@@ -10,9 +10,9 @@ export default {
     active: {
       type: Boolean,
       default: false,
-      description: 'Whether breadcrumb item is active'
-    }
-  }
-};
+      description: 'Whether breadcrumb item is active',
+    },
+  },
+}
 </script>
 <style></style>

frontend/src/components/Breadcrumb/RouteBreadcrumb.vue

@@ -1,43 +1,40 @@
 <template>
   <bread-crumb list-classes="breadcrumb-links breadcrumb-dark">
-    <BreadCrumbItem>
-        <router-link to="/">
-          <i class="fas fa-home"></i>
-        </router-link>
-    </BreadCrumbItem>
-    <BreadCrumbItem
+    <bread-crumb-item>
+      <router-link to="/overview">
+        <i class="fas fa-home"></i>
+      </router-link>
+    </bread-crumb-item>
+    <bread-crumb-item
       v-for="(route, index) in $route.matched.slice()"
       :key="route.name"
       :active="index === $route.matched.length - 1"
-      style="display:inline-block"
+      style="display: inline-block"
     >
-      <router-link
-        :to="{ name: route.name }"
-        v-if="index < $route.matched.length - 1"
-      >
+      <router-link :to="{ name: route.name }" v-if="index < $route.matched.length - 1">
         {{ route.name }}
       </router-link>
       <span v-else>{{ route.name }}</span>
-    </BreadCrumbItem>
+    </bread-crumb-item>
   </bread-crumb>
 </template>
 
 <script>
-  import BreadCrumb from './Breadcrumb';
-  import BreadCrumbItem from './BreadcrumbItem';
+import BreadCrumb from './Breadcrumb'
+import BreadCrumbItem from './BreadcrumbItem'
 
-  export default {
-    name: 'route-breadcrumb',
-    components: {
-      BreadCrumb,
-      BreadCrumbItem
+export default {
+  name: 'route-breadcrumb',
+  components: {
+    BreadCrumb,
+    BreadCrumbItem,
+  },
+  methods: {
+    getBreadName(route) {
+      return route.name
     },
-    methods: {
-      getBreadName(route) {
-        return route.name;
-      }
-    }
-  };
+  },
+}
 </script>
 
 <style scoped></style>

frontend/src/components/ButtonCheckbox.vue

@@ -1,39 +1,38 @@
 <template>
   <div class="btn-group-toggle" data-toggle="buttons">
     <label class="btn" :class="[{ active: value }, buttonClasses]">
-      <input v-model="model" type="checkbox" checked="" autocomplete="off">
+      <input v-model="model" type="checkbox" checked="" autocomplete="off" />
       <slot></slot>
     </label>
   </div>
 </template>
 <script>
-  export default {
-    name: 'button-checkbox',
-    props: {
-      value: {
-        type: Boolean,
-        description: 'Checked value'
-      },
-      buttonClasses: {
-        type: [String, Object],
-        description: 'Inner button css classes'
-      }
+export default {
+  name: 'button-checkbox',
+  props: {
+    value: {
+      type: Boolean,
+      description: 'Checked value',
     },
+    buttonClasses: {
+      type: [String, Object],
+      description: 'Inner button css classes',
+    },
+  },
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  computed: {
     model: {
-      prop: 'value',
-      event: 'change'
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('change', val)
+      },
     },
-    computed: {
-      model: {
-        get() {
-          return this.value
-        },
-        set(val) {
-          this.$emit('change', val)
-        }
-      }
-    }
-  }
+  },
+}
 </script>
-<style>
-</style>
+<style></style>

frontend/src/components/ButtonRadioGroup.vue

@@ -1,47 +1,55 @@
 <template>
   <div class="btn-group-toggle" data-toggle="buttons">
-    <label v-for="(option, index) in options"
-           :key="index"
-           class="btn"
-           :class="[{ active: value === option.value }, buttonClasses]">
-      <input :value="option.value" v-model="model" type="radio" id="option1" autocomplete="off" checked="">
-      {{option.label}}
+    <label
+      v-for="(option, index) in options"
+      :key="index"
+      class="btn"
+      :class="[{ active: value === option.value }, buttonClasses]"
+    >
+      <input
+        :value="option.value"
+        v-model="model"
+        type="radio"
+        id="option1"
+        autocomplete="off"
+        checked=""
+      />
+      {{ option.label }}
     </label>
   </div>
 </template>
 <script>
-  export default {
-    name: 'button-radio-group',
-    props: {
-      options: {
-        type: Array,
-        description: 'Radio options. Should be an array of objects {value: "", label: ""}',
-        default: () => []
-      },
-      value: {
-        type: String,
-        description: 'Radio value'
-      },
-      buttonClasses: {
-        type: [String, Object],
-        description: 'Inner button css classes'
-      }
+export default {
+  name: 'button-radio-group',
+  props: {
+    options: {
+      type: Array,
+      description: 'Radio options. Should be an array of objects {value: "", label: ""}',
+      default: () => [],
     },
+    value: {
+      type: String,
+      description: 'Radio value',
+    },
+    buttonClasses: {
+      type: [String, Object],
+      description: 'Inner button css classes',
+    },
+  },
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  computed: {
     model: {
-      prop: 'value',
-      event: 'change'
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('change', val)
+      },
     },
-    computed: {
-      model: {
-        get() {
-          return this.value
-        },
-        set(val) {
-          this.$emit('change', val)
-        }
-      }
-    }
-  }
+  },
+}
 </script>
-<style>
-</style>
+<style></style>

frontend/src/components/Cards/Card.vue

@@ -1,18 +1,17 @@
 <template>
   <b-card
-      no-body
-       :class="[
-         {'card-lift--hover': hover},
-         {'shadow': shadow},
-         {[`shadow-${shadowSize}`]: shadowSize},
-         {[`bg-gradient-${gradient}`]: gradient},
-         {[`bg-${type}`]: type}
-       ]">
-
+    no-body
+    :class="[
+      { 'card-lift--hover': hover },
+      { shadow: shadow },
+      { [`shadow-${shadowSize}`]: shadowSize },
+      { [`bg-gradient-${gradient}`]: gradient },
+      { [`bg-${type}`]: type },
+    ]"
+  >
     <slot name="image"></slot>
     <b-card-header :class="headerClasses" v-if="$slots.header">
-      <slot name="header">
-      </slot>
+      <slot name="header"></slot>
     </b-card-header>
     <b-card-body :class="bodyClasses" v-if="!noBody">
       <slot></slot>
@@ -26,48 +25,47 @@
   </b-card>
 </template>
 <script>
-  export default {
-    name: "card",
-    props: {
-      type: {
-        type: String,
-        description: "Card type"
-      },
-      gradient: {
-        type: String,
-        description: "Card background gradient type (warning,danger etc)"
-      },
-      hover: {
-        type: Boolean,
-        description: "Whether card should move on hover"
-      },
-      shadow: {
-        type: Boolean,
-        description: "Whether card has shadow"
-      },
-      shadowSize: {
-        type: String,
-        description: "Card shadow size"
-      },
-      noBody: {
-        type: Boolean,
-        default: false,
-        description: "Whether card should have wrapper body class"
-      },
-      bodyClasses: {
-        type: [String, Object, Array],
-        description: "Card body css classes"
-      },
-      headerClasses: {
-        type: [String, Object, Array],
-        description: "Card header css classes"
-      },
-      footerClasses: {
-        type: [String, Object, Array],
-        description: "Card footer css classes"
-      }
-    }
-  };
+export default {
+  name: 'card',
+  props: {
+    type: {
+      type: String,
+      description: 'Card type',
+    },
+    gradient: {
+      type: String,
+      description: 'Card background gradient type (warning,danger etc)',
+    },
+    hover: {
+      type: Boolean,
+      description: 'Whether card should move on hover',
+    },
+    shadow: {
+      type: Boolean,
+      description: 'Whether card has shadow',
+    },
+    shadowSize: {
+      type: String,
+      description: 'Card shadow size',
+    },
+    noBody: {
+      type: Boolean,
+      default: false,
+      description: 'Whether card should have wrapper body class',
+    },
+    bodyClasses: {
+      type: [String, Object, Array],
+      description: 'Card body css classes',
+    },
+    headerClasses: {
+      type: [String, Object, Array],
+      description: 'Card header css classes',
+    },
+    footerClasses: {
+      type: [String, Object, Array],
+      description: 'Card footer css classes',
+    },
+  },
+}
 </script>
-<style>
-</style>
+<style></style>

frontend/src/components/Cards/StatsCard.vue

@@ -1,57 +1,58 @@
 <template>
   <card class="card-stats" :show-footer-line="true">
     <b-row>
-
       <b-col>
         <slot>
-          <h5 class="card-title text-uppercase text-muted mb-0" v-if="title">{{title}}</h5>
-          <span class="h2 font-weight-bold mb-0" v-if="subTitle">{{subTitle}}</span>
+          <h5 class="card-title text-uppercase text-muted mb-0" v-if="title">
+            {{ title }}
+          </h5>
+          <span class="h2 font-weight-bold mb-0" v-if="subTitle">
+            {{ subTitle }}
+          </span>
         </slot>
       </b-col>
 
       <b-col cols="auto" v-if="$slots.icon || icon">
         <slot name="icon">
-          <div class="icon icon-shape text-white rounded-circle shadow"
-               :class="[`bg-${type}`, iconClasses]">
+          <div
+            class="icon icon-shape text-white rounded-circle shadow"
+            :class="[`bg-${type}`, iconClasses]"
+          >
             <i :class="icon"></i>
           </div>
         </slot>
       </b-col>
-        <b-col cols="auto" v-if="$slots.img || img">
+      <b-col cols="auto" v-if="$slots.img || img">
         <slot name="img">
-        
           <img :src="img" width="80" />
-
         </slot>
       </b-col>
     </b-row>
 
     <p class="mt-3 mb-0 text-sm">
-      <slot name="footer">
-
-      </slot>
+      <slot name="footer"></slot>
     </p>
   </card>
 </template>
 <script>
-  import Card from './Card.vue';
+import Card from './Card.vue'
 
-  export default {
-    name: 'stats-card',
-    components: {
-      Card
+export default {
+  name: 'stats-card',
+  components: {
+    Card,
+  },
+  props: {
+    type: {
+      type: String,
+      default: 'primary',
     },
-    props: {
-      type: {
-        type: String,
-        default: 'primary'
-      },
-      icon: String,
-      img: String,
-      title: String,
-      subTitle: String,
-      iconClasses: [String, Array]
-    }
-  };
+    icon: String,
+    img: String,
+    title: String,
+    subTitle: String,
+    iconClasses: [String, Array],
+  },
+}
 </script>
 <style></style>

frontend/src/components/Charts/BarChart.js

@@ -1,5 +1,5 @@
-import { Bar, mixins } from 'vue-chartjs';
-import globalOptionsMixin from "@/components/Charts/globalOptionsMixin";
+import { Bar, mixins } from 'vue-chartjs'
+import globalOptionsMixin from '@/components/Charts/globalOptionsMixin'
 
 export default {
   name: 'bar-chart',
@@ -8,23 +8,23 @@ export default {
   props: {
     extraOptions: {
       type: Object,
-      default: () => ({})
-    }
+      default: () => ({}),
+    },
   },
   data() {
     return {
-      ctx: null
-    };
+      ctx: null,
+    }
   },
   mounted() {
     this.$watch(
       'chartData',
       (newVal, oldVal) => {
         if (!oldVal) {
-          this.renderChart(this.chartData, this.extraOptions);
+          this.renderChart(this.chartData, this.extraOptions)
         }
       },
-      { immediate: true }
-    );
-  }
-};
+      { immediate: true },
+    )
+  },
+}

frontend/src/components/Charts/LineChart.js

@@ -1,5 +1,5 @@
-import { Line, mixins } from 'vue-chartjs';
-import globalOptionsMixin from "@/components/Charts/globalOptionsMixin";
+import { Line, mixins } from 'vue-chartjs'
+import globalOptionsMixin from '@/components/Charts/globalOptionsMixin'
 export default {
   name: 'line-chart',
   extends: Line,
@@ -7,23 +7,23 @@ export default {
   props: {
     extraOptions: {
       type: Object,
-      default: () => ({})
-    }
+      default: () => ({}),
+    },
   },
   data() {
     return {
-      ctx: null
-    };
+      ctx: null,
+    }
   },
   mounted() {
     this.$watch(
       'chartData',
       (newVal, oldVal) => {
         if (!oldVal) {
-          this.renderChart(this.chartData, this.extraOptions);
+          this.renderChart(this.chartData, this.extraOptions)
         }
       },
-      { immediate: true }
-    );
-  }
-};
+      { immediate: true },
+    )
+  },
+}

frontend/src/components/Charts/config.js

@@ -1,10 +1,10 @@
-import { parseOptions } from "@/components/Charts/optionHelpers";
+import { parseOptions } from '@/components/Charts/optionHelpers'
 import Chart from 'chart.js'
 
 export const Charts = {
-  mode: 'light',//(themeMode) ? themeMode : 'light';
+  mode: 'light', //(themeMode) ? themeMode : 'light';
   fonts: {
-    base: 'Open Sans'
+    base: 'Open Sans',
   },
   colors: {
     gray: {
@@ -16,114 +16,115 @@ export const Charts = {
       600: '#8898aa',
       700: '#525f7f',
       800: '#32325d',
-      900: '#212529'
+      900: '#212529',
     },
     theme: {
-      'default': '#172b4d',
-      'primary': '#5e72e4',
-      'secondary': '#f4f5f7',
-      'info': '#11cdef',
-      'success': '#2dce89',
-      'danger': '#f5365c',
-      'warning': '#fb6340'
+      default: '#172b4d',
+      primary: '#5e72e4',
+      secondary: '#f4f5f7',
+      info: '#11cdef',
+      success: '#2dce89',
+      danger: '#f5365c',
+      warning: '#fb6340',
     },
     black: '#12263F',
     white: '#FFFFFF',
     transparent: 'transparent',
-  }
-};
+  },
+}
 
 function chartOptions() {
-  let { colors, mode, fonts } = Charts;
+  let { colors, mode, fonts } = Charts
   // Options
   let options = {
     defaults: {
       global: {
         responsive: true,
         maintainAspectRatio: false,
-        defaultColor: (mode === 'dark') ? colors.gray[700] : colors.gray[600],
-        defaultFontColor: (mode === 'dark') ? colors.gray[700] : colors.gray[600],
+        defaultColor: mode === 'dark' ? colors.gray[700] : colors.gray[600],
+        defaultFontColor: mode === 'dark' ? colors.gray[700] : colors.gray[600],
         defaultFontFamily: fonts.base,
         defaultFontSize: 13,
         layout: {
-          padding: 0
+          padding: 0,
         },
         legend: {
           display: false,
           position: 'bottom',
           labels: {
             usePointStyle: true,
-            padding: 16
-          }
+            padding: 16,
+          },
         },
         elements: {
           point: {
             radius: 0,
-            backgroundColor: colors.theme['primary']
+            backgroundColor: colors.theme['primary'],
           },
           line: {
-            tension: .4,
+            tension: 0.4,
             borderWidth: 4,
             borderColor: colors.theme['primary'],
             backgroundColor: colors.transparent,
-            borderCapStyle: 'rounded'
+            borderCapStyle: 'rounded',
           },
           rectangle: {
-            backgroundColor: colors.theme['warning']
+            backgroundColor: colors.theme['warning'],
           },
           arc: {
             backgroundColor: colors.theme['primary'],
-            borderColor: (mode == 'dark') ? colors.gray[800] : colors.white,
-            borderWidth: 4
-          }
+            borderColor: mode == 'dark' ? colors.gray[800] : colors.white,
+            borderWidth: 4,
+          },
         },
         tooltips: {
           enabled: true,
           mode: 'index',
           intersect: false,
-        }
+        },
       },
       pie: {
         tooltips: {
-          mode: 'point'
-        }
+          mode: 'point',
+        },
       },
       doughnut: {
         tooltips: {
-          mode: 'point'
+          mode: 'point',
         },
         cutoutPercentage: 83,
         legendCallback: function (chart) {
-          let data = chart.data;
-          let content = '';
+          let data = chart.data
+          let content = ''
 
           data.labels.forEach(function (label, index) {
-            let bgColor = data.datasets[0].backgroundColor[index];
+            let bgColor = data.datasets[0].backgroundColor[index]
 
-            content += '<span class="chart-legend-item">';
-            content += '<i class="chart-legend-indicator" style="background-color: ' + bgColor + '"></i>';
-            content += label;
-            content += '</span>';
-          });
+            content += '<span class="chart-legend-item">'
+            content +=
+              '<i class="chart-legend-indicator" style="background-color: ' + bgColor + '"></i>'
+            content += label
+            content += '</span>'
+          })
 
-          return content;
-        }
-      }
-    }
-  };
+          return content
+        },
+      },
+    },
+  }
 
   // yAxes
   Chart.scaleService.updateScaleDefaults('linear', {
     gridLines: {
       borderDash: [2],
       borderDashOffset: [2],
-      color: (mode === 'dark') ? colors.gray[900] : colors.gray[200],
+      color: mode === 'dark' ? colors.gray[900] : colors.gray[200],
       drawBorder: false,
       drawTicks: true,
       zeroLineWidth: 1,
-      zeroLineColor: (mode === 'dark') ? colors.gray[900] : colors.gray[200],
+      zeroLineColor: mode === 'dark' ? colors.gray[900] : colors.gray[200],
       zeroLineBorderDash: [2],
-      zeroLineBorderDashOffset: [2]
+      zeroLineBorderDashOffset: [2],
     },
     ticks: {
       beginAtZero: true,
@@ -132,9 +133,9 @@ function chartOptions() {
         if (!(value % 10)) {
           return value
         }
-      }
-    }
-  });
+      },
+    },
+  })
 
   // xAxes
   Chart.scaleService.updateScaleDefaults('category', {
@@ -146,13 +147,13 @@ function chartOptions() {
       zeroLineWidth: 1,
     },
     ticks: {
-      padding: 20
+      padding: 20,
     },
-    maxBarThickness: 10
-  });
+    maxBarThickness: 10,
+  })
 
-  return options;
-};
+  return options
+}
 
 let initialized = false
 
@@ -160,27 +161,29 @@ export function initGlobalOptions() {
   if (initialized) {
     return
   }
-  parseOptions(Chart, chartOptions());
+  parseOptions(Chart, chartOptions())
   initialized = true
 }
 
 export const basicOptions = {
   maintainAspectRatio: false,
   legend: {
-    display: false
+    display: false,
   },
-  responsive: true
-};
+  responsive: true,
+}
 export let blueChartOptions = {
   scales: {
-    yAxes: [{
-      gridLines: {
-        color: Charts.colors.gray[700],
-        zeroLineColor: Charts.colors.gray[700]
-      }
-    }]
-  }
-};
+    yAxes: [
+      {
+        gridLines: {
+          color: Charts.colors.gray[700],
+          zeroLineColor: Charts.colors.gray[700],
+        },
+      },
+    ],
+  },
+}
 
 export let lineChartOptionsBlue = {
   ...basicOptions,
@@ -192,7 +195,7 @@ export let lineChartOptionsBlue = {
     xPadding: 12,
     mode: 'nearest',
     intersect: 0,
-    position: 'nearest'
+    position: 'nearest',
   },
   responsive: true,
   scales: {
@@ -202,15 +205,15 @@ export let lineChartOptionsBlue = {
         gridLines: {
           drawBorder: false,
           color: 'rgba(29,140,248,0.0)',
-          zeroLineColor: 'transparent'
+          zeroLineColor: 'transparent',
         },
         ticks: {
           suggestedMin: 60,
           suggestedMax: 125,
           padding: 20,
-          fontColor: '#9e9e9e'
-        }
-      }
+          fontColor: '#9e9e9e',
+        },
+      },
     ],
 
     xAxes: [
@@ -219,13 +222,13 @@ export let lineChartOptionsBlue = {
         gridLines: {
           drawBorder: false,
           color: 'rgba(29,140,248,0.1)',
-          zeroLineColor: 'transparent'
+          zeroLineColor: 'transparent',
         },
         ticks: {
           padding: 20,
-          fontColor: '#9e9e9e'
-        }
-      }
-    ]
-  }
-};
+          fontColor: '#9e9e9e',
+        },
+      },
+    ],
+  },
+}

frontend/src/components/Charts/globalOptionsMixin.js

@@ -1,7 +1,7 @@
-import { initGlobalOptions } from "@/components/Charts/config";
+import { initGlobalOptions } from '@/components/Charts/config'
 import './roundedCornersExtension'
 export default {
   mounted() {
-    initGlobalOptions();
-  }
+    initGlobalOptions()
+  },
 }

frontend/src/components/Charts/optionHelpers.js

@@ -2,9 +2,9 @@
 export function parseOptions(parent, options) {
   for (let item in options) {
     if (typeof options[item] !== 'object') {
-      parent[item] = options[item];
+      parent[item] = options[item]
     } else {
-      parseOptions(parent[item], options[item]);
+      parseOptions(parent[item], options[item])
     }
   }
 }

frontend/src/components/Charts/roundedCornersExtension.js

@@ -3,64 +3,63 @@
 // Code from: https://codepen.io/jedtrow/full/ygRYgo
 //
 import Chart from 'chart.js'
-Chart.elements.Rectangle.prototype.draw = function() {
-
-  let ctx = this._chart.ctx;
-  let vm = this._view;
-  let left, right, top, bottom, signX, signY, borderSkipped, radius;
-  let borderWidth = vm.borderWidth;
+Chart.elements.Rectangle.prototype.draw = function () {
+  let ctx = this._chart.ctx
+  let vm = this._view
+  let left, right, top, bottom, signX, signY, borderSkipped, radius
+  let borderWidth = vm.borderWidth
   // Set Radius Here
   // If radius is large enough to cause drawing errors a max radius is imposed
-  let cornerRadius = 6;
+  let cornerRadius = 6
 
   if (!vm.horizontal) {
     // bar
-    left = vm.x - vm.width / 2;
-    right = vm.x + vm.width / 2;
-    top = vm.y;
-    bottom = vm.base;
-    signX = 1;
-    signY = bottom > top ? 1 : -1;
-    borderSkipped = vm.borderSkipped || 'bottom';
+    left = vm.x - vm.width / 2
+    right = vm.x + vm.width / 2
+    top = vm.y
+    bottom = vm.base
+    signX = 1
+    signY = bottom > top ? 1 : -1
+    borderSkipped = vm.borderSkipped || 'bottom'
   } else {
     // horizontal bar
-    left = vm.base;
-    right = vm.x;
-    top = vm.y - vm.height / 2;
-    bottom = vm.y + vm.height / 2;
-    signX = right > left ? 1 : -1;
-    signY = 1;
-    borderSkipped = vm.borderSkipped || 'left';
+    left = vm.base
+    right = vm.x
+    top = vm.y - vm.height / 2
+    bottom = vm.y + vm.height / 2
+    signX = right > left ? 1 : -1
+    signY = 1
+    borderSkipped = vm.borderSkipped || 'left'
   }
 
   // Canvas doesn't allow us to stroke inside the width so we can
   // adjust the sizes to fit if we're setting a stroke on the line
   if (borderWidth) {
     // borderWidth shold be less than bar width and bar height.
-    let barSize = Math.min(Math.abs(left - right), Math.abs(top - bottom));
-    borderWidth = borderWidth > barSize ? barSize : borderWidth;
-    let halfStroke = borderWidth / 2;
+    let barSize = Math.min(Math.abs(left - right), Math.abs(top - bottom))
+    borderWidth = borderWidth > barSize ? barSize : borderWidth
+    let halfStroke = borderWidth / 2
     // Adjust borderWidth when bar top position is near vm.base(zero).
-    let borderLeft = left + (borderSkipped !== 'left' ? halfStroke * signX : 0);
-    let borderRight = right + (borderSkipped !== 'right' ? -halfStroke * signX : 0);
-    let borderTop = top + (borderSkipped !== 'top' ? halfStroke * signY : 0);
-    let borderBottom = bottom + (borderSkipped !== 'bottom' ? -halfStroke * signY : 0);
+    let borderLeft = left + (borderSkipped !== 'left' ? halfStroke * signX : 0)
+    let borderRight = right + (borderSkipped !== 'right' ? -halfStroke * signX : 0)
+    let borderTop = top + (borderSkipped !== 'top' ? halfStroke * signY : 0)
+    let borderBottom = bottom + (borderSkipped !== 'bottom' ? -halfStroke * signY : 0)
     // not become a vertical line?
     if (borderLeft !== borderRight) {
-      top = borderTop;
-      bottom = borderBottom;
+      top = borderTop
+      bottom = borderBottom
     }
     // not become a horizontal line?
     if (borderTop !== borderBottom) {
-      left = borderLeft;
-      right = borderRight;
+      left = borderLeft
+      right = borderRight
     }
   }
 
-  ctx.beginPath();
-  ctx.fillStyle = vm.backgroundColor;
-  ctx.strokeStyle = vm.borderColor;
-  ctx.lineWidth = borderWidth;
+  ctx.beginPath()
+  ctx.fillStyle = vm.backgroundColor
+  ctx.strokeStyle = vm.borderColor
+  ctx.lineWidth = borderWidth
 
   // Corner points, from bottom-left to bottom-right clockwise
   // | 1 2 |
@@ -69,62 +68,61 @@ Chart.elements.Rectangle.prototype.draw = function() {
     [left, bottom],
     [left, top],
     [right, top],
-    [right, bottom]
-  ];
+    [right, bottom],
+  ]
 
   // Find first (starting) corner with fallback to 'bottom'
-  let borders = ['bottom', 'left', 'top', 'right'];
-  let startCorner = borders.indexOf(borderSkipped, 0);
+  let borders = ['bottom', 'left', 'top', 'right']
+  let startCorner = borders.indexOf(borderSkipped, 0)
   if (startCorner === -1) {
-    startCorner = 0;
+    startCorner = 0
   }
 
   function cornerAt(index) {
-    return corners[(startCorner + index) % 4];
+    return corners[(startCorner + index) % 4]
   }
 
   // Draw rectangle from 'startCorner'
-  let corner = cornerAt(0);
-  ctx.moveTo(corner[0], corner[1]);
+  let corner = cornerAt(0)
+  ctx.moveTo(corner[0], corner[1])
 
   for (let i = 1; i < 4; i++) {
-    corner = cornerAt(i);
-    let nextCornerId = i + 1;
+    corner = cornerAt(i)
+    let nextCornerId = i + 1
     if (nextCornerId == 4) {
       nextCornerId = 0
     }
 
-    let nextCorner = cornerAt(nextCornerId);
+    let nextCorner = cornerAt(nextCornerId)
 
-    let width = corners[2][0] - corners[1][0];
-    let height = corners[0][1] - corners[1][1];
-    let x = corners[1][0];
-    let y = corners[1][1];
+    let width = corners[2][0] - corners[1][0]
+    let height = corners[0][1] - corners[1][1]
+    let x = corners[1][0]
+    let y = corners[1][1]
 
-    let radius = cornerRadius;
+    let radius = cornerRadius
 
     // Fix radius being too large
     if (radius > height / 2) {
-      radius = height / 2;
+      radius = height / 2
     }
     if (radius > width / 2) {
-      radius = width / 2;
+      radius = width / 2
     }
 
-    ctx.moveTo(x + radius, y);
-    ctx.lineTo(x + width - radius, y);
-    ctx.quadraticCurveTo(x + width, y, x + width, y + radius);
-    ctx.lineTo(x + width, y + height - radius);
-    ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
-    ctx.lineTo(x + radius, y + height);
-    ctx.quadraticCurveTo(x, y + height, x, y + height - radius);
-    ctx.lineTo(x, y + radius);
-    ctx.quadraticCurveTo(x, y, x + radius, y);
-
+    ctx.moveTo(x + radius, y)
+    ctx.lineTo(x + width - radius, y)
+    ctx.quadraticCurveTo(x + width, y, x + width, y + radius)
+    ctx.lineTo(x + width, y + height - radius)
+    ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height)
+    ctx.lineTo(x + radius, y + height)
+    ctx.quadraticCurveTo(x, y + height, x, y + height - radius)
+    ctx.lineTo(x, y + radius)
+    ctx.quadraticCurveTo(x, y, x + radius, y)
   }
 
-  ctx.fill();
+  ctx.fill()
   if (borderWidth) {
-    ctx.stroke();
+    ctx.stroke()
   }
-};
+}

frontend/src/components/CloseButton.spec.js

@@ -0,0 +1,28 @@
+import { mount } from '@vue/test-utils'
+
+import CloseButton from './CloseButton'
+
+const localVue = global.localVue
+
+describe('CloseButton', () => {
+  let wrapper
+  let propsData = {
+    target: 'Target',
+    expanded: false,
+  }
+
+  const Wrapper = () => {
+    return mount(CloseButton, { localVue, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('emmits click event', () => {
+      wrapper.find('.navbar-toggler').trigger('click')
+      expect(wrapper.emitted('click')).toBeTruthy()
+    })
+  })
+})

frontend/src/components/CloseButton.vue

@@ -9,7 +9,8 @@
     :aria-expanded="expanded"
     aria-label="Toggle navigation"
   >
-    <span></span> <span></span>
+    <span></span>
+    <span></span>
   </button>
 </template>
 <script>
@@ -18,18 +19,18 @@ export default {
   props: {
     target: {
       type: [String, Number],
-      description: 'Close button target element'
+      description: 'Close button target element',
     },
     expanded: {
       type: Boolean,
-      description: 'Whether button is expanded (aria-expanded attribute)'
-    }
+      description: 'Whether button is expanded (aria-expanded attribute)',
+    },
   },
   methods: {
     handleClick(evt) {
-      this.$emit('click', evt);
-    }
-  }
-};
+      this.$emit('click', evt)
+    },
+  },
+}
 </script>
 <style></style>

frontend/src/components/Collapse/Collapse.vue

@@ -1,10 +1,5 @@
 <template>
-  <div
-    id="accordion"
-    role="tablist"
-    aria-multiselectable="true"
-    class="accordion"
-  >
+  <div id="accordion" role="tablist" aria-multiselectable="true" class="accordion">
     <slot></slot>
   </div>
 </template>
@@ -16,18 +11,18 @@ export default {
     animationDuration: {
       type: Number,
       default: 250,
-      description: 'Collapse animation duration'
+      description: 'Collapse animation duration',
     },
     multipleActive: {
       type: Boolean,
       default: true,
-      description: 'Whether you can have multiple collapse items opened at the same time'
+      description: 'Whether you can have multiple collapse items opened at the same time',
     },
     activeIndex: {
       type: Number,
       default: -1,
-      description: 'Active collapse item index'
-    }
+      description: 'Active collapse item index',
+    },
   },
   provide() {
     return {
@@ -35,50 +30,50 @@ export default {
       multipleActive: this.multipleActive,
       addItem: this.addItem,
       removeItem: this.removeItem,
-      deactivateAll: this.deactivateAll
-    };
+      deactivateAll: this.deactivateAll,
+    }
   },
   data() {
     return {
-      items: []
-    };
+      items: [],
+    }
   },
   methods: {
     addItem(item) {
-      const index = this.$slots.default.indexOf(item.$vnode);
+      const index = this.$slots.default.indexOf(item.$vnode)
       if (index !== -1) {
-        this.items.splice(index, 0, item);
+        this.items.splice(index, 0, item)
       }
     },
     removeItem(item) {
-      const items = this.items;
-      const index = items.indexOf(item);
+      const items = this.items
+      const index = items.indexOf(item)
       if (index > -1) {
-        items.splice(index, 1);
+        items.splice(index, 1)
       }
     },
     deactivateAll() {
-      this.items.forEach(item => {
-        item.active = false;
-      });
+      this.items.forEach((item) => {
+        item.active = false
+      })
     },
     activateItem() {
       if (this.activeIndex !== -1) {
-        this.items[this.activeIndex].active = true;
+        this.items[this.activeIndex].active = true
       }
-    }
+    },
   },
   mounted() {
     this.$nextTick(() => {
-      this.activateItem();
-    });
+      this.activateItem()
+    })
   },
   watch: {
     activeIndex() {
-      this.activateItem();
-    }
-  }
-};
+      this.activateItem()
+    },
+  },
+}
 </script>
 
 <style scoped></style>

frontend/src/components/Collapse/CollapseItem.vue

@@ -8,7 +8,7 @@
         @click.prevent="activate"
         :aria-controls="`content-${itemId}`"
       >
-        <slot name="title"> {{ title }} </slot>
+        <slot name="title">{{ title }}</slot>
         <i class="tim-icons icon-minimal-down"></i>
       </a>
     </b-card-header>
@@ -26,67 +26,66 @@
   </b-card>
 </template>
 <script>
-import { CollapseTransition } from 'vue2-transitions';
+import { CollapseTransition } from 'vue2-transitions'
 
 export default {
   name: 'collapse-item',
   components: {
-    CollapseTransition
+    CollapseTransition,
   },
   props: {
     title: {
       type: String,
       default: '',
-      description: 'Collapse item title'
+      description: 'Collapse item title',
     },
-    id: String
+    id: String,
   },
   inject: {
     animationDuration: {
-      default: 250
+      default: 250,
     },
     multipleActive: {
-      default: false
+      default: false,
     },
     addItem: {
-      default: () => {}
+      default: () => {},
     },
     removeItem: {
-      default: () => {}
+      default: () => {},
     },
     deactivateAll: {
-      default: () => {}
-    }
+      default: () => {},
+    },
   },
   computed: {
     itemId() {
-      return this.id || this.title;
-    }
+      return this.id || this.title
+    },
   },
   data() {
     return {
-      active: false
-    };
+      active: false,
+    }
   },
   methods: {
     activate() {
-      let wasActive = this.active;
+      let wasActive = this.active
       if (!this.multipleActive) {
-        this.deactivateAll();
+        this.deactivateAll()
       }
-      this.active = !wasActive;
-      console.log(this.active)
-    }
+      this.active = !wasActive
+    },
   },
   mounted() {
-    this.addItem(this);
+    this.addItem(this)
   },
   destroyed() {
     if (this.$el && this.$el.parentNode) {
-      this.$el.parentNode.removeChild(this.$el);
+      this.$el.parentNode.removeChild(this.$el)
     }
-    this.removeItem(this);
-  }
-};
+    this.removeItem(this)
+  },
+}
 </script>
 <style></style>

frontend/src/components/Inputs/BaseCheckbox.vue

@@ -1,14 +1,16 @@
 <template>
-  <div class="custom-control custom-checkbox"
-       :class="[
-       {disabled: disabled},
-       {[`custom-checkbox-${type}`]: type},inlineClass]">
-    <input :id="cbId"
-           class="custom-control-input"
-           :class="inputClasses"
-           type="checkbox"
-           :disabled="disabled"
-           v-model="model"/>
+  <div
+    class="custom-control custom-checkbox"
+    :class="[{ disabled: disabled }, { [`custom-checkbox-${type}`]: type }, inlineClass]"
+  >
+    <input
+      :id="cbId"
+      class="custom-control-input"
+      :class="inputClasses"
+      type="checkbox"
+      :disabled="disabled"
+      v-model="model"
+    />
     <label :for="cbId" class="custom-control-label">
       <slot>
         <span v-if="inline">&nbsp;</span>
@@ -17,62 +19,60 @@
   </div>
 </template>
 <script>
-  export default {
-    name: "base-checkbox",
-    model: {
-      prop: "checked"
+export default {
+  name: 'base-checkbox',
+  model: {
+    prop: 'checked',
+  },
+  props: {
+    checked: {
+      type: [Array, Boolean],
+      description: 'Whether checkbox is checked',
     },
-    props: {
-      checked: {
-        type: [Array, Boolean],
-        description: "Whether checkbox is checked"
-      },
-      disabled: {
-        type: Boolean,
-        description: "Whether checkbox is disabled"
-      },
-      inline: {
-        type: Boolean,
-        description: "Whether checkbox is inline"
-      },
-      inputClasses: {
-        type: [String, Object, Array],
-        description: "Checkbox input classes"
-      },
-      type: {
-        type: String,
-        description: 'Checkbox type (e.g info, danger etc)'
-      }
+    disabled: {
+      type: Boolean,
+      description: 'Whether checkbox is disabled',
     },
-    data() {
-      return {
-        cbId: "",
-        touched: false
-      };
+    inline: {
+      type: Boolean,
+      description: 'Whether checkbox is inline',
     },
-    computed: {
-      model: {
-        get() {
-          return this.checked;
-        },
-        set(check) {
-          if (!this.touched) {
-            this.touched = true;
-          }
-          this.$emit("input", check);
-        }
-      },
-      inlineClass() {
-        if (this.inline) {
-          return `form-check-inline`;
-        }
-        return ''
-      }
+    inputClasses: {
+      type: [String, Object, Array],
+      description: 'Checkbox input classes',
     },
-    created() {
-      this.cbId = Math.random()
-        .toString(16)
-        .slice(2);
+    type: {
+      type: String,
+      description: 'Checkbox type (e.g info, danger etc)',
+    },
+  },
+  data() {
+    return {
+      cbId: '',
+      touched: false,
     }
-  };
+  },
+  computed: {
+    model: {
+      get() {
+        return this.checked
+      },
+      set(check) {
+        if (!this.touched) {
+          this.touched = true
+        }
+        this.$emit('input', check)
+      },
+    },
+    inlineClass() {
+      if (this.inline) {
+        return `form-check-inline`
+      }
+      return ''
+    },
+  },
+  created() {
+    this.cbId = Math.random().toString(16).slice(2)
+  },
+}
 </script>

frontend/src/components/Inputs/BaseInput.vue

@@ -1,24 +1,31 @@
 <template>
-  <validation-provider :rules="rules" :name="name" v-bind="$attrs" v-slot="{errors, valid, invalid, validated}">
+  <validation-provider
+    :rules="rules"
+    :name="name"
+    v-bind="$attrs"
+    v-slot="{ errors, valid, invalid, validated }"
+  >
     <b-form-group>
       <slot name="label">
         <label v-if="label" :class="labelClasses">
-          {{label}}
+          {{ label }}
         </label>
       </slot>
-      <div :class="[
-       {'input-group': hasIcon},
-       {'focused': focused},
-       {'input-group-alternative': alternative},
-       {'has-label': label || $slots.label},
-       inputGroupClasses
-       ]">
+      <div
+        :class="[
+          { 'input-group': hasIcon },
+          { focused: focused },
+          { 'input-group-alternative': alternative },
+          { 'has-label': label || $slots.label },
+          inputGroupClasses,
+        ]"
+      >
         <div v-if="prependIcon || $slots.prepend" class="input-group-prepend">
-        <span class="input-group-text">
-          <slot name="prepend">
-            <i :class="prependIcon"></i>
-          </slot>
-        </span>
+          <span class="input-group-text">
+            <slot name="prepend">
+              <i :class="prependIcon"></i>
+            </slot>
+          </span>
         </div>
         <slot v-bind="slotData">
           <input
@@ -29,24 +36,29 @@
             :valid="valid"
             :required="required"
             class="form-control"
-            :class="[{'is-valid': valid && validated && successMessage}, {'is-invalid': invalid && validated}, inputClasses]">
+            :class="[
+              { 'is-valid': valid && validated && successMessage },
+              { 'is-invalid': invalid && validated },
+              inputClasses,
+            ]"
+          />
         </slot>
         <div v-if="appendIcon || $slots.append" class="input-group-append">
           <span class="input-group-text">
-              <slot name="append">
-                  <i :class="appendIcon"></i>
-              </slot>
+            <slot name="append">
+              <i :class="appendIcon"></i>
+            </slot>
           </span>
         </div>
         <slot name="infoBlock"></slot>
       </div>
       <slot name="success">
         <div class="valid-feedback" v-if="valid && validated && successMessage">
-          {{successMessage}}
+          {{ successMessage }}
         </div>
       </slot>
       <slot name="error">
-        <div v-if="errors[0]" class="invalid-feedback" style="display: block;">
+        <div v-if="errors[0]" class="invalid-feedback" style="display: block">
           {{ errors[0] }}
         </div>
       </slot>
@@ -54,123 +66,122 @@
   </validation-provider>
 </template>
 <script>
-  export default {
-    inheritAttrs: false,
-    name: "base-input",
-    props: {
-      required: {
-        type: Boolean,
-        description: "Whether input is required (adds an asterix *)"
-      },
-      group: {
-        type: Boolean,
-        description: "Whether input is an input group (manual override in special cases)"
-      },
-      alternative: {
-        type: Boolean,
-        description: "Whether input is of alternative layout"
-      },
-      label: {
-        type: String,
-        description: "Input label (text before input)"
-      },
-      error: {
-        type: String,
-        description: "Input error (below input)"
-      },
-      successMessage: {
-        type: String,
-        description: "Input success message",
-        default: ''
-      },
-      labelClasses: {
-        type: String,
-        description: "Input label css classes",
-        default: "form-control-label"
-      },
-      inputClasses: {
-        type: String,
-        description: "Input css classes"
-      },
-      inputGroupClasses: {
-        type: String,
-        description: "Input group css classes"
-      },
-      value: {
-        type: [String, Number],
-        description: "Input value"
-      },
-      type: {
-        type: String,
-        description: "Input type",
-        default: "text"
-      },
-      appendIcon: {
-        type: String,
-        description: "Append icon (right)"
-      },
-      prependIcon: {
-        type: String,
-        description: "Prepend icon (left)"
-      },
-      rules: {
-        type: [String, Array, Object],
-        description: 'Vee validate validation rules',
-        default: ''
-      },
-      name: {
-        type: String,
-        description: 'Input name (used for validation)',
-        default: ''
-      }
+export default {
+  inheritAttrs: false,
+  name: 'base-input',
+  props: {
+    required: {
+      type: Boolean,
+      description: 'Whether input is required (adds an asterix *)',
     },
-    data() {
-      return {
-        focused: false
-      };
+    group: {
+      type: Boolean,
+      description: 'Whether input is an input group (manual override in special cases)',
     },
-    computed: {
-      listeners() {
-        return {
-          ...this.$listeners,
-          input: this.updateValue,
-          focus: this.onFocus,
-          blur: this.onBlur
-        };
-      },
-      slotData() {
-        return {
-          focused: this.focused,
-          error: this.error,
-          ...this.listeners
-        };
-      },
-      hasIcon() {
-        const { append, prepend } = this.$slots;
-        return (
-          append !== undefined ||
-          prepend !== undefined ||
-          this.appendIcon !== undefined ||
-          this.prependIcon !== undefined ||
-          this.group
-        );
-      }
+    alternative: {
+      type: Boolean,
+      description: 'Whether input is of alternative layout',
     },
-    methods: {
-      updateValue(evt) {
-        let value = evt.target.value;
-        this.$emit("input", value);
-      },
-      onFocus(evt) {
-        this.focused = true;
-        this.$emit("focus", evt);
-      },
-      onBlur(evt) {
-        this.focused = false;
-        this.$emit("blur", evt);
-      }
+    label: {
+      type: String,
+      description: 'Input label (text before input)',
+    },
+    error: {
+      type: String,
+      description: 'Input error (below input)',
+    },
+    successMessage: {
+      type: String,
+      description: 'Input success message',
+      default: '',
+    },
+    labelClasses: {
+      type: String,
+      description: 'Input label css classes',
+      default: 'form-control-label',
+    },
+    inputClasses: {
+      type: String,
+      description: 'Input css classes',
+    },
+    inputGroupClasses: {
+      type: String,
+      description: 'Input group css classes',
+    },
+    value: {
+      type: [String, Number],
+      description: 'Input value',
+    },
+    type: {
+      type: String,
+      description: 'Input type',
+      default: 'text',
+    },
+    appendIcon: {
+      type: String,
+      description: 'Append icon (right)',
+    },
+    prependIcon: {
+      type: String,
+      description: 'Prepend icon (left)',
+    },
+    rules: {
+      type: [String, Array, Object],
+      description: 'Vee validate validation rules',
+      default: '',
+    },
+    name: {
+      type: String,
+      description: 'Input name (used for validation)',
+      default: '',
+    },
+  },
+  data() {
+    return {
+      focused: false,
     }
-  };
+  },
+  computed: {
+    listeners() {
+      return {
+        ...this.$listeners,
+        input: this.updateValue,
+        focus: this.onFocus,
+        blur: this.onBlur,
+      }
+    },
+    slotData() {
+      return {
+        focused: this.focused,
+        error: this.error,
+        ...this.listeners,
+      }
+    },
+    hasIcon() {
+      const { append, prepend } = this.$slots
+      return (
+        append !== undefined ||
+        prepend !== undefined ||
+        this.appendIcon !== undefined ||
+        this.prependIcon !== undefined ||
+        this.group
+      )
+    },
+  },
+  methods: {
+    updateValue(evt) {
+      let value = evt.target.value
+      this.$emit('input', value)
+    },
+    onFocus(evt) {
+      this.focused = true
+      this.$emit('focus', evt)
+    },
+    onBlur(evt) {
+      this.focused = false
+      this.$emit('blur', evt)
+    },
+  },
+}
 </script>
-<style>
-</style>
+<style></style>

frontend/src/components/Inputs/BaseRadio.vue

@@ -1,7 +1,5 @@
 <template>
-  <div
-    class="custom-control custom-radio"
-    :class="[inlineClass, { disabled: disabled }]">
+  <div class="custom-control custom-radio" :class="[inlineClass, { disabled: disabled }]">
     <input
       :id="cbId"
       class="custom-control-input"
@@ -18,51 +16,49 @@
   </div>
 </template>
 <script>
-  export default {
-    name: 'base-radio',
-    props: {
-      name: {
-        type: [String, Number],
-        description: 'Radio label'
-      },
-      disabled: {
-        type: Boolean,
-        description: 'Whether radio is disabled'
-      },
-      value: {
-        type: [String, Boolean],
-        description: 'Radio value'
-      },
-      inline: {
-        type: Boolean,
-        description: 'Whether radio is inline'
-      }
+export default {
+  name: 'base-radio',
+  props: {
+    name: {
+      type: [String, Number],
+      description: 'Radio label',
     },
-    data() {
-      return {
-        cbId: ''
-      };
+    disabled: {
+      type: Boolean,
+      description: 'Whether radio is disabled',
     },
-    computed: {
-      model: {
-        get() {
-          return this.value;
-        },
-        set(value) {
-          this.$emit('input', value);
-        }
-      },
-      inlineClass() {
-        if (this.inline) {
-          return `form-check-inline`;
-        }
-        return '';
-      }
+    value: {
+      type: [String, Boolean],
+      description: 'Radio value',
     },
-    created() {
-      this.cbId = Math.random()
-        .toString(16)
-        .slice(2);
+    inline: {
+      type: Boolean,
+      description: 'Whether radio is inline',
+    },
+  },
+  data() {
+    return {
+      cbId: '',
     }
-  };
+  },
+  computed: {
+    model: {
+      get() {
+        return this.value
+      },
+      set(value) {
+        this.$emit('input', value)
+      },
+    },
+    inlineClass() {
+      if (this.inline) {
+        return `form-check-inline`
+      }
+      return ''
+    },
+  },
+  created() {
+    this.cbId = Math.random().toString(16).slice(2)
+  },
+}
 </script>

frontend/src/components/LoadingPanel.vue

@@ -2,11 +2,11 @@
   <b-row v-loading="true" id="loading"></b-row>
 </template>
 <script>
-import Vue from 'vue';
-import { Loading } from 'element-ui';
+import Vue from 'vue'
+import { Loading } from 'element-ui'
 
-Vue.use(Loading.directive);
-export default {};
+Vue.use(Loading.directive)
+export default {}
 </script>
 <style>
 #loading {

frontend/src/components/Modal-OLD.vue

@@ -1,34 +1,37 @@
 <template>
-  <SlideYUpTransition :duration="animationDuration">
-    <b-modal class="modal fade"
-        ref="app-modal"
-        :size="size"
-        :hide-header="!$slots.header"
-        :modal-class="[{'modal-mini': type === 'mini'}, ...modalClasses]"
-        @mousedown.self="closeModal"
-        tabindex="-1"
-        role="dialog"
-        centered
-        @close="closeModal"
-        @hide="closeModal"
-        :header-class="headerClasses"
-        :footer-class="footerClasses"
-        :content-class="[gradient ? `bg-gradient-${gradient}` : '', ...modalContentClasses]"
-        :body-class="bodyClasses"
-        :aria-hidden="!show">
-
+  <slide-y-up-transition :duration="animationDuration">
+    <b-modal
+      class="modal fade"
+      ref="app-modal"
+      :size="size"
+      :hide-header="!$slots.header"
+      :modal-class="[{ 'modal-mini': type === 'mini' }, ...modalClasses]"
+      @mousedown.self="closeModal"
+      tabindex="-1"
+      role="dialog"
+      centered
+      @close="closeModal"
+      @hide="closeModal"
+      :header-class="headerClasses"
+      :footer-class="footerClasses"
+      :content-class="[gradient ? `bg-gradient-${gradient}` : '', ...modalContentClasses]"
+      :body-class="bodyClasses"
+      :aria-hidden="!show"
+    >
       <template v-slot:modal-header>
         <slot name="header"></slot>
-            <slot name="close-button">
-              <button type="button"
-                      class="close"
-                      v-if="showClose"
-                      @click="closeModal"
-                      data-dismiss="modal"
-                      aria-label="Close">
-                <span :aria-hidden="!show">×</span>
-              </button>
-            </slot>
+        <slot name="close-button">
+          <button
+            type="button"
+            class="close"
+            v-if="showClose"
+            @click="closeModal"
+            data-dismiss="modal"
+            aria-label="Close"
+          >
+            <span :aria-hidden="!show">×</span>
+          </button>
+        </slot>
       </template>
 
       <slot />
@@ -36,90 +39,89 @@
       <template v-slot:modal-footer>
         <slot name="footer"></slot>
       </template>
-
     </b-modal>
-  </SlideYUpTransition>
+  </slide-y-up-transition>
 </template>
 <script>
-  import { SlideYUpTransition } from "vue2-transitions";
+import { SlideYUpTransition } from 'vue2-transitions'
 
-  export default {
-    name: "modal",
-    components: {
-      SlideYUpTransition
+export default {
+  name: 'modal',
+  components: {
+    SlideYUpTransition,
+  },
+  props: {
+    show: Boolean,
+    showClose: {
+      type: Boolean,
+      default: true,
     },
-    props: {
-      show: Boolean,
-      showClose: {
-        type: Boolean,
-        default: true
+    type: {
+      type: String,
+      default: '',
+      validator(value) {
+        let acceptedValues = ['', 'notice', 'mini']
+        return acceptedValues.indexOf(value) !== -1
       },
-      type: {
-        type: String,
-        default: "",
-        validator(value) {
-          let acceptedValues = ["", "notice", "mini"];
-          return acceptedValues.indexOf(value) !== -1;
-        },
-        description: 'Modal type (notice|mini|"") '
+      description: 'Modal type (notice|mini|"") ',
+    },
+    modalClasses: {
+      type: [Object, String],
+      description: 'Modal dialog css classes',
+    },
+    size: {
+      type: String,
+      description: 'Modal size',
+      validator(value) {
+        let acceptedValues = ['', 'sm', 'lg']
+        return acceptedValues.indexOf(value) !== -1
       },
-      modalClasses: {
-        type: [Object, String],
-        description: "Modal dialog css classes"
-      },
-      size: {
-        type: String,
-        description: 'Modal size',
-        validator(value) {
-          let acceptedValues = ["", "sm", "lg"];
-          return acceptedValues.indexOf(value) !== -1;
-        },
-      },
-      modalContentClasses: {
-        type: [Object, String],
-        description: "Modal dialog content css classes"
-      },
-      gradient: {
-        type: String,
-        description: "Modal gradient type (danger, primary etc)"
-      },
-      headerClasses: {
-        type: [Object, String],
-        description: "Modal Header css classes"
-      },
-      bodyClasses: {
-        type: [Object, String],
-        description: "Modal Body css classes"
-      },
-      footerClasses: {
-        type: [Object, String],
-        description: "Modal Footer css classes"
-      },
-      animationDuration: {
-        type: Number,
-        default: 500,
-        description: "Modal transition duration"
+    },
+    modalContentClasses: {
+      type: [Object, String],
+      description: 'Modal dialog content css classes',
+    },
+    gradient: {
+      type: String,
+      description: 'Modal gradient type (danger, primary etc)',
+    },
+    headerClasses: {
+      type: [Object, String],
+      description: 'Modal Header css classes',
+    },
+    bodyClasses: {
+      type: [Object, String],
+      description: 'Modal Body css classes',
+    },
+    footerClasses: {
+      type: [Object, String],
+      description: 'Modal Footer css classes',
+    },
+    animationDuration: {
+      type: Number,
+      default: 500,
+      description: 'Modal transition duration',
+    },
+  },
+  methods: {
+    closeModal() {
+      this.$emit('update:show', false)
+      this.$emit('close')
+    },
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.$refs['app-modal'].show()
+      } else {
+        this.$refs['app-modal'].hide()
       }
     },
-    methods: {
-      closeModal() {
-        this.$emit("update:show", false);
-        this.$emit("close");
-      }
-    },
-    watch: {
-      show(val) {
-        if (val) {
-          this.$refs['app-modal'].show();
-        } else {
-          this.$refs['app-modal'].hide();
-        }
-      }
-    }
-  };
+  },
+}
 </script>
 <style>
-  .modal-backdrop {
-    background-color: rgba(0, 0, 0, 0.6) !important;
-  }
+.modal-backdrop {
+  background-color: rgba(0, 0, 0, 0.6) !important;
+}
 </style>

frontend/src/components/Modal.vue

@@ -1,85 +1,80 @@
 <template>
-    <!--Notice modal-->
-        <modal :show.sync="$store.state.modals"
-              modal-classes="modal-danger"
-              modal-content-classes="bg-gradient-danger">
-          <h6 slot="header" class="modal-title">Your attention is required</h6>
+  <!--Notice modal-->
+  <modal
+    :show.sync="$store.state.modals"
+    modal-classes="modal-danger"
+    modal-content-classes="bg-gradient-danger"
+  >
+    <h6 slot="header" class="modal-title">Your attention is required</h6>
 
-          <div class="py-3 text-center">
-             
-             <form ref="form" @submit.stop.prevent="handleSubmit">
-                <b-form-group
-                  label="Name"
-                  label-for="name-input"
-                  invalid-feedback="Name is required"
-                  :state="nameState"
-                >
-                  <b-form-input
-                    id="name-input"
-                    v-model="name"
-                    :state="nameState"
-                    required
-                  ></b-form-input>
-                </b-form-group>
-              </form>
-          </div>
-
-          <template slot="footer">
-            <base-button type="white">Ok</base-button>
-            <base-button type="link" class="text-white ml-auto" @click="$store.state.modals = false">abbrechen</base-button>
-          </template>
-        </modal>
+    <div class="py-3 text-center">
+      <form ref="form" @submit.stop.prevent="handleSubmit">
+        <b-form-group
+          label="Name"
+          label-for="name-input"
+          invalid-feedback="Name is required"
+          :state="nameState"
+        >
+          <b-form-input id="name-input" v-model="name" :state="nameState" required></b-form-input>
+        </b-form-group>
+      </form>
+    </div>
 
+    <template slot="footer">
+      <base-button type="white">Ok</base-button>
+      <base-button type="link" class="ml-auto" @click="$store.state.modals = false">
+        abbrechen
+      </base-button>
+    </template>
+  </modal>
 </template>
 
 <script>
+export default {
+  name: 'modal',
+  data() {
+    return {
+      name: '',
+      nameState: null,
+      submittedNames: [],
+    }
+  },
+  /*Modal*/
+  checkFormValidity() {
+    const valid = this.$refs.form.checkValidity()
+    this.nameState = valid
+    return valid
+  },
+  resetModal() {
+    this.name = ''
+    this.nameState = null
+  },
+  handleOk(bvModalEvt) {
+    // Prevent modal from closing
+    bvModalEvt.preventDefault()
+    // Trigger submit handler
+    this.handleSubmit()
+  },
+  handleSubmit() {
+    // Exit when the form isn't valid
+    if (!this.checkFormValidity()) {
+      return
+    }
+    // Push the name to submitted names
+    this.submittedNames.push(this.name)
+    this.$store.state.modals = false
+    this.$store.commit('loginAsAdmin')
+    this.$router.push('/AdminOverview')
 
-
- export default {
-   name: 'modal',
-    data() {
-      return {
-        name: '',
-        nameState: null,
-        submittedNames: []
-      }
-    },
-     /*Modal*/
-    checkFormValidity() {
-        const valid = this.$refs.form.checkValidity()
-        this.nameState = valid
-        return valid
-    },
-    resetModal() {
-        this.name = ''
-        this.nameState = null
-      },
-    handleOk(bvModalEvt) {
-        // Prevent modal from closing
-        bvModalEvt.preventDefault()
-        // Trigger submit handler
-        this.handleSubmit()
-      },
-    handleSubmit() {
-        // Exit when the form isn't valid
-        if (!this.checkFormValidity()) {
-          return
-        }
-         // Push the name to submitted names
-         this.submittedNames.push(this.name)
-         this.$store.state.modals = false
-         this.$store.commit('loginAsAdmin')
-         this.$router.push('/AdminOverview')        
-        
-        // Hide the modal manually
-        this.$nextTick(() => {
-          this.$bvModal.hide('modal-prevent-closing')
-        })
-      } 
-  };
+    // Hide the modal manually
+    this.$nextTick(() => {
+      this.$bvModal.hide('modal-prevent-closing')
+    })
+  },
+}
 </script>
 <style>
-  .modal-backdrop {
-    background-color: rgba(0, 0, 0, 0.6) !important;
-  }
+.modal-backdrop {
+  background-color: rgba(0, 0, 0, 0.6) !important;
+}
 </style>

frontend/src/components/Navbar/BaseNav.vue

@@ -18,10 +18,7 @@
         </button>
       </slot>
 
-      <b-navbar-toggle
-        target="nav-text-collapse"
-        @click.stop="toggleMenu">
-      </b-navbar-toggle>
+      <b-navbar-toggle target="nav-text-collapse" @click.stop="toggleMenu"></b-navbar-toggle>
 
       <b-collapse
         is-nav
@@ -29,7 +26,8 @@
         class="navbar-custom-collapse collapse"
         :class="menuClasses"
         :visible="show"
-        v-click-outside="closeMenu">
+        v-click-outside="closeMenu"
+      >
         <slot :close-menu="closeMenu"></slot>
       </b-collapse>
     </div>
@@ -43,29 +41,28 @@ export default {
       type: Boolean,
       default: false,
       description:
-        'Whether navbar menu is shown (valid for viewports < specified by `expand` prop)'
+        'Whether navbar menu is shown (valid for viewports < specified by `expand` prop)',
     },
     transparent: {
       type: Boolean,
       default: false,
-      description: 'Whether navbar is transparent'
+      description: 'Whether navbar is transparent',
     },
     expand: {
       type: String,
       default: 'lg',
-      description: 'Breakpoint where nav should expand'
+      description: 'Breakpoint where nav should expand',
     },
     menuClasses: {
       type: [String, Object, Array],
       default: '',
-      description:
-        'Navbar menu (items) classes. Can be used to align menu items to the right/left'
+      description: 'Navbar menu (items) classes. Can be used to align menu items to the right/left',
     },
     containerClasses: {
       type: [String, Object, Array],
       default: 'container',
       description:
-        'Container classes. Can be used to control container classes (contains both navbar brand and menu items)'
+        'Container classes. Can be used to control container classes (contains both navbar brand and menu items)',
     },
     type: {
       type: String,
@@ -81,43 +78,43 @@ export default {
           'primary',
           'light',
           'info',
-          'vue'
-        ].includes(value);
+          'vue',
+        ].includes(value)
       },
-      description: 'Navbar color type'
-    }
+      description: 'Navbar color type',
+    },
   },
   model: {
     prop: 'show',
-    event: 'change'
+    event: 'change',
   },
   computed: {
     classes() {
-      let color = `bg-${this.type}`;
+      let color = `bg-${this.type}`
       let classes = [
         { 'navbar-transparent': this.transparent },
-        { [`navbar-expand-${this.expand}`]: this.expand }
-      ];
+        { [`navbar-expand-${this.expand}`]: this.expand },
+      ]
       if (this.position) {
-        classes.push(`navbar-${this.position}`);
+        classes.push(`navbar-${this.position}`)
       }
       if (!this.transparent) {
-        classes.push(color);
+        classes.push(color)
       }
-      return classes;
+      return classes
     },
     hasMenu() {
-      return this.$slots.default;
-    }
+      return this.$slots.default
+    },
   },
   methods: {
     toggleMenu() {
-      this.$emit('change', !this.show);
+      this.$emit('change', !this.show)
     },
     closeMenu() {
-      this.$emit('change', false);
-    }
-  }
-};
+      this.$emit('change', false)
+    },
+  },
+}
 </script>
 <style></style>

frontend/src/components/Navbar/NavbarToggleButton.vue

@@ -15,7 +15,7 @@
 </template>
 <script>
 export default {
-  name: 'navbar-toggle-button'
-};
+  name: 'navbar-toggle-button',
+}
 </script>
 <style></style>

frontend/src/components/NavbarToggleButton.vue

@@ -10,7 +10,7 @@
   >
     <span class="navbar-toggler-icon"></span>
     <slot>
-        <span></span>
+      <span></span>
     </slot>
   </button>
 </template>
@@ -19,14 +19,14 @@ export default {
   props: {
     target: {
       type: [String, Number],
-      description: 'Button target element'
+      description: 'Button target element',
     },
     toggled: {
       type: Boolean,
       default: false,
-      description: 'Whether button is toggled'
-    }
-  }
-};
+      description: 'Whether button is toggled',
+    },
+  },
+}
 </script>
 <style></style>

frontend/src/components/NotificationPlugin/Notification.vue

@@ -3,207 +3,192 @@
     @click="tryClose"
     data-notify="container"
     class="alert alert-notify alert-dismissible"
-    :class="[
-      { 'alert-with-icon': icon },
-      verticalAlign,
-      horizontalAlign,
-      alertType
-    ]"
+    :class="[{ 'alert-with-icon': icon }, verticalAlign, horizontalAlign, alertType]"
     role="alert"
     :style="customPosition"
     data-notify-position="top-center"
   >
     <template v-if="icon || $slots.icon">
       <slot name="icon">
-            <span class="alert-icon" data-notify="icon">
-              <i :class="icon"></i>
-            </span>
+        <span class="alert-icon" data-notify="icon">
+          <i :class="icon"></i>
+        </span>
       </slot>
     </template>
 
     <span class="alert-text">
-
       <span v-if="title" class="title">
-        <b>{{ title }}<br/></b>
+        <b>
+          {{ title }}
+          <br />
+        </b>
       </span>
       <span v-if="message" v-html="message"></span>
-      <content-render
-        v-if="!message && component"
-        :component="component"
-      ></content-render>
+      <content-render v-if="!message && component" :component="component"></content-render>
     </span>
 
     <slot name="dismiss-icon">
-      <button type="button"
-              class="close"
-              data-dismiss="alert"
-              aria-label="Close"
-              @click="close">
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close" @click="close">
         <span aria-hidden="true">×</span>
       </button>
     </slot>
   </div>
 </template>
 <script>
-  export default {
-    name: 'notification',
-    components: {
-      contentRender: {
-        props: ['component'],
-        render: function (createElement) {
-          return createElement(this.component)
-        }
-      }
+export default {
+  name: 'notification',
+  components: {
+    contentRender: {
+      props: ['component'],
+      render: function (createElement) {
+        return createElement(this.component)
+      },
     },
-    props: {
-      message: String,
-      title: {
-        type: String,
-        description: 'Notification title'
-      },
-      icon: {
-        type: String,
-        description: 'Notification icon'
-      },
-      verticalAlign: {
-        type: String,
-        default: 'top',
-        validator: value => {
-          let acceptedValues = ['top', 'bottom'];
-          return acceptedValues.indexOf(value) !== -1;
-        },
-        description: 'Vertical alignment of notification (top|bottom)'
-      },
-      horizontalAlign: {
-        type: String,
-        default: 'right',
-        validator: value => {
-          let acceptedValues = ['left', 'center', 'right'];
-          return acceptedValues.indexOf(value) !== -1;
-        },
-        description: 'Horizontal alignment of notification (left|center|right)'
-      },
-      type: {
-        type: String,
-        default: 'info',
-        validator: value => {
-          let acceptedValues = [
-            'default',
-            'info',
-            'primary',
-            'danger',
-            'warning',
-            'success'
-          ];
-          return acceptedValues.indexOf(value) !== -1;
-        },
-        description: 'Notification type of notification (default|info|primary|danger|warning|success)'
-      },
-      timeout: {
-        type: Number,
-        default: 5000,
-        validator: value => {
-          return value >= 0;
-        },
-        description: 'Notification timeout (closes after X milliseconds). Default is 5000 (5s)'
-      },
-      timestamp: {
-        type: Date,
-        default: () => new Date(),
-        description: 'Notification timestamp (used internally to handle notification removal correctly)'
-      },
-      component: {
-        type: [Object, Function],
-        description: 'Custom content component. Cane be a `.vue` component or render function'
-      },
-      showClose: {
-        type: Boolean,
-        default: true,
-        description: 'Whether to show close button'
-      },
-      closeOnClick: {
-        type: Boolean,
-        default: true,
-        description: 'Whether to close notification when clicking it\' body'
-      },
-      clickHandler: {
-        type: Function,
-        description: 'Custom notification click handler'
-      }
+  },
+  props: {
+    message: String,
+    title: {
+      type: String,
+      description: 'Notification title',
     },
-    data() {
-      return {
-        elmHeight: 0
-      };
+    icon: {
+      type: String,
+      description: 'Notification icon',
     },
-    computed: {
-      hasIcon() {
-        return this.icon && this.icon.length > 0;
+    verticalAlign: {
+      type: String,
+      default: 'top',
+      validator: (value) => {
+        let acceptedValues = ['top', 'bottom']
+        return acceptedValues.indexOf(value) !== -1
       },
-      alertType() {
-        return `alert-${this.type}`;
-      },
-      customPosition() {
-        let initialMargin = 20;
-        let alertHeight = this.elmHeight + 10;
-        let sameAlertsCount = this.$notifications.state.filter(alert => {
-          return (
-            alert.horizontalAlign === this.horizontalAlign &&
-            alert.verticalAlign === this.verticalAlign &&
-            alert.timestamp <= this.timestamp
-          );
-        }).length;
-        if (this.$notifications.settings.overlap) {
-          sameAlertsCount = 1;
-        }
-        let pixels = (sameAlertsCount - 1) * alertHeight + initialMargin;
-        let styles = {};
-        if (this.verticalAlign === 'top') {
-          styles.top = `${pixels}px`;
-        } else {
-          styles.bottom = `${pixels}px`;
-        }
-        return styles;
-      }
+      description: 'Vertical alignment of notification (top|bottom)',
     },
-    methods: {
-      close() {
-        this.$emit('close', this.timestamp);
+    horizontalAlign: {
+      type: String,
+      default: 'right',
+      validator: (value) => {
+        let acceptedValues = ['left', 'center', 'right']
+        return acceptedValues.indexOf(value) !== -1
       },
-      tryClose(evt) {
-        if (this.clickHandler) {
-          this.clickHandler(evt, this);
-        }
-        if (this.closeOnClick) {
-          this.close();
-        }
-      }
+      description: 'Horizontal alignment of notification (left|center|right)',
     },
-    mounted() {
-      this.elmHeight = this.$el.clientHeight;
-      if (this.timeout) {
-        setTimeout(this.close, this.timeout);
-      }
+    type: {
+      type: String,
+      default: 'info',
+      validator: (value) => {
+        let acceptedValues = ['default', 'info', 'primary', 'danger', 'warning', 'success']
+        return acceptedValues.indexOf(value) !== -1
+      },
+      description:
+        'Notification type of notification (default|info|primary|danger|warning|success)',
+    },
+    timeout: {
+      type: Number,
+      default: 5000,
+      validator: (value) => {
+        return value >= 0
+      },
+      description: 'Notification timeout (closes after X milliseconds). Default is 5000 (5s)',
+    },
+    timestamp: {
+      type: Date,
+      default: () => new Date(),
+      description:
+        'Notification timestamp (used internally to handle notification removal correctly)',
+    },
+    component: {
+      type: [Object, Function],
+      description: 'Custom content component. Cane be a `.vue` component or render function',
+    },
+    showClose: {
+      type: Boolean,
+      default: true,
+      description: 'Whether to show close button',
+    },
+    closeOnClick: {
+      type: Boolean,
+      default: true,
+      description: "Whether to close notification when clicking it' body",
+    },
+    clickHandler: {
+      type: Function,
+      description: 'Custom notification click handler',
+    },
+  },
+  data() {
+    return {
+      elmHeight: 0,
     }
-  };
+  },
+  computed: {
+    hasIcon() {
+      return this.icon && this.icon.length > 0
+    },
+    alertType() {
+      return `alert-${this.type}`
+    },
+    customPosition() {
+      let initialMargin = 20
+      let alertHeight = this.elmHeight + 10
+      let sameAlertsCount = this.$notifications.state.filter((alert) => {
+        return (
+          alert.horizontalAlign === this.horizontalAlign &&
+          alert.verticalAlign === this.verticalAlign &&
+          alert.timestamp <= this.timestamp
+        )
+      }).length
+      if (this.$notifications.settings.overlap) {
+        sameAlertsCount = 1
+      }
+      let pixels = (sameAlertsCount - 1) * alertHeight + initialMargin
+      let styles = {}
+      if (this.verticalAlign === 'top') {
+        styles.top = `${pixels}px`
+      } else {
+        styles.bottom = `${pixels}px`
+      }
+      return styles
+    },
+  },
+  methods: {
+    close() {
+      this.$emit('close', this.timestamp)
+    },
+    tryClose(evt) {
+      if (this.clickHandler) {
+        this.clickHandler(evt, this)
+      }
+      if (this.closeOnClick) {
+        this.close()
+      }
+    },
+  },
+  mounted() {
+    this.elmHeight = this.$el.clientHeight
+    if (this.timeout) {
+      setTimeout(this.close, this.timeout)
+    }
+  },
+}
 </script>
 <style lang="scss">
-  .notifications .alert {
-    position: fixed;
-    z-index: 10000;
+.notifications .alert {
+  position: fixed;
+  z-index: 10000;
 
-    &[data-notify='container'] {
-      max-width: 500px;
-    }
-
-    &.center {
-      margin: 0 auto;
-    }
-    &.left {
-      left: 20px;
-    }
-    &.right {
-      right: 20px;
-    }
+  &[data-notify='container'] {
+    max-width: 500px;
   }
+
+  &.center {
+    margin: 0 auto;
+  }
+  &.left {
+    left: 20px;
+  }
+  &.right {
+    right: 20px;
+  }
+}
 </style>

frontend/src/components/NotificationPlugin/Notifications.vue

@@ -1,55 +1,52 @@
 <template>
   <div class="notifications">
-    <slide-y-up-transition :duration="transitionDuration"
-                             group
-                             mode="out-in">
+    <slide-y-up-transition :duration="transitionDuration" group mode="out-in">
       <notification
         v-for="notification in notifications"
         v-bind="notification"
         :clickHandler="notification.onClick"
         :key="notification.timestamp.getTime()"
         @close="removeNotification"
-      >
-      </notification>
+      ></notification>
     </slide-y-up-transition>
   </div>
 </template>
 <script>
-  import Notification from './Notification.vue';
-  import { SlideYUpTransition } from 'vue2-transitions';
+import Notification from './Notification.vue'
+import { SlideYUpTransition } from 'vue2-transitions'
 
-  export default {
-    components: {
-      SlideYUpTransition,
-      Notification
+export default {
+  components: {
+    SlideYUpTransition,
+    Notification,
+  },
+  props: {
+    transitionDuration: {
+      type: Number,
+      default: 200,
     },
-    props: {
-      transitionDuration: {
-        type: Number,
-        default: 200
-      },
-      overlap: {
-        type: Boolean,
-        default: false
-      }
+    overlap: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-      return {
-        notifications: this.$notifications.state
-      };
-    },
-    methods: {
-      removeNotification(timestamp) {
-        this.$notifications.removeNotification(timestamp);
-      }
-    },
-    created() {
-      this.$notifications.settings.overlap = this.overlap;
-    },
-    watch: {
-      overlap: function (newVal) {
-        this.$notifications.settings.overlap = newVal;
-      }
+  },
+  data() {
+    return {
+      notifications: this.$notifications.state,
     }
-  };
+  },
+  methods: {
+    removeNotification(timestamp) {
+      this.$notifications.removeNotification(timestamp)
+    },
+  },
+  created() {
+    this.$notifications.settings.overlap = this.overlap
+  },
+  watch: {
+    overlap: function (newVal) {
+      this.$notifications.settings.overlap = newVal
+    },
+  },
+}
 </script>

frontend/src/components/NotificationPlugin/index.js

@@ -1,4 +1,4 @@
-import Notifications from './Notifications.vue';
+import Notifications from './Notifications.vue'
 
 const NotificationStore = {
   state: [], // here the notifications will be added
@@ -9,58 +9,58 @@ const NotificationStore = {
     type: 'info',
     timeout: 5000,
     closeOnClick: true,
-    showClose: true
+    showClose: true,
   },
   setOptions(options) {
-    this.settings = Object.assign(this.settings, options);
+    this.settings = Object.assign(this.settings, options)
   },
   removeNotification(timestamp) {
-    const indexToDelete = this.state.findIndex(n => n.timestamp === timestamp);
+    const indexToDelete = this.state.findIndex((n) => n.timestamp === timestamp)
     if (indexToDelete !== -1) {
-      this.state.splice(indexToDelete, 1);
+      this.state.splice(indexToDelete, 1)
     }
   },
   addNotification(notification) {
     if (typeof notification === 'string' || notification instanceof String) {
-      notification = { message: notification };
+      notification = { message: notification }
     }
-    notification.timestamp = new Date();
+    notification.timestamp = new Date()
     notification.timestamp.setMilliseconds(
-      notification.timestamp.getMilliseconds() + this.state.length
-    );
-    notification = Object.assign({}, this.settings, notification);
-    this.state.push(notification);
+      notification.timestamp.getMilliseconds() + this.state.length,
+    )
+    notification = Object.assign({}, this.settings, notification)
+    this.state.push(notification)
   },
   notify(notification) {
     if (Array.isArray(notification)) {
-      notification.forEach(notificationInstance => {
-        this.addNotification(notificationInstance);
-      });
+      notification.forEach((notificationInstance) => {
+        this.addNotification(notificationInstance)
+      })
     } else {
-      this.addNotification(notification);
+      this.addNotification(notification)
     }
-  }
-};
+  },
+}
 
 const NotificationsPlugin = {
   install(Vue, options) {
     let app = new Vue({
       data: {
-        notificationStore: NotificationStore
+        notificationStore: NotificationStore,
       },
       methods: {
         notify(notification) {
-          this.notificationStore.notify(notification);
-        }
-      }
-    });
-    Vue.prototype.$notify = app.notify;
-    Vue.prototype.$notifications = app.notificationStore;
-    Vue.component('Notifications', Notifications);
+          this.notificationStore.notify(notification)
+        },
+      },
+    })
+    Vue.prototype.$notify = app.notify
+    Vue.prototype.$notifications = app.notificationStore
+    Vue.component('Notifications', Notifications)
     if (options) {
-      NotificationStore.setOptions(options);
+      NotificationStore.setOptions(options)
     }
-  }
-};
+  },
+}
 
-export default NotificationsPlugin;
+export default NotificationsPlugin

frontend/src/components/SearchUser.vue

@@ -1,12 +1,8 @@
 <template>
-    <vue-bootstrap-typeahead 
-    v-model="query"
-    :data="users"
-    @change="getUser"
-  />
+  <vue-bootstrap-typeahead v-model="query" :data="users" @change="getUser" />
 </template>
 <script>
-  import VueBootstrapTypeahead from 'vue-bootstrap-typeahead'
+import VueBootstrapTypeahead from 'vue-bootstrap-typeahead'
 
 // Global registration
 //Vue.component('vue-bootstrap-typeahead', VueBootstrapTypeahead)
@@ -15,71 +11,71 @@
 
 // Local registration
 export default {
-    name: "SearchUser",
-    components: {
-        VueBootstrapTypeahead
-    },
-    data() {
-      return {
-        user: "",
-        users: [
-          "Bob",
-          "Alice",
-          "Bernd",
-          "Dario",
-          "Alex",
-          "Pauls",
-          "Ulf",
-          "Delaware",
-          "Florida",
-          "Georgia",
-          "Hawaii",
-          "Idaho",
-          "Illnois",
-          "Indiana",
-          "Iowa",
-          "Kansas",
-          "Kentucky",
-          "Louisiana",
-          "Maine",
-          "Maryland",
-          "Massachusetts",
-          "Michigan",
-          "Minnesota",
-          "Mississippi",
-          "Missouri",
-          "Montana",
-          "Nebraska",
-          "Nevada",
-          "New Hampshire",
-          "New Jersey",
-          "New Mexico",
-          "New York",
-          "North Carolina",
-          "North Dakota",
-          "Ohio",
-          "Oklahoma",
-          "Oregon",
-          "Pennsylvania",
-          "Rhode Island",
-          "South Carolina",
-          "South Dakota",
-          "Tennessee",
-          "Texas",
-          "Utah",
-          "Vermont",
-          "Virginia",
-          "Washington",
-          "West Virginia",
-          "Wisconsin",
-          "Wyoming"
-        ]
-      };
-    },
-    methods: {
-      getUser() {
-        alert(this.data.user)
-      }
+  name: 'SearchUser',
+  components: {
+    VueBootstrapTypeahead,
+  },
+  data() {
+    return {
+      user: '',
+      users: [
+        'Bob',
+        'Alice',
+        'Bernd',
+        'Dario',
+        'Alex',
+        'Pauls',
+        'Ulf',
+        'Delaware',
+        'Florida',
+        'Georgia',
+        'Hawaii',
+        'Idaho',
+        'Illnois',
+        'Indiana',
+        'Iowa',
+        'Kansas',
+        'Kentucky',
+        'Louisiana',
+        'Maine',
+        'Maryland',
+        'Massachusetts',
+        'Michigan',
+        'Minnesota',
+        'Mississippi',
+        'Missouri',
+        'Montana',
+        'Nebraska',
+        'Nevada',
+        'New Hampshire',
+        'New Jersey',
+        'New Mexico',
+        'New York',
+        'North Carolina',
+        'North Dakota',
+        'Ohio',
+        'Oklahoma',
+        'Oregon',
+        'Pennsylvania',
+        'Rhode Island',
+        'South Carolina',
+        'South Dakota',
+        'Tennessee',
+        'Texas',
+        'Utah',
+        'Vermont',
+        'Virginia',
+        'Washington',
+        'West Virginia',
+        'Wisconsin',
+        'Wyoming',
+      ],
     }
-  };
+  },
+  methods: {
+    getUser() {
+      alert(this.data.user)
+    },
+  },
+}
 </script>

frontend/src/components/SidebarPlugin/SideBar.vue

@@ -1,137 +1,133 @@
 <template>
-    <nav class="navbar navbar-vertical fixed-left navbar-expand-md navbar-light bg-transparent" id="sidenav-main">
-        <div class="container-fluid">
-
-            <!--Toggler-->
-            <navbar-toggle-button @click.native="showSidebar">
-                
-            </navbar-toggle-button>
-            <router-link class="navbar-brand" to="/">
-                <img :src="logo" class="navbar-brand-img" alt="...">
+  <nav
+    class="navbar navbar-vertical fixed-left navbar-expand-md navbar-light bg-transparent"
+    id="sidenav-main"
+  >
+    <div class="container-fluid">
+      <!--Toggler-->
+      <navbar-toggle-button @click.native="showSidebar"></navbar-toggle-button>
+      <div class="navbar-brand">
+        <img :src="logo" class="navbar-brand-img" alt="..." />
+      </div>
+      <b-row class="text-center">
+        <b-col>{{ $n($store.state.user.balance) }} GDD</b-col>
+      </b-row>
+      <slot name="mobile-right">
+        <ul class="nav align-items-center d-md-none">
+          <base-dropdown class="nav-item" menu-on-right tag="li" title-tag="a">
+            <a slot="title-container" class="nav-link" href="#" role="button">
+              <div class="media align-items-center">
+                <span class="avatar avatar-sm">
+                  <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
+                </span>
+              </div>
+            </a>
+            xx
+            <router-link to="/overview" class="dropdown-item text-lg text-muted">
+              <i class="ni ni-single-02"></i>
+              <span>{{ $t('site.overview.account_overview') }}</span>
             </router-link>
-
-            <slot name="mobile-right">
-                <ul class="nav align-items-center d-md-none">
-                
-                    <base-dropdown class="nav-item" menu-on-right tag="li" title-tag="a">
-                        <a slot="title-container" class="nav-link" href="#" role="button">
-                            <div class="media align-items-center">
-                              <span class="avatar avatar-sm rounded-circle">
-                                <img alt="Image placeholder" src="img/theme/team-1.jpg">
-                              </span>
-                            </div>
-                        </a>
- 
-                        <router-link to="/KontoOverview" class="dropdown-item text-lg text-muted">
-                            <i class="ni ni-single-02"></i>
-                            <span>{{ $t('site.overview.account_overview')}}</span>
-                        </router-link>
-                        <router-link to="/profile" class="dropdown-item  text-lg text-muted">
-                            <i class="ni ni-single-02"></i>
-                            <span>{{ $t('site.navbar.my-profil')}}</span>
-                        </router-link>
-                        <router-link to="/profileedit" class="dropdown-item  text-lg text-muted">
-                            <i class="ni ni-settings-gear-65"></i>
-                            <span>{{ $t('site.navbar.settings') }}</span>
-                        </router-link>
+            <router-link to="/profile" class="dropdown-item text-lg text-muted">
+              <i class="ni ni-single-02"></i>
+              <span>{{ $t('site.navbar.my-profil') }}</span>
+            </router-link>
+            <router-link to="/profileedit" class="dropdown-item text-lg text-muted">
+              <i class="ni ni-settings-gear-65"></i>
+              <span>{{ $t('site.navbar.settings') }}</span>
+            </router-link>
+            <router-link to="/transactions" class="dropdown-item text-lg text-muted">
+              <i class="ni ni-calendar-grid-58"></i>
+              <span>Transactions</span>
+            </router-link>
+            <!--
                         <router-link to="/activity" class="dropdown-item  text-lg text-muted">
                             <i class="ni ni-calendar-grid-58"></i>
                             <span>{{ $t('site.navbar.activity') }}</span>
                         </router-link>
-                       
-                        <div class="dropdown-divider"></div>
-                        <router-link @click="logout" class="dropdown-item  text-lg text-muted">
-                            <i class="ni ni-support-16"></i>
-                            <span>{{ $t('logout') }}</span>
-                        </router-link>
-                    </base-dropdown>
-                </ul>
-            </slot>
-            <slot></slot>
-            <div v-show="$sidebar.showSidebar" class="navbar-collapse collapse show" id="sidenav-collapse-main">
-
-                <div class="navbar-collapse-header d-md-none">
-                    <div class="row">
-                        <div class="col-6 collapse-brand">
-                            <router-link to="/">
-                                <img :src="logo">
-                            </router-link>
-                        </div>
-                        <div class="col-6 collapse-close">
-                            <navbar-toggle-button @click.native="closeSidebar"></navbar-toggle-button>
-                        </div>
-                    </div>
-                </div>
-
-                <ul class="navbar-nav">
-                    <slot name="links">
-                    </slot>
-                </ul>
-              
-                <hr class="my-3">
-     
-                <ul class="navbar-nav mb-md-3">
-                   
-                     <li class="nav-item"> 
- 
-                        <a class="nav-link text-lg bg-light" href="#!"  @click="logout">
-                        {{ $t('logout') }}
-                        </a>
-                     </li>
-                  </ul>
-                 
+                       -->
+            <div class="dropdown-divider"></div>
+            <div @click="logout" class="dropdown-item text-lg text-muted">
+              <i class="ni ni-support-16"></i>
+              {{ $t('logout') }}
             </div>
+          </base-dropdown>
+        </ul>
+      </slot>
+      <slot></slot>
+      <div
+        v-show="$sidebar.showSidebar"
+        class="navbar-collapse collapse show"
+        id="sidenav-collapse-main"
+      >
+        <div class="navbar-collapse-header d-md-none">
+          <div class="row">
+            <div class="col-6 collapse-brand">
+              <router-link to="/overview">
+                <img :src="logo" />
+              </router-link>
             </div>
-    </nav>
+            <div class="col-6 collapse-close">
+              <navbar-toggle-button @click.native="closeSidebar"></navbar-toggle-button>
+            </div>
+          </div>
+        </div>
+        <ul class="navbar-nav">
+          <slot name="links"></slot>
+        </ul>
+        <hr class="my-3" />
+        <ul class="navbar-nav mb-md-3">
+          <li class="nav-item">
+            <a class="nav-link text-lg" href="#!" @click="logout">
+              {{ $t('logout') }}
+            </a>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </nav>
 </template>
 <script>
-  import NavbarToggleButton from '@/components/NavbarToggleButton'
+import NavbarToggleButton from '@/components/NavbarToggleButton'
+import VueQrcode from 'vue-qrcode'
 
-  export default {
-    name: 'sidebar',
-    components: {
-      NavbarToggleButton
+export default {
+  name: 'sidebar',
+  components: {
+    NavbarToggleButton,
+    VueQrcode,
+  },
+  props: {
+    logo: {
+      type: String,
+      default: 'img/brand/green.png',
+      description: 'Gradido Sidebar app logo',
     },
-    props: {
-      logo: {
-        type: String,
-        default: 'img/brand/green.png',
-        description: 'Sidebar app logo'
-      },
-      autoClose: {
-        type: Boolean,
-        default: true,
-        description: 'Whether sidebar should autoclose on mobile when clicking an item'
-      }
+    autoClose: {
+      type: Boolean,
+      default: true,
+      description: 'Whether sidebar should autoclose on mobile when clicking an item',
     },
-    provide() {
-      return {
-        autoClose: this.autoClose
-      };
+  },
+  provide() {
+    return {
+      autoClose: this.autoClose,
+    }
+  },
+  methods: {
+    closeSidebar() {
+      this.$sidebar.displaySidebar(false)
     },
-    methods: {
-      closeSidebar() {
-        this.$sidebar.displaySidebar(false)
-      },
-      showSidebar() {
-        this.$sidebar.displaySidebar(true)
-      },
-      setLocale(locale) {
-      this.$i18n.locale = locale
-      //this.$router.push({
-      //  params: { lang: locale }
-      //})
-      //this.hideDropdown()
+    showSidebar() {
+      this.$sidebar.displaySidebar(true)
     },
-    logout(){
-      //console.log("DashboardNavbar.vue user logout() : ")
+    logout() {
       this.$store.dispatch('logout')
-    }  
     },
-    beforeDestroy() {
-      if (this.$sidebar.showSidebar) {
-        this.$sidebar.showSidebar = false;
-      }
+  },
+  beforeDestroy() {
+    if (this.$sidebar.showSidebar) {
+      this.$sidebar.showSidebar = false
     }
-  };
+  },
+}
 </script>

frontend/src/components/SidebarPlugin/SidebarItem.vue

@@ -15,31 +15,28 @@
     >
       <template v-if="addLink">
         <span class="nav-link-text">
-          {{ link.name }} <b class="caret"></b>
+          {{ link.name }}
+          <b class="caret"></b>
         </span>
       </template>
       <template v-else>
         <i :class="link.icon"></i>
-        <span class="nav-link-text">{{ link.name }} <b class="caret"></b></span>
+        <span class="nav-link-text">
+          {{ link.name }}
+          <b class="caret"></b>
+        </span>
       </template>
     </a>
 
     <collapse-transition>
-      <div
-        v-if="$slots.default || this.isMenu"
-        v-show="!collapsed"
-        class="collapse show"
-      >
+      <div v-if="$slots.default || this.isMenu" v-show="!collapsed" class="collapse show">
         <ul class="nav nav-sm flex-column">
           <slot></slot>
         </ul>
       </div>
     </collapse-transition>
 
-    <slot
-      name="title"
-      v-if="children.length === 0 && !$slots.default && link.path"
-    >
+    <slot name="title" v-if="children.length === 0 && !$slots.default && link.path">
       <component
         :to="link.path"
         @click.native="linkClick"
@@ -61,19 +58,19 @@
   </b-nav-item>
 </template>
 <script>
-import { CollapseTransition } from 'vue2-transitions';
+import { CollapseTransition } from 'vue2-transitions'
 
 export default {
   name: 'sidebar-item',
   components: {
-    CollapseTransition
+    CollapseTransition,
   },
   props: {
     menu: {
       type: Boolean,
       default: false,
       description:
-        "Whether the item is a menu. Most of the item it's not used and should be used only if you want to override the default behavior."
+        "Whether the item is a menu. Most of the item it's not used and should be used only if you want to override the default behavior.",
     },
     link: {
       type: Object,
@@ -81,115 +78,109 @@ export default {
         return {
           name: '',
           path: '',
-          children: []
-        };
+          children: [],
+        }
       },
       description:
-        'Sidebar link. Can contain name, path, icon and other attributes. See examples for more info'
-    }
+        'Sidebar link. Can contain name, path, icon and other attributes. See examples for more info',
+    },
   },
   provide() {
     return {
       addLink: this.addChild,
-      removeLink: this.removeChild
-    };
+      removeLink: this.removeChild,
+    }
   },
   inject: {
     addLink: { default: null },
     removeLink: { default: null },
     autoClose: {
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
       children: [],
-      collapsed: true
-    };
+      collapsed: true,
+    }
   },
   computed: {
     baseComponent() {
-      return this.isMenu || this.link.isRoute ? 'li' : 'router-link';
+      return this.isMenu || this.link.isRoute ? 'li' : 'router-link'
     },
     linkPrefix() {
       if (this.link.name) {
-        let words = this.link.name.split(' ');
-        return words.map(word => word.substring(0, 1)).join('');
+        let words = this.link.name.split(' ')
+        return words.map((word) => word.substring(0, 1)).join('')
       }
       return ''
     },
     isMenu() {
-      return this.children.length > 0 || this.menu === true;
+      return this.children.length > 0 || this.menu === true
     },
     isActive() {
       if (this.$route && this.$route.path) {
-        let matchingRoute = this.children.find(c =>
-          this.$route.path.startsWith(c.link.path)
-        );
+        let matchingRoute = this.children.find((c) => this.$route.path.startsWith(c.link.path))
         if (matchingRoute !== undefined) {
-          return true;
+          return true
         }
       }
-      return false;
-    }
+      return false
+    },
   },
   methods: {
     addChild(item) {
-      const index = this.$slots.default.indexOf(item.$vnode);
-      this.children.splice(index, 0, item);
+      const index = this.$slots.default.indexOf(item.$vnode)
+      this.children.splice(index, 0, item)
     },
     removeChild(item) {
-      const tabs = this.children;
-      const index = tabs.indexOf(item);
-      tabs.splice(index, 1);
+      const tabs = this.children
+      const index = tabs.indexOf(item)
+      tabs.splice(index, 1)
     },
     elementType(link, isParent = true) {
       if (link.isRoute === false) {
-        return isParent ? 'li' : 'a';
+        return isParent ? 'li' : 'a'
       } else {
-        return 'router-link';
+        return 'router-link'
       }
     },
     linkAbbreviation(name) {
-      const matches = name.match(/\b(\w)/g);
-      return matches.join('');
+      const matches = name.match(/\b(\w)/g)
+      return matches.join('')
     },
     linkClick() {
-      if (
-        this.autoClose &&
-        this.$sidebar &&
-        this.$sidebar.showSidebar === true
-      ) {
-        this.$sidebar.displaySidebar(false);
+      if (this.autoClose && this.$sidebar && this.$sidebar.showSidebar === true) {
+        this.$sidebar.displaySidebar(false)
       }
     },
     collapseMenu() {
-      this.collapsed = !this.collapsed;
+      this.collapsed = !this.collapsed
     },
     collapseSubMenu(link) {
-      link.collapsed = !link.collapsed;
-    }
+      link.collapsed = !link.collapsed
+    },
   },
   mounted() {
     if (this.addLink) {
-      this.addLink(this);
+      this.addLink(this)
     }
     if (this.link.collapsed !== undefined) {
-      this.collapsed = this.link.collapsed;
+      this.collapsed = this.link.collapsed
     }
     if (this.isActive && this.isMenu) {
-      this.collapsed = false;
+      this.collapsed = false
     }
   },
   destroyed() {
     if (this.$el && this.$el.parentNode) {
-      this.$el.parentNode.removeChild(this.$el);
+      this.$el.parentNode.removeChild(this.$el)
     }
     if (this.removeLink) {
-      this.removeLink(this);
+      this.removeLink(this)
     }
-  }
-};
+  },
+}
 </script>
 <style>
 .sidebar-menu-item {

frontend/src/components/SidebarPlugin/index.js

@@ -1,43 +1,43 @@
-import Sidebar from './SideBar.vue';
-import SidebarItem from './SidebarItem.vue';
+import Sidebar from './SideBar.vue'
+import SidebarItem from './SidebarItem.vue'
 
 const SidebarStore = {
   showSidebar: false,
   sidebarLinks: [],
   isMinimized: false,
   displaySidebar(value) {
-    this.showSidebar = value;
+    this.showSidebar = value
   },
   toggleMinimize() {
-    document.body.classList.toggle('sidebar-mini');
+    document.body.classList.toggle('sidebar-mini')
     // we simulate the window Resize so the charts will get updated in realtime.
     const simulateWindowResize = setInterval(() => {
-      window.dispatchEvent(new Event('resize'));
-    }, 180);
+      window.dispatchEvent(new Event('resize'))
+    }, 180)
 
     // we stop the simulation of Window Resize after the animations are completed
     setTimeout(() => {
-      clearInterval(simulateWindowResize);
-    }, 1000);
+      clearInterval(simulateWindowResize)
+    }, 1000)
 
-    this.isMinimized = !this.isMinimized;
-  }
-};
+    this.isMinimized = !this.isMinimized
+  },
+}
 
 const SidebarPlugin = {
   install(Vue, options) {
     if (options && options.sidebarLinks) {
-      SidebarStore.sidebarLinks = options.sidebarLinks;
+      SidebarStore.sidebarLinks = options.sidebarLinks
     }
     let app = new Vue({
       data: {
-        sidebarStore: SidebarStore
-      }
-    });
-    Vue.prototype.$sidebar = app.sidebarStore;
-    Vue.component('side-bar', Sidebar);
-    Vue.component('sidebar-item', SidebarItem);
-  }
-};
+        sidebarStore: SidebarStore,
+      },
+    })
+    Vue.prototype.$sidebar = app.sidebarStore
+    Vue.component('side-bar', Sidebar)
+    Vue.component('sidebar-item', SidebarItem)
+  },
+}
 
-export default SidebarPlugin;
+export default SidebarPlugin

frontend/src/components/Tabs/Tab.vue

@@ -16,18 +16,18 @@ export default {
   inject: ['addTab', 'removeTab'],
   data() {
     return {
-      active: false
-    };
+      active: false,
+    }
   },
   mounted() {
-    this.addTab(this);
+    this.addTab(this)
   },
   destroyed() {
     if (this.$el && this.$el.parentNode) {
-      this.$el.parentNode.removeChild(this.$el);
+      this.$el.parentNode.removeChild(this.$el)
     }
-    this.removeTab(this);
-  }
-};
+    this.removeTab(this)
+  },
+}
 </script>
 <style></style>

frontend/src/components/Tabs/Tabs.vue

@@ -4,7 +4,7 @@
       :class="[
         { 'col-md-4': vertical && !tabNavWrapperClasses },
         { 'col-12': centered && !tabNavWrapperClasses },
-        tabNavWrapperClasses
+        tabNavWrapperClasses,
       ]"
     >
       <b-nav
@@ -14,7 +14,7 @@
           `nav-pills-${type}`,
           { 'flex-column': vertical },
           { 'justify-content-center': centered },
-          tabNavClasses
+          tabNavClasses,
         ]"
       >
         <b-nav-item
@@ -28,7 +28,7 @@
           @click.prevent="activateTab(tab)"
           :aria-expanded="tab.active"
         >
-          <tab-item-content :tab="tab"> </tab-item-content>
+          <tab-item-content :tab="tab"></tab-item-content>
         </b-nav-item>
       </b-nav>
     </div>
@@ -37,7 +37,7 @@
       :class="[
         { 'tab-space': !vertical },
         { 'col-md-8': vertical && !tabContentClasses },
-        tabContentClasses
+        tabContentClasses,
       ]"
     >
       <slot></slot>
@@ -52,110 +52,104 @@ export default {
     TabItemContent: {
       props: ['tab'],
       render(h) {
-        return h('div', [this.tab.$slots.title || this.tab.title]);
-      }
-    }
+        return h('div', [this.tab.$slots.title || this.tab.title])
+      },
+    },
   },
   provide() {
     return {
       addTab: this.addTab,
-      removeTab: this.removeTab
-    };
+      removeTab: this.removeTab,
+    }
   },
   props: {
     type: {
       type: String,
       default: 'primary',
-      validator: value => {
-        let acceptedValues = [
-          'primary',
-          'info',
-          'success',
-          'warning',
-          'danger'
-        ];
-        return acceptedValues.indexOf(value) !== -1;
-      }
+      validator: (value) => {
+        let acceptedValues = ['primary', 'info', 'success', 'warning', 'danger']
+        return acceptedValues.indexOf(value) !== -1
+      },
     },
     activeTab: {
       type: String,
       default: '',
-      description: 'Active tab name'
+      description: 'Active tab name',
     },
     tabNavWrapperClasses: {
       type: [String, Object],
       default: '',
-      description: 'ul wrapper css classes'
+      description: 'ul wrapper css classes',
     },
     tabNavClasses: {
       type: [String, Object],
       default: '',
-      description: 'ul css classes'
+      description: 'ul css classes',
     },
     tabContentClasses: {
       type: [String, Object],
       default: '',
-      description: 'tab content css classes'
+      description: 'tab content css classes',
     },
     vertical: Boolean,
     centered: Boolean,
-    value: String
+    value: String,
   },
   data() {
     return {
-      tabs: []
-    };
+      tabs: [],
+    }
   },
   methods: {
     findAndActivateTab(title) {
-      let tabToActivate = this.tabs.find(t => t.title === title);
+      let tabToActivate = this.tabs.find((t) => t.title === title)
       if (tabToActivate) {
-        this.activateTab(tabToActivate);
+        this.activateTab(tabToActivate)
       }
     },
     activateTab(tab) {
       if (this.handleClick) {
-        this.handleClick(tab);
+        this.handleClick(tab)
       }
-      this.deactivateTabs();
-      tab.active = true;
+      this.deactivateTabs()
+      tab.active = true
     },
     deactivateTabs() {
-      this.tabs.forEach(tab => {
-        tab.active = false;
-      });
+      this.tabs.forEach((tab) => {
+        tab.active = false
+      })
     },
     addTab(tab) {
-      const index = this.$slots.default.indexOf(tab.$vnode);
+      const index = this.$slots.default.indexOf(tab.$vnode)
       if (!this.activeTab && index === 0) {
-        tab.active = true;
+        tab.active = true
       }
       if (this.activeTab === tab.name) {
-        tab.active = true;
+        tab.active = true
       }
-      this.tabs.splice(index, 0, tab);
+      this.tabs.splice(index, 0, tab)
     },
     removeTab(tab) {
-      const tabs = this.tabs;
-      const index = tabs.indexOf(tab);
+      const tabs = this.tabs
+      const index = tabs.indexOf(tab)
       if (index > -1) {
-        tabs.splice(index, 1);
+        tabs.splice(index, 1)
       }
-    }
+    },
   },
   mounted() {
     this.$nextTick(() => {
       if (this.value) {
-        this.findAndActivateTab(this.value);
+        this.findAndActivateTab(this.value)
       }
-    });
+    })
   },
   watch: {
     value(newVal) {
-      this.findAndActivateTab(newVal);
-    }
-  }
-};
+      this.findAndActivateTab(newVal)
+    },
+  },
+}
 </script>
 
 <style scoped></style>

frontend/src/components/index.js

@@ -1,30 +1,30 @@
-import BaseCheckbox from './Inputs/BaseCheckbox.vue';
-import BaseAlert from './BaseAlert.vue';
-import BaseRadio from './Inputs/BaseRadio.vue';
-import BaseInput from './Inputs/BaseInput.vue';
-import Badge from './Badge';
-import BaseProgress from './BaseProgress.vue';
-import BaseButton from './BaseButton.vue';
+import BaseCheckbox from './Inputs/BaseCheckbox.vue'
+import BaseAlert from './BaseAlert.vue'
+import BaseRadio from './Inputs/BaseRadio.vue'
+import BaseInput from './Inputs/BaseInput.vue'
+import Badge from './Badge'
+import BaseProgress from './BaseProgress.vue'
+import BaseButton from './BaseButton.vue'
 
-import BaseDropdown from './BaseDropdown.vue';
-import BaseTable from './BaseTable.vue';
+import BaseDropdown from './BaseDropdown.vue'
+import BaseTable from './BaseTable.vue'
 
-import Card from './Cards/Card.vue';
-import StatsCard from './Cards/StatsCard.vue';
-import BaseNav from './Navbar/BaseNav';
-import NavbarToggleButton from './Navbar/NavbarToggleButton';
+import Card from './Cards/Card.vue'
+import StatsCard from './Cards/StatsCard.vue'
+import BaseNav from './Navbar/BaseNav'
+import NavbarToggleButton from './Navbar/NavbarToggleButton'
 
-import TabPane from './Tabs/Tab.vue';
-import Tabs from './Tabs/Tabs.vue';
-import Collapse from './Collapse/Collapse.vue';
-import CollapseItem from './Collapse/CollapseItem.vue';
-import Modal from './Modal.vue';
-import BaseSlider from './BaseSlider.vue';
-import LoadingPanel from './LoadingPanel.vue';
+import TabPane from './Tabs/Tab.vue'
+import Tabs from './Tabs/Tabs.vue'
+import Collapse from './Collapse/Collapse.vue'
+import CollapseItem from './Collapse/CollapseItem.vue'
+import Modal from './Modal.vue'
+import BaseSlider from './BaseSlider.vue'
+import LoadingPanel from './LoadingPanel.vue'
 
-import BasePagination from './BasePagination.vue';
+import BasePagination from './BasePagination.vue'
 
-import SidebarPlugin from './SidebarPlugin';
+import SidebarPlugin from './SidebarPlugin'
 
 export {
   BaseCheckbox,
@@ -48,5 +48,5 @@ export {
   BaseButton,
   Collapse,
   CollapseItem,
-  LoadingPanel
-};
+  LoadingPanel,
+}

frontend/src/config/index.js

@@ -11,8 +11,12 @@ const environment = {
 
 const server = {
   LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/',
-  COMMUNITY_API_STATE_BALANCE_URL: process.env.COMMUNITY_API_STATE_BALANCE_URL || 'http://localhost/state-balances/',
-  COMMUNITY_API_TRANSACTION_CREATION_URL: process.env.COMMUNITY_API_TRANSACTION_CREATION_URL || 'http://localhost/transaction-creations/',
+  COMMUNITY_API_STATE_BALANCE_URL:
+    process.env.COMMUNITY_API_STATE_BALANCE_URL || 'http://localhost/state-balances/',
+  // Schöpfung
+  // COMMUNITY_API_TRANSACTION_CREATION_URL: process.env.COMMUNITY_API_TRANSACTION_CREATION_URL || 'http://localhost/transaction-creations/',
+  COMMUNITY_API_TRANSACTION_SEND_COINS:
+    process.env.COMMUNITY_API_TRANSACTION_SEND_COINS || 'http://localhost/transaction-send-coins/',
 }
 
 const CONFIG = {

frontend/src/directives/click-ouside.js

@@ -1,15 +1,15 @@
 export default {
-  bind: function(el, binding, vnode) {
-    el.clickOutsideEvent = function(event) {
+  bind: function (el, binding, vnode) {
+    el.clickOutsideEvent = function (event) {
       // here I check that click was outside the el and his childrens
       if (!(el == event.target || el.contains(event.target))) {
         // and if it did, call method provided in attribute value
-        vnode.context[binding.expression](event);
+        vnode.context[binding.expression](event)
       }
-    };
-    document.body.addEventListener('click', el.clickOutsideEvent);
+    }
+    document.body.addEventListener('click', el.clickOutsideEvent)
   },
-  unbind: function(el) {
-    document.body.removeEventListener('click', el.clickOutsideEvent);
-  }
-};
+  unbind: function (el) {
+    document.body.removeEventListener('click', el.clickOutsideEvent)
+  },
+}

frontend/src/i18n.js

@@ -1,16 +1,31 @@
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 
+import en from 'vee-validate/dist/locale/en'
+import de from 'vee-validate/dist/locale/de'
+
 Vue.use(VueI18n)
 
-function loadLocaleMessages () {
+function loadLocaleMessages() {
   const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.json$/i)
   const messages = {}
-  locales.keys().forEach(key => {
+  locales.keys().forEach((key) => {
     const matched = key.match(/([A-Za-z0-9-_]+)\./i)
     if (matched && matched.length > 1) {
       const locale = matched[1]
       messages[locale] = locales(key)
+      if (locale === 'de') {
+        messages[locale] = {
+          validations: de,
+          ...messages[locale],
+        }
+      }
+      if (locale === 'en') {
+        messages[locale] = {
+          validations: en,
+          ...messages[locale],
+        }
+      }
     }
   })
   return messages
@@ -19,20 +34,23 @@ function loadLocaleMessages () {
 const numberFormats = {
   'en-US': {
     currency: {
-      style: 'currency'
-    }
+      style: 'currency',
+      currency: 'GDD',
+      abbreviate: true,
+    },
   },
   'de-DE': {
     currency: {
-      style: 'currency'
-    }
-  }
+      style: 'currency',
+      currency: 'GDD',
+      abbreviate: true,
+    },
+  },
 }
 
-
 export default new VueI18n({
   locale: 'en',
   fallbackLocale: 'en',
   messages: loadLocaleMessages(),
-  numberFormats
+  numberFormats,
 })

frontend/src/locales/de.json

@@ -1,21 +1,21 @@
 {
   "message": "hallo gradido !!",
   "welcome":"Willkommen!",
-  "logout":"Logout",
+  "logout":"Abmelden",
   "login":"Login",
   "signup": "Registrieren",
   "imprint":"Impressum",
   "privacy_policy":"Datenschutzerklärung",
-  "license":"Lizenz",
-  "back":"zurück",
+  "back":"Zurück",
+  "sent":"Senden",
   "transactions":"Transaktionen",
-  "language":"Sprachen",
+  "language":"Language",
   "languages":{
     "de": "Deutsch",
     "en": "English"
   },
   "form": {
-    "cancel":"abbrechen",
+    "cancel":"Abbrechen",
     "firstname":"Vorname",
     "lastname":"Nachname",
     "email":"eMail",
@@ -29,7 +29,7 @@
     "from":"von",
     "to":"bis",
     "at":"am",
-    "send_now":"jetzt versenden"
+    "send_now":"Jetzt versenden"
   },
   "transaction":{
     "show_part": "Die letzten <strong>{count}</strong> Transaktionen",
@@ -38,72 +38,58 @@
   },
   "site": {
     "login": {
-      "community":"Du bist die Gemeinschaft",
+      "community":"Tausend Dank, weil du bei uns bist!",
       "remember":"Passwort merken",
       "signin":"Anmelden",
       "forgot_pwd":"Passwort vergessen?",
-      "new_wallet":"Neues Wallet erstellen"
+      "new_wallet":"Neues Konto erstellen"
     },
     "signup": {
-      "title": "Erstelle deine Gradido Wallet",
-      "subtitle": "Werde ein teil der Gemeinschaft!",
+      "title": "Erstelle dein Gradido-Konto",
+      "subtitle": "Werde Teil der Gemeinschaft!",
       "strength":"Passwortsicherheit:",
       "strong":"stark",
       "agree":"habe ich gelesen und verstanden und stimme diesen zu."
     },
     "password": {
       "title": "Passwort zurücksetzen",
-      "subtitle": "Wenn sie das Passwort vergessen haben oder ändern möchten.",
-      "reset_now": "jetzt zurücksetzen"
+      "subtitle": "Wenn du dein Passwort vergessen hast, kannst du es hier zurücksetzen.",
+      "reset_now": "Jetzt zurücksetzen"
     },
     "thx": {
       "title": "Danke!",
       "subtitle": "Wir haben dir eine eMail gesendet."
     },
-      "overview":{
+    "overview":{
         "account_overview":"Kontoübersicht",
         "since_last_month": "seid letzten Monat",
         "send_gradido":"Gradido versenden",
         "add_work":"neuer Gemeinschaftsbeitrag"
-      },
-      "navbar" : {
-        "my-profil":"Mein Profil",
-        "settings":"Einstellung",
-        "activity":"Aktivität",
-        "support":"Support"
-      },
-      "sidebar" : {
-         "community":"Gemeinschaft",
-         "members_area":"Mitgliederbereich",
-         "membership":"Mitgliedschaft",
-         "language":"Sprachen"
-      },
-      "landing1" : {
-        "explore": "Erkunden Sie Gradido",
-        "text": "Gesundes Geld für eine gesunde Welt - Das Gradido-Modell kann weltweiten Wohlstand und Frieden schaffen",
-        "link": "Seiten erkunden"
-      },
-      "404" : {
-         "ooops" : "Ooops!",
-         "text" : "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zum Erkunden",
-         "back" : "zurück zur Übersicht!"
-      }
-  },
-  "admin": {
-    "site": {
-      "overview": {
-        "created": "created",
-        "transience" : "Transience",
-        "exchanged": "Exchanged",
-        "members" : "Members"
-      }
+    },
+    "navbar" : {
+      "my-profil":"Mein Profil",
+      "settings":"Einstellungen",
+      "activity":"Aktivität",
+      "support":"Support"
+    },
+    "sidebar" : {
+        "community":"Gemeinschaft",
+        "members_area":"Mitgliederbereich",
+        "membership":"Mitgliedschaft",
+        "language":"Sprachen"
+    },
+    "landing1" : {
+      "explore": "Erkunden Sie Gradido",
+      "text": "Gesundes Geld für eine gesunde Welt — Das Gradido-Modell kann weltweiten Wohlstand und Frieden schaffen",
+      "link": "Seiten erkunden"
+    },
+    "404" : {
+        "ooops" : "Ooops!",
+        "text" : "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zum Erkunden",
+        "back" : "Zurück zur Übersicht!"
     }
   },
   "nav": {
     "features": "Neuigkeiten"
-  },
-  "about": {
-    "title": "Über uns",
-    "content": "Lorem ipsum deutsch dolor sit amet consectetur adipisicing elit. Aut dicta incidunt ea ut commodi quidem temporibus illo quia. Et itaque deleniti veniam tempore facere ipsum animi totam culpa minima vel voluptatem adipisci natus blanditiis similique sunt expedita, ex dicta doloremque repellat vitae temporibus. Quisquam quia, accusantium blanditiis architecto facilis saepe! Lorem ipsum dolor sit amet consectetur adipisicing elit. Ad unde laborum ut suscipit iure aliquam sapiente doloribus exercitationem nam sint."
   }
 }

frontend/src/locales/en.json

@@ -4,24 +4,24 @@
   "logout":"Logout",
   "login":"Login",
   "signup": "Sign up",
-  "imprint":"Imprint",
+  "imprint":"Legal notice",
   "privacy_policy":"Privacy policy",
-  "license":"License",
-  "back":"back",
-  "transactions":"transactions",
-  "language":"Language",
+  "back":"Back",
+  "sent":"Send",
+  "transactions":"Transactions",
+  "language":"Sprache",
   "languages":{
-      "de": "Deutsch",
-      "en": "English"
+    "de": "Deutsch",
+    "en": "English"
   },
   "form": {
     "cancel":"Cancel",
     "firstname":"Firstname",
     "lastname":"Lastname",
     "email":"Email",
-    "email_repeat":"repeat_email",
+    "email_repeat":"Repeat Email",
     "password":"Password",
-    "password_repeat":"repeat password",
+    "password_repeat":"Repeat password",
     "amount":"Amount",
     "memo":"Memo",
     "message":"Message",
@@ -30,7 +30,7 @@
     "to":"to",
     "at":"at",
     "time":"Time",
-    "send_now":"send now"
+    "send_now":"Send now"
   },
   "transaction":{
     "show_part": "The last <strong>{count}</strong> transactions",
@@ -39,27 +39,27 @@
   },
   "site": {
     "login": {
-      "community":"You are the community",
-      "remember":"Remember me",
+      "community":"A thousand thanks for being with us!",
+      "remember":"Remember password",
       "signin":"Sign in",
       "forgot_pwd":"Forgot password?",
-      "new_wallet":"Create new wallet"
+      "new_wallet":"Create new account"
     },
     "signup": {
-      "title": "Create your Gradido Wallet",
+      "title": "Create your Gradido account",
       "subtitle": "Become a part of the community!",
-      "strength":"password strength:",
+      "strength":"Password strength:",
       "strong":"strong",
-      "agree":"I have read and understood and agree to them the"
+      "agree":"I have read and understood and agree to them"
     },
     "password": {
-      "title": "reset password",
-      "subtitle": "If you have forgotten the password or want to change it.",
-      "reset_now": "reset now"
+      "title": "Reset password",
+      "subtitle": "If you have forgotten your password, you can reset it here.",
+      "reset_now": "Reset now"
     },
     "thx": {
-      "title": "Thank you",
-      "subtitle": "We have sent you an eMail."
+      "title": "Thank you!",
+      "subtitle": "We have sent you an email."
     },
     "overview":{
       "account_overview":"Account overview",
@@ -68,42 +68,29 @@
       "add_work":"New Community Contribution"
     },
     "navbar" : {
-      "my-profil":"My Profil",
+      "my-profil":"My profile",
       "settings":"Settings",
       "activity":"Activity",
       "support":"Support"
     },
     "sidebar" : {
-       "community":"Community",
-       "members_area":"Members area",
-       "membership":"Membership"
+      "community":"Community",
+      "members_area":"Members area",
+      "membership":"Membership",
+      "language":"Languages"
     },
     "landing1" : {
-        "explore":"Explore Gradido",
-        "text":"If you want to get inspiration or just show something directly to your clients, you can jump start your development with our pre-built example pages.",
-        "link":"Explore pages"
+      "explore":"Explore Gradido",
+      "text":"Healthy money for a healthy world — the Gradido model can create global prosperity and peace",
+      "link":"Explore pages"
     },
     "404" : {
-       "ooops" : "Ooops!",
-       "text" : "Page not found. Don't worry though, we have plenty of other pages to explore",
-       "back" : "Back to dashboard!"
+      "ooops" : "Ooops!",
+      "text" : "Page not found. Do not worry though, we have plenty of other pages to explore",
+      "back" : "Back to dashboard!"
     }    
-},
-"admin": {
-  "site": {
-    "overview": {
-      "creation": "Creation",
-      "transience" : "Transience",
-      "exchanged": "Exchanged",
-      "members" : "Members"
-    }
-  }
-},
+  },
   "nav": {
     "features": "Features"
-  },
-  "about": {
-    "title": "About",
-    "content": "Lorem ipsum english dolor sit amet consectetur adipisicing elit. Aut dicta incidunt ea ut commodi quidem temporibus illo quia. Et itaque deleniti veniam tempore facere ipsum animi totam culpa minima vel voluptatem adipisci natus blanditiis similique sunt expedita, ex dicta doloremque repellat vitae temporibus. Quisquam quia, accusantium blanditiis architecto facilis saepe! Lorem ipsum dolor sit amet consectetur adipisicing elit. Ad unde laborum ut suscipit iure aliquam sapiente doloribus exercitationem nam sint."
   }
 }

frontend/src/main.js

@@ -1,20 +1,20 @@
-import Vue from 'vue';
-import DashboardPlugin from './plugins/dashboard-plugin';
-import App from './App.vue';
-import i18n from './i18n.js';
-import VueCookies from 'vue-cookies';
+import Vue from 'vue'
+import DashboardPlugin from './plugins/dashboard-plugin'
+import App from './App.vue'
+import i18n from './i18n.js'
+import VeeValidate from './vee-validate.js'
+import VueCookies from 'vue-cookies'
 
 // store
-import {store} from './store/store';
+import { store } from './store/store'
 
 // router setup
-import router from './routes/router';
+import router from './routes/router'
 
 // plugin setup
-Vue.use(DashboardPlugin);
-Vue.config.productionTip = false;
-Vue.use(VueCookies);
-
+Vue.use(DashboardPlugin)
+Vue.config.productionTip = false
+Vue.use(VueCookies)
 
 /* eslint-disable no-new */
 new Vue({
@@ -22,5 +22,5 @@ new Vue({
   router,
   store,
   i18n,
-  render: h => h(App) 
-});
+  render: (h) => h(App),
+})

frontend/src/plugins/dashboard-plugin.js

@@ -1,67 +1,67 @@
 // Polyfills for js features used in the Dashboard but not supported in some browsers (mainly IE)
-import '@/polyfills';
+import '@/polyfills'
 // Notifications plugin. Used on Notifications page
-import Notifications from '@/components/NotificationPlugin';
+import Notifications from '@/components/NotificationPlugin'
 // Validation plugin used to validate forms
-import { configure } from 'vee-validate';
+import { configure } from 'vee-validate'
 // A plugin file where you could register global components used across the app
-import GlobalComponents from './globalComponents';
+import GlobalComponents from './globalComponents'
 // A plugin file where you could register global directives
-import GlobalDirectives from './globalDirectives';
+import GlobalDirectives from './globalDirectives'
 // Sidebar on the right. Used as a local plugin in DashboardLayout.vue
-import SideBar from '@/components/SidebarPlugin';
+import SideBar from '@/components/SidebarPlugin'
 
 // element ui language configuration
-import lang from 'element-ui/lib/locale/lang/en';
-import locale from 'element-ui/lib/locale';
-locale.use(lang);
+import lang from 'element-ui/lib/locale/lang/en'
+import locale from 'element-ui/lib/locale'
+locale.use(lang)
 
 // vue-bootstrap
 import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
 
 // asset imports
-import '@/assets/scss/argon.scss';
-import '@/assets/vendor/nucleo/css/nucleo.css';
-import { extend } from 'vee-validate';
-import * as rules from 'vee-validate/dist/rules';
-import { messages } from 'vee-validate/dist/locale/en.json';
+import '@/assets/scss/argon.scss'
+import '@/assets/vendor/nucleo/css/nucleo.css'
+import { extend } from 'vee-validate'
+import * as rules from 'vee-validate/dist/rules'
+import { messages } from 'vee-validate/dist/locale/en.json'
 
-import VueQrcodeReader from "vue-qrcode-reader";
-import VueQrcode from "vue-qrcode";
+import VueQrcodeReader from 'vue-qrcode-reader'
+import VueQrcode from 'vue-qrcode'
 
+import VueFlatPickr from 'vue-flatpickr-component'
 
-import VueGoodTablePlugin from 'vue-good-table';
+import VueGoodTablePlugin from 'vue-good-table'
 // import the styles
-import 'vue-good-table/dist/vue-good-table.css';
+import 'vue-good-table/dist/vue-good-table.css'
 
-import VueMoment from 'vue-moment';
+import VueMoment from 'vue-moment'
 
-Object.keys(rules).forEach(rule => {
+Object.keys(rules).forEach((rule) => {
   extend(rule, {
     ...rules[rule], // copies rule configuration
-    message: messages[rule] // assign message
-  });
-});
+    message: messages[rule], // assign message
+  })
+})
 export default {
   install(Vue) {
-    Vue.use(GlobalComponents);
-    Vue.use(GlobalDirectives);
-    Vue.use(SideBar);
-    Vue.use(Notifications);
-    Vue.use(BootstrapVue);
-    Vue.use(IconsPlugin);
-    Vue.use(VueGoodTablePlugin);
-    Vue.use(VueMoment);
-    Vue.use(VueQrcodeReader);
-    Vue.use(VueQrcode);
+    Vue.use(GlobalComponents)
+    Vue.use(GlobalDirectives)
+    Vue.use(SideBar)
+    Vue.use(Notifications)
+    Vue.use(BootstrapVue)
+    Vue.use(IconsPlugin)
+    Vue.use(VueGoodTablePlugin)
+    Vue.use(VueMoment)
+    Vue.use(VueQrcodeReader)
+    Vue.use(VueQrcode)
+    Vue.use(VueFlatPickr)
     configure({
       classes: {
         valid: 'is-valid',
         invalid: 'is-invalid',
         dirty: ['is-dirty', 'is-dirty'], // multiple classes per flag!
-      }
+      },
     })
-  }
-};
-
-
+  },
+}

frontend/src/plugins/globalComponents.js

@@ -1,45 +1,45 @@
-import BaseInput from '@/components/Inputs/BaseInput.vue';
-import BaseDropdown from '@/components/BaseDropdown.vue';
-import Card from '@/components/Cards/Card.vue';
-import Modal from '@/components/Modal.vue';
-import StatsCard from '@/components/Cards/StatsCard.vue';
-import BaseButton from '@/components/BaseButton.vue';
-import Badge from '@/components/Badge.vue';
-import BaseCheckbox from '@/components/Inputs/BaseCheckbox.vue';
-import BaseRadio from "@/components/Inputs/BaseRadio";
-import BaseProgress from "@/components/BaseProgress";
-import BasePagination from "@/components/BasePagination";
-import BaseAlert from "@/components/BaseAlert";
-import BaseNav from "@/components/Navbar/BaseNav";
-import BaseHeader from '@/components/BaseHeader';
-import { ValidationProvider, ValidationObserver } from 'vee-validate';
-import { Input, Tooltip, Popover } from 'element-ui';
+import BaseInput from '@/components/Inputs/BaseInput.vue'
+import BaseDropdown from '@/components/BaseDropdown.vue'
+import Card from '@/components/Cards/Card.vue'
+import Modal from '@/components/Modal.vue'
+import StatsCard from '@/components/Cards/StatsCard.vue'
+import BaseButton from '@/components/BaseButton.vue'
+import Badge from '@/components/Badge.vue'
+import BaseCheckbox from '@/components/Inputs/BaseCheckbox.vue'
+import BaseRadio from '@/components/Inputs/BaseRadio'
+import BaseProgress from '@/components/BaseProgress'
+import BasePagination from '@/components/BasePagination'
+import BaseAlert from '@/components/BaseAlert'
+import BaseNav from '@/components/Navbar/BaseNav'
+import BaseHeader from '@/components/BaseHeader'
+import { ValidationProvider, ValidationObserver } from 'vee-validate'
+import { Input, Tooltip, Popover } from 'element-ui'
 /**
  * You can register global components here and use them as a plugin in your main Vue instance
  */
 
 const GlobalComponents = {
   install(Vue) {
-    Vue.component(Badge.name, Badge);
-    Vue.component(BaseAlert.name, BaseAlert);
-    Vue.component(BaseButton.name, BaseButton);
-    Vue.component(BaseCheckbox.name, BaseCheckbox);
-    Vue.component(BaseHeader.name, BaseHeader);
-    Vue.component(BaseInput.name, BaseInput);
-    Vue.component(BaseDropdown.name, BaseDropdown);
-    Vue.component(BaseNav.name, BaseNav);
-    Vue.component(BasePagination.name, BasePagination);
-    Vue.component(BaseProgress.name, BaseProgress);
-    Vue.component(BaseRadio.name, BaseRadio);
-    Vue.component(Card.name, Card);
-    Vue.component(Modal.name, Modal);
-    Vue.component(StatsCard.name, StatsCard);
-    Vue.component(Input.name, Input);
+    Vue.component(Badge.name, Badge)
+    Vue.component(BaseAlert.name, BaseAlert)
+    Vue.component(BaseButton.name, BaseButton)
+    Vue.component(BaseCheckbox.name, BaseCheckbox)
+    Vue.component(BaseHeader.name, BaseHeader)
+    Vue.component(BaseInput.name, BaseInput)
+    Vue.component(BaseDropdown.name, BaseDropdown)
+    Vue.component(BaseNav.name, BaseNav)
+    Vue.component(BasePagination.name, BasePagination)
+    Vue.component(BaseProgress.name, BaseProgress)
+    Vue.component(BaseRadio.name, BaseRadio)
+    Vue.component(Card.name, Card)
+    Vue.component(Modal.name, Modal)
+    Vue.component(StatsCard.name, StatsCard)
+    Vue.component(Input.name, Input)
     Vue.component('validation-provider', ValidationProvider)
     Vue.component('validation-observer', ValidationObserver)
-    Vue.use(Tooltip);
-    Vue.use(Popover);
-  }
-};
+    Vue.use(Tooltip)
+    Vue.use(Popover)
+  },
+}
 
-export default GlobalComponents;
+export default GlobalComponents

frontend/src/plugins/globalDirectives.js

@@ -1,4 +1,4 @@
-import clickOutside from '@/directives/click-ouside.js';
+import clickOutside from '@/directives/click-ouside.js'
 
 /**
  * You can register global directives here and use them as a plugin in your main Vue instance
@@ -6,8 +6,8 @@ import clickOutside from '@/directives/click-ouside.js';
 
 const GlobalDirectives = {
   install(Vue) {
-    Vue.directive('click-outside', clickOutside);
-  }
-};
+    Vue.directive('click-outside', clickOutside)
+  },
+}
 
-export default GlobalDirectives;
+export default GlobalDirectives

frontend/src/routes/router.js

@@ -8,24 +8,23 @@ Vue.use(VueRouter)
 const router = new VueRouter({
   routes, // short for routes: routes
   linkActiveClass: 'active',
-  scrollBehavior: (to, from ,savedPosition) => {
+  scrollBehavior: (to, from, savedPosition) => {
     if (savedPosition) {
-      return savedPosition;
+      return savedPosition
     }
     if (to.hash) {
       return { selector: to.hash }
     }
     return { x: 0, y: 0 }
-  }
-});
+  },
+})
 
 router.beforeEach((to, from, next) => {
- 
   let language = to.params.lang
-     if (!language) {
-       language = 'de'
-     }
-     next()  
+  if (!language) {
+    language = 'de'
+  }
+  next()
 })
 
 export default router

frontend/src/routes/routes.js

@@ -1,10 +1,8 @@
-import DashboardLayout from '@/views/Layout/DashboardLayout.vue'
+import DashboardLayout from '@/views/Layout/DashboardLayout_gdd.vue'
 import AuthLayoutGDD from '@/views/Layout/AuthLayout_gdd.vue'
-import AuthLayout from '@/views/Layout/AuthLayout.vue'
 
 import NotFound from '@/views/NotFoundPage.vue'
 
-
 const routes = [
   {
     path: '/',
@@ -13,73 +11,58 @@ const routes = [
     children: [
       {
         path: '/login',
-        component: () => import('../views/Pages/Login.vue')
+        component: () => import('../views/Pages/Login.vue'),
       },
       {
         path: '/thx',
-        component: () => import('../views/Pages/thx.vue')
+        component: () => import('../views/Pages/thx.vue'),
       },
       {
         path: '/register',
-        component: () => import('../views/Pages/Register.vue')
+        component: () => import('../views/Pages/Register.vue'),
       },
       {
         path: '/password',
-        component: () => import('../views/Pages/Password.vue')
-      }
-    ]
+        component: () => import('../views/Pages/Password.vue'),
+      },
+      {
+        path: '/explorer',
+        name: 'Explorer',
+        component: () => import('../views/Pages/Explorer.vue'),
+      },
+    ],
   },
   {
     path: '/',
-    redirect: 'KontoOverview',
+    redirect: 'overview',
     component: DashboardLayout,
     children: [
       {
-        path: '/KontoOverview',
+        path: '/overview',
         component: () => import('../views/KontoOverview.vue'),
         meta: {
-          requiresAuth: true
-        }
+          requiresAuth: true,
+        },
       },
       {
         path: '/profile',
-        component: () => import('../views/Pages/UserProfileCard.vue')
+        component: () => import('../views/Pages/UserProfileCard.vue'),
       },
       {
         path: '/profileedit',
-        component: () => import('../views/Pages/UserProfileEdit.vue')
+        component: () => import('../views/Pages/UserProfileEdit.vue'),
       },
       {
         path: '/activity',
-        component: () => import('../views/Pages/UserProfileActivity.vue')
-      }
-    ]
-  },
-  ,
-  {
-    path: '/',
-    redirect: 'AdminOverview',
-    component: AuthLayout,
-    children: [
+        component: () => import('../views/Pages/UserProfileActivity.vue'),
+      },
       {
-        path: '/AdminOverview',
-        name: 'Adminübersicht',
-        component: () => import('../views/AdminOverview.vue'),
-        meta: {
-          requiresAuth: true
-        }
-      }
-    ]
+        path: '/transactions',
+        component: () => import('../views/Pages/UserProfileTransactionList.vue'),
+      },
+    ],
   },
-  {
-    path: '/',
-    redirect: 'login',
-    component: AuthLayout,
-    children: [
+  { path: '*', component: NotFound },
+]
 
-      { path: '*', component: NotFound }
-    ]
-  }
-];
-
-export default routes;
+export default routes

frontend/src/routes/starterRouter.js

@@ -1,33 +0,0 @@
-import Vue from 'vue';
-import Router from 'vue-router';
-import DashboardLayout from '../views/Starter/SampleLayout.vue';
-import Starter from '../views/Starter/SamplePage.vue';
-
-Vue.use(Router);
-
-export default new Router({
-  routes: [
-    {
-      path: '/',
-      name: 'home',
-      redirect: '/dashboard',
-      component: DashboardLayout,
-      children: [
-        {
-          path: 'dashboard',
-          name: 'dashboard',
-          components: { default: Starter }
-        }
-      ]
-    }
-  ],
-  scrollBehavior: (to, from ,savedPosition) => {
-    if (savedPosition) {
-      return savedPosition;
-    }
-    if (to.hash) {
-      return { selector: to.hash };
-    }
-    return { x: 0, y: 0 };
-  }
-});

frontend/src/store/store.js

@@ -4,138 +4,130 @@ Vue.use(Vuex)
 import router from '../routes/router.js'
 import loginAPI from '../apis/loginAPI'
 import communityAPI from '../apis/communityAPI'
-import axios from 'axios'
-
 
 export const store = new Vuex.Store({
   state: {
     session_id: null,
-    email: null,
-    user : {
-      name:"",
+    email: '',
+    language: 'en',
+    sizeDE: 'normal',
+    sizeGB: 'big',
+    loginfail: false,
+    user: {
+      name: '',
       balance: 0,
-      balance_gdt: 0
+      balance_gdt: 0,
     },
-    ajaxCreateData:  {
-      session_id : '',
-      email: "",
-      amount: 0,
-      target_date:"2021-02-19T13:25:36+00:00", 
-      memo:"",
-      auto_sign: true
+    modals: false,
+    optionAxios: {
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Credentials': 'true',
+      },
     },
-    transactions: [],
-    modals: false
-  },
-  // Retrieve a state variable
-  getters: {
-    //isLoggedIn: (state /*, getters */) => {
-    //  return state.session_id !== null;
-    //}
   },
+  getters: {},
   // Syncronous mutation of the state
   mutations: {
+    language: (state, language) => {
+      //console.log('mutation: language', language)
+      state.language = language
+      $cookies.set('gdd_lang', language)
+      if (state.language == 'de') {
+        state.sizeDE = 'big'
+        state.sizeGB = 'normal'
+      } else {
+        state.sizeDE = 'normal'
+        state.sizeGB = 'big'
+      }
+    },
+    loginfail: (state, loginfail) => {
+      //console.log('mutation: email')
+      state.loginfail = loginfail
+    },
     email: (state, email) => {
       //console.log('mutation: email')
       state.email = email
     },
-    session_id: (state,session_id) => {
+    session_id: (state, session_id) => {
       //console.log('mutation: session_id')
       state.session_id = session_id
     },
-    user_balance: (state,balance) => {
+    user_balance: (state, balance) => {
       //console.log('mutation: user_balance')
-      state.user.balance = (balance)/10000
+      state.user.balance = balance / 10000
     },
-    user_balance_gdt: (state,balance) => {
+    user_balance_gdt: (state, balance) => {
       //console.log('mutation: user_balance_gdt')
-      state.user.balance_gdt = (balance)/10000
+      state.user.balance_gdt = balance / 10000
     },
-    transactions: (state,transactions) => {
-      //console.log('mutation: transactions')
-      state.transactions = transactions
-    }
   },
   // Asyncronous actions - used for api calls
   actions: {
     login: async ({ dispatch, commit }, data) => {
-      console.log('action: login')
-      const result = await loginAPI.login(data.email,data.password)
-      console.log('result',result)
-      console.log('result.success',result.success)
-      if( result.success ){
+      const result = await loginAPI.login(data.email, data.password)
+      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('/KontoOverview')
+        $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
-        dispatch('logout')
+        //alert('>>>>> FAIl LOGIN')
+        commit('loginfail', true)
+
+        //dispatch('logout')
       }
     },
     passwordReset: async (data) => {
-      console.log("<<<<<<<<<<< PASSWORT RESET TODO >>>>>>>>>>>", data.email)
+      //console.log('<<<<<<<<<<< PASSWORT RESET TODO >>>>>>>>>>>', data.email)
     },
     schoepfen: async (data) => {
-       // http://localhost/transaction-creations/ajaxCreate
+      // http://localhost/transaction-creations/ajaxCreate
     },
     createUser: async ({ commit, dispatch }, data) => {
-      console.log('action: createUser')
-      const result = await loginAPI.create(data.email,data.first_name,data.last_name,data.password)
-      if( result.success ){
+      // console.log('action: createUser')
+      const result = await loginAPI.create(
+        data.email,
+        data.first_name,
+        data.last_name,
+        data.password,
+      )
+      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('/KontoOverview')
+        $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
+        // console.log('action createUser to  logout start')
         dispatch('logout')
       }
     },
-    logout: async ({ commit , state }) => {
-      console.log('action: logout')
-      // Are we actually logged in?
-      if(state.session_id){
+    logout: async ({ commit, state }) => {
+      //console.log('action: logout')
+      if (state.session_id) {
         const result = await loginAPI.logout(state.session_id)
         // The result can be error, but thats ok with us
       }
 
       commit('session_id', null)
       commit('email', null)
-      $cookies.remove('gdd_session_id');
-      $cookies.remove('gdd_u');
+      $cookies.remove('gdd_session_id')
+      $cookies.remove('gdd_u')
+      $cookies.remove('gdd_lang')
       router.push('/Login')
     },
-    ajaxCreate: async ({ dispatch, state }) => {
-      //console.log('action: ajaxCreate')
-      state.ajaxCreateData.amount = (state.ajaxCreateData.amount)*10000
-      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);
-      });
-    },
-    ajaxListTransactions: async ({commit, dispatch, state}) => {
-     // console.log('action: ajaxListTransactions', state.session_id)
-     // const result = await communityAPI.transactions(state.session_id)     
-    },
     accountBalance: async ({ commit, dispatch, state }) => {
-      //console.log('action: accountBalance')
-      const result = await communityAPI.balance(state.session_id)
-      //console.log(result)
-      if(result.success) {
+      const result = await communityAPI.balance($cookies.get('gdd_session_id'))
+      if (result.success) {
         commit('user_balance', result.result.data.balance)
       } else {
         dispatch('logout')
       }
-    }
-  }  
+    },
+  },
 })

frontend/src/util/throttle.js

@@ -4,12 +4,12 @@
  * @param [timeout] the throttle interval
  */
 export function throttle(handlerFunc, timeout = 66) {
-  let resizeTimeout;
+  let resizeTimeout
   if (!resizeTimeout) {
     resizeTimeout = setTimeout(() => {
-      resizeTimeout = null;
-      handlerFunc();
+      resizeTimeout = null
+      handlerFunc()
       // The actualResizeHandler will execute at a rate of 15fps
-    }, timeout);
+    }, timeout)
   }
 }

frontend/src/vee-validate.js

@@ -0,0 +1,25 @@
+import { configure, extend } from 'vee-validate'
+import { required, email, min } from 'vee-validate/dist/rules'
+import i18n from './i18n'
+
+configure({
+  defaultMessage: (field, values) => {
+    values._field_ = i18n.t(`fields.${field}`)
+    return i18n.t(`validations.messages.${values._rule_}`, values)
+  },
+})
+
+extend('email', {
+  ...email,
+  message: (_, values) => i18n.t('validations.messages.email', values),
+})
+
+extend('required', {
+  ...required,
+  message: (_, values) => i18n.t('validations.messages.required', values),
+})
+
+extend('min', {
+  ...min,
+  message: (_, values) => i18n.t('validations.messages.min', values),
+})