From 84d17b81bb3afb87e5db2a58141fac1bd8256832 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 10 Mar 2021 12:50:29 +0100
Subject: [PATCH] WIP - add post to community

---
 community_server                              |  2 +-
 frontend/src/App.vue                          | 19 +++---
 frontend/src/store/store.js                   |  4 +-
 .../src/views/KontoOverview/GddAddWork.vue    | 67 +++++++++++++------
 frontend/yarn.lock                            |  9 ++-
 login_server                                  |  2 +-
 6 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/community_server b/community_server
index cfc0af844..36ddbba58 160000
--- a/community_server
+++ b/community_server
@@ -1 +1 @@
-Subproject commit cfc0af844dcb1832993fdb6126493adb443960be
+Subproject commit 36ddbba5815435575b2d3c1270d738ccabc9eb54
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index d89ca100d..da80c328f 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -17,19 +17,21 @@ import icon from "./icon.js";
 export default {
   name: 'app',
   components: {
-      ParticlesBg,
+      ParticlesBg
     },
     created () { 
       //console.log("this.$cookies.get('gdd_session_id') ", this.$cookies.get('gdd_session_id') )
-      //console.log(" $cookies.isKey('gdd_session_id') == true", this.$cookies.isKey("gdd_session_id") == true )
-      if ( this.$cookies.get('gdd_session_id')  == this.$store.state.session_id ) {
-        //this.$store.state.email = this.$cookies.get('gdd_u')       
+       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")
       } 
     },
-     data: function () {
+     data() {
     return {
       config: {
         num: [1, 7],
@@ -51,12 +53,11 @@ export default {
 </script>
 <style>
     .btn {
-          background-color: #5A7B02;
-    border-color: #5e72e4;
+      background-color: #5A7B02;
+      border-color: #5e72e4;
     }
      a, .copyright{
-        color: #5A7B02;
-    
+      color: #5A7B02;    
     }
     gradido-global-color-text{color:  #3D443B }
     gradido-global-color-accent{color:  #047006 }
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 0a2703364..fd559dadb 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -59,8 +59,10 @@ export const store = new Vuex.Store({
   // Asyncronous actions - used for api calls
   actions: {
     login: async ({ dispatch, commit }, data) => {
-      //console.log('action: login')
+      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 ){
         commit('session_id', result.result.data.session_id)
         commit('email', data.email)
diff --git a/frontend/src/views/KontoOverview/GddAddWork.vue b/frontend/src/views/KontoOverview/GddAddWork.vue
index bfe295b49..6bc7f971c 100644
--- a/frontend/src/views/KontoOverview/GddAddWork.vue
+++ b/frontend/src/views/KontoOverview/GddAddWork.vue
@@ -22,27 +22,53 @@
                     <b-form @submit="onSubmit" @reset="onReset" v-if="show">
                       
                          <b-row class="form-group">
-                          <label for="example-datetime-local-input" class="col-md-2 col-form-label form-control-label">von</label>
+                          <label for="example-datetime-local-input" class="col-md-2 col-form-label form-control-label form-control-lg">von</label>
                           <b-col md="10">
-                            <base-input type="datetime-local" value="2018-11-23T10:30:00" v-model="form.from"/>
+                            <base-input type="datetime-local" value="2018-11-23T10:30:00" v-model="form.from" @change="dateDiff" />
                           </b-col>
                         </b-row>
                            <b-row class="form-group">
-                          <label for="example-datetime-local-input" class="col-md-2 col-form-label form-control-label">bis</label>
+                          <label for="example-datetime-local-input" class="col-md-2 col-form-label form-control-label form-control-lg">bis</label>
                           <b-col md="10">
-                            <base-input type="datetime-local" value="2018-11-23T10:30:00" v-model="form.to"/>
+                            <base-input type="datetime-local" value="2018-11-23T10:30:00" v-model="form.to"  @change="dateDiff" />
+                          </b-col>
+                        </b-row>
+                           <b-row class="form-group">
+                          <label for="example-datetime-local-input" class="col-md-2 col-form-label form-control-label form-control-lg">Stunden</label>
+                          <b-col md="10">
+                            <base-input type="text" v-model="form.hours" disabled class="form-control-lg"/>
                           </b-col>
                         </b-row>
                           <b-row class="form-group">
-                            <label class="col-md-2 col-form-label form-control-label">Ort</label>
+                          <label for="example-datetime-local-input" class="col-md-2 col-form-label form-control-label form-control-lg">GDD Shöpfen</label>
+                          <b-col md="10">
+                             <base-input type="text" :value="(form.hours * 20)" disabled class="form-control-lg"/>
+                          </b-col>
+
+                        </b-row>
+                          <b-row class="form-group">
+                            <label class="col-md-2 col-form-label form-control-label form-control-lg">Ort</label>
                             <b-col md="10">
-                              <base-input placeholder="Berlin" v-model="form.location"></base-input>
+                              <base-input placeholder="Berlin" v-model="form.location" class="form-control-lg"></base-input>
                             </b-col>
                           </b-row>
+                              <b-row class="form-group">
+                            <label class="col-md-2 col-form-label form-control-label form-control-lg">Kategorie</label>
+                            <b-col md="10">
+                                        <base-input >
+                            <select class="form-control form-control-lg">
+                              <option>Umwelt</option>
+                              <option>Helfen</option>
+                              <option>Verein</option>
+                            </select>
+                          </base-input>
+                            </b-col>
+                          </b-row>
+                
                           
                           
                          <base-input label="Beitrag">
-                          <textarea class="form-control" id="exampleFormControlTextarea3" rows="3" v-model="form.text"></textarea>
+                          <textarea class="form-control form-control-lg" rows="3" v-model="form.text" ></textarea>
                         </base-input>
                       
                       <br>                
@@ -61,6 +87,7 @@
 </template>
 
 <script>
+ 
 export default {
   name: 'GDDAddWork',
   data(){
@@ -69,11 +96,12 @@ export default {
        form: {
            from:'',
            to: '',
-           hours: 0,
+           hours: '',
            text: '',
            gdd: 0.00,
            location: '',
-           text2: ''
+           text2: '',
+           sendtime: ''
         },
         timestamp: ""
     }
@@ -82,24 +110,23 @@ export default {
     setInterval(this.getNow, 2000);
   },
   methods: {
-    getNow: function() {
-      const today = new Date();      
-      const date = today.getDate()+'.'+(today.getMonth()+1)+'.'+ today.getFullYear();
-      const time = today.getHours() + ":" + today.getMinutes();
-      const dateTime = date +', '+ time;      
-      this.timestamp = new Date();
+    dateDiff() {
+      this.form.hours = ((((this.$moment(this.form.to)) - (this.$moment(this.form.from)))/1000)/3600)
     },
-    getHours: function (from,to) {
-      const a = (to - from)
-      console.log("(to - from)", (to - from)) 
-      console.log("a summe", a) 
+    getNow: function() {
+      //const today = new Date()      
+      //const date = today.getDate()+'.'+(today.getMonth()+1)+'.'+ today.getFullYear();
+      //const time = today.getHours() + ":" + today.getMinutes();
+      //const dateTime = date +', '+ time;      
+      this.timestamp = new Date()
     },
     onSubmit(event) {
         event.preventDefault()
         console.log("onSUBMIT this.form.from >>>>",  this.form.from)
-        console.log("onSUBMIT this.form.from >>>>",  this.moment(this.form.from))
+        console.log("onSUBMIT this.form.from >>>>",  this.$moment(this.form.from))
         console.log("onSUBMIT this.form.to >>>>",  this.form.to)
        // console.log("onSUBMIT >>>>", this.getHours(this.form.from, this.form.to))
+       this.form.sendtime = new Date()
         alert(JSON.stringify(this.form))
      
       },
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 0c780e810..06586d16a 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -6374,7 +6374,7 @@ mixin-deep@^1.2.0:
   dependencies:
     minimist "^1.2.5"
 
-moment@^2.10.2:
+moment@^2.10.2, moment@^2.19.2:
   version "2.29.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
   integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
@@ -9708,6 +9708,13 @@ vue-loader@^15.7.0:
     vue-hot-reload-api "^2.3.0"
     vue-style-loader "^4.1.0"
 
+vue-moment@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/vue-moment/-/vue-moment-4.1.0.tgz#092a8ff723a96c6f85a0a8e23ad30f0bf320f3b0"
+  integrity sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw==
+  dependencies:
+    moment "^2.19.2"
+
 vue-qrcode-reader@^2.3.16:
   version "2.3.16"
   resolved "https://registry.yarnpkg.com/vue-qrcode-reader/-/vue-qrcode-reader-2.3.16.tgz#600f24d0b652bfded29c50a7695c7f521b71c7bb"
diff --git a/login_server b/login_server
index 2837ac13f..9b9115290 160000
--- a/login_server
+++ b/login_server
@@ -1 +1 @@
-Subproject commit 2837ac13f00fa411b826f58edcffc05519a5786e
+Subproject commit 9b9115290c8d2ead756d64b70ae63a6571aa4693