From 15f43d735113e4951cfaaabb388fccb940c76df4 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 17 Mar 2021 09:33:42 +0100
Subject: [PATCH 01/24] add work reprt in the community skellet

---
 frontend/src/App.vue                          |  29 ++-
 frontend/src/apis/communityAPI.js             |   3 +
 frontend/src/apis/loginAPI.js                 |   3 +
 .../components/Breadcrumb/RouteBreadcrumb.vue |   2 +-
 .../src/components/SidebarPlugin/SideBar.vue  |  44 ++--
 frontend/src/plugins/dashboard-plugin.js      |   2 +
 frontend/src/routes/routes.js                 |  15 +-
 frontend/src/store/store.js                   |   6 +-
 frontend/src/views/AdminOverview.vue          |   2 +
 frontend/src/views/KontoOverview.vue          |  36 +--
 .../src/views/KontoOverview/GddAddWork.vue    |   9 +
 .../src/views/KontoOverview/GddAddWork2.vue   | 240 ++++++++++++++++++
 frontend/src/views/KontoOverview/GddTable.vue |   3 +
 .../src/views/KontoOverview/GddWorkTable.vue  |  27 +-
 frontend/src/views/Landing.vue                |   2 +-
 frontend/src/views/Layout/AdminLayout.vue     |   2 +-
 frontend/src/views/Layout/AuthLayout.vue      |   4 +-
 frontend/src/views/Layout/AuthLayout_gdd.vue  |  10 +-
 frontend/src/views/Layout/DashboardLayout.vue |  10 +-
 frontend/src/views/Layout/DashboardNavbar.vue |  12 +-
 frontend/src/views/NotFoundPage.vue           |   2 +-
 .../src/views/Pages/UserProfile/UserCard.vue  |   2 +-
 22 files changed, 354 insertions(+), 111 deletions(-)
 create mode 100644 frontend/src/views/KontoOverview/GddAddWork2.vue

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index da80c328f..52976cf65 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -4,8 +4,7 @@
     </header>
     <div class="">   
       <particles-bg type="custom" :config="config" :bg="true" />  
-      <router-view />
-       
+      <router-view />       
     </div>
   </div> 
 </template>
