From 62d3ca64bb092d4bc9aa0cda1fbe52c5b5499523 Mon Sep 17 00:00:00 2001 From: mlogclub Date: Tue, 9 Jun 2026 19:50:41 +0800 Subject: [PATCH] Restructure docs navigation for channel and widget guides --- docs | 2 +- .../dashboard/users/_components/create.tsx | 31 +++++++++-------- web/app/dashboard/users/_components/edit.tsx | 34 +++++++++++-------- web/components/image-input.tsx | 5 +-- web/messages/en-US.json | 8 ++--- web/messages/zh-CN.json | 8 ++--- 6 files changed, 48 insertions(+), 40 deletions(-) diff --git a/docs b/docs index 751a56b..b99f885 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 751a56bdfd6a2af74983df00570f29c29d567973 +Subproject commit b99f88541a2a4a3b927d6bcc31f662df3dab59fc diff --git a/web/app/dashboard/users/_components/create.tsx b/web/app/dashboard/users/_components/create.tsx index f5e23e8..76cf721 100644 --- a/web/app/dashboard/users/_components/create.tsx +++ b/web/app/dashboard/users/_components/create.tsx @@ -15,6 +15,7 @@ import { useAppLocale, useI18n } from "@/i18n/provider" import { Status } from "@/lib/generated/enums" import { getRoleDisplayName } from "@/lib/role-i18n" import { cn } from "@/lib/utils" +import { ImageInput } from "@/components/image-input" import { Badge } from "@/components/ui/badge" import { Button } from "@/components/ui/button" import { Checkbox } from "@/components/ui/checkbox" @@ -119,13 +120,7 @@ function CreateUserDrawerBody({ z.object({ username: z.string().trim().min(1, t("user.usernameRequired")), nickname: z.string().trim(), - avatar: z - .string() - .trim() - .refine( - (value) => value.length === 0 || /^https?:\/\/\S+$/i.test(value), - t("user.avatarInvalid") - ), + avatar: z.string().trim(), mobile: z .string() .trim() @@ -233,14 +228,22 @@ function CreateUserDrawerBody({ - - {t("user.avatar")} + + {t("user.avatar")} - ( + + )} /> diff --git a/web/app/dashboard/users/_components/edit.tsx b/web/app/dashboard/users/_components/edit.tsx index 367d8b0..6d631ee 100644 --- a/web/app/dashboard/users/_components/edit.tsx +++ b/web/app/dashboard/users/_components/edit.tsx @@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from "react" import { zodResolver } from "@hookform/resolvers/zod" -import { Resolver, useForm } from "react-hook-form" +import { Controller, Resolver, useForm } from "react-hook-form" import { z } from "zod/v4" import { @@ -11,6 +11,7 @@ import { fetchUserDetail, } from "@/lib/api/admin" import { useI18n } from "@/i18n/provider" +import { ImageInput } from "@/components/image-input" import { Button } from "@/components/ui/button" import { Drawer, @@ -121,13 +122,7 @@ function UserEditDrawerBody({ () => z.object({ nickname: z.string().trim().min(1, t("user.nicknameRequired")), - avatar: z - .string() - .trim() - .refine( - (value) => value.length === 0 || /^https?:\/\/\S+$/i.test(value), - t("user.avatarInvalid") - ), + avatar: z.string().trim(), mobile: z .string() .trim() @@ -155,6 +150,7 @@ function UserEditDrawerBody({ defaultValues: emptyForm, }) const { + control, handleSubmit, reset, register, @@ -220,14 +216,22 @@ function UserEditDrawerBody({ - - {t("user.avatar")} + + {t("user.avatar")} - ( + + )} /> diff --git a/web/components/image-input.tsx b/web/components/image-input.tsx index 9575db9..6b736ed 100644 --- a/web/components/image-input.tsx +++ b/web/components/image-input.tsx @@ -81,7 +81,7 @@ export function ImageInput({ const isDisabled = disabled || uploading return ( -
+
{ diff --git a/web/messages/en-US.json b/web/messages/en-US.json index a6e35e6..52bdada 100644 --- a/web/messages/en-US.json +++ b/web/messages/en-US.json @@ -926,7 +926,7 @@ "emptyRows": "No matching users", "nicknameRequired": "Enter a nickname.", "usernameRequired": "Enter a username.", - "avatarInvalid": "Avatar URL must start with http or https.", + "avatarInvalid": "Invalid avatar.", "mobileInvalid": "Enter a valid phone number.", "emailInvalid": "Enter a valid email address.", "editTitle": "Edit User", @@ -934,8 +934,8 @@ "loading": "Loading...", "nickname": "Nickname", "nicknamePlaceholder": "Enter nickname", - "avatar": "Avatar URL", - "avatarPlaceholder": "Enter avatar URL", + "avatar": "Avatar", + "avatarPlaceholder": "Upload avatar", "mobile": "Mobile", "mobilePlaceholder": "Enter mobile number", "email": "Email", @@ -948,7 +948,7 @@ "username": "Username", "usernamePlaceholder": "Login name, required", "nicknameCreatePlaceholder": "Optional, defaults to username", - "avatarCreatePlaceholder": "Optional, http(s) URL", + "avatarCreatePlaceholder": "Upload avatar", "optional": "Optional", "remark": "Notes", "rolesOptional": "Roles (optional)", diff --git a/web/messages/zh-CN.json b/web/messages/zh-CN.json index 9b8ea39..615ed08 100644 --- a/web/messages/zh-CN.json +++ b/web/messages/zh-CN.json @@ -926,7 +926,7 @@ "emptyRows": "没有匹配的用户数据", "nicknameRequired": "昵称不能为空", "usernameRequired": "用户名不能为空", - "avatarInvalid": "头像地址必须是 http 或 https 链接", + "avatarInvalid": "头像不合法", "mobileInvalid": "手机号格式不正确", "emailInvalid": "邮箱格式不正确", "editTitle": "修改用户", @@ -934,8 +934,8 @@ "loading": "加载中...", "nickname": "昵称", "nicknamePlaceholder": "请输入昵称", - "avatar": "头像地址", - "avatarPlaceholder": "请输入头像 URL", + "avatar": "头像", + "avatarPlaceholder": "上传头像", "mobile": "手机号", "mobilePlaceholder": "请输入手机号", "email": "邮箱", @@ -948,7 +948,7 @@ "username": "用户名", "usernamePlaceholder": "登录名，必填", "nicknameCreatePlaceholder": "可选，默认同用户名", - "avatarCreatePlaceholder": "可选，http(s) 链接", + "avatarCreatePlaceholder": "上传头像", "optional": "可选", "remark": "备注", "rolesOptional": "角色（可选）",