chore: improved file structure of independent modals

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

frontend/src/App.vue

@@ -45,7 +45,7 @@ export default {
 		username: state => state.user.auth.username,
 		userId: state => state.user.auth.userId,
 		banned: state => state.user.auth.banned,
-		modals: state => state.modals.modals,
+		modals: state => state.modalVisibility.modals,
 		currentlyActive: state => state.modals.currentlyActive,
 		nightmode: state => state.user.preferences.nightmode
 	}),
@@ -175,7 +175,7 @@ export default {
 				.getElementsByTagName("body")[0]
 				.classList.remove("night-mode");
 		},
-		...mapActions("modals", ["closeCurrentModal"]),
+		...mapActions("modalVisibility", ["closeCurrentModal"]),
 		...mapActions("user/preferences", [
 			"changeNightmode",
 			"changeAutoSkipDisliked"

frontend/src/components/Modal.vue

@@ -37,7 +37,7 @@ export default {
 				.replace(/ (.)/g, $1 => $1.toUpperCase())
 				.replace(/ /g, "");
 		},
-		...mapActions("modals", ["closeCurrentModal"])
+		...mapActions("modalVisibility", ["closeCurrentModal"])
 	}
 };
 </script>

frontend/src/components/layout/MainHeader.vue

@@ -87,7 +87,7 @@ export default {
 		};
 	},
 	computed: mapState({
-		modals: state => state.modals.modals.header,
+		modals: state => state.modalVisibility.modals.header,
 		role: state => state.user.auth.role,
 		loggedIn: state => state.user.auth.loggedIn,
 		username: state => state.user.auth.username
@@ -103,7 +103,7 @@ export default {
 	},
 
 	methods: {
-		...mapActions("modals", ["openModal"]),
+		...mapActions("modalVisibility", ["openModal"]),
 		...mapActions("user/auth", ["logout"])
 	}
 };

frontend/src/components/modals/CreatePlaylist.vue

@@ -75,7 +75,7 @@ export default {
 				}
 			});
 		},
-		...mapActions("modals", ["closeModal", "openModal"]),
+		...mapActions("modalVisibility", ["closeModal", "openModal"]),
 		...mapActions("user/playlists", ["editPlaylist"])
 	}
 };

frontend/src/components/modals/EditPlaylist.vue

@@ -422,7 +422,7 @@ export default {
 				);
 			}
 		},
-		...mapActions("modals", ["closeModal"])
+		...mapActions("modalVisibility", ["closeModal"])
 	}
 };
 </script>

frontend/src/components/modals/EditSong.vue

