Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: revamped dashboard #5

Merged
merged 6 commits into from
Feb 15, 2025
Merged

feat: revamped dashboard #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d86bbee
feat: revamped dashboard
taqh Feb 14, 2025
50807a7
feat: update dashboard
dpaulos6 Feb 14, 2025
9ada22d
Merge pull request #1 from dpaulos6/taqh-pr-updated
taqh Feb 14, 2025
5c3d242
sidebar + header updates
taqh Feb 14, 2025
092467e
sticky header
taqh Feb 14, 2025
8c6d78a
fix: new better colors
mezotv Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@
},
"overrides": {
"react-is": "^19.0.0-rc-69d4b800-20241021"
}
},
"packageManager": "[email protected]"
}
218 changes: 94 additions & 124 deletions src/app/(dashboard)/dashboard/analytics/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,140 +1,110 @@
"use client"
"use client";

import { useState } from "react"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
import { DateRangePicker } from "@/components/date-range-picker"
import { RevenueChart } from "@/components/charts/revenue-chart"
import { InvoiceStatusChart } from "@/components/charts/invoice-status-chart"
import { TopProjectsChart } from "@/components/charts/top-projects-chart"
import { MonthlyComparisonChart } from "@/components/charts/monthly-comparison-chart"
import {
Breadcrumb,
BreadcrumbItem,
BreadcrumbLink,
BreadcrumbList,
BreadcrumbPage,
BreadcrumbSeparator,
} from "@/components/ui/breadcrumb"
import { SidebarInset, SidebarTrigger } from "@/components/ui/sidebar"
import { Separator } from "@/components/ui/separator"
import { InvoiceStatusChart } from "@/components/charts/invoice-status-chart";
import { MonthlyComparisonChart } from "@/components/charts/monthly-comparison-chart";
import { RevenueChart } from "@/components/charts/revenue-chart";
import { TopProjectsChart } from "@/components/charts/top-projects-chart";
import { DateRangePicker } from "@/components/date-range-picker";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { useState } from "react";

