diff --git a/dashboard/15-final/app/dashboard/(overview)/page.tsx b/dashboard/15-final/app/dashboard/(overview)/page.tsx index 3b0c76b..24349f6 100644 --- a/dashboard/15-final/app/dashboard/(overview)/page.tsx +++ b/dashboard/15-final/app/dashboard/(overview)/page.tsx @@ -7,6 +7,7 @@ import { fetchTotalAmountByStatus, } from '@/app/lib/data'; import { Suspense } from 'react'; +import { lusitana } from '@/app/ui/fonts'; import { RevenueChartSkeleton } from '@/app/ui/dashboard/skeletons'; export const dynamic = 'force-dynamic'; @@ -19,6 +20,9 @@ export default async function Page() { return (
+

+ Dashboard +

diff --git a/dashboard/15-final/app/dashboard/layout.tsx b/dashboard/15-final/app/dashboard/layout.tsx index ec0248d..d7b45e2 100644 --- a/dashboard/15-final/app/dashboard/layout.tsx +++ b/dashboard/15-final/app/dashboard/layout.tsx @@ -6,9 +6,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {
-
- {children} -
+
{children}
); } diff --git a/dashboard/15-final/app/ui/dashboard/logo-icon.tsx b/dashboard/15-final/app/ui/dashboard/acme-logo.tsx similarity index 100% rename from dashboard/15-final/app/ui/dashboard/logo-icon.tsx rename to dashboard/15-final/app/ui/dashboard/acme-logo.tsx diff --git a/dashboard/15-final/app/ui/dashboard/card.tsx b/dashboard/15-final/app/ui/dashboard/card.tsx index 741d541..b8fc638 100644 --- a/dashboard/15-final/app/ui/dashboard/card.tsx +++ b/dashboard/15-final/app/ui/dashboard/card.tsx @@ -4,6 +4,8 @@ import { UserGroupIcon, InboxIcon, } from '@heroicons/react/24/outline'; +import { lusitana } from '@/app/ui/fonts'; +import clsx from 'clsx'; const iconMap = { collected: BanknotesIcon, @@ -24,12 +26,17 @@ export default function Card({ const Icon = iconMap[type]; return ( -
-
-

{title}

+
+
{Icon ? : null} +

{title}

-

+

{value}

diff --git a/dashboard/15-final/app/ui/dashboard/latest-invoices.tsx b/dashboard/15-final/app/ui/dashboard/latest-invoices.tsx index 51bb075..c04ec1e 100644 --- a/dashboard/15-final/app/ui/dashboard/latest-invoices.tsx +++ b/dashboard/15-final/app/ui/dashboard/latest-invoices.tsx @@ -1,5 +1,8 @@ import { LatestInvoice } from '@/app/lib/definitions'; +import { ArrowPathIcon } from '@heroicons/react/24/outline'; +import clsx from 'clsx'; import Image from 'next/image'; +import { lusitana } from '@/app/ui/fonts'; export default async function LatestInvoices({ latestInvoices, @@ -7,38 +10,57 @@ export default async function LatestInvoices({ latestInvoices: LatestInvoice[]; }) { return ( -
-

Latest Invoices

- - {latestInvoices.map((invoice) => { - return ( -
-
- {`${invoice.name}'s -
-

- {invoice.name} -

-

- {invoice.email} +

+

+ Latest Invoices +

+
+
+ {latestInvoices.map((invoice, i) => { + return ( +
+
+ {`${invoice.name}'s +
+

+ {invoice.name} +

+

+ {invoice.email} +

+
+
+

+ {invoice.amount}

-
-

- {invoice.amount} -

-
- ); - })} + ); + })} +
+
+ +

Updated just now

+
+
); } diff --git a/dashboard/15-final/app/ui/dashboard/revenue-chart.tsx b/dashboard/15-final/app/ui/dashboard/revenue-chart.tsx index 5ce138b..56f6972 100644 --- a/dashboard/15-final/app/ui/dashboard/revenue-chart.tsx +++ b/dashboard/15-final/app/ui/dashboard/revenue-chart.tsx @@ -1,6 +1,8 @@ import { generateYAxis } from '@/app/lib/utils'; import { fetchRevenue } from '@/app/lib/data'; - +import { CalendarIcon } from '@heroicons/react/24/outline'; +import { lusitana } from '@/app/ui/fonts'; +import clsx from 'clsx'; // This component is representational only. // For data visualization UI, check out: // https://www.tremor.so/ @@ -18,34 +20,42 @@ export default async function RevenueChart() { } return ( -
-

Revenue

-
- {/* y-axis */} -
- {yAxisLabels.map((label) => ( -

{label}

+
+

+ Recent Revenue +

+
+
+ {/* y-axis */} +
+ {yAxisLabels.map((label) => ( +

{label}

+ ))} +
+ + {revenue.map((month) => ( +
+ {/* bars */} +
+ {/* x-axis */} +

+ {month.month} +

+
))}
- - {revenue.map((month) => ( -
- {/* bars */} -
- {/* x-axis */} -

- {month.month} -

-
- ))} +
+ +

Last 6 months

+
); diff --git a/dashboard/15-final/app/ui/dashboard/sidenav.tsx b/dashboard/15-final/app/ui/dashboard/sidenav.tsx index a290f71..8fa45eb 100644 --- a/dashboard/15-final/app/ui/dashboard/sidenav.tsx +++ b/dashboard/15-final/app/ui/dashboard/sidenav.tsx @@ -1,8 +1,7 @@ -import Image from 'next/image'; import Link from 'next/link'; import NavLinks from '@/app/ui/dashboard/nav-links'; import LogOutButton from './log-out-button'; -import LogoIcon from './logo-icon'; +import AcmeLogo from '../acme-logo'; export default function SideNav() { return ( @@ -11,9 +10,9 @@ export default function SideNav() { className="mb-2 flex h-20 items-end justify-center rounded-md bg-blue-600 p-4 md:h-40 md:justify-start" href="/" > - - - +
+ +