From d5553b7105bf90fbabf8dfd2f5600885580e6e34 Mon Sep 17 00:00:00 2001
From: RyoichiNakai <elmobasketball0913@me.com>
Date: Sat, 15 Jan 2022 21:35:21 +0900
Subject: [PATCH] =?UTF-8?q?#134=20=E3=83=AD=E3=82=B0=E3=82=A2=E3=82=A6?=
 =?UTF-8?q?=E3=83=88=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=20?=
 =?UTF-8?q?=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/admin/dialogs/AccountPlus.vue |  9 +++++
 components/layouts/Header.vue            | 21 +++++++---
 components/layouts/LogOutDialog.vue      | 49 ++++++++++++++++++++++++
 components/layouts/NavDrawer.vue         | 15 +++++++-
 components/layouts/index.js              |  3 +-
 5 files changed, 89 insertions(+), 8 deletions(-)
 create mode 100644 components/layouts/LogOutDialog.vue

diff --git a/components/admin/dialogs/AccountPlus.vue b/components/admin/dialogs/AccountPlus.vue
index 1e10e6c..3b47128 100644
--- a/components/admin/dialogs/AccountPlus.vue
+++ b/components/admin/dialogs/AccountPlus.vue
@@ -305,6 +305,15 @@ export default {
               student.point,
               this.teachers.map((obj) => obj.id)
             )
+            if (student.rank == null) {
+              student.rank = 0
+            }
+            if (student.group == null) {
+              student.group = 0
+            }
+            if (student.password == null) {
+              student.password = ''
+            }
             createUser(student).then((result) => {
               if (result.statusCode === 400) {
                 alert('以下の学生の登録に失敗しました。\nemail: ' + result.email + '\nname:' + result.name)
diff --git a/components/layouts/Header.vue b/components/layouts/Header.vue
index e2cd99f..46cf19d 100644
--- a/components/layouts/Header.vue
+++ b/components/layouts/Header.vue
@@ -29,16 +29,24 @@
       <v-list-item-title>ようこそ、{{ userName }}さん</v-list-item-title>
       <v-list-item-subtitle class="grey--text">{{ userEmail }}</v-list-item-subtitle>
     </div>
+
+    <LogOutDialog :open="signOutConfirm" @close="close" />
   </v-app-bar>
 </template>
 
 <script>
 import { mapMutations, mapGetters } from 'vuex'
+import LogOutDialog from './LogOutDialog'
 
 export default {
   name: 'Header',
+  components: {
+    LogOutDialog,
+  },
   data() {
-    return {}
+    return {
+      signOutConfirm: false,
+    }
   },
   computed: {
     ...mapGetters({
@@ -61,16 +69,19 @@ export default {
     },
   },
   methods: {
+    ...mapMutations({
+      toggle: 'drawer/toggle',
+    }),
     redirectPage(path) {
       if (path === '/signout') {
-        this.$store.dispatch('auth/signOut')
+        this.signOutConfirm = true
       } else {
         this.$router.push({ path })
       }
     },
-    ...mapMutations({
-      toggle: 'drawer/toggle',
-    }),
+    close(e) {
+      this.signOutConfirm = e
+    },
   },
 }
 </script>
diff --git a/components/layouts/LogOutDialog.vue b/components/layouts/LogOutDialog.vue
new file mode 100644
index 0000000..6f3d126
--- /dev/null
+++ b/components/layouts/LogOutDialog.vue
@@ -0,0 +1,49 @@
+<template>
+  <v-dialog :value="open" width="600px" @input="close">
+    <v-card>
+      <v-card-title>
+        {{ cardTitle }}
+      </v-card-title>
+
+      <v-card-text>
+        <p>{{ cardText }}</p>
+      </v-card-text>
+
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn text @click="close"> 閉じる </v-btn>
+        <v-btn color="accent" text @click="signOut"> ログアウト </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script>
+export default {
+  name: 'LogOutDialog',
+  props: {
+    open: {
+      type: Boolean,
+      default: false,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      cardTitle: 'ログアウトの確認',
+      cardText: '本当にログアウトしますか？',
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('close', false)
+    },
+    signOut() {
+      this.$store.dispatch('auth/signOut')
+      this.close()
+    },
+  },
+}
+</script>
+
+<style></style>
diff --git a/components/layouts/NavDrawer.vue b/components/layouts/NavDrawer.vue
index 7953018..4036bd3 100644
--- a/components/layouts/NavDrawer.vue
+++ b/components/layouts/NavDrawer.vue
@@ -46,16 +46,24 @@
         </v-list-item>
       </v-list-item-group>
     </v-list>
+
+    <LogOutDialog :open="signOutConfirm" @close="signOutConfirmClose" />
   </v-navigation-drawer>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
+import LogOutDialog from './LogOutDialog'
 
 export default {
   name: 'NavDrawer',
+  components: {
+    LogOutDialog,
+  },
   data() {
-    return {}
+    return {
+      signOutConfirm: false,
+    }
   },
   computed: {
     ...mapGetters({
@@ -85,7 +93,7 @@ export default {
   methods: {
     redirectPage(path) {
       if (path === '/signout') {
-        this.$store.dispatch('auth/signOut')
+        this.signOutConfirm = true
       } else {
         this.$router.push({ path })
       }
@@ -94,6 +102,9 @@ export default {
     close() {
       this.$store.commit('drawer/close')
     },
+    signOutConfirmClose(e) {
+      this.signOutConfirm = e
+    },
   },
 }
 </script>
diff --git a/components/layouts/index.js b/components/layouts/index.js
index 24cb030..d306f63 100644
--- a/components/layouts/index.js
+++ b/components/layouts/index.js
@@ -1,4 +1,5 @@
 import Header from './Header'
 import NavDrawer from './NavDrawer'
+import LogOutDialog from './LogOutDialog'
 
-export { Header, NavDrawer }
+export { Header, NavDrawer, LogOutDialog }