export default function Analytics() {
const [dateRange, setDateRange] = useState({ from: new Date(2023, 0, 1), to: new Date() })
const [dateRange, setDateRange] = useState({ from: new Date(2023, 0, 1), to: new Date() });

return (
<SidebarInset>
<header className="flex h-16 shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-data-[collapsible=icon]/sidebar-wrapper:h-12">
<div className="flex items-center gap-2 px-4">
<SidebarTrigger className="-ml-1" />
<Separator orientation="vertical" className="mr-2 h-4" />
<Breadcrumb>
<BreadcrumbList>
<BreadcrumbItem className="hidden md:block">
<BreadcrumbLink href="/dashboard">Dashboard</BreadcrumbLink>
</BreadcrumbItem>
<BreadcrumbSeparator className="hidden md:block" />
<BreadcrumbItem>
<BreadcrumbPage>Analytics</BreadcrumbPage>
</BreadcrumbItem>
</BreadcrumbList>
</Breadcrumb>
</div>
</header>
<div className="flex flex-1 flex-col gap-4 p-4">
<div className="flex justify-between items-center">
<h1 className="text-3xl font-bold tracking-tight">Analytics</h1>
<DateRangePicker date={dateRange} />
</div>
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">Total Revenue</CardTitle>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">€45,231.89</div>
<p className="text-xs text-muted-foreground">+20.1% from last month</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">Invoices Sent</CardTitle>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">+2,350</div>
<p className="text-xs text-muted-foreground">+180.1% from last month</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">Paid Invoices</CardTitle>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">+12,234</div>
<p className="text-xs text-muted-foreground">+19% from last month</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">Outstanding Balance</CardTitle>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">€6,354.12</div>
<p className="text-xs text-muted-foreground">-4% from last month</p>
</CardContent>
</Card>
</div>
<Tabs defaultValue="overview" className="space-y-4">
<TabsList>
<TabsTrigger value="overview">Overview</TabsTrigger>
<TabsTrigger value="invoices">Invoices</TabsTrigger>
<TabsTrigger value="projects">Projects</TabsTrigger>
</TabsList>
<TabsContent value="overview" className="space-y-4">
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-7">
<Card className="col-span-4">
<CardHeader>
<CardTitle>Revenue Overview</CardTitle>
</CardHeader>
<CardContent className="pl-2">
<RevenueChart />
</CardContent>
</Card>
<Card className="col-span-3">
<CardHeader>
<CardTitle>Invoice Status</CardTitle>
</CardHeader>
<CardContent>
<InvoiceStatusChart />
</CardContent>
</Card>
</div>
</TabsContent>
<TabsContent value="invoices" className="space-y-4">
<div className="flex flex-1 flex-col gap-4 p-4">
<div className="flex items-center justify-between">
<h1 className="text-3xl font-bold tracking-tight">Analytics</h1>
<DateRangePicker date={dateRange} />
</div>
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">Total Revenue</CardTitle>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">€45,231.89</div>
<p className="text-muted-foreground text-xs">+20.1% from last month</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">Invoices Sent</CardTitle>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">+2,350</div>
<p className="text-muted-foreground text-xs">+180.1% from last month</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">Paid Invoices</CardTitle>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">+12,234</div>
<p className="text-muted-foreground text-xs">+19% from last month</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">Outstanding Balance</CardTitle>
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">€6,354.12</div>
<p className="text-muted-foreground text-xs">-4% from last month</p>
</CardContent>
</Card>
</div>
<Tabs defaultValue="overview" className="space-y-4">
<TabsList>
<TabsTrigger value="overview">Overview</TabsTrigger>
<TabsTrigger value="invoices">Invoices</TabsTrigger>
<TabsTrigger value="projects">Projects</TabsTrigger>
</TabsList>
<TabsContent value="overview" className="space-y-4">
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-7">
<Card className="col-span-4">
<CardHeader>
<CardTitle>Monthly Comparison</CardTitle>
<CardDescription>Compare invoice totals month by month</CardDescription>
<CardTitle>Revenue Overview</CardTitle>
</CardHeader>
<CardContent>
<MonthlyComparisonChart />
<CardContent className="pl-2">
<RevenueChart />
</CardContent>
</Card>
</TabsContent>
<TabsContent value="projects" className="space-y-4">
<Card className="col-span-4">
<Card className="col-span-3">
<CardHeader>
<CardTitle>Top Projects</CardTitle>
<CardDescription>Highest revenue generating projects</CardDescription>
<CardTitle>Invoice Status</CardTitle>
</CardHeader>
<CardContent>
<TopProjectsChart />
<InvoiceStatusChart />
</CardContent>
</Card>
</TabsContent>
</Tabs>
</div>
</SidebarInset>
)
</div>
</TabsContent>
<TabsContent value="invoices" className="space-y-4">
<Card className="col-span-4">
<CardHeader>
<CardTitle>Monthly Comparison</CardTitle>
<CardDescription>Compare invoice totals month by month</CardDescription>
</CardHeader>
<CardContent>
<MonthlyComparisonChart />
</CardContent>
</Card>
</TabsContent>
<TabsContent value="projects" className="space-y-4">
<Card className="col-span-4">
<CardHeader>
<CardTitle>Top Projects</CardTitle>
<CardDescription>Highest revenue generating projects</CardDescription>
</CardHeader>
<CardContent>
<TopProjectsChart />
</CardContent>
</Card>
</TabsContent>
</Tabs>
</div>
);
}

35 changes: 6 additions & 29 deletions src/app/(dashboard)/dashboard/clients/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
"use client";

import {
Breadcrumb,
BreadcrumbItem,
BreadcrumbLink,
BreadcrumbList,
BreadcrumbPage,
BreadcrumbSeparator,
} from "@/components/ui/breadcrumb";
import { ClientModal } from "@/components/client-modal";
import { ClientsTable } from "@/components/dashboard/clients-table";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import {
Pagination,
PaginationContent,
PaginationItem,
PaginationLink,
} from "@/components/ui/pagination";
import { SidebarInset, SidebarTrigger } from "@/components/ui/sidebar";
import { ClientsTable } from "@/components/dashboard/clients-table";
import { ClientModal } from "@/components/client-modal";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Plus } from "lucide-react";
import { useState } from "react";

