Browse Source

Manage Station minor improvements

Owen Diffey 3 years ago
parent
commit
cb14b73ed7

+ 7 - 7
frontend/src/components/modals/ManageStation/Tabs/Blacklist.vue

@@ -1,11 +1,11 @@
 <template>
 	<div class="station-blacklist">
-		<p class="text-centered">
+		<p class="has-text-centered">
 			Blacklist a playlist to prevent all of its songs playing in this
-			station, or blacklist a song to prevent it playing.
+			station.
 		</p>
 		<div class="tabs-container">
-			<div class="tab-selection">
+			<!-- <div class="tab-selection">
 				<button
 					class="button is-default"
 					:class="{ selected: tab === 'playlists' }"
@@ -20,7 +20,7 @@
 				>
 					Songs
 				</button>
-			</div>
+			</div> -->
 			<div class="tab" v-show="tab === 'playlists'">
 				<div v-if="excludedPlaylists.length > 0">
 					<playlist-item
@@ -56,13 +56,13 @@
 						</div>
 					</playlist-item>
 				</div>
-				<p v-else class="nothing-here-text scrollable-list">
+				<p v-else class="has-text-centered scrollable-list">
 					No playlists currently blacklisted.
 				</p>
 			</div>
-			<div class="tab" v-show="tab === 'songs'">
+			<!-- <div class="tab" v-show="tab === 'songs'">
 				Blacklisting songs has yet to be added.
-			</div>
+			</div> -->
 		</div>
 	</div>
 </template>

+ 2 - 2
frontend/src/components/modals/ManageStation/Tabs/Playlists.vue

@@ -80,7 +80,7 @@
 						</div>
 					</playlist-item>
 				</div>
-				<p v-else class="nothing-here-text scrollable-list">
+				<p v-else class="has-text-centered scrollable-list">
 					No playlists currently selected.
 				</p>
 			</div>
@@ -279,7 +279,7 @@
 						</playlist-item>
 					</transition-group>
 				</draggable>
-				<p v-else class="nothing-here-text scrollable-list">
+				<p v-else class="has-text-centered scrollable-list">
 					You don't have any playlists!
 				</p>
 			</div>

+ 1 - 1
frontend/src/components/modals/ManageStation/Tabs/Search.vue

@@ -38,7 +38,7 @@
 				</song-item>
 				<button
 					v-if="resultsLeftCount > 0"
-					class="button is-primary"
+					class="button is-primary load-more-button"
 					@click="searchForMusareSongs(musareSearch.page + 1)"
 				>
 					Load {{ nextPageResultsCount }} more results

+ 10 - 0
frontend/src/pages/Admin/tabs/Stations.vue

@@ -177,11 +177,16 @@
 			</div>
 		</div>
 
+		<request-song v-if="modals.requestSong" />
+		<edit-playlist v-if="modals.editPlaylist" />
+		<create-playlist v-if="modals.createPlaylist" />
 		<manage-station
 			v-if="modals.manageStation"
 			:station-id="editingStationId"
 			sector="admin"
 		/>
+		<report v-if="modals.report" />
+		<edit-song v-if="modals.editSong" song-type="songs" sector="admin" />
 	</div>
 </template>
 
@@ -195,8 +200,13 @@ import ws from "@/ws";
 
 export default {
 	components: {
+		RequestSong: () => import("@/components/modals/RequestSong.vue"),
+		EditPlaylist: () => import("@/components/modals/EditPlaylist.vue"),
+		CreatePlaylist: () => import("@/components/modals/CreatePlaylist.vue"),
 		ManageStation: () =>
 			import("@/components/modals/ManageStation/index.vue"),
+		Report: () => import("@/components/modals/Report.vue"),
+		EditSong: () => import("@/components/modals/EditSong.vue"),
 		UserIdToUsername,
 		Confirm
 	},

+ 2 - 10
frontend/src/pages/Station/index.vue

@@ -820,16 +820,6 @@ export default {
 				if (this.playerReady) this.player.pauseVideo();
 				this.updateNoSong(true);
 			}
-
-			let isInQueue = false;
-
-			this.songsList.forEach(queueSong => {
-				if (queueSong.requestedBy === this.userId) isInQueue = true;
-			});
-
-			if (!isInQueue && this.partyPlaylists) {
-				this.addPartyPlaylistSongToQueue();
-			}
 		});
 
 		this.socket.on("event:stations.pause", res => {
@@ -904,6 +894,8 @@ export default {
 					: null;
 
 			this.updateNextSong(nextSong);
+
+			this.addPartyPlaylistSongToQueue();
 		});
 
 		this.socket.on("event:queue.repositionSong", res => {