@@ -584,11 +584,11 @@ export default {
 		};
 	},
 	computed: {
-		...mapState("editSongModal", {
+		...mapState("modals/editSong", {
 			video: state => state.video,
 			song: state => state.song
 		}),
-		...mapState("modals", {
+		...mapState("modalVisibility", {
 			modals: state => state.modals.admin
 		})
 	},
@@ -1394,7 +1394,7 @@ export default {
 		resetGenreHelper() {
 			this.$refs.genreHelper.resetBox();
 		},
-		...mapActions("editSongModal", [
+		...mapActions("modals/editSong", [
 			"stopVideo",
 			"loadVideoById",
 			"pauseVideo",
@@ -1403,7 +1403,7 @@ export default {
 			"updateSongField",
 			"selectDiscogsInfo"
 		]),
-		...mapActions("modals", ["closeModal"])
+		...mapActions("modalVisibility", ["closeModal"])
 	}
 };
 </script>

frontend/src/components/modals/EditStation.vue

@@ -507,7 +507,7 @@ export default {
 		// ...mapState("admin/stations", {
 		// 	stations: state => state.stations
 		// }),
-		...mapState("editStationModal", {
+		...mapState("modals/editStation", {
 			station: state => state.station,
 			originalStation: state => state.originalStation
 		})
@@ -1019,8 +1019,8 @@ export default {
 			else if (type === "blacklist-genres")
 				this.station.blacklistedGenres.splice(index, 1);
 		},
-		...mapActions("editStationModal", ["editStation"]),
-		...mapActions("modals", ["closeModal"])
+		...mapActions("modals/editStation", ["editStation"]),
+		...mapActions("modalVisibility", ["closeModal"])
 	}
 };
 </script>

frontend/src/components/modals/Login.vue

@@ -116,7 +116,7 @@ export default {
 		githubRedirect() {
 			localStorage.setItem("github_redirect", this.$route.path);
 		},
-		...mapActions("modals", ["closeModal"]),
+		...mapActions("modalVisibility", ["closeModal"]),
 		...mapActions("user/auth", ["login"])
 	}
 };

frontend/src/components/modals/Register.vue

@@ -254,7 +254,7 @@ export default {
 		githubRedirect() {
 			localStorage.setItem("github_redirect", this.$route.path);
 		},
-		...mapActions("modals", ["closeModal"]),
+		...mapActions("modalVisibility", ["closeModal"]),
 		...mapActions("user/auth", ["register"])
 	}
 };

frontend/src/pages/Admin/EditNews.vue

@@ -178,7 +178,7 @@ export default {
 		sector: { type: String, default: "admin" }
 	},
 	computed: {
-		...mapState("editNewsModal", {
+		...mapState("modals/editNews", {
 			news: state => state.news
 		})
 	},
@@ -238,8 +238,8 @@ export default {
 				}
 			});
 		},
-		...mapActions("modals", ["closeModal"]),
-		...mapActions("editNewsModal", [
+		...mapActions("modalVisibility", ["closeModal"]),
+		...mapActions("modals/editNews", [
 			"editNews",
 			"addChange",
 			"removeChange"

frontend/src/pages/Admin/EditUser.vue

@@ -109,7 +109,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState("editUserModal", {
+		...mapState("modals/editUser", {
 			user: state => state.user
 		})
 	},
@@ -225,8 +225,8 @@ export default {
 				new Toast({ content: res.message, timeout: 4000 });
 			});
 		},
-		...mapActions("editUserModal", ["editUser"]),
-		...mapActions("modals", ["closeModal"])
+		...mapActions("modals/editUser", ["editUser"]),
+		...mapActions("modalVisibility", ["closeModal"])
 	}
 };
 </script>

frontend/src/pages/Admin/ViewPunishment.vue

@@ -93,7 +93,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState("viewPunishmentModal", {
+		...mapState("modals/viewPunishment", {
 			punishment: state => state.punishment
 		})
 	},
@@ -125,8 +125,8 @@ export default {
 		});
 	},
 	methods: {
-		...mapActions("modals", ["closeModal"]),
-		...mapActions("viewPunishmentModal", ["viewPunishment"]),
+		...mapActions("modalVisibility", ["closeModal"]),
+		...mapActions("modals/viewPunishment", ["viewPunishment"]),
 		format,
 		formatDistance,
 		parseISO

frontend/src/pages/Admin/ViewReport.vue

@@ -105,7 +105,7 @@ export default {
 		sector: { type: String, default: "admin" }
 	},
 	computed: {
-		...mapState("viewReportModal", {
+		...mapState("viewReport", {
 			report: state => state.report
 		})
 	},
@@ -151,8 +151,8 @@ export default {
 					err => new Toast({ content: err.message, timeout: 5000 })
 				);
 		},
-		...mapActions("viewReportModal", ["viewReport", "resolveReport"]),
-		...mapActions("modals", ["closeModal"])
+		...mapActions("modals/viewReport", ["viewReport", "resolveReport"]),
+		...mapActions("modalVisibility", ["closeModal"])
 	}
 };
 </script>

frontend/src/pages/Admin/tabs/News.vue

@@ -238,7 +238,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState("modals", {
+		...mapState("modalVisibility", {
 			modals: state => state.modals.admin
 		}),
 		...mapState("admin/news", {
@@ -342,7 +342,7 @@ export default {
 		init() {
 			this.socket.emit("apis.joinAdminRoom", "news", () => {});
 		},
-		...mapActions("modals", ["openModal", "closeModal"]),
+		...mapActions("modalVisibility", ["openModal", "closeModal"]),
 		...mapActions("admin/news", [
 			"editNews",
 			"addNews",

frontend/src/pages/Admin/tabs/Punishments.vue

@@ -116,7 +116,7 @@ export default {
 			//   return _.orderBy(this.punishments, -1);
 			return this.punishments;
 		},
-		...mapState("modals", {
+		...mapState("modalVisibility", {
 			modals: state => state.modals.admin
 		})
 	},
@@ -153,7 +153,7 @@ export default {
 			});
 			this.socket.emit("apis.joinAdminRoom", "punishments", () => {});
 		},
-		...mapActions("modals", ["openModal"]),
+		...mapActions("modalVisibility", ["openModal"]),
 		...mapActions("admin/punishments", ["viewPunishment"])
 	}
 };

frontend/src/pages/Admin/tabs/QueueSongs.vue

@@ -210,7 +210,7 @@ export default {
 					) !== -1
 			);
 		},
-		...mapState("modals", {
+		...mapState("modalVisibility", {
 			modals: state => state.modals.admin
 		})
 	},
@@ -318,8 +318,8 @@ export default {
 			this.socket.emit("apis.joinAdminRoom", "queue", () => {});
 		},
 		// ...mapActions("admin/songs", ["editSong"]),
-		...mapActions("editSongModal", ["stopVideo"]),
-		...mapActions("modals", ["openModal"])
+		...mapActions("modals/editSong", ["stopVideo"]),
+		...mapActions("modalVisibility", ["openModal"])
 	}
 };
 </script>

frontend/src/pages/Admin/tabs/Reports.vue

@@ -85,7 +85,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState("modals", {
+		...mapState("modalVisibility", {
 			modals: state => state.modals.admin
 		})
 	},
@@ -147,7 +147,7 @@ export default {
 					err => new Toast({ content: err.message, timeout: 5000 })
 				);
 		},
-		...mapActions("modals", ["openModal", "closeModal"]),
+		...mapActions("modalVisibility", ["openModal", "closeModal"]),
 		...mapActions("admin/reports", ["resolveReport"])
 	}
 };

frontend/src/pages/Admin/tabs/Songs.vue

@@ -293,7 +293,7 @@ export default {
 						(this.genreFilterSelected.indexOf(b) === -1 ? 1 : 0)
 				);
 		},
-		...mapState("modals", {
+		...mapState("modalVisibility", {
 			modals: state => state.modals.admin
 		}),
 		...mapState("admin/songs", {
@@ -419,8 +419,8 @@ export default {
 			"removeSong",
 			"updateSong"
 		]),
-		...mapActions("editSongModal", ["stopVideo"]),
-		...mapActions("modals", ["openModal", "closeModal"])
+		...mapActions("modals/editSong", ["stopVideo"]),
+		...mapActions("modalVisibility", ["openModal", "closeModal"])
 	}
 };
 </script>

frontend/src/pages/Admin/tabs/Stations.vue

@@ -207,7 +207,7 @@ export default {
 		...mapState("admin/stations", {
 			stations: state => state.stations
 		}),
-		...mapState("modals", {
+		...mapState("modalVisibility", {
 			modals: state => state.modals.admin
 		})
 	},
@@ -344,7 +344,7 @@ export default {
 			});
 			this.socket.emit("apis.joinAdminRoom", "stations", () => {});
 		},
-		...mapActions("modals", ["openModal"]),
+		...mapActions("modalVisibility", ["openModal"]),
 		...mapActions("admin/stations", [
 			"editStation",
 			"loadStations",

frontend/src/pages/Admin/tabs/Users.vue

@@ -80,7 +80,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState("modals", {
+		...mapState("modalVisibility", {
 			modals: state => state.modals.admin
 		})
 	},
@@ -113,7 +113,7 @@ export default {
 			});
 			this.socket.emit("apis.joinAdminRoom", "users", () => {});
 		},
-		...mapActions("modals", ["openModal"])
+		...mapActions("modalVisibility", ["openModal"])
 	}
 };
 </script>

frontend/src/pages/Home/CreateCommunityStation.vue

@@ -140,7 +140,7 @@ export default {
 				}
 			);
 		},
