Merge branch 'polishing-jonathan' into polishing

frontend/components/Sidebars/SongsList.vue

@@ -206,16 +206,6 @@ export default {
 	height: 100%;
 }
 
-.slide-transition {
-	transition: transform 0.6s ease-in-out;
-	transform: translateX(0);
-}
-
-.slide-enter,
-.slide-leave {
-	transform: translateX(100%);
-}
-
 .sidebar-title {
 	background-color: rgb(3, 169, 244);
 	text-align: center;

frontend/components/Sidebars/UsersList.vue

@@ -47,33 +47,6 @@ export default {
 	}
 }
 
-.sidebar {
-	position: fixed;
-	z-index: 1;
-	top: 0;
-	right: 0;
-	width: 300px;
-	height: 100vh;
-	background-color: $white;
-	box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16),
-		0 2px 10px 0 rgba(0, 0, 0, 0.12);
-}
-
-.inner-wrapper {
-	top: 60px;
-	position: relative;
-}
-
-.slide-transition {
-	transition: transform 0.6s ease-in-out;
-	transform: translateX(0);
-}
-
-.slide-enter,
-.slide-leave {
-	transform: translateX(100%);
-}
-
 .sidebar-title {
 	background-color: rgb(3, 169, 244);
 	text-align: center;

frontend/components/Station/Station.vue

@@ -92,7 +92,7 @@
 						>
 							<div
 								class="seeker-bar light-blue"
-								style="width: 0%;"
+								style="width: 0%"
 							/>
 						</div>
 					</div>
@@ -129,8 +129,7 @@
 								{{ utils.formatTime(currentSong.duration) }}
 							</div>
 						</article>
-
-						<p v-if="noSong" class="center">
+						<p v-if="noSong" class="has-text-centered">
 							There is currently no song playing.
 						</p>
 
@@ -206,7 +205,7 @@
 								</h4>
 								<div class="columns is-mobile">
 									<form
-										style="margin-top: 12px; margin-bottom: 0;"
+										style="margin-top: 12px; margin-bottom: 0"
 										action="#"
 										class="column is-7-desktop is-4-mobile"
 									>
@@ -251,7 +250,7 @@
 										>
 											<li
 												id="like"
-												style="margin-right: 10px;"
+												style="margin-right: 10px"
 												@click="toggleLike()"
 											>
 												<span class="flow-text">{{
@@ -360,7 +359,7 @@
 													currentSong.dislikes !== -1
 											"
 											id="ratings"
-											style="display: inline-block;"
+											style="display: inline-block"
 										>
 											<li
 												id="dislike"
@@ -386,7 +385,7 @@
 											</li>
 											<li
 												id="like"
-												style="display: inline-block;"
+												style="display: inline-block"
 												@click="toggleLike()"
 											>
 												<span class="flow-text">{{
@@ -417,7 +416,7 @@
 			<add-to-playlist v-if="modals.addSongToPlaylist" />
 			<edit-playlist v-if="modals.editPlaylist" />
 			<create-playlist v-if="modals.createPlaylist" />
-			<edit-station v-show="modals.editStation" store="station" />
+			<edit-station v-if="modals.editStation" store="station" />
 			<report v-if="modals.report" />
 
 			<transition name="slide-outer">
@@ -957,7 +956,8 @@ export default {
 															if (
 																data3.status ===
 																"success"
-															) {} // eslint-disable-line
+															) {
+															} // eslint-disable-line
 														}
 													);
 												}

frontend/store/modules/modals.js

@@ -32,7 +32,11 @@ const getters = {};
 
 const actions = {
 	closeModal: ({ commit }, data) => {
-		if (data.modal === "register") window.location.reload();
+		if (data.modal === "register") {
+			lofig.get("recaptcha.enabled").then(recaptchaEnabled => {
+				if (recaptchaEnabled) window.location.reload();
+			});
+		}
 		commit("closeModal", data);
 	},
 	openModal: ({ commit }, data) => {