FEAT: Added more info & functionality to UserPage & Added ability to follow streamers on both UserPage and VideoPage;
Added shortcut to toggle chat;
This commit is contained in:
@@ -3,9 +3,12 @@ import Navbar from "../components/Layout/Navbar";
|
||||
import Button, { ToggleButton } from "../components/Layout/Button";
|
||||
import ChatPanel from "../components/Video/ChatPanel";
|
||||
import { useNavigate, useParams } from "react-router-dom";
|
||||
import { useAuthModal } from "../hooks/useAuthModal";
|
||||
import { useAuth } from "../context/AuthContext";
|
||||
import { useFollow } from "../hooks/useFollow";
|
||||
import VideoPlayer from "../components/Video/VideoPlayer";
|
||||
import { SocketProvider } from "../context/SocketContext";
|
||||
import AuthModal from "../components/Auth/AuthModal";
|
||||
|
||||
interface VideoPageProps {
|
||||
streamerId: number;
|
||||
@@ -24,6 +27,9 @@ const VideoPage: React.FC<VideoPageProps> = ({ streamerId }) => {
|
||||
const [streamData, setStreamData] = useState<StreamDataProps>();
|
||||
const [viewerCount, setViewerCount] = useState(0);
|
||||
const [isChatOpen, setIsChatOpen] = useState(true);
|
||||
const { isFollowing, checkFollowStatus, followUser, unfollowUser } =
|
||||
useFollow();
|
||||
const { showAuthModal, setShowAuthModal } = useAuthModal();
|
||||
// const [showCheckout, setShowCheckout] = useState(false);
|
||||
// const showReturn = window.location.search.includes("session_id");
|
||||
const navigate = useNavigate();
|
||||
@@ -40,6 +46,7 @@ const VideoPage: React.FC<VideoPageProps> = ({ streamerId }) => {
|
||||
// document.body.style.overflow = "unset";
|
||||
// };
|
||||
// }, [showCheckout]);
|
||||
|
||||
useEffect(() => {
|
||||
// Fetch stream data for this streamer
|
||||
fetch(`/api/streams/${streamerId}/data`).then((res) => {
|
||||
@@ -57,6 +64,9 @@ const VideoPage: React.FC<VideoPageProps> = ({ streamerId }) => {
|
||||
categoryName: data.category_name,
|
||||
};
|
||||
setStreamData(transformedData);
|
||||
|
||||
// Check if the logged-in user is following this streamer
|
||||
if (isLoggedIn) checkFollowStatus(data.username);
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error("Error fetching stream data:", error);
|
||||
@@ -64,6 +74,21 @@ const VideoPage: React.FC<VideoPageProps> = ({ streamerId }) => {
|
||||
});
|
||||
}, [streamerId]);
|
||||
|
||||
// Keyboard shortcut to toggle chat
|
||||
useEffect(() => {
|
||||
const handleKeyPress = (e: KeyboardEvent) => {
|
||||
if (e.key === "c") {
|
||||
setIsChatOpen((prev) => !prev);
|
||||
}
|
||||
};
|
||||
|
||||
document.addEventListener("keydown", handleKeyPress);
|
||||
|
||||
return () => {
|
||||
document.removeEventListener("keydown", handleKeyPress);
|
||||
};
|
||||
}, []);
|
||||
|
||||
const toggleChat = () => {
|
||||
setIsChatOpen((prev) => !prev);
|
||||
};
|
||||
@@ -86,9 +111,11 @@ const VideoPage: React.FC<VideoPageProps> = ({ streamerId }) => {
|
||||
<ToggleButton
|
||||
onClick={toggleChat}
|
||||
toggled={isChatOpen}
|
||||
extraClasses="absolute top-[70px] right-[20px] text-[1rem] flex items-center flex-nowrap"
|
||||
extraClasses="group cursor-pointer absolute top-[70px] right-[20px] text-[1rem] flex items-center flex-nowrap"
|
||||
>
|
||||
{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">Press C</small>
|
||||
</ToggleButton>
|
||||
|
||||
<ChatPanel
|
||||
@@ -98,53 +125,66 @@ const VideoPage: React.FC<VideoPageProps> = ({ streamerId }) => {
|
||||
|
||||
<div
|
||||
id="stream-info"
|
||||
className="flex flex-col gap-2 p-4 text-white"
|
||||
className="flex flex-row items-center justify-evenly gap-2 p-8 text-white text-xl"
|
||||
style={{ gridArea: "2 / 1 / 3 / 2" }}
|
||||
>
|
||||
<h1 className="text-2xl font-bold">
|
||||
<h1 className="text-3xl text-center font-bold">
|
||||
{streamData ? streamData.streamTitle : "Loading..."}
|
||||
</h1>
|
||||
<div className="flex flex-col gap-2">
|
||||
<div
|
||||
id="streamer"
|
||||
className="flex items-center gap-2 cursor-pointer"
|
||||
<div>
|
||||
<Button
|
||||
extraClasses="flex flex-col items-center font-bold bg-[#ff0000] p-4 px-12 rounded-[3rem] cursor-pointer"
|
||||
onClick={() => navigate(`/user/${streamerName}`)}
|
||||
>
|
||||
<h1>{streamData ? streamData.streamerName : "Loading..."}</h1>
|
||||
<img
|
||||
src="/images/monkey.png"
|
||||
alt="streamer"
|
||||
className="w-10 h-10 bg-indigo-500 rounded-full"
|
||||
className="w-30 h-10 bg-indigo-500 rounded-full"
|
||||
/>
|
||||
<span>
|
||||
{streamData ? streamData.streamerName : "Loading..."}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="font-semibold">Viewer Count:</span>
|
||||
<span>{viewerCount}</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="font-semibold">Started At:</span>
|
||||
<span>
|
||||
{streamData
|
||||
? new Date(streamData.startTime).toLocaleString()
|
||||
: "Loading..."}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="font-semibold">Category ID:</span>
|
||||
<span>
|
||||
{streamData ? streamData.categoryName : "Loading..."}
|
||||
</span>
|
||||
</div>
|
||||
</Button>
|
||||
|
||||
{/* (Un)Follow Button */}
|
||||
{!isFollowing ? (
|
||||
<Button
|
||||
extraClasses="w-full bg-purple-700 hover:bg-[#28005e]"
|
||||
onClick={() => followUser(streamerId, setShowAuthModal)}
|
||||
>
|
||||
Follow
|
||||
</Button>
|
||||
) : (
|
||||
<Button
|
||||
extraClasses="w-full bg-green-400/30 hover:content-['Unfollow'] hover:border-[#a80000]"
|
||||
onClick={() => unfollowUser(streamerId, setShowAuthModal)}
|
||||
>
|
||||
Following
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex flex-col items-center font-bold">
|
||||
<span className="font-thin">Viewers</span>
|
||||
<span>{viewerCount}</span>
|
||||
</div>
|
||||
<div className="flex flex-col items-center font-bold">
|
||||
<span className="font-thin">Started</span>
|
||||
<span>
|
||||
{streamData
|
||||
? new Date(streamData.startTime).toLocaleString()
|
||||
: "Loading..."}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex flex-col items-center font-bold">
|
||||
<span className="font-thin">Category</span>
|
||||
<span>{streamData ? streamData.categoryName : "Loading..."}</span>
|
||||
</div>
|
||||
{isLoggedIn && (
|
||||
<Button extraClasses="mx-auto mb-4">Payment Screen Test</Button>
|
||||
)}
|
||||
</div>
|
||||
{isLoggedIn && (
|
||||
<Button extraClasses="mx-auto mb-4">Payment Screen Test</Button>
|
||||
)}
|
||||
</div>
|
||||
{/* {showCheckout && <CheckoutForm onClose={() => setShowCheckout(false)} />} */}
|
||||
{/* {showReturn && <Return />} */}
|
||||
{showAuthModal && <AuthModal onClose={() => setShowAuthModal(false)} />}
|
||||
</div>
|
||||
</SocketProvider>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user