first commit
This commit is contained in:
Beyhan Oğur
94
frontend/app/admin/users/columns.tsx
Normal file
94
frontend/app/admin/users/columns.tsx
Normal file
@@ -0,0 +1,94 @@
|
||||
"use client"
|
||||
|
||||
import { ColumnDef, HeaderContext, CellContext } from "@tanstack/react-table"
|
||||
import { User } from "@/types/user"
|
||||
import { Badge } from "@/components/ui/badge"
|
||||
import { Check, X } from "lucide-react"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { ArrowUpDown } from "lucide-react"
|
||||
|
||||
// Actions cell component will be added later or inline if simple
|
||||
import { DataTableRowActions } from "./user-row-actions"
|
||||
|
||||
export const getColumns = (onRefresh: () => void): ColumnDef<User>[] => [
|
||||
{
|
||||
accessorKey: "id",
|
||||
header: ({ column }: HeaderContext<User, unknown>) => {
|
||||
return (
|
||||
<Button
|
||||
variant="ghost"
|
||||
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
|
||||
>
|
||||
ID
|
||||
<ArrowUpDown className="ml-2 h-4 w-4" />
|
||||
</Button>
|
||||
)
|
||||
},
|
||||
},
|
||||
{
|
||||
accessorKey: "username",
|
||||
header: ({ column }: HeaderContext<User, unknown>) => {
|
||||
return (
|
||||
<Button
|
||||
variant="ghost"
|
||||
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
|
||||
>
|
||||
Kullanıcı Adı
|
||||
<ArrowUpDown className="ml-2 h-4 w-4" />
|
||||
</Button>
|
||||
)
|
||||
},
|
||||
},
|
||||
{
|
||||
accessorKey: "email",
|
||||
header: ({ column }: HeaderContext<User, unknown>) => {
|
||||
return (
|
||||
<Button
|
||||
variant="ghost"
|
||||
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
|
||||
>
|
||||
Email
|
||||
<ArrowUpDown className="ml-2 h-4 w-4" />
|
||||
</Button>
|
||||
)
|
||||
},
|
||||
},
|
||||
{
|
||||
accessorKey: "email_verified",
|
||||
header: "Doğrulandı",
|
||||
cell: ({ row }: CellContext<User, unknown>) => {
|
||||
return row.getValue("email_verified") ? (
|
||||
<Badge variant="secondary" className="bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-300"><Check className="w-3 h-3 mr-1" /> Evet</Badge>
|
||||
) : (
|
||||
<Badge variant="outline" className="text-gray-500"><X className="w-3 h-3 mr-1" /> Hayır</Badge>
|
||||
)
|
||||
},
|
||||
},
|
||||
{
|
||||
accessorKey: "deleted_at",
|
||||
header: "Durum",
|
||||
cell: ({ row }) => {
|
||||
const deletedAt = row.original.deleted_at
|
||||
return deletedAt ? (
|
||||
<Badge variant="destructive">Silindi</Badge>
|
||||
) : (
|
||||
<Badge variant="outline" className="bg-green-50 text-green-700 border-green-200">Aktif</Badge>
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
accessorKey: "is_admin",
|
||||
header: "Rol",
|
||||
cell: ({ row }: CellContext<User, unknown>) => {
|
||||
return row.getValue("is_admin") ? (
|
||||
<Badge variant="default">Admin</Badge>
|
||||
) : (
|
||||
<Badge variant="secondary">User</Badge>
|
||||
)
|
||||
},
|
||||
},
|
||||
{
|
||||
id: "actions",
|
||||
cell: ({ row }: CellContext<User, unknown>) => <DataTableRowActions row={row} onRefresh={onRefresh} />,
|
||||
},
|
||||
]
|
||||
100
frontend/app/admin/users/data-table.tsx
Normal file
100
frontend/app/admin/users/data-table.tsx
Normal file
@@ -0,0 +1,100 @@
|
||||
"use client"
|
||||
|
||||
import * as React from "react"
|
||||
import {
|
||||
ColumnDef,
|
||||
flexRender,
|
||||
getCoreRowModel,
|
||||
useReactTable,
|
||||
SortingState,
|
||||
getSortedRowModel,
|
||||
HeaderGroup,
|
||||
Header,
|
||||
Row,
|
||||
Cell
|
||||
} from "@tanstack/react-table"
|
||||
|
||||
import {
|
||||
Table,
|
||||
TableBody,
|
||||
TableCell,
|
||||
TableHead,
|
||||
TableHeader,
|
||||
TableRow,
|
||||
} from "@/components/ui/table"
|
||||
|
||||
interface DataTableProps<TData, TValue> {
|
||||
columns: ColumnDef<TData, TValue>[]
|
||||
data: TData[]
|
||||
}
|
||||
|
||||
export function DataTable<TData, TValue>({
|
||||
columns,
|
||||
data,
|
||||
}: DataTableProps<TData, TValue>) {
|
||||
const [sorting, setSorting] = React.useState<SortingState>([])
|
||||
|
||||
// eslint-disable-next-line react-hooks/incompatible-library
|
||||
const table = useReactTable({
|
||||
data,
|
||||
columns,
|
||||
getCoreRowModel: getCoreRowModel(),
|
||||
// Pagination is handled server-side in the main page, so we don't strictly need client-side pagination here
|
||||
// unless we mix both. For now, let's keep it simple and just render rows.
|
||||
// If we pass 20 items, it renders 20 items.
|
||||
// getPaginationRowModel: getPaginationRowModel(),
|
||||
onSortingChange: setSorting,
|
||||
getSortedRowModel: getSortedRowModel(),
|
||||
state: {
|
||||
sorting,
|
||||
},
|
||||
manualPagination: true, // Tell table we handle pagination manually
|
||||
})
|
||||
|
||||
return (
|
||||
<div className="rounded-md border">
|
||||
<Table>
|
||||
<TableHeader>
|
||||
{table.getHeaderGroups().map((headerGroup: HeaderGroup<TData>) => (
|
||||
<TableRow key={headerGroup.id}>
|
||||
{headerGroup.headers.map((header: Header<TData, unknown>) => {
|
||||
return (
|
||||
<TableHead key={header.id}>
|
||||
{header.isPlaceholder
|
||||
? null
|
||||
: flexRender(
|
||||
header.column.columnDef.header,
|
||||
header.getContext()
|
||||
)}
|
||||
</TableHead>
|
||||
)
|
||||
})}
|
||||
</TableRow>
|
||||
))}
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
{table.getRowModel().rows?.length ? (
|
||||
table.getRowModel().rows.map((row: Row<TData>) => (
|
||||
<TableRow
|
||||
key={row.id}
|
||||
data-state={row.getIsSelected() && "selected"}
|
||||
>
|
||||
{row.getVisibleCells().map((cell: Cell<TData, unknown>) => (
|
||||
<TableCell key={cell.id}>
|
||||
{flexRender(cell.column.columnDef.cell, cell.getContext())}
|
||||
</TableCell>
|
||||
))}
|
||||
</TableRow>
|
||||
))
|
||||
) : (
|
||||
<TableRow>
|
||||
<TableCell colSpan={columns.length} className="h-24 text-center">
|
||||
Sonuç bulunamadı.
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
)}
|
||||
</TableBody>
|
||||
</Table>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
151
frontend/app/admin/users/page.tsx
Normal file
151
frontend/app/admin/users/page.tsx
Normal file
@@ -0,0 +1,151 @@
|
||||
"use client"
|
||||
|
||||
import * as React from "react"
|
||||
import { useEffect, useState, Suspense } from "react"
|
||||
import { useSession } from "next-auth/react"
|
||||
import { useRouter, useSearchParams } from "next/navigation"
|
||||
import { getColumns } from "./columns"
|
||||
import { DataTable } from "./data-table"
|
||||
import { User } from "@/types/user"
|
||||
import { userService } from "@/services/userService"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
|
||||
import { Loader2 } from "lucide-react"
|
||||
|
||||
function UsersPageContent() {
|
||||
const { data: session, status } = useSession()
|
||||
const router = useRouter()
|
||||
const searchParams = useSearchParams()
|
||||
|
||||
const [data, setData] = useState<User[]>([])
|
||||
const [total, setTotal] = useState(0)
|
||||
const [loading, setLoading] = useState(true)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
|
||||
// Filters
|
||||
const page = Number(searchParams.get("page")) || 1
|
||||
const perPage = Number(searchParams.get("per_page")) || 20
|
||||
const soft = searchParams.get("soft") || "" // "", "only", "with"
|
||||
|
||||
const fetchData = React.useCallback(async () => {
|
||||
if (!session?.user?.accessToken) {
|
||||
setLoading(false)
|
||||
return
|
||||
}
|
||||
setLoading(true)
|
||||
setError(null)
|
||||
try {
|
||||
const response = await userService.getUsers(session.user.accessToken, page, perPage, soft)
|
||||
setData(response.items || [])
|
||||
setTotal(response.total)
|
||||
} catch (error) {
|
||||
console.error("Failed to fetch users:", error)
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
setError((error as any).message || "Kullanıcılar getirilirken bir hata oluştu")
|
||||
setData([])
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}, [session, page, perPage, soft])
|
||||
|
||||
useEffect(() => {
|
||||
if (status === "loading") return
|
||||
|
||||
if (status === "unauthenticated" || !session?.user?.accessToken) {
|
||||
setLoading(false)
|
||||
return
|
||||
}
|
||||
|
||||
fetchData()
|
||||
}, [fetchData, status, session])
|
||||
|
||||
const columns = React.useMemo(() => getColumns(fetchData), [fetchData])
|
||||
|
||||
const handleFilterChange = (value: string) => {
|
||||
const params = new URLSearchParams(searchParams.toString())
|
||||
if (value && value !== "active") {
|
||||
params.set("soft", value)
|
||||
} else {
|
||||
params.delete("soft")
|
||||
}
|
||||
params.set("page", "1")
|
||||
router.push(`/admin/users?${params.toString()}`)
|
||||
}
|
||||
|
||||
const handlePageChange = (newPage: number) => {
|
||||
const params = new URLSearchParams(searchParams.toString())
|
||||
params.set("page", newPage.toString())
|
||||
router.push(`/admin/users?${params.toString()}`)
|
||||
}
|
||||
|
||||
const totalPages = Math.ceil(total / perPage)
|
||||
|
||||
return (
|
||||
<div className="container mx-auto py-10">
|
||||
<div className="flex items-center justify-between mb-6">
|
||||
<h1 className="text-3xl font-bold tracking-tight">Kullanıcı Yönetimi</h1>
|
||||
<div className="flex gap-4">
|
||||
<Select
|
||||
value={soft || "active"}
|
||||
onValueChange={handleFilterChange}
|
||||
>
|
||||
<SelectTrigger className="w-[180px]">
|
||||
<SelectValue placeholder="Durum Seç" />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="active">Aktif Kullanıcılar</SelectItem>
|
||||
<SelectItem value="only">Silinmişler (Çöp Kutusu)</SelectItem>
|
||||
<SelectItem value="with">Tümü (Aktif + Silinmiş)</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="bg-destructive/15 text-destructive p-4 rounded-md mb-6">
|
||||
Hata: {error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{loading && data.length === 0 ? (
|
||||
<div className="flex justify-center items-center h-64">
|
||||
<Loader2 className="h-8 w-8 animate-spin" />
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<DataTable columns={columns} data={data} />
|
||||
{/* Pagination Controls */}
|
||||
<div className="flex items-center justify-end space-x-2 py-4">
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onClick={() => handlePageChange(page - 1)}
|
||||
disabled={page <= 1}
|
||||
>
|
||||
Önceki
|
||||
</Button>
|
||||
<div className="text-sm">
|
||||
Sayfa {page} / {totalPages || 1}
|
||||
</div>
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onClick={() => handlePageChange(page + 1)}
|
||||
disabled={page >= totalPages}
|
||||
>
|
||||
Sonraki
|
||||
</Button>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default function UsersPage() {
|
||||
return (
|
||||
<Suspense fallback={<div className="flex justify-center p-10"><Loader2 className="h-8 w-8 animate-spin" /></div>}>
|
||||
<UsersPageContent />
|
||||
</Suspense>
|
||||
)
|
||||
}
|
||||
123
frontend/app/admin/users/user-dialog.tsx
Normal file
123
frontend/app/admin/users/user-dialog.tsx
Normal file
@@ -0,0 +1,123 @@
|
||||
"use client"
|
||||
|
||||
import { Button } from "@/components/ui/button"
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from "@/components/ui/dialog"
|
||||
import { Input } from "@/components/ui/input"
|
||||
import { Label } from "@/components/ui/label"
|
||||
import { User, UserPayload } from "@/types/user"
|
||||
import { useState } from "react"
|
||||
import { userService } from "@/services/userService"
|
||||
import { useSession } from "next-auth/react"
|
||||
import { toast } from "sonner"
|
||||
import { useRouter } from "next/navigation"
|
||||
|
||||
interface UserDialogProps {
|
||||
open: boolean
|
||||
onOpenChange: (open: boolean) => void
|
||||
user: User
|
||||
onSuccess?: () => void
|
||||
}
|
||||
|
||||
export function UserDialog({ open, onOpenChange, user, onSuccess }: UserDialogProps) {
|
||||
const { data: session } = useSession()
|
||||
const router = useRouter()
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [formData, setFormData] = useState<UserPayload>({
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
is_admin: user.is_admin,
|
||||
password: "",
|
||||
})
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
if (!session?.user?.accessToken) return
|
||||
|
||||
setLoading(true)
|
||||
try {
|
||||
// Create a payload copy to manipulate
|
||||
const payload = { ...formData }
|
||||
// Remove password if it's empty so we don't overwrite with empty string
|
||||
if (!payload.password || payload.password.trim() === "") {
|
||||
delete payload.password
|
||||
}
|
||||
|
||||
await userService.updateUser(session.user.accessToken, user.id, payload)
|
||||
toast.success("Kullanıcı güncellendi")
|
||||
onOpenChange(false)
|
||||
if (onSuccess) onSuccess() // Trigger parent refresh
|
||||
router.refresh()
|
||||
} catch (error) {
|
||||
toast.error("Kullanıcı güncellenirken bir hata oluştu")
|
||||
console.error(error)
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={onOpenChange}>
|
||||
<DialogContent className="sm:max-w-[425px]">
|
||||
<DialogHeader>
|
||||
<DialogTitle>Kullanıcı Düzenle</DialogTitle>
|
||||
<DialogDescription>
|
||||
Kullanıcı bilgilerini buradan güncelleyebilirsiniz. Şifre alanını boş bırakırsanız değişmez.
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
<form onSubmit={handleSubmit}>
|
||||
<div className="grid gap-4 py-4">
|
||||
<div className="grid grid-cols-4 items-center gap-4">
|
||||
<Label htmlFor="username" className="text-right">
|
||||
Kullanıcı Adı
|
||||
</Label>
|
||||
<Input
|
||||
id="username"
|
||||
value={formData.username}
|
||||
onChange={(e) => setFormData({ ...formData, username: e.target.value })}
|
||||
className="col-span-3"
|
||||
/>
|
||||
</div>
|
||||
<div className="grid grid-cols-4 items-center gap-4">
|
||||
<Label htmlFor="email" className="text-right">
|
||||
Email
|
||||
</Label>
|
||||
<Input
|
||||
id="email"
|
||||
type="email"
|
||||
value={formData.email}
|
||||
onChange={(e) => setFormData({ ...formData, email: e.target.value })}
|
||||
className="col-span-3"
|
||||
/>
|
||||
</div>
|
||||
<div className="grid grid-cols-4 items-center gap-4">
|
||||
<Label htmlFor="password" className="text-right">
|
||||
Yeni Şifre
|
||||
</Label>
|
||||
<Input
|
||||
id="password"
|
||||
type="password"
|
||||
placeholder="Değişmeyecekse boş bırakın"
|
||||
value={formData.password || ""}
|
||||
onChange={(e) => setFormData({ ...formData, password: e.target.value })}
|
||||
className="col-span-3"
|
||||
/>
|
||||
</div>
|
||||
{/* Admin role toggle could be added here if needed */}
|
||||
</div>
|
||||
<DialogFooter>
|
||||
<Button type="submit" disabled={loading}>
|
||||
{loading ? "Kaydediliyor..." : "Kaydet"}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</form>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
132
frontend/app/admin/users/user-row-actions.tsx
Normal file
132
frontend/app/admin/users/user-row-actions.tsx
Normal file
@@ -0,0 +1,132 @@
|
||||
import { Row } from "@tanstack/react-table"
|
||||
import { MoreHorizontal, Pen, Trash, RotateCcw } from "lucide-react"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import {
|
||||
DropdownMenu,
|
||||
DropdownMenuContent,
|
||||
DropdownMenuItem,
|
||||
DropdownMenuSeparator,
|
||||
DropdownMenuTrigger,
|
||||
} from "@/components/ui/dropdown-menu"
|
||||
import { User } from "@/types/user"
|
||||
import { useState } from "react"
|
||||
import { UserDialog } from "./user-dialog"
|
||||
import { userService } from "@/services/userService"
|
||||
import { useSession } from "next-auth/react"
|
||||
import { toast } from "sonner"
|
||||
import { useRouter } from "next/navigation"
|
||||
import Swal from 'sweetalert2'
|
||||
import withReactContent from 'sweetalert2-react-content'
|
||||
|
||||
const MySwal = withReactContent(Swal)
|
||||
|
||||
interface DataTableRowActionsProps<TData> {
|
||||
row: Row<TData>
|
||||
onRefresh: () => void
|
||||
}
|
||||
|
||||
export function DataTableRowActions<TData extends User>({
|
||||
row,
|
||||
onRefresh,
|
||||
}: DataTableRowActionsProps<TData>) {
|
||||
const user = row.original as User
|
||||
const [showEditDialog, setShowEditDialog] = useState(false)
|
||||
const { data: session } = useSession()
|
||||
const router = useRouter()
|
||||
|
||||
const handleDelete = async () => {
|
||||
if (!session?.user?.accessToken) return
|
||||
|
||||
const result = await MySwal.fire({
|
||||
title: 'Emin misiniz?',
|
||||
text: "Bu kullanıcıyı silmek istediğinize emin misiniz? Bu işlem geri alınabilir (Soft Delete).",
|
||||
icon: 'warning',
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: '#d33',
|
||||
cancelButtonColor: '#3085d6',
|
||||
confirmButtonText: 'Evet, Sil!',
|
||||
cancelButtonText: 'İptal'
|
||||
})
|
||||
|
||||
if (!result.isConfirmed) return
|
||||
|
||||
try {
|
||||
await userService.deleteUser(session.user.accessToken, user.id)
|
||||
MySwal.fire(
|
||||
'Silindi!',
|
||||
'Kullanıcı başarıyla silindi.',
|
||||
'success'
|
||||
)
|
||||
onRefresh()
|
||||
router.refresh()
|
||||
} catch (error) {
|
||||
toast.error("Kullanıcı silinirken bir hata oluştu")
|
||||
console.error(error)
|
||||
}
|
||||
}
|
||||
|
||||
const handleRestore = async () => {
|
||||
if (!session?.user?.accessToken) return
|
||||
|
||||
const result = await MySwal.fire({
|
||||
title: 'Geri Yükle?',
|
||||
text: "Bu kullanıcıyı geri yüklemek istediğinize emin misiniz?",
|
||||
icon: 'question',
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: '#3085d6',
|
||||
cancelButtonColor: '#d33',
|
||||
confirmButtonText: 'Evet, Geri Yükle!',
|
||||
cancelButtonText: 'İptal'
|
||||
})
|
||||
|
||||
if (!result.isConfirmed) return
|
||||
|
||||
try {
|
||||
await userService.restoreUser(session.user.accessToken, user.id)
|
||||
MySwal.fire(
|
||||
'Geri Yüklendi!',
|
||||
'Kullanıcı başarıyla geri yüklendi.',
|
||||
'success'
|
||||
)
|
||||
onRefresh()
|
||||
router.refresh()
|
||||
} catch (error) {
|
||||
toast.error("Kullanıcı geri yüklenirken bir hata oluştu")
|
||||
console.error(error)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<UserDialog
|
||||
open={showEditDialog}
|
||||
onOpenChange={setShowEditDialog}
|
||||
user={user}
|
||||
onSuccess={onRefresh} // Trigger refresh on success
|
||||
/>
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button variant="ghost" className="h-8 w-8 p-0">
|
||||
<span className="sr-only">Menü aç</span>
|
||||
<MoreHorizontal className="h-4 w-4" />
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end">
|
||||
<DropdownMenuItem onClick={() => setShowEditDialog(true)}>
|
||||
<Pen className="mr-2 h-3.5 w-3.5 text-muted-foreground/70" />
|
||||
Düzenle
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem onClick={handleDelete} className="text-red-600">
|
||||
<Trash className="mr-2 h-3.5 w-3.5" />
|
||||
Sil
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem onClick={handleRestore}>
|
||||
<RotateCcw className="mr-2 h-3.5 w-3.5" />
|
||||
Geri Yükle
|
||||
</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
</>
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user