-		...mapActions("modals", ["closeModal"])
+		...mapActions("modalVisibility", ["closeModal"])
 	}
 };
 </script>

frontend/src/pages/Home/index.vue

@@ -207,7 +207,7 @@ export default {
 		...mapState({
 			loggedIn: state => state.user.auth.loggedIn,
 			userId: state => state.user.auth.userId,
-			modals: state => state.modals.modals.home
+			modals: state => state.modalVisibility.modals.home
 		}),
 		filteredStations() {
 			const privacyOrder = ["public", "unlisted", "private"];
@@ -462,7 +462,7 @@ export default {
 				} else new Toast({ content: res.message, timeout: 8000 });
 			});
 		},
-		...mapActions("modals", ["openModal"]),
+		...mapActions("modalVisibility", ["openModal"]),
 		...mapActions("station", ["updateIfStationIsFavorited"])
 	}
 };

frontend/src/pages/Profile.vue

@@ -213,7 +213,7 @@ export default {
 		...mapState({
 			role: state => state.user.auth.role,
 			userId: state => state.user.auth.userId,
-			...mapState("modals", {
+			...mapState("modalVisibility", {
 				modals: state => state.modals.station
 			})
 		}),
@@ -503,7 +503,7 @@ export default {
 			}
 			return false;
 		},
-		...mapActions("modals", ["openModal"]),
+		...mapActions("modalVisibility", ["openModal"]),
 		...mapActions("user/playlists", ["editPlaylist"])
 	}
 };

frontend/src/pages/Station/Report.vue

@@ -300,7 +300,7 @@ export default {
 			}
 		},
 		...mapActions("station", ["updateReportQueueSong"]),
-		...mapActions("modals", ["closeModal"])
+		...mapActions("modalVisibility", ["closeModal"])
 	}
 };
 </script>

frontend/src/pages/Station/components/CurrentlyPlaying.vue

@@ -102,7 +102,7 @@ export default {
 		})
 	},
 	methods: {
-		...mapActions("modals", ["openModal"]),
+		...mapActions("modalVisibility", ["openModal"]),
 		formatDistance,
 		parseISO
 	}

