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 @@ 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 @@
Charts
-
Geschöpft
+
Geschöpft
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 @@
Overview
-
Sales value
+
Sales value
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'}" > - {{$route.name}} + {{$route.name}} @@ -23,14 +23,14 @@ tag="li" title-tag="a" title-classes="nav-link pr-0"> - - + + - + - {{this.$store.state.email}} + {{ $store.state.email }} @@ -68,8 +68,8 @@