diff --git a/src/app/dashboard/invoices/[id]/page.tsx b/src/app/dashboard/invoices/[id]/page.tsx index 5bd92f2..e619a2f 100644 --- a/src/app/dashboard/invoices/[id]/page.tsx +++ b/src/app/dashboard/invoices/[id]/page.tsx @@ -78,7 +78,7 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) { {/* Header */}
-

+

Invoice Details

@@ -91,28 +91,35 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) {

{/* Content */} -
+
{/* Left Column */} -
+
{/* Invoice Header */}
-
-
-
-

+
+
+
+

{invoice.invoiceNumber}

-

- Issued {formatDate(invoice.issueDate)} • Due {formatDate(invoice.dueDate)} -

+
+
+ Issued {formatDate(invoice.issueDate)} +
+
+ Due {formatDate(invoice.dueDate)} +
+
-
-

Total Amount

-

+

+

+ Total Amount +

+

{formatCurrency(total)}

@@ -125,13 +132,14 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) { {isOverdue && ( -
+

Invoice Overdue

{Math.ceil( - (new Date().getTime() - new Date(invoice.dueDate).getTime()) / + (new Date().getTime() - + new Date(invoice.dueDate).getTime()) / (1000 * 60 * 60 * 24), )}{" "} days past due date @@ -154,7 +162,7 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) {

-

+

{invoice.client.name}

@@ -162,17 +170,19 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) {
{invoice.client.email && (
-
- +
+
- {invoice.client.email} + + {invoice.client.email} +
)} {invoice.client.phone && (
-
- +
+
{invoice.client.phone}
@@ -180,10 +190,10 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) { {(invoice.client.addressLine1 ?? invoice.client.city) && (
-
- +
+
-
+
{invoice.client.addressLine1 && (
{invoice.client.addressLine1}
)} @@ -224,7 +234,7 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) {
-

+

{invoice.business.name}

@@ -232,19 +242,23 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) {
{invoice.business.email && (
-
- +
+
- {invoice.business.email} + + {invoice.business.email} +
)} {invoice.business.phone && (
-
- +
+
- {invoice.business.phone} + + {invoice.business.phone} +
)}
@@ -263,20 +277,26 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) { {invoice.items.map((item, index) => ( -
+
-
-

{item.description}

-
- {formatDate(item.date)} - - {item.hours} hours - - @ ${item.rate}/hr +
+

+ {item.description} +

+
+ + {formatDate(item.date)} + + + {item.hours} hours + + + @ ${item.rate}/hr +
-
-

+

+

{formatCurrency(item.amount)}

@@ -289,18 +309,26 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) {
Subtotal: - {formatCurrency(subtotal)} + + {formatCurrency(subtotal)} +
{invoice.taxRate > 0 && (
- Tax ({invoice.taxRate}%): - {formatCurrency(taxAmount)} + + Tax ({invoice.taxRate}%): + + + {formatCurrency(taxAmount)} +
)}
Total: - {formatCurrency(total)} + + {formatCurrency(total)} +
@@ -314,7 +342,9 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) { Notes -

{invoice.notes}

+

+ {invoice.notes} +

)} @@ -336,19 +366,13 @@ async function InvoiceContent({ invoiceId }: { invoiceId: string }) { Edit Invoice - + {invoice.items && invoice.client && ( - + )} {invoice.status === "draft" && ( - + )} diff --git a/src/app/page.tsx b/src/app/page.tsx index c4d07c2..c9f77a4 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -20,24 +20,24 @@ import { export default function HomePage() { return ( -
+
{/* Navigation */} -