diff --git a/app/(user)/blog/[slug]/page.tsx b/app/(user)/blog/[slug]/page.tsx index 5064d7d..4b775e5 100644 --- a/app/(user)/blog/[slug]/page.tsx +++ b/app/(user)/blog/[slug]/page.tsx @@ -61,7 +61,7 @@ export default async function Page({ params }: PageProps) { {/* Back Button */} Back diff --git a/app/(user)/team/page.tsx b/app/(user)/team/page.tsx index 3dd31fe..2bc9045 100644 --- a/app/(user)/team/page.tsx +++ b/app/(user)/team/page.tsx @@ -70,8 +70,8 @@ export default function Team() { key={user.nim} name={user.name} roleTim={user.role_tim} - picture={user.avatar} - profile_url={user.profil_bevy} + picture={user.avatar || "/profile_dummy.jpg"} + profile_url={user.profil_bevy || "#"} /> )) )} diff --git a/app/admin/dashboard/manage-user/components/userColumns.tsx b/app/admin/dashboard/manage-user/components/userColumns.tsx index 488516e..3fb11ed 100644 --- a/app/admin/dashboard/manage-user/components/userColumns.tsx +++ b/app/admin/dashboard/manage-user/components/userColumns.tsx @@ -20,7 +20,7 @@ export const columns: ColumnDef[] = [ const user = row.original; return
user = ({ user, type }) => { const formData = new FormData(e.currentTarget); const data = Object.fromEntries(formData.entries()); - if (!updatePassword) { + if (type === "EDIT" && !updatePassword) { delete data.password; // Hapus password jika user memilih tidak mengupdate password } const method = type === "EDIT" ? "PUT" : "POST"; @@ -56,6 +56,7 @@ const UserForm: FC = ({ user, type }) => { toast.error("An error occurred while submitting the form"); } }; + return ( <>
@@ -101,32 +102,33 @@ const UserForm: FC = ({ user, type }) => { readOnly={type === "EDIT"} />
- {type === "EDIT" && ( -
-
+ )} + {type === "EDIT" && ( +
+ +
+ )}