feat: update layout styles and iframe source for improved UI consistency
This commit is contained in:
@@ -61,13 +61,13 @@ export const LayoutMain = (props: LayoutMainProps) => {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='flex gap-2 text-lg w-full relative'>
|
<div className='flex gap-2 text-lg w-full h-12 items-center'>
|
||||||
<div
|
<div
|
||||||
className={clsx('layout-menu items-center w-full', !mount && 'invisible!')}
|
className={clsx('layout-menu items-center bg-gray-200 w-full h-full', !mount && 'invisible!')}
|
||||||
style={{
|
style={{
|
||||||
cursor: isElectron ? 'move' : 'default',
|
cursor: isElectron ? 'move' : 'default',
|
||||||
}}>
|
}}>
|
||||||
<div className='flex grow justify-between pl-4 py-2 items-center bg-gray-200'>
|
<div className='flex grow justify-between pl-4 py-2 items-center '>
|
||||||
<div className='flex items-center gap-2'>
|
<div className='flex items-center gap-2'>
|
||||||
<div className='text-xl font-bold '>{props.title}</div>
|
<div className='text-xl font-bold '>{props.title}</div>
|
||||||
<div className='flex items-center gap-2 text-sm '>
|
<div className='flex items-center gap-2 text-sm '>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
export default function Home() {
|
export default function Home() {
|
||||||
return (
|
return (
|
||||||
<div className="flex h-full items-center justify-center bg-zinc-50 font-sans dark:bg-black">
|
<div className="flex h-full items-center justify-center bg-zinc-50 font-sans dark:bg-black">
|
||||||
<iframe src="/root/router-studio" className="w-full border-0" style={{
|
<iframe src="/root/router-studio?noHeader=true" className="w-full border-0" style={{
|
||||||
height: 'calc(100vh - 48px)'
|
height: 'calc(100vh - 48px)'
|
||||||
}} />
|
}} />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,33 +1,45 @@
|
|||||||
import { Link, Outlet, createRootRoute, useNavigate } from '@tanstack/react-router'
|
import { LayoutMain } from '@/modules/layout'
|
||||||
|
|
||||||
|
import { Link, Outlet, createRootRoute } from '@tanstack/react-router'
|
||||||
import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
|
import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
|
||||||
import { Toaster } from '@/components/ui/sonner'
|
import { Toaster } from '@/components/ui/sonner'
|
||||||
import { AuthProvider } from '@/pages/auth'
|
import { AuthProvider } from '@/pages/auth'
|
||||||
import { TooltipProvider } from '@/components/ui/tooltip'
|
import { TooltipProvider } from '@/components/ui/tooltip'
|
||||||
import { LayoutMain } from '@/modules/layout'
|
import { Home } from 'lucide-react';
|
||||||
export const Route = createRootRoute({
|
export const Route = createRootRoute({
|
||||||
component: RootComponent,
|
component: RootComponent,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const BaseHeader = (props: { children?: React.ReactNode }) => {
|
||||||
|
if (props.children) {
|
||||||
|
return props.children
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="flex gap-2 text-lg w-full h-12 items-center">
|
||||||
|
<div className='px-2'>
|
||||||
|
<Link
|
||||||
|
to="/"
|
||||||
|
activeProps={{
|
||||||
|
className: 'font-bold',
|
||||||
|
}}
|
||||||
|
activeOptions={{ exact: true }}
|
||||||
|
>
|
||||||
|
<Home className='w-5 h-5' />
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<hr />
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
function RootComponent() {
|
function RootComponent() {
|
||||||
return (
|
return (
|
||||||
<div className='h-full w-full overflow-hidden'>
|
<div className='h-full overflow-hidden'>
|
||||||
{/*
|
<BaseHeader><LayoutMain /></BaseHeader>
|
||||||
<div className="p-2 flex gap-2 text-lg">
|
|
||||||
<Link
|
|
||||||
to="/"
|
|
||||||
activeProps={{
|
|
||||||
className: 'font-bold',
|
|
||||||
}}
|
|
||||||
activeOptions={{ exact: true }}
|
|
||||||
>
|
|
||||||
Home
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
<hr /> */}
|
|
||||||
<AuthProvider mustLogin={true}>
|
<AuthProvider mustLogin={true}>
|
||||||
<LayoutMain />
|
|
||||||
<TooltipProvider>
|
<TooltipProvider>
|
||||||
<main className='h-[calc(100%-4rem)] overflow-auto scrollbar'>
|
<main className='h-[calc(100%-3rem)] overflow-auto scrollbar'>
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</main>
|
</main>
|
||||||
</TooltipProvider>
|
</TooltipProvider>
|
||||||
@@ -35,6 +47,5 @@ function RootComponent() {
|
|||||||
<TanStackRouterDevtools position="bottom-right" />
|
<TanStackRouterDevtools position="bottom-right" />
|
||||||
<Toaster />
|
<Toaster />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user