Merge pull request #143 from RyoichiNakai/develop

本番反映 リリース

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)

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>

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>

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>

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 }