diff --git a/.gitmodules b/.gitmodules
index 04f340efb..b867af34b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,5 +22,4 @@
url = https://github.com/gradido/iroha-ed25519.git
[submodule "dependencies/spirit-po"]
path = login_server/dependencies/spirit-po
- url = https://github.com/cbeck88/spirit-po.git
-
+ url = https://github.com/cbeck88/spirit-po.git
\ No newline at end of file
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index da80c328f..925cb52f6 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -4,8 +4,7 @@
@@ -19,17 +18,17 @@ 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') ) {
- //this.$store.state.email = this.$cookies.get('gdd_u')
- console.log("login to kontooverview")
- this.$router.push('/KontoOverview')
- }else {
- console.log("login to LOGIN")
- this.$router.push("/Login")
- }
+ created () {
+ console.log('%cWillkommen bei Gradido %cgreen text', 'font-weight:bold', 'color: green')
+ if ( $cookies.isKey("gdd_session_id") == true) {
+ console.log('%cHey %c'+$cookies.get("gdd_u")+'', 'font-weight:bold', 'color: orange')
+ this.$store.commit('session_id', $cookies.get("gdd_session_id"))
+ this.$store.commit('email', $cookies.get("gdd_u"))
+ this.$router.push("overview")
+ }else {
+ console.log("app.vue to Logout")
+ this.$store.dispatch('logout')
+ }
},
data() {
return {
@@ -52,7 +51,7 @@ export default {
}
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 @@
-
+
Senden
@@ -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..1e77c16c5 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'}"
>
- {{$route.name}}
+
+ {{$route.name}}
+
@@ -15,32 +17,20 @@
-
-
+
-
-
-
-
+
- {{this.$store.state.email}}
+
+
+
+ {{ $store.state.email }}
@@ -50,7 +40,7 @@
{{ $t('welcome') }}
-
+
{{ $t('site.overview.account_overview')}}
@@ -78,8 +68,8 @@