frontend/src/pages/Station/components/Sidebar/MyPlaylists.vue

@@ -81,7 +81,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState("modals", {
+		...mapState("modalVisibility", {
 			modals: state => state.modals.station
 		}),
 		...mapState({
@@ -234,7 +234,7 @@ export default {
 				}
 			);
 		},
-		...mapActions("modals", ["openModal"]),
+		...mapActions("modalVisibility", ["openModal"]),
 		...mapActions("user/playlists", ["editPlaylist"])
 	}
 };

frontend/src/pages/Station/components/Sidebar/Queue/QueueItem.vue

@@ -125,7 +125,7 @@ export default {
 			this.openModal({ sector: "station", modal: "report" });
 		},
 		...mapActions("station", ["updateReportQueueSong"]),
-		...mapActions("modals", ["openModal"]),
+		...mapActions("modalVisibility", ["openModal"]),
 		formatDistance,
 		parseISO
 	}

frontend/src/pages/Station/components/Sidebar/Queue/index.vue

@@ -103,7 +103,7 @@ export default {
 				}
 			);
 		},
-		...mapActions("modals", ["openModal"])
+		...mapActions("modalVisibility", ["openModal"])
 	}
 };
 </script>

frontend/src/pages/Station/components/Sidebar/index.vue

@@ -58,7 +58,7 @@ export default {
 			this.tab = this.$route.query.tab;
 	},
 	methods: {
-		...mapActions("modals", ["openModal"]),
+		...mapActions("modalVisibility", ["openModal"]),
 		showTab(tab) {
 			const queries = this.$route.query.tab
 				? this.$route.query

frontend/src/pages/Station/index.vue

@@ -472,7 +472,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapState("modals", {
+		...mapState("modalVisibility", {
 			modals: state => state.modals.station
 		}),
 		...mapState("station", {
@@ -1538,7 +1538,7 @@ export default {
 			this.editingSongId = song._id;
 			this.openModal({ sector: "station", modal: "editSong" });
 		},
-		...mapActions("modals", ["openModal"]),
+		...mapActions("modalVisibility", ["openModal"]),
 		...mapActions("station", [
 			"joinStation",
 			"updateUserCount",
@@ -1551,7 +1551,7 @@ export default {
 			"updateNoSong",
 			"updateIfStationIsFavorited"
 		]),
-		...mapActions("editSongModal", ["stopVideo"])
+		...mapActions("modals/editSong", ["stopVideo"])
 	}
 };
 </script>

frontend/src/store/index.js

@@ -3,15 +3,16 @@ import Vuex from "vuex";
 
 import user from "./modules/user";
 import settings from "./modules/settings";
-import modals from "./modules/modals";
+import modalVisibility from "./modules/modalVisibility";
 import station from "./modules/station";
 import admin from "./modules/admin";
-import editSongModal from "./modules/editSongModal";
-import editStationModal from "./modules/editStationModal";
-import editUserModal from "./modules/editUserModal";
-import editNewsModal from "./modules/editNewsModal";
-import viewPunishmentModal from "./modules/viewPunishmentModal";
-import viewReportModal from "./modules/viewReportModal";
+
+import editSongModal from "./modules/modals/editSong";
+import editStationModal from "./modules/modals/editStation";
+import editUserModal from "./modules/modals/editUser";
+import editNewsModal from "./modules/modals/editNews";
+import viewPunishmentModal from "./modules/modals/viewPunishment";
+import viewReportModal from "./modules/modals/viewReport";
 
 Vue.use(Vuex);
 
@@ -19,15 +20,20 @@ export default new Vuex.Store({
 	modules: {
 		user,
 		settings,
-		modals,
 		station,
 		admin,
-		editSongModal,
-		editStationModal,
-		editUserModal,
-		editNewsModal,
-		viewPunishmentModal,
-		viewReportModal
+		modalVisibility,
+		modals: {
+			namespaced: true,
+			modules: {
+				editSong: editSongModal,
+				editStation: editStationModal,
+				editUser: editUserModal,
+				editNews: editNewsModal,
+				viewPunishment: viewPunishmentModal,
+				viewReport: viewReportModal
+			}
+		}
 	},
 	strict: false
 });

frontend/src/store/modules/editSongModal.js → frontend/src/store/modules/modals/editSong.js

@@ -1,7 +1,7 @@
 /* eslint no-param-reassign: 0 */
 
 // import Vue from "vue";
-// import admin from "../../api/admin/index";
+// import admin from "../../../api/admin/index";
 
 export default {
 	namespaced: true,

frontend/src/store/modules/viewReportModal.js → frontend/src/store/modules/modals/viewReport.js

@@ -1,6 +1,6 @@
 /* eslint no-param-reassign: 0 */
 
-import admin from "../../api/admin/index";
+import admin from "../../../api/admin/index";
 
 export default {
 	namespaced: true,