IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove submodul

Browse Source
This commit is contained in:
ogerly 2021-03-18 15:20:32 +01:00
parent 21aa8b9cc2
commit e4e6cf967e
6 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -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

26
frontend/src/App.vue
View File

@ -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')
}
},

2
frontend/src/components/Modal.vue
View File

@ -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>

2
frontend/src/views/AdminOverview.vue
View File

@ -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">

2
frontend/src/views/Dashboard.vue
View File

@ -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">

14
frontend/src/views/Layout/DashboardNavbar.vue
View File

@ -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 {