jhynsoo/worlabel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fe/design/header-z-index' into 'fe/develop'

Browse Source 
Design: 헤더 z-index 설정

See merge request s11-s-project/S11P21S002!309
This commit is contained in:
정현조 2024-10-08 15:55:38 +09:00
commit 60ef3bbac9
5 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/components/Header/index.tsx
View File

@ -6,22 +6,14 @@ import { Suspense } from 'react';
import AlarmPopover from './AlarmPopover'; import AlarmPopover from './AlarmPopover';
import ProfilePopover from './ProfilePopover'; import ProfilePopover from './ProfilePopover';
export interface HeaderProps extends React.HTMLAttributes<HTMLDivElement> {} export default function Header() {
export default function Header({ className, ...props }: HeaderProps) {
const location = useLocation(); const location = useLocation();
const isHomePage = location.pathname === '/'; const isHomePage = location.pathname === '/';
const profile = useAuthStore((state) => state.profile); const profile = useAuthStore((state) => state.profile);
return ( return (
<header <header className="fixed left-0 top-0 z-40 flex h-16 w-full items-center justify-between border-b border-gray-200 bg-white px-4 sm:px-6 md:px-8 lg:px-10">
className={cn(
'flex h-16 w-full items-center justify-between border-b border-gray-200 bg-white px-4 sm:px-6 md:px-8 lg:px-10',
className
)}
{...props}
>
<div className="flex items-center gap-4 md:gap-10"> <div className="flex items-center gap-4 md:gap-10">
<Link <Link
to="/" to="/"

2
frontend/src/components/ManageLayout/index.tsx
View File

@ -18,7 +18,7 @@ export default function ManageLayout({ tabTitle }: { tabTitle: string }) {
return ( return (
<> <>
<Header className="fixed left-0 top-0 w-full" /> <Header />
<div className="flex min-h-screen flex-col justify-between"> <div className="flex min-h-screen flex-col justify-between">
<div className="mt-16 flex flex-1"> <div className="mt-16 flex flex-1">

2
frontend/src/components/PageLayout/index.tsx
View File

@ -6,7 +6,7 @@ import { Suspense } from 'react';
export default function PageLayout() { export default function PageLayout() {
return ( return (
<> <>
<Header className="fixed left-0 top-0 w-full" /> <Header />
<div className="flex min-h-screen flex-col justify-between"> <div className="flex min-h-screen flex-col justify-between">
<div className="mt-16 flex flex-1"> <div className="mt-16 flex flex-1">
<Suspense fallback={<div></div>}> <Suspense fallback={<div></div>}>

2
frontend/src/components/WorkspaceBrowseLayout/index.tsx
View File

@ -92,7 +92,7 @@ export default function WorkspaceBrowseLayout() {
return ( return (
<> <>
<Header className="fixed left-0 top-0 w-full" /> <Header />
<div className="flex min-h-screen flex-col justify-between"> <div className="flex min-h-screen flex-col justify-between">
<div className="mt-16 flex flex-1"> <div className="mt-16 flex flex-1">

2
frontend/src/components/WorkspaceLayout/index.tsx
View File

@ -46,7 +46,7 @@ export default function WorkspaceLayout() {
return ( return (
<> <>
<Header className="fixed left-0 top-0" /> <Header />
<div className="mt-16 h-[calc(100vh-64px)] w-screen"> <div className="mt-16 h-[calc(100vh-64px)] w-screen">
<ResizablePanelGroup direction="horizontal"> <ResizablePanelGroup direction="horizontal">
<WorkspaceSidebar <WorkspaceSidebar