HI-VPN/hi-frontend
4
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases Wiki Activity

🔀 merge: main into develop

Browse Source
This commit is contained in:
web-ppanel
2026-01-27 18:16:34 +00:00
parent 6dd743bbf4 ed5c56fb2a
commit 830c18c9e4
61 changed files with 1330 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/admin/public/assets/locales/en-US/components.json
+3 -1
View File
@@ -44,6 +44,8 @@
"60003": "An existing subscription is detected. Please cancel it before proceeding.",
"60004": "Unable to delete at the moment as the subscription has active users.",
"60005": "Single subscription mode has exceeded user limit",
"60006": "User quota limit has been reached, unable to continue.",
"60007": "Insufficient inventory, please try again later or contact the administrator.",
"70001": "Incorrect verification code, please re-enter.",
"80001": "Task was not successfully queued, please try again later.",
"90001": "Please disable DEBUG mode and try again.",
@@ -61,5 +63,5 @@
"system": "System",
"toggle": "Toggle theme"
},
"unlimited": "unlimited"
"unlimited": "Unlimited"
}
apps/admin/public/assets/locales/en-US/product.json
+3
View File
@@ -30,6 +30,7 @@
"discountPercent": "Discount Percentage",
"Hour": "Hour",
"inventory": "Subscription Limit",
"unlimitedInventory": "Unlimited (enter -1)",
"language": "Language",
"languageDescription": "Leave empty for default without language restriction",
"languagePlaceholder": "Language identifier for the subscription, e.g., en-US, zh-CN",
@@ -56,6 +57,8 @@
"resetOn1st": "Reset on the 1st",
"selectResetCycle": "Please select a reset cycle",
"selectUnitTime": "Please select a unit of time",
"showOriginalPrice": "Show Original Price",
"showOriginalPriceDescription": "When enabled, the subscription card will display both the original price and the discounted price to help users understand the discount amount",
"speedLimit": "Speed Limit ",
"traffic": "Traffic",
"unitPrice": "Unit Price",
apps/admin/public/assets/locales/en-US/tool.json
+2 -2
View File
@@ -13,9 +13,9 @@
"systemServices": "System Services",
"update": "Update",
"updateFailed": "Update failed",
"updateServerDescription": "Are you sure you want to update the server version from V{{current}} to V{{latest}}?",
"updateServerDescription": "Are you sure you want to update the server version from {{current}} to {{latest}}?",
"updateSuccess": "Update completed successfully",
"updateWebDescription": "Are you sure you want to update the web version from V{{current}} to V{{latest}}?",
"updateWebDescription": "Are you sure you want to update the web version from {{current}} to {{latest}}?",
"userUpdateSuccess": "User updated successfully",
"webVersion": "Web Version"
}
apps/admin/public/assets/locales/en-US/user.json
+22
View File
@@ -25,9 +25,11 @@
"createSuccess": "Created successfully",
"createUser": "Create User",
"delete": "Delete",
"deleted": "Deleted",
"deleteDescription": "This action cannot be undone.",
"deleteSubscriptionDescription": "This action cannot be undone.",
"deleteSuccess": "Deleted successfully",
"isDeleted": "Status",
"deviceLimit": "Device Limit",
"download": "Download",
"downloadTraffic": "Download Traffic",
@@ -51,6 +53,7 @@
"loginStatus": "Login Status",
"manager": "Administrator",
"more": "More",
"normal": "Normal",
"notifySettingsTitle": "Notify Settings",
"offline": "Offline",
"online": "Online",
@@ -80,6 +83,25 @@
"toggleSubscriptionStatus": "Toggle Status",
"toggleSubscriptionStatusDescription": "This will toggle the subscription status.",
"resetTime": "Reset Time",
"resetToken": "Reset Subscription Address",
"resetTokenDescription": "This will reset the subscription address and regenerate a new token.",
"resetTokenSuccess": "Subscription address reset successfully",
"confirmResetToken": "Confirm Reset Subscription Address",
"stopSubscribe": "Stop Subscription",
"stopSubscribeDescription": "This will stop the subscription temporarily. User will not be able to use it.",
"stopSubscribeSuccess": "Subscription stopped successfully",
"confirmStopSubscribe": "Confirm Stop Subscription",
"resumeSubscribe": "Resume Subscription",
"resumeSubscribeDescription": "This will resume the subscription and allow the user to use it.",
"resumeSubscribeSuccess": "Subscription resumed successfully",
"confirmResumeSubscribe": "Confirm Resume Subscription",
"status": "Status",
"statusPending": "Pending",
"statusActive": "Active",
"statusFinished": "Finished",
"statusExpired": "Expired",
"statusDeducted": "Deducted",
"statusStopped": "Stopped",
"save": "Save",
"speedLimit": "Speed Limit",
"startTime": "startTime",
apps/admin/public/assets/locales/zh-CN/components.json
+2
View File
@@ -44,6 +44,8 @@
"60003": "检测到现有订阅，请先取消后再继续。",
"60004": "由于订阅有活跃用户，暂时无法删除。",
"60005": "单一订阅模式已超过用户限制",
"60006": "用户配额已达到限制，无法继续操作。",
"60007": "库存不足，请稍后再试或联系管理员。",
"70001": "验证码不正确，请重新输入。",
"80001": "任务未成功加入队列，请稍后再试。",
"90001": "请禁用 DEBUG 模式后再试。",
apps/admin/public/assets/locales/zh-CN/product.json
+3
View File
@@ -30,6 +30,7 @@
"discountPercent": "折扣百分比",
"Hour": "小时",
"inventory": "订阅库存",
"unlimitedInventory": "无限制（输入 -1）",
"language": "语言",
"languageDescription": "留空为默认无语言限制",
"languagePlaceholder": "订阅的语言标识符，例如 en-US、zh-CN",
@@ -56,6 +57,8 @@
"resetOn1st": "每月1日重置",
"selectResetCycle": "请选择重置周期",
"selectUnitTime": "请选择时间单位",
"showOriginalPrice": "显示原价",
"showOriginalPriceDescription": "开启后，在订阅卡片上将会显示原价和折后价，帮助用户了解优惠幅度",
"speedLimit": "速度限制",
"traffic": "流量",
"unitPrice": "单价",
apps/admin/public/assets/locales/zh-CN/tool.json
+2 -2
View File
@@ -13,9 +13,9 @@
"systemServices": "系统服务",
"update": "更新",
"updateFailed": "更新失败",
"updateServerDescription": "确定要将服务器版本从 V{{current}} 更新到 V{{latest}} 吗？",
"updateServerDescription": "确定要将服务器版本从 {{current}} 更新到 {{latest}} 吗？",
"updateSuccess": "更新成功",
"updateWebDescription": "确定要将前端版本从 V{{current}} 更新到 V{{latest}} 吗？",
"updateWebDescription": "确定要将前端版本从 {{current}} 更新到 {{latest}} 吗？",
"userUpdateSuccess": "用户端更新成功",
"webVersion": "前端版本"
}
apps/admin/public/assets/locales/zh-CN/user.json
+22
View File
@@ -25,9 +25,11 @@
"createSuccess": "创建成功",
"createUser": "创建用户",
"delete": "删除",
"deleted": "已删除",
"deleteDescription": "此操作无法撤销。",
"deleteSubscriptionDescription": "此操作无法撤销。",
"deleteSuccess": "删除成功",
"isDeleted": "状态",
"deviceLimit": "IP限制",
"download": "下载",
"downloadTraffic": "下载流量",
@@ -51,6 +53,7 @@
"loginStatus": "登录状态",
"manager": "管理员",
"more": "更多",
"normal": "正常",
"notifySettingsTitle": "通知设置",
"offline": "离线",
"online": "在线",
@@ -80,6 +83,25 @@
"toggleSubscriptionStatus": "切换状态",
"toggleSubscriptionStatusDescription": "将切换该订阅的启用/停用状态。",
"resetTime": "重置时间",
"resetToken": "重置订阅地址",
"resetTokenDescription": "这将重置订阅地址并重新生成新的令牌。",
"resetTokenSuccess": "订阅地址重置成功",
"confirmResetToken": "确认重置订阅地址",
"stopSubscribe": "暂停订阅",
"stopSubscribeDescription": "这将暂时停止订阅。用户将无法使用。",
"stopSubscribeSuccess": "订阅已暂停",
"confirmStopSubscribe": "确认暂停订阅",
"resumeSubscribe": "恢复订阅",
"resumeSubscribeDescription": "这将恢复订阅，允许用户继续使用。",
"resumeSubscribeSuccess": "订阅已恢复",
"confirmResumeSubscribe": "确认恢复订阅",
"status": "状态",
"statusPending": "待处理",
"statusActive": "活跃",
"statusFinished": "已完成",
"statusExpired": "已过期",
"statusDeducted": "已扣除",
"statusStopped": "已停止",
"save": "保存",
"speedLimit": "速度限制",
"startTime": "开始时间",
apps/admin/src/components/display.tsx
+2 -2
View File
@@ -28,7 +28,7 @@ export function Display<T extends number | undefined | null>({
if (
["traffic", "trafficSpeed", "number"].includes(type) &&
unlimited &&
!value
(value === 0 || value === null || value === undefined)
) {
return t("unlimited");
}
@@ -42,7 +42,7 @@ export function Display<T extends number | undefined | null>({
}
if (type === "number") {
return value ? value.toString() : "0";
return value !== null && value !== undefined ? value.toString() : "0";
}
return "0";
apps/admin/src/sections/auth-control/forms/email-settings-form.tsx
+4 -4
View File
@@ -538,7 +538,7 @@ export default function EmailSettingsForm() {
</FormLabel>
<FormControl>
<HTMLEditor
onBlur={field.onChange}
onChange={field.onChange}
placeholder={t(
"email.inputPlaceholder",
"Please enter"
@@ -642,7 +642,7 @@ export default function EmailSettingsForm() {
</FormLabel>
<FormControl>
<HTMLEditor
onBlur={field.onChange}
onChange={field.onChange}
placeholder={t(
"email.inputPlaceholder",
"Please enter"
@@ -713,7 +713,7 @@ export default function EmailSettingsForm() {
</FormLabel>
<FormControl>
<HTMLEditor
onBlur={field.onChange}
onChange={field.onChange}
placeholder={t(
"email.inputPlaceholder",
"Please enter"
@@ -795,7 +795,7 @@ export default function EmailSettingsForm() {
</FormLabel>
<FormControl>
<HTMLEditor
onBlur={field.onChange}
onChange={field.onChange}
placeholder={t(
"email.inputPlaceholder",
"Please enter"
apps/admin/src/sections/auth/email/register-form.tsx
+1 -1
View File
@@ -179,7 +179,7 @@ export default function RegisterForm({
/>
<SendCode
params={{
...form.getValues(),
email: form.watch("email"),
type: 1,
}}
type="email"
apps/admin/src/sections/auth/email/reset-form.tsx
+1 -1
View File
@@ -98,7 +98,7 @@ export default function ResetForm({
/>
<SendCode
params={{
...form.getValues(),
email: form.watch("email"),
type: 2,
}}
type="email"
apps/admin/src/sections/auth/index.tsx
+1 -1
View File
@@ -15,7 +15,7 @@ export default function Auth() {
const navigate = useNavigate();
useEffect(() => {
if (user) {
// navigate({ to: "/dashboard" });
navigate({ to: "/dashboard" });
}
}, [navigate, user]);
apps/admin/src/sections/dashboard/components/system-version-card.tsx
+102 -101
View File
@@ -69,7 +69,7 @@ export default function SystemVersionCard() {
queryFn: async () => {
const { data } = await basicCheckServiceVersion(
{
service_name: "admin",
service_name: "admin-web-with-api",
secret: moduleConfig!.secret,
},
{ skipErrorHandler: true }
@@ -105,13 +105,13 @@ export default function SystemVersionCard() {
setIsUpdatingWeb(true);
try {
await basicUpdateService({
service_name: "admin",
service_name: "admin-web-with-api",
secret: moduleConfig.secret,
});
toast.success(t("adminUpdateSuccess", "Admin updated successfully"));
await basicUpdateService({
service_name: "user",
service_name: "user-web-with-api",
secret: moduleConfig.secret,
});
toast.success(t("userUpdateSuccess", "User updated successfully"));
@@ -188,52 +188,52 @@ export default function SystemVersionCard() {
</div>
<div className="flex items-center space-x-2">
<Badge>V{packageJson.version}</Badge>
{hasWebNewVersion && webVersionInfo && (
<AlertDialog onOpenChange={setOpenUpdateWeb} open={openUpdateWeb}>
<AlertDialogTrigger asChild>
<Button
className="h-6 px-2 text-xs"
disabled={isUpdatingWeb}
size="sm"
variant="outline"
>
<Icon className="mr-1 h-3 w-3" icon="mdi:download" />
{t("update", "Update")} V{webVersionInfo.latest_version}
<AlertDialog onOpenChange={setOpenUpdateWeb} open={openUpdateWeb}>
<AlertDialogTrigger asChild>
<Button
className="h-6 px-2 text-xs"
disabled={!hasWebNewVersion || isUpdatingWeb}
size="sm"
variant="outline"
>
<Icon className="mr-1 h-3 w-3" icon="mdi:download" />
{hasWebNewVersion && webVersionInfo
? `${t("update", "Update")} ${webVersionInfo.latest_version}`
: t("update", "Update")}
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
{t("confirmUpdate", "Confirm Update")}
</AlertDialogTitle>
<AlertDialogDescription>
{webVersionInfo
? t(
"updateWebDescription",
"Are you sure you want to update the web version from {{current}} to {{latest}}?",
{
current: webVersionInfo.current_version,
latest: webVersionInfo.latest_version,
}
)
: t(
"updateDescription",
"Are you sure you want to update?"
)}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{t("cancel", "Cancel")}</AlertDialogCancel>
<Button disabled={isUpdatingWeb} onClick={handleUpdateWeb}>
{isUpdatingWeb && (
<Icon className="mr-2 animate-spin" icon="mdi:loading" />
)}
{t("confirmUpdate", "Confirm Update")}
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
{t("confirmUpdate", "Confirm Update")}
</AlertDialogTitle>
<AlertDialogDescription>
{t(
"updateWebDescription",
"Are you sure you want to update the web version from V{{current}} to V{{latest}}?",
{
current: packageJson.version,
latest: webVersionInfo.latest_version,
}
)}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>
{t("cancel", "Cancel")}
</AlertDialogCancel>
<Button disabled={isUpdatingWeb} onClick={handleUpdateWeb}>
{isUpdatingWeb && (
<Icon
className="mr-2 animate-spin"
icon="mdi:loading"
/>
)}
{t("confirmUpdate", "Confirm Update")}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
)}
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div>
</div>
@@ -251,62 +251,63 @@ export default function SystemVersionCard() {
serverVersionInfo?.current_version ||
"1.0.0"}
</Badge>
{hasServerNewVersion && serverVersionInfo && moduleConfig && (
<AlertDialog
onOpenChange={setOpenUpdateServer}
open={openUpdateServer}
>
<AlertDialogTrigger asChild>
<AlertDialog
onOpenChange={setOpenUpdateServer}
open={openUpdateServer}
>
<AlertDialogTrigger asChild>
<Button
className="h-6 px-2 text-xs"
disabled={!hasServerNewVersion || isUpdatingServer}
size="sm"
variant="outline"
>
<Icon className="mr-1 h-3 w-3" icon="mdi:download" />
{hasServerNewVersion && serverVersionInfo
? `${t("update", "Update")} ${serverVersionInfo.latest_version}`
: t("update", "Update")}
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
{t("confirmUpdate", "Confirm Update")}
</AlertDialogTitle>
<AlertDialogDescription>
{serverVersionInfo && moduleConfig
? t(
"updateServerDescription",
"Are you sure you want to update the server version from {{current}} to {{latest}}?",
{
current:
moduleConfig.service_version ||
serverVersionInfo.current_version,
latest: serverVersionInfo.latest_version,
}
)
: t(
"updateDescription",
"Are you sure you want to update?"
)}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{t("cancel", "Cancel")}</AlertDialogCancel>
<Button
className="h-6 px-2 text-xs"
disabled={isUpdatingServer}
size="sm"
variant="outline"
disabled={isUpdatingServer || !moduleConfig}
onClick={() =>
moduleConfig &&
updateServerMutation.mutate(moduleConfig.service_name)
}
>
<Icon className="mr-1 h-3 w-3" icon="mdi:download" />
{t("update", "Update")} V{serverVersionInfo.latest_version}
{isUpdatingServer && (
<Icon className="mr-2 animate-spin" icon="mdi:loading" />
)}
{t("confirmUpdate", "Confirm Update")}
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
{t("confirmUpdate", "Confirm Update")}
</AlertDialogTitle>
<AlertDialogDescription>
{t(
"updateServerDescription",
"Are you sure you want to update the server version from V{{current}} to V{{latest}}?",
{
current:
moduleConfig.service_version ||
serverVersionInfo.current_version,
latest: serverVersionInfo.latest_version,
}
)}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>
{t("cancel", "Cancel")}
</AlertDialogCancel>
<Button
disabled={isUpdatingServer}
onClick={() =>
updateServerMutation.mutate(moduleConfig.service_name)
}
>
{isUpdatingServer && (
<Icon
className="mr-2 animate-spin"
icon="mdi:loading"
/>
)}
{t("confirmUpdate", "Confirm Update")}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
)}
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div>
</div>
</CardContent>
apps/admin/src/sections/product/subscribe-form.tsx
+30 -4
View File
@@ -63,7 +63,7 @@ interface SubscribeFormProps<T> {
}
const defaultValues = {
inventory: 0,
inventory: -1,
speed_limit: 0,
device_limit: 0,
traffic: 0,
@@ -278,7 +278,7 @@ export default function SubscribeForm<T extends Record<string, any>>({
{trigger}
</Button>
</SheetTrigger>
<SheetContent className="w-[800px] max-w-full gap-0 md:max-w-screen-md">
<SheetContent className="w-[800px] max-w-full gap-0 md:max-w-3xl">
<SheetHeader>
<SheetTitle>{title}</SheetTitle>
</SheetHeader>
@@ -446,11 +446,10 @@ export default function SubscribeForm<T extends Record<string, any>>({
<FormLabel>{t("form.inventory")}</FormLabel>
<FormControl>
<EnhancedInput
min={0}
onValueChange={(value) => {
form.setValue(field.name, value);
}}
placeholder={t("form.noLimit")}
placeholder={t("form.unlimitedInventory")}
step={1}
type="number"
value={field.value}
@@ -901,6 +900,33 @@ export default function SubscribeForm<T extends Record<string, any>>({
</FormItem>
)}
/>
<FormField
control={form.control}
name="show_original_price"
render={({ field }) => (
<FormItem>
<div className="flex items-center justify-between">
<div className="space-y-0.5">
<FormLabel>
{t("form.showOriginalPrice")}
</FormLabel>
<FormDescription>
{t("form.showOriginalPriceDescription")}
</FormDescription>
</div>
<FormControl>
<Switch
checked={!!field.value}
onCheckedChange={(value) => {
form.setValue(field.name, value);
}}
/>
</FormControl>
</div>
<FormMessage />
</FormItem>
)}
/>
</div>
</TabsContent>
apps/admin/src/sections/product/subscribe-table.tsx
+8 -9
View File
@@ -208,15 +208,14 @@ export default function SubscribeTable() {
{
accessorKey: "inventory",
header: t("inventory"),
cell: ({ row }) => (
<Display
type="number"
unlimited
value={
row.getValue("inventory") === -1 ? 0 : row.getValue("inventory")
}
/>
),
cell: ({ row }) => {
const inventory = row.getValue("inventory") as number;
return inventory === -1 ? (
<Display type="number" unlimited value={0} />
) : (
<Display type="number" unlimited value={inventory} />
);
},
},
{
accessorKey: "quota",
apps/admin/src/sections/servers/server-form.tsx
+1 -1
View File
@@ -98,7 +98,7 @@ function DynamicField({
field.generate ? (
field.generate.functions &&
field.generate.functions.length > 0 ? (
<DropdownMenu>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button size="sm" type="button" variant="ghost">
<Icon className="h-4 w-4" icon="mdi:key" />
apps/admin/src/sections/user/index.tsx
+15 -6
View File
@@ -92,7 +92,7 @@ export default function User() {
<Button variant="destructive">{t("delete", "Delete")}</Button>
}
/>,
<DropdownMenu key="more">
<DropdownMenu key="more" modal={false}>
<DropdownMenuTrigger asChild>
<Button variant="outline">{t("more", "More")}</Button>
</DropdownMenuTrigger>
@@ -176,6 +176,18 @@ export default function User() {
accessorKey: "id",
header: "ID",
},
{
accessorKey: "deleted_at",
header: t("isDeleted", "Deleted"),
cell: ({ row }) => {
const deletedAt = row.getValue("deleted_at") as number | undefined;
return deletedAt ? (
<Badge variant="destructive">{t("deleted", "Deleted")}</Badge>
) : (
<Badge variant="outline">{t("normal", "Normal")}</Badge>
);
},
},
{
accessorKey: "auth_methods",
header: t("userName", "Username"),
@@ -371,16 +383,13 @@ function SubscriptionSheet({ userId }: { userId: number }) {
<SheetTrigger asChild>
<Button variant="secondary">{t("subscription", "Subscription")}</Button>
</SheetTrigger>
<SheetContent
className="w-[1000px] max-w-full md:max-w-screen-xl"
side="right"
>
<SheetContent className="w-[1000px] max-w-full md:max-w-7xl" side="right">
<SheetHeader>
<SheetTitle>
{t("subscriptionList", "Subscription List")} · ID: {userId}
</SheetTitle>
</SheetHeader>
<div className="mt-2">
<div className="mt-2 px-4">
<UserSubscription userId={userId} />
</div>
</SheetContent>
apps/admin/src/sections/user/user-subscription/index.tsx
+189 -106
View File
@@ -1,4 +1,5 @@
import { Link } from "@tanstack/react-router";
import { Badge } from "@workspace/ui/components/badge";
import { Button } from "@workspace/ui/components/button";
import {
DropdownMenu,
@@ -16,7 +17,6 @@ import {
deleteUserSubscribe,
getUserSubscribe,
resetUserSubscribeToken,
resetUserSubscribeTraffic,
toggleUserSubscribeStatus,
updateUserSubscribe,
} from "@workspace/ui/services/admin/user";
@@ -33,7 +33,6 @@ export default function UserSubscription({ userId }: { userId: number }) {
const { t } = useTranslation("user");
const [loading, setLoading] = useState(false);
const ref = useRef<ProTableActions>(null);
const { getUserSubscribe: getUserSubscribeUrls } = useGlobalStore();
return (
<ProTable<API.UserSubscribe, Record<string, unknown>>
@@ -59,100 +58,14 @@ export default function UserSubscription({ userId }: { userId: number }) {
title={t("editSubscription", "Edit Subscription")}
trigger={t("edit", "Edit")}
/>,
<Button
key="copy"
onClick={async () => {
await navigator.clipboard.writeText(
getUserSubscribeUrls(row.token)[0] || ""
);
toast.success(t("copySuccess", "Copied successfully"));
}}
variant="secondary"
>
{t("copySubscription", "Copy Subscription")}
</Button>,
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={t(
"resetSubscriptionTokenDescription",
"This will reset the subscription token. Old links will become invalid."
)}
key="reset-token"
onConfirm={async () => {
await resetUserSubscribeToken({ user_subscribe_id: row.id });
toast.success(t("resetSuccess", "Reset successfully"));
ref.current?.refresh();
}}
title={t("resetSubscriptionToken", "Reset Token")}
trigger={
<Button variant="outline">
{t("resetToken", "Reset Token")}
</Button>
}
<RowMoreActions
key="more"
refresh={() => ref.current?.refresh()}
row={row}
token={row.token}
userId={userId}
/>
/>,
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={t(
"resetSubscriptionTrafficDescription",
"This will reset the subscription traffic counters."
)}
key="reset-traffic"
onConfirm={async () => {
await resetUserSubscribeTraffic({ user_subscribe_id: row.id });
toast.success(t("resetSuccess", "Reset successfully"));
ref.current?.refresh();
}}
title={t("resetSubscriptionTraffic", "Reset Traffic")}
trigger={
<Button variant="outline">
{t("resetTraffic", "Reset Traffic")}
</Button>
}
/>,
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={t(
"toggleSubscriptionStatusDescription",
"This will toggle the subscription status."
)}
key="toggle-status"
onConfirm={async () => {
await toggleUserSubscribeStatus({ user_subscribe_id: row.id });
toast.success(t("updateSuccess", "Updated successfully"));
ref.current?.refresh();
}}
title={t("toggleSubscriptionStatus", "Toggle Status")}
trigger={
<Button variant="outline">
{t("toggleStatus", "Toggle Status")}
</Button>
}
/>,
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={t(
"deleteSubscriptionDescription",
"This action cannot be undone."
)}
key="delete"
onConfirm={async () => {
await deleteUserSubscribe({ user_subscribe_id: row.id });
toast.success(t("deleteSuccess", "Deleted successfully"));
ref.current?.refresh();
}}
title={t("confirmDelete", "Confirm Delete")}
trigger={
<Button variant="destructive">{t("delete", "Delete")}</Button>
}
/>,
<RowMoreActions key="more" subId={row.id} userId={userId} />,
],
}}
columns={[
@@ -165,6 +78,51 @@ export default function UserSubscription({ userId }: { userId: number }) {
header: t("subscriptionName", "Subscription Name"),
cell: ({ row }) => row.original.subscribe.name,
},
{
accessorKey: "status",
header: t("status", "Status"),
cell: ({ row }) => {
const status = row.getValue("status") as number;
const expireTime = row.original.expire_time;
// 如果过期时间为0，说明是永久订阅，应该显示为激活状态
const displayStatus = status === 3 && expireTime === 0 ? 1 : status;
const statusMap: Record<
number,
{
label: string;
variant: "default" | "secondary" | "destructive" | "outline";
}
> = {
0: { label: t("statusPending", "Pending"), variant: "outline" },
1: { label: t("statusActive", "Active"), variant: "default" },
2: {
label: t("statusFinished", "Finished"),
variant: "secondary",
},
3: {
label: t("statusExpired", "Expired"),
variant: "destructive",
},
4: {
label: t("statusDeducted", "Deducted"),
variant: "secondary",
},
5: {
label: t("statusStopped", "Stopped"),
variant: "destructive",
},
};
const statusInfo = statusMap[displayStatus] || {
label: "Unknown",
variant: "outline",
};
return (
<Badge variant={statusInfo.variant}>{statusInfo.label}</Badge>
);
},
},
{
accessorKey: "upload",
header: t("upload", "Upload"),
@@ -216,10 +174,12 @@ export default function UserSubscription({ userId }: { userId: number }) {
{
accessorKey: "expire_time",
header: t("expireTime", "Expire Time"),
cell: ({ row }) =>
row.getValue("expire_time")
? formatDate(row.getValue("expire_time"))
: t("permanent", "Permanent"),
cell: ({ row }) => {
const expireTime = row.getValue("expire_time") as number;
return expireTime && expireTime !== 0
? formatDate(expireTime)
: t("permanent", "Permanent");
},
},
{
accessorKey: "created_at",
@@ -263,19 +223,72 @@ export default function UserSubscription({ userId }: { userId: number }) {
);
}
function RowMoreActions({ userId, subId }: { userId: number; subId: number }) {
function RowMoreActions({
userId,
row,
token,
refresh,
}: {
userId: number;
row: API.UserSubscribe;
token: string;
refresh: () => void;
}) {
const triggerRef = useRef<HTMLButtonElement>(null);
const resetTokenRef = useRef<HTMLButtonElement>(null);
const toggleStatusRef = useRef<HTMLButtonElement>(null);
const deleteRef = useRef<HTMLButtonElement>(null);
const { t } = useTranslation("user");
const { getUserSubscribe: getUserSubscribeUrls } = useGlobalStore();
return (
<div className="inline-flex">
<DropdownMenu>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button variant="outline">{t("more", "More")}</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem
onSelect={async (e) => {
e.preventDefault();
await navigator.clipboard.writeText(
getUserSubscribeUrls(row.short, token)[0] || ""
);
toast.success(t("copySuccess", "Copied successfully"));
}}
>
{t("copySubscription", "Copy Subscription")}
</DropdownMenuItem>
<DropdownMenuItem
onSelect={(e) => {
e.preventDefault();
resetTokenRef.current?.click();
}}
>
{t("resetToken", "Reset Subscription Address")}
</DropdownMenuItem>
<DropdownMenuItem
onSelect={(e) => {
e.preventDefault();
toggleStatusRef.current?.click();
}}
>
{row.status === 5
? t("resumeSubscribe", "Resume Subscription")
: t("stopSubscribe", "Stop Subscription")}
</DropdownMenuItem>
<DropdownMenuItem
className="text-destructive"
onSelect={(e) => {
e.preventDefault();
deleteRef.current?.click();
}}
>
{t("delete", "Delete")}
</DropdownMenuItem>
<DropdownMenuItem asChild>
<Link
search={{ user_id: userId, user_subscribe_id: subId }}
search={{ user_id: userId, user_subscribe_id: row.id }}
to="/dashboard/log/subscribe"
>
{t("subscriptionLogs", "Subscription Logs")}
@@ -283,7 +296,7 @@ function RowMoreActions({ userId, subId }: { userId: number; subId: number }) {
</DropdownMenuItem>
<DropdownMenuItem asChild>
<Link
search={{ user_id: userId, user_subscribe_id: subId }}
search={{ user_id: userId, user_subscribe_id: row.id }}
to="/dashboard/log/reset-subscribe"
>
{t("resetLogs", "Reset Logs")}
@@ -291,7 +304,7 @@ function RowMoreActions({ userId, subId }: { userId: number; subId: number }) {
</DropdownMenuItem>
<DropdownMenuItem asChild>
<Link
search={{ user_id: userId, user_subscribe_id: subId }}
search={{ user_id: userId, user_subscribe_id: row.id }}
to="/dashboard/log/subscribe-traffic"
>
{t("trafficStats", "Traffic Stats")}
@@ -299,7 +312,7 @@ function RowMoreActions({ userId, subId }: { userId: number; subId: number }) {
</DropdownMenuItem>
<DropdownMenuItem asChild>
<Link
search={{ user_id: userId, subscribe_id: subId }}
search={{ user_id: userId, subscribe_id: row.id }}
to="/dashboard/log/traffic-details"
>
{t("trafficDetails", "Traffic Details")}
@@ -316,8 +329,78 @@ function RowMoreActions({ userId, subId }: { userId: number; subId: number }) {
</DropdownMenuContent>
</DropdownMenu>
{/* Hidden triggers for confirm dialogs */}
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={t(
"resetTokenDescription",
"This will reset the subscription address and regenerate a new token."
)}
onConfirm={async () => {
await resetUserSubscribeToken({
user_subscribe_id: row.id,
});
toast.success(
t("resetTokenSuccess", "Subscription address reset successfully")
);
refresh();
}}
title={t("confirmResetToken", "Confirm Reset Subscription Address")}
trigger={<Button className="hidden" ref={resetTokenRef} />}
/>
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={
row.status === 5
? t(
"resumeSubscribeDescription",
"This will resume the subscription and allow the user to use it."
)
: t(
"stopSubscribeDescription",
"This will stop the subscription temporarily. User will not be able to use it."
)
}
onConfirm={async () => {
await toggleUserSubscribeStatus({
user_subscribe_id: row.id,
});
toast.success(
row.status === 5
? t("resumeSubscribeSuccess", "Subscription resumed successfully")
: t("stopSubscribeSuccess", "Subscription stopped successfully")
);
refresh();
}}
title={
row.status === 5
? t("confirmResumeSubscribe", "Confirm Resume Subscription")
: t("confirmStopSubscribe", "Confirm Stop Subscription")
}
trigger={<Button className="hidden" ref={toggleStatusRef} />}
/>
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={t(
"deleteSubscriptionDescription",
"This action cannot be undone."
)}
onConfirm={async () => {
await deleteUserSubscribe({ user_subscribe_id: row.id });
toast.success(t("deleteSuccess", "Deleted successfully"));
refresh();
}}
title={t("confirmDelete", "Confirm Delete")}
trigger={<Button className="hidden" ref={deleteRef} />}
/>
<SubscriptionDetail
subscriptionId={subId}
subscriptionId={row.id}
trigger={<Button className="hidden" ref={triggerRef} />}
userId={userId}
/>
apps/admin/src/sections/user/user-subscription/subscription-form.tsx
+142 -138
View File
@@ -95,145 +95,149 @@ export function SubscriptionForm({
<SheetHeader>
<SheetTitle>{title}</SheetTitle>
</SheetHeader>
<ScrollArea className="h-[calc(100dvh-48px-36px-36px-env(safe-area-inset-top))]">
<Form {...form}>
<form
className="mt-4 space-y-4"
onSubmit={form.handleSubmit(handleSubmit)}
>
<FormField
control={form.control}
name="subscribe_id"
render={({ field }) => (
<FormItem>
<FormLabel>{t("subscription", "Subscription")}</FormLabel>
<FormControl>
<Combobox<number, false>
onChange={(value) => {
form.setValue(field.name, value);
}}
options={subscribes?.map((item) => ({
value: item.id!,
label: item.name!,
}))}
placeholder="Select Subscription"
value={field.value}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="traffic"
render={({ field }) => (
<FormItem>
<FormLabel>{t("trafficLimit", "Traffic Limit")}</FormLabel>
<FormControl>
<EnhancedInput
placeholder={t("unlimited", "Unlimited")}
type="number"
{...field}
formatInput={(value) =>
unitConversion("bytesToGb", value)
}
formatOutput={(value) =>
unitConversion("gbToBytes", value)
}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
suffix="GB"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="upload"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("uploadTraffic", "Upload Traffic")}
</FormLabel>
<FormControl>
<EnhancedInput
placeholder="0"
type="number"
{...field}
formatInput={(value) =>
unitConversion("bytesToGb", value)
}
formatOutput={(value) =>
unitConversion("gbToBytes", value)
}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
suffix="GB"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="download"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("downloadTraffic", "Download Traffic")}
</FormLabel>
<FormControl>
<EnhancedInput
placeholder="0"
type="number"
{...field}
formatInput={(value) =>
unitConversion("bytesToGb", value)
}
formatOutput={(value) =>
unitConversion("gbToBytes", value)
}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
suffix="GB"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="expired_at"
render={({ field }) => (
<FormItem>
<FormLabel>{t("expiredAt", "Expired At")}</FormLabel>
<FormControl>
<DatePicker
onChange={(value: number | null | undefined) => {
if (value === field.value) {
form.setValue(field.name, 0);
} else {
form.setValue(field.name, value!);
<ScrollArea className="h-[calc(100dvh-48px-36px-36px-env(safe-area-inset-top))] px-4">
<div className="pr-4">
<Form {...form}>
<form
className="mt-4 space-y-4"
onSubmit={form.handleSubmit(handleSubmit)}
>
<FormField
control={form.control}
name="subscribe_id"
render={({ field }) => (
<FormItem>
<FormLabel>{t("subscription", "Subscription")}</FormLabel>
<FormControl>
<Combobox<number, false>
onChange={(value) => {
form.setValue(field.name, value);
}}
options={subscribes?.map((item) => ({
value: item.id!,
label: item.name!,
}))}
placeholder="Select Subscription"
value={field.value}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="traffic"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("trafficLimit", "Traffic Limit")}
</FormLabel>
<FormControl>
<EnhancedInput
placeholder={t("unlimited", "Unlimited")}
type="number"
{...field}
formatInput={(value) =>
unitConversion("bytesToGb", value)
}
}}
placeholder={t("permanent", "Permanent")}
value={field.value ?? undefined}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</form>
</Form>
formatOutput={(value) =>
unitConversion("gbToBytes", value)
}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
suffix="GB"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="upload"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("uploadTraffic", "Upload Traffic")}
</FormLabel>
<FormControl>
<EnhancedInput
placeholder="0"
type="number"
{...field}
formatInput={(value) =>
unitConversion("bytesToGb", value)
}
formatOutput={(value) =>
unitConversion("gbToBytes", value)
}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
suffix="GB"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="download"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("downloadTraffic", "Download Traffic")}
</FormLabel>
<FormControl>
<EnhancedInput
placeholder="0"
type="number"
{...field}
formatInput={(value) =>
unitConversion("bytesToGb", value)
}
formatOutput={(value) =>
unitConversion("gbToBytes", value)
}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
suffix="GB"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="expired_at"
render={({ field }) => (
<FormItem>
<FormLabel>{t("expiredAt", "Expired At")}</FormLabel>
<FormControl>
<DatePicker
onChange={(value: number | null | undefined) => {
form.setValue(field.name, value || 0);
}}
placeholder={t("permanent", "Permanent")}
value={
field.value && field.value > 0
? field.value
: undefined
}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</form>
</Form>
</div>
</ScrollArea>
<SheetFooter className="flex-row justify-end gap-2 pt-3">
<Button
apps/admin/src/stores/global.tsx
+7 -6
View File
@@ -8,7 +8,7 @@ export interface GlobalStore {
setCommon: (common: Partial<API.GetGlobalConfigResponse>) => void;
setUser: (user?: API.User) => void;
getUserInfo: () => Promise<void>;
getUserSubscribe: (uuid: string, type?: string) => string[];
getUserSubscribe: (short: string, token: string, type?: string) => string[];
getAppSubLink: (url: string, schema?: string) => string;
}
@@ -120,7 +120,7 @@ export const useGlobalStore = create<GlobalStore>((set, get) => ({
console.error("Failed to refresh user:", error);
}
},
getUserSubscribe: (uuid: string, type?: string) => {
getUserSubscribe: (short: string, token: string, type?: string) => {
const { pan_domain, subscribe_domain, subscribe_path } =
get().common.subscribe || {};
const domains = subscribe_domain
@@ -129,12 +129,13 @@ export const useGlobalStore = create<GlobalStore>((set, get) => ({
return domains.map((domain) => {
if (pan_domain) {
if (type) return `https://${uuid}.${type}.${domain}`;
return `https://${uuid}.${domain}`;
if (type)
return `https://${short}.${type}.${domain}${subscribe_path}?token=${token}&type=${type}`;
return `https://${short}.${domain}${subscribe_path}?token=${token}`;
}
if (type)
return `https://${domain}${subscribe_path}?token=${uuid}&type=${type}`;
return `https://${domain}${subscribe_path}?token=${uuid}`;
return `https://${domain}${subscribe_path}?token=${token}&type=${type}`;
return `https://${domain}${subscribe_path}?token=${token}`;
});
},
getAppSubLink: (url: string, schema?: string) => {
apps/admin/vite.config.ts
+32 -29
View File
@@ -4,7 +4,7 @@ import tailwindcss from "@tailwindcss/vite";
import { devtools } from "@tanstack/devtools-vite";
import { tanstackRouter } from "@tanstack/router-plugin/vite";
import viteReact from "@vitejs/plugin-react";
import { defineConfig, type Plugin } from "vite";
import { defineConfig, loadEnv, type Plugin } from "vite";
// Plugin to generate version.lock file after build
function versionLockPlugin(): Plugin {
@@ -24,34 +24,37 @@ function versionLockPlugin(): Plugin {
}
// https://vitejs.dev/config/
export default defineConfig({
base: "./",
plugins: [
devtools({ eventBusConfig: { port: 42_070 } }),
tanstackRouter({
target: "react",
autoCodeSplitting: true,
}),
viteReact(),
tailwindcss(),
versionLockPlugin(),
],
resolve: {
alias: {
"@": fileURLToPath(new URL("./src", import.meta.url)),
},
},
server: {
proxy: {
"/api": {
target: "https://api.ppanel.dev",
changeOrigin: true,
secure: false,
rewrite: (path) => path.replace(/^\/api/, ""),
export default defineConfig(({ mode }) => {
const env = loadEnv(mode, process.cwd(), "");
return {
base: "./",
plugins: [
devtools({ eventBusConfig: { port: 42_070 } }),
tanstackRouter({
target: "react",
autoCodeSplitting: true,
}),
viteReact(),
tailwindcss(),
versionLockPlugin(),
],
resolve: {
alias: {
"@": fileURLToPath(new URL("./src", import.meta.url)),
},
},
},
build: {
assetsDir: "static",
},
server: {
proxy: {
"/api": {
target: env.VITE_API_BASE_URL || "https://api.ppanel.dev",
changeOrigin: true,
secure: false,
},
},
},
build: {
assetsDir: "static",
},
};
});
apps/user/public/assets/locales/en-US/components.json
+2
View File
@@ -44,6 +44,8 @@
"60003": "An existing subscription is detected. Please cancel it before proceeding.",
"60004": "Unable to delete at the moment as the subscription has active users.",
"60005": "Single subscription mode has exceeded user limit",
"60006": "User quota limit has been reached, unable to continue.",
"60007": "Insufficient inventory, please try again later or contact the administrator.",
"70001": "Incorrect verification code, please re-enter.",
"80001": "Task was not successfully queued, please try again later.",
"90001": "Please disable DEBUG mode and try again.",
apps/user/public/assets/locales/en-US/subscribe.json
+1
View File
@@ -6,6 +6,7 @@
"duration": "Duration",
"fee": "Fee",
"gift": "gift Deduction",
"originalPrice": "Original Price (Monthly)",
"price": "Price",
"productDiscount": "Product Discount",
"total": "Total"
apps/user/public/assets/locales/zh-CN/components.json
+2
View File
@@ -44,6 +44,8 @@
"60003": "检测到现有订阅，请先取消后再继续。",
"60004": "由于订阅有活跃用户，暂时无法删除。",
"60005": "单一订阅模式已超过用户限制",
"60006": "用户配额已达到限制，无法继续操作。",
"60007": "库存不足，请稍后再试或联系管理员。",
"70001": "验证码不正确，请重新输入。",
"80001": "任务未成功加入队列，请稍后再试。",
"90001": "请禁用 DEBUG 模式后再试。",
apps/user/public/assets/locales/zh-CN/subscribe.json
+1
View File
@@ -6,6 +6,7 @@
"duration": "套餐时长",
"fee": "手续费",
"gift": "赠金抵扣",
"originalPrice": "原价（按月）",
"price": "价格",
"productDiscount": "商品折扣",
"total": "总价"
apps/user/src/layout/user-nav.tsx
+1 -1
View File
@@ -33,7 +33,7 @@ export function UserNav() {
if (user) {
return (
<DropdownMenu>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<div className="flex cursor-pointer items-center gap-2 rounded-full border bg-background px-2 py-1.5 transition-colors duration-200 hover:bg-accent">
<Avatar className="h-6 w-6">
apps/user/src/sections/auth/email/register-form.tsx
+1 -1
View File
@@ -173,7 +173,7 @@ export default function RegisterForm({
/>
<SendCode
params={{
...form.getValues(),
email: form.watch("email"),
type: 1,
}}
type="email"
apps/user/src/sections/auth/email/reset-form.tsx
+1 -1
View File
@@ -98,7 +98,7 @@ export default function ResetForm({
/>
<SendCode
params={{
...form.getValues(),
email: form.watch("email"),
type: 2,
}}
type="email"
apps/user/src/sections/auth/phone/login-form.tsx
+4 -1
View File
@@ -127,7 +127,10 @@ export default function LoginForm({
{mode === "code" && (
<SendCode
params={{
...form.getValues(),
telephone: form.watch("telephone"),
telephone_area_code: form.watch(
"telephone_area_code"
),
type: 2,
}}
type="phone"
apps/user/src/sections/auth/phone/register-form.tsx
+4 -1
View File
@@ -182,7 +182,10 @@ export default function RegisterForm({
<SendCode
params={{
...form.getValues(),
telephone: form.watch("telephone"),
telephone_area_code: form.watch(
"telephone_area_code"
),
type: 1,
}}
type="phone"
apps/user/src/sections/auth/phone/reset-form.tsx
+2 -1
View File
@@ -124,7 +124,8 @@ export default function ResetForm({
/>
<SendCode
params={{
...form.getValues(),
telephone: form.watch("telephone"),
telephone_area_code: form.watch("telephone_area_code"),
type: 2,
}}
type="phone"
apps/user/src/sections/main/product-showcase/content.tsx
+38 -13
View File
@@ -142,19 +142,44 @@ export function Content({ subscriptionData }: ProductShowcaseProps) {
</CardContent>
<Separator />
<CardFooter className="relative flex flex-col gap-4 p-4">
<motion.h2
animate={{ opacity: 1 }}
className="pb-4 font-semibold text-2xl sm:text-3xl"
initial={{ opacity: 0 }}
transition={{ duration: 0.5, delay: 0.2 }}
>
<Display type="currency" value={item.unit_price} />
<span className="font-medium text-base">
/
{unitTimeMap[item.unit_time!] ||
t(item.unit_time || "Month", item.unit_time || "Month")}
</span>
</motion.h2>
{(() => {
const hasDiscount = item.discount && item.discount.length > 0;
const shouldShowOriginal = item.show_original_price !== false;
const displayPrice =
shouldShowOriginal || !hasDiscount
? item.unit_price
: Math.round(
item.unit_price *
(item.discount?.[0]?.quantity ?? 1) *
((item.discount?.[0]?.discount ?? 100) / 100)
);
const displayQuantity =
shouldShowOriginal || !hasDiscount
? 1
: (item.discount?.[0]?.quantity ?? 1);
const unitTime =
unitTimeMap[item.unit_time!] ||
t(item.unit_time || "Month", item.unit_time || "Month");
return (
<motion.h2
animate={{ opacity: 1 }}
className="pb-4 font-semibold text-2xl sm:text-3xl"
initial={{ opacity: 0 }}
transition={{ duration: 0.5, delay: 0.2 }}
>
<Display type="currency" value={displayPrice} />
<span className="font-medium text-base">
{displayQuantity === 1
? `/${unitTime}`
: `/${displayQuantity} ${unitTime}`}
</span>
</motion.h2>
);
})()}
<motion.div>
<Button
asChild
apps/user/src/sections/purchasing/content.tsx
+1
View File
@@ -282,6 +282,7 @@ export default function Content({
...order,
quantity: params.quantity,
unit_price: subscription?.unit_price,
show_original_price: subscription?.show_original_price,
}}
/>
</CardContent>
apps/user/src/sections/purchasing/order.tsx
+1
View File
@@ -178,6 +178,7 @@ export default function Order() {
order={{
...data,
unit_price: data?.subscribe?.unit_price,
show_original_price: data?.subscribe?.show_original_price,
}}
/>
</CardContent>
apps/user/src/sections/subscribe/billing.tsx
+14 -1
View File
@@ -10,6 +10,7 @@ interface SubscribeBillingProps {
unit_price: number;
unit_time: string;
subscribe_discount: number;
show_original_price?: boolean;
}
>;
}
@@ -33,7 +34,19 @@ export function SubscribeBilling({ order }: Readonly<SubscribeBillingProps>) {
{t(order?.unit_time || "Month", order?.unit_time || "Month")}
</span>
</li>
)}
)}{" "}
{order?.show_original_price !== false &&
order?.type &&
[1, 2].includes(order?.type) && (
<li>
<span className="text-muted-foreground">
{t("billing.originalPrice", "Original Price (Monthly)")}
</span>
<span>
<Display type="currency" value={order?.unit_price} />
</span>
</li>
)}{" "}
<li>
<span className="text-muted-foreground">
{t("billing.price", "Price")}
apps/user/src/sections/subscribe/duration-selector.tsx
+4 -2
View File
@@ -15,6 +15,7 @@ interface DurationSelectorProps {
unitTime?: string;
discounts?: Array<{ quantity: number; discount: number }>;
onChange: (value: number) => void;
showOriginalPrice?: boolean;
}
const DurationSelector: React.FC<DurationSelectorProps> = ({
@@ -22,6 +23,7 @@ const DurationSelector: React.FC<DurationSelectorProps> = ({
unitTime = "Month",
discounts = [],
onChange,
showOriginalPrice = true,
}) => {
const { t } = useTranslation("subscribe");
const handleChange = useCallback(
@@ -61,7 +63,7 @@ const DurationSelector: React.FC<DurationSelectorProps> = ({
onValueChange={handleChange}
value={String(quantity)}
>
{unitTime !== "Minute" && (
{showOriginalPrice && unitTime !== "Minute" && (
<DurationOption label={`1 / ${t(unitTime)}`} value="1" />
)}
{discounts?.map((item) => (
@@ -78,7 +80,7 @@ const DurationSelector: React.FC<DurationSelectorProps> = ({
</span>
{discountPercentage > 0 ? (
<Badge className="h-6 text-sm" variant="destructive">
-{discountPercentage}% {t("discount", "Discount")}
-{discountPercentage.toFixed(2)}% {t("discount", "Discount")}
</Badge>
) : (
<span className="h-6 text-muted-foreground text-sm">--</span>
apps/user/src/sections/subscribe/index.tsx
+33 -8
View File
@@ -122,14 +122,39 @@ export default function Subscribe() {
</CardContent>
<Separator />
<CardFooter className="flex flex-col gap-2">
<h2 className="pb-8 font-semibold text-2xl sm:text-3xl">
<Display type="currency" value={item.unit_price} />
<span className="font-medium text-base">
/
{unitTimeMap[item.unit_time!] ||
t(item.unit_time || "Month", item.unit_time || "Month")}
</span>
</h2>
{(() => {
const hasDiscount = item.discount && item.discount.length > 0;
const shouldShowOriginal = item.show_original_price !== false;
const displayPrice =
shouldShowOriginal || !hasDiscount
? item.unit_price
: Math.round(
item.unit_price *
(item.discount?.[0]?.quantity ?? 1) *
((item.discount?.[0]?.discount ?? 100) / 100)
);
const displayQuantity =
shouldShowOriginal || !hasDiscount
? 1
: (item.discount?.[0]?.quantity ?? 1);
const unitTime =
unitTimeMap[item.unit_time!] ||
t(item.unit_time || "Month", item.unit_time || "Month");
return (
<h2 className="pb-8 font-semibold text-2xl sm:text-3xl">
<Display type="currency" value={displayPrice} />
<span className="font-medium text-base">
{displayQuantity === 1
? `/${unitTime}`
: `/${displayQuantity} ${unitTime}`}
</span>
</h2>
);
})()}
<Button
className="absolute bottom-0 w-full rounded-t-none rounded-b-xl"
onClick={() => {
apps/user/src/sections/subscribe/purchase.tsx
+14 -2
View File
@@ -45,7 +45,13 @@ export default function Purchase({
const { data: order } = useQuery({
enabled: !!subscribe?.id,
queryKey: ["preCreateOrder", params],
queryKey: [
"preCreateOrder",
subscribe?.id,
params.quantity,
params.payment,
params.coupon,
],
queryFn: async () => {
try {
const { data } = await preCreateOrder({
@@ -68,9 +74,13 @@ export default function Purchase({
useEffect(() => {
if (subscribe) {
const defaultQuantity =
subscribe.show_original_price === false && subscribe.discount?.[0]
? subscribe.discount[0].quantity
: 1;
setParams((prev) => ({
...prev,
quantity: 1,
quantity: defaultQuantity,
subscribe_id: subscribe?.id,
}));
}
@@ -127,6 +137,7 @@ export default function Purchase({
...order,
quantity: params.quantity,
unit_price: subscribe?.unit_price,
show_original_price: subscribe?.show_original_price,
}}
/>
</CardContent>
@@ -139,6 +150,7 @@ export default function Purchase({
handleChange("quantity", value);
}}
quantity={params.quantity as number}
showOriginalPrice={subscribe?.show_original_price}
unitTime={subscribe?.unit_time}
/>
<CouponInput
apps/user/src/sections/subscribe/renewal.tsx
+14 -2
View File
@@ -44,7 +44,13 @@ export default function Renewal({ id, subscribe }: Readonly<RenewalProps>) {
const { data: order } = useQuery({
enabled: !!subscribe.id && open,
queryKey: ["preCreateOrder", params],
queryKey: [
"preCreateOrder",
subscribe.id,
params.quantity,
params.payment,
params.coupon,
],
queryFn: async () => {
try {
const { data } = await preCreateOrder({
@@ -66,9 +72,13 @@ export default function Renewal({ id, subscribe }: Readonly<RenewalProps>) {
useEffect(() => {
if (subscribe.id && id) {
const defaultQuantity =
subscribe.show_original_price === false && subscribe.discount?.[0]
? subscribe.discount[0].quantity
: 1;
setParams((prev) => ({
...prev,
quantity: 1,
quantity: defaultQuantity,
subscribe_id: subscribe.id,
user_subscribe_id: id,
}));
@@ -126,6 +136,7 @@ export default function Renewal({ id, subscribe }: Readonly<RenewalProps>) {
...order,
quantity: params.quantity,
unit_price: subscribe?.unit_price,
show_original_price: subscribe?.show_original_price,
}}
/>
</CardContent>
@@ -138,6 +149,7 @@ export default function Renewal({ id, subscribe }: Readonly<RenewalProps>) {
handleChange("quantity", value);
}}
quantity={params.quantity!}
showOriginalPrice={subscribe?.show_original_price}
unitTime={subscribe?.unit_time}
/>
<CouponInput
apps/user/src/sections/user/dashboard/content.tsx
+334 -317
View File
@@ -218,337 +218,354 @@ export default function Content() {
</Tabs>
)}
</div>
{userSubscribe.map((item) => (
<Card
className={cn("relative", {
"relative opacity-80 grayscale": item.status === 3,
"relative hidden opacity-60 blur-[0.3px] grayscale":
item.status === 4,
})}
key={item.id}
>
{item.status >= 2 && (
<div
className={cn(
"pointer-events-none absolute top-0 left-0 z-10 h-full w-full overflow-hidden mix-blend-difference brightness-150 contrast-200 invert-[0.2]",
{
"text-destructive": item.status === 2,
"text-white": item.status === 3 || item.status === 4,
}
)}
>
<div className="absolute inset-0">
{Array.from({ length: 16 }).map((_, i) => {
const row = Math.floor(i / 4);
const col = i % 4;
const top = 10 + row * 25 + (col % 2 === 0 ? 5 : -5);
const left = 5 + col * 30 + (row % 2 === 0 ? 0 : 10);
{userSubscribe.map((item) => {
// 如果过期时间为0，说明是永久订阅，不应该显示过期状态
const isActuallyExpired =
item.status === 3 && item.expire_time !== 0;
const shouldShowWatermark =
item.status === 2 || item.status === 4 || isActuallyExpired;
return (
<span
className="absolute rotate-[-30deg] whitespace-nowrap font-black text-lg opacity-40 shadow-[0px_0px_1px_rgba(255,255,255,0.5)]"
key={i}
style={{
top: `${top}%`,
left: `${left}%`,
}}
>
{
statusWatermarks[
item.status as keyof typeof statusWatermarks
]
}
</span>
);
})}
</div>
</div>
)}
<CardHeader className="flex flex-row flex-wrap items-center justify-between gap-2 space-y-0">
<CardTitle className="font-medium">
{item.subscribe.name}
<p className="mt-1 text-foreground/50 text-sm">
{formatDate(item.start_time)}
</p>
</CardTitle>
{item.status !== 4 && (
<div className="flex flex-wrap gap-2">
<AlertDialog>
<AlertDialogTrigger asChild>
<Button size="sm" variant="destructive">
{t("resetSubscription", "Reset Subscription")}
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
{t("prompt", "Prompt")}
</AlertDialogTitle>
<AlertDialogDescription>
{t(
"confirmResetSubscription",
"Are you sure you want to reset your subscription?"
)}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>
{t("cancel", "Cancel")}
</AlertDialogCancel>
<AlertDialogAction
onClick={async () => {
await resetUserSubscribeToken({
user_subscribe_id: item.id,
});
await refetch();
toast.success(t("resetSuccess", "Reset Success"));
return (
<Card
className={cn("relative", {
"relative opacity-80 grayscale": isActuallyExpired,
"relative hidden opacity-60 blur-[0.3px] grayscale":
item.status === 4,
})}
key={item.id}
>
{shouldShowWatermark && (
<div
className={cn(
"pointer-events-none absolute top-0 left-0 z-10 h-full w-full overflow-hidden mix-blend-difference brightness-150 contrast-200 invert-[0.2]",
{
"text-destructive": item.status === 2,
"text-white": isActuallyExpired || item.status === 4,
}
)}
>
<div className="absolute inset-0">
{Array.from({ length: 16 }).map((_, i) => {
const row = Math.floor(i / 4);
const col = i % 4;
const top = 10 + row * 25 + (col % 2 === 0 ? 5 : -5);
const left = 5 + col * 30 + (row % 2 === 0 ? 0 : 10);
return (
<span
className="absolute rotate-[-30deg] whitespace-nowrap font-black text-lg opacity-40 shadow-[0px_0px_1px_rgba(255,255,255,0.5)]"
key={i}
style={{
top: `${top}%`,
left: `${left}%`,
}}
>
{t("confirm", "Confirm")}
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
<ResetTraffic
id={item.id}
replacement={item.subscribe.replacement}
/>
{item.expire_time !== 0 && (
<Renewal id={item.id} subscribe={item.subscribe} />
)}
<Unsubscribe
allowDeduction={item.subscribe.allow_deduction}
id={item.id}
onSuccess={refetch}
/>
{
statusWatermarks[
item.status as keyof typeof statusWatermarks
]
}
</span>
);
})}
</div>
</div>
)}
</CardHeader>
<CardContent>
<ul className="grid grid-cols-2 gap-3 *:flex *:flex-col *:justify-between lg:grid-cols-4">
<li>
<span className="text-muted-foreground">
{t("used", "Used")}
</span>
<span className="font-bold text-2xl">
<Display
type="traffic"
unlimited={!item.traffic}
value={item.upload + item.download}
/>
</span>
</li>
<li>
<span className="text-muted-foreground">
{t("totalTraffic", "Total Traffic")}
</span>
<span className="font-bold text-2xl">
<Display
type="traffic"
unlimited={!item.traffic}
value={item.traffic}
/>
</span>
</li>
<li>
<span className="text-muted-foreground">
{t("nextResetDays", "Next Reset Days")}
</span>
<span className="font-semibold text-2xl">
{item.reset_time
? differenceInDays(
new Date(item.reset_time),
new Date()
)
: t("noReset", "No Reset")}
</span>
</li>
<li>
<span className="text-muted-foreground">
{t("expirationDays", "Expiration Days")}
</span>
<span className="font-semibold text-2xl">
{}
{item.expire_time
? differenceInDays(
new Date(item.expire_time),
new Date()
) || t("unknown", "Unknown")
: t("noLimit", "No Limit")}
</span>
</li>
</ul>
<Separator className="mt-4" />
<Accordion
className="w-full"
collapsible
defaultValue="0"
type="single"
>
{getUserSubscribe(item.token, protocol)?.map((url, index) => (
<AccordionItem key={url} value={String(index)}>
<AccordionTrigger className="hover:no-underline">
<div className="flex w-full flex-row items-center justify-between">
<CardTitle className="font-medium text-sm">
{t("subscriptionUrl", "Subscription URL")}{" "}
{index + 1}
</CardTitle>
<CopyToClipboard
onCopy={(_, result) => {
if (result) {
toast.success(t("copySuccess", "Copy Success"));
}
}}
text={url}
>
<span
className="mr-4 flex cursor-pointer rounded p-2 text-primary text-sm hover:bg-accent"
onClick={(e) => e.stopPropagation()}
<CardHeader className="flex flex-row flex-wrap items-center justify-between gap-2 space-y-0">
<CardTitle className="font-medium">
{item.subscribe.name}
<p className="mt-1 text-foreground/50 text-sm">
{formatDate(item.start_time)}
</p>
</CardTitle>
{item.status !== 4 && (
<div className="flex flex-wrap gap-2">
<AlertDialog>
<AlertDialogTrigger asChild>
<Button size="sm" variant="destructive">
{t("resetSubscription", "Reset Subscription")}
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
{t("prompt", "Prompt")}
</AlertDialogTitle>
<AlertDialogDescription>
{t(
"confirmResetSubscription",
"Are you sure you want to reset your subscription?"
)}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>
{t("cancel", "Cancel")}
</AlertDialogCancel>
<AlertDialogAction
onClick={async () => {
await resetUserSubscribeToken({
user_subscribe_id: item.id,
});
await refetch();
toast.success(
t("resetSuccess", "Reset Success")
);
}}
>
<Icon className="mr-2 size-5" icon="uil:copy" />
{t("copy", "Copy")}
</span>
</CopyToClipboard>
</div>
</AccordionTrigger>
<AccordionContent>
<div className="grid grid-cols-2 gap-4 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-6">
{applications
?.filter(
(application) =>
!!(
application.download_link?.[platform] &&
application.scheme
)
{t("confirm", "Confirm")}
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
<ResetTraffic
id={item.id}
replacement={item.subscribe.replacement}
/>
{item.expire_time !== 0 && (
<Renewal id={item.id} subscribe={item.subscribe} />
)}
<Unsubscribe
allowDeduction={item.subscribe.allow_deduction}
id={item.id}
onSuccess={refetch}
/>
</div>
)}
</CardHeader>
<CardContent>
<ul className="grid grid-cols-2 gap-3 *:flex *:flex-col *:justify-between lg:grid-cols-4">
<li>
<span className="text-muted-foreground">
{t("used", "Used")}
</span>
<span className="font-bold text-2xl">
<Display
type="traffic"
unlimited={!item.traffic}
value={item.upload + item.download}
/>
</span>
</li>
<li>
<span className="text-muted-foreground">
{t("totalTraffic", "Total Traffic")}
</span>
<span className="font-bold text-2xl">
<Display
type="traffic"
unlimited={!item.traffic}
value={item.traffic}
/>
</span>
</li>
<li>
<span className="text-muted-foreground">
{t("nextResetDays", "Next Reset Days")}
</span>
<span className="font-semibold text-2xl">
{item.reset_time
? differenceInDays(
new Date(item.reset_time),
new Date()
)
.map((application) => {
const downloadUrl =
application.download_link?.[platform];
: t("noReset", "No Reset")}
</span>
</li>
<li>
<span className="text-muted-foreground">
{t("expirationDays", "Expiration Days")}
</span>
<span className="font-semibold text-2xl">
{}
{item.expire_time
? differenceInDays(
new Date(item.expire_time),
new Date()
) || t("unknown", "Unknown")
: t("noLimit", "No Limit")}
</span>
</li>
</ul>
<Separator className="mt-4" />
<Accordion
className="w-full"
collapsible
defaultValue="0"
type="single"
>
{getUserSubscribe(item.short, item.token, protocol)?.map(
(url, index) => (
<AccordionItem key={url} value={String(index)}>
<AccordionTrigger className="hover:no-underline">
<div className="flex w-full flex-row items-center justify-between">
<CardTitle className="font-medium text-sm">
{t("subscriptionUrl", "Subscription URL")}{" "}
{index + 1}
</CardTitle>
const handleCopy = (
_: string,
result: boolean
) => {
if (result) {
const href = getAppSubLink(
url,
application.scheme
);
const showSuccessMessage = () => {
<CopyToClipboard
onCopy={(_, result) => {
if (result) {
toast.success(
<>
<p>
{t("copySuccess", "Copy Success")}
</p>
<br />
<p>
{t(
"manualImportMessage",
"Please import manually"
)}
</p>
</>
t("copySuccess", "Copy Success")
);
}
}}
text={url}
>
<span
className="mr-4 flex cursor-pointer rounded p-2 text-primary text-sm hover:bg-accent"
onClick={(e) => e.stopPropagation()}
>
<Icon
className="mr-2 size-5"
icon="uil:copy"
/>
{t("copy", "Copy")}
</span>
</CopyToClipboard>
</div>
</AccordionTrigger>
<AccordionContent>
<div className="grid grid-cols-2 gap-4 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-6">
{applications
?.filter(
(application) =>
!!(
application.download_link?.[platform] &&
application.scheme
)
)
.map((application) => {
const downloadUrl =
application.download_link?.[platform];
const handleCopy = (
_: string,
result: boolean
) => {
if (result) {
const href = getAppSubLink(
url,
application.scheme
);
const showSuccessMessage = () => {
toast.success(
<>
<p>
{t("copySuccess", "Copy Success")}
</p>
<br />
<p>
{t(
"manualImportMessage",
"Please import manually"
)}
</p>
</>
);
};
if (isBrowser() && href) {
window.location.href = href;
const checkRedirect = setTimeout(() => {
if (window.location.href !== href) {
showSuccessMessage();
}
clearTimeout(checkRedirect);
}, 1000);
return;
}
showSuccessMessage();
}
};
if (isBrowser() && href) {
window.location.href = href;
const checkRedirect = setTimeout(() => {
if (window.location.href !== href) {
showSuccessMessage();
}
clearTimeout(checkRedirect);
}, 1000);
return;
}
return (
<div
className="flex size-full flex-col items-center justify-between gap-2 text-muted-foreground text-xs"
key={application.name}
>
<span>{application.name}</span>
showSuccessMessage();
}
};
return (
<div
className="flex size-full flex-col items-center justify-between gap-2 text-muted-foreground text-xs"
key={application.name}
>
<span>{application.name}</span>
{application.icon && (
<img
alt={application.name}
className="p-1"
height={64}
src={application.icon}
width={64}
/>
)}
<div className="flex">
{downloadUrl && (
<Button
asChild
className={
application.scheme
? "rounded-r-none px-1.5"
: "px-1.5"
}
size="sm"
variant="secondary"
>
<a
href={downloadUrl}
rel="noopener noreferrer"
target="_blank"
>
{t("download", "Download")}
</a>
</Button>
)}
{application.scheme && (
<CopyToClipboard
onCopy={handleCopy}
text={getAppSubLink(
url,
application.scheme
{application.icon && (
<img
alt={application.name}
className="p-1"
height={64}
src={application.icon}
width={64}
/>
)}
<div className="flex">
{downloadUrl && (
<Button
asChild
className={
application.scheme
? "rounded-r-none px-1.5"
: "px-1.5"
}
size="sm"
variant="secondary"
>
<a
href={downloadUrl}
rel="noopener noreferrer"
target="_blank"
>
{t("download", "Download")}
</a>
</Button>
)}
>
<Button
className={
downloadUrl
? "rounded-l-none p-2"
: "p-2"
}
size="sm"
>
{t("import", "Import")}
</Button>
</CopyToClipboard>
)}
</div>
</div>
);
})}
<div className="hidden size-full flex-col items-center justify-between gap-2 text-muted-foreground text-sm lg:flex">
<span>{t("qrCode", "QR Code")}</span>
<QRCodeCanvas
bgColor="transparent"
fgColor="rgb(59, 130, 246)"
size={80}
value={url}
/>
<span className="text-center">
{t("scanToSubscribe", "Scan to Subscribe")}
</span>
</div>
</div>
</AccordionContent>
</AccordionItem>
))}
</Accordion>
</CardContent>
</Card>
))}
{application.scheme && (
<CopyToClipboard
onCopy={handleCopy}
text={getAppSubLink(
url,
application.scheme
)}
>
<Button
className={
downloadUrl
? "rounded-l-none p-2"
: "p-2"
}
size="sm"
>
{t("import", "Import")}
</Button>
</CopyToClipboard>
)}
</div>
</div>
);
})}
<div className="hidden size-full flex-col items-center justify-between gap-2 text-muted-foreground text-sm lg:flex">
<span>{t("qrCode", "QR Code")}</span>
<QRCodeCanvas
bgColor="transparent"
fgColor="rgb(59, 130, 246)"
size={80}
value={url}
/>
<span className="text-center">
{t("scanToSubscribe", "Scan to Subscribe")}
</span>
</div>
</div>
</AccordionContent>
</AccordionItem>
)
)}
</Accordion>
</CardContent>
</Card>
);
})}
</>
) : (
<>
apps/user/src/sections/user/payment/index.tsx
+1
View File
@@ -164,6 +164,7 @@ export default function Page() {
order={{
...data,
unit_price: data?.subscribe?.unit_price,
show_original_price: data?.subscribe?.show_original_price,
}}
/>
</CardContent>
apps/user/src/sections/user/profile/third-party-accounts.tsx
+2 -2
View File
@@ -147,8 +147,8 @@ function MobileBindDialog({
/>
<SendCode
params={{
telephone_area_code: form.getValues().area_code,
telephone: form.getValues().mobile,
telephone_area_code: form.watch("area_code"),
telephone: form.watch("mobile"),
type: 1,
}}
type="phone"
apps/user/src/stores/global.tsx
+7 -6
View File
@@ -8,7 +8,7 @@ export interface GlobalStore {
setCommon: (common: Partial<API.GetGlobalConfigResponse>) => void;
setUser: (user?: API.User) => void;
getUserInfo: () => Promise<void>;
getUserSubscribe: (uuid: string, type?: string) => string[];
getUserSubscribe: (short: string, token: string, type?: string) => string[];
getAppSubLink: (url: string, schema?: string) => string;
}
@@ -120,7 +120,7 @@ export const useGlobalStore = create<GlobalStore>((set, get) => ({
console.error("Failed to refresh user:", error);
}
},
getUserSubscribe: (uuid: string, type?: string) => {
getUserSubscribe: (short: string, token: string, type?: string) => {
const { pan_domain, subscribe_domain, subscribe_path } =
get().common.subscribe || {};
const domains = subscribe_domain
@@ -129,12 +129,13 @@ export const useGlobalStore = create<GlobalStore>((set, get) => ({
return domains.map((domain) => {
if (pan_domain) {
if (type) return `https://${uuid}.${type}.${domain}`;
return `https://${uuid}.${domain}`;
if (type)
return `https://${short}.${type}.${domain}${subscribe_path}?token=${token}&type=${type}`;
return `https://${short}.${domain}${subscribe_path}?token=${token}`;
}
if (type)
return `https://${domain}${subscribe_path}?token=${uuid}&type=${type}`;
return `https://${domain}${subscribe_path}?token=${uuid}`;
return `https://${domain}${subscribe_path}?token=${token}&type=${type}`;
return `https://${domain}${subscribe_path}?token=${token}`;
});
},
getAppSubLink: (url: string, schema?: string) => {
apps/user/vite.config.ts
+32 -28
View File
@@ -4,7 +4,7 @@ import tailwindcss from "@tailwindcss/vite";
import { devtools } from "@tanstack/devtools-vite";
import { tanstackRouter } from "@tanstack/router-plugin/vite";
import viteReact from "@vitejs/plugin-react";
import { defineConfig, type Plugin } from "vite";
import { defineConfig, loadEnv, type Plugin } from "vite";
// Plugin to generate version.lock file after build
function versionLockPlugin(): Plugin {
@@ -24,33 +24,37 @@ function versionLockPlugin(): Plugin {
}
// https://vitejs.dev/config/
export default defineConfig({
base: "./",
plugins: [
devtools({ eventBusConfig: { port: 42_069 } }),
tanstackRouter({
target: "react",
autoCodeSplitting: true,
}),
viteReact(),
tailwindcss(),
versionLockPlugin(),
],
resolve: {
alias: {
"@": fileURLToPath(new URL("./src", import.meta.url)),
},
},
server: {
proxy: {
"/api": {
target: "https://api.ppanel.dev",
changeOrigin: true,
secure: false,
export default defineConfig(({ mode }) => {
const env = loadEnv(mode, process.cwd(), "");
return {
base: "./",
plugins: [
devtools({ eventBusConfig: { port: 42_069 } }),
tanstackRouter({
target: "react",
autoCodeSplitting: true,
}),
viteReact(),
tailwindcss(),
versionLockPlugin(),
],
resolve: {
alias: {
"@": fileURLToPath(new URL("./src", import.meta.url)),
},
},
},
build: {
assetsDir: "static",
},
server: {
proxy: {
"/api": {
target: env.VITE_API_BASE_URL || "https://api.ppanel.dev",
changeOrigin: true,
secure: false,
},
},
},
build: {
assetsDir: "static",
},
};
});