d7e0d7eada
New users get a Gravatar-backed avatar automatically (computed from email at signup); users can upload a custom photo instead via Settings, or revert to the Gravatar/initials fallback. avatarUrl stays the single resolved value (custom photo, OAuth photo, or precomputed Gravatar URL) so every existing avatar-rendering spot across the app needs zero changes. - users.hasCustomAvatar tracks whether avatarUrl is a real upload vs a computed Gravatar fallback, so "remove photo" knows what to revert to. - New /api/v1/upload/avatar-presign route (session-scoped, generic — the existing recipe-photo presign route required a recipeId). - CSP img-src needed www.gravatar.com added, or every browser blocks the fallback avatar outright. - Settings page now reads avatarUrl from a fresh DB query instead of Better Auth's session object — the session cookie cache (5 min TTL) was serving a stale image right after upload, showing the initials fallback until the cache happened to expire. Verified locally: signup auto-sets a Gravatar URL, upload persists across reload, remove correctly reverts to Gravatar/initials.
202 lines
6.7 KiB
TypeScript
202 lines
6.7 KiB
TypeScript
"use client";
|
|
|
|
import { useState } from "react";
|
|
import { toast } from "sonner";
|
|
import { Button } from "@/components/ui/button";
|
|
import { Input } from "@/components/ui/input";
|
|
import { Label } from "@/components/ui/label";
|
|
import { Textarea } from "@/components/ui/textarea";
|
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
|
|
import { Switch } from "@/components/ui/switch";
|
|
import { useTranslations } from "next-intl";
|
|
import { useLocale, SUPPORTED_LOCALES, type Locale } from "@/lib/i18n/provider";
|
|
import { AvatarUploader } from "./avatar-uploader";
|
|
|
|
type UserProps = {
|
|
name: string;
|
|
email: string;
|
|
image: string | null;
|
|
locale: string;
|
|
bio: string | null;
|
|
privateBio: string | null;
|
|
isPrivate: boolean;
|
|
hasCustomAvatar: boolean;
|
|
};
|
|
|
|
export function SettingsForm({ user }: { user: UserProps }) {
|
|
const t = useTranslations("settingsForm");
|
|
const t_common = useTranslations("common");
|
|
const { setLocale } = useLocale();
|
|
|
|
const [avatarImage, setAvatarImage] = useState(user.image);
|
|
const [hasCustomAvatar, setHasCustomAvatar] = useState(user.hasCustomAvatar);
|
|
const [name, setName] = useState(user.name);
|
|
const [bio, setBio] = useState(user.bio ?? "");
|
|
const [privateBio, setPrivateBio] = useState(user.privateBio ?? "");
|
|
const [saving, setSaving] = useState(false);
|
|
const [savingBio, setSavingBio] = useState(false);
|
|
const [isPrivate, setIsPrivate] = useState(user.isPrivate);
|
|
const [savingPrivacy, setSavingPrivacy] = useState(false);
|
|
|
|
async function saveProfile() {
|
|
setSaving(true);
|
|
try {
|
|
const res = await fetch("/api/v1/users/me", {
|
|
method: "PATCH",
|
|
headers: { "Content-Type": "application/json" },
|
|
body: JSON.stringify({ name }),
|
|
});
|
|
if (res.ok) toast.success(t_common("saved"));
|
|
else toast.error(t_common("saveFailed"));
|
|
} finally {
|
|
setSaving(false);
|
|
}
|
|
}
|
|
|
|
async function saveBios() {
|
|
setSavingBio(true);
|
|
try {
|
|
const res = await fetch("/api/v1/users/me", {
|
|
method: "PATCH",
|
|
headers: { "Content-Type": "application/json" },
|
|
body: JSON.stringify({
|
|
bio: bio.trim() || null,
|
|
privateBio: privateBio.trim() || null,
|
|
}),
|
|
});
|
|
if (res.ok) toast.success(t_common("saved"));
|
|
else toast.error(t_common("saveFailed"));
|
|
} finally {
|
|
setSavingBio(false);
|
|
}
|
|
}
|
|
|
|
const bioUnchanged = bio === (user.bio ?? "") && privateBio === (user.privateBio ?? "");
|
|
|
|
async function savePrivacy(checked: boolean) {
|
|
setSavingPrivacy(true);
|
|
const previous = isPrivate;
|
|
setIsPrivate(checked);
|
|
try {
|
|
const res = await fetch("/api/v1/users/me", {
|
|
method: "PATCH",
|
|
headers: { "Content-Type": "application/json" },
|
|
body: JSON.stringify({ isPrivate: checked }),
|
|
});
|
|
if (res.ok) toast.success(t_common("saved"));
|
|
else {
|
|
setIsPrivate(previous);
|
|
toast.error(t_common("saveFailed"));
|
|
}
|
|
} catch {
|
|
setIsPrivate(previous);
|
|
toast.error(t_common("saveFailed"));
|
|
} finally {
|
|
setSavingPrivacy(false);
|
|
}
|
|
}
|
|
|
|
return (
|
|
<div className="space-y-6">
|
|
<section className="rounded-xl border p-6 space-y-4">
|
|
<h2 className="font-semibold text-lg">{t("profile")}</h2>
|
|
<AvatarUploader
|
|
name={user.name}
|
|
image={avatarImage}
|
|
hasCustomAvatar={hasCustomAvatar}
|
|
onChange={(image, custom) => {
|
|
setAvatarImage(image);
|
|
setHasCustomAvatar(custom);
|
|
}}
|
|
/>
|
|
<div className="space-y-2">
|
|
<Label>{t("displayName")}</Label>
|
|
<Input value={name} onChange={(e) => setName(e.target.value)} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label>{t("email")}</Label>
|
|
<Input value={user.email} disabled className="opacity-70" />
|
|
</div>
|
|
<Button onClick={saveProfile} disabled={saving || name === user.name}>
|
|
{saving ? t("saving") : t_common("save")}
|
|
</Button>
|
|
</section>
|
|
|
|
<section className="rounded-xl border p-6 space-y-4">
|
|
<h2 className="font-semibold text-lg">{t("bio")}</h2>
|
|
<div className="space-y-2">
|
|
<Label>{t("publicBio")}</Label>
|
|
<p className="text-xs text-muted-foreground">{t("publicBioDescription")}</p>
|
|
<Textarea
|
|
value={bio}
|
|
onChange={(e) => setBio(e.target.value)}
|
|
placeholder={t("publicBioPlaceholder")}
|
|
rows={3}
|
|
maxLength={500}
|
|
className="resize-none"
|
|
/>
|
|
<p className="text-xs text-muted-foreground text-right">{bio.length}/500</p>
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label>{t("privateBio")}</Label>
|
|
<p className="text-xs text-muted-foreground">{t("privateBioDescription")}</p>
|
|
<Textarea
|
|
value={privateBio}
|
|
onChange={(e) => setPrivateBio(e.target.value)}
|
|
placeholder={t("privateBioPlaceholder")}
|
|
rows={5}
|
|
maxLength={2000}
|
|
className="resize-none"
|
|
/>
|
|
<p className="text-xs text-muted-foreground text-right">{privateBio.length}/2000</p>
|
|
</div>
|
|
<Button onClick={saveBios} disabled={savingBio || bioUnchanged}>
|
|
{savingBio ? t("saving") : t_common("save")}
|
|
</Button>
|
|
</section>
|
|
|
|
<section className="rounded-xl border p-6 space-y-1">
|
|
<div className="flex items-center justify-between">
|
|
<div>
|
|
<h2 className="font-semibold text-lg">{t("privateAccount")}</h2>
|
|
<p className="text-sm text-muted-foreground mt-1 max-w-prose">
|
|
{t("privateAccountDescription")}
|
|
</p>
|
|
</div>
|
|
<Switch
|
|
id="private-account"
|
|
checked={isPrivate}
|
|
disabled={savingPrivacy}
|
|
onCheckedChange={(checked) => { void savePrivacy(checked); }}
|
|
/>
|
|
</div>
|
|
</section>
|
|
|
|
<section className="rounded-xl border p-6 space-y-4">
|
|
<h2 className="font-semibold text-lg">{t("language")}</h2>
|
|
<p className="text-sm text-muted-foreground">{t("languageDescription")}</p>
|
|
<Select
|
|
defaultValue={user.locale}
|
|
onValueChange={(v) => {
|
|
void setLocale(v as Locale).then((ok) => {
|
|
if (ok) toast.success(t_common("saved"));
|
|
else toast.error(t_common("saveFailed"));
|
|
});
|
|
}}
|
|
>
|
|
<SelectTrigger className="w-48">
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{SUPPORTED_LOCALES.map((l) => (
|
|
<SelectItem key={l.code} value={l.code}>
|
|
{l.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</section>
|
|
</div>
|
|
);
|
|
}
|