diff --git a/app/dashboard/account-management/page.tsx b/app/dashboard/account-management/page.tsx index ef0f4d4..62b86a0 100644 --- a/app/dashboard/account-management/page.tsx +++ b/app/dashboard/account-management/page.tsx @@ -8,8 +8,8 @@ const Navbar = dynamic(() => import("@/components/ui/navbar"), { export default function AccountManagement() { return ( -
- +
+
) diff --git a/app/dashboard/layout.tsx b/app/dashboard/layout.tsx index c817385..3a6a94c 100644 --- a/app/dashboard/layout.tsx +++ b/app/dashboard/layout.tsx @@ -8,12 +8,10 @@ export default function DashboardLayout({ }>) { return ( -
+
-
- {children} -
+
{children}
) diff --git a/app/dashboard/upload-account-data/page.tsx b/app/dashboard/upload-account-data/page.tsx index 6cfdb0b..36be063 100644 --- a/app/dashboard/upload-account-data/page.tsx +++ b/app/dashboard/upload-account-data/page.tsx @@ -8,7 +8,7 @@ const Navbar = dynamic(() => import("@/components/ui/navbar"), { export default function UploadAccountData() { return ( -
+
diff --git a/app/layout.tsx b/app/layout.tsx index 562e01c..ce7ab83 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -28,7 +28,7 @@ export default function RootLayout({ )} > - {children} + {children} ) diff --git a/app/page.tsx b/app/page.tsx index 75a8291..95c1035 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -44,28 +44,17 @@ export default function Page() { } return ( -
-
-
- logo-multipool -

- AI Platform Kolaboratif +
+
+

+ Login

-

- Produksi Narasi Media -

-
+
+

+ Username +

{" "} ( )} /> - {errors.username && (

{errors.username.message} @@ -94,12 +82,13 @@ export default function Page() { required: "Required", }} render={({ field }) => ( - + )}

+

+ Forgot password? +

-
) } diff --git a/components/form/upload-accounts-data/upload-accounts-data-file.tsx b/components/form/upload-accounts-data/upload-accounts-data-file.tsx index d24c0f6..07bc245 100644 --- a/components/form/upload-accounts-data/upload-accounts-data-file.tsx +++ b/components/form/upload-accounts-data/upload-accounts-data-file.tsx @@ -46,64 +46,67 @@ export default function UploadCsvCard() { return (
-

Upload a CSV file

+

Account Management

+

Manage your Account

- {/* DROP AREA */} -
{ - e.preventDefault() - setDragActive(true) - }} - onDragLeave={() => setDragActive(false)} - onDrop={handleDrop} - className={`flex flex-col items-center justify-center gap-3 rounded-xl border-2 border-dashed p-10 text-center transition ${dragActive ? "border-blue-500 bg-blue-50" : "border-blue-400"} `} - > -
📁
+
+

Upload a CSV file

-

Drag your file(s) to start uploading

+
{ + e.preventDefault() + setDragActive(true) + }} + onDragLeave={() => setDragActive(false)} + onDrop={handleDrop} + className={`flex flex-col items-center justify-center gap-3 rounded-xl border-2 border-dashed p-10 text-center transition ${dragActive ? "border-blue-500 bg-blue-50" : "border-blue-400"} `} + > +
📁
-
-
- OR -
+

Drag your file(s) to start uploading

+ +
+
+ OR +
+
+ + + + handleFile(e.target.files?.[0] ?? null)} + /> + + {file && ( +

Selected: {file.name}

+ )}
- - - handleFile(e.target.files?.[0] ?? null)} - /> - - {file && ( -

Selected: {file.name}

- )} -
- - {/* ACTION BUTTONS */} -
- {/* */} - + +
([]) const getData = async () => { @@ -109,16 +109,20 @@ export default function AccountManagementTable() { const getStatus = (id: number) => { const color = [ - "text-green-600 border-2 border-green-600 bg-green-300", - "text-violet-600 border-2 border-violet-600 bg-violet-300", - "text-yellow-600 border-2 border-yellow-600 bg-yellow-300", - "text-red-600 border-2 border-red-600 bg-red-300", + "text-green-600 border-2 border-green-600 bg-green-100", + "text-blue-600 border-2 border-blue-600 bg-blue-100", + "text-yellow-600 border-2 border-yellow-600 bg-yellow-100", + "text-red-600 border-2 border-red-600 bg-red-100", ] const findStatusName = dummyStatus.find((a) => a.id == id) return ( -

+

{findStatusName?.value}

) @@ -126,12 +130,14 @@ export default function AccountManagementTable() { return (
-
-

Search and Filter

-
+
+

Account Management

+

Manage your Account

+ +
-

Identifier

- +

Search

+ setSearch(e.target.value)} @@ -150,12 +156,12 @@ export default function AccountManagementTable() {
-

Proxy Location

+

Proxy Location

-

Status

+

Status

-
+
- + Identifier @@ -254,7 +260,7 @@ export default function AccountManagementTable() { onClick={() => { console.log("selectData", invoice.id) }} - className="cursor-pointer bg-blue-500 text-white" + className="cursor-pointer bg-blue-900 text-white" > Process @@ -262,7 +268,7 @@ export default function AccountManagementTable() { ))} - + diff --git a/components/ui/app-sidebar.tsx b/components/ui/app-sidebar.tsx index c6aa1e0..b2bbeff 100644 --- a/components/ui/app-sidebar.tsx +++ b/components/ui/app-sidebar.tsx @@ -1,3 +1,4 @@ +"use client" import { Sidebar, SidebarContent, @@ -9,14 +10,32 @@ import { import Link from "next/link" import { ManagementIcon, UploadAccount } from "../icons" import Image from "next/image" +import { usePathname } from "next/navigation" + +const menu = [ + { + title: "account-management", + icon: , + }, + { + title: "upload-account-data", + icon: , + }, + { + title: "spesific-target", + icon: , + }, + { + title: "spesific-target-mapping", + icon: , + }, +] export function AppSidebar() { + const pathname = usePathname() return ( - -
+ +
{/* TRIGGER */}
@@ -24,14 +43,15 @@ export function AppSidebar() { {/* LOGO */}
- + /> */} +
@@ -39,17 +59,20 @@ export function AppSidebar() { {/* MENU */} - - - - Management Account - - + {menu.map((item) => ( + + {item.icon} + + {item.title.split("-").join(" ")} + + + ))} - @@ -57,7 +80,7 @@ export function AppSidebar() { Upload Account Data - + */} diff --git a/components/ui/navbar.tsx b/components/ui/navbar.tsx index 2525ed7..4697b04 100644 --- a/components/ui/navbar.tsx +++ b/components/ui/navbar.tsx @@ -11,15 +11,16 @@ export default function Navbar(props: { title: string }) { }, []) return ( -
-
+
+
+

{title}

+ - + - -

{username}

+ {/* +

{username}

*/}
-

{title}

) }