Skip to content

Commit

Permalink
Merge pull request #58 from pablo-kitz/ui/footer-mobile
Browse files Browse the repository at this point in the history
ui optimizations and mobile support on the dashboard
  • Loading branch information
Codehagen authored Jan 13, 2024
2 parents 60d4690 + f1e5f60 commit 6511572
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 61 deletions.
18 changes: 1 addition & 17 deletions app/(dashboard)/dashboard/accounts/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,7 @@ export default async function DashboardPage() {

return (
<>
<div className="md:hidden">
<Image
src="/examples/mail-dark.png"
width={1280}
height={727}
alt="Mail"
className="hidden dark:block"
/>
<Image
src="/examples/mail-light.png"
width={1280}
height={727}
alt="Mail"
className="block dark:hidden"
/>
</div>
<div className="hidden flex-col md:flex">
<div className="flex flex-col">
<AccountsDashboard
accounts={accounts}
mails={mails}
Expand Down
7 changes: 3 additions & 4 deletions app/(dashboard)/dashboard/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ export default async function DashboardLayout({
}

return (
<div className="flex min-h-screen flex-col space-y-6">
<div className="flex min-h-screen flex-col">
<NavBar user={user} items={dashboardConfig.mainNav} scroll={false} />

{children}
<SiteFooter className="border-t" />
<div className="flex-1">{children}</div>
<SiteFooter />
</div>
);
}
18 changes: 1 addition & 17 deletions app/(dashboard)/dashboard/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,7 @@ export default async function DashboardPage() {

return (
<>
<div className="md:hidden">
<Image
src="/examples/mail-dark.png"
width={1280}
height={727}
alt="Mail"
className="hidden dark:block"
/>
<Image
src="/examples/mail-light.png"
width={1280}
height={727}
alt="Mail"
className="block dark:hidden"
/>
</div>
<div className="hidden flex-col md:flex">
<div className="flex flex-col">
<Dashboard
accounts={accounts}
mails={mails}
Expand Down
18 changes: 1 addition & 17 deletions app/(dashboard)/dashboard/transactions/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,7 @@ export default async function DashboardPage() {

return (
<>
<div className="md:hidden">
<Image
src="/examples/mail-dark.png"
width={1280}
height={727}
alt="Mail"
className="hidden dark:block"
/>
<Image
src="/examples/mail-light.png"
width={1280}
height={727}
alt="Mail"
className="block dark:hidden"
/>
</div>
<div className="hidden flex-col md:flex">
<div className="flex flex-col">
<TransactionsDashboard
accounts={accounts}
mails={mails}
Expand Down
5 changes: 3 additions & 2 deletions app/(dashboard2)/dashboard2/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default async function DashboardLayout({
}

return (
<div className="flex min-h-screen flex-col space-y-6">
<div className="flex min-h-screen flex-col">
<NavBar user={user} items={dashboardConfig.mainNav} scroll={false} />

<div className="container grid flex-1 gap-12 md:grid-cols-[200px_1fr]">
Expand All @@ -31,7 +31,8 @@ export default async function DashboardLayout({
{children}
</main>
</div>
<SiteFooter className="border-t" />

<SiteFooter />
</div>
);
}
2 changes: 1 addition & 1 deletion app/(docs)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default async function DocsLayout({ children }: DocsLayoutProps) {
<DocsSidebarNav items={docsConfig.sidebarNav} />
</NavBar>
<div className="container flex-1">{children}</div>
<SiteFooter className="border-t" />
<SiteFooter />
</div>
);
}
6 changes: 3 additions & 3 deletions components/layout/site-footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import { Icons } from "@/components/shared/icons";

export function SiteFooter({ className }: React.HTMLAttributes<HTMLElement>) {
return (
<footer className={cn(className)}>
<div className="container flex flex-col items-center justify-between gap-4 py-10 md:h-24 md:flex-row md:py-0">
<div className="flex flex-col items-center gap-4 px-8 md:flex-row md:gap-2 md:px-0">
<footer className={cn(className, "border-t")}>
<div className="container flex h-12 flex-row items-center justify-between gap-4">
<div className="flex flex-row items-center gap-4 md:gap-2 md:px-0">
<Icons.logo />
<p className="text-center text-sm leading-loose md:text-left">
Built by{" "}
Expand Down

0 comments on commit 6511572

Please sign in to comment.