Преглед изворни кода

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

Jonathan пре 3 година
родитељ
комит
3a1ec473ed

+ 10 - 4
frontend/src/components/modals/EditStation.vue

@@ -228,7 +228,7 @@
 						</div>
 					</div>
 					<!--  Buttons changing the mode of the station -->
-					<div v-if="station.type === 'community'">
+					<div>
 						<label class="label">Station Mode</label>
 						<div
 							@mouseenter="modeDropdownActive = true"
@@ -265,7 +265,10 @@
 									Playlist
 								</button>
 							</transition>
-							<transition name="slide-down">
+							<transition
+								v-if="station.type === 'community'"
+								name="slide-down"
+							>
 								<button
 									class="yellow"
 									v-if="
@@ -318,7 +321,10 @@
 									Random
 								</button>
 							</transition>
-							<transition name="slide-down">
+							<transition
+								v-if="station.type === 'community'"
+								name="slide-down"
+							>
 								<button
 									class="blue"
 									v-if="
@@ -1317,7 +1323,7 @@ export default {
 			}
 
 			&.blue {
-				background-color: var(--primary-color);
+				background-color: var(--blue);
 			}
 
 			&.orange {

+ 5 - 1
frontend/src/pages/Profile/index.vue

@@ -78,7 +78,11 @@
 						Playlists
 					</button>
 				</div>
-				<playlists :user-id="userId" v-show="tab === 'playlists'" />
+				<playlists
+					:user-id="userId"
+					:username="user.name"
+					v-show="tab === 'playlists'"
+				/>
 				<recent-activity
 					:user-id="userId"
 					v-show="tab === 'recent-activity'"

+ 5 - 2
frontend/src/pages/Profile/tabs/Playlists.vue

@@ -109,6 +109,10 @@ export default {
 		userId: {
 			type: String,
 			default: ""
+		},
+		username: {
+			type: String,
+			default: ""
 		}
 	},
 	computed: {
@@ -116,8 +120,7 @@ export default {
 			...mapState("modalVisibility", {
 				modals: state => state.modals.station
 			}),
-			myUserId: state => state.user.auth.userId,
-			username: state => state.user.auth.username
+			myUserId: state => state.user.auth.userId
 		}),
 		playlists: {
 			get() {