({
+ resolver: zodResolver(resetUserPasswordSchema),
+ defaultValues: {
+ id: userId,
+ },
+ })
+
+ const onSubmit = async (formData: ResetUserPasswordFormType) => {
+ const response = await resetUserPasswordAction(formData)
+
+ if (response?.errors) {
+ Object.entries(response.errors).forEach(([fieldName, messages]) => {
+ messages.forEach((message: string) => {
+ setError(fieldName as keyof ResetUserPasswordFormType, {
+ type: "server",
+ message,
+ })
+ toast.error(message)
+ })
+ })
+ return
+ }
+
+ if (response?.success) {
+ toast.success(response.message)
+ reset({ id: userId, password: "" })
+ }
+ }
+
+ return (
+
+ )
+}
diff --git a/src/app/(dashboard)/admin/users/new/page.tsx b/src/app/(dashboard)/admin/users/new/page.tsx
new file mode 100644
index 0000000..2083520
--- /dev/null
+++ b/src/app/(dashboard)/admin/users/new/page.tsx
@@ -0,0 +1,12 @@
+import NewUserForm from "../_components/new.user.form"
+
+export default function NewUserPage() {
+ return (
+
+ )
+}
diff --git a/src/app/(dashboard)/admin/users/page.tsx b/src/app/(dashboard)/admin/users/page.tsx
new file mode 100644
index 0000000..d3b6143
--- /dev/null
+++ b/src/app/(dashboard)/admin/users/page.tsx
@@ -0,0 +1,96 @@
+import { Pencil } from "lucide-react"
+import Link from "next/link"
+
+import PageHeader from "@/components/common/pageheader"
+import PaginationButtons from "@/components/common/pagination"
+import { Button } from "@/components/ui/button"
+import { getUsers } from "@/services/user.service"
+
+export default async function UsersPage(props: {
+ searchParams?: Promise<{
+ page?: string
+ search?: string
+ }>
+}) {
+ const searchParams = await props.searchParams
+ const currentPage = searchParams?.page ? parseInt(searchParams.page, 10) : 1
+ const search = searchParams?.search || ""
+ const { data: users, totalPages } = await getUsers({
+ page: currentPage,
+ pageSize: 10,
+ search,
+ })
+
+ return (
+
+
+ {users.length === 0 && currentPage === 1 && (
+
+ )}
+ {users.length > 0 && (
+
+
+
+
+ |
+ Name
+ |
+
+ Username
+ |
+
+ Email
+ |
+
+ Role
+ |
+
+ Status
+ |
+
+ Actions
+ |
+
+
+
+ {users.map((user) => (
+
+ | {user.name} |
+ {user.username} |
+ {user.email} |
+ {user.role} |
+
+ {user.isActive ? "Active" : "Inactive"}
+ |
+
+
+
+
+ |
+
+ ))}
+
+
+
+ |
+
+ |
+
+
+
+
+ )}
+
Serial Number
|
+
+ Quantity
+ |
Actions
|
@@ -74,6 +77,9 @@ export default async function AssignmentsPage(props: {
{assignment?.asset?.serialNumber || "N/A"}
|
+
+ {assignment?.quantity}
+ |
- |
+ |
|
diff --git a/src/app/(dashboard)/import/_components/import.form.tsx b/src/app/(dashboard)/import/_components/import.form.tsx
index 9002a30..042e083 100644
--- a/src/app/(dashboard)/import/_components/import.form.tsx
+++ b/src/app/(dashboard)/import/_components/import.form.tsx
@@ -5,11 +5,10 @@ import { useRouter } from "next/navigation"
import type { ChangeEvent } from "react"
import { useForm } from "react-hook-form"
import { toast } from "sonner"
-
+import { importItems } from "@/actions/import.actions"
import { SubmitButton } from "@/components/forms/submitButton"
-import { importItems } from "@/lib/actions/import.actions"
-import { type ImportFormType, importSchema } from "@/lib/schemas/import.schemas"
-import type { CategorySummary } from "@/lib/types"
+import { type ImportFormType, importSchema } from "@/schemas/import.schema"
+import type { CategorySummary } from "@/types"
export default function ImportForm({
categories,
diff --git a/src/app/(dashboard)/import/page.tsx b/src/app/(dashboard)/import/page.tsx
index 13cf63c..90be751 100644
--- a/src/app/(dashboard)/import/page.tsx
+++ b/src/app/(dashboard)/import/page.tsx
@@ -15,7 +15,7 @@ export default async function ImportPage() {
Mass Import
- {ENVIRONMENT === "demo" && (
+ {(ENVIRONMENT === "development" || ENVIRONMENT === "demo") && (
|