Merge branch 'polishing' of github.com:Musare/MusareNode into polishing

backend/logic/actions/stations.js

@@ -600,7 +600,9 @@ export default {
 						locked: station.locked,
 						partyMode: station.partyMode,
 						owner: station.owner,
-						privatePlaylist: station.privatePlaylist
+						privatePlaylist: station.privatePlaylist,
+						genres: station.genres,
+						blacklistedGenres: station.blacklistedGenres
 					};
 					userList[session.socketId] = station._id;
 					next(null, data);

frontend/src/components/layout/MainFooter.vue

@@ -5,11 +5,8 @@
 				<div id="footer-copyright">
 					<p>© Copyright Musare 2015 - 2021</p>
 				</div>
-				<a href="/"
-					><img
-						id="footer-logo"
-						src="/assets/blue_wordmark.png"
-						alt="Musare"
+				<a id="footer-logo" href="/"
+					><img src="/assets/blue_wordmark.png" alt="Musare"
 				/></a>
 				<div id="footer-links">
 					<a
@@ -80,12 +77,13 @@ export default {
 		0 6px 20px 0 rgba(3, 169, 244, 0.2);
 	background-color: $white;
 	width: 100%;
+	height: 160px;
 
 	#footer-logo {
 		display: block;
 		margin-left: auto;
 		margin-right: auto;
-		width: 200px;
+		width: 160px;
 		order: 1;
 	}
 
@@ -122,18 +120,19 @@ export default {
 
 @media only screen and (min-width: 992px) {
 	.footer {
+		height: 100px;
 		#footer-copyright {
 			left: 0;
-			top: 20px;
+			top: 0;
 			position: absolute;
-			line-height: 25px;
+			line-height: 50px;
 		}
 
 		#footer-links {
 			right: 0;
-			top: 20px;
+			top: 0;
 			position: absolute;
-			line-height: 25px;
+			line-height: 50px;
 		}
 	}
 }

frontend/src/components/modals/EditStation.vue

@@ -38,7 +38,10 @@
 							</p>
 						</div>
 					</div>
-					<div class="col col-2" v-if="editing.genres">
+					<div
+						class="col col-2"
+						v-if="editing.type === 'official' && editing.genres"
+					>
 						<div>
 							<label class="label">Genre(s)</label>
 							<p class="control has-addons">
@@ -159,8 +162,14 @@
 					</div>
 
 					<!--  Choose a playlist -->
-					<div v-if="!editing.partyMode && playlists.length > 0">
-						<hr style="margin: 10px 0 20px 0;" />
+					<div
+						v-if="
+							editing.type === 'community' &&
+								!editing.partyMode &&
+								playlists.length > 0
+						"
+					>
+						<hr style="margin: 10px 0 20px 0" />
 
 						<h4 class="section-title">Choose a playlist</h4>
 						<p class="section-description">

frontend/src/pages/Station/index.vue

@@ -669,7 +669,9 @@ export default {
 				description: this.station.description,
 				privacy: this.station.privacy,
 				displayName: this.station.displayName,
-				locked: this.station.locked
+				locked: this.station.locked,
+				genres: this.station.genres,
+				blacklistedGenres: this.station.blacklistedGenres
 			});
 			this.openModal({
 				sector: "station",
@@ -1199,7 +1201,9 @@ export default {
 						partyMode,
 						owner,
 						privatePlaylist,
-						type
+						type,
+						genres,
+						blacklistedGenres
 					} = res.data;
 
 					this.joinStation({
@@ -1212,7 +1216,9 @@ export default {
 						partyMode,
 						owner,
 						privatePlaylist,
-						type
+						type,
+						genres,
+						blacklistedGenres
 					});
 
 					const currentSong = res.data.currentSong
@@ -1441,7 +1447,7 @@ export default {
 @import "../../styles/global.scss";
 
 .main-container {
-	min-height: calc(100vh + 180px);
+	min-height: calc(100vh + 100px);
 }
 
 .progress {