feat(profile): add user profile with bio, website, and social links

- Added fields for user bio, website, and social links (Twitter, GitHub, Instagram, Facebook, YouTube, Discord) in the profile settings form.
- Updated the user profile modal to display bio, website, and social links.
- Improved email management UI for better layout and user experience.
- Introduced new translations for the added fields in the settings locale.

Signed-off-by: Innei <tukon479@gmail.com>
This commit is contained in:
Innei
2025-06-10 00:08:25 +08:00
parent f0cdcaaac0
commit 507a525965
7 changed files with 1065 additions and 55 deletions
@@ -59,43 +59,45 @@ export function EmailManagement() {
{user?.emailVerified ? t("profile.email.verified") : t("profile.email.unverified")}
</span>
</div>
<p className="text-text-secondary group flex gap-2 text-sm">
{user?.email}
<div className="flex items-center justify-between">
<div className="text-text-secondary group flex items-center gap-2">
{user?.email}
<AnimatedCommandButton
icon={<m.i className="i-mgc-edit-cute-re size-4" />}
className="size-5 p-1"
variant="ghost"
onClick={() => {
present({
title: t("profile.email.change"),
content: EmailManagementForm,
})
}}
/>
{user?.email && (
<CopyButton
value={user.email}
className={cn(
"size-5 p-1 duration-300",
!isMobile && "opacity-0 group-hover:opacity-100",
)}
<AnimatedCommandButton
icon={<m.i className="i-mgc-edit-cute-re size-4" />}
className="size-5 p-1"
variant="ghost"
onClick={() => {
present({
title: t("profile.email.change"),
content: EmailManagementForm,
})
}}
/>
{user?.email && (
<CopyButton
value={user.email}
className={cn(
"size-5 p-1 duration-300",
!isMobile && "opacity-0 group-hover:opacity-100",
)}
/>
)}
</div>
{!user?.emailVerified && (
<Button
variant="outline"
type="button"
isLoading={verifyEmailMutation.isPending}
onClick={() => {
verifyEmailMutation.mutate()
}}
buttonClassName="mt-2"
>
{t("profile.email.send_verification")}
</Button>
)}
</p>
{!user?.emailVerified && (
<Button
variant="outline"
type="button"
isLoading={verifyEmailMutation.isPending}
onClick={() => {
verifyEmailMutation.mutate()
}}
buttonClassName="mt-2"
>
{t("profile.email.send_verification")}
</Button>
)}
</div>
</>
)
}
@@ -9,7 +9,7 @@ import {
FormLabel,
FormMessage,
} from "@follow/components/ui/form/index.jsx"
import { Input } from "@follow/components/ui/input/index.js"
import { Input, TextArea } from "@follow/components/ui/input/index.js"
import { cn } from "@follow/utils/utils"
import { zodResolver } from "@hookform/resolvers/zod"
import { useMutation } from "@tanstack/react-query"
@@ -22,12 +22,57 @@ import { setWhoami, useWhoami } from "~/atoms/user"
import { updateUser } from "~/lib/auth"
import { toastFetchError } from "~/lib/error-parser"
const socialLinksSchema = z.object({
twitter: z.string().max(64).optional(),
github: z.string().max(64).optional(),
instagram: z.string().max(64).optional(),
facebook: z.string().max(64).optional(),
youtube: z.string().max(64).optional(),
discord: z.string().max(64).optional(),
})
const formSchema = z.object({
handle: z.string().max(50).optional(),
name: z.string().min(3).max(50),
image: z.string().url().or(z.literal("")).optional(),
bio: z.string().max(256).optional(),
website: z.string().url().max(64).optional().or(z.literal("")),
socialLinks: socialLinksSchema.optional(),
})
const socialIconClassNames = {
twitter: "i-mgc-twitter-cute-fi",
github: "i-mgc-github-cute-fi",
instagram: "i-mingcute-ins-fill",
facebook: "i-mingcute-facebook-fill",
youtube: "i-mgc-youtube-cute-fi",
discord: "i-mingcute-discord-fill",
}
const formItemLabelClassName = tw`pl-3`
// Extended user type to include the new fields
type ExtendedUser = ReturnType<typeof useWhoami> & {
bio?: string
website?: string
socialLinks?: {
twitter?: string
github?: string
instagram?: string
facebook?: string
youtube?: string
discord?: string
}
}
const socialCopyMap = {
twitter: "Twitter",
github: "GitHub",
instagram: "Instagram",
facebook: "Facebook",
youtube: "YouTube",
discord: "Discord",
}
export const ProfileSettingForm = ({
className,
buttonClassName,
@@ -36,7 +81,7 @@ export const ProfileSettingForm = ({
buttonClassName?: string
}) => {
const { t } = useTranslation("settings")
const user = useWhoami()
const user = useWhoami() as ExtendedUser
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
@@ -44,6 +89,16 @@ export const ProfileSettingForm = ({
handle: user?.handle || undefined,
name: user?.name || "",
image: user?.image || "",
bio: user?.bio || "",
website: user?.website || "",
socialLinks: {
twitter: user?.socialLinks?.twitter || "",
github: user?.socialLinks?.github || "",
instagram: user?.socialLinks?.instagram || "",
facebook: user?.socialLinks?.facebook || "",
youtube: user?.socialLinks?.youtube || "",
discord: user?.socialLinks?.discord || "",
},
},
})
@@ -53,6 +108,10 @@ export const ProfileSettingForm = ({
handle: values.handle,
image: values.image,
name: values.name,
// @ts-expect-error
bio: values.bio,
website: values.website,
socialLinks: values.socialLinks,
}),
onError: (error) => {
toastFetchError(error)
@@ -71,6 +130,15 @@ export const ProfileSettingForm = ({
updateMutation.mutate(values)
}
const socialLinkFields: (keyof z.infer<typeof socialLinksSchema>)[] = [
"twitter",
"github",
"instagram",
"facebook",
"youtube",
"discord",
]
return (
<Form {...form}>
<form onSubmit={form.handleSubmit(onSubmit)} className={cn("mt-4 space-y-4", className)}>
@@ -79,7 +147,7 @@ export const ProfileSettingForm = ({
name="handle"
render={({ field }) => (
<FormItem>
<FormLabel>{t("profile.handle.label")}</FormLabel>
<FormLabel className={formItemLabelClassName}>{t("profile.handle.label")}</FormLabel>
<FormControl>
<Input {...field} />
</FormControl>
@@ -93,7 +161,7 @@ export const ProfileSettingForm = ({
name="name"
render={({ field }) => (
<FormItem>
<FormLabel>{t("profile.name.label")}</FormLabel>
<FormLabel className={formItemLabelClassName}>{t("profile.name.label")}</FormLabel>
<FormControl>
<Input {...field} />
</FormControl>
@@ -109,7 +177,9 @@ export const ProfileSettingForm = ({
render={({ field }) => (
<div className="flex gap-4">
<FormItem className="w-full">
<FormLabel>{t("profile.avatar.label")}</FormLabel>
<FormLabel className={formItemLabelClassName}>
{t("profile.avatar.label")}
</FormLabel>
<FormControl>
<div className="flex items-center gap-4">
<Input {...field} />
@@ -127,6 +197,78 @@ export const ProfileSettingForm = ({
)}
/>
<FormField
control={form.control}
name="bio"
render={({ field }) => (
<FormItem>
<FormLabel className={formItemLabelClassName}>{t("profile.profile.bio")}</FormLabel>
<FormControl>
<TextArea
rounded="lg"
{...field}
placeholder="Tell us about yourself..."
className="placeholder:text-text-tertiary min-h-[80px] resize-none p-3 text-sm"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="website"
render={({ field }) => (
<FormItem>
<FormLabel className={formItemLabelClassName}>
{t("profile.profile.website")}
</FormLabel>
<FormControl>
<Input type="url" {...field} placeholder="https://your-website.com" />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<div>
<FormLabel className={cn(formItemLabelClassName, "text-sm font-medium")}>
{t("profile.profile.social_links")}
</FormLabel>
<div className="mt-2 grid grid-cols-2 gap-2">
{socialLinkFields.map((social) => (
<FormField
key={social}
control={form.control}
name={`socialLinks.${social}`}
render={({ field }) => (
<FormItem>
<FormControl>
<label
className={cn(
"ring-accent/20 focus-within:border-accent/80 duration-200 focus-within:outline-none focus-within:ring-2",
"border-border bg-theme-background hover:bg-accent/5 flex cursor-text items-center gap-2 rounded-md border px-3 py-2 transition-colors dark:bg-zinc-700/[0.15]",
)}
>
<i
className={`${socialIconClassNames[social]} text-text-secondary shrink-0 text-base`}
/>
<input
{...field}
placeholder={socialCopyMap[social]}
className="placeholder:text-text-tertiary border-0 !bg-transparent p-0 text-sm focus-visible:ring-0"
/>
</label>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
))}
</div>
</div>
<div className={cn("text-right", buttonClassName)}>
<Button type="submit" isLoading={updateMutation.isPending}>
{t("profile.submit")}
@@ -3,6 +3,7 @@ import { Avatar, AvatarFallback, AvatarImage } from "@follow/components/ui/avata
import { ActionButton, Button } from "@follow/components/ui/button/index.js"
import { LoadingCircle } from "@follow/components/ui/loading/index.jsx"
import { ScrollArea } from "@follow/components/ui/scroll-area/index.js"
import { Tooltip, TooltipContent, TooltipTrigger } from "@follow/components/ui/tooltip/index.js"
import { nextFrame, stopPropagation } from "@follow/utils/dom"
import { getStorageNS } from "@follow/utils/ns"
import { clsx, cn } from "@follow/utils/utils"
@@ -28,6 +29,48 @@ import { useUserById } from "~/store/user"
import type { SubscriptionModalContentProps } from "./user-profile-modal.shared"
import { SubscriptionItems } from "./user-profile-modal.shared"
// Social platform icons mapping
const socialIconClassNames = {
twitter: "i-mgc-twitter-cute-fi duration-200 group-hover:text-[#1DA1F2]",
github: "i-mgc-github-cute-fi duration-200 group-hover:text-[#181717] group-hover:dark:invert",
instagram: "i-mingcute-ins-fill duration-200 group-hover:text-[#C13584]",
facebook: "i-mingcute-facebook-fill duration-200 group-hover:text-[#1877F2]",
youtube: "i-mgc-youtube-cute-fi duration-200 group-hover:text-[#FF0000]",
discord: "i-mingcute-discord-fill duration-200 group-hover:text-[#5865F2]",
}
const socialCopyMap = {
twitter: "Twitter",
github: "GitHub",
instagram: "Instagram",
facebook: "Facebook",
youtube: "YouTube",
discord: "Discord",
}
const getSocialLink = (platform: keyof typeof socialIconClassNames, id: string) => {
switch (platform) {
case "twitter": {
return `https://twitter.com/${id}`
}
case "github": {
return `https://github.com/${id}`
}
case "instagram": {
return `https://instagram.com/${id}`
}
case "facebook": {
return `https://facebook.com/${id}`
}
case "youtube": {
return `https://youtube.com/${id}`
}
case "discord": {
return `https://discord.com/${id}`
}
}
}
type ItemVariant = "loose" | "compact"
const itemVariantAtom = atomWithStorage(
getStorageNS("item-variant"),
@@ -37,6 +80,30 @@ const itemVariantAtom = atomWithStorage(
getOnInit: true,
},
)
const pickUserData = <
T extends {
avatar?: string
name?: string | null
handle?: string | null
id: string
bio?: string | null
website?: string | null
socialLinks?: Record<string, string> | null
},
>(
user: T,
) => {
return {
avatar: user.avatar,
name: user.name,
handle: user.handle,
id: user.id,
bio: user.bio,
website: user.website,
socialLinks: user.socialLinks,
}
}
export const UserProfileModalContent: FC<SubscriptionModalContentProps> = ({ userId, variant }) => {
const { t } = useTranslation()
const user = useAuthQuery(
@@ -49,21 +116,7 @@ export const UserProfileModalContent: FC<SubscriptionModalContentProps> = ({ use
)
const storeUser = useUserById(userId)
const userInfo = user.data
? {
avatar: user.data.image,
name: user.data.name,
handle: user.data.handle,
id: user.data.id,
}
: storeUser
? {
avatar: storeUser.image,
name: storeUser.name,
handle: storeUser.handle,
id: storeUser.id,
}
: null
const userInfo = user.data ? pickUserData(user.data) : storeUser ? pickUserData(storeUser) : null
const follow = useFollow()
const subscriptions = useUserSubscriptionsQuery(user.data?.id)
@@ -269,13 +322,81 @@ export const UserProfileModalContent: FC<SubscriptionModalContentProps> = ({ use
</m.div>
<m.div
className={cn(
"text-sm text-zinc-500",
"text-text-secondary text-sm",
userInfo.handle ? "visible" : "hidden select-none",
)}
layout
>
@{userInfo.handle}
</m.div>
{/* Bio */}
{user.data?.bio && !isHeaderSimple && (
<m.div
layout
transition={{ duration: 0.35 }}
className="text-text-secondary/80 mt-2 max-w-md text-center text-sm"
>
{user.data.bio}
</m.div>
)}
{/* Website */}
{user.data?.website && !isHeaderSimple && (
<m.div layout transition={{ duration: 0.35 }} className="mt-2">
<a
href={user.data.website}
target="_blank"
rel="noopener noreferrer"
className="text-accent hover:text-accent/80 flex items-center gap-1 text-sm transition-colors"
>
<i className="i-mgc-link-cute-re text-base" />
{user.data.website.replace(/^https?:\/\//, "")}
</a>
</m.div>
)}
{/* Social Links */}
{user.data?.socialLinks && !isHeaderSimple && (
<m.div
layout
transition={{ duration: 0.35 }}
className="mt-3 flex flex-wrap gap-2"
>
{Object.entries(user.data.socialLinks).map(([platform, id]) => {
if (!id || !(platform in socialIconClassNames)) return null
return (
<Tooltip key={platform}>
<TooltipTrigger asChild>
<a
href={getSocialLink(
platform as keyof typeof socialIconClassNames,
id,
)}
target="_blank"
rel="noopener noreferrer"
className="text-text-secondary bg-material-opaque group flex items-center justify-center rounded-full p-2 transition-colors"
>
<i
className={cn(
socialIconClassNames[
platform as keyof typeof socialIconClassNames
],
"text-base",
)}
/>
</a>
</TooltipTrigger>
<TooltipContent className="text-sm">
{socialCopyMap[platform as keyof typeof socialCopyMap]}
</TooltipContent>
</Tooltip>
)
})}
</m.div>
)}
<Button
buttonClassName={cn(
isHeaderSimple ? "absolute -right-full top-4 rounded-full p-2" : "mt-4",
@@ -17,6 +17,25 @@ import { useUserById } from "~/store/user"
import type { SubscriptionModalContentProps } from "./user-profile-modal.shared"
import { SubscriptionGroup } from "./user-profile-modal.shared"
// Social platform icons mapping
const socialIconClassNames = {
twitter: "i-mgc-twitter-cute-fi",
github: "i-mgc-github-cute-fi",
instagram: "i-mingcute-ins-fill",
facebook: "i-mingcute-facebook-fill",
youtube: "i-mgc-youtube-cute-fi",
discord: "i-mingcute-discord-fill",
}
const socialCopyMap = {
twitter: "Twitter",
github: "GitHub",
instagram: "Instagram",
facebook: "Facebook",
youtube: "YouTube",
discord: "Discord",
}
export const UserProfileModalContent: FC<SubscriptionModalContentProps> = ({ userId }) => {
const { t } = useTranslation()
const user = useAuthQuery(users.profile({ userId }))
@@ -72,6 +91,56 @@ export const UserProfileModalContent: FC<SubscriptionModalContentProps> = ({ use
>
@{userInfo.handle}
</div>
{/* Bio */}
{user.data?.bio && (
<div className="mt-3 max-w-xs text-center text-sm text-zinc-600">
{user.data.bio}
</div>
)}
{/* Website */}
{user.data?.website && (
<div className="mt-2">
<a
href={user.data.website}
target="_blank"
rel="noopener noreferrer"
className="text-accent hover:text-accent/80 flex items-center gap-1 text-sm transition-colors"
>
<i className="i-mgc-link-cute-re text-base" />
{user.data.website.replace(/^https?:\/\//, "")}
</a>
</div>
)}
{/* Social Links */}
{user.data?.socialLinks && (
<div className="mt-3 flex flex-wrap gap-2">
{Object.entries(user.data.socialLinks).map(([platform, url]) => {
if (!url || !(platform in socialIconClassNames)) return null
return (
<a
key={platform}
href={url}
target="_blank"
rel="noopener noreferrer"
className="hover:text-accent flex items-center justify-center rounded-full bg-zinc-100 p-2 text-zinc-500 transition-colors dark:bg-zinc-800"
title={socialCopyMap[platform as keyof typeof socialCopyMap]}
>
<i
className={cn(
socialIconClassNames[platform as keyof typeof socialIconClassNames],
"text-base",
)}
/>
</a>
)
})}
</div>
)}
<Button
buttonClassName={"mt-4"}
textClassName="gap-1"
+5
View File
@@ -417,6 +417,11 @@
"profile.new_password.label": "New Password",
"profile.no_password": "<Link>Reset</Link> your password to set a new one.",
"profile.password.label": "Password",
"profile.profile.bio": "Bio",
"profile.profile.changed": "Profile updated",
"profile.profile.save": "Save",
"profile.profile.social_links": "Social Links",
"profile.profile.website": "Website",
"profile.reset_password_mail_sent": "Reset password mail sent.",
"profile.security": "Security",
"profile.set_avatar": "Set Avatar",
@@ -57,6 +57,7 @@ export const TextArea = ({
isFocus && "!border-accent/80 ring-2",
"placeholder:text-text-tertiary dark:text-zinc-200",
"bg-theme-background dark:bg-zinc-700/[0.15]",
wrapperClassName,
)}
onMouseMove={handleMouseMove}
File diff suppressed because it is too large Load Diff