fixed some ui, refactored code
This commit is contained in:
@@ -1,15 +1,22 @@
|
||||
"use client";
|
||||
|
||||
import { useCallback, useMemo } from "react";
|
||||
import { LogOut } from "lucide-react";
|
||||
import { useCallback, useMemo, useState, useEffect } from "react";
|
||||
import { LogOut, Edit2, Save, X, User, Phone, MapPin, Mail } from "lucide-react";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import {
|
||||
Card,
|
||||
CardContent,
|
||||
CardDescription,
|
||||
CardHeader,
|
||||
CardTitle,
|
||||
} from "@/components/ui/card";
|
||||
import { Skeleton } from "@/components/ui/skeleton";
|
||||
import { useUserProfile } from "@/lib/hooks";
|
||||
import { useUserProfile, useUpdateProfile } from "@/lib/hooks";
|
||||
import { clearAuthToken } from "@/lib/api";
|
||||
import { useTranslations } from "next-intl";
|
||||
import { toast } from "sonner";
|
||||
|
||||
interface ProfilePageProps {
|
||||
params: Promise<{ locale: string }>;
|
||||
@@ -17,34 +24,118 @@ interface ProfilePageProps {
|
||||
|
||||
export default function ClientProfilePage(props: ProfilePageProps) {
|
||||
const { data: user, isLoading, error } = useUserProfile();
|
||||
const updateProfile = useUpdateProfile();
|
||||
const t = useTranslations();
|
||||
|
||||
const [isEditing, setIsEditing] = useState(false);
|
||||
const [formData, setFormData] = useState({
|
||||
first_name: "",
|
||||
last_name: "",
|
||||
phone_number: "",
|
||||
address: "",
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (user && !isEditing) {
|
||||
setFormData({
|
||||
first_name: user.first_name || "",
|
||||
last_name: user.last_name || "",
|
||||
phone_number: user.phone_number || "",
|
||||
address: user.address || "",
|
||||
});
|
||||
}
|
||||
}, [user, isEditing]);
|
||||
|
||||
const prepareDataForAPI = useCallback(() => {
|
||||
return {
|
||||
name: `${formData.first_name} ${formData.last_name}`.trim(),
|
||||
phone_number: formData.phone_number,
|
||||
address: formData.address,
|
||||
};
|
||||
}, [formData]);
|
||||
|
||||
const handleLogout = useCallback(() => {
|
||||
clearAuthToken();
|
||||
window.location.href = "/";
|
||||
}, []);
|
||||
|
||||
const loadingSkeleton = useMemo(() => (
|
||||
<div className="min-h-screen bg-gray-50 p-4 pt-20">
|
||||
<div className="container mx-auto max-w-2xl">
|
||||
<Skeleton className="h-10 w-48 mb-6" />
|
||||
<Card className="shadow-lg mb-4">
|
||||
<CardHeader>
|
||||
<Skeleton className="h-6 w-32 mb-2" />
|
||||
<Skeleton className="h-4 w-48" />
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
{[1, 2, 3, 4].map((i) => (
|
||||
<div key={i} className="space-y-2">
|
||||
<Skeleton className="h-4 w-24" />
|
||||
<Skeleton className="h-10 w-full" />
|
||||
</div>
|
||||
))}
|
||||
</CardContent>
|
||||
</Card>
|
||||
const handleEdit = useCallback(() => {
|
||||
if (user) {
|
||||
setFormData({
|
||||
first_name: user.first_name || "",
|
||||
last_name: user.last_name || "",
|
||||
phone_number: user.phone_number || "",
|
||||
address: user.address || "",
|
||||
});
|
||||
setIsEditing(true);
|
||||
}
|
||||
}, [user]);
|
||||
|
||||
const handleCancel = useCallback(() => {
|
||||
setIsEditing(false);
|
||||
if (user) {
|
||||
setFormData({
|
||||
first_name: user.first_name || "",
|
||||
last_name: user.last_name || "",
|
||||
phone_number: user.phone_number || "",
|
||||
address: user.address || "",
|
||||
});
|
||||
}
|
||||
}, [user]);
|
||||
|
||||
const handleSave = useCallback(async () => {
|
||||
const apiData = prepareDataForAPI();
|
||||
|
||||
if (!apiData.name) {
|
||||
toast.error(t("name_required") || "Name is required");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await updateProfile.mutateAsync(apiData);
|
||||
setIsEditing(false);
|
||||
toast.success(t("profile_updated_success") || "Profile updated successfully");
|
||||
} catch (err: any) {
|
||||
const errorMessage = err?.response?.data?.message || t("profile_update_error") || "Failed to update profile";
|
||||
toast.error(errorMessage);
|
||||
console.error("Profile update error:", err);
|
||||
}
|
||||
}, [formData, updateProfile, t, prepareDataForAPI]);
|
||||
|
||||
const handleInputChange = useCallback(
|
||||
(field: keyof typeof formData, value: string) => {
|
||||
setFormData((prev) => ({ ...prev, [field]: value }));
|
||||
},
|
||||
[]
|
||||
);
|
||||
|
||||
const loadingSkeleton = useMemo(
|
||||
() => (
|
||||
<div className="min-h-screen bg-gray-50 p-4 sm:p-6 lg:p-8 pt-20 sm:pt-24">
|
||||
<div className="container mx-auto max-w-4xl">
|
||||
<div className="mb-6 sm:mb-8">
|
||||
<Skeleton className="h-8 sm:h-10 w-32 sm:w-40 mb-2" />
|
||||
<Skeleton className="h-4 w-48 sm:w-64" />
|
||||
</div>
|
||||
<Card className="shadow-sm">
|
||||
<CardHeader>
|
||||
<Skeleton className="h-6 w-32 mb-2" />
|
||||
<Skeleton className="h-4 w-48" />
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4 sm:space-y-6">
|
||||
{[1, 2, 3, 4].map((i) => (
|
||||
<div key={i} className="space-y-2">
|
||||
<Skeleton className="h-4 w-24" />
|
||||
<Skeleton className="h-10 sm:h-11 w-full" />
|
||||
</div>
|
||||
))}
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
), []);
|
||||
),
|
||||
[]
|
||||
);
|
||||
|
||||
if (isLoading) {
|
||||
return loadingSkeleton;
|
||||
@@ -53,10 +144,20 @@ export default function ClientProfilePage(props: ProfilePageProps) {
|
||||
if (error) {
|
||||
return (
|
||||
<div className="min-h-screen bg-gray-50 flex items-center justify-center p-4">
|
||||
<Card className="w-full max-w-md">
|
||||
<Card className="w-full max-w-md shadow-sm">
|
||||
<CardContent className="pt-6 text-center">
|
||||
<p className="text-red-600 mb-4">{t("error_loading_profile")}</p>
|
||||
<Button onClick={() => window.location.reload()}>{t("try_again")}</Button>
|
||||
<div className="w-12 h-12 sm:w-14 sm:h-14 bg-red-50 rounded-full flex items-center justify-center mx-auto mb-4">
|
||||
<X className="h-6 w-6 sm:h-7 sm:w-7 text-red-600" />
|
||||
</div>
|
||||
<p className="text-red-600 mb-4 text-sm sm:text-base">
|
||||
{t("error_loading_profile")}
|
||||
</p>
|
||||
<Button
|
||||
onClick={() => window.location.reload()}
|
||||
className="w-full sm:w-auto"
|
||||
>
|
||||
{t("try_again")}
|
||||
</Button>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
@@ -64,51 +165,194 @@ export default function ClientProfilePage(props: ProfilePageProps) {
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen bg-gray-50 p-4 pt-20">
|
||||
<div className="container mx-auto max-w-2xl">
|
||||
<h1 className="text-3xl font-bold mb-6">{t("profile")}</h1>
|
||||
<div className="min-h-screen bg-gray-50 p-4 sm:p-6 lg:p-8 pt-20 sm:pt-24">
|
||||
<div className="container mx-auto max-w-4xl">
|
||||
{/* Header Section */}
|
||||
<div className="mb-6 sm:mb-8">
|
||||
<div className="flex items-start justify-between gap-4">
|
||||
<div className="flex-1 min-w-0">
|
||||
<h1 className="text-2xl sm:text-3xl lg:text-4xl font-bold text-gray-900 mb-1 sm:mb-2 truncate">
|
||||
{t("profile")}
|
||||
</h1>
|
||||
<p className="text-sm sm:text-base text-gray-600">
|
||||
{isEditing ? t("edit_your_information") : t("view_your_information")}
|
||||
</p>
|
||||
</div>
|
||||
<div className="flex-shrink-0 w-12 h-12 sm:w-14 sm:h-14 bg-blue-600 rounded-full flex items-center justify-center shadow-sm">
|
||||
<User className="h-6 w-6 sm:h-7 sm:w-7 text-white" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Card className="shadow-lg mb-4">
|
||||
<CardHeader>
|
||||
<CardTitle>{t("personal_info")}</CardTitle>
|
||||
<CardDescription>{t("profile_description")}</CardDescription>
|
||||
{/* Profile Card */}
|
||||
<Card className="shadow-sm border border-gray-200 mb-4 sm:mb-6">
|
||||
<CardHeader className="border-b border-gray-100 pb-4 sm:pb-5">
|
||||
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
||||
<div>
|
||||
<CardTitle className="text-lg sm:text-xl text-gray-900">
|
||||
{t("personal_info")}
|
||||
</CardTitle>
|
||||
<CardDescription className="text-xs sm:text-sm text-gray-600 mt-1">
|
||||
{t("profile_description")}
|
||||
</CardDescription>
|
||||
</div>
|
||||
{!isEditing && (
|
||||
<Button
|
||||
onClick={handleEdit}
|
||||
variant="outline"
|
||||
size="sm"
|
||||
className="self-start sm:self-center border-gray-300 hover:bg-gray-50 text-gray-700 h-9"
|
||||
>
|
||||
<Edit2 className="h-3.5 w-3.5 sm:h-4 sm:w-4 mr-1.5 sm:mr-2" />
|
||||
<span className="text-sm">{t("edit")}</span>
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
|
||||
<CardContent className="pt-5 sm:pt-6 space-y-4 sm:space-y-5">
|
||||
{user && (
|
||||
<>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="firstName">{t("first_name")}</Label>
|
||||
<Input id="firstName" value={user.first_name || ""} disabled className="bg-gray-50" />
|
||||
{/* Name Fields - Grid on larger screens */}
|
||||
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4 sm:gap-5">
|
||||
<div className="space-y-2">
|
||||
<Label
|
||||
htmlFor="firstName"
|
||||
className="text-sm font-medium text-gray-700 flex items-center gap-1.5"
|
||||
>
|
||||
<User className="h-3.5 w-3.5 text-gray-400" />
|
||||
{t("first_name")}
|
||||
</Label>
|
||||
<Input
|
||||
id="firstName"
|
||||
value={formData.first_name}
|
||||
onChange={(e) =>
|
||||
handleInputChange("first_name", e.target.value)
|
||||
}
|
||||
disabled={!isEditing}
|
||||
className={`h-10 sm:h-11 text-sm sm:text-base ${
|
||||
isEditing
|
||||
? "border-gray-300 focus:border-blue-500 focus:ring-1 focus:ring-blue-500 bg-white"
|
||||
: "bg-gray-50 border-gray-200 text-gray-700"
|
||||
}`}
|
||||
placeholder={t("enter_first_name")}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label
|
||||
htmlFor="lastName"
|
||||
className="text-sm font-medium text-gray-700 flex items-center gap-1.5"
|
||||
>
|
||||
<User className="h-3.5 w-3.5 text-gray-400" />
|
||||
{t("last_name")}
|
||||
</Label>
|
||||
<Input
|
||||
id="lastName"
|
||||
value={formData.last_name}
|
||||
onChange={(e) =>
|
||||
handleInputChange("last_name", e.target.value)
|
||||
}
|
||||
disabled={!isEditing}
|
||||
className={`h-10 sm:h-11 text-sm sm:text-base ${
|
||||
isEditing
|
||||
? "border-gray-300 focus:border-blue-500 focus:ring-1 focus:ring-blue-500 bg-white"
|
||||
: "bg-gray-50 border-gray-200 text-gray-700"
|
||||
}`}
|
||||
placeholder={t("enter_last_name")}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Phone Field */}
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="lastName">{t("last_name")}</Label>
|
||||
<Input id="lastName" value={user.last_name || ""} disabled className="bg-gray-50" />
|
||||
<Label
|
||||
htmlFor="phone"
|
||||
className="text-sm font-medium text-gray-700 flex items-center gap-1.5"
|
||||
>
|
||||
<Phone className="h-3.5 w-3.5 text-gray-400" />
|
||||
{t("phone_number")}
|
||||
</Label>
|
||||
<Input
|
||||
id="phone"
|
||||
value={formData.phone_number}
|
||||
onChange={(e) =>
|
||||
handleInputChange("phone_number", e.target.value)
|
||||
}
|
||||
disabled={!isEditing}
|
||||
className={`h-10 sm:h-11 text-sm sm:text-base ${
|
||||
isEditing
|
||||
? "border-gray-300 focus:border-blue-500 focus:ring-1 focus:ring-blue-500 bg-white"
|
||||
: "bg-gray-50 border-gray-200 text-gray-700"
|
||||
}`}
|
||||
placeholder={t("enter_phone_number")}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Address Field */}
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="phone">{t("phone_number")}</Label>
|
||||
<Input id="phone" value={user.phone_number || ""} disabled className="bg-gray-50" />
|
||||
<Label
|
||||
htmlFor="address"
|
||||
className="text-sm font-medium text-gray-700 flex items-center gap-1.5"
|
||||
>
|
||||
<MapPin className="h-3.5 w-3.5 text-gray-400" />
|
||||
{t("address")}
|
||||
</Label>
|
||||
<Input
|
||||
id="address"
|
||||
value={formData.address}
|
||||
onChange={(e) =>
|
||||
handleInputChange("address", e.target.value)
|
||||
}
|
||||
disabled={!isEditing}
|
||||
className={`h-10 sm:h-11 text-sm sm:text-base ${
|
||||
isEditing
|
||||
? "border-gray-300 focus:border-blue-500 focus:ring-1 focus:ring-blue-500 bg-white"
|
||||
: "bg-gray-50 border-gray-200 text-gray-700"
|
||||
}`}
|
||||
placeholder={t("enter_address")}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="address">{t("address")}</Label>
|
||||
<Input id="address" value={user.address || ""} disabled className="bg-gray-50" />
|
||||
</div>
|
||||
{/* Action Buttons - Edit Mode */}
|
||||
{isEditing && (
|
||||
<div className="flex flex-col sm:flex-row gap-3 pt-4 sm:pt-5 border-t border-gray-100">
|
||||
<Button
|
||||
onClick={handleSave}
|
||||
disabled={updateProfile.isPending}
|
||||
className="w-full sm:flex-1 bg-blue-600 hover:bg-blue-700 h-10 sm:h-11 text-sm sm:text-base font-medium shadow-sm"
|
||||
>
|
||||
<Save className="h-4 w-4 mr-2" />
|
||||
{updateProfile.isPending ? t("saving") : t("save_changes")}
|
||||
</Button>
|
||||
<Button
|
||||
onClick={handleCancel}
|
||||
variant="outline"
|
||||
disabled={updateProfile.isPending}
|
||||
className="w-full sm:flex-1 h-10 sm:h-11 text-sm sm:text-base font-medium border-gray-300 hover:bg-gray-50"
|
||||
>
|
||||
<X className="h-4 w-4 mr-2" />
|
||||
{t("cancel")}
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
<Button
|
||||
onClick={handleLogout}
|
||||
variant="destructive"
|
||||
size="lg"
|
||||
className="w-full max-w-md flex items-center justify-center gap-2"
|
||||
>
|
||||
<LogOut className="h-5 w-5" />
|
||||
{t("common.logout")}
|
||||
</Button>
|
||||
{/* Logout Button */}
|
||||
<div className="flex justify-center">
|
||||
<Button
|
||||
onClick={handleLogout}
|
||||
variant="destructive"
|
||||
size="lg"
|
||||
className="w-full sm:w-auto sm:min-w-[280px] flex items-center justify-center gap-2 h-11 text-sm sm:text-base font-medium shadow-sm"
|
||||
>
|
||||
<LogOut className="h-4 w-4 sm:h-5 sm:w-5" />
|
||||
{t("common.logout")}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user