fix(use of modals): closeCurrentModal() should be used sparingly

Signed-off-by: Jonathan <theflametrooper@gmail.com>

frontend/components/Modals/CreateCommunityStation.vue

@@ -127,12 +127,15 @@ export default {
 							`You have added the station successfully`,
 							4000
 						);
-						_this.closeCurrentModal();
+						_this.closeModal({
+							sector: "home",
+							modal: "createCommunityStation"
+						});
 					} else Toast.methods.addToast(res.message, 4000);
 				}
 			);
 		},
-		...mapActions("modals", ["closeCurrentModal"])
+		...mapActions("modals", ["closeModal"])
 	}
 };
 </script>

frontend/components/Modals/EditNews.vue

@@ -155,7 +155,15 @@
 				<i class="material-icons save-changes">done</i>
 				<span>&nbsp;Save and close</span>
 			</button>
-			<button class="button is-danger" @click="closeCurrentModal()">
+			<button
+				class="button is-danger"
+				@click="
+					closeModal({
+						sector: 'admin',
+						modal: 'editNews'
+					})
+				"
+			>
 				<span>&nbsp;Close</span>
 			</button>
 		</div>
@@ -186,7 +194,7 @@ export default {
 		removeChange: function(type, index) {
 			this.$parent.editing[type].splice(index, 1);
 		},
-		...mapActions("modals", ["closeCurrentModal"])
+		...mapActions("modals", ["closeModal"])
 	}
 };
 </script>

frontend/components/Modals/EditSong.vue

@@ -421,7 +421,11 @@ export default {
 							}
 						});
 					}
-					if (close) _this.closeCurrentModal();
+					if (close)
+						_this.closeModal({
+							sector: "admin",
+							modal: "editSong"
+						});
 				}
 			);
 		},
@@ -581,7 +585,7 @@ export default {
 			"getCurrentTime",
 			"editSong"
 		]),
-		...mapActions("modals", ["closeModal", "closeCurrentModal"])
+		...mapActions("modals", ["closeModal"])
 	},
 	mounted: function() {
 		let _this = this;

frontend/components/Modals/EditUser.vue

@@ -73,7 +73,15 @@
 				<button class="button is-warning" v-on:click="removeSessions()">
 					<span>&nbsp;Remove all sessions</span>
 				</button>
-				<button class="button is-danger" @click="closeCurrentModal()">
+				<button
+					class="button is-danger"
+					@click="
+						closeModal({
+							sector: 'admin',
+							modal: 'editUser'
+						})
+					"
+				>
 					<span>&nbsp;Close</span>
 				</button>
 			</div>
@@ -192,7 +200,7 @@ export default {
 				Toast.methods.addToast(res.message, 4000);
 			});
 		},
-		...mapActions("modals", ["closeCurrentModal"])
+		...mapActions("modals", ["closeModal"])
 	},
 	mounted: function() {
 		let _this = this;

frontend/components/Modals/Login.vue

@@ -1,12 +1,28 @@
 <template>
 	<div class="modal is-active">
-		<div class="modal-background" @click="closeCurrentModal()" />
+		<div
+			class="modal-background"
+			@click="
+				closeModal({
+					sector: 'header',
+					modal: 'login'
+				})
+			"
+		/>
 		<div class="modal-card">
 			<header class="modal-card-head">
 				<p class="modal-card-title">
 					Login
 				</p>
-				<button class="delete" @click="closeCurrentModal()" />
+				<button
+					class="delete"
+					@click="
+						closeModal({
+							sector: 'header',
+							modal: 'login'
+						})
+					"
+				/>
 			</header>
 			<section class="modal-card-body">
 				<!-- validation to check if exists http://bulma.io/documentation/elements/form/ -->
@@ -91,7 +107,7 @@ export default {
 		githubRedirect: function() {
 			localStorage.setItem("github_redirect", this.$route.path);
 		},
-		...mapActions("modals", ["closeModal", "closeCurrentModal"]),
+		...mapActions("modals", ["closeModal"]),
 		...mapActions("user/auth", ["login"])
 	}
 };

frontend/components/Modals/Register.vue

@@ -1,12 +1,28 @@
 <template>
 	<div class="modal is-active">
-		<div class="modal-background" @click="closeCurrentModal()" />
+		<div
+			class="modal-background"
+			@click="
+				closeModal({
+					sector: 'header',
+					modal: 'register'
+				})
+			"
+		/>
 		<div class="modal-card">
 			<header class="modal-card-head">
 				<p class="modal-card-title">
 					Register
 				</p>
-				<button class="delete" @click="closeCurrentModal()" />
+				<button
+					class="delete"
+					@click="
+						closeModal({
+							sector: 'header',
+							modal: 'register'
+						})
+					"
+				/>
 			</header>
 			<section class="modal-card-body">
 				<!-- validation to check if exists http://bulma.io/documentation/elements/form/ -->
@@ -125,7 +141,7 @@ export default {
 		githubRedirect: function() {
 			localStorage.setItem("github_redirect", this.$route.path);
 		},
-		...mapActions("modals", ["closeCurrentModal"]),
+		...mapActions("modals", ["closeModal"]),
 		...mapActions("user/auth", ["register"])
 	}
 };

frontend/store/modules/modals.js

@@ -35,9 +35,6 @@ const actions = {
 	openModal: ({ commit }, data) => {
 		commit("openModal", data);
 	},
-	toggleModal: ({ commit }, data) => {
-		commit("toggleModal", data);
-	},
 	closeCurrentModal: ({ commit }) => {
 		commit("closeCurrentModal");
 	}
@@ -53,13 +50,6 @@ const mutations = {
 		state.modals[sector][modal] = true;
 		state.currentlyActive = { sector, modal };
 	},
-	toggleModal(state, data) {
-		const { sector, modal } = data;
-		state.modals[sector][modal] = !state.modals[sector][modal];
-		if (state.modals[sector][modal])
-			state.currentlyActive = { sector, modal };
-		else state.currentlyActive = {};
-	},
 	closeCurrentModal(state) {
 		const { sector, modal } = state.currentlyActive;
 		state.modals[sector][modal] = false;