@@ -19,17 +18,25 @@ export default {
   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') ) {
+    mounted() {
+      console.log("mounted")
+      console.log(" $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id")  )
+      console.log(" $cookies.isKey('gdd_session_id') ", $cookies.isKey("gdd_session_id")  )
+      const isSession = $cookies.isKey("gdd_session_id")
+      const getSession = $cookies.get("gdd_session_id")
+      console.log("this.isSession ", this.isSession  )
+
+      if ( $cookies.isKey("gdd_session_id")) {
         //this.$store.state.email = this.$cookies.get('gdd_u') 
-         console.log("login to kontooverview")      
-        this.$router.push('/KontoOverview') 
+        console.log("router to overview")
+        this.$router.push("/overview") 
       }else {
-        console.log("login to LOGIN")
-       this.$router.push("/Login")
+        console.log("router to LOGIN")
+        //this.$router.push("/login")
       } 
+    },
+    created () { 
+      console.log("created")      
     },
      data() {
     return {
@@ -52,7 +59,7 @@ export default {
 }
 </script>
 <style>
-    .btn {
+    .btn-primary pim{
       background-color: #5A7B02;
       border-color: #5e72e4;
     }
diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js
index a1da31707..430600732 100644
--- a/frontend/src/apis/communityAPI.js
+++ b/frontend/src/apis/communityAPI.js
@@ -1,6 +1,9 @@
 import axios from 'axios';
 import CONFIG from '../config'
 
+// axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt.
+axios.defaults.withCredentials = true
+
 const apiGet = async (url) => {
   try {
     const result = await axios.get(url);
diff --git a/frontend/src/apis/loginAPI.js b/frontend/src/apis/loginAPI.js
index 8756a6840..7857ccad1 100644
--- a/frontend/src/apis/loginAPI.js
+++ b/frontend/src/apis/loginAPI.js
@@ -7,6 +7,9 @@ const EMAIL_TYPE = {
   ADMIN: 5, // if user was registered by an admin
 }
 
+// axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt.
+axios.defaults.withCredentials = true
+
 const apiPost = async (url, payload) => {
   try {
     const result = await axios.post(url, payload);
diff --git a/frontend/src/components/Breadcrumb/RouteBreadcrumb.vue b/frontend/src/components/Breadcrumb/RouteBreadcrumb.vue
index ff9b3cf12..c10ad9504 100644
--- a/frontend/src/components/Breadcrumb/RouteBreadcrumb.vue
+++ b/frontend/src/components/Breadcrumb/RouteBreadcrumb.vue
@@ -1,7 +1,7 @@
 <template>
   <bread-crumb list-classes="breadcrumb-links breadcrumb-dark">
     <BreadCrumbItem>
-        <router-link to="/">
+        <router-link to="/overview">
           <i class="fas fa-home"></i>
         </router-link>
     </BreadCrumbItem>
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 734976777..206e5a016 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -6,12 +6,12 @@
             <navbar-toggle-button @click.native="showSidebar">
                 
             </navbar-toggle-button>
-            <router-link class="navbar-brand" to="/">
+            <router-link class="navbar-brand" to="/overview">
                 <img :src="logo" class="navbar-brand-img" alt="...">
             </router-link>
 
             <slot name="mobile-right">
-                <ul class="nav align-items-center d-md-none">
+                <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">
@@ -22,7 +22,7 @@
                             </div>
                         </a>
  
-                        <router-link to="/KontoOverview" class="dropdown-item text-lg text-muted">
+                        <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>
@@ -40,10 +40,10 @@
                         </router-link>
                        
                         <div class="dropdown-divider"></div>
-                        <router-link @click="logout" class="dropdown-item  text-lg text-muted">
+                        <div @click="logout" class="dropdown-item  text-lg text-muted" >
                             <i class="ni ni-support-16"></i>
-                            <span>{{ $t('logout') }}</span>
-                        </router-link>
+                             {{ $t('logout') }} 
+                        </div>
                     </base-dropdown>
                 </ul>
             </slot>
@@ -53,7 +53,7 @@
                 <div class="navbar-collapse-header d-md-none">
                     <div class="row">
                         <div class="col-6 collapse-brand">
-                            <router-link to="/">
+                            <router-link to="/overview">
                                 <img :src="logo">
                             </router-link>
                         </div>
@@ -62,26 +62,20 @@
                         </div>
                     </div>
                 </div>
-
                 <ul class="navbar-nav">
                     <slot name="links">
                     </slot>
                 </ul>
-              
-                <hr class="my-3">
-     
-                <ul class="navbar-nav mb-md-3">
-                   
+                <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>
+                  </ul>                 
             </div>
+          </div>
     </nav>
 </template>
 <script>
@@ -96,7 +90,7 @@
       logo: {
         type: String,
         default: 'img/brand/green.png',
-        description: 'Sidebar app logo'
+        description: 'Gradido Sidebar app logo'
       },
       autoClose: {
         type: Boolean,
@@ -116,17 +110,9 @@
       showSidebar() {
         this.$sidebar.displaySidebar(true)
       },
-      setLocale(locale) {
-      this.$i18n.locale = locale
-      //this.$router.push({
-      //  params: { lang: locale }
-      //})
-      //this.hideDropdown()
-    },
-    logout(){
-      //console.log("DashboardNavbar.vue user logout() : ")
-      this.$store.dispatch('logout')
-    }  
+      logout(){
+        this.$store.dispatch('logout')
+      }  
     },
     beforeDestroy() {
       if (this.$sidebar.showSidebar) {
diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js
index 664870f4f..a903cab74 100755
--- a/frontend/src/plugins/dashboard-plugin.js
+++ b/frontend/src/plugins/dashboard-plugin.js
@@ -29,6 +29,7 @@ import { messages } from 'vee-validate/dist/locale/en.json';
 import VueQrcodeReader from "vue-qrcode-reader";
 import VueQrcode from "vue-qrcode";
 
+import VueFlatPickr from 'vue-flatpickr-component';
 
 import VueGoodTablePlugin from 'vue-good-table';
 // import the styles
@@ -54,6 +55,7 @@ export default {
     Vue.use(VueMoment);
     Vue.use(VueQrcodeReader);
     Vue.use(VueQrcode);
+    Vue.use(VueFlatPickr);
     configure({
       classes: {
         valid: 'is-valid',
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 6cf3c8c0a..4acb71d90 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -2,7 +2,7 @@ import DashboardLayout from '@/views/Layout/DashboardLayout.vue'
 import AuthLayoutGDD from '@/views/Layout/AuthLayout_gdd.vue'
 import AuthLayout from '@/views/Layout/AuthLayout.vue'
 
-import NotFound from '@/views/NotFoundPage.vue'
+// import NotFound from '@/views/NotFoundPage.vue'
 
 
 const routes = [
@@ -31,11 +31,11 @@ const routes = [
   },
   {
     path: '/',
-    redirect: 'KontoOverview',
+    redirect: 'overview',
     component: DashboardLayout,
     children: [
       {
-        path: '/KontoOverview',
+        path: '/overview',
         component: () => import('../views/KontoOverview.vue'),
         meta: {
           requiresAuth: true
@@ -70,15 +70,6 @@ const routes = [
         }
       }
     ]
-  },
-  {
-    path: '/',
-    redirect: 'login',
-    component: AuthLayout,
-    children: [
-     
-      { path: '*', component: NotFound }
-    ]
   }
 ];
 
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index fd559dadb..88a6e0c6b 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -6,6 +6,8 @@ import loginAPI from '../apis/loginAPI'
 import communityAPI from '../apis/communityAPI'
 import axios from 'axios'
 
+// axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt.
+axios.defaults.withCredentials = true
 
 export const store = new Vuex.Store({
   state: {
@@ -68,7 +70,7 @@ export const store = new Vuex.Store({
         commit('email', data.email)
         $cookies.set('gdd_session_id', result.result.data.session_id);
         $cookies.set('gdd_u',  data.email);
-        router.push('/KontoOverview')
+        router.push('/overview')
       } else {
         // Register failed, we perform a logout
         dispatch('logout')
@@ -88,7 +90,7 @@ export const store = new Vuex.Store({
         commit('email', data.email)
         $cookies.set('gdd_session_id', result.result.data.session_id);
         $cookies.set('gdd_u',  data.email);
-        router.push('/KontoOverview')
+        router.push('/overview')
       } else {
         // Register failed, we perform a logout
         dispatch('logout')
diff --git a/frontend/src/views/AdminOverview.vue b/frontend/src/views/AdminOverview.vue
index 7c7124eab..5d4040d24 100644
--- a/frontend/src/views/AdminOverview.vue
+++ b/frontend/src/views/AdminOverview.vue
@@ -226,6 +226,8 @@
   import AdminUserCreation from './AdminOverview/AdminUserCreation';
   import axios from 'axios';
 
+  // axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt.
+  axios.defaults.withCredentials = true
 
   export default {
     components: {
diff --git a/frontend/src/views/KontoOverview.vue b/frontend/src/views/KontoOverview.vue
index b1cc2da02..fdc6ef5aa 100644
--- a/frontend/src/views/KontoOverview.vue
+++ b/frontend/src/views/KontoOverview.vue
@@ -6,37 +6,41 @@
       <gdd-sent />
       <hr>
       <gdd-table />
-     
       <hr>
       <div>
-        <gdd-add-work />       
+        <gdd-add-work-2 />       
       </div>
       <br>
-    
-      <!-- 
+      <!--
+        <div>
+          <gdd-add-work />       
+        </div>
+        <br>
+      -->      
       <div>
         <gdd-work-table />       
-      </div>
-      -->
+      </div>    
     </base-header>     
      <hr>
   </div>
 </template>
 <script>
-   import GddStatus from './KontoOverview/GddStatus.vue';
-   import GddSent from './KontoOverview/GddSent.vue';
-   import GddTable from './KontoOverview/GddTable.vue';
- import GddAddWork from './KontoOverview/GddAddWork.vue';
-   // import GddWorkTable from './KontoOverview/GddWorkTable.vue';
+  import GddStatus from './KontoOverview/GddStatus.vue';
+  import GddSent from './KontoOverview/GddSent.vue';
+  import GddTable from './KontoOverview/GddTable.vue';
+  //import GddAddWork from './KontoOverview/GddAddWork.vue';
+  import GddAddWork2 from './KontoOverview/GddAddWork2.vue';
+  import GddWorkTable from './KontoOverview/GddWorkTable.vue';
 
   export default {  
     name: "Overview",
     components: {
-        GddStatus,
-        GddSent,
-        GddTable,
-        GddAddWork
-        //GddWorkTable
+      GddStatus,
+      GddSent,
+      GddTable,
+      //GddAddWork,
+      GddAddWork2,
+      GddWorkTable
      },
      created() { 
        this.$store.dispatch('accountBalance')        
diff --git a/frontend/src/views/KontoOverview/GddAddWork.vue b/frontend/src/views/KontoOverview/GddAddWork.vue
index 6bc7f971c..eec578ca6 100644
--- a/frontend/src/views/KontoOverview/GddAddWork.vue
+++ b/frontend/src/views/KontoOverview/GddAddWork.vue
@@ -70,6 +70,15 @@
                          <base-input label="Beitrag">
                           <textarea class="form-control form-control-lg" rows="3" v-model="form.text" ></textarea>
                         </base-input>
+                         <b-row class="form-group">
+                            <label class="col-md-2 col-form-label form-control-label form-control-lg">Tätigkeit</label>
+                            <b-col md="8">
+                              <base-input placeholder="Tätigkeit" v-model="form.location" class="form-control-lg"></base-input>
+                            </b-col>
+                             <b-col md="2">
+                              <base-input placeholder="Stunden" v-model="form.location" class="form-control-lg"></base-input>
+                            </b-col>
+                          </b-row>
                       
                       <br>                
                        
diff --git a/frontend/src/views/KontoOverview/GddAddWork2.vue b/frontend/src/views/KontoOverview/GddAddWork2.vue
new file mode 100644
index 000000000..10a8034ae
--- /dev/null
+++ b/frontend/src/views/KontoOverview/GddAddWork2.vue
@@ -0,0 +1,240 @@
+<template>
+  <div>
+    <b-tabs content-class="mt-3" fill> 
+      <b-tab :title="names.thisMonth" active>        
+        
+        <b-row>
+          <b-col cols="3"> 
+             
+            <base-input label="Arbeitstunden" >
+              <b-form-input  type="number" placeholder="23" />
+            </base-input>
+             <base-input label="Datum / Zeitraum" >
+              <flat-pickr class="form-control" v-model="date" :config="config"></flat-pickr>
+            </base-input>
+          </b-col>
+          <b-col cols="9"> 
+            <base-input label="Arbeitsreport">
+              <textarea class="form-control" rows="5" @focus="textFocus"></textarea>
+            </base-input>
+          </b-col>
+         
+        </b-row>
+        <b-row>
+          <b-col><button class="btn btn-info text-right" @click.prevent="newWorkForm">weiteren Report hinzufügen</button></b-col>
+          <b-col>  
+            <div class="text-right">
+              <button class="btn btn-info text-right" @click.prevent="submitForm2">save new Report</button>
+            </div>
+          </b-col>
+        </b-row>  
+    </b-tab>
+  
+   
+  
+    <b-tab :title="names.lastMonth">
+<b-row>
+          <b-col cols="3"> 
+             
+            <base-input label="Arbeitstunden" >
+              <b-form-input  type="number" placeholder="23" />
+            </base-input>
+             <base-input label="Datum / Zeitraum" >
+              <flat-pickr class="form-control" v-model="date" :config="lastConfig"></flat-pickr>
+            </base-input>
+          </b-col>
+          <b-col cols="9"> 
+            <base-input label="Arbeitsreport">
+              <textarea class="form-control" rows="5" @focus="textFocus"></textarea>
+            </base-input>
+          </b-col>
+         
+        </b-row>
+        <b-row>
+          <b-col><button class="btn btn-warning text-right" @click.prevent="newWorkForm">+ weiteren Report hinzufügen</button></b-col>
+          <b-col>  
+            <div class="text-right">
+              <button class="btn btn-info text-right" @click.prevent="submitForm2">save new Report</button>
+            </div>
+          </b-col>
+        </b-row>  
+        <hr>
+        <pre>Selected date is - {{date}}</pre>
+        <p>{{days.lastMonth}} Days in {{names.lastMonth}} </p>
+     
+      <p>Du hast diesen Monat 
+               {{stundenSumme>0 ? 'schon ' : 'noch keine' }}
+              {{stundenSumme>0 ? ''+ stundenSumme : ''  }} 
+              Stunden eingetragen</p>
+         
+    </b-tab>
+  
+  
+   
+  
+    <b-tab :title="names.beforLastMonth">
+
+       <b-row>
+          <b-col cols="3"> 
+             
+            <base-input label="Arbeitstunden" >
+              <b-form-input  type="number" placeholder="23" />
+            </base-input>
+             <base-input label="Datum / Zeitraum" >
+              <flat-pickr class="form-control" v-model="date" :config="beforLastConfig"></flat-pickr>
+            </base-input>
+          </b-col>
+          <b-col cols="9"> 
+            <base-input label="Arbeitsreport">
+              <textarea class="form-control" rows="5" @focus="textFocus"></textarea>
+            </base-input>
+          </b-col>
+         
+        </b-row>
+        <b-row>
+          <b-col><button class="btn btn-warning text-right" @click.prevent="newWorkForm">+ weiteren Report hinzufügen</button></b-col>
+          <b-col>  
+            <div class="text-right">
+              <button class="btn btn-info text-right" @click.prevent="submitForm3">save new Report</button>
+            </div>
+          </b-col>
+        </b-row>  
+        <hr>
+        <pre>Selected date is - {{date}}</pre>
+        <p>{{days.beforLastMonth}} Days in {{names.beforLastMonth}} </p>
+        <p>Du hast noch keine Einträge </p>
+    
+     
+    </b-tab>
+    
+  </b-tabs>
+ 
+  </div>
+</template>
+
+<script>
+import flatPickr from "vue-flatpickr-component"
+import "flatpickr/dist/flatpickr.css"
+
+export default {
+  name: 'GDDAddWork2',
+  components: {flatPickr},
+  data(){
+    return {
+      date: null,
+      config: {
+        altInput: false,
+        dateFormat: "d-m-Y",        
+        minDate:  this.$moment().startOf('month').format("DD.MM.YYYY"),
+        maxDate: this.$moment().format("DD.MM.YYYY"),
+         mode: 'range'
+      
+      }, 
+      lastConfig:{
+          altInput: false,
+        dateFormat: "d-m-Y",        
+        minDate:  this.$moment().month(this.$moment().month()-1).startOf('month').format("DD.MM.YYYY"),
+        maxDate: this.$moment().month(this.$moment().month()-1).endOf('month').format("DD.MM.YYYY"),
+         mode: 'range'
+      },
+      beforLastConfig:{
+          altInput: false,
+        dateFormat: "d-m-Y",        
+        minDate:  this.$moment().month(this.$moment().month()-2).startOf('month').format("DD.MM.YYYY"),
+        maxDate: this.$moment().month(this.$moment().month()-2).endOf('month').format("DD.MM.YYYY"),
+         mode: 'range'
+      },
+      index: 0,
+      form:[],
+      stundenSumme: 0,
+      messages: [],
+      submitted:false,
+      days: {
+        thisMonth: this.$moment().month(this.$moment().month()).daysInMonth(),
+        lastMonth: this.$moment().month(this.$moment().month()-1).daysInMonth(),
+        beforLastMonth: this.$moment().month(this.$moment().month()-2).daysInMonth(),
+      },
+      names: {
+        thisMonth: this.$moment().month(this.$moment().month()).format('MMMM'),
+        lastMonth: this.$moment().month(this.$moment().month()-1).format('MMMM'),
+        beforLastMonth: this.$moment().month(this.$moment().month()-2).format('MMMM')
+      }
+    }
+  },
+  created() {
+    
+  },
+  watch: {
+    $form: function(){
+    stunden(this.form)
+    }
+  },
+  methods: {
+     getTR(m,i){
+       console.log(m+"-"+i)
+     },
+     stunden(hour, i, mon) {
+       let n = 0
+       console.log("stunden(form)=>", hour)
+       console.log("stunden(i)=>", i)
+       console.log("stunden(mon)=>", mon)
+        
+    
+       console.log("this.stundenSumme start=> ", this.stundenSumme) 
+       this.stundenSumme = 0
+       console.log("arr.length => ", this.form.length) 
+       for (n; n < this.form.length; n++){
+         console.log(">arr[n]=> ",this.form[n])
+         if (this.form[n] > 0) {
+           this.stundenSumme += parseInt(this.form[n]) ;
+           	
+           }
+
+          
+        }
+        this.messages.push({
+              id: this.index,
+        	    MonthsNumber: mon,
+        	    DaysNumber: i,
+        	    HoursNumber: hour,
+              DestinationText: '',
+        	    TextDecoded: ''
+             });
+             this.index++
+       console.log("this.stundenSumme ende=> ", this.stundenSumme) 
+     },
+     	addNewMessage: function(){
+		    this.messages.push({
+        	DaysNumber: '',
+        	TextDecoded: ''
+        });
+       
+	    },
+     deleteNewMessage: function(event) {
+       console.log("deleteNewMessage:event) => ", event) 
+       //console.log("deleteNewMessage:this.events.splice(this.event) => ", this.events.splice(this.event)) 
+        this.form.splice(event, null);
+        this.messages.splice(index, 1);
+        this.index--
+      },
+    submitForm: function(e) {
+    	console.log(this.messages);
+       
+        this.messages = [{ DaysNumber: '', TextDecoded: '' }];
+        this.submitted = true;
+    },
+    submitForm2() {
+      console.log("submitForm2 TODO")
+    }, 
+    submitForm3() {
+      console.log("submitForm3 TODO")
+    },
+    textFocus(){
+      console.log("textFocus TODO")
+    },
+    newWorkForm(){
+      console.log("newWorkForm TODO")
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/frontend/src/views/KontoOverview/GddTable.vue b/frontend/src/views/KontoOverview/GddTable.vue
index 9d417e318..f3a90cfca 100644
--- a/frontend/src/views/KontoOverview/GddTable.vue
+++ b/frontend/src/views/KontoOverview/GddTable.vue
@@ -41,6 +41,9 @@
 <script>
 import axios from 'axios';
 
+// axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt.
+axios.defaults.withCredentials = true
+
 export default {
   name: 'GddTable',  
   data(){
diff --git a/frontend/src/views/KontoOverview/GddWorkTable.vue b/frontend/src/views/KontoOverview/GddWorkTable.vue
index 463db1da9..ca4d70725 100644
--- a/frontend/src/views/KontoOverview/GddWorkTable.vue
+++ b/frontend/src/views/KontoOverview/GddWorkTable.vue
@@ -1,20 +1,18 @@
 <template>
   <div>
-        <b-list-group > 
-          <b-list-group-item v-for="item in items" :key="item.id"> 
-          <div class="d-flex w-100 justify-content-between"  @click="toogle(item)" >
-            <b-icon v-if="item.status == 'submitted'" icon="clock-history"   class="m-1"  font-scale="2" style="color:orange"></b-icon>
-            <b-icon v-else icon="check2-all" class="m-1"  font-scale="2" style="color:green" ></b-icon>                
-              <h2 class="text-muted"><small>{{item.datel}}</small> - {{item.text}}</h2>
-            </div>
-          </b-list-group-item>
-        </b-list-group>
+      <b-list-group > 
+        <b-list-group-item v-for="item in items" :key="item.id"> 
+        <div class="d-flex w-100 justify-content-between"  @click="toogle(item)" >
+          <b-icon v-if="item.status == 'submitted'" icon="clock-history"   class="m-1"  font-scale="2" style="color:orange"></b-icon>
+          <b-icon v-else icon="check2-all" class="m-1"  font-scale="2" style="color:green" ></b-icon>                
+            <h2 class="text-muted"><small>{{item.datel}}</small> - {{item.text}}</h2>
+          </div>
+        </b-list-group-item>
+      </b-list-group>
   </div>
 </template>
 
 <script>
-
-
 export default {
   name: 'GddWorkTable',  
   data(){
@@ -22,8 +20,8 @@ export default {
         form: [],        
         items: [
           {  id: 1, text: 'Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ', datel: '12.12.2020 14:04', status: 'submitted' },
-          {  id: 2, text: 'Larsen Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ',    datel: '22.06.2020 22:23', status: 'submitted'  },
-          {  id: 3, text: 'Geneva Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ',    datel: '15.04.2020 12:55', status: 'confirmed' },
+          {  id: 2, text: 'Larsen Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ', datel: '22.06.2020 22:23', status: 'submitted'  },
+          {  id: 3, text: 'Geneva Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ',  datel: '15.04.2020 12:55', status: 'confirmed' },
           {  id: 4, text: 'Community Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ', datel: '10.03.2020 18:20', status: 'confirmed'}
         ]      
     };
@@ -37,10 +35,7 @@ export default {
       },
       toogle(item) {
         const temp = '<b-collapse visible v-bind:id="item.id">xxx <small class="text-muted">porta</small></b-collapse>'
-
       }
-  },
-  watch: { 
   }
 };
 </script>
diff --git a/frontend/src/views/Landing.vue b/frontend/src/views/Landing.vue
index 72f0cb88f..4238d9a88 100644
--- a/frontend/src/views/Landing.vue
+++ b/frontend/src/views/Landing.vue
@@ -10,7 +10,7 @@
             <b-col xl="5" lg="6" md="6" class="px-5">
               <h1 class="text-light">Landing Gradido</h1>               
               <br>
-              <router-link to="/KontoOverview" class="font-weight-bold text-white mt-5"> LoginUser</router-link>
+              <router-link to="/overview" class="font-weight-bold text-white mt-5"> LoginUser</router-link>
               <br><br>
               <router-link  to="/AdminOverview" class="font-weight-bold text-white mt-5"> Login Admin</router-link>
                <br><br>
diff --git a/frontend/src/views/Layout/AdminLayout.vue b/frontend/src/views/Layout/AdminLayout.vue
index b582bb588..a21079d0a 100644
--- a/frontend/src/views/Layout/AdminLayout.vue
+++ b/frontend/src/views/Layout/AdminLayout.vue
@@ -6,7 +6,7 @@
         <sidebar-item
           :link="{
             name: 'Kontoübersicht',
-            path: 'KontoOverview',
+            path: '/overview',
             icon: 'ni ni-tv-2 text-primary',
           }"
         >
diff --git a/frontend/src/views/Layout/AuthLayout.vue b/frontend/src/views/Layout/AuthLayout.vue
index 48c156c31..089950afd 100755
--- a/frontend/src/views/Layout/AuthLayout.vue
+++ b/frontend/src/views/Layout/AuthLayout.vue
@@ -8,7 +8,7 @@
       expand="lg"
     >
       <div slot="brand" class="navbar-wrapper">
-        <b-navbar-brand to="/">
+        <b-navbar-brand to="/overview">
           <img src="img/brand/white.png">
         </b-navbar-brand>
       </div>
@@ -17,7 +17,7 @@
        <div class="navbar-collapse-header">
          <b-row>
            <b-col cols="6" class="collapse-brand">
-             <router-link to="/">
+             <router-link to="/overview">
                <img src="img/brand/green.png">
              </router-link>
            </b-col>
diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue
index 5b7048491..1c7885849 100644
--- a/frontend/src/views/Layout/AuthLayout_gdd.vue
+++ b/frontend/src/views/Layout/AuthLayout_gdd.vue
@@ -13,17 +13,17 @@
               </div>
             </b-col>
             <b-col xl="6" class="col-xl-6">
-              <b-nav class="nav-footer justify-content-center justify-content-xl-end">
-                <b-nav-item ref="https://www.creative-tim.com" target="_blank">
+              <b-nav class="nav-footer justify-content-center justify-content-lg-end">
+                <b-nav-item ref="https://gradido.net/" target="_blank">
                   Gradido
                 </b-nav-item>
-                <b-nav-item href="https://www.creative-tim.com/presentation" target="_blank">
+                <b-nav-item href="https://gradido.net/" target="_blank">
                 {{$t('imprint')}}
                 </b-nav-item>
-                <b-nav-item href="http://blog.creative-tim.com" target="_blank">
+                <b-nav-item href="https://gradido.net/" target="_blank">
                   {{$t('privacy_policy')}}
                 </b-nav-item>
-                <b-nav-item href="https://www.creative-tim.com/license" target="_blank">
+                <b-nav-item href="https://gradido.net/" target="_blank">
                   {{$t('license')}}
                 </b-nav-item>
               </b-nav>
diff --git a/frontend/src/views/Layout/DashboardLayout.vue b/frontend/src/views/Layout/DashboardLayout.vue
index 1bba74762..a7bd82e8b 100755
--- a/frontend/src/views/Layout/DashboardLayout.vue
+++ b/frontend/src/views/Layout/DashboardLayout.vue
@@ -4,7 +4,7 @@
     <side-bar>
       <template slot="links" >
        
-         <b-nav-item href="#!" to="/KontoOverview">
+         <b-nav-item href="#!" to="/overview">
                
               <b-nav-text class="p-0 text-lg text-muted">Senden</b-nav-text>
           </b-nav-item>
@@ -58,7 +58,7 @@
 
   import DashboardNavbar from './DashboardNavbar.vue';
   import ContentFooter from './ContentFooter.vue';
-  import DashboardContent from './Content.vue';
+  // import DashboardContent from './Content.vue';
   import { FadeTransition } from 'vue2-transitions';
 
   export default {
@@ -74,11 +74,7 @@
         if (isWindows) {
           initScrollbar('sidenav');
         }
-      },
-       logout(){
-          //console.log("DashboardLayout.vue user logout() : ")
-          this.$store.dispatch('logout')
-        }  
+      }
     },
     mounted() {
       this.initScrollbar()
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 56e7b092d..806afc6c5 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -34,12 +34,12 @@
                      title-tag="a"
                      title-classes="nav-link pr-0">
         <a href="#" class="nav-link pr-0" @click.prevent slot="title-container">
-          <b-media no-body class="align-items-center">
-            
-                  <span class="avatar avatar-sm rounded-circle">
-                     <vue-qrcode :value="$store.state.email" />
-                  </span>
+          <b-media no-body class="align-items-center">            
+                 
             <b-media-body class="ml-2 d-none d-lg-block">
+               <span class="avatar avatar-sm rounded-circle">
+                     <vue-qrcode :value="$store.state.email" type="image/png"/>
+                  </span>
               <span class="mb-0 text-lg  font-weight-bold">{{this.$store.state.email}}</span>
             </b-media-body>
           </b-media>
@@ -50,7 +50,7 @@
           <b-dropdown-header class="noti-title">
             <h6 class="text-overflow m-0"> {{ $t('welcome')  }}</h6>
           </b-dropdown-header>
-           <b-dropdown-item href="#!" to="/KontoOverview">
+           <b-dropdown-item href="#!" to="/overview">
             <i class="ni ni-single-02"></i>
             <span>{{ $t('site.overview.account_overview')}}</span>
           </b-dropdown-item>
diff --git a/frontend/src/views/NotFoundPage.vue b/frontend/src/views/NotFoundPage.vue
index a72d03a26..c80dfbfc7 100755
--- a/frontend/src/views/NotFoundPage.vue
+++ b/frontend/src/views/NotFoundPage.vue
@@ -348,7 +348,7 @@
             <div class="pr-md-5">
               <h1 class="text-light"> {{ $t('site.landing1.explore') }}</h1>
               <p class="text-light">{{ $t('site.landing1.text') }}</p>
-              <router-link to="/user" class="font-weight-bold text-warning mt-5">{{ $t('site.landing1.link') }}</router-link>
+              <router-link to="/overview" class="font-weight-bold text-warning mt-5">{{ $t('site.landing1.link') }}</router-link>
             </div>
           </b-col>
         </b-row>
diff --git a/frontend/src/views/Pages/UserProfile/UserCard.vue b/frontend/src/views/Pages/UserProfile/UserCard.vue
index e55a9f1f5..e698844a9 100755
--- a/frontend/src/views/Pages/UserProfile/UserCard.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard.vue
@@ -4,7 +4,7 @@
       <b-col lg="3" class="order-lg-2">
         <div class="card-profile-image">
           <a href="#">
-            <vue-qrcode :value="$store.state.email" />
+            <vue-qrcode :value="$store.state.email"  type="image/png"/>
           </a>
         </div>
       </b-col>

From 34e2a4672b47da1798b417617214f28dfb80f084 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 17 Mar 2021 12:33:26 +0100
Subject: [PATCH 02/24] back to master

---
 docker-compose.yml                | 14 ++++++-------
 frontend/src/apis/communityAPI.js |  7 ++++++-
 frontend/src/apis/loginAPI.js     |  3 ---
 frontend/src/store/store.js       | 34 +++++++++++++++++++------------
 4 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2acee2817..a423b22da 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -121,13 +121,13 @@ services:
   #########################################################  
   ## GRADIDO NODE test ###################################
   #########################################################
-  gradido-node-test:
-    build:
-      context: .
-      dockerfile: ./gn/docker/deprecated-hedera-node/Dockerfile
-    container_name: gn-test
-    working_dir: /opt/gn/build
-    command: ["./unit_tests"]
+  # gradido-node-test:
+  #   build:
+  #     context: .
+  #     dockerfile: ./gn/docker/deprecated-hedera-node/Dockerfile
+  #   container_name: gn-test
+  #   working_dir: /opt/gn/build
+  #   command: ["./unit_tests"]
       
 networks:
   external-net:
diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js
index 430600732..77856862a 100644
--- a/frontend/src/apis/communityAPI.js
+++ b/frontend/src/apis/communityAPI.js
@@ -1,9 +1,14 @@
 import axios from 'axios';
 import CONFIG from '../config'
 
-// axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt.
+// axios.defaults.withCredentials = true ist eine Anweisung an Axios, alle Anfragen mit Anmeldeinformationen zu senden, 
+// wie z. Autorisierungsheader, TLS-Client-Zertifikate oder Cookies (wie in unserem Fall).
 axios.defaults.withCredentials = true
 
+//Wir setzen unsere axios.defaults.baseURL für unsere Axios-Anfrage auf unsere. 
+// Auf APIdiese Weise wird diese Basis-URL verwendet, wenn wir über Axios senden. Damit können wir nur unsere Endpunkte wie /registerund /loginzu unseren Aktionen hinzufügen, ohne jedes Mal die vollständige URL anzugeben.
+axios.defaults.baseURL = CONFIG.COMMUNITY_API_STATE_BALANCE_URL
+
 const apiGet = async (url) => {
   try {
     const result = await axios.get(url);
diff --git a/frontend/src/apis/loginAPI.js b/frontend/src/apis/loginAPI.js
index 7857ccad1..8756a6840 100644
--- a/frontend/src/apis/loginAPI.js
+++ b/frontend/src/apis/loginAPI.js
@@ -7,9 +7,6 @@ const EMAIL_TYPE = {
   ADMIN: 5, // if user was registered by an admin
 }
 
-// axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt.
-axios.defaults.withCredentials = true
-
 const apiPost = async (url, payload) => {
   try {
     const result = await axios.post(url, payload);
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 88a6e0c6b..d8930ac26 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -5,9 +5,8 @@ import router from '../routes/router.js'
 import loginAPI from '../apis/loginAPI'
 import communityAPI from '../apis/communityAPI'
 import axios from 'axios'
+// import CONFIG from '../config'
 
-// axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt.
-axios.defaults.withCredentials = true
 
 export const store = new Vuex.Store({
   state: {
@@ -27,7 +26,14 @@ export const store = new Vuex.Store({
       auto_sign: true
     },
     transactions: [],
-    modals: false
+    modals: false,
+    optionAxios: {
+      headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          'Access-Control-Allow-Origin': '*',
+          'Access-Control-Allow-Credentials': 'true'
+      }
+    }
   },
   // Retrieve a state variable
   getters: {
@@ -62,19 +68,21 @@ export const store = new Vuex.Store({
   actions: {
     login: async ({ dispatch, commit }, data) => {
       console.log('action: login')
+      console.log('action:  data', data.email)
+      
       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)
-        $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')
-      } 
+     // if( result.success ){
+     //   commit('session_id', result.result.data.session_id)
+     //   commit('email', data.email)
+     //   $cookies.set('gdd_session_id', result.result.data.session_id);
+     //   $cookies.set('gdd_u',  data.email);
+     //   router.push('/overview')
+     // } else {
+     //   // Register failed, we perform a logout
+     //   dispatch('logout')
+     // } 
     },
     passwordReset: async (data) => {
       console.log("<<<<<<<<<<< PASSWORT RESET TODO >>>>>>>>>>>", data.email)

From c0a7690989cd5c79b1675eae70a73b0bd83b2fd2 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 17 Mar 2021 12:37:53 +0100
Subject: [PATCH 03/24] merge vue_with_ngix in master

---
 .github/workflows/publish.yml       | 307 ++++++++++++++++++++++++++++
 .github/workflows/test.yml          | 244 ++++++++++++++++++++++
 .gitignore                          |   1 +
 .gitmodules                         |   3 -
 CHANGELOG.md                        |   7 +
 docker-compose.yml                  |  10 +
 frontend/Dockerfile                 |   6 +-
 frontend/package.json               |   8 +-
 mariadb/setup_dbs_different_user.sh |   4 +-
 package.json                        |  15 ++
 yarn.lock                           |  77 +++++++
 11 files changed, 670 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/publish.yml
 create mode 100644 .github/workflows/test.yml
 create mode 100644 CHANGELOG.md
 create mode 100644 package.json
 create mode 100644 yarn.lock

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 000000000..7f252fe08
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,307 @@
+name: gradido publish CI
+
+on:
+  push:
+    branches:
+      - master
+
+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 COMMUNITY NEO4J ##########################################
+  ##############################################################################
+  build_production_frontend:
+    name: Docker Build Production - Frontend
+    runs-on: ubuntu-latest
+    #needs: [prepare] [nothing]
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ##########################################################################
+      # SET ENVS ###############################################################
+      ##########################################################################
+      - name: ENV - VERSION
+        run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
+      - name: ENV - BUILD_DATE
+        run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+      - name: ENV - BUILD_VERSION
+        run: echo "BUILD_VERSION=${VERSION}.${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+      - name: ENV - BUILD_COMMIT
+        run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
+      ##########################################################################
+      # FRONTEND ###############################################################
+      ##########################################################################
+      - name: Frontend | Build `production` image
+        run: |
+          docker build --target production -t "gradido/frontend:latest" -t "gradido/frontend:production" -t "gradido/frontend:${VERSION}" -t "gradido/frontend:${BUILD_VERSION}" frontend/
+          docker save "gradido/frontend" > /tmp/frontend.tar
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: docker-frontend-production
+          path: /tmp/frontend.tar
+
+  ##############################################################################
+  # JOB: DOCKER BUILD PRODUCTION BACKEND #######################################
+  ##############################################################################
+  #build_production_backend:
+  #  name: Docker Build Production - Backend
+  #  runs-on: ubuntu-latest
+  #  needs: [prepare]
+  #  steps:
+  #    ##########################################################################
+  #    # CHECKOUT CODE ##########################################################
+  #    ##########################################################################
+  #    - name: Checkout code
+  #      uses: actions/checkout@v2
+  #    ##########################################################################
+  #    # SET ENVS ###############################################################
+  #    ##########################################################################
+  #    - name: ENV - VERSION
+  #      run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
+  #    - name: ENV - BUILD_DATE
+  #      run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+  #    - name: ENV - BUILD_VERSION
+  #      run: echo "BUILD_VERSION=${VERSION}.${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+  #    - name: ENV - BUILD_COMMIT
+  #      run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
+  #    ##########################################################################
+  #    # BUILD BACKEND DOCKER IMAGE (production) ################################
+  #    ##########################################################################
+  #    - name: backend | Build `production` image
+  #      run: |
+  #        docker build --target production -t "ocelotsocialnetwork/backend:latest" -t "ocelotsocialnetwork/backend:${VERSION}" -t "ocelotsocialnetwork/backend:${BUILD_VERSION}" backend/
+  #        docker save "ocelotsocialnetwork/backend" > /tmp/backend.tar
+  #    - name: Upload Artifact
+  #      uses: actions/upload-artifact@v2
+  #      with:
+  #        name: docker-backend-production
+  #        path: /tmp/backend.tar
+
+  ##############################################################################
+  # JOB: DOCKER BUILD PRODUCTION WEBAPP ########################################
+  ##############################################################################
+  #build_production_webapp:
+  #  name: Docker Build Production - WebApp
+  #  runs-on: ubuntu-latest
+  #  needs: [prepare]
+  #  steps:
+  #    ##########################################################################
+  #    # CHECKOUT CODE ##########################################################
+  #    ##########################################################################
+  #    - name: Checkout code
+  #      uses: actions/checkout@v2
+  #    ##########################################################################
+  #    # SET ENVS ###############################################################
+  #    ##########################################################################
+  #    - name: ENV - VERSION
+  #      run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
+  #    - name: ENV - BUILD_DATE
+  #      run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+  #    - name: ENV - BUILD_VERSION
+  #      run: echo "BUILD_VERSION=${VERSION}.${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+  #    - name: ENV - BUILD_COMMIT
+  #      run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
+  #    ##########################################################################
+  #    # BUILD WEBAPP DOCKER IMAGE (build) ######################################
+  #    ##########################################################################
+  #    - name: webapp | Build `production` image
+  #      run: |
+  #        docker build --target production -t "ocelotsocialnetwork/webapp:latest" -t "ocelotsocialnetwork/webapp:${VERSION}" -t "ocelotsocialnetwork/webapp:${BUILD_VERSION}" webapp/
+  #        docker save "ocelotsocialnetwork/webapp" > /tmp/webapp.tar
+  #    - name: Upload Artifact
+  #      uses: actions/upload-artifact@v2
+  #      with:
+  #        name: docker-webapp-production
+  #        path: /tmp/webapp.tar
+
+  ##############################################################################
+  # JOB: DOCKER BUILD PRODUCTION MAINTENANCE ###################################
+  ##############################################################################
+  #build_production_maintenance:
+  #  name: Docker Build Production - Maintenance
+  #  runs-on: ubuntu-latest
+  #  needs: [prepare]
+  #  steps:
+  #    ##########################################################################
+  #    # CHECKOUT CODE ##########################################################
+  #    ##########################################################################
+  #    - name: Checkout code
+  #      uses: actions/checkout@v2
+  #    ##########################################################################
+  #    # SET ENVS ###############################################################
+  #    ##########################################################################
+  #    - name: ENV - VERSION
+  #      run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
+  #    - name: ENV - BUILD_DATE
+  #      run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+  #    - name: ENV - BUILD_VERSION
+  #      run: echo "BUILD_VERSION=${VERSION}.${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+  #    - name: ENV - BUILD_COMMIT
+  #      run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
+  #    ##########################################################################
+  #    # BUILD MAINTENANCE DOCKER IMAGE (build) #################################
+  #    ##########################################################################
+  #    - name: maintenance | Build `production` image
+  #      # TODO: --target production
+  #      run: |
+  #        docker build -t "ocelotsocialnetwork/maintenance:latest" -t "ocelotsocialnetwork/maintenance:${VERSION}" -t "ocelotsocialnetwork/maintenance:${BUILD_VERSION}" webapp/ -f webapp/Dockerfile.maintenance
+  #        docker save "ocelotsocialnetwork/maintenance" > /tmp/maintenance.tar
+  #    - name: Upload Artifact
+  #      uses: actions/upload-artifact@v2
+  #      with:
+  #        name: docker-maintenance-production
+  #        path: /tmp/maintenance.tar
+
+  ##############################################################################
+  # JOB: UPLOAD TO DOCKERHUB ###################################################
+  ##############################################################################
+  upload_to_dockerhub:
+    name: Upload to Dockerhub
+    runs-on: ubuntu-latest
+    needs: [build_production_frontend]
+    env:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ##########################################################################
+      # DOWNLOAD DOCKER IMAGES #################################################
+      ##########################################################################
+      - name: Download Docker Image (Neo4J)
+        uses: actions/download-artifact@v2
+        with:
+          name: docker-frontend-production
+          path: /tmp
+      - name: Load Docker Image
+        run: docker load < /tmp/frontend.tar
+      #- name: Download Docker Image (Backend)
+      #  uses: actions/download-artifact@v2
+      #  with:
+      #    name: docker-backend-production
+      #    path: /tmp
+      #- name: Load Docker Image
+      #  run: docker load < /tmp/backend.tar
+      #- name: Download Docker Image (WebApp)
+      #  uses: actions/download-artifact@v2
+      #  with:
+      #    name: docker-webapp-production
+      #    path: /tmp
+      #- name: Load Docker Image
+      #  run: docker load < /tmp/webapp.tar
+      #- name: Download Docker Image (Maintenance)
+      #  uses: actions/download-artifact@v2
+      #  with:
+      #    name: docker-maintenance-production
+      #    path: /tmp
+      #- name: Load Docker Image
+      #  run: docker load < /tmp/maintenance.tar
+      ##########################################################################
+      # Upload #################################################################
+      ##########################################################################
+      - name: login to dockerhub
+        run: echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin
+      - name: Push frontend
+        run: docker push --all-tags gradido/frontend
+      #- name: Push backend
+      #  run: docker push --all-tags ocelotsocialnetwork/backend
+      #- name: Push webapp
+      #  run: docker push --all-tags ocelotsocialnetwork/webapp
+      #- name: Push maintenance
+      #  run: docker push --all-tags ocelotsocialnetwork/maintenance
+
+  ##############################################################################
+  # JOB: GITHUB TAG LATEST VERSION #############################################
+  ##############################################################################
+  github_tag:
+    name: Tag latest version on Github
+    runs-on: ubuntu-latest
+    needs: [upload_to_dockerhub]
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # Fetch full History for changelog
+      ##########################################################################
+      # SET ENVS ###############################################################
+      ##########################################################################
+      - name: ENV - VERSION
+        run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
+      - name: ENV - BUILD_DATE
+        run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+      - name: ENV - BUILD_VERSION
+        run: echo "BUILD_VERSION=${VERSION}.${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+      - name: ENV - BUILD_COMMIT
+        run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
+      ##########################################################################
+      # Push version tag to GitHub #############################################
+      ##########################################################################
+      # TODO: this will error on duplicate
+      #- name: package-version-to-git-tag
+      #  uses: pkgdeps/git-tag-action@v2
+      #  with:
+      #    github_token: ${{ secrets.GITHUB_TOKEN }}
+      #    github_repo: ${{ github.repository }}
+      #    version: ${{ env.VERSION }}
+      #    git_commit_sha: ${{ github.sha }}
+      #    git_tag_prefix: "v"
+      ##########################################################################
+      # Push build tag to GitHub ###############################################
+      ##########################################################################
+      - name: package-version-to-git-tag + build number
+        uses: pkgdeps/git-tag-action@v2
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_repo: ${{ github.repository }}
+          version: ${{ env.BUILD_VERSION }}
+          git_commit_sha: ${{ github.sha }}
+          git_tag_prefix: "b"
+      ##########################################################################
+      # Push release tag to GitHub #############################################
+      ##########################################################################
+      - name: yarn install
+        run: yarn install
+      - name: generate changelog
+        run: yarn auto-changelog --latest-version ${{ env.VERSION }} --unreleased-only
+      - name: package-version-to-git-release
+        continue-on-error: true # Will fail if tag exists
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ env.VERSION }}
+          release_name: ${{ env.VERSION }}
+          body_path: ./CHANGELOG.md
+          draft: false
+          prerelease: false
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..e8dfbab4e
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,244 @@
+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]
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ##########################################################################
+      # NEO4J ##################################################################
+      ##########################################################################
+      - name: Frontend | Build `test` image
+        run: |
+          docker build --target test -t "gradido/frontend:test" frontend/
+          docker save "gradido/frontend:test" > /tmp/frontend.tar
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: docker-frontend-test
+          path: /tmp/frontend.tar
+
+  ##############################################################################
+  # JOB: DOCKER BUILD TEST BACKEND #############################################
+  ##############################################################################
+  #build_test_backend:
+  #  name: Docker Build Test - Backend
+  #  runs-on: ubuntu-latest
+  #  needs: [prepare]
+  #  steps:
+  #    ##########################################################################
+  #    # CHECKOUT CODE ##########################################################
+  #    ##########################################################################
+  #    - name: Checkout code
+  #      uses: actions/checkout@v2
+  #    ##########################################################################
+  #    # BUILD BACKEND DOCKER IMAGE (build) #####################################
+  #    ##########################################################################
+  #    - name: backend | Build `test` image
+  #      run: |
+  #        docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
+  #        docker save "ocelotsocialnetwork/backend:test" > /tmp/backend.tar
+  #    - name: Upload Artifact
+  #      uses: actions/upload-artifact@v2
+  #      with:
+  #        name: docker-backend-test
+  #        path: /tmp/backend.tar
+
+  ##############################################################################
+  # JOB: DOCKER BUILD TEST WEBAPP ##############################################
+  ##############################################################################
+  #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
+
+  ##############################################################################
+  # JOB: LINT FRONTEND #########################################################
+  ##############################################################################
+  lint_frontend:
+    name: Lint frontend
+    runs-on: ubuntu-latest
+    needs: [build_test_frontend]
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ##########################################################################
+      # DOWNLOAD DOCKER IMAGE ##################################################
+      ##########################################################################
+      - name: Download Docker Image (Frontend)
+        uses: actions/download-artifact@v2
+        with:
+          name: docker-frontend-test
+          path: /tmp
+      - name: Load Docker Image
+        run: docker load < /tmp/frontend.tar
+      ##########################################################################
+      # LINT FRONTEND ###########################################################
+      ##########################################################################
+      - name: frontend | Lint
+        run: docker run --rm gradido/frontend:test yarn run lint
+
+  ##############################################################################
+  # JOB: LINT WEBAPP ###########################################################
+  ##############################################################################
+  #lint_webapp:
+  #  name: Lint webapp
+  #  runs-on: ubuntu-latest
+  #  needs: [build_test_webapp]
+  #  steps:
+  #    ##########################################################################
+  #    # CHECKOUT CODE ##########################################################
+  #    ##########################################################################
+  #    - name: Checkout code
+  #      uses: actions/checkout@v2
+  #    ##########################################################################
+  #    # DOWNLOAD DOCKER IMAGE ##################################################
+  #    ##########################################################################
+  #    - 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
+  #    ##########################################################################
+  #    # LINT WEBAPP ############################################################
+  #    ##########################################################################
+  #    - name: webapp | Lint
+  #      run: docker run --rm ocelotsocialnetwork/webapp:test yarn run lint
+
+  ##############################################################################
+  # JOB: UNIT TEST BACKEND #####################################################
+  ##############################################################################
+  #unit_test_backend:
+  #  name: Unit tests - backend
+  #  runs-on: ubuntu-latest
+  #  needs: [build_test_neo4j,build_test_backend]
+  #  steps:
+  #    ##########################################################################
+  #    # CHECKOUT CODE ##########################################################
+  #    ##########################################################################
+  #    - name: Checkout code
+  #      uses: actions/checkout@v2
+  #    ##########################################################################
+  #    # DOWNLOAD DOCKER IMAGES #################################################
+  #    ##########################################################################
+  #    - name: Download Docker Image (Neo4J)
+  #      uses: actions/download-artifact@v2
+  #      with:
+  #        name: docker-neo4j-image
+  #        path: /tmp
+  #    - name: Load Docker Image
+  #      run: docker load < /tmp/neo4j.tar
+  #    - name: Download Docker Image (Backend)
+  #      uses: actions/download-artifact@v2
+  #      with:
+  #        name: docker-backend-test
+  #        path: /tmp
+  #    - name: Load Docker Image
+  #      run: docker load < /tmp/backend.tar
+  #    ##########################################################################
+  #    # UNIT TESTS BACKEND #####################################################
+  #    ##########################################################################
+  #    # 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 neo4j backend
+  #    - name: backend | Initialize Database
+  #      run: docker-compose exec -T backend yarn db:migrate init
+  #    - name: backend | Unit test
+  #      run: docker-compose exec -T backend yarn test
+
+  ##############################################################################
+  # JOB: UNIT TEST WEBAPP ######################################################
+  ##############################################################################
+  #unit_test_webapp:
+  #  name: Unit tests - webapp
+  #  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
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 397b4a762..b12f322a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.log
+/node_modules/*
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 87ddbfce6..116400a7b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,6 +5,3 @@
 [submodule "login_server"]
 	path = login_server
 	url = git@github.com:gradido/gradido_login_server.git
-[submodule "community_server"]
-	path = community_server
-	url = git@github.com:gradido/gradido_community_server.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..ac578be89
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,7 @@
+### Changelog
+
+All notable changes to this project will be documented in this file. Dates are displayed in UTC.
+
+Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
+
+#### 0.9.1
diff --git a/docker-compose.yml b/docker-compose.yml
index a423b22da..12e839535 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -121,6 +121,7 @@ services:
   #########################################################  
   ## GRADIDO NODE test ###################################
   #########################################################
+<<<<<<< HEAD
   # gradido-node-test:
   #   build:
   #     context: .
@@ -128,6 +129,15 @@ services:
   #   container_name: gn-test
   #   working_dir: /opt/gn/build
   #   command: ["./unit_tests"]
+=======
+ # gradido-node-test:
+ #   build:
+ #     context: .
+ #     dockerfile: ./gn/docker/deprecated-hedera-node/Dockerfile
+ #   container_name: gn-test
+ #   working_dir: /opt/gn/build
+ #   command: ["./unit_tests"]
+>>>>>>> cc95d22989ca12044bcbbc5e45c1e34c930c9b00
       
 networks:
   external-net:
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 486dbdca4..f133926b2 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -81,9 +81,9 @@ CMD /bin/sh -c "yarn run dev"
 FROM base as production
 
 # Copy "binary"-files from build image
-COPY --from=build ${DOCKER_WORKDIR}/.nuxt ./.nuxt
-COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
-COPY --from=build ${DOCKER_WORKDIR}/nuxt.config.js ./nuxt.config.js
+COPY --from=build ${DOCKER_WORKDIR}/dist ./dist
+#COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
+#COPY --from=build ${DOCKER_WORKDIR}/nuxt.config.js ./nuxt.config.js
 # Copy static files
 # TODO - this should be one Folder containign all stuff needed to be copied
 #COPY --from=build ${DOCKER_WORKDIR}/constants ./constants
diff --git a/frontend/package.json b/frontend/package.json
index 74ba8a588..420d5ebce 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.0.0",
+  "version": "0.9.1",
   "private": true,
   "scripts": {
     "start": "node server.js",
@@ -28,6 +28,7 @@
     "fuse.js": "^3.2.0",
     "google-maps": "^3.2.1",
     "nouislider": "^12.1.0",
+    "particles-bg-vue": "1.2.3",
     "perfect-scrollbar": "^1.3.0",
     "qrcode": "^1.4.4",
     "quill": "^1.3.6",
@@ -43,13 +44,12 @@
     "vue-flatpickr-component": "^8.1.2",
     "vue-good-table": "^2.21.3",
     "vue-i18n": "^8.22.4",
+    "vue-moment": "^4.1.0",
     "vue-qrcode": "^0.3.5",
     "vue-qrcode-reader": "^2.3.16",
     "vue-router": "^3.0.6",
     "vue2-transitions": "^0.2.3",
-    "vuex": "^3.6.0",
-    "particles-bg-vue": "1.2.3",
-    "vue-moment": "^4.1.0"
+    "vuex": "^3.6.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.7.0",
diff --git a/mariadb/setup_dbs_different_user.sh b/mariadb/setup_dbs_different_user.sh
index 8af616ea0..d362a1971 100755
--- a/mariadb/setup_dbs_different_user.sh
+++ b/mariadb/setup_dbs_different_user.sh
@@ -36,7 +36,7 @@ EOFMYSQL
 cd ../login_server/skeema 
 sudo cat << EOF > .skeema
 [production]
-flavor=mariadb:10.1.47
+flavor=mariadb:10.3.25
 host=127.0.0.1
 port=3306
 user=$LOGIN_DB_USER
@@ -57,7 +57,7 @@ cd ../../..
 cd community_server/skeema
 sudo cat << EOF > .skeema
 [production]
-flavor=mariadb:10.1.47
+flavor=mariadb:10.3.25
 host=127.0.0.1
 port=3306
 user=$COMMUNITY_DB_USER
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..839e88fd9
--- /dev/null
+++ b/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "gradido",
+  "version": "0.9.1",
+  "description": "Gradido",
+  "main": "index.js",
+  "repository": "git@github.com:gradido/gradido.git",
+  "author": "Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>",
+  "license": "MIT",
+  "scripts": {
+    "release": "yarn version --no-git-tag-version --no-commit-hooks --no-commit && auto-changelog --latest-version $(node -p -e \"require('./package.json').version\") && cd frontend && yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version $(node -p -e \"require('./../package.json').version\")"
+  },
+  "dependencies": {
+    "auto-changelog": "^2.2.1"
+  }
+}
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000..4098c4c49
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,77 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+auto-changelog@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/auto-changelog/-/auto-changelog-2.2.1.tgz#a031fbf1dfe140dda2ec8c77a524031478a0e933"
+  integrity sha512-XlykJfZrXlWUAADBqGoN1elmntrRcx7oEymyYB3NRPEZxv0TfYHfivmwzejUMnwAdXKCgbQPo7GV5ULs3jwpfw==
+  dependencies:
+    commander "^5.0.0"
+    handlebars "^4.7.3"
+    lodash.uniqby "^4.7.0"
+    node-fetch "^2.6.0"
+    parse-github-url "^1.0.2"
+    semver "^6.3.0"
+
+commander@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+
+handlebars@^4.7.3:
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
+lodash.uniqby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
+  integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
+
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+neo-async@^2.6.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+node-fetch@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
+parse-github-url@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-github-url/-/parse-github-url-1.0.2.tgz#242d3b65cbcdda14bb50439e3242acf6971db395"
+  integrity sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==
+
+semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+uglify-js@^3.1.4:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.1.tgz#2749d4b8b5b7d67460b4a418023ff73c3fefa60a"
+  integrity sha512-EWhx3fHy3M9JbaeTnO+rEqzCe1wtyQClv6q3YWq0voOj4E+bMZBErVS1GAHPDiRGONYq34M1/d8KuQMgvi6Gjw==
+
+wordwrap@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=

From 7bbdfd80515f9b69a9d644034fb5ccdd554bfdba Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 17 Mar 2021 14:11:47 +0100
Subject: [PATCH 04/24] docker-compose.yml

---
 docker-compose.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 12e839535..1017c860c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -121,15 +121,7 @@ services:
   #########################################################  
   ## GRADIDO NODE test ###################################
   #########################################################
-<<<<<<< HEAD
-  # gradido-node-test:
-  #   build:
-  #     context: .
-  #     dockerfile: ./gn/docker/deprecated-hedera-node/Dockerfile
-  #   container_name: gn-test
-  #   working_dir: /opt/gn/build
-  #   command: ["./unit_tests"]
-=======
+
  # gradido-node-test:
  #   build:
  #     context: .
@@ -137,7 +129,6 @@ services:
  #   container_name: gn-test
  #   working_dir: /opt/gn/build
  #   command: ["./unit_tests"]
->>>>>>> cc95d22989ca12044bcbbc5e45c1e34c930c9b00
       
 networks:
   external-net:

From 1b7d9533645c2c46314c6cf1b9f07c8ea86dbc11 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 17 Mar 2021 14:13:35 +0100
Subject: [PATCH 05/24] docker-compose.yml fix conflict

---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1017c860c..b0c30ca66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -121,7 +121,6 @@ services:
   #########################################################  
   ## GRADIDO NODE test ###################################
   #########################################################
-
  # gradido-node-test:
  #   build:
  #     context: .

From 6f8d39405a54ea18982531bb2e5cedc6e341d0bf Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 18 Mar 2021 09:33:19 +0100
Subject: [PATCH 06/24] fix merge login_server, login ok

---
 docu/neue-struktur.drawio                     | 160 ++++++++++++++++++
 docu/neue-struktur.png                        | Bin 0 -> 79799 bytes
 frontend/src/apis/communityAPI.js             |   8 -
 frontend/src/store/store.js                   |  40 +++--
 frontend/src/views/AdminOverview.vue          |   4 +-
 frontend/src/views/KontoOverview/GddTable.vue |   5 +-
 6 files changed, 188 insertions(+), 29 deletions(-)
 create mode 100644 docu/neue-struktur.drawio
 create mode 100644 docu/neue-struktur.png

diff --git a/docu/neue-struktur.drawio b/docu/neue-struktur.drawio
new file mode 100644
index 000000000..98d84b645
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/docu/neue-struktur.png b/docu/neue-struktur.png
new file mode 100644
index 0000000000000000000000000000000000000000..43036a4a94dfc4c6cdd4a035e5bcb4a08633d0ae
GIT binary patch
literal 79799
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
VM~)1lyf=V91056X3auND{ujb)I3WN4

literal 0
HcmV?d00001

diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js
index 77856862a..a1da31707 100644
--- a/frontend/src/apis/communityAPI.js
+++ b/frontend/src/apis/communityAPI.js
@@ -1,14 +1,6 @@
 import axios from 'axios';
 import CONFIG from '../config'
 
-// axios.defaults.withCredentials = true ist eine Anweisung an Axios, alle Anfragen mit Anmeldeinformationen zu senden, 
-// wie z. Autorisierungsheader, TLS-Client-Zertifikate oder Cookies (wie in unserem Fall).
-axios.defaults.withCredentials = true
-
-//Wir setzen unsere axios.defaults.baseURL für unsere Axios-Anfrage auf unsere. 
-// Auf APIdiese Weise wird diese Basis-URL verwendet, wenn wir über Axios senden. Damit können wir nur unsere Endpunkte wie /registerund /loginzu unseren Aktionen hinzufügen, ohne jedes Mal die vollständige URL anzugeben.
-axios.defaults.baseURL = CONFIG.COMMUNITY_API_STATE_BALANCE_URL
-
 const apiGet = async (url) => {
   try {
     const result = await axios.get(url);
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index d8930ac26..35731a213 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -5,7 +5,7 @@ import router from '../routes/router.js'
 import loginAPI from '../apis/loginAPI'
 import communityAPI from '../apis/communityAPI'
 import axios from 'axios'
-// import CONFIG from '../config'
+import CONFIG from '../config'
 
 
 export const store = new Vuex.Store({
@@ -69,20 +69,32 @@ export const store = new Vuex.Store({
     login: async ({ dispatch, commit }, data) => {
       console.log('action: login')
       console.log('action:  data', data.email)
+      //console.log('action: CONFIG.LOGIN_API_URL', CONFIG.LOGIN_API_URL)
+      
+      axios.post("http://localhost/login_api/unsecureLogin/", 
+                  {"email": data.email, "password":data.password }).then((result) => {
+            console.log("store login result", result)
+       
+     // const result = await loginAPI.login(data.email,data.password)
+     console.log('result.data.state',result.data.state)
+     console.log('result.data.session_id',result.data.session_id)
+     
+      
+      if( result.data.state ){
+        commit('session_id', result.data.session_id)
+        commit('email', data.email)
+        $cookies.set('gdd_session_id', result.data.session_id);
+        $cookies.set('gdd_u',  data.email);
+        router.push('/overview')
+      } else {
+        // Register failed, we perform a logout
+        dispatch('logout')
+      }
+      }, (error) => {
+        console.log(error);
+      });
+
       
-      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)
-     //   $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')
-     // } 
     },
     passwordReset: async (data) => {
       console.log("<<<<<<<<<<< PASSWORT RESET TODO >>>>>>>>>>>", data.email)
diff --git a/frontend/src/views/AdminOverview.vue b/frontend/src/views/AdminOverview.vue
index 5d4040d24..6ed76740e 100644
--- a/frontend/src/views/AdminOverview.vue
+++ b/frontend/src/views/AdminOverview.vue
@@ -226,9 +226,7 @@
   import AdminUserCreation from './AdminOverview/AdminUserCreation';
   import axios from 'axios';
 
-  // axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt.
-  axios.defaults.withCredentials = true
-
+ 
   export default {
     components: {
       LineChart,
diff --git a/frontend/src/views/KontoOverview/GddTable.vue b/frontend/src/views/KontoOverview/GddTable.vue
index f3a90cfca..2163574ab 100644
--- a/frontend/src/views/KontoOverview/GddTable.vue
+++ b/frontend/src/views/KontoOverview/GddTable.vue
@@ -40,10 +40,7 @@
 
 <script>
 import axios from 'axios';
-
-// axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt.
-axios.defaults.withCredentials = true
-
+ 
 export default {
   name: 'GddTable',  
   data(){

From 67393f50a7916769b19ded1fbe608dc7a6f14d4b Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 18 Mar 2021 13:18:36 +0100
Subject: [PATCH 07/24] reload after login fixed

---
 frontend/src/App.vue                          | 31 +++----
 frontend/src/apis/communityAPI.js             |  2 +
 frontend/src/store/store.js                   | 22 +++--
 frontend/src/views/KontoOverview.vue          | 14 ++-
 frontend/src/views/Layout/AuthLayout_gdd.vue  | 89 +------------------
 frontend/src/views/Layout/DashboardNavbar.vue | 14 +--
 frontend/src/views/Pages/Login.vue            | 14 ++-
 .../src/views/Pages/UserProfile/UserCard.vue  |  2 +-
 8 files changed, 55 insertions(+), 133 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 52976cf65..28669abef 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -20,23 +20,24 @@ export default {
     },
     mounted() {
       console.log("mounted")
-      console.log(" $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id")  )
-      console.log(" $cookies.isKey('gdd_session_id') ", $cookies.isKey("gdd_session_id")  )
-      const isSession = $cookies.isKey("gdd_session_id")
-      const getSession = $cookies.get("gdd_session_id")
-      console.log("this.isSession ", this.isSession  )
-
-      if ( $cookies.isKey("gdd_session_id")) {
-        //this.$store.state.email = this.$cookies.get('gdd_u') 
-        console.log("router to overview")
-        this.$router.push("/overview") 
-      }else {
-        console.log("router to LOGIN")
-        //this.$router.push("/login")
-      } 
     },
     created () { 
-      console.log("created")      
+      console.log("created")   
+ 
+     // console.log(" $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id")  )
+      console.log("app.vue $cookies.isKey('gdd_session_id') ", $cookies.isKey("gdd_session_id")  )
+       const isSession = $cookies.isKey("gdd_session_id")
+     // const getSession = $cookies.get("gdd_session_id")
+     // console.log("this.isSession ", this.isSession  )
+  console.log("xx", ( isSession == true))
+      if ( $cookies.isKey("gdd_session_id") == true) {
+        //this.$store.state.email = this.$cookies.get('gdd_u') 
+       console.log("app to overview")
+       this.$router.push("overview") 
+     }else {
+        console.log("router to LOGIN")
+        //this.$router.push("/login")
+      }    
     },
      data() {
     return {
diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js
index a1da31707..b88bd6c26 100644
--- a/frontend/src/apis/communityAPI.js
+++ b/frontend/src/apis/communityAPI.js
@@ -3,7 +3,9 @@ import CONFIG from '../config'
 
 const apiGet = async (url) => {
   try {
+    console.log("comm api url",url)
     const result = await axios.get(url);
+    console.log("comm api result",result)
     if(result.status !== 200){
       throw new Error('HTTP Status Error '+result.status)
     }
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 35731a213..4fdb4d201 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -5,7 +5,7 @@ import router from '../routes/router.js'
 import loginAPI from '../apis/loginAPI'
 import communityAPI from '../apis/communityAPI'
 import axios from 'axios'
-import CONFIG from '../config'
+//import CONFIG from '../config'
 
 
 export const store = new Vuex.Store({
@@ -68,9 +68,7 @@ export const store = new Vuex.Store({
   actions: {
     login: async ({ dispatch, commit }, data) => {
       console.log('action: login')
-      console.log('action:  data', data.email)
-      //console.log('action: CONFIG.LOGIN_API_URL', CONFIG.LOGIN_API_URL)
-      
+    
       axios.post("http://localhost/login_api/unsecureLogin/", 
                   {"email": data.email, "password":data.password }).then((result) => {
             console.log("store login result", result)
@@ -80,7 +78,7 @@ export const store = new Vuex.Store({
      console.log('result.data.session_id',result.data.session_id)
      
       
-      if( result.data.state ){
+      if( result.data.state == "success"){
         commit('session_id', result.data.session_id)
         commit('email', data.email)
         $cookies.set('gdd_session_id', result.data.session_id);
@@ -88,6 +86,7 @@ export const store = new Vuex.Store({
         router.push('/overview')
       } else {
         // Register failed, we perform a logout
+        console.log('action login to  logout start')
         dispatch('logout')
       }
       }, (error) => {
@@ -113,6 +112,7 @@ export const store = new Vuex.Store({
         router.push('/overview')
       } else {
         // Register failed, we perform a logout
+        console.log('action createUser to  logout start')
         dispatch('logout')
       }
     },     
@@ -150,12 +150,18 @@ export const store = new Vuex.Store({
      // 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)
+      console.log('action: accountBalance')
+      console.log('action: dispatch', dispatch)
+      console.log('action: state.session_id', state.session_id)
+      console.log(" action: $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id")  )
+      commit('session_id', $cookies.get("gdd_session_id"))
+        commit('email', $cookies.get("gdd_u"))
+      const result = await communityAPI.balance($cookies.get("gdd_session_id"))
+       console.log("accountBalance result", result)
       if(result.success) {
         commit('user_balance', result.result.data.balance)
       } else {
+        console.log('action accountBalance to  logout start')
         dispatch('logout')
       }
     }
diff --git a/frontend/src/views/KontoOverview.vue b/frontend/src/views/KontoOverview.vue
index fdc6ef5aa..85886da4a 100644
--- a/frontend/src/views/KontoOverview.vue
+++ b/frontend/src/views/KontoOverview.vue
@@ -25,11 +25,10 @@
   </div>
 </template>
 <script>
-  import GddStatus from './KontoOverview/GddStatus.vue';
-  import GddSent from './KontoOverview/GddSent.vue';
-  import GddTable from './KontoOverview/GddTable.vue';
-  //import GddAddWork from './KontoOverview/GddAddWork.vue';
-  import GddAddWork2 from './KontoOverview/GddAddWork2.vue';
+  import GddStatus    from './KontoOverview/GddStatus.vue';
+  import GddSent      from './KontoOverview/GddSent.vue';
+  import GddTable     from './KontoOverview/GddTable.vue';
+  import GddAddWork2  from './KontoOverview/GddAddWork2.vue';
   import GddWorkTable from './KontoOverview/GddWorkTable.vue';
 
   export default {  
@@ -38,13 +37,12 @@
       GddStatus,
       GddSent,
       GddTable,
-      //GddAddWork,
       GddAddWork2,
       GddWorkTable
      },
      created() { 
-       this.$store.dispatch('accountBalance')        
-     },
+       this.$store.dispatch('accountBalance',  $cookies.get("gdd_session_id"))        
+     }
   };
 </script>
 
diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue
index 1c7885849..b53eb676f 100644
--- a/frontend/src/views/Layout/AuthLayout_gdd.vue
+++ b/frontend/src/views/Layout/AuthLayout_gdd.vue
@@ -41,25 +41,10 @@
   </div>
 </template>
 <script>
-  import { BaseNav } from '@/components';
-  import { ZoomCenterTransition } from 'vue2-transitions';
 
-  export default {
-    components: {
-      //BaseNav,
-      //ZoomCenterTransition
-    },
-    props: {
-      backgroundColor: {
-        type: String,
-        default: 'black'
-      }
-    },
+  export default { 
     data() {
       return {
-        showMenu: false,
-        menuTransitionDuration: 250,
-        pageTransitionDuration: 200,
         year: new Date().getFullYear(),
         pageClass: 'login-page'
       };
@@ -76,80 +61,10 @@
         //  params: { lang: locale }
         //})
         //this.hideDropdown()
-      },
-      toggleNavbar() {
-        document.body.classList.toggle('nav-open');
-        this.showMenu = !this.showMenu;
-      },
-      closeMenu() {
-        document.body.classList.remove('nav-open');
-        this.showMenu = false;
-      },
-      setBackgroundColor() {
-        document.body.classList.add('bg-default');
-      },
-      removeBackgroundColor() {
-        document.body.classList.remove('bg-default');
-      },
-      updateBackground() {
-        if (!this.$route.meta.noBodyBackground) {
-          this.setBackgroundColor();
-        } else {
-          this.removeBackgroundColor()
-        }
-      }
-    },
-    beforeDestroy() {
-      this.removeBackgroundColor();
-    },
-    beforeRouteUpdate(to, from, next) {
-      // Close the mobile menu first then transition to next page
-      if (this.showMenu) {
-        this.closeMenu();
-        setTimeout(() => {
-          next();
-        }, this.menuTransitionDuration);
-      } else {
-        next();
-      }
-    },
-    watch: {
-      $route: {
-        immediate: true,
-        handler: function () {
-          this.updateBackground()
-        }
       }
     }
   };
 </script>
 <style lang="scss">
-  $scaleSize: 0.8;
-  @keyframes zoomIn8 {
-    from {
-      opacity: 0;
-      transform: scale3d($scaleSize, $scaleSize, $scaleSize);
-    }
-    100% {
-      opacity: 1;
-    }
-  }
-
-  .main-content .zoomIn {
-    animation-name: zoomIn8;
-  }
-
-  @keyframes zoomOut8 {
-    from {
-      opacity: 1;
-    }
-    to {
-      opacity: 0;
-      transform: scale3d($scaleSize, $scaleSize, $scaleSize);
-    }
-  }
-
-  .main-content .zoomOut {
-    animation-name: zoomOut8;
-  }
+   
 </style>
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 806afc6c5..a736e45d2 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -15,19 +15,7 @@
       </li>
     </b-navbar-nav>
     <b-navbar-nav class="align-items-center ml-auto ml-md-0">
-       <!-- <b-form class="navbar-search form-inline mr-sm-3"
-            :class="{'navbar-search-dark': type === 'default', 'navbar-search-light': type === 'light'}"
-            id="navbar-search-main">
-        <b-form-group class="mb-0">         
-          <b-input-group class="input-group-alternative input-group-merge">
-            <b-form-input placeholder="Search" type="text"> </b-form-input>
 
-            <div class="input-group-append">
-              <span class="input-group-text"><i class="fas fa-search"></i></span>
-            </div>
-          </b-input-group>  
-        </b-form-group>
-      </b-form> -->
       <base-dropdown menu-on-right
                      class="nav-item"
                      tag="li"
@@ -38,7 +26,7 @@
                  
             <b-media-body class="ml-2 d-none d-lg-block">
                <span class="avatar avatar-sm rounded-circle">
-                     <vue-qrcode :value="$store.state.email" type="image/png"/>
+                    <!-- <vue-qrcode :value="$store.state.email" /> -->
                   </span>
               <span class="mb-0 text-lg  font-weight-bold">{{this.$store.state.email}}</span>
             </b-media-body>
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index cf7427415..9550e5466 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -82,6 +82,18 @@
       onSubmit() {
         this.$store.dispatch('login', {"email":  this.model.email, "password":  this.model.password})
       }
-    }
+    },
+    created () { 
+      console.log("login.vue created")   
+  
+      if ( $cookies.isKey("gdd_session_id")) {
+        //this.$store.state.email = this.$cookies.get('gdd_u') 
+        console.log("login to overview")
+        this.$router.push("/overview") 
+      }else {
+        console.log("login to LOGIN")
+        //this.$router.push("/login")
+      }    
+    },
   }
 </script>
diff --git a/frontend/src/views/Pages/UserProfile/UserCard.vue b/frontend/src/views/Pages/UserProfile/UserCard.vue
index e698844a9..e55a9f1f5 100755
--- a/frontend/src/views/Pages/UserProfile/UserCard.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard.vue
@@ -4,7 +4,7 @@
       <b-col lg="3" class="order-lg-2">
         <div class="card-profile-image">
           <a href="#">
-            <vue-qrcode :value="$store.state.email"  type="image/png"/>
+            <vue-qrcode :value="$store.state.email" />
           </a>
         </div>
       </b-col>

From 1949260452d64b4ce8051aafba45b0befc1e5ac7 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Thu, 18 Mar 2021 12:55:04 +0000
Subject: [PATCH 08/24] fix bugs with begin of decay implementation

---
 .../src/Model/Entity/StateBalance.php         | 19 +++++++++++++++----
 .../Model/Transactions/TransactionBody.php    |  2 ++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/community_server/src/Model/Entity/StateBalance.php b/community_server/src/Model/Entity/StateBalance.php
index 174e785b4..871c55bd8 100644
--- a/community_server/src/Model/Entity/StateBalance.php
+++ b/community_server/src/Model/Entity/StateBalance.php
@@ -35,6 +35,15 @@ class StateBalance extends Entity
     
     protected $_virtual = ['decay'];
     
+    private function convertToTimestamp($dateOrTime)
+    {
+        if(method_exists($dateOrTime, 'getTimestamp')) {
+            return $dateOrTime->getTimestamp();
+        } else {
+            return $dateOrTime->i18nFormat(Time::UNIX_TIMESTAMP_FORMAT);
+        }
+    }
+    
     protected function _getDecay()
     {
       // decay factor in seconds per year
@@ -44,7 +53,7 @@ class StateBalance extends Entity
       // SELECT TIMESTAMPDIFF(SECOND, modified, CURDATE()) AS age_in_seconds from state_balances
       // decay_for_duration = decay_factor^seconds
       // decay = gradido_cent * decay_for_duration 
-      $decay_duration = intval(Time::now()->getTimestamp() - $this->record_date->getTimestamp());
+      $decay_duration = $this->decayDuration(Time::now());
       if($decay_duration === 0) {
           return $this->amount;
       }
@@ -53,7 +62,8 @@ class StateBalance extends Entity
     }
     public function partDecay($target_date)
     {
-        $decay_duration = intval($target_date->getTimestamp() - $this->record_date->getTimestamp());
+        if($target_date == null) return 0;
+        $decay_duration = $this->decayDuration($target_date);
         if($decay_duration <= 0) {
             return $this->amount;
         }
@@ -61,7 +71,8 @@ class StateBalance extends Entity
     }
     
     public function decayDuration($target_date)
-    {
-        return intval($target_date->getTimestamp() - $this->record_date->getTimestamp());
+    {   
+        if($this->record_date == null) return 0;
+        return intval($this->convertToTimestamp($target_date) - $this->record_date->getTimestamp());
     }
 }
diff --git a/community_server/src/Model/Transactions/TransactionBody.php b/community_server/src/Model/Transactions/TransactionBody.php
index 8164f33f7..ef785705c 100644
--- a/community_server/src/Model/Transactions/TransactionBody.php
+++ b/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

From 21aa8b9cc2024a0cfdab11e0309b3b1f3c8cbfd9 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 18 Mar 2021 15:02:54 +0100
Subject: [PATCH 09/24] fix-cookies-get-set

---
 frontend/src/App.vue                          | 17 ++++++++++-------
 frontend/src/store/store.js                   |  4 ++--
 frontend/src/views/Layout/DashboardNavbar.vue |  4 +++-
 frontend/src/views/Pages/Login.vue            | 18 +++---------------
 frontend/src/views/Pages/Password.vue         |  4 ++--
 frontend/src/views/Pages/Register.vue         |  4 ++--
 6 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 28669abef..38fb24619 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -25,18 +25,21 @@ export default {
       console.log("created")   
  
      // console.log(" $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id")  )
-      console.log("app.vue $cookies.isKey('gdd_session_id') ", $cookies.isKey("gdd_session_id")  )
-       const isSession = $cookies.isKey("gdd_session_id")
-     // const getSession = $cookies.get("gdd_session_id")
-     // console.log("this.isSession ", this.isSession  )
-  console.log("xx", ( isSession == true))
+     // console.log("app.vue $cookies.isKey('gdd_session_id') ", $cookies.isKey("gdd_session_id")  )
+      // const isSession = $cookies.isKey("gdd_session_id")
+      // const getSession = $cookies.get("gdd_session_id")
+      // console.log("this.isSession ", this.isSession  )
+      //  console.log("xx", ( isSession == true))
       if ( $cookies.isKey("gdd_session_id") == true) {
         //this.$store.state.email = this.$cookies.get('gdd_u') 
+         console.log("cookies to store.state")
+        this.$store.commit('session_id', $cookies.get("gdd_session_id"))
+        this.$store.commit('email', $cookies.get("gdd_u"))
        console.log("app to overview")
        this.$router.push("overview") 
      }else {
-        console.log("router to LOGIN")
-        //this.$router.push("/login")
+        console.log("app.vue to LOout")
+        this.$store.dispatch('logout')
       }    
     },
      data() {
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 4fdb4d201..f87db8347 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -154,8 +154,8 @@ export const store = new Vuex.Store({
       console.log('action: dispatch', dispatch)
       console.log('action: state.session_id', state.session_id)
       console.log(" action: $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id")  )
-      commit('session_id', $cookies.get("gdd_session_id"))
-        commit('email', $cookies.get("gdd_u"))
+     // commit('session_id', $cookies.get("gdd_session_id"))
+      //  commit('email', $cookies.get("gdd_u"))
       const result = await communityAPI.balance($cookies.get("gdd_session_id"))
        console.log("accountBalance result", result)
       if(result.success) {
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index a736e45d2..4c6f9f6c0 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -4,7 +4,9 @@
     class="navbar-top navbar-expand"
     :class="{'navbar-dark': type === 'default'}"
   >
-    <a href="#" aria-current="page" class="h4 mb-0 text-white text-uppercase d-none d-lg-inline-block active router-link-active"> {{$route.name}} </a>
+    <a href="#" aria-current="page" class="h4 mb-0 text-uppercase d-none d-lg-inline-block active router-link-active"> 
+      {{$route.name}} 
+    </a>
     <!-- Navbar links -->
     <b-navbar-nav class="align-items-center ml-md-auto">
       <!-- This item dont have <b-nav-item> because item have data-action/data-target on tag <a>, wich we cant add -->
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 9550e5466..71c1616f6 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -6,8 +6,8 @@
         <div class="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">{{ $t('site.login.community')}}</p>
+              <h1>Gradido Wallet</h1>
+              <p class="text-lead">{{ $t('site.login.community')}}</p>
             </b-col>
           </b-row>
         </div>
@@ -82,18 +82,6 @@
       onSubmit() {
         this.$store.dispatch('login', {"email":  this.model.email, "password":  this.model.password})
       }
-    },
-    created () { 
-      console.log("login.vue created")   
-  
-      if ( $cookies.isKey("gdd_session_id")) {
-        //this.$store.state.email = this.$cookies.get('gdd_u') 
-        console.log("login to overview")
-        this.$router.push("/overview") 
-      }else {
-        console.log("login to LOGIN")
-        //this.$router.push("/login")
-      }    
-    },
+    }
   }
 </script>
diff --git a/frontend/src/views/Pages/Password.vue b/frontend/src/views/Pages/Password.vue
index af1dc5bc2..dc18a1cc7 100644
--- a/frontend/src/views/Pages/Password.vue
+++ b/frontend/src/views/Pages/Password.vue
@@ -5,8 +5,8 @@
         <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">{{ $t('site.password.title')}}</h1>
-              <p class="text-lead text-white">{{ $t('site.password.subtitle')}}</p>
+              <h1 >{{ $t('site.password.title')}}</h1>
+              <p class="text-lead">{{ $t('site.password.subtitle')}}</p>
             </b-col>
           </b-row>
         </div>
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index e3eb84805..d6592addd 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -6,8 +6,8 @@
         <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">{{ $t('site.signup.title')}}</h1>
-              <p class="text-lead text-white">{{ $t('site.signup.subtitle')}}</p>
+              <h1 >{{ $t('site.signup.title')}}</h1>
+              <p class="text-lead">{{ $t('site.signup.subtitle')}}</p>
             </b-col>
           </b-row>
         </div>

From e4e6cf967ecb548a9ac3c0f6b3858df364378eb1 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 18 Mar 2021 15:20:32 +0100
Subject: [PATCH 10/24] remove submodul

---
 .gitmodules                                   |  4 +--
 frontend/src/App.vue                          | 26 +++++--------------
 frontend/src/components/Modal.vue             |  2 +-
 frontend/src/views/AdminOverview.vue          |  2 +-
 frontend/src/views/Dashboard.vue              |  2 +-
 frontend/src/views/Layout/DashboardNavbar.vue | 14 +++++-----
 6 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 116400a7b..fab7b5b5e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,6 +2,4 @@
 	path = gn
 	url = https://github.com/gradido/gn.git
 	branch = master
-[submodule "login_server"]
-	path = login_server
-	url = git@github.com:gradido/gradido_login_server.git
+
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 38fb24619..6a229f115 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -18,27 +18,15 @@ export default {
   components: {
       ParticlesBg
     },
-    mounted() {
-      console.log("mounted")
-    },
-    created () { 
-      console.log("created")   
- 
-     // console.log(" $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id")  )
-     // console.log("app.vue $cookies.isKey('gdd_session_id') ", $cookies.isKey("gdd_session_id")  )
-      // const isSession = $cookies.isKey("gdd_session_id")
-      // const getSession = $cookies.get("gdd_session_id")
-      // console.log("this.isSession ", this.isSession  )
-      //  console.log("xx", ( isSession == true))
+    created () {  
+      console.log('%cWillkommen bei Gradido %cgreen text', 'font-weight:bold', 'color: green')
       if ( $cookies.isKey("gdd_session_id") == true) {
-        //this.$store.state.email = this.$cookies.get('gdd_u') 
-         console.log("cookies to store.state")
-        this.$store.commit('session_id', $cookies.get("gdd_session_id"))
-        this.$store.commit('email', $cookies.get("gdd_u"))
-       console.log("app to overview")
-       this.$router.push("overview") 
+         console.log('%cWillkommen zurück %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"))
+         this.$router.push("overview") 
      }else {
-        console.log("app.vue to LOout")
+        console.log("app.vue to Logout")
         this.$store.dispatch('logout')
       }    
     },
diff --git a/frontend/src/components/Modal.vue b/frontend/src/components/Modal.vue
index 44996d624..cc01518d1 100644
--- a/frontend/src/components/Modal.vue
+++ b/frontend/src/components/Modal.vue
@@ -26,7 +26,7 @@
 
           <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>
+            <base-button type="link" class="ml-auto" @click="$store.state.modals = false">abbrechen</base-button>
           </template>
         </modal>
      
diff --git a/frontend/src/views/AdminOverview.vue b/frontend/src/views/AdminOverview.vue
index 6ed76740e..41c1b1d99 100644
--- a/frontend/src/views/AdminOverview.vue
+++ b/frontend/src/views/AdminOverview.vue
@@ -65,7 +65,7 @@
             <b-row align-v="center" slot="header">
               <b-col>
                 <h6 class="text-light text-uppercase ls-1 mb-1">Charts</h6>
-                <h5 class="h3 text-white mb-0">Geschöpft</h5>
+                <h5 class="h3 mb-0">Geschöpft</h5>
               </b-col>
               <b-col>
                 <b-nav class="nav-pills justify-content-end">
diff --git a/frontend/src/views/Dashboard.vue b/frontend/src/views/Dashboard.vue
index d7313896d..79a1a03d7 100644
--- a/frontend/src/views/Dashboard.vue
+++ b/frontend/src/views/Dashboard.vue
@@ -68,7 +68,7 @@
             <b-row align-v="center" slot="header">
               <b-col>
                 <h6 class="text-light text-uppercase ls-1 mb-1">Overview</h6>
-                <h5 class="h3 text-white mb-0">Sales value</h5>
+                <h5 class="h3 mb-0">Sales value</h5>
               </b-col>
               <b-col>
                 <b-nav class="nav-pills justify-content-end">
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 4c6f9f6c0..1e77c16c5 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -5,7 +5,7 @@
     :class="{'navbar-dark': type === 'default'}"
   >
     <a href="#" aria-current="page" class="h4 mb-0 text-uppercase d-none d-lg-inline-block active router-link-active"> 
-      {{$route.name}} 
+      {{$route.name}}
     </a>
     <!-- Navbar links -->
     <b-navbar-nav class="align-items-center ml-md-auto">
@@ -23,14 +23,14 @@
                      tag="li"
                      title-tag="a"
                      title-classes="nav-link pr-0">
-        <a href="#" class="nav-link pr-0" @click.prevent slot="title-container">
-          <b-media no-body class="align-items-center">            
+        <a href="#" class="pr-1" @click.prevent slot="title-container">
+          <b-media no-body class="align-items-center">
                  
             <b-media-body class="ml-2 d-none d-lg-block">
                <span class="avatar avatar-sm rounded-circle">
-                    <!-- <vue-qrcode :value="$store.state.email" /> -->
+                     <vue-qrcode :value="$store.state.email" />  
                   </span>
-              <span class="mb-0 text-lg  font-weight-bold">{{this.$store.state.email}}</span>
+              <span class="mb-0 text-lg font-weight-bold">{{ $store.state.email }}</span>
             </b-media-body>
           </b-media>
         </a>
@@ -68,8 +68,8 @@
   </base-nav>
 </template>
 <script>
-import { CollapseTransition } from 'vue2-transitions';
-import { BaseNav } from '@/components';
+import { CollapseTransition } from 'vue2-transitions'
+import { BaseNav } from '@/components'
 import VueQrcode from 'vue-qrcode'
 
 export default {

From a1a79041c3fe906f3385bc1b4e1633ecfc07a932 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 18 Mar 2021 16:30:04 +0100
Subject: [PATCH 11/24] hide console log

---
 frontend/src/App.vue                          |  2 +-
 frontend/src/apis/communityAPI.js             |  2 --
 frontend/src/store/store.js                   | 30 +++++++++----------
 frontend/src/views/KontoOverview/GddSent.vue  | 28 ++++++-----------
 frontend/src/views/KontoOverview/GddTable.vue | 11 ++++---
 5 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 6a229f115..925cb52f6 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -21,7 +21,7 @@ export default {
     created () {  
       console.log('%cWillkommen bei Gradido %cgreen text', 'font-weight:bold', 'color: green')
       if ( $cookies.isKey("gdd_session_id") == true) {
-         console.log('%cWillkommen zurück %c'+$cookies.get("gdd_u")+'', 'font-weight:bold', 'color: orange')
+         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"))
          this.$router.push("overview") 
diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js
index b88bd6c26..a1da31707 100644
--- a/frontend/src/apis/communityAPI.js
+++ b/frontend/src/apis/communityAPI.js
@@ -3,9 +3,7 @@ import CONFIG from '../config'
 
 const apiGet = async (url) => {
   try {
-    console.log("comm api url",url)
     const result = await axios.get(url);
-    console.log("comm api result",result)
     if(result.status !== 200){
       throw new Error('HTTP Status Error '+result.status)
     }
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index f87db8347..a75e34a5e 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -67,15 +67,15 @@ 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')
     
       axios.post("http://localhost/login_api/unsecureLogin/", 
                   {"email": data.email, "password":data.password }).then((result) => {
-            console.log("store login result", result)
+           //  console.log("store login result", result)
        
      // const result = await loginAPI.login(data.email,data.password)
-     console.log('result.data.state',result.data.state)
-     console.log('result.data.session_id',result.data.session_id)
+     // console.log('result.data.state',result.data.state)
+     // console.log('result.data.session_id',result.data.session_id)
      
       
       if( result.data.state == "success"){
@@ -86,7 +86,7 @@ export const store = new Vuex.Store({
         router.push('/overview')
       } else {
         // Register failed, we perform a logout
-        console.log('action login to  logout start')
+        // console.log('action login to  logout start')
         dispatch('logout')
       }
       }, (error) => {
@@ -102,7 +102,7 @@ export const store = new Vuex.Store({
        // http://localhost/transaction-creations/ajaxCreate
     },
     createUser: async ({ commit, dispatch }, data) => {
-      console.log('action: createUser')
+      // 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)
@@ -112,7 +112,7 @@ export const store = new Vuex.Store({
         router.push('/overview')
       } else {
         // Register failed, we perform a logout
-        console.log('action createUser to  logout start')
+        // console.log('action createUser to  logout start')
         dispatch('logout')
       }
     },     
@@ -134,7 +134,7 @@ export const store = new Vuex.Store({
       //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)
+        //console.log("store ajaxCreate result", result)
        
       if( result.success ){
         // TODO
@@ -150,14 +150,14 @@ export const store = new Vuex.Store({
      // const result = await communityAPI.transactions(state.session_id)     
     },
     accountBalance: async ({ commit, dispatch, state }) => {
-      console.log('action: accountBalance')
-      console.log('action: dispatch', dispatch)
-      console.log('action: state.session_id', state.session_id)
-      console.log(" action: $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id")  )
-     // commit('session_id', $cookies.get("gdd_session_id"))
-      //  commit('email', $cookies.get("gdd_u"))
+      // console.log('action: accountBalance')
+      // console.log('action: dispatch', dispatch)
+      // console.log('action: state.session_id', state.session_id)
+      // console.log(" action: $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id")  )
+      // commit('session_id', $cookies.get("gdd_session_id"))
+      // commit('email', $cookies.get("gdd_u"))
       const result = await communityAPI.balance($cookies.get("gdd_session_id"))
-       console.log("accountBalance result", result)
+      // console.log("accountBalance result", result)
       if(result.success) {
         commit('user_balance', result.result.data.balance)
       } else {
diff --git a/frontend/src/views/KontoOverview/GddSent.vue b/frontend/src/views/KontoOverview/GddSent.vue
index 0cef089e6..b0a153b3b 100644
--- a/frontend/src/views/KontoOverview/GddSent.vue
+++ b/frontend/src/views/KontoOverview/GddSent.vue
@@ -13,12 +13,10 @@
                 </b-row>                     
                 <b-row>                     
                   <qrcode-stream @decode="onDecode" @detect="onDetect" ></qrcode-stream>
-                    <b-alert show  variant="secondary">
-                        
+                    <b-alert show  variant="secondary">                        
                         <span class="alert-text"><strong>QR Code Scanner</strong> - Scanne den QR Code deines Partners</span>
                     </b-alert>
-                    <b-alert show variant="warning" >
-                      
+                    <b-alert show variant="warning" >                      
                       <span class="alert-text"  @click="scan=false"><strong>abrechen!</strong></span>
                     </b-alert>
                 </b-row>  
@@ -38,10 +36,8 @@
                           size="lg"
                         class="mb-3"
                         >
-                          <b-input-group-prepend>
-                            
-                                <img src="img/icons/gradido/qr-scan-pure.png" width="80" height="auto" @click="scan=true"/>
-                             
+                          <b-input-group-prepend>                            
+                                <img src="img/icons/gradido/qr-scan-pure.png" width="80" height="auto" @click="scan=true"/>                             
                           </b-input-group-prepend>
                       <b-form-input 
                           id="input-1"
@@ -75,17 +71,13 @@
                         </b-form-input>
                         
                         <b-input-group-prepend>                           
-                           
                             <div class="h1">GDD</div>
-                           
                         </b-input-group-prepend>
 
                     </b-input-group>                           
                     <b-input-group>
-                      <b-input-group-prepend>                          
-                        
-                           <b-icon icon="chat-right-text" class="display-1"></b-icon> 
-                        
+                      <b-input-group-prepend>                        
+                           <b-icon icon="chat-right-text" class="display-1"></b-icon>
                       </b-input-group-prepend>
                       <b-form-textarea v-model="form.memo"></b-form-textarea>
                     </b-input-group>
@@ -97,7 +89,6 @@
                   <br>
                 </b-form> 
               </validation-observer>
-               
             </b-card>
           </b-collapse>
         </b-col>
@@ -133,14 +124,13 @@ export default {
      async onDecode (decodedString) {
            console.log('onDecode JSON.parse(decodedString)',JSON.parse(decodedString) )
            const arr = JSON.parse(decodedString) 
-           console.log('arr',arr[0].email )
+           // console.log('arr',arr[0].email )
            this.modal.h4 = 'Scan erfolgreich'
            this.modal.p = arr
            this.form.email = arr[0].email
            this.form.amount1 = arr[0].amount
-           console.log('arr mail',arr.email)
-           console.log('arr mail',arr.amount)
-      
+           // console.log('arr mail',arr.email)
+           // console.log('arr mail',arr.amount)      
           this.modals2 = true
       },
       async onDetect (promise) {
diff --git a/frontend/src/views/KontoOverview/GddTable.vue b/frontend/src/views/KontoOverview/GddTable.vue
index 2163574ab..c84d9a985 100644
--- a/frontend/src/views/KontoOverview/GddTable.vue
+++ b/frontend/src/views/KontoOverview/GddTable.vue
@@ -57,13 +57,12 @@ export default {
      axios.get("http://localhost/state-balances/ajaxListTransactions/"+ this.$store.state.session_id).then((result) => {
       //console.log("result",result)
       //console.log("result.state",result.data.state)
-     //
       //console.log("result.data.state == 'success'",result.data.state == "success")
    
-    //console.log("result.count",result.data.count)
-    // console.log("result.gdtSum",result.data.gdtSum)
-     console.log("result.transactions",typeof(result.data.transactions))
-     //commit('transactions', result.data.transactions)
+      //console.log("result.count",result.data.count)
+      //console.log("result.gdtSum",result.data.gdtSum)
+      //console.log("result.transactions",typeof(result.data.transactions))
+      //commit('transactions', result.data.transactions)
       this.$store.state.user.balance_gdt =  result.data.gdtSum
       this.items =  result.data.transactions
       this.count = result.data.count
@@ -76,7 +75,7 @@ export default {
    },
   computed: {
   filteredItems(a) {
-    console.log("filteredItems date",a.items)
+    // console.log("filteredItems date",a.items)
     return a.items
     
   }

From 04c772b1e49d6c3c8f257f85a038861b9ab25947 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 18 Mar 2021 17:11:16 +0100
Subject: [PATCH 12/24] made login respect the env variable by using loginAPI
 file

---
 frontend/src/store/store.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index a75e34a5e..788f52d2e 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -69,11 +69,11 @@ export const store = new Vuex.Store({
     login: async ({ dispatch, commit }, data) => {
       // console.log('action: login')
     
-      axios.post("http://localhost/login_api/unsecureLogin/", 
-                  {"email": data.email, "password":data.password }).then((result) => {
+      //axios.post("http://localhost/login_api/unsecureLogin/", 
+      //            {"email": data.email, "password":data.password }).then((result) => {
            //  console.log("store login result", result)
        
-     // const result = await loginAPI.login(data.email,data.password)
+      const result = await loginAPI.login(data.email,data.password)
      // console.log('result.data.state',result.data.state)
      // console.log('result.data.session_id',result.data.session_id)
      
@@ -89,9 +89,9 @@ export const store = new Vuex.Store({
         // console.log('action login to  logout start')
         dispatch('logout')
       }
-      }, (error) => {
-        console.log(error);
-      });
+      //}, (error) => {
+      //  console.log(error);
+      //});
 
       
     },

From 38ba2ae1e9d64b2047fe981e56f7ccb3f53f7d57 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 18 Mar 2021 17:18:57 +0100
Subject: [PATCH 13/24] try to fix api for login

---
 frontend/src/store/store.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 788f52d2e..c33fbb338 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -78,10 +78,10 @@ export const store = new Vuex.Store({
      // console.log('result.data.session_id',result.data.session_id)
      
       
-      if( result.data.state == "success"){
-        commit('session_id', result.data.session_id)
+      if( result.success){
+        commit('session_id', result.result.data.session_id)
         commit('email', data.email)
-        $cookies.set('gdd_session_id', result.data.session_id);
+        $cookies.set('gdd_session_id', result.result.data.session_id);
         $cookies.set('gdd_u',  data.email);
         router.push('/overview')
       } else {

From c48754cb9ce9703cc16ce529749fbde9378c46c1 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 18 Mar 2021 17:33:05 +0100
Subject: [PATCH 14/24] fixed remainign two lint errors

---
 frontend/src/views/Layout/DashboardNavbar.vue | 2 +-
 frontend/src/views/NotFoundPage.vue           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 1e77c16c5..ad669c196 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -74,7 +74,7 @@ import VueQrcode from 'vue-qrcode'
 
 export default {
   components: {
-   CollapseTransition,
+   //CollapseTransition,
     BaseNav,
     VueQrcode
   },
diff --git a/frontend/src/views/NotFoundPage.vue b/frontend/src/views/NotFoundPage.vue
index c80dfbfc7..17c027880 100755
--- a/frontend/src/views/NotFoundPage.vue
+++ b/frontend/src/views/NotFoundPage.vue
@@ -363,7 +363,7 @@ export default {
   name: 'not-found',
   data() {
     return {
-          anime:{
+anime:{
   targets: '.row svg',
   translateY: 10,
   autoplay: true,
@@ -371,7 +371,7 @@ export default {
   easing: 'easeInOutSine',
   direction: 'alternate'
 },
-anime:{
+anime2:{
   targets: '#zero',
   translateX: 10,
   autoplay: true,

From e2b15a6276b8c2f5f53b1e08b513a58475a4691b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 18 Mar 2021 17:50:13 +0100
Subject: [PATCH 15/24] removed console eslint rule(production)

---
 frontend/.eslintrc.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index fe2660bd9..638b2d891 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -5,7 +5,8 @@ module.exports = {
   },
   extends: ['plugin:vue/essential'],
   rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    // TODO no console!
+    'no-console': 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   },
   parserOptions: {

From c0b92d74b2fb4868c6743140c339e51c89cf03ce Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 18 Mar 2021 18:02:41 +0100
Subject: [PATCH 16/24] v0.9.2

---
 CHANGELOG.md          | 21 +++++++++++++++++++++
 frontend/package.json |  2 +-
 package.json          |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac578be89..7821e6c89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,4 +4,25 @@ 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.2](https://github.com/gradido/gradido/compare/0.9.1...0.9.2)
+
+- 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)
diff --git a/frontend/package.json b/frontend/package.json
index 420d5ebce..5100e736a 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "private": true,
   "scripts": {
     "start": "node server.js",
diff --git a/package.json b/package.json
index 839e88fd9..ea12c0a50 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",

From 187811f87924a0b3b15c32b3dd1fa8ee2c1c6d46 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Mar 2021 14:03:05 +0100
Subject: [PATCH 17/24] build community server build login server removed old
 gradido node push workflow(not working)

---
 .github/workflows/push.yml |  18 ------
 .github/workflows/test.yml | 114 ++++++++++++++++++++++---------------
 2 files changed, 67 insertions(+), 65 deletions(-)
 delete mode 100644 .github/workflows/push.yml

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
deleted file mode 100644
index 2e5bf99ab..000000000
--- a/.github/workflows/push.yml
+++ /dev/null
@@ -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
-
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e8dfbab4e..8879a34bb 100644
--- a/.github/workflows/test.yml
+++ b/.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,56 @@ 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
+      ##########################################################################
+      # BUILD LOGIN SERVER DOCKER IMAGE (build) ################################
+      ##########################################################################
+      - name: login server | Build `test` image
+        run: |
+          docker build --target login_server_debug -t "gradido/loginserver:test" login_server/Dockerfile.debug
+          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" community_server/
+          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 #########################################################
@@ -241,4 +246,19 @@ jobs:
   #      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
\ No newline at end of file
+  #      run: docker-compose exec -T webapp yarn test
+
+  #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
\ No newline at end of file

From ea65400de071b17a3e186199e0fe66150ed44ae0 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Mar 2021 17:35:04 +0100
Subject: [PATCH 18/24] fixed docker builds (they work differently - why?)

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8879a34bb..2248b65dc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -74,7 +74,7 @@ jobs:
       ##########################################################################
       - name: login server | Build `test` image
         run: |
-          docker build --target login_server_debug -t "gradido/loginserver:test" login_server/Dockerfile.debug
+          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
@@ -100,7 +100,7 @@ jobs:
       ##########################################################################
       - name: community server | Build `test` image
         run: |
-          docker build -t "gradido/communityserver:test" community_server/
+          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

From bf34acb573b14cdb2f539ec2817c4a8918979765 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Mar 2021 18:17:39 +0100
Subject: [PATCH 19/24] include submodules in checkout for login server

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2248b65dc..e340b4889 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -69,6 +69,7 @@ jobs:
       ##########################################################################
       - name: Checkout code
         uses: actions/checkout@v2
+        submodules: recursive
       ##########################################################################
       # BUILD LOGIN SERVER DOCKER IMAGE (build) ################################
       ##########################################################################

From abb5f1170d1952e00c3583b1bcf261a9bf1fc326 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Mar 2021 18:18:38 +0100
Subject: [PATCH 20/24] corrected syntax

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e340b4889..d92f167dc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -69,7 +69,8 @@ jobs:
       ##########################################################################
       - name: Checkout code
         uses: actions/checkout@v2
-        submodules: recursive
+        with:
+          - submodules: recursive
       ##########################################################################
       # BUILD LOGIN SERVER DOCKER IMAGE (build) ################################
       ##########################################################################

From 7f01a890ae3b9452de7e23310427cb58dc05aa8c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Mar 2021 18:19:33 +0100
Subject: [PATCH 21/24] more syntax

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d92f167dc..ed55ced01 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -70,7 +70,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
-          - submodules: recursive
+          submodules: recursive
       ##########################################################################
       # BUILD LOGIN SERVER DOCKER IMAGE (build) ################################
       ##########################################################################

From dc63b4ccaff1df140ea5d848ac0cf1a0d0439b63 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Mar 2021 18:24:30 +0100
Subject: [PATCH 22/24] try to correct submodules path

---
 .gitmodules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index b867af34b..60b29abc2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,10 +4,10 @@
 	branch = master
 [submodule "mithril_client"]
         path = community_server/mithril_client
-        url = git@github.com:gradido/gradido_mithrilJS_client.git
+        url = https://github.com/gradido/gradido_mithrilJS_client.git
 [submodule "src/protobuf"]
         path = community_server/src/protobuf
-        url =  git@github.com:gradido/gradido_protocol.git
+        url =  https://github.com/gradido/gradido_protocol.git
 [submodule "dependencies/tinf"]
         path = login_server/dependencies/tinf
         url = https://github.com/jibsen/tinf.git

From f12a1a40536ed6abf0171bd9a6b1ba7272a44c1a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Mar 2021 18:25:41 +0100
Subject: [PATCH 23/24] remove mithril client - seems not to work at all

---
 .gitmodules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 60b29abc2..246626547 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,9 +2,9 @@
 	path = gn
 	url = https://github.com/gradido/gn.git
 	branch = master
-[submodule "mithril_client"]
-        path = community_server/mithril_client
-        url = https://github.com/gradido/gradido_mithrilJS_client.git
+#[submodule "mithril_client"]
+#        path = community_server/mithril_client
+#        url = https://github.com/gradido/gradido_mithrilJS_client.git
 [submodule "src/protobuf"]
         path = community_server/src/protobuf
         url =  https://github.com/gradido/gradido_protocol.git

From 7ec9fcf9ea172f1bcdb61ab850ac37725c154898 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Mar 2021 18:27:16 +0100
Subject: [PATCH 24/24] remove mithril client reference

---
 community_server/mithril_client | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 community_server/mithril_client

diff --git a/community_server/mithril_client b/community_server/mithril_client
deleted file mode 160000
index f0b1d113c..000000000
--- a/community_server/mithril_client
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f0b1d113cee2a76e9dbb098b315f4acaf38410d0