Adds responsive sidebar and header
Implements a responsive design for the left sidebar, making it collapsible on smaller screens. Adds a hamburger menu icon in the header to toggle the sidebar's visibility on mobile devices, improving the user experience on smaller screens. The right sidebar is now hidden on smaller screens and only visible on extra large screens.
This commit is contained in:
1 parent
f5520411db
commit
fcfdf8ac67
3 files changed
+67
-8
No files matched your search
+28
-3
@@ -1,5 +1,7 @@
|
|||||||
import type { ReactNode } from 'react';
|
import type { ReactNode } from 'react';
|
||||||
|
import { useState } from 'react';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
|
import { HamburgerMenuIcon, Cross1Icon } from '@radix-ui/react-icons';
|
||||||
import { LeftSidebar } from './LeftSidebar';
|
import { LeftSidebar } from './LeftSidebar';
|
||||||
|
|
||||||
interface LayoutProps {
|
interface LayoutProps {
|
||||||
@@ -9,19 +11,42 @@ interface LayoutProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function Layout({ children, showSidebar = true, rightSidebar }: LayoutProps) {
|
export function Layout({ children, showSidebar = true, rightSidebar }: LayoutProps) {
|
||||||
|
const [isMobileSidebarOpen, setIsMobileSidebarOpen] = useState(false);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen bg-[#1e1e1e]">
|
<div className="min-h-screen bg-[#1e1e1e]">
|
||||||
{/* Left Sidebar - fixed positioning */}
|
{/* Left Sidebar - fixed positioning */}
|
||||||
{showSidebar && <LeftSidebar />}
|
{showSidebar && (
|
||||||
|
<LeftSidebar
|
||||||
|
isMobileOpen={isMobileSidebarOpen}
|
||||||
|
onMobileClose={() => setIsMobileSidebarOpen(false)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Main Content */}
|
{/* Main Content */}
|
||||||
<div className={`flex-1 flex flex-col min-w-0 ${showSidebar ? 'ml-64' : ''}`}>
|
<div className={`flex-1 flex flex-col min-w-0 ${showSidebar ? 'lg:ml-64' : ''}`}>
|
||||||
{/* Top Header */}
|
{/* Top Header */}
|
||||||
<header className="bg-[#252526] border-b border-[#3e3e42] sticky top-0 z-10">
|
<header className="bg-[#252526] border-b border-[#3e3e42] sticky top-0 z-10">
|
||||||
<div className="px-6 py-3 flex items-center justify-between">
|
<div className="px-6 py-3 flex items-center justify-between">
|
||||||
|
<div className="flex items-center gap-4">
|
||||||
|
{/* Hamburger Menu Button - only visible on mobile/tablet */}
|
||||||
|
{showSidebar && (
|
||||||
|
<button
|
||||||
|
onClick={() => setIsMobileSidebarOpen(!isMobileSidebarOpen)}
|
||||||
|
className="lg:hidden p-2 hover:bg-[#2d2d30] rounded transition-colors text-[#e4e4e4]"
|
||||||
|
aria-label="Toggle sidebar"
|
||||||
|
>
|
||||||
|
{isMobileSidebarOpen ? (
|
||||||
|
<Cross1Icon className="h-5 w-5" />
|
||||||
|
) : (
|
||||||
|
<HamburgerMenuIcon className="h-5 w-5" />
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
<Link to="/" className="text-xl font-semibold text-[#e4e4e4] hover:text-[#4db8ff] transition-colors">
|
<Link to="/" className="text-xl font-semibold text-[#e4e4e4] hover:text-[#4db8ff] transition-colors">
|
||||||
Gem Wiki (잼위키)
|
Gem Wiki (잼위키)
|
||||||
</Link>
|
</Link>
|
||||||
|
</div>
|
||||||
<nav className="flex items-center gap-6 text-sm">
|
<nav className="flex items-center gap-6 text-sm">
|
||||||
<Link to="/" className="text-[#9d9d9d] hover:text-[#e4e4e4] transition-colors">
|
<Link to="/" className="text-[#9d9d9d] hover:text-[#e4e4e4] transition-colors">
|
||||||
Learn
|
Learn
|
||||||
@@ -35,7 +60,7 @@ export function Layout({ children, showSidebar = true, rightSidebar }: LayoutPro
|
|||||||
|
|
||||||
{/* Content Area */}
|
{/* Content Area */}
|
||||||
<div className="flex flex-1">
|
<div className="flex flex-1">
|
||||||
<main className={`flex-1 px-8 py-6 overflow-y-auto ${rightSidebar ? 'mr-64' : ''}`}>
|
<main className={`flex-1 px-4 md:px-8 py-6 overflow-y-auto ${rightSidebar ? 'xl:mr-64' : ''}`}>
|
||||||
{children}
|
{children}
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
|
|||||||
@@ -10,9 +10,10 @@ interface TreeNodeProps {
|
|||||||
allPages: Page[];
|
allPages: Page[];
|
||||||
searchQuery: string;
|
searchQuery: string;
|
||||||
level: number;
|
level: number;
|
||||||
|
onLinkClick: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
function TreeNode({ page, children, allPages, searchQuery, level }: TreeNodeProps) {
|
function TreeNode({ page, children, allPages, searchQuery, level, onLinkClick }: TreeNodeProps) {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const [isExpanded, setIsExpanded] = useState(true);
|
const [isExpanded, setIsExpanded] = useState(true);
|
||||||
const isActive = location.pathname === `/pages/${page.id}`;
|
const isActive = location.pathname === `/pages/${page.id}`;
|
||||||
@@ -43,6 +44,7 @@ function TreeNode({ page, children, allPages, searchQuery, level }: TreeNodeProp
|
|||||||
|
|
||||||
<Link
|
<Link
|
||||||
to={`/pages/${page.id}`}
|
to={`/pages/${page.id}`}
|
||||||
|
onClick={onLinkClick}
|
||||||
className={`flex-1 flex items-center gap-2 px-2 py-1.5 text-sm rounded transition-colors ${
|
className={`flex-1 flex items-center gap-2 px-2 py-1.5 text-sm rounded transition-colors ${
|
||||||
isActive
|
isActive
|
||||||
? 'bg-[#0078d4] text-white'
|
? 'bg-[#0078d4] text-white'
|
||||||
@@ -67,6 +69,7 @@ function TreeNode({ page, children, allPages, searchQuery, level }: TreeNodeProp
|
|||||||
allPages={allPages}
|
allPages={allPages}
|
||||||
searchQuery={searchQuery}
|
searchQuery={searchQuery}
|
||||||
level={level + 1}
|
level={level + 1}
|
||||||
|
onLinkClick={onLinkClick}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
@@ -76,7 +79,12 @@ function TreeNode({ page, children, allPages, searchQuery, level }: TreeNodeProp
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function LeftSidebar() {
|
interface LeftSidebarProps {
|
||||||
|
isMobileOpen: boolean;
|
||||||
|
onMobileClose: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function LeftSidebar({ isMobileOpen, onMobileClose }: LeftSidebarProps) {
|
||||||
const [searchQuery, setSearchQuery] = useState('');
|
const [searchQuery, setSearchQuery] = useState('');
|
||||||
const { data: pages = [] } = useQuery({
|
const { data: pages = [] } = useQuery({
|
||||||
queryKey: ['pages'],
|
queryKey: ['pages'],
|
||||||
@@ -86,8 +94,32 @@ export function LeftSidebar() {
|
|||||||
// Build tree structure
|
// Build tree structure
|
||||||
const rootPages = pages.filter(page => !page.parentId).sort((a, b) => (a.order || 0) - (b.order || 0));
|
const rootPages = pages.filter(page => !page.parentId).sort((a, b) => (a.order || 0) - (b.order || 0));
|
||||||
|
|
||||||
|
// Close mobile sidebar on navigation
|
||||||
|
const handleLinkClick = () => {
|
||||||
|
if (window.innerWidth < 1024) { // lg breakpoint
|
||||||
|
onMobileClose();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<aside className="w-64 h-screen fixed left-0 top-0 bg-[#252526] border-r border-[#3e3e42] flex flex-col overflow-hidden z-20">
|
<>
|
||||||
|
{/* Mobile overlay */}
|
||||||
|
{isMobileOpen && (
|
||||||
|
<div
|
||||||
|
className="fixed inset-0 bg-black/50 z-20 lg:hidden"
|
||||||
|
onClick={onMobileClose}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Sidebar */}
|
||||||
|
<aside className={`
|
||||||
|
w-64 h-screen fixed left-0 top-0 bg-[#252526] border-r border-[#3e3e42]
|
||||||
|
flex flex-col overflow-hidden z-30 transition-transform duration-300
|
||||||
|
lg:translate-x-0
|
||||||
|
${
|
||||||
|
isMobileOpen ? 'translate-x-0' : '-translate-x-full'
|
||||||
|
}
|
||||||
|
`}>
|
||||||
{/* Search Box */}
|
{/* Search Box */}
|
||||||
<div className="p-4 border-b border-[#3e3e42]">
|
<div className="p-4 border-b border-[#3e3e42]">
|
||||||
<div className="relative">
|
<div className="relative">
|
||||||
@@ -126,6 +158,7 @@ export function LeftSidebar() {
|
|||||||
allPages={pages}
|
allPages={pages}
|
||||||
searchQuery={searchQuery}
|
searchQuery={searchQuery}
|
||||||
level={0}
|
level={0}
|
||||||
|
onLinkClick={handleLinkClick}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
@@ -133,5 +166,6 @@ export function LeftSidebar() {
|
|||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</aside>
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -16,7 +16,7 @@ export function RightSidebar() {
|
|||||||
|
|
||||||
if (headings.length === 0) {
|
if (headings.length === 0) {
|
||||||
return (
|
return (
|
||||||
<aside className="w-64 fixed top-0 right-0 h-screen bg-[#252526] border-l border-[#3e3e42] overflow-y-auto z-10">
|
<aside className="hidden xl:block w-64 fixed top-0 right-0 h-screen bg-[#252526] border-l border-[#3e3e42] overflow-y-auto z-10">
|
||||||
<div className="p-4 mt-14">
|
<div className="p-4 mt-14">
|
||||||
<h2 className="text-sm font-semibold text-[#e4e4e4] mb-4">이 문서의 내용</h2>
|
<h2 className="text-sm font-semibold text-[#e4e4e4] mb-4">이 문서의 내용</h2>
|
||||||
<p className="text-xs text-[#9d9d9d]">헤딩이 없습니다</p>
|
<p className="text-xs text-[#9d9d9d]">헤딩이 없습니다</p>
|
||||||
@@ -26,7 +26,7 @@ export function RightSidebar() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<aside className="w-64 fixed top-0 right-0 h-screen bg-[#252526] border-l border-[#3e3e42] overflow-y-auto z-10">
|
<aside className="hidden xl:block w-64 fixed top-0 right-0 h-screen bg-[#252526] border-l border-[#3e3e42] overflow-y-auto z-10">
|
||||||
<div className="p-4 mt-14">
|
<div className="p-4 mt-14">
|
||||||
<h2 className="text-sm font-semibold text-[#e4e4e4] mb-4">이 문서의 내용</h2>
|
<h2 className="text-sm font-semibold text-[#e4e4e4] mb-4">이 문서의 내용</h2>
|
||||||
<nav>
|
<nav>
|
||||||
|
|||||||
Reference in new issue
Block a user