From 298055bddc0f2711b2217a3294d8711edd5ce7ab Mon Sep 17 00:00:00 2001
From: emreaydogdu <busra0112>
Date: Tue, 6 Oct 2020 21:51:41 +0200
Subject: [PATCH] expired
---
src/App.vue | 8 ++------
src/components/Home.vue | 4 ----
src/components/LogIn.vue | 9 ++++++---
src/components/SideMenu.vue | 7 ++++---
src/components/Teachers.vue | 39 ++++++++++++------------------------
src/main.js | 5 +++++
src/router.js | 2 +-
src/services/auth.service.js | 1 +
8 files changed, 32 insertions(+), 43 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 2da976c..1c8fe36 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -28,18 +28,14 @@ export default {
return this.$store.state.auth.status.loggedIn;
},
- currentUser() {
- return this.$store.state.auth.user;
- },
-
},
created() {
- this.update()
+ this.navUpdate();
},
methods: {
- update() {
+ navUpdate (){
if (!this.loggedIn) {
this.sidebarStyle = "display: none";
this.contentClass = "content col-md-12";
diff --git a/src/components/Home.vue b/src/components/Home.vue
index e6ad403..7812868 100644
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -50,10 +50,6 @@ export default {
*/
},
- logOut: function() {
- this.$store.dispatch('auth/logout');
- this.$router.push('/login');
- }
}
diff --git a/src/components/LogIn.vue b/src/components/LogIn.vue
index 646003d..01a7445 100644
--- a/src/components/LogIn.vue
+++ b/src/components/LogIn.vue
@@ -72,7 +72,9 @@ export default {
reg: /^([\w\.\-]+)@([\w\-]+)((\.(\w){2,3})+)$/,
password: "",
passwordFieldType: 'password',
- passwordToggleStyle: "password_toggle_img"
+ passwordToggleStyle: "password_toggle_img",
+
+
}
},
@@ -113,9 +115,10 @@ export default {
if (this.user.username && this.user.password) {
this.$store.dispatch('auth/login', this.user).then(
() => {
- localStorage.setItem('cronJob', 0);
+ this.$crontab.startCrontab();
+ this.$crontab.execJob('counter')
this.$router.push('/home');
- this.$parent.update();
+ this.$parent.navUpdate();
}
);
}
diff --git a/src/components/SideMenu.vue b/src/components/SideMenu.vue
index dfa812b..55dfd6e 100644
--- a/src/components/SideMenu.vue
+++ b/src/components/SideMenu.vue
@@ -12,7 +12,7 @@
<router-link to="/layouts"><a class="navA">Vorlagen</a></router-link><br>
<router-link to="/calendar"><a class="navA">Kalender</a></router-link><br>
<router-link to="/register"><a class="navA">neuen Nutzer anlegen</a></router-link>
- <a class="nav-link sidebar-bottom" href @click.prevent="logOut()">
+ <a class="nav-link sidebar-bottom" href @click.prevent="logout">
<a href="/logout"><a class="navA">Abmelden</a></a>
</a>
</div>
@@ -24,15 +24,16 @@ export default {
name: "SideMenu",
methods: {
- logOut: function() {
+ logout: function () {
this.$store.dispatch('auth/logout').then(
() => {
localStorage.setItem('cronJob', 0);
this.$router.push('/login');
- this.$parent.update();
+ this.$parent.navUpdate();
},
error => {
this.message = (error.response && error.response.data) || error.message || error.toString();
+ console.log(this.message)
}
);
}
diff --git a/src/components/Teachers.vue b/src/components/Teachers.vue
index 4a3c51a..b5fbcab 100644
--- a/src/components/Teachers.vue
+++ b/src/components/Teachers.vue
@@ -1,55 +1,42 @@
<template>
<div class="content col-md-12">
- <h1>{{counter}}</h1>
<h1>{{data}}</h1>
+ <h1>{{message}}</h1>
+ <h1>{{service}}</h1>
</div>
</template>
<script>
+
+
export default {
name: "Teachers",
data(){
return{
data: "Placeholder",
- counter: JSON.parse(localStorage.getItem('cronJob')),
- cronJob: this.$crontab.addJob({
- name: 'counter',
- interval: {
- seconds: '/1',
- },
- job: this.countUp
- })
+ message: "not Expired",
+ service: 0,
}
+
},
created() {
this.getData();
- this.$crontab.execJob('counter');
},
methods:{
- countUp () {
- this.counter += 1
- if (this.counter >= 60){
- this.$crontab.deleteJob('counter');
- //alert("Geh nachhcause");
- }
- localStorage.setItem('cronJob', this.counter);
- },
getData () {
this.$store.dispatch('user/getHello').then(
- () => {
+ (response) => {
+ console.log(response.status)
this.data = this.$store.state.user.response;
},
- error => {
- this.message =
- (error.response && error.response.data) ||
- error.message ||
- error.toString();
- this.successful = false;
+ (error) => {
+ this.message = error;
+ console.log(error)
}
);
- }
+ },
}
}
</script>
diff --git a/src/main.js b/src/main.js
index 608442b..5dad244 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,6 +16,11 @@ import { faHome, faUser, faUserPlus, faSignInAlt, faSignOutAlt } from '@fortawes
library.add(faHome, faUser, faUserPlus, faSignInAlt, faSignOutAlt);
+VueCrontab.setOption({
+ interval: 200,
+ auto_start: false
+})
+
Vue.config.productionTip = false;
Vue.use(VueCrontab)
Vue.use(BootstrapVue)
diff --git a/src/router.js b/src/router.js
index a280dcf..9c4395c 100644
--- a/src/router.js
+++ b/src/router.js
@@ -63,7 +63,7 @@ const router = new Router({
})
router.beforeEach((to, from, next) => {
- const publicPages = ['/login'];
+ const publicPages = ['/login', '/register'];
const authRequired = !publicPages.includes(to.path);
const loggedIn = localStorage.getItem('user');
diff --git a/src/services/auth.service.js b/src/services/auth.service.js
index bde9845..fe87078 100644
--- a/src/services/auth.service.js
+++ b/src/services/auth.service.js
@@ -14,6 +14,7 @@ class AuthService {
.then(response => {
if (response.data.idToken) {
localStorage.setItem('user', JSON.stringify(response.data));
+ localStorage.setItem('cronJob', 0);
}
return response.data;
--
GitLab