Expand Down Expand Up @@ -87,21 +78,7 @@ export default function Clients() {
const totalPages = Math.ceil(filteredClients.length / itemsPerPage);

return (
<SidebarInset className="flex h-screen flex-col">
<header className="flex h-16 shrink-0 items-center border-b px-4">
<SidebarTrigger className="mr-2 -ml-1" />
<Breadcrumb>
<BreadcrumbList>
<BreadcrumbItem className="hidden md:inline-flex">
<BreadcrumbLink href="/dashboard">Dashboard</BreadcrumbLink>
</BreadcrumbItem>
<BreadcrumbSeparator className="hidden md:inline-flex" />
<BreadcrumbItem>
<BreadcrumbPage>Clients</BreadcrumbPage>
</BreadcrumbItem>
</BreadcrumbList>
</Breadcrumb>
</header>
<>
<div className="flex flex-grow flex-col space-y-6 overflow-hidden p-6">
<div className="flex items-center justify-between">
<h1 className="text-3xl font-bold tracking-tight">Clients</h1>
Expand Down Expand Up @@ -141,6 +118,6 @@ export default function Clients() {
onClose={() => setIsModalOpen(false)}
onAddClient={addClient}
/>
</SidebarInset>
</>
);
}
65 changes: 22 additions & 43 deletions src/app/(dashboard)/dashboard/invoices/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
"use client"
"use client";

import { useState } from "react"
import { Plus } from "lucide-react"
import { Button } from "@/components/ui/button"
import { Input } from "@/components/ui/input"
import { InvoiceModal } from "@/components/dashboard/invoice-modal"
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
import { InvoiceModal } from "@/components/dashboard/invoice-modal";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { Input } from "@/components/ui/input";
import {
Breadcrumb,
BreadcrumbItem,
BreadcrumbLink,
BreadcrumbList,
BreadcrumbPage,
BreadcrumbSeparator,
} from "@/components/ui/breadcrumb"
import { SidebarInset, SidebarTrigger } from "@/components/ui/sidebar"
import { Separator } from "@/components/ui/separator"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table";
import { Plus } from "lucide-react";
import { useState } from "react";

// Mock data
const invoices = [
Expand Down Expand Up @@ -62,37 +59,20 @@ const invoices = [
totalAmount: "€300.00",
paymentMethod: "Credit Card",
},
]
];

export default function InvoicesPage() {
const [isModalOpen, setIsModalOpen] = useState(false)
const [searchQuery, setSearchQuery] = useState("")
const [isModalOpen, setIsModalOpen] = useState(false);
const [searchQuery, setSearchQuery] = useState("");

const filteredInvoices = invoices.filter((invoice) =>
Object.values(invoice).some((value) => value.toLowerCase().includes(searchQuery.toLowerCase())),
)
);

return (
<SidebarInset>
<header className="flex h-16 shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-data-[collapsible=icon]/sidebar-wrapper:h-12">
<div className="flex items-center gap-2 px-4">
<SidebarTrigger className="-ml-1" />
<Separator orientation="vertical" className="mr-2 h-4" />
<Breadcrumb>
<BreadcrumbList>
<BreadcrumbItem className="hidden md:block">
<BreadcrumbLink href="/dashboard">Dashboard</BreadcrumbLink>
</BreadcrumbItem>
<BreadcrumbSeparator className="hidden md:block" />
<BreadcrumbItem>
<BreadcrumbPage>Invoices</BreadcrumbPage>
</BreadcrumbItem>
</BreadcrumbList>
</Breadcrumb>
</div>
</header>
<>
<div className="flex flex-1 flex-col gap-4 p-4 pt-0">
<div className="flex justify-between items-center">
<div className="flex items-center justify-between">
<h1 className="text-3xl font-bold tracking-tight">Invoices</h1>
<Button onClick={() => setIsModalOpen(true)}>
<Plus className="mr-2 h-4 w-4" /> Add Invoice
Expand Down Expand Up @@ -178,7 +158,6 @@ export default function InvoicesPage() {
</Card>
</div>
<InvoiceModal isOpen={isModalOpen} onClose={() => setIsModalOpen(false)} />
</SidebarInset>
)
</>
);
}

Loading