dylan/gander
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Styles;

Browse Source 
UPDATE: Remove shortcut tips teleporting on toggle;
FIX: Clicking on a category on `AllCategoriesPage` now correctly routes;
REFACTOR: Update `StreamType` to match backend return structure;
This commit is contained in:
Chris-1010
2025-02-27 15:30:12 +00:00
parent 56985f8f6a
commit 53cdb87004
6 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/Layout/DynamicPageContent.tsx
View File

@@ -30,7 +30,7 @@ const DynamicPageContent: React.FC<DynamicPageContentProps> = ({
id="content" id="content"
className={`min-w-[850px] ${ className={`min-w-[850px] ${
showSideBar ? "w-[85vw] translate-x-[15vw]" : "w-[100vw]" showSideBar ? "w-[85vw] translate-x-[15vw]" : "w-[100vw]"
} items-start pb-[12vh] transition-all duration-[500ms] ease-in-out ${contentClassName}`} } items-start transition-all duration-[500ms] ease-in-out ${contentClassName}`}
> >
{children} {children}
</div> </div>

77
frontend/src/components/Navigation/Navbar.tsx
View File

@@ -25,6 +25,7 @@ const Navbar: React.FC<NavbarProps> = ({ variant = "default" }) => {
const { showAuthModal, setShowAuthModal } = useAuthModal(); const { showAuthModal, setShowAuthModal } = useAuthModal();
const { showSideBar } = useSidebar(); const { showSideBar } = useSidebar();
const { showQuickSettings, setShowQuickSettings } = useQuickSettings(); const { showQuickSettings, setShowQuickSettings } = useQuickSettings();
const [justToggled, setJustToggled] = React.useState(false);
const handleLogout = () => { const handleLogout = () => {
console.log("Logging out..."); console.log("Logging out...");
@@ -38,6 +39,8 @@ const Navbar: React.FC<NavbarProps> = ({ variant = "default" }) => {
const handleQuickSettings = () => { const handleQuickSettings = () => {
setShowQuickSettings(!showQuickSettings); setShowQuickSettings(!showQuickSettings);
setJustToggled(true);
setTimeout(() => setJustToggled(false), 750);
}; };
// Keyboard shortcut to toggle sidebar // Keyboard shortcut to toggle sidebar
@@ -65,43 +68,43 @@ const Navbar: React.FC<NavbarProps> = ({ variant = "default" }) => {
> >
{isLoggedIn && window.innerWidth > 900 && <Sidebar />} {isLoggedIn && window.innerWidth > 900 && <Sidebar />}
<Logo variant={variant} /> <Logo variant={variant} />
{/* Login / Logout Button */} {/* Login / Logout Button */}
<Button <Button
extraClasses={`absolute top-[2vh] ${ extraClasses={`absolute top-[2vh] ${
showSideBar showSideBar
? "left-[16vw] duration-[0.5s]" ? "left-[16vw] duration-[0.5s]"
: "left-[20px] duration-[1s]" : "left-[20px] duration-[1s]"
} text-[1rem] flex items-center flex-nowrap z-[99]`} } text-[1rem] flex items-center flex-nowrap z-[99]`}
onClick={() => (isLoggedIn ? handleLogout() : setShowAuthModal(true))} onClick={() => (isLoggedIn ? handleLogout() : setShowAuthModal(true))}
> >
{isLoggedIn ? ( {isLoggedIn ? (
<> <>
<LogOutIcon className="h-15 w-15 mr-1" /> <LogOutIcon className="h-15 w-15 mr-1" />
Logout Logout
</> </>
) : ( ) : (
<> <>
<LogInIcon className="h-15 w-15 mr-1" /> <LogInIcon className="h-15 w-15 mr-1" />
Login / Register Login / Register
</> </>
)} )}
</Button> </Button>
{/* Quick Settings Sidebar */} {/* Quick Settings Sidebar */}
<ToggleButton <ToggleButton
extraClasses={`absolute group text-[1rem] top-[2vh] ${ extraClasses={`absolute group text-[1rem] top-[2vh] ${
showQuickSettings ? "right-[21vw]" : "right-[20px]" showQuickSettings ? "right-[21vw]" : "right-[20px]"
} cursor-pointer`} } cursor-pointer`}
onClick={() => handleQuickSettings()} onClick={() => handleQuickSettings()}
toggled={showQuickSettings} toggled={showQuickSettings}
> >
<SettingsIcon className="h-[2vw] w-[2vw]" /> <SettingsIcon className="h-[2vw] w-[2vw]" />
{showQuickSettings && ( {!showQuickSettings && !justToggled && (
<small className="absolute flex items-center top-0 mr-4 right-0 h-full w-full my-auto group-hover:right-full opacity-0 group-hover:opacity-100 text-white transition-all delay-200"> <small className="absolute flex items-center top-0 mr-4 right-0 h-full w-full my-auto group-hover:right-full opacity-0 group-hover:opacity-100 text-white transition-all delay-200">
Press Q Press Q
</small> </small>
)} )}
</ToggleButton> </ToggleButton>
<QuickSettings /> <QuickSettings />
{variant != "no-searchbar" && <SearchBar />} {variant != "no-searchbar" && <SearchBar />}

5
frontend/src/components/Navigation/Sidebar.tsx
View File

@@ -25,6 +25,7 @@ const Sidebar: React.FC<SideBarProps> = ({ extraClasses = "" }) => {
const { username, isLoggedIn } = useAuth(); const { username, isLoggedIn } = useAuth();
const [followedStreamers, setFollowedStreamers] = useState<Streamer[]>([]); const [followedStreamers, setFollowedStreamers] = useState<Streamer[]>([]);
const [followedCategories, setFollowedCategories] = useState<Category[]>([]); const [followedCategories, setFollowedCategories] = useState<Category[]>([]);
const [justToggled, setJustToggled] = useState(false);
// Fetch followed streamers // Fetch followed streamers
useEffect(() => { useEffect(() => {
@@ -46,6 +47,8 @@ const Sidebar: React.FC<SideBarProps> = ({ extraClasses = "" }) => {
const handleSideBar = () => { const handleSideBar = () => {
setShowSideBar(!showSideBar); setShowSideBar(!showSideBar);
setJustToggled(true);
setTimeout(() => setJustToggled(false), 750);
}; };
// Keyboard shortcut to toggle sidebar // Keyboard shortcut to toggle sidebar
@@ -98,7 +101,7 @@ const Sidebar: React.FC<SideBarProps> = ({ extraClasses = "" }) => {
> >
<SidebarIcon className="h-[2vw] w-[2vw]" /> <SidebarIcon className="h-[2vw] w-[2vw]" />
{showSideBar && ( {!showSideBar && !justToggled && (
<small className="absolute flex items-center top-0 ml-4 left-0 h-full w-full my-auto group-hover:left-full opacity-0 group-hover:opacity-100 text-white transition-all delay-200"> <small className="absolute flex items-center top-0 ml-4 left-0 h-full w-full my-auto group-hover:left-full opacity-0 group-hover:opacity-100 text-white transition-all delay-200">
Press S Press S
</small> </small>

7
frontend/src/components/Stream/ChatPanel.tsx
View File

@@ -30,6 +30,7 @@ const ChatPanel: React.FC<ChatPanelProps> = ({
const [messages, setMessages] = useState<ChatMessage[]>([]); const [messages, setMessages] = useState<ChatMessage[]>([]);
const [inputMessage, setInputMessage] = useState(""); const [inputMessage, setInputMessage] = useState("");
const chatContainerRef = useRef<HTMLDivElement>(null); const chatContainerRef = useRef<HTMLDivElement>(null);
const [justToggled, setJustToggled] = useState(false);
// Join chat room when component mounts // Join chat room when component mounts
useEffect(() => { useEffect(() => {
@@ -114,6 +115,8 @@ const ChatPanel: React.FC<ChatPanelProps> = ({
const toggleChat = () => { const toggleChat = () => {
setShowChat(!showChat); setShowChat(!showChat);
setJustToggled(true);
setTimeout(() => setJustToggled(false), 750);
}; };
const sendChat = () => { const sendChat = () => {
@@ -147,11 +150,11 @@ const ChatPanel: React.FC<ChatPanelProps> = ({
{/* Toggle Button for Chat */} {/* Toggle Button for Chat */}
<button <button
onClick={toggleChat} onClick={toggleChat}
className={`group cursor-pointer p-2 hover:bg-gray-800 rounded-md absolute top-[1vh] left-[1vw] ${showChat ? "" : "delay-[0.75s] -translate-x-[3.3vw]"} text-[1rem] text-purple-500 flex items-center flex-nowrap z-[50] duration-[0.3s] transition-all`} className={`group cursor-pointer p-2 hover:bg-gray-800 rounded-md absolute top-[1vh] left-[1vw] ${showChat ? "" : "delay-[0.75s] -translate-x-[4vw]"} text-[1rem] text-purple-500 flex items-center flex-nowrap z-[20] duration-[0.3s] transition-all`}
> >
{showChat ? <ArrowRightFromLineIcon /> : <ArrowLeftFromLineIcon />} {showChat ? <ArrowRightFromLineIcon /> : <ArrowLeftFromLineIcon />}
<small className={`absolute ${showChat ? "right-0 group-hover:-right-[4vw]" : "left-0 group-hover:-left-[4vw]"} p-1 rounded-md group-hover:bg-white/10 w-fit opacity-0 group-hover:opacity-100 text-white transition-all`}> <small className={`absolute ${showChat ? justToggled ? "left-0 group-hover:-left-[4vw] group-hover:bg-white/10" : "right-0 group-hover:-right-[5vw] group-hover:bg-red-500/80" : justToggled ? "right-0 group-hover:-right-[5vw] group-hover:bg-red-500/80" : "left-0 group-hover:-left-[4vw] group-hover:bg-white/10"} p-1 rounded-md w-fit opacity-0 group-hover:opacity-100 text-white transition-all`}>
Press C Press C
</small> </small>
</button> </button>

2
frontend/src/pages/AllCategoriesPage.tsx
View File

@@ -87,7 +87,7 @@ const AllCategoriesPage: React.FC = () => {
type="category" type="category"
title="All Categories" title="All Categories"
items={categories} items={categories}
onClick={handleCategoryClick} onItemClick={handleCategoryClick}
extraClasses="bg-[var(--recommend)] text-center" extraClasses="bg-[var(--recommend)] text-center"
itemExtraClasses="w-[20vw]" itemExtraClasses="w-[20vw]"
wrap={true} wrap={true}

1
frontend/src/types/StreamType.ts
View File

@@ -5,5 +5,6 @@ export interface StreamType {
username: string; username: string;
streamCategory: string; streamCategory: string;
viewers: number; viewers: number;
startTime?: string;
thumbnail?: string; thumbnail?: string;
} }