From 64d153a245d5b96202c576eaf5d50891ef447247 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 24 Feb 2021 15:23:15 +0100
Subject: [PATCH 1/4] add axios for gdd balance

---
 frontend/src/store/store.js          | 37 ++++++++++++++++++++++------
 frontend/src/views/KontoOverview.vue |  5 ++++
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index b97bf47a1..d330e2e2b 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -12,11 +12,12 @@ export const store = new Vuex.Store({
     is_admin: false,
     active: false,
     modals: false,
+    url: "",
     user : {
       name:"",
-      email:""
-    },
-    dataLogout: {"session_id": -127182}
+      email:"",
+      sessionID: 0
+    }
   },
   mutations: {   
     isActive(state) {
@@ -31,14 +32,16 @@ export const store = new Vuex.Store({
          
         //console.log("Im Store LOGIN() axios then.statusText ", ldata.statusText);
         if (ldata.statusText === "OK") {          
-          console.log("STORE login() ldatasession_id",  ldata.data.session_id)                
+            //console.log("STORE login() ldatasession_id",  ldata.data.session_id)                
             state.is_auth = true 
             state.active = true
+            state.user.sessionID = ldata.data.session_id
+            state.user.email = logindata.email
             $cookies.set('gdd_is_auth','true');
             $cookies.set('gdd_session_id', ldata.data.session_id);
             $cookies.set('gdd_email',logindata.email);
-            state.user.email = logindata.email
-     
+            console.log("cookie ? GRADIDO_LOGIN",  $cookies.get('GRADIDO_LOGIN'))  
+           
             //console.log("STORE login() to " + state.is_auth)      
             router.push('/KontoOverview')
            
@@ -71,7 +74,7 @@ export const store = new Vuex.Store({
       });
     },     
     logout(state){
-      axios.post("http://localhost/login_api/logout", this.dataLogout).then((ldata) => {
+      axios.post("http://localhost/login_api/logout", {"session_id": state.user.sessionID}).then((ldata) => {
          
       //console.log("Im Store logout() axios then ", ldata);
        // this.ldata = ldata.data;
@@ -79,6 +82,8 @@ export const store = new Vuex.Store({
         state.is_auth = false 
         state.is_admin = false 
         state.active = false
+        state.user.sessionID = ''
+        state.user.email = ''
         $cookies.set('gdd_is_auth','false');
         $cookies.remove('gdd_email');
         $cookies.remove('gdd_session_id');
@@ -87,6 +92,24 @@ export const store = new Vuex.Store({
         console.log(error);
       });
         
+    },
+    accountBalance0(state) {
+      console.log("accountBalance0 => START")
+      axios.get("http://localhost/state-balances/ajaxGetBalance/739420303").then((req) => {
+        console.log("accountBalance => ", req)
+      }, (error) => {
+        console.log(error);
+      });
+    },
+    accountBalance1(state) {
+      console.log("accountBalance1 => START")
+      state.url = "http://localhost/state-balances/ajaxGetBalance/"+ state.user.sessionID
+      console.log(state.url)
+      axios.get(state.url).then((req) => {
+        console.log("accountBalance => ", req)
+      }, (error) => {
+        console.log(error);
+      });
     }
   }
 })
\ No newline at end of file
diff --git a/frontend/src/views/KontoOverview.vue b/frontend/src/views/KontoOverview.vue
index b568bf8f0..ce5ef6985 100644
--- a/frontend/src/views/KontoOverview.vue
+++ b/frontend/src/views/KontoOverview.vue
@@ -30,6 +30,8 @@
        
       </div>
     </base-header>
+    <div @click="$store.commit('accountBalance0')">this.$store.commit('accountBalance0')</div>
+    <div @click="$store.commit('accountBalance1')">this.$store.commit('accountBalance1')</div>
      <hr>
     <h3>User Data</h3>
     <small>/public/json-example/userdata.json</small>
@@ -80,6 +82,9 @@
         GddAddWork,
         GddWorkTable,
         axios
+     },
+     created() {
+        
      },
      methods: {
          UserData() {

From fb0a8500571f8786e16d696f6bd72b7078198910 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 25 Feb 2021 15:15:39 +0100
Subject: [PATCH 2/4] loginAPI.js change mathods to actions

---
 frontend/src/mixins/loginAPI.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/mixins/loginAPI.js b/frontend/src/mixins/loginAPI.js
index 69c5e1441..d102f381d 100644
--- a/frontend/src/mixins/loginAPI.js
+++ b/frontend/src/mixins/loginAPI.js
@@ -3,7 +3,7 @@ const LOGIN_API_URL = 'http://localhost/login_api/'
 
 // define a mixin object
 const loginAPI = {
-  mutations: {
+  actions: {
     login: async () => {
       return axios.post(LOGIN_API_URL + 'unsecureLogin', data);
     },

From da1cb4e7b6e77745a7d63e6b096952669b6103be Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 25 Feb 2021 15:22:47 +0100
Subject: [PATCH 3/4] merge master

---
 frontend/src/store/store.js                    | 14 ++++++++------
 frontend/src/views/KontoOverview.vue           | 14 ++++++++++----
 frontend/src/views/KontoOverview/GddStatus.vue | 13 +++++++++----
 login_server                                   |  2 +-
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index d330e2e2b..82a25c42c 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -16,7 +16,8 @@ export const store = new Vuex.Store({
     user : {
       name:"",
       email:"",
-      sessionID: 0
+      sessionID: 0,
+      balance: 0
     }
   },
   mutations: {   
@@ -30,7 +31,7 @@ export const store = new Vuex.Store({
       //console.log("logon TEST =>", logindata )  
       axios.post("http://localhost/login_api/unsecureLogin", logindata).then((ldata) => {
          
-        //console.log("Im Store LOGIN() axios then.statusText ", ldata.statusText);
+        console.log("Im Store LOGIN() axios then.statusText ", ldata);
         if (ldata.statusText === "OK") {          
             //console.log("STORE login() ldatasession_id",  ldata.data.session_id)                
             state.is_auth = true 
@@ -41,7 +42,7 @@ export const store = new Vuex.Store({
             $cookies.set('gdd_session_id', ldata.data.session_id);
             $cookies.set('gdd_email',logindata.email);
             console.log("cookie ? GRADIDO_LOGIN",  $cookies.get('GRADIDO_LOGIN'))  
-           
+            //this.$store.commit('accountBalance')
             //console.log("STORE login() to " + state.is_auth)      
             router.push('/KontoOverview')
            
@@ -101,12 +102,13 @@ export const store = new Vuex.Store({
         console.log(error);
       });
     },
-    accountBalance1(state) {
-      console.log("accountBalance1 => START")
+    accountBalance(state) {
+      console.log(" => START")
       state.url = "http://localhost/state-balances/ajaxGetBalance/"+ state.user.sessionID
       console.log(state.url)
       axios.get(state.url).then((req) => {
-        console.log("accountBalance => ", req)
+        console.log("accountBalance => ", req.data.balance)
+        state.user.balance = req.data.balance
       }, (error) => {
         console.log(error);
       });
diff --git a/frontend/src/views/KontoOverview.vue b/frontend/src/views/KontoOverview.vue
index ce5ef6985..8ad94fe3a 100644
--- a/frontend/src/views/KontoOverview.vue
+++ b/frontend/src/views/KontoOverview.vue
@@ -31,12 +31,18 @@
       </div>
     </base-header>
     <div @click="$store.commit('accountBalance0')">this.$store.commit('accountBalance0')</div>
-    <div @click="$store.commit('accountBalance1')">this.$store.commit('accountBalance1')</div>
+    <div @click="$store.commit('accountBalance')">this.$store.commit('accountBalance')</div> 
      <hr>
-    <h3>User Data</h3>
-    <small>/public/json-example/userdata.json</small>
+    <h3>User Balanace</h3>
+    <small>this.$store.state.user.balance</small>
     <p>
-      {{userdata}}
+       {{this.$store.state.user}}
+    </p>
+     <hr>
+    <h3>User Balanace</h3>
+    <small>this.$store.state.user.balance</small>
+    <p>
+      {{this.$store.state.user.balance}}
     </p>
 
  <hr>
diff --git a/frontend/src/views/KontoOverview/GddStatus.vue b/frontend/src/views/KontoOverview/GddStatus.vue
index 1b0985665..87825d232 100644
--- a/frontend/src/views/KontoOverview/GddStatus.vue
+++ b/frontend/src/views/KontoOverview/GddStatus.vue
@@ -4,13 +4,12 @@
         <b-col xl="6" md="6">
           <stats-card :title="$t('site.overview.current_balance')"
                       type="gradient-red"
-                      sub-title="3500,897 GDD"
+                      sub-title="balance_gdd"
                       img="img/icons/gradido/my_gradido.png"
                       class="mb-4">
-
+                {{ balance_gdd }} GDD
             <template slot="footer">
-              <span class="text-success mr-2">+ 3.48%</span>
-              <span class="text-nowrap">{{ $t('site.overview.since_last_month') }}</span>
+              <span class="text-success mr-2">{{ balance_gtt }} GTT</span>
             </template>
           </stats-card>
         </b-col>
@@ -34,5 +33,11 @@
 <script>
 export default {
   name: 'GddStatus',
+  data(){
+    return {
+      balance_gdd: this.$store.state.user.balance,
+      balance_gtt: 2000,
+    }
+  }
 };
 </script>
\ No newline at end of file
diff --git a/login_server b/login_server
index 2a033c34e..9b9115290 160000
--- a/login_server
+++ b/login_server
@@ -1 +1 @@
-Subproject commit 2a033c34e4657e84a4387ecfda1cd6102032e95e
+Subproject commit 9b9115290c8d2ead756d64b70ae63a6571aa4693

From ceb4dda6fa24694c436bcc151d66a2291145869f Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Fri, 26 Feb 2021 11:53:19 +0100
Subject: [PATCH 4/4] style step I

---
 frontend/src/App.vue                  |  2 +-
 frontend/src/routes/routes.js         | 23 ++++++------
 frontend/src/store/store.js           | 29 ++++++++++++----
 frontend/src/views/KontoOverview.vue  |  3 +-
 frontend/src/views/Pages/Login.vue    | 50 ++++++++++++++++-----------
 frontend/src/views/Pages/Register.vue | 48 ++++++++++++++++++-------
 6 files changed, 103 insertions(+), 52 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index b4c26ef8e..a7658a130 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -22,7 +22,7 @@ export default {
          this.$router.push('/KontoOverview') 
         // }
      }else {
-       this.$router.push("/Landing")
+       this.$router.push("/Login")
      } 
       
       //var user = { id:1, name:'Journal',session:'25j_7Sl6xDq2Kc3ym0fmrSSk2xV2XkUkX' };
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index c571acc30..1ce4875a1 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -11,17 +11,21 @@ const routes = [
     redirect: 'landing',
     component: AuthLayoutGDD,
     children: [
-      {
-        path: '/Landing',
-        name: 'Landing',
-        component: () => import(/* webpackChunkName: "demo" */ '../views/Landing.vue')
-      },
       {
         path: '/login',
         name: 'login',
         component: () => import(/* webpackChunkName: "demo" */ '../views/Pages/Login.vue')
       },
-      
+      {
+        path: '/Landing',
+        name: 'Landing',
+        component: () => import(/* webpackChunkName: "demo" */ '../views/Landing.vue')
+      },      
+      {
+        path: '/register',
+        name: 'register',
+        component: () => import(/* webpackChunkName: "demo" */ '../views/Pages/Register.vue')
+      },
     ]
   },
   {
@@ -41,12 +45,7 @@ const routes = [
         path: '/profile',
         name: 'profile',
         component: () => import(/* webpackChunkName: "demo" */ '../views/Pages/UserProfile.vue')
-      },
-      {
-        path: '/register',
-        name: 'register',
-        component: () => import(/* webpackChunkName: "demo" */ '../views/Pages/Register.vue')
-      },
+      }
     ]
   },
   ,
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 82a25c42c..902004594 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -18,6 +18,14 @@ export const store = new Vuex.Store({
       email:"",
       sessionID: 0,
       balance: 0
+    },
+    ajaxCreateData:  {
+      session_id : '',
+      email: "max.musterman@gmail.de",
+      amount: 10000000,
+      target_date:"2021-02-19T13:25:36+00:00", 
+      memo:"AGE",
+      auto_sign: true
     }
   },
   mutations: {   
@@ -68,7 +76,7 @@ export const store = new Vuex.Store({
          
          console.log("Im Store creatUser() axios then ", ldata);
          // this.ldata = ldata.data;
-         return true
+         router.push('/Login')
          
       }, (error) => {
         console.log(error);
@@ -88,16 +96,25 @@ export const store = new Vuex.Store({
         $cookies.set('gdd_is_auth','false');
         $cookies.remove('gdd_email');
         $cookies.remove('gdd_session_id');
-        router.push('/Landing')
+        router.push('/Login')
       }, (error) => {
         console.log(error);
       });
         
     },
-    accountBalance0(state) {
-      console.log("accountBalance0 => START")
-      axios.get("http://localhost/state-balances/ajaxGetBalance/739420303").then((req) => {
-        console.log("accountBalance => ", req)
+    ajaxCreate(state){
+      state.ajaxCreateData.session_id = state.user.sessionID
+      console.log(" state.ajaxCreateData => ",  state.ajaxCreateData)
+      axios.post(" http://localhost/transaction-creations/ajaxCreate/", state.ajaxCreateData).then((req) => {
+        console.log("ajaxCreate => ", req)
+      }, (error) => { 
+        console.log(error);
+      });
+    },
+    ajaxListTransactions(state) {
+      console.log("ajaxListTransactions => START")
+      axios.get("http://localhost/state-balances/ajaxListTransactions/"+ state.user.sessionID).then((req) => {
+        console.log("ajaxListTransactions => ", req)
       }, (error) => {
         console.log(error);
       });
diff --git a/frontend/src/views/KontoOverview.vue b/frontend/src/views/KontoOverview.vue
index 8ad94fe3a..6b7e2ded9 100644
--- a/frontend/src/views/KontoOverview.vue
+++ b/frontend/src/views/KontoOverview.vue
@@ -30,7 +30,8 @@
        
       </div>
     </base-header>
-    <div @click="$store.commit('accountBalance0')">this.$store.commit('accountBalance0')</div>
+    <div @click="$store.commit('ajaxCreate')">this.$store.commit('ajaxCreate')</div>
+    <div @click="$store.commit('ajaxListTransactions')">this.$store.commit('ajaxListTransactions')</div>
     <div @click="$store.commit('accountBalance')">this.$store.commit('accountBalance')</div> 
      <hr>
     <h3>User Balanace</h3>
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index b5f19cd2d..b4fac1b27 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -1,13 +1,23 @@
 <template>
   <div>
     <!-- Header -->
-    <div class="header bg-gradient-success py-7 py-lg-8 pt-lg-9">
-     
+    <div class="header bg-gradient-success py-7 py-lg-5 pt-lg-1">
+         <b-container class="container">
+        <div class="header-body text-center mb-7">
+          <b-row class="justify-content-center">
+            <b-col xl="5" lg="6" md="8" class="px-5">
+              <h1 class="text-white">Gradido Wallet</h1>
+              <p class="text-lead text-white">Du bist die Community</p>
+            </b-col>
+          </b-row>
+        </div>
+      </b-container>
       <div class="separator separator-bottom separator-skew zindex-100">
         <svg x="0" y="0" viewBox="0 0 2560 100" preserveAspectRatio="none" version="1.1"
              xmlns="http://www.w3.org/2000/svg">
           <polygon class="fill-default" points="2560 0 2560 100 0 100"></polygon>
         </svg>
+        
       </div>
     </div>
     <!-- Page content -->
@@ -15,21 +25,12 @@
       <b-row class="justify-content-center">
         <b-col lg="5" md="7">
           <b-card no-body class="bg-secondary border-0 mb-0">
-             
-            <b-card-header class="pb-1"  >
-                <video width="450" height="300" autoplay loop>
-                  <source src="/img/brand/cube.webm" type="video/webm">                  
-                    Your browser does not support the video tag.  
-                </video>
-            </b-card-header>
             <b-card-body class="px-lg-5 py-lg-5">
-              <div class="text-center text-muted mb-4">
-                <h2>Login Gradido Wallet</h2>
+              
+                <div class="text-center text-muted mb-4">
+                <small>login</small>
               </div>
-              <div class="text-center text-muted mb-4">
-                <h4>Login Server 1</h4>
-              </div>
-              <!--<validation-observer v-slot="{handleSubmit}" ref="formValidator">
+               <validation-observer v-slot="{handleSubmit}" ref="formValidator">
                 <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
                   <base-input alternative
                               class="mb-3"
@@ -55,7 +56,7 @@
                     <base-button type="primary" native-type="submit" class="my-4">Sign in</base-button>
                   </div>
                 </b-form>
-              </validation-observer> -->
+              </validation-observer>  
             </b-card-body>
           </b-card>
           <b-row class="mt-3">
@@ -78,14 +79,23 @@
         model: {
           email: '',
           password: '',
-          rememberMe: false
+          rememberMe: false,      
+          rfname: '',
+          rlname: '',
+          remail: '',
+          rpwd: ''
         }
       };
     },
-    methods: {
+    methods: {    
       onSubmit() {
-        // this will be called only after form is valid. You can do api call here to login
+        console.log("onSubmit()  ")        
+        console.log("this.email ",this.model.email)
+        console.log("this.password ",this.model.password)
+        //console.log("landingpage login() lemail  ", this.lemail)
+        //console.log("landingpage login()  lpwd ", this.lpwd)
+        this.$store.commit('login', {"email":  this.model.email, "password":  this.model.password})
       }
     }
-  };
+  }
 </script>
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 60637cb29..de238b90e 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <!-- Header -->
-    <div class="header bg-gradient-success py-7 py-lg-8 pt-lg-9">
+    <div class="header bg-gradient-success py-7 py-lg-5 pt-lg-1">
       <b-container class="container">
         <div class="header-body text-center mb-7">
           <b-row class="justify-content-center">
             <b-col xl="5" lg="6" md="8" class="px-5">
-              <h1 class="text-white">Erstelle eine Gradido Wallet</h1>
+              <h1 class="text-white">Erstelle deine Gradido Wallet</h1>
               <p class="text-lead text-white">Werde teil der Community</p>
             </b-col>
           </b-row>
@@ -25,23 +25,28 @@
       <b-row class="justify-content-center">
         <b-col lg="6" md="8" >
           <b-card no-body class="bg-secondary border-0">
-            <b-card-header class="bg-transparent pb-5">
-              <div class="text-muted text-center mt-2 mb-4"><small>Sign up with</small></div>
-            
-            </b-card-header>
+             
             <b-card-body class="px-lg-5 py-lg-5">
               <div class="text-center text-muted mb-4">
-                <small>Or sign up with credentials</small>
+                <small>sign up </small>
               </div>
               <validation-observer v-slot="{handleSubmit}" ref="formValidator">
                 <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
                   <base-input alternative
                               class="mb-3"
                               prepend-icon="ni ni-hat-3"
-                              placeholder="Name"
-                              name="Name"
+                              placeholder="Vorname"
+                              name="Vorname"
                               :rules="{required: true}"
-                              v-model="model.name">
+                              v-model="model.firstname">
+                  </base-input>
+                   <base-input alternative
+                              class="mb-3"
+                              prepend-icon="ni ni-hat-3"
+                              placeholder="Nachname"
+                              name="Nachname"
+                              :rules="{required: true}"
+                              v-model="model.lastname">
                   </base-input>
 
                   <base-input alternative
@@ -82,6 +87,17 @@
           </b-card>
         </b-col>
       </b-row>
+      <div class="text-center py-lg-5" >
+                    <b-button type="button" variant="success" class="mt-4" to="/Login">zurück</b-button>
+                  </div>
+
+                  <div>
+  <b-button v-b-modal.modal-1 variant="primary">Launch demo modal</b-button>
+
+  <b-modal id="modal-1" title="New message to undefined">
+    <p class="my-4">...</p>
+  </b-modal>
+</div>
     </b-container>
   </div>
 </template>
@@ -92,7 +108,8 @@
     data() {
       return {
         model: {
-          name: '',
+          firstname: '',
+          lastname: '',
           email: '',
           password: '',
           agree: false
@@ -102,9 +119,16 @@
     methods: {
       onSubmit() {
         // this will be called only after form is valid. You can do an api call here to register users
+          
+      console.log("onSubmit()  ")
+       console.log("landingpage login() email  ", this.model.email)
+       console.log("landingpage login()  firstname ", this.model.firstname)
+       console.log("landingpage login()  lastname ", this.model.lastname)
+       console.log("landingpage login()  password ", this.model.password)
+       this.$store.commit('creatUser', {"email":this.model.email, "first_name":this.model.firstname, "last_name":this.model.lastname , "emailType": 2, "password":this.model.password})      
+       
       }
     }
-
   };
 </script>
 <style></style>