Merge pull request #47 from choosenname/29-improve-the-admin-panel

choosenname · web-flow · commit f51155ca757f · 2024-05-24T06:36:52.000+03:00
29 improve the admin panel
diff --git a/actions/register.ts b/actions/register.ts
@@ -14,7 +14,7 @@ export const register = async (values: z.infer<typeof RegisterSchema>) => {
         return { error: "Invalid fields!" };
     }
 
-    const {name , password,departmentId } = validatedFields.data;
+    const {name , password,departmentId , post, office, startWork, endWork} = validatedFields.data;
     const hashedPassword = await bcrypt.hash(password, 10);
 
     const existingUser = await getUserByName(name);
@@ -29,6 +29,10 @@ export const register = async (values: z.infer<typeof RegisterSchema>) => {
             password: hashedPassword,
             departmentId,
             imageUrl: "",
+            post,
+            office,
+            startWork,
+            endWork,
         }
     });
 
diff --git a/app/api/profile/route.ts b/app/api/profile/route.ts
@@ -37,4 +37,14 @@ export async function PATCH(
         console.log("[PROFILE_PATCH]", error);
         return new NextResponse("Internal Error", { status: 500 });
     }
+}
+
+export async function GET() {
+    try {
+        const user = await currentUser();
+        return NextResponse.json(user);
+    } catch (error) {
+        console.log("[PROFILE_GET]", error);
+        return new NextResponse("Internal Error", { status: 500 });
+    }
 }
diff --git a/columns.tsx b/columns.tsx
@@ -18,6 +18,14 @@ import {Server} from "@prisma/client";
 import {DeleteServerMenuItem} from "@/components/admin/items/delete-server-item";
 import axios from "axios";
 
