From 926e4295713c444b72fac14d180332b9c8c922fb Mon Sep 17 00:00:00 2001
From: mathsuky <yuida2718@gmail.com>
Date: Mon, 25 Sep 2023 20:06:20 +0900
Subject: [PATCH 1/7] =?UTF-8?q?onbeforeunload=E3=81=A7=E3=83=A1=E3=83=83?=
 =?UTF-8?q?=E3=82=BB=E3=83=BC=E3=82=B8=E3=82=92=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/main/SidebarFooter.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/main/SidebarFooter.vue b/src/components/main/SidebarFooter.vue
index b6fc9e1f..13355a3f 100644
--- a/src/components/main/SidebarFooter.vue
+++ b/src/components/main/SidebarFooter.vue
@@ -75,6 +75,16 @@ export default {
       return this.$store.direct.state.me?.privileged ?? false
     },
   },
+  mounted: function () {
+    window.onbeforeunload = () => {
+      if (this.inputData) {
+        return 'このページを離れると保存されていないデータは破棄されますが，よろしいですか。'
+      }
+    }
+  },
+  destroyed() {
+    window.onbeforeunload = null
+  },
   methods: {
     showModal() {
       this.isVisible = true

From 9a5e40792d2aadc53000cf3eb34abd83d494b776 Mon Sep 17 00:00:00 2001
From: mathsuky <yuida2718@gmail.com>
Date: Sat, 30 Sep 2023 20:53:54 +0900
Subject: [PATCH 2/7] =?UTF-8?q?form=E3=81=AEclose=E3=83=9C=E3=82=BF?=
 =?UTF-8?q?=E3=83=B3=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E3=82=82=E5=88=A4?=
 =?UTF-8?q?=E5=AE=9A=E3=82=92=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/main/SidebarFooter.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/main/SidebarFooter.vue b/src/components/main/SidebarFooter.vue
index 13355a3f..54b89904 100644
--- a/src/components/main/SidebarFooter.vue
+++ b/src/components/main/SidebarFooter.vue
@@ -90,16 +90,20 @@ export default {
       this.isVisible = true
     },
     hideModal() {
-      this.isVisible = false
-      this.showError = false
-      this.inputData = ''
+      if (this.inputData) {
+        if (confirm('入力されたデータは破棄されますが，よろしいですか。')) {
+          this.isVisible = false
+          this.showError = false
+          this.inputData = ''
+        }
+        return
+      }
     },
     async saveData() {
       if (isValidVerifiedroomData(this.inputData)) {
         this.showError = false
         try {
           await fetch(`${baseURL}/rooms/all`, {
-            //開発環境url
             method: 'POST',
             credentials: 'include',
             headers: {

From 8b70189e5caf7d7d279678e72930267e4d9138c2 Mon Sep 17 00:00:00 2001
From: mathsuky <yuida2718@gmail.com>
Date: Mon, 2 Oct 2023 21:14:39 +0900
Subject: [PATCH 3/7] =?UTF-8?q?=E3=83=A2=E3=83=BC=E3=83=80=E3=83=AB?=
 =?UTF-8?q?=E3=81=8C=E7=A9=BA=E3=81=AE=E5=A0=B4=E5=90=88=E3=81=AE=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/main/SidebarFooter.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/main/SidebarFooter.vue b/src/components/main/SidebarFooter.vue
index 54b89904..dbe1810b 100644
--- a/src/components/main/SidebarFooter.vue
+++ b/src/components/main/SidebarFooter.vue
@@ -97,6 +97,10 @@ export default {
           this.inputData = ''
         }
         return
+      } else {
+        this.isVisible = false
+        this.showError = false
+        this.inputData = ''
       }
     },
     async saveData() {

From f8c575c33bda951255aa8c98566dbe0107199607 Mon Sep 17 00:00:00 2001
From: mathsuky <yuida2718@gmail.com>
Date: Sat, 14 Oct 2023 20:55:10 +0900
Subject: [PATCH 4/7] =?UTF-8?q?=E9=81=B7=E7=A7=BB=E6=99=82=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A=E3=82=92=E8=A4=87=E6=95=B0=E3=81=AEform=E3=81=AB?=
 =?UTF-8?q?=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/event/EventFormBase.vue | 44 ++++++++++++++++++++++++++
 src/components/main/SidebarFooter.vue  | 21 +++++++-----
 src/pages/GroupNew.vue                 | 41 ++++++++++++++++++++++++
 src/workers/draftConfirmer.ts          | 13 ++++++++
 4 files changed, 111 insertions(+), 8 deletions(-)
 create mode 100644 src/workers/draftConfirmer.ts

diff --git a/src/components/event/EventFormBase.vue b/src/components/event/EventFormBase.vue
index 3933b7a0..68c55222 100644
--- a/src/components/event/EventFormBase.vue
+++ b/src/components/event/EventFormBase.vue
@@ -75,6 +75,9 @@ import EventFormSummary, {
 } from '@/components/event/EventFormSummary.vue'
 import FormNextButton from '@/components/shared/FormNextButton.vue'
 import FormBackButton from '@/components/shared/FormBackButton.vue'
+import { useDraftConfirmer } from '@/workers/draftConfirmer'
+import { removeDraftConfirmer } from '@/workers/draftConfirmer'
+import router from '@/router'
 
 export type EventInput = EventInputContent &
   (
@@ -196,6 +199,47 @@ export default class EventFormBase extends Vue {
         : this.timeAndPlace.timeEnd,
     }
   }
+  hasContent(): boolean {
+    return (
+      this.summary.name !== '' ||
+      this.summary.description !== '' ||
+      this.summary.tags.length > 0 ||
+      this.summary.groupName !== '' ||
+      this.summary.place !== '' ||
+      this.summary.timeStart !== '' ||
+      this.summary.timeEnd !== '' ||
+      this.summary.open ||
+      !this.summary.sharedRoom
+    )
+  }
+  mounted() {
+    this.$watch('summary', () => {
+      if (this.hasContent()) {
+        useDraftConfirmer()
+      } else {
+        removeDraftConfirmer()
+      }
+    })
+    router.beforeEach((to, from, next) => {
+      if (from.name === 'EventNew') {
+        if (this.hasContent()) {
+          if (
+            confirm(
+              '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+            )
+          ) {
+            next()
+          } else {
+            next(false)
+          }
+        } else {
+          next()
+        }
+      } else {
+        next()
+      }
+    })
+  }
 
   @Emit()
   submit(): EventOutput {
diff --git a/src/components/main/SidebarFooter.vue b/src/components/main/SidebarFooter.vue
index dbe1810b..f4bbe878 100644
--- a/src/components/main/SidebarFooter.vue
+++ b/src/components/main/SidebarFooter.vue
@@ -59,6 +59,8 @@
 
 <script lang="ts">
 import { isValidVerifiedroomData } from '@/workers/isValidVerifiedroomData'
+import { useDraftConfirmer } from '@/workers/draftConfirmer'
+import { removeDraftConfirmer } from '@/workers/draftConfirmer'
 import { baseURL } from '@/workers/api'
 
 export default {
@@ -76,14 +78,13 @@ export default {
     },
   },
   mounted: function () {
-    window.onbeforeunload = () => {
-      if (this.inputData) {
-        return 'このページを離れると保存されていないデータは破棄されますが，よろしいですか。'
+    this.$watch('inputData', newVal => {
+      if (newVal !== '') {
+        useDraftConfirmer()
+      } else {
+        removeDraftConfirmer()
       }
-    }
-  },
-  destroyed() {
-    window.onbeforeunload = null
+    })
   },
   methods: {
     showModal() {
@@ -91,7 +92,11 @@ export default {
     },
     hideModal() {
       if (this.inputData) {
-        if (confirm('入力されたデータは破棄されますが，よろしいですか。')) {
+        if (
+          confirm(
+            '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+          )
+        ) {
           this.isVisible = false
           this.showError = false
           this.inputData = ''
diff --git a/src/pages/GroupNew.vue b/src/pages/GroupNew.vue
index 83245a9f..47282984 100644
--- a/src/pages/GroupNew.vue
+++ b/src/pages/GroupNew.vue
@@ -35,6 +35,9 @@ import GroupFormSummary from '@/components/group/GroupFormSummary.vue'
 import FormNextButton from '@/components/shared/FormNextButton.vue'
 import FormBackButton from '@/components/shared/FormBackButton.vue'
 import api, { RequestGroup } from '@/api'
+import { useDraftConfirmer } from '@/workers/draftConfirmer'
+import { removeDraftConfirmer } from '@/workers/draftConfirmer'
+import router from '@/router'
 
 @Component({
   components: {
@@ -60,6 +63,44 @@ export default class GroupNew extends Vue {
       : [],
   }
 
+  hasContent(): boolean {
+    return (
+      this.group.name !== '' || this.group.description !== '' || this.group.open
+    )
+  }
+  mounted() {
+    this.$watch(
+      'group',
+      () => {
+        if (this.hasContent()) {
+          useDraftConfirmer()
+        } else {
+          removeDraftConfirmer()
+        }
+      },
+      { deep: true }
+    )
+    router.beforeEach((to, from, next) => {
+      if (from.name === 'GroupNew') {
+        if (this.hasContent()) {
+          if (
+            confirm(
+              '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+            )
+          ) {
+            next()
+          } else {
+            next(false)
+          }
+        } else {
+          next()
+        }
+      } else {
+        next()
+      }
+    })
+  }
+
   async submitGroup() {
     try {
       await api.groups.createGroup({ requestGroup: this.group })
diff --git a/src/workers/draftConfirmer.ts b/src/workers/draftConfirmer.ts
new file mode 100644
index 00000000..3e34ec84
--- /dev/null
+++ b/src/workers/draftConfirmer.ts
@@ -0,0 +1,13 @@
+const beforeUnloadListener = (event: BeforeUnloadEvent) => {
+  event.preventDefault()
+  event.returnValue =
+    '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+}
+
+export function useDraftConfirmer(): void {
+  window.addEventListener('beforeunload', beforeUnloadListener)
+}
+
+export function removeDraftConfirmer(): void {
+  window.removeEventListener('beforeunload', beforeUnloadListener)
+}

From f34c3060eb36bf209a1333960c77209f898c2476 Mon Sep 17 00:00:00 2001
From: mathsuky <yuida2718@gmail.com>
Date: Mon, 16 Oct 2023 21:58:27 +0900
Subject: [PATCH 5/7] =?UTF-8?q?=E7=A0=B4=E6=A3=84=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=82=82=E3=82=88=E3=81=84=E6=96=B9=E3=81=AB=E9=80=B2=E3=82=80?=
 =?UTF-8?q?=E3=81=A8=E3=83=9D=E3=83=83=E3=83=97=E3=82=A2=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E3=81=8C=E7=B9=B0=E3=82=8A=E8=BF=94=E3=81=97=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C=E3=81=AE=E8=A7=A3?=
 =?UTF-8?q?=E6=B1=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/event/EventFormBase.vue | 15 +++++++++++++++
 src/pages/GroupNew.vue                 |  9 +++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/components/event/EventFormBase.vue b/src/components/event/EventFormBase.vue
index 68c55222..0f997429 100644
--- a/src/components/event/EventFormBase.vue
+++ b/src/components/event/EventFormBase.vue
@@ -199,6 +199,7 @@ export default class EventFormBase extends Vue {
         : this.timeAndPlace.timeEnd,
     }
   }
+
   hasContent(): boolean {
     return (
       this.summary.name !== '' ||
@@ -212,6 +213,18 @@ export default class EventFormBase extends Vue {
       !this.summary.sharedRoom
     )
   }
+  cleanupContent(): void {
+    this.summary.name = ''
+    this.summary.description = ''
+    this.summary.tags = []
+    this.summary.groupName = ''
+    this.summary.place = ''
+    this.summary.timeStart = ''
+    this.summary.timeEnd = ''
+    this.summary.open = false
+    this.summary.sharedRoom = true
+  }
+
   mounted() {
     this.$watch('summary', () => {
       if (this.hasContent()) {
@@ -228,6 +241,8 @@ export default class EventFormBase extends Vue {
               '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
             )
           ) {
+            removeDraftConfirmer()
+            this.cleanupContent()
             next()
           } else {
             next(false)
diff --git a/src/pages/GroupNew.vue b/src/pages/GroupNew.vue
index 47282984..3afc9290 100644
--- a/src/pages/GroupNew.vue
+++ b/src/pages/GroupNew.vue
@@ -68,6 +68,13 @@ export default class GroupNew extends Vue {
       this.group.name !== '' || this.group.description !== '' || this.group.open
     )
   }
+
+  cleanupContent(): void {
+    this.group.name = ''
+    this.group.description = ''
+    this.group.open = false
+  }
+
   mounted() {
     this.$watch(
       'group',
@@ -88,6 +95,8 @@ export default class GroupNew extends Vue {
               '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
             )
           ) {
+            removeDraftConfirmer()
+            this.cleanupContent()
             next()
           } else {
             next(false)

From 253efb0950c1b1ac602ee0a15a42e74956138b91 Mon Sep 17 00:00:00 2001
From: mathsuky <yuida2718@gmail.com>
Date: Wed, 18 Oct 2023 14:25:51 +0900
Subject: [PATCH 6/7] =?UTF-8?q?submit=E3=81=99=E3=82=8B=E3=81=A8=E3=81=8D?=
 =?UTF-8?q?=E3=81=AB=E3=83=9D=E3=83=83=E3=83=97=E3=82=A2=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E3=81=A7=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/event/EventFormBase.vue | 119 ++++++++++++++++++-------
 src/pages/GroupEdit.vue                |  70 ++++++++++++++-
 src/pages/GroupNew.vue                 |  54 ++++++-----
 3 files changed, 185 insertions(+), 58 deletions(-)

diff --git a/src/components/event/EventFormBase.vue b/src/components/event/EventFormBase.vue
index 0f997429..40620187 100644
--- a/src/components/event/EventFormBase.vue
+++ b/src/components/event/EventFormBase.vue
@@ -78,6 +78,7 @@ import FormBackButton from '@/components/shared/FormBackButton.vue'
 import { useDraftConfirmer } from '@/workers/draftConfirmer'
 import { removeDraftConfirmer } from '@/workers/draftConfirmer'
 import router from '@/router'
+import { Route } from 'vue-router'
 
 export type EventInput = EventInputContent &
   (
@@ -118,6 +119,10 @@ export default class EventFormBase extends Vue {
 
   instant: boolean = null!
 
+  originalSummary: EventSummary = null!
+
+  beforeEachControl: (() => void) | null = null
+
   created() {
     this.content = {
       name: this.event?.name ?? '',
@@ -200,19 +205,15 @@ export default class EventFormBase extends Vue {
     }
   }
 
-  hasContent(): boolean {
-    return (
-      this.summary.name !== '' ||
-      this.summary.description !== '' ||
-      this.summary.tags.length > 0 ||
-      this.summary.groupName !== '' ||
-      this.summary.place !== '' ||
-      this.summary.timeStart !== '' ||
-      this.summary.timeEnd !== '' ||
-      this.summary.open ||
-      !this.summary.sharedRoom
-    )
+  isChanged(): boolean {
+    if (this.summary && this.originalSummary) {
+      return (
+        JSON.stringify(this.summary) !== JSON.stringify(this.originalSummary)
+      )
+    }
+    return false
   }
+
   cleanupContent(): void {
     this.summary.name = ''
     this.summary.description = ''
@@ -225,39 +226,89 @@ export default class EventFormBase extends Vue {
     this.summary.sharedRoom = true
   }
 
-  mounted() {
-    this.$watch('summary', () => {
-      if (this.hasContent()) {
-        useDraftConfirmer()
+  isEventNewOrEdit(): boolean {
+    const currentRoute: Route = this.$route
+    return currentRoute.name === 'EventNew'
+  }
+
+  beforLeaveGuardinEventEdit = (to, from, next) => {
+    if (from.name === 'EventEdit') {
+      if (this.isChanged()) {
+        if (
+          confirm(
+            '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+          )
+        ) {
+          removeDraftConfirmer()
+          this.cleanupContent()
+          next()
+        } else {
+          next(false)
+        }
       } else {
-        removeDraftConfirmer()
+        next()
       }
-    })
-    router.beforeEach((to, from, next) => {
-      if (from.name === 'EventNew') {
-        if (this.hasContent()) {
-          if (
-            confirm(
-              '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
-            )
-          ) {
-            removeDraftConfirmer()
-            this.cleanupContent()
-            next()
-          } else {
-            next(false)
-          }
-        } else {
+    } else {
+      next()
+    }
+  }
+  beforLeaveGuardinEventNew = (to, from, next) => {
+    if (from.name === 'EventNew') {
+      if (this.isChanged()) {
+        if (
+          confirm(
+            '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+          )
+        ) {
+          removeDraftConfirmer()
+          this.cleanupContent()
           next()
+        } else {
+          next(false)
         }
       } else {
         next()
       }
-    })
+    } else {
+      next()
+    }
+  }
+
+  mounted() {
+    this.$watch(
+      'summary',
+      () => {
+        if (this.isChanged()) {
+          useDraftConfirmer()
+        } else {
+          removeDraftConfirmer()
+        }
+      },
+      { deep: true }
+    )
+    if (this.isEventNewOrEdit()) {
+      this.beforeEachControl = router.beforeEach(this.beforLeaveGuardinEventNew)
+    } else {
+      this.beforeEachControl = router.beforeEach(
+        this.beforLeaveGuardinEventEdit
+      )
+    }
+    this.originalSummary = JSON.parse(JSON.stringify(this.summary))
+  }
+
+  beforeDestroy() {
+    if (this.beforeEachControl) {
+      this.beforeEachControl()
+    }
   }
 
   @Emit()
   submit(): EventOutput {
+    removeDraftConfirmer()
+    this.cleanupContent()
+    if (this.beforeEachControl) {
+      this.beforeEachControl()
+    }
     return {
       ...this.content,
       group: this.content.group!,
diff --git a/src/pages/GroupEdit.vue b/src/pages/GroupEdit.vue
index d9f25157..7d9d6c5d 100644
--- a/src/pages/GroupEdit.vue
+++ b/src/pages/GroupEdit.vue
@@ -56,6 +56,9 @@ import FormBackButton from '@/components/shared/FormBackButton.vue'
 import ProgressCircular from '@/components/shared/ProgressCircular.vue'
 import LoadFailedText from '@/components/shared/LoadFailedText.vue'
 import api, { RequestGroup } from '@/api'
+import router from '@/router'
+import { useDraftConfirmer } from '@/workers/draftConfirmer'
+import { removeDraftConfirmer } from '@/workers/draftConfirmer'
 
 @Component({
   components: {
@@ -74,6 +77,8 @@ export default class GroupEdit extends Vue {
   step = 1
 
   group: RequestGroup | null = null
+  originalGroup: RequestGroup | null = null
+  beforeEachControl: (() => void) | null = null
 
   get groupId() {
     return this.$route.params.id
@@ -84,6 +89,7 @@ export default class GroupEdit extends Vue {
     try {
       const group = await api.groups.getGroup({ groupID: this.groupId })
       this.group = group
+      this.originalGroup = JSON.parse(JSON.stringify(group))
       this.canEdit =
         !group.isTraQGroup && !!this.me && group.admins.includes(this.me)
       this.status = 'loaded'
@@ -92,6 +98,39 @@ export default class GroupEdit extends Vue {
     }
   }
 
+  isChanged(): boolean {
+    if (this.group && this.originalGroup) {
+      return JSON.stringify(this.group) !== JSON.stringify(this.originalGroup)
+    }
+    return false
+  }
+
+  cleanupContent(): void {
+    this.group = this.originalGroup
+  }
+
+  beforeLeaveGuard = (to, from, next) => {
+    if (from.path === `/groups/edit/${this.groupId}`) {
+      if (this.isChanged()) {
+        if (
+          confirm(
+            '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+          )
+        ) {
+          removeDraftConfirmer()
+          this.cleanupContent()
+          next()
+        } else {
+          next(false)
+        }
+      } else {
+        next()
+      }
+    } else {
+      next()
+    }
+  }
+
   async submitGroup() {
     if (!this.group) return
     try {
@@ -99,6 +138,8 @@ export default class GroupEdit extends Vue {
         groupID: this.groupId,
         requestGroup: this.group,
       })
+      removeDraftConfirmer()
+      this.cleanupContent()
       this.$router.push(`/groups/${this.groupId}`)
     } catch (__) {
       alert('Failed to submit...')
@@ -125,9 +166,32 @@ export default class GroupEdit extends Vue {
     if (!confirmed) return
     try {
       await api.groups.deleteGroup({ groupID: this.groupId })
-      this.$router.push('/')
-    } catch (__) {
-      alert('Failed to submit...')
+      removeDraftConfirmer()
+      this.cleanupContent()
+      this.$router.push('/groups')
+    } catch (error) {
+      alert('Failed to delete...')
+    }
+  }
+
+  mounted() {
+    this.$watch(
+      'group',
+      () => {
+        if (this.isChanged()) {
+          useDraftConfirmer()
+        } else {
+          removeDraftConfirmer()
+        }
+      },
+      { deep: true }
+    )
+    this.beforeEachControl = router.beforeEach(this.beforeLeaveGuard)
+  }
+
+  beforeDestroy() {
+    if (this.beforeEachControl) {
+      this.beforeEachControl()
     }
   }
 
diff --git a/src/pages/GroupNew.vue b/src/pages/GroupNew.vue
index 3afc9290..54412b08 100644
--- a/src/pages/GroupNew.vue
+++ b/src/pages/GroupNew.vue
@@ -51,6 +51,8 @@ export default class GroupNew extends Vue {
   valid = false
   step = 1
 
+  beforeEachControl: (() => void) | null = null
+
   group: RequestGroup = {
     name: '',
     description: '',
@@ -75,6 +77,28 @@ export default class GroupNew extends Vue {
     this.group.open = false
   }
 
+  beforeLeaveGuard = (to, from, next) => {
+    if (from.name === 'GroupNew') {
+      if (this.hasContent()) {
+        if (
+          confirm(
+            '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+          )
+        ) {
+          removeDraftConfirmer()
+          this.cleanupContent()
+          next()
+        } else {
+          next(false)
+        }
+      } else {
+        next()
+      }
+    } else {
+      next()
+    }
+  }
+
   mounted() {
     this.$watch(
       'group',
@@ -87,27 +111,13 @@ export default class GroupNew extends Vue {
       },
       { deep: true }
     )
-    router.beforeEach((to, from, next) => {
-      if (from.name === 'GroupNew') {
-        if (this.hasContent()) {
-          if (
-            confirm(
-              '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
-            )
-          ) {
-            removeDraftConfirmer()
-            this.cleanupContent()
-            next()
-          } else {
-            next(false)
-          }
-        } else {
-          next()
-        }
-      } else {
-        next()
-      }
-    })
+    this.beforeEachControl = router.beforeEach(this.beforeLeaveGuard)
+  }
+
+  beforeDestroy() {
+    if (this.beforeEachControl) {
+      this.beforeEachControl()
+    }
   }
 
   async submitGroup() {
@@ -117,6 +127,8 @@ export default class GroupNew extends Vue {
       alert('Failed to submit...')
       return
     }
+    removeDraftConfirmer()
+    this.cleanupContent()
     this.$router.push('/events/new')
   }
 }

From cb02124aa9619ca07dc00be1030a5f2cfa3656c7 Mon Sep 17 00:00:00 2001
From: mathsuky <yuida2718@gmail.com>
Date: Thu, 26 Oct 2023 23:59:54 +0900
Subject: [PATCH 7/7] =?UTF-8?q?=E9=96=A2=E6=95=B0=E3=81=AE=E3=83=8D?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=82=92=E6=B5=85=E3=81=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/event/EventFormBase.vue | 69 ++++++++++++--------------
 src/pages/GroupEdit.vue                | 32 ++++++------
 src/pages/GroupNew.vue                 | 32 ++++++------
 3 files changed, 61 insertions(+), 72 deletions(-)

diff --git a/src/components/event/EventFormBase.vue b/src/components/event/EventFormBase.vue
index 40620187..8d6f53fa 100644
--- a/src/components/event/EventFormBase.vue
+++ b/src/components/event/EventFormBase.vue
@@ -232,46 +232,43 @@ export default class EventFormBase extends Vue {
   }
 
   beforLeaveGuardinEventEdit = (to, from, next) => {
-    if (from.name === 'EventEdit') {
-      if (this.isChanged()) {
-        if (
-          confirm(
-            '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
-          )
-        ) {
-          removeDraftConfirmer()
-          this.cleanupContent()
-          next()
-        } else {
-          next(false)
-        }
-      } else {
-        next()
-      }
-    } else {
-      next()
+    if (from.name !== 'EventEdit') {
+      return next()
+    }
+
+    if (!this.isChanged()) {
+      return next()
     }
+
+    if (
+      confirm(
+        '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+      )
+    ) {
+      removeDraftConfirmer()
+      this.cleanupContent()
+      return next()
+    }
+
+    return next(false)
   }
+
   beforLeaveGuardinEventNew = (to, from, next) => {
-    if (from.name === 'EventNew') {
-      if (this.isChanged()) {
-        if (
-          confirm(
-            '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
-          )
-        ) {
-          removeDraftConfirmer()
-          this.cleanupContent()
-          next()
-        } else {
-          next(false)
-        }
-      } else {
-        next()
-      }
-    } else {
-      next()
+    if (from.name !== 'EventNew' || !this.isChanged()) {
+      return next()
     }
+
+    if (
+      confirm(
+        '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+      )
+    ) {
+      removeDraftConfirmer()
+      this.cleanupContent()
+      return next()
+    }
+
+    return next(false)
   }
 
   mounted() {
diff --git a/src/pages/GroupEdit.vue b/src/pages/GroupEdit.vue
index 7d9d6c5d..91b72c20 100644
--- a/src/pages/GroupEdit.vue
+++ b/src/pages/GroupEdit.vue
@@ -110,25 +110,21 @@ export default class GroupEdit extends Vue {
   }
 
   beforeLeaveGuard = (to, from, next) => {
-    if (from.path === `/groups/edit/${this.groupId}`) {
-      if (this.isChanged()) {
-        if (
-          confirm(
-            '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
-          )
-        ) {
-          removeDraftConfirmer()
-          this.cleanupContent()
-          next()
-        } else {
-          next(false)
-        }
-      } else {
-        next()
-      }
-    } else {
-      next()
+    if (from.path !== `/groups/edit/${this.groupId}` || !this.isChanged()) {
+      return next()
     }
+
+    if (
+      confirm(
+        '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+      )
+    ) {
+      removeDraftConfirmer()
+      this.cleanupContent()
+      return next()
+    }
+
+    return next(false)
   }
 
   async submitGroup() {
diff --git a/src/pages/GroupNew.vue b/src/pages/GroupNew.vue
index 54412b08..6f9a0adb 100644
--- a/src/pages/GroupNew.vue
+++ b/src/pages/GroupNew.vue
@@ -78,25 +78,21 @@ export default class GroupNew extends Vue {
   }
 
   beforeLeaveGuard = (to, from, next) => {
-    if (from.name === 'GroupNew') {
-      if (this.hasContent()) {
-        if (
-          confirm(
-            '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
-          )
-        ) {
-          removeDraftConfirmer()
-          this.cleanupContent()
-          next()
-        } else {
-          next(false)
-        }
-      } else {
-        next()
-      }
-    } else {
-      next()
+    if (from.name !== 'GroupNew' || this.hasContent()) {
+      return next()
     }
+
+    if (
+      confirm(
+        '入力されたデータは送信されないまま破棄されますが，よろしいですか。'
+      )
+    ) {
+      removeDraftConfirmer()
+      this.cleanupContent()
+      return next()
+    }
+
+    return next(false)
   }
 
   mounted() {