Sfoglia il codice sorgente

fix: various ManageStation and StationInfoBox improvements and fixes

Kristian Vos 2 anni fa
parent
commit
7c20e171a8

+ 13 - 5
frontend/src/components/StationInfoBox.vue

@@ -34,23 +34,31 @@
 			<p>{{ station.description }}</p>
 		</div>
 
-		<div class="admin-buttons" v-if="isOwnerOrAdmin()">
+		<div class="admin-buttons">
 			<!-- (Admin) Pause/Resume Button -->
 			<button
 				class="button is-danger"
-				v-if="stationPaused"
+				v-if="isOwnerOrAdmin() && stationPaused"
 				@click="resumeStation()"
 			>
 				<i class="material-icons icon-with-button">play_arrow</i>
 				<span> Resume Station </span>
 			</button>
-			<button class="button is-danger" @click="pauseStation()" v-else>
+			<button
+				class="button is-danger"
+				@click="pauseStation()"
+				v-if="isOwnerOrAdmin() && !stationPaused"
+			>
 				<i class="material-icons icon-with-button">pause</i>
 				<span> Pause Station </span>
 			</button>
 
 			<!-- (Admin) Skip Button -->
-			<button class="button is-danger" @click="skipStation()">
+			<button
+				class="button is-danger"
+				@click="skipStation()"
+				v-if="isOwnerOrAdmin()"
+			>
 				<i class="material-icons icon-with-button">skip_next</i>
 				<span> Force Skip </span>
 			</button>
@@ -67,7 +75,7 @@
 						}
 					})
 				"
-				v-if="showManageStation"
+				v-if="isOwnerOrAdmin() && showManageStation"
 			>
 				<i class="material-icons icon-with-button">settings</i>
 				<span> Manage Station </span>

+ 8 - 6
frontend/src/components/modals/ManageStation/index.vue

@@ -22,7 +22,7 @@
 						<station-info-box
 							:station="station"
 							:station-paused="stationPaused"
-							:show-go-to-station="true"
+							:show-go-to-station="sector !== 'station'"
 						/>
 					</div>
 					<div v-if="isOwnerOrAdmin() || sector !== 'home'">
@@ -559,7 +559,12 @@ export default {
 			);
 		},
 		onCloseModal() {
-			this.$refs.settingsTabComponent.onCloseModal();
+			if (this.sector !== "home")
+				this.$refs.settingsTabComponent.onCloseModal();
+			else {
+				console.log("ON CLOSE MODAL FROM WITHIN MANAGESTATION");
+				this.closeModal("manageStation");
+			}
 		},
 		...mapModalActions("modals/manageStation/MODAL_UUID", [
 			"editStation",
@@ -640,14 +645,11 @@ export default {
 	height: 100%;
 
 	.left-section {
-		.section {
-			row-gap: 20px;
-		}
-
 		.station-info-box-wrapper {
 			border-radius: @border-radius;
 			border: 1px solid var(--light-grey-3);
 			overflow: hidden;
+			margin-bottom: 20px;
 		}
 
 		.tab-selection {