Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions frontend/src/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,7 @@ $screen-lg: 1024px; /* Px for media queries for large screens */
$screen-ulg: 1200px; /* Px for media queries for ultra large screens */

$width-without-drawer: 98vw;

$default-overlay-box-shadow: 1px 2px 7px 4px $secondary-color;
$default-overlay-background-color: $primary-color;
$default-overlay-text-color: $success-color;
4 changes: 3 additions & 1 deletion frontend/src/components/overlay/musicPlayer/MusicPlayer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ export default function MusicPlayer() {
}, [socketContext]);

return (
<div className="music-player-wrapper">
<div className={`music-player-wrapper ${songName ? "" : "hidden"}`}>
<div className="music-player-background"></div>

{showPlaylist && audioData ? (
<SongsPlaylist songs={audioData.songsInQue} />
) : (
Expand Down
28 changes: 19 additions & 9 deletions frontend/src/components/overlay/musicPlayer/style.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
.music-player-wrapper {
padding-right: 0.4rem;
font-weight: 500;
background-color: rgba(24, 23, 23, 0.3);
height: 100%;
font-size: 1.2vw;
border-radius: 1rem;
display: flex;
flex-direction: column;
color: lightblue;
color: $default-overlay-text-color;
overflow: hidden;
span {
padding-left: 0.3rem;
font-weight: 700;
color: white;
position: relative;
box-shadow: $default-overlay-box-shadow;
padding-left: 0.5rem;

.music-player-background {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
filter: opacity(15%);
background-color: $default-overlay-background-color;
}

& > div {
Expand All @@ -25,7 +32,6 @@
width: 100%;
border-radius: 1rem;

color: white;
display: inline-block;
white-space: nowrap;
animation: scrollHorizontally 6s alternate infinite;
Expand All @@ -34,16 +40,20 @@
display: flex;

& > div {
flex: 1 1 30%;
flex: 1;
align-self: center;
z-index: 100;

& > span {
color: $default-overlay-text-color !important;
}
}
}

.music-player-playlist {
display: flex;
height: 100%;
flex-direction: column;
color: white;

& > div:first-child {
text-align: center;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useEffect, useState } from "react";
import React, { useCallback, useEffect, useRef, useState } from "react";

import { useSocketContext } from "@socket";
import YouTube, { YouTubeEvent, YouTubeProps } from "react-youtube";
Expand All @@ -16,6 +16,7 @@ export default function MusicPlayer() {
const [player, setPlayer] = React.useState<YouTubeEvent | null>(null);
const [duration, setDuration] = useState<number>(0);
const [currentTime, setCurrentTime] = useState<number>(0);
const youtubeWrapperRef = useRef<HTMLDivElement | null>(null);

const handleYTPause = useCallback(() => {
if (player) player.target.pauseVideo();
Expand Down Expand Up @@ -111,7 +112,18 @@ export default function MusicPlayer() {
};

return (
<div className={`youtube-player-wrapper ${songName ? "" : "hidden"}`}>
<div
className={`youtube-player-wrapper ${songName ? "" : "hidden"}`}
ref={youtubeWrapperRef}
style={{
fontSize: `${
youtubeWrapperRef.current
? `${youtubeWrapperRef.current.offsetWidth / 500}dvw`
: "1rem"
}`,
}}
>
<div className="youtube-player-background"></div>
<div className="youtube-song-details">
<div className="youtube-current-song">{songName} </div>
<div className="youtube-song-progress">
Expand Down
24 changes: 20 additions & 4 deletions frontend/src/components/overlay/youtubePlayerVideo/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,38 @@
bottom: 0;
}

.youtube-player-background {
position: absolute;
background-color: $default-overlay-background-color;
filter: opacity(15%);
left: 0;
top: 0;
bottom: 0;
right: 0;
}

.youtube-song-details {
padding: 0.5rem;
border-radius: 0.5rem;
z-index: 2;
position: absolute;
overflow: hidden;
display: flex;
font-weight: 700;
opacity: 0.8;
background-color: rgb(195, 195, 195);
box-shadow: $default-overlay-box-shadow;
width: 100%;
height: 90%;
}

.youtube-song-progress {
* {
color: $success-color !important;
}
}

.youtube-current-song {
flex: 0 0 60%;
border-right: 1px solid rgba(138, 137, 137, 0.52);
border-right: 1px solid $primary-color;
margin-right: 2%;
}

* {
Expand Down