Skip to content

Commit

Permalink
trying to fix layout
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephen-Gordon committed Mar 31, 2024
1 parent ad94a21 commit d69677d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/app/@auth/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function ComponentsLayout({
<>
<AuthPage>
{/* <SheetLayout>{children}</SheetLayout> */}
<VaulDrawer>
<VaulDrawer >
<div className='overflow-y-scroll'>{children}</div>
</VaulDrawer>
</AuthPage>
Expand Down
3 changes: 2 additions & 1 deletion src/app/components/ui/VaulDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export function VaulDrawer({children}) {

return (
<Drawer.Root

onClose={() => {
dispatch(setSheet(false));
window.history.pushState({}, '', '/home');
Expand All @@ -21,7 +22,7 @@ export function VaulDrawer({children}) {
>
<Drawer.Portal>
<Drawer.Overlay className='bg-background/40 fixed inset-0' />
<Drawer.Content className='from-background to bg-background/80 fixed bottom-0 left-0 right-0 mt-24 flex h-[96%] flex-col rounded-t-[10px] bg-gradient-to-t backdrop-blur-2xl'>
<Drawer.Content className='z-50 from-background to bg-background/80 fixed bottom-0 left-0 right-0 mt-24 flex h-[96%] flex-col rounded-t-[10px] bg-gradient-to-t backdrop-blur-2xl'>
{children}
</Drawer.Content>
</Drawer.Portal>
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/ui/hover-border-gradient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export function HoverBorderGradient({
}} */
/* onMouseLeave={() => setHovered(false)} */
className={cn(
`relative flex h-min w-full flex-col flex-nowrap content-center items-center justify-center gap-10 overflow-visible rounded-xl border bg-black/${
`relative flex h-min w-full flex-col flex-nowrap content-center items-center justify-center gap-10 overflow-visible rounded-xl border bg-black/${
hovered ? 10 : 0
} decoration-clone p-px transition duration-500 dark:bg-white/20`,
containerClassName
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default function Page() {
console.log('usdcBalance', usdcBalance);
return (
<AuthPage>
<main className='relative bg-background grid justify-center overflow-y-auto'>
<main className='relative bg-background overflow-y-auto h-full'>

<div>
{/* <div className='absolute -z-50 '>
Expand Down
7 changes: 5 additions & 2 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,16 @@ export default function RootLayout({
<WagmiProvider config={config!}>
<QueryClientProvider client={queryClient}>
<LayoutGroup>
<div vaul-drawer-wrapper='' className='h-[100vh] overflow-y-scroll relative'>
<div
vaul-drawer-wrapper=''
className='relative h-[100vh] justify-center overflow-hidden'
>
{auth}
{drawer}

{children}
<BottomNavbar />
</div>
<BottomNavbar />
</LayoutGroup>
</QueryClientProvider>
</WagmiProvider>
Expand Down

0 comments on commit d69677d

Please sign in to comment.