+const formatTime = (dateString: string) => {
+    const date = new Date(dateString);
+    return new Intl.DateTimeFormat('ru-RU', {
+        hour: '2-digit',
+        minute: '2-digit'
+    }).format(date);
+}
+
 export const UserColumn: ColumnDef<FullUserType>[] = [
     {
         accessorKey: "imageUrl",
@@ -29,15 +37,33 @@ export const UserColumn: ColumnDef<FullUserType>[] = [
     },
     {
         accessorKey: "name",
-        header: "Name",
+        header: "Имя",
     },
     {
         accessorKey: "role",
-        header: "Role",
+        header: "Роль",
     },
     {
         accessorKey: "department.department",
-        header: "Department",
+        header: "Отдел",
+    },
+    {
+        accessorKey: "post",
+        header: "Должность",
+    },
+    {
+        accessorKey: "office",
+        header: "Кабинет",
+    },
+    {
+        accessorKey: "startWork",
+        header: "Время начала работы",
+        cell: ({ row }) => formatTime(row.getValue("startWork") as string),
+    },
+    {
+        accessorKey: "endWork",
+        header: "Время конца работы",
+        cell: ({ row }) => formatTime(row.getValue("endWork") as string),
     },
     {
         id: "actions",
@@ -48,16 +74,16 @@ export const UserColumn: ColumnDef<FullUserType>[] = [
                 <DropdownMenu>
                     <DropdownMenuTrigger asChild>
                         <Button variant="ghost" className="h-8 w-8 p-0">
-                            <span className="sr-only">Open menu</span>
+                            <span className="sr-only">Открыть меню</span>
                             <MoreHorizontal className="h-4 w-4" />
                         </Button>
                     </DropdownMenuTrigger>
                     <DropdownMenuContent align="end">
-                        <DropdownMenuLabel>Actions</DropdownMenuLabel>
+                        <DropdownMenuLabel>Действия</DropdownMenuLabel>
                         <DropdownMenuItem
                             onClick={() => navigator.clipboard.writeText(original.id)}
                         >
-                            Copy user ID
+                            Копировать ID пользователя
                         </DropdownMenuItem>
                         <DropdownMenuItem
                             onClick={() => axios.delete(`/api/profile/${original.id}`)}
@@ -84,11 +110,11 @@ export const ServerColumn: ColumnDef<FullServerType>[] = [
     },
     {
         accessorKey: "name",
-        header: "Name",
+        header: "Имя",
     },
     {
         accessorKey: "department.department",
-        header: "Department",
+        header: "Отдел",
     },
     {
         id: "actions",
@@ -100,16 +126,16 @@ export const ServerColumn: ColumnDef<FullServerType>[] = [
                 <DropdownMenu>
                     <DropdownMenuTrigger asChild>
                         <Button variant="ghost" className="h-8 w-8 p-0">
-                            <span className="sr-only">Open menu</span>
+                            <span className="sr-only">Открыть меню</span>
                             <MoreHorizontal className="h-4 w-4" />
                         </Button>
                     </DropdownMenuTrigger>
                     <DropdownMenuContent align="end">
-                        <DropdownMenuLabel>Actions</DropdownMenuLabel>
+                        <DropdownMenuLabel>Действия</DropdownMenuLabel>
                         <DropdownMenuItem
                             onClick={() => navigator.clipboard.writeText(original.id)}
                         >
-                            Copy server ID
+                            Копировать ID сервера
                         </DropdownMenuItem>
                         <DropdownMenuSeparator />
                         <DeleteServerMenuItem original={server} />
diff --git a/components/admin/admin-sidebar.tsx b/components/admin/admin-sidebar.tsx
@@ -18,8 +18,8 @@ export const AdminSidebar = async () => {
             </div>
             <div className="px-3">
                 <Separator className="bg-zinc-200 dark:bg-zinc-700 rounded-md my-2"/>
-                <AdminSection label={"Users"} icon={<Users/>} link={"users"}/>
-                <AdminSection label={"Servers"} icon={<Server/>} link={"servers"}/>
+                <AdminSection label={"Сотрудники"} icon={<Users/>} link={"users"}/>
+                <AdminSection label={"Сервера"} icon={<Server/>} link={"servers"}/>
             </div>
         </div>)
 }
diff --git a/components/auth/register-form.tsx b/components/auth/register-form.tsx
@@ -24,6 +24,7 @@ import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from "@/c
 import {Department} from "@prisma/client";
 import axios from "axios";
 import {inviteUser} from "@/actions/invite";
+import {TimePickerDemo} from "@/components/time-picker/time-picker-demo";
 
 export const RegisterForm = () => {
     const [error, setError] = useState<string | undefined>("");
@@ -37,6 +38,10 @@ export const RegisterForm = () => {
             name: "",
             password: "",
             departmentId: "",
+            post: "",
+            office: "",
+            startWork: new Date(),
+            endWork: new Date(),
         },
     });
 
@@ -83,7 +88,7 @@ export const RegisterForm = () => {
                             name="name"
                             render={({ field }) => (
                                 <FormItem>
-                                    <FormLabel>Name</FormLabel>
+                                    <FormLabel>Имя</FormLabel>
                                     <FormControl>
                                         <Input
                                             {...field}
@@ -100,7 +105,7 @@ export const RegisterForm = () => {
                             name="password"
                             render={({ field }) => (
                                 <FormItem>
-                                    <FormLabel>Password</FormLabel>
+                                    <FormLabel>Пароль</FormLabel>
                                     <FormControl>
                                         <Input
                                             {...field}
@@ -113,6 +118,72 @@ export const RegisterForm = () => {
                                 </FormItem>
                             )}
                         />
+                        <FormField
+                            control={form.control}
+                            name="post"
+                            render={({ field }) => (
+                                <FormItem>
+                                    <FormLabel>Должность</FormLabel>
+                                    <FormControl>
+                                        <Input
+                                            {...field}
+                                            disabled={isPending}
+                                            placeholder=""
+                                        />
+                                    </FormControl>
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                        />
+                        <FormField
+                            control={form.control}
+                            name="office"
+                            render={({ field }) => (
+                                <FormItem>
+                                    <FormLabel>Кабинет</FormLabel>
+                                    <FormControl>
+                                        <Input
+                                            {...field}
+                                            disabled={isPending}
+                                            placeholder=""
+                                        />
+                                    </FormControl>
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                        />
+                        <FormField
+                            control={form.control}
+                            name="startWork"
+                            render={({ field }) => (
+                                <FormItem>
+                                    <FormLabel>Время начала работы</FormLabel>
+                                    <FormControl>
+                                        <TimePickerDemo
+                                            setDate={field.onChange}
+                                            date={field.value}
+                                        />
+                                    </FormControl>
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                        />
+                        <FormField
+                            control={form.control}
+                            name="endWork"
+                            render={({ field }) => (
+                                <FormItem>
+                                    <FormLabel>Время конца работы</FormLabel>
+                                    <FormControl>
+                                        <TimePickerDemo
+                                            setDate={field.onChange}
+                                            date={field.value}
+                                        />
+                                    </FormControl>
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                        />
                         <FormField
                             control={form.control}
                             name="departmentId"
diff --git a/components/auth/user-button.tsx b/components/auth/user-button.tsx
@@ -28,7 +28,7 @@ export const UserButton = ({user}: UserButtonProps) => {
                 <UserAvatar src={user.imageUrl}/>
             </DropdownMenuTrigger>
             <DropdownMenuContent className="w-40" align="end">
-                <Button variant="ghost" onClick={() => onOpen("editProfile", {user})}>
+                <Button variant="ghost" onClick={() => onOpen("editProfile")}>
                     <DropdownMenuItem>
                         <Settings className="h-4 w-4 mr-2"/>
                         Профиль
diff --git a/components/modals/edit-profile-modal.tsx b/components/modals/edit-profile-modal.tsx
@@ -4,7 +4,7 @@ import axios from "axios";
 import * as z from "zod";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
-import { useEffect } from "react";
+import {useEffect, useState} from "react";
 
 import {
     Dialog,
@@ -27,12 +27,28 @@ import { FileUpload } from "@/components/files/file-upload";
 import { useRouter } from "next/navigation";
 import { useModal } from "@/hooks/use-modal-store";
 import { ProfileSchema } from "@/schemas";
+import {User} from "@prisma/client";
 
 export const EditProfileModal = () => {
     const { isOpen, onClose, type, data } = useModal();
     useRouter();
     const isModalOpen = isOpen && type === "editProfile";
-    const { user } = data;
+    const [user, setUser] = useState<User | null>(null);
+
+    useEffect(() => {
+        const fetchUser = async () => {
+            try {
+                const response = await axios.get('/api/profile');
+                setUser(response.data);
+            } catch (error) {
+                console.error('Failed to fetch user:', error);
+            }
+        };
+
+        if (isModalOpen) {
+            fetchUser();
+        }
+    }, [isModalOpen]);
 
     const form = useForm({
         resolver: zodResolver(ProfileSchema),
@@ -46,7 +62,7 @@ export const EditProfileModal = () => {
     useEffect(() => {
         if (user) {
             form.setValue("name", user.name || "");
-            form.setValue("password", user.password || "");
+            form.setValue("password", "");
             form.setValue("imageUrl", user.imageUrl);
         }
     }, [user, form]);
diff --git a/components/time-picker/time-picker-demo.tsx b/components/time-picker/time-picker-demo.tsx
@@ -0,0 +1,48 @@
+"use client";
+
+import * as React from "react";
+import { Clock } from "lucide-react";
+import { Label } from "@/components/ui/label";
+import { TimePickerInput } from "./time-picker-input";
+
+interface TimePickerDemoProps {
+    date: Date | undefined;
+    setDate: (date: Date | undefined) => void;
+}
+
+export function TimePickerDemo({ date, setDate }: TimePickerDemoProps) {
+    const minuteRef = React.useRef<HTMLInputElement>(null);
+    const hourRef = React.useRef<HTMLInputElement>(null);
+
+    return (
+        <div className="flex items-end gap-2">
+            <div className="grid gap-1 text-center">
+                <Label htmlFor="hours" className="text-xs">
+                    Hours
+                </Label>
+                <TimePickerInput
+                    picker="hours"
+                    date={date}
+                    setDate={setDate}
+                    ref={hourRef}
+                    onRightFocus={() => minuteRef.current?.focus()}
+                />
+            </div>
+            <div className="grid gap-1 text-center">
+                <Label htmlFor="minutes" className="text-xs">
+                    Minutes
+                </Label>
+                <TimePickerInput
+                    picker="minutes"
+                    date={date}
+                    setDate={setDate}
+                    ref={minuteRef}
+                    onLeftFocus={() => hourRef.current?.focus()}
+                />
+            </div>
+            <div className="flex h-10 items-center">
+                <Clock className="ml-2 h-4 w-4" />
+            </div>
+        </div>
+    );
+}
diff --git a/components/time-picker/time-picker-input.tsx b/components/time-picker/time-picker-input.tsx
diff --git a/components/time-picker/time-picker-utils.tsx b/components/time-picker/time-picker-utils.tsx
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
diff --git a/schemas/index.ts b/schemas/index.ts
