Admin/panel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Refactor user management to replace email with username across the application

Browse Source
This commit is contained in:
RKWojs
2025-07-28 22:25:23 +02:00
parent 6fc2e6703b
commit 07b4af5f24
14 changed files with 298 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/admin/users/[id]/edit/page.js
View File

@@ -15,7 +15,7 @@ export default function EditUserPage() {
const [user, setUser] = useState(null);
const [formData, setFormData] = useState({
name: "",
email: "",
username: "",
role: "user",
is_active: true,
password: ""
@@ -62,7 +62,7 @@ export default function EditUserPage() {
setUser(userData);
setFormData({
name: userData.name,
email: userData.email,
username: userData.username,
role: userData.role,
is_active: userData.is_active,
password: "" // Never populate password field
@@ -84,7 +84,7 @@ export default function EditUserPage() {
// Prepare update data (exclude empty password)
const updateData = {
name: formData.name,
email: formData.email,
username: formData.username,
role: formData.role,
is_active: formData.is_active
};
@@ -209,12 +209,12 @@ export default function EditUserPage() {
<div>
<label className="block text-sm font-medium text-gray-700 mb-2">
Email *
Username *
</label>
<Input
type="email"
value={formData.email}
onChange={(e) => setFormData({ ...formData, email: e.target.value })}
type="text"
value={formData.username}
onChange={(e) => setFormData({ ...formData, username: e.target.value })}
required
/>
</div>

12
src/app/admin/users/page.js
View File

@@ -194,7 +194,7 @@ export default function UserManagementPage() {
</div>
<div>
<h3 className="text-lg font-semibold text-gray-900">{user.name}</h3>
<p className="text-sm text-gray-500">{user.email}</p>
<p className="text-sm text-gray-500">{user.username}</p>
</div>
</div>
<div className="flex items-center space-x-2">
@@ -284,7 +284,7 @@ export default function UserManagementPage() {
function CreateUserModal({ onClose, onUserCreated }) {
const [formData, setFormData] = useState({
name: "",
email: "",
username: "",
password: "",
role: "user",
is_active: true
@@ -353,12 +353,12 @@ function CreateUserModal({ onClose, onUserCreated }) {
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">
Email
Username
</label>
<Input
type="email"
value={formData.email}
onChange={(e) => setFormData({ ...formData, email: e.target.value })}
type="text"
value={formData.username}
onChange={(e) => setFormData({ ...formData, username: e.target.value })}
required
/>
</div>

2
src/app/api/admin/users/[id]/route.js
View File

@@ -78,7 +78,7 @@ async function updateUserHandler(req, { params }) {
if (error.message.includes("already exists")) {
return NextResponse.json(
{ error: "A user with this email already exists" },
{ error: "A user with this username already exists" },
{ status: 409 }
);
}

8
src/app/api/admin/users/route.js
View File

@@ -27,9 +27,9 @@ async function createUserHandler(req) {
const data = await req.json();
// Validate required fields
if (!data.name || !data.email || !data.password) {
if (!data.name || !data.username || !data.password) {
return NextResponse.json(
{ error: "Name, email, and password are required" },
{ error: "Name, username, and password are required" },
{ status: 400 }
);
}
@@ -53,7 +53,7 @@ async function createUserHandler(req) {
const newUser = await createUser({
name: data.name,
email: data.email,
username: data.username,
password: data.password,
role: data.role || "user",
is_active: data.is_active !== undefined ? data.is_active : true
@@ -68,7 +68,7 @@ async function createUserHandler(req) {
if (error.message.includes("already exists")) {
return NextResponse.json(
{ error: "A user with this email already exists" },
{ error: "A user with this username already exists" },
{ status: 409 }
);
}

32
src/app/auth/signin/page.js
View File

@@ -6,7 +6,7 @@ import { useRouter } from "next/navigation"
import { useSearchParams } from "next/navigation"
function SignInContent() {
const [email, setEmail] = useState("")
const [username, setUsername] = useState("")
const [password, setPassword] = useState("")
const [error, setError] = useState("")
const [isLoading, setIsLoading] = useState(false)
@@ -21,13 +21,13 @@ function SignInContent() {
try {
const result = await signIn("credentials", {
email,
username,
password,
redirect: false,
})
if (result?.error) {
setError("Invalid email or password")
setError("Invalid username or password")
} else {
// Successful login
router.push(callbackUrl)
@@ -45,10 +45,10 @@ function SignInContent() {
<div className="max-w-md w-full space-y-8">
<div>
<h2 className="mt-6 text-center text-3xl font-extrabold text-gray-900">
Sign in to your account
Zaloguj się do swojego konta
</h2>
<p className="mt-2 text-center text-sm text-gray-600">
Access the Project Management Panel
Dostęp do panelu
</p>
</div>
<form className="mt-8 space-y-6" onSubmit={handleSubmit}>
@@ -60,24 +60,24 @@ function SignInContent() {
<div className="rounded-md shadow-sm -space-y-px">
<div>
<label htmlFor="email" className="sr-only">
Email address
<label htmlFor="username" className="sr-only">
Nazwa użytkownika
</label>
<input
id="email"
name="email"
type="email"
autoComplete="email"
id="username"
name="username"
type="text"
autoComplete="username"
required
className="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-t-md focus:outline-none focus:ring-blue-500 focus:border-blue-500 focus:z-10 sm:text-sm"
placeholder="Email address"
value={email}
onChange={(e) => setEmail(e.target.value)}
placeholder="Nazwa użytkownika"
value={username}
onChange={(e) => setUsername(e.target.value)}
/>
</div>
<div>
<label htmlFor="password" className="sr-only">
Password
Hasło
</label>
<input
id="password"
@@ -105,7 +105,7 @@ function SignInContent() {
<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
<path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
Signing in...
Zaloguj...
</span>
) : (
"Sign in"