logoutの処理を修正

Author: kaizumaki

src/layouts/classes.vue

@@ -138,10 +138,10 @@ export default Vue.extend({
     this.loading = false
   },
   methods: {
-    clickLogout() {
-      vxm.classData.unloadClassData().then(() => {
-        this.$router.push('/')
-      })
+    async clickLogout() {
+      await vxm.user.logout()
+      await vxm.app.resetDate()
+      await this.$router.push('/')
     },
   },
 })

src/layouts/protected.vue

@@ -140,11 +140,6 @@ export default Vue.extend({
     this.loading = false
   },
   methods: {
-    signout() {
-      vxm.user.logout()
-      this.$router.push('/')
-    },
-
     unloadClassData() {
       vxm.classData.unloadClassData()
     },

src/pages/user/editUserData.vue

@@ -220,14 +220,13 @@ export default Vue.extend<Data, Methods, Computed, unknown>({
       this.$router.push('/edit')
     },
     async doLogout(): Promise<void> {
-      await Auth.signOut()
-        .then(() => {
-          vxm.user.logout()
-          this.$router.push('/')
-        })
-        .catch(() => {
-          this.error = true
-        })
+      try {
+        await vxm.user.logout()
+        await vxm.app.resetDate()
+        await this.$router.push('/')
+      } catch {
+        this.error = true
+      }
     },
   },
 })

src/pages/user/logout.vue

@@ -15,6 +15,7 @@
 import Vue from 'vue'
 import BaseBottomSheetLayer from '@/components/BaseBottomSheetLayer.vue'
 import { Auth } from 'aws-amplify'
+import { vxm } from '@/store'
 
 export default Vue.extend({
   components: { BaseBottomSheetLayer },
@@ -33,6 +34,7 @@ export default Vue.extend({
       this.loading = true
       try {
         await Auth.signOut()
+        await vxm.app.resetDate()
         await this.$router.push('/')
       } catch {
         this.loading = false

src/store/modules/app.ts

@@ -30,4 +30,9 @@ export class AppStore extends VuexModule implements App {
   public setDate(date: Date) {
     this.currentDate = date
   }
+
+  @mutation
+  public resetDate() {
+    this.currentDate = new Date()
+  }
 }