UPDATE: Reverted VideoPage look
This commit is contained in:
JustIceO7
@@ -97,16 +97,17 @@ const VideoPage: React.FC<VideoPageProps> = ({ streamerId }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<SocketProvider>
|
<SocketProvider>
|
||||||
<div id="videoPage" className="w-full h-full min-h-screen bg-gray-900 flex flex-col">
|
<div id="videoPage" className="w-full">
|
||||||
<Navbar />
|
<Navbar />
|
||||||
|
|
||||||
<div
|
<div
|
||||||
id="container"
|
id="container"
|
||||||
className={`grid ${
|
className={`grid ${isChatOpen ? "w-[100vw]" : "w-[125vw]"
|
||||||
isChatOpen ? "w-[100vw]" : "w-[125vw]"
|
} grid-rows-[auto_1fr] bg-gray-900 h-full grid-cols-[auto_25vw] transition-all`}
|
||||||
} flex-grow bg-gray-900 h-full grid-cols-[auto_25vw] transition-all`}
|
|
||||||
>
|
>
|
||||||
<VideoPlayer />
|
<div className="relative">
|
||||||
|
<VideoPlayer streamId={streamerId} />
|
||||||
|
</div>
|
||||||
|
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
onClick={toggleChat}
|
onClick={toggleChat}
|
||||||
@@ -115,9 +116,7 @@ const VideoPage: React.FC<VideoPageProps> = ({ streamerId }) => {
|
|||||||
>
|
>
|
||||||
{isChatOpen ? "Hide Chat" : "Show Chat"}
|
{isChatOpen ? "Hide Chat" : "Show Chat"}
|
||||||
|
|
||||||
<small className="absolute right-0 left-0 -bottom-0 group-hover:-bottom-5 opacity-0 group-hover:opacity-100 text-white transition-all">
|
<small className="absolute right-0 left-0 -bottom-0 group-hover:-bottom-5 opacity-0 group-hover:opacity-100 text-white transition-all">Press C</small>
|
||||||
Press C
|
|
||||||
</small>
|
|
||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
|
|
||||||
<ChatPanel
|
<ChatPanel
|
||||||
@@ -125,108 +124,101 @@ const VideoPage: React.FC<VideoPageProps> = ({ streamerId }) => {
|
|||||||
onViewerCountChange={(count: number) => setViewerCount(count)}
|
onViewerCountChange={(count: number) => setViewerCount(count)}
|
||||||
onInputFocus={setIsInputFocused}
|
onInputFocus={setIsInputFocused}
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
{/* Stream Data */}
|
|
||||||
<div
|
|
||||||
id="stream-info"
|
|
||||||
className="flex flex-row items-center justify-evenly gap-4 p-4 bg-[#18181b] text-white text-lg rounded-md shadow-lg"
|
|
||||||
style={{ gridArea: "2 / 1 / 3 / 3" }}
|
|
||||||
>
|
|
||||||
{/* Streamer Icon */}
|
|
||||||
<div className="flex flex-col items-center mb-[1em]">
|
|
||||||
<img
|
|
||||||
src="/images/monkey.png"
|
|
||||||
alt="streamer profile picture"
|
|
||||||
className="w-[3em] h-[3em] rounded-full border-[0.15em] border-purple-500 cursor-pointer"
|
|
||||||
onClick={() => navigate(`/user/${streamerName}`)}
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
className="text-white font-bold hover:underline mt-[0.5em]"
|
|
||||||
onClick={() => navigate(`/user/${streamerName}`)}
|
|
||||||
>
|
|
||||||
{streamData ? streamData.streamerName : "Loading..."}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Stream Title */}
|
{/* Stream Data */}
|
||||||
<div className="flex flex-col items-start min-w-fit max-w-[60%] mx-8 text-wrap">
|
<div
|
||||||
<h1 className="text-[1rem] lg:text-[1.25em] xl:text-[1.5em] font-bold">
|
id="stream-info"
|
||||||
{streamData ? streamData.streamTitle : "Loading..."}
|
className="flex flex-row items-center justify-between gap-4 p-4 bg-[#18181b] text-white text-lg rounded-md shadow-lg"
|
||||||
</h1>
|
>
|
||||||
<span className="text-[0.75em] lg:text-[0.85em] xl:text-[1em] text-gray-400">
|
{/* Streamer Icon */}
|
||||||
{streamData ? streamData.categoryName : "Loading..."}
|
<div className="flex flex-col items-center mb-[1em]">
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Streamer Info */}
|
|
||||||
<div className="flex items-center gap-[0.75em] flex-col lg:flex-row">
|
|
||||||
<div className="flex flex-col items-center lg:items-start">
|
|
||||||
{!isFollowing ? (
|
|
||||||
<button
|
|
||||||
className="bg-purple-600 text-white font-bold px-[1.5em] py-[0.5em] rounded-md hover:bg-purple-700 text-sm"
|
|
||||||
onClick={() => followUser(streamerId, setShowAuthModal)}
|
|
||||||
>
|
|
||||||
Follow
|
|
||||||
</button>
|
|
||||||
) : (
|
|
||||||
<button
|
|
||||||
className="bg-gray-700 text-white font-bold px-[1.5em] py-[0.5em] rounded-md hover:bg-red-600 text-sm"
|
|
||||||
onClick={() => unfollowUser(streamerId, setShowAuthModal)}
|
|
||||||
>
|
|
||||||
Unfollow
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Stream Stats */}
|
|
||||||
<div className="flex flex-col items-center">
|
|
||||||
<div className="flex items-center gap-[0.5em]">
|
|
||||||
<img
|
<img
|
||||||
src="../../../images/icons/user.png"
|
src="/images/monkey.png"
|
||||||
alt="Viewers Icon"
|
alt="streamer"
|
||||||
className="w-[1em] h-[1em] md:w-[1.2em] md:h-[1.2em]"
|
className="w-[3em] h-[3em] rounded-full border-[0.15em] border-purple-500 cursor-pointer"
|
||||||
|
onClick={() => navigate(`/user/${streamerName}`)}
|
||||||
/>
|
/>
|
||||||
<span className="font-bold text-[1.2em]">{viewerCount}</span>
|
<button
|
||||||
|
className="text-white font-bold hover:underline mt-[0.5em]"
|
||||||
|
onClick={() => navigate(`/user/${streamerName}`)}
|
||||||
|
>
|
||||||
|
{streamData ? streamData.streamerName : "Loading..."}
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex flex-col items-center">
|
{/* Stream Title */}
|
||||||
<span className="text-gray-400 text-[0.75em]">Started</span>
|
<div className="flex flex-col items-start flex-grow">
|
||||||
<span className="text-[0.75em]">
|
<h2 className="text-[0.75em] lg:text-[0.85em] xl:text-[1em] font-bold">
|
||||||
{streamData
|
{streamData ? streamData.streamTitle : "Loading..."}
|
||||||
? `${Math.floor(
|
</h2>
|
||||||
(Date.now() - new Date(streamData.startTime).getTime()) /
|
<span className="text-[0.75em] lg:text-[0.85em] xl:text-[1em] text-gray-400">
|
||||||
3600000
|
{streamData ? streamData.categoryName : "Loading..."}
|
||||||
)} hours ago`
|
</span>
|
||||||
: "Loading..."}
|
</div>
|
||||||
</span>
|
|
||||||
</div>
|
{/* Streamer Info */}
|
||||||
|
<div className="flex items-center gap-[0.75em] flex-col lg:flex-row">
|
||||||
|
<div className="flex flex-col items-center lg:items-start">
|
||||||
|
{!isFollowing ? (
|
||||||
|
<button
|
||||||
|
className="bg-purple-600 text-white font-bold px-[1.5em] py-[0.5em] rounded-md hover:bg-purple-700 text-sm"
|
||||||
|
onClick={() => followUser(streamerId, setShowAuthModal)}
|
||||||
|
>
|
||||||
|
Follow
|
||||||
|
</button>
|
||||||
|
) : (
|
||||||
|
<button
|
||||||
|
className="bg-gray-700 text-white font-bold px-[1.5em] py-[0.5em] rounded-md hover:bg-red-600 text-sm"
|
||||||
|
onClick={() => unfollowUser(streamerId, setShowAuthModal)}
|
||||||
|
>
|
||||||
|
Unfollow
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Stream Stats */}
|
||||||
|
<div className="flex flex-col items-center">
|
||||||
|
<div className="flex items-center gap-[0.5em]">
|
||||||
|
<img
|
||||||
|
src="../../../images/icons/user.png"
|
||||||
|
alt="Viewers Icon"
|
||||||
|
className="w-[1em] h-[1em] md:w-[1.2em] md:h-[1.2em]"
|
||||||
|
/>
|
||||||
|
<span className="font-bold text-[1.2em]">{viewerCount}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex flex-col items-center">
|
||||||
|
<span className="text-gray-400 text-[0.75em]">Started</span>
|
||||||
|
<span className="text-[0.75em]">
|
||||||
|
{streamData
|
||||||
|
? `${Math.floor((Date.now() - new Date(streamData.startTime).getTime()) / 3600000)} hours ago`
|
||||||
|
: "Loading..."}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Subscribe Button */}
|
||||||
|
<div className="flex flex-col items-center">
|
||||||
|
<button
|
||||||
|
className="bg-red-600 text-white font-bold px-[1.5em] py-[0.5em] rounded-md hover:bg-red-700 text-sm"
|
||||||
|
onClick={() => {
|
||||||
|
if (!isLoggedIn) {
|
||||||
|
setShowAuthModal(true);
|
||||||
|
} else {
|
||||||
|
setShowCheckout(true);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Subscribe
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Subscribe Button */}
|
|
||||||
<div className="flex flex-col items-center">
|
|
||||||
<button
|
|
||||||
className="bg-red-600 text-white font-bold px-[1.5em] py-[0.5em] rounded-md hover:bg-red-700 text-sm"
|
|
||||||
onClick={() => {
|
|
||||||
if (!isLoggedIn) {
|
|
||||||
setShowAuthModal(true);
|
|
||||||
} else {
|
|
||||||
setShowCheckout(true);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Subscribe
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
|
{showCheckout && <CheckoutForm onClose={() => setShowCheckout(false)} streamerID={streamerId}/>}
|
||||||
|
{showReturn && <Return />}
|
||||||
|
{showAuthModal && <AuthModal onClose={() => setShowAuthModal(false)} />}
|
||||||
</div>
|
</div>
|
||||||
{showCheckout && (
|
|
||||||
<CheckoutForm
|
|
||||||
onClose={() => setShowCheckout(false)}
|
|
||||||
streamerID={streamerId}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{showReturn && <Return />}
|
|
||||||
{showAuthModal && <AuthModal onClose={() => setShowAuthModal(false)} />}
|
|
||||||
</div>
|
</div>
|
||||||
</SocketProvider>
|
</SocketProvider>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user