Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bb0a811432 | |||
| 8445e302e6 | |||
| 2bff15fd13 | |||
| 0345b7cced | |||
| 7a4ebdf985 | |||
| 05a61d8bf2 | |||
| 0a07d2578e | |||
| ee05a73834 | |||
| 13dce0c20b | |||
| 41f06bfe54 | |||
| 0cadd83e45 |
@@ -1,6 +1,31 @@
|
|||||||
<a name="readme-top"></a>
|
<a name="readme-top"></a>
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.4.7](https://github.com/perfect-panel/ppanel-web/compare/v1.4.6...v1.4.7) (2025-09-23)
|
||||||
|
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
* Add unique key to ProTable for improved rendering with user ID filters ([2bff15f](https://github.com/perfect-panel/ppanel-web/commit/2bff15f))
|
||||||
|
* Adjust layout spacing and chart aspect ratio in ServerConfig component ([05a61d8](https://github.com/perfect-panel/ppanel-web/commit/05a61d8))
|
||||||
|
* Refactor server ID cell rendering for improved readability and consistency ([0345b7c](https://github.com/perfect-panel/ppanel-web/commit/0345b7c))
|
||||||
|
* Update announcement page to format creation date and enhance content display ([8445e30](https://github.com/perfect-panel/ppanel-web/commit/8445e30))
|
||||||
|
* Update OnlineUsersCell to display user count with icon instead of badge ([7a4ebdf](https://github.com/perfect-panel/ppanel-web/commit/7a4ebdf))
|
||||||
|
* Update subscribe name fallback to return '--' instead of 'Unknown' ([0a07d25](https://github.com/perfect-panel/ppanel-web/commit/0a07d25))
|
||||||
|
|
||||||
|
## [1.4.6](https://github.com/perfect-panel/ppanel-web/compare/v1.4.5...v1.4.6) (2025-09-17)
|
||||||
|
|
||||||
|
|
||||||
|
### 🎫 Chores
|
||||||
|
|
||||||
|
* Merge branch 'main' into develop ([41f06bf](https://github.com/perfect-panel/ppanel-web/commit/41f06bf))
|
||||||
|
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
* Add loaded state to node, server, and subscribe stores for better loading management ([13dce0c](https://github.com/perfect-panel/ppanel-web/commit/13dce0c))
|
||||||
|
* Removed node metadata fields in subscription schema to simplify structure ([0cadd83](https://github.com/perfect-panel/ppanel-web/commit/0cadd83))
|
||||||
|
|
||||||
## [1.4.5](https://github.com/perfect-panel/ppanel-web/compare/v1.4.4...v1.4.5) (2025-09-17)
|
## [1.4.5](https://github.com/perfect-panel/ppanel-web/compare/v1.4.4...v1.4.5) (2025-09-17)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -88,24 +88,20 @@ export default function NodesPage() {
|
|||||||
{
|
{
|
||||||
id: 'address_port',
|
id: 'address_port',
|
||||||
header: `${t('address')}:${t('port')}`,
|
header: `${t('address')}:${t('port')}`,
|
||||||
cell: ({ row }) => (row.original.address || '—') + ':' + (row.original.port ?? '—'),
|
cell: ({ row }) => `${row.original.address || '—'}:${row.original.port || '—'}`,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
id: 'server_id',
|
id: 'server_id',
|
||||||
header: t('server'),
|
header: t('server'),
|
||||||
cell: ({ row }) => (
|
cell: ({ row }) =>
|
||||||
<div className='space-y-1'>
|
`${getServerName(row.original.server_id)}:${getServerAddress(row.original.server_id)}`,
|
||||||
<Badge variant='outline'>
|
},
|
||||||
{getServerName(row.original.server_id)} : {getServerAddress(row.original.server_id)}
|
{
|
||||||
</Badge>
|
id: 'server_id',
|
||||||
<br />
|
header: ` ${t('protocol')}:${t('port')}`,
|
||||||
<Badge variant='outline'>
|
cell: ({ row }) =>
|
||||||
{row.original.protocol || '—'} :{' '}
|
`${row.original.protocol}:${getProtocolPort(row.original.server_id, row.original.protocol)}`,
|
||||||
{getProtocolPort(row.original.server_id, row.original.protocol)}
|
|
||||||
</Badge>
|
|
||||||
</div>
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
accessorKey: 'tags',
|
accessorKey: 'tags',
|
||||||
|
|||||||
@@ -58,6 +58,9 @@ export default function Page() {
|
|||||||
accessorKey: 'subscribe_id',
|
accessorKey: 'subscribe_id',
|
||||||
header: t('subscribe'),
|
header: t('subscribe'),
|
||||||
cell: ({ row }) => {
|
cell: ({ row }) => {
|
||||||
|
if (row.original.type === 4) {
|
||||||
|
return t(`type.${row.getValue('type')}`);
|
||||||
|
}
|
||||||
const name = getSubscribeName(row.getValue('subscribe_id'));
|
const name = getSubscribeName(row.getValue('subscribe_id'));
|
||||||
const quantity = row.original.quantity;
|
const quantity = row.original.quantity;
|
||||||
return name ? `${name} × ${quantity}` : '';
|
return name ? `${name} × ${quantity}` : '';
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import {
|
|||||||
SheetTrigger,
|
SheetTrigger,
|
||||||
} from '@workspace/ui/components/sheet';
|
} from '@workspace/ui/components/sheet';
|
||||||
import { formatBytes } from '@workspace/ui/utils';
|
import { formatBytes } from '@workspace/ui/utils';
|
||||||
|
import { Users } from 'lucide-react';
|
||||||
import { useTranslations } from 'next-intl';
|
import { useTranslations } from 'next-intl';
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
|
|
||||||
@@ -92,8 +93,7 @@ export default function OnlineUsersCell({ status }: { status?: API.ServerStatus
|
|||||||
<Sheet open={open} onOpenChange={setOpen}>
|
<Sheet open={open} onOpenChange={setOpen}>
|
||||||
<SheetTrigger asChild>
|
<SheetTrigger asChild>
|
||||||
<button className='hover:text-foreground text-muted-foreground flex items-center gap-2 bg-transparent p-0 text-sm'>
|
<button className='hover:text-foreground text-muted-foreground flex items-center gap-2 bg-transparent p-0 text-sm'>
|
||||||
<Badge variant='secondary'>{status?.online.length}</Badge>
|
<Users className='h-4 w-4' /> {status?.online.length}
|
||||||
<span>{t('onlineUsers')}</span>
|
|
||||||
</button>
|
</button>
|
||||||
</SheetTrigger>
|
</SheetTrigger>
|
||||||
<SheetContent className='h-screen w-screen max-w-none sm:h-auto sm:w-[900px] sm:max-w-[90vw]'>
|
<SheetContent className='h-screen w-screen max-w-none sm:h-auto sm:w-[900px] sm:max-w-[90vw]'>
|
||||||
|
|||||||
@@ -293,7 +293,7 @@ export default function ServerConfig() {
|
|||||||
{t('config.dynamicMultiplierDescription')}
|
{t('config.dynamicMultiplierDescription')}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div className='flex flex-col-reverse gap-8 md:flex-row md:items-start'>
|
<div className='flex flex-col-reverse gap-2 md:flex-row md:items-start'>
|
||||||
<div className='w-full md:w-1/2'>
|
<div className='w-full md:w-1/2'>
|
||||||
<ArrayInput<API.TimePeriod>
|
<ArrayInput<API.TimePeriod>
|
||||||
fields={[
|
fields={[
|
||||||
@@ -324,10 +324,7 @@ export default function ServerConfig() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className='w-full md:w-1/2'>
|
<div className='w-full md:w-1/2'>
|
||||||
<ChartContainer
|
<ChartContainer config={chartConfig} className='mx-auto aspect-[5/3] w-full'>
|
||||||
config={chartConfig}
|
|
||||||
className='mx-auto aspect-[4/3] max-w-[400px]'
|
|
||||||
>
|
|
||||||
<PieChart>
|
<PieChart>
|
||||||
<Pie
|
<Pie
|
||||||
data={chartTimeSlots}
|
data={chartTimeSlots}
|
||||||
|
|||||||
@@ -189,19 +189,6 @@ export const subscribeSchema = {
|
|||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
description: 'Whether this protocol is enabled',
|
description: 'Whether this protocol is enabled',
|
||||||
},
|
},
|
||||||
// Node metadata
|
|
||||||
Country: {
|
|
||||||
type: 'string',
|
|
||||||
description: 'Node country',
|
|
||||||
},
|
|
||||||
City: {
|
|
||||||
type: 'string',
|
|
||||||
description: 'Node city',
|
|
||||||
},
|
|
||||||
Ratio: {
|
|
||||||
type: 'number',
|
|
||||||
description: 'Traffic ratio multiplier',
|
|
||||||
},
|
|
||||||
// UUID for vmess/vless
|
// UUID for vmess/vless
|
||||||
UUID: {
|
UUID: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ export default function Page() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<ProTable<API.User, API.GetUserListParams>
|
<ProTable<API.User, API.GetUserListParams>
|
||||||
|
key={initialFilters.user_id}
|
||||||
action={ref}
|
action={ref}
|
||||||
initialFilters={initialFilters}
|
initialFilters={initialFilters}
|
||||||
header={{
|
header={{
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ interface NodeState {
|
|||||||
// Loading states
|
// Loading states
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
loadingTags: boolean;
|
loadingTags: boolean;
|
||||||
|
loaded: boolean;
|
||||||
|
loadedTags: boolean;
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchNodes: () => Promise<void>;
|
fetchNodes: () => Promise<void>;
|
||||||
@@ -30,6 +32,8 @@ export const useNodeStore = create<NodeState>((set, get) => ({
|
|||||||
tags: [],
|
tags: [],
|
||||||
loading: false,
|
loading: false,
|
||||||
loadingTags: false,
|
loadingTags: false,
|
||||||
|
loaded: false,
|
||||||
|
loadedTags: false,
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchNodes: async () => {
|
fetchNodes: async () => {
|
||||||
@@ -38,9 +42,13 @@ export const useNodeStore = create<NodeState>((set, get) => ({
|
|||||||
set({ loading: true });
|
set({ loading: true });
|
||||||
try {
|
try {
|
||||||
const { data } = await filterNodeList({ page: 1, size: 999999999 });
|
const { data } = await filterNodeList({ page: 1, size: 999999999 });
|
||||||
set({ nodes: data?.data?.list || [] });
|
set({
|
||||||
|
nodes: data?.data?.list || [],
|
||||||
|
loaded: true,
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Handle error silently
|
// Handle error silently
|
||||||
|
set({ loaded: true });
|
||||||
} finally {
|
} finally {
|
||||||
set({ loading: false });
|
set({ loading: false });
|
||||||
}
|
}
|
||||||
@@ -52,9 +60,13 @@ export const useNodeStore = create<NodeState>((set, get) => ({
|
|||||||
set({ loadingTags: true });
|
set({ loadingTags: true });
|
||||||
try {
|
try {
|
||||||
const { data } = await queryNodeTag();
|
const { data } = await queryNodeTag();
|
||||||
set({ tags: data?.data?.tags || [] });
|
set({
|
||||||
|
tags: data?.data?.tags || [],
|
||||||
|
loadedTags: true,
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Handle error silently
|
// Handle error silently
|
||||||
|
set({ loadedTags: true });
|
||||||
} finally {
|
} finally {
|
||||||
set({ loadingTags: false });
|
set({ loadingTags: false });
|
||||||
}
|
}
|
||||||
@@ -104,10 +116,10 @@ export const useNode = () => {
|
|||||||
const store = useNodeStore();
|
const store = useNodeStore();
|
||||||
|
|
||||||
// Auto-fetch nodes and tags
|
// Auto-fetch nodes and tags
|
||||||
if (store.nodes.length === 0 && !store.loading) {
|
if (!store.loaded && !store.loading) {
|
||||||
store.fetchNodes();
|
store.fetchNodes();
|
||||||
}
|
}
|
||||||
if (store.tags.length === 0 && !store.loadingTags) {
|
if (!store.loadedTags && !store.loadingTags) {
|
||||||
store.fetchTags();
|
store.fetchTags();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -116,6 +128,8 @@ export const useNode = () => {
|
|||||||
tags: store.tags,
|
tags: store.tags,
|
||||||
loading: store.loading,
|
loading: store.loading,
|
||||||
loadingTags: store.loadingTags,
|
loadingTags: store.loadingTags,
|
||||||
|
loaded: store.loaded,
|
||||||
|
loadedTags: store.loadedTags,
|
||||||
fetchNodes: store.fetchNodes,
|
fetchNodes: store.fetchNodes,
|
||||||
fetchTags: store.fetchTags,
|
fetchTags: store.fetchTags,
|
||||||
getNodeById: store.getNodeById,
|
getNodeById: store.getNodeById,
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ interface ServerState {
|
|||||||
|
|
||||||
// Loading states
|
// Loading states
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
|
loaded: boolean;
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchServers: () => Promise<void>;
|
fetchServers: () => Promise<void>;
|
||||||
@@ -24,6 +25,7 @@ export const useServerStore = create<ServerState>((set, get) => ({
|
|||||||
// Initial state
|
// Initial state
|
||||||
servers: [],
|
servers: [],
|
||||||
loading: false,
|
loading: false,
|
||||||
|
loaded: false,
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchServers: async () => {
|
fetchServers: async () => {
|
||||||
@@ -32,9 +34,13 @@ export const useServerStore = create<ServerState>((set, get) => ({
|
|||||||
set({ loading: true });
|
set({ loading: true });
|
||||||
try {
|
try {
|
||||||
const { data } = await filterServerList({ page: 1, size: 999999999 });
|
const { data } = await filterServerList({ page: 1, size: 999999999 });
|
||||||
set({ servers: data?.data?.list || [] });
|
set({
|
||||||
|
servers: data?.data?.list || [],
|
||||||
|
loaded: true,
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Handle error silently
|
// Handle error silently
|
||||||
|
set({ loaded: true });
|
||||||
} finally {
|
} finally {
|
||||||
set({ loading: false });
|
set({ loading: false });
|
||||||
}
|
}
|
||||||
@@ -84,13 +90,14 @@ export const useServer = () => {
|
|||||||
const store = useServerStore();
|
const store = useServerStore();
|
||||||
|
|
||||||
// Auto-fetch servers
|
// Auto-fetch servers
|
||||||
if (store.servers.length === 0 && !store.loading) {
|
if (!store.loaded && !store.loading) {
|
||||||
store.fetchServers();
|
store.fetchServers();
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
servers: store.servers,
|
servers: store.servers,
|
||||||
loading: store.loading,
|
loading: store.loading,
|
||||||
|
loaded: store.loaded,
|
||||||
fetchServers: store.fetchServers,
|
fetchServers: store.fetchServers,
|
||||||
getServerById: store.getServerById,
|
getServerById: store.getServerById,
|
||||||
getServerName: store.getServerName,
|
getServerName: store.getServerName,
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ interface SubscribeState {
|
|||||||
|
|
||||||
// Loading states
|
// Loading states
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
|
loaded: boolean;
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchSubscribes: () => Promise<void>;
|
fetchSubscribes: () => Promise<void>;
|
||||||
@@ -20,6 +21,7 @@ export const useSubscribeStore = create<SubscribeState>((set, get) => ({
|
|||||||
// Initial state
|
// Initial state
|
||||||
subscribes: [],
|
subscribes: [],
|
||||||
loading: false,
|
loading: false,
|
||||||
|
loaded: false,
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchSubscribes: async () => {
|
fetchSubscribes: async () => {
|
||||||
@@ -28,9 +30,13 @@ export const useSubscribeStore = create<SubscribeState>((set, get) => ({
|
|||||||
set({ loading: true });
|
set({ loading: true });
|
||||||
try {
|
try {
|
||||||
const { data } = await getSubscribeList({ page: 1, size: 999999999 });
|
const { data } = await getSubscribeList({ page: 1, size: 999999999 });
|
||||||
set({ subscribes: data?.data?.list || [] });
|
set({
|
||||||
|
subscribes: data?.data?.list || [],
|
||||||
|
loaded: true,
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Handle error silently
|
// Handle error silently
|
||||||
|
set({ loaded: true });
|
||||||
} finally {
|
} finally {
|
||||||
set({ loading: false });
|
set({ loading: false });
|
||||||
}
|
}
|
||||||
@@ -38,7 +44,7 @@ export const useSubscribeStore = create<SubscribeState>((set, get) => ({
|
|||||||
|
|
||||||
// Getters
|
// Getters
|
||||||
getSubscribeName: (subscribeId?: number) => {
|
getSubscribeName: (subscribeId?: number) => {
|
||||||
if (!subscribeId) return 'Unknown';
|
if (!subscribeId) return '--';
|
||||||
const subscribe = get().subscribes.find((s) => s.id === subscribeId);
|
const subscribe = get().subscribes.find((s) => s.id === subscribeId);
|
||||||
return subscribe?.name ?? `Subscribe ${subscribeId}`;
|
return subscribe?.name ?? `Subscribe ${subscribeId}`;
|
||||||
},
|
},
|
||||||
@@ -52,13 +58,14 @@ export const useSubscribe = () => {
|
|||||||
const store = useSubscribeStore();
|
const store = useSubscribeStore();
|
||||||
|
|
||||||
// Auto-fetch subscribes
|
// Auto-fetch subscribes
|
||||||
if (store.subscribes.length === 0 && !store.loading) {
|
if (!store.loaded && !store.loading) {
|
||||||
store.fetchSubscribes();
|
store.fetchSubscribes();
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
subscribes: store.subscribes,
|
subscribes: store.subscribes,
|
||||||
loading: store.loading,
|
loading: store.loading,
|
||||||
|
loaded: store.loaded,
|
||||||
fetchSubscribes: store.fetchSubscribes,
|
fetchSubscribes: store.fetchSubscribes,
|
||||||
getSubscribeName: store.getSubscribeName,
|
getSubscribeName: store.getSubscribeName,
|
||||||
getSubscribeById: store.getSubscribeById,
|
getSubscribeById: store.getSubscribeById,
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { queryAnnouncement } from '@/services/user/announcement';
|
|||||||
import { useQuery } from '@tanstack/react-query';
|
import { useQuery } from '@tanstack/react-query';
|
||||||
import { Timeline } from '@workspace/ui/components/timeline';
|
import { Timeline } from '@workspace/ui/components/timeline';
|
||||||
import { Markdown } from '@workspace/ui/custom-components/markdown';
|
import { Markdown } from '@workspace/ui/custom-components/markdown';
|
||||||
|
import { formatDate } from '@workspace/ui/utils';
|
||||||
|
|
||||||
export default function Page() {
|
export default function Page() {
|
||||||
const { data } = useQuery({
|
const { data } = useQuery({
|
||||||
@@ -23,8 +24,8 @@ export default function Page() {
|
|||||||
<Timeline
|
<Timeline
|
||||||
data={
|
data={
|
||||||
data.map((item) => ({
|
data.map((item) => ({
|
||||||
title: item.title,
|
title: String(formatDate(item.created_at, false)),
|
||||||
content: <Markdown>{item.content}</Markdown>,
|
content: <Markdown>{`### ${item.title}\n${item.content}`}</Markdown>,
|
||||||
})) || []
|
})) || []
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
'use client';
|
'use client';
|
||||||
|
|
||||||
|
import { Empty } from '@/components/empty';
|
||||||
import { NEXT_PUBLIC_HIDDEN_TUTORIAL_DOCUMENT } from '@/config/constants';
|
import { NEXT_PUBLIC_HIDDEN_TUTORIAL_DOCUMENT } from '@/config/constants';
|
||||||
import { queryDocumentList } from '@/services/user/document';
|
import { queryDocumentList } from '@/services/user/document';
|
||||||
import { getTutorialList } from '@/utils/tutorial';
|
import { getTutorialList } from '@/utils/tutorial';
|
||||||
@@ -34,7 +35,7 @@ export default function Page() {
|
|||||||
},
|
},
|
||||||
enabled: NEXT_PUBLIC_HIDDEN_TUTORIAL_DOCUMENT !== 'true',
|
enabled: NEXT_PUBLIC_HIDDEN_TUTORIAL_DOCUMENT !== 'true',
|
||||||
});
|
});
|
||||||
|
if (!DocumentList && !TutorialList) return <Empty />;
|
||||||
return (
|
return (
|
||||||
<div className='space-y-4'>
|
<div className='space-y-4'>
|
||||||
{DocumentList?.length > 0 && (
|
{DocumentList?.length > 0 && (
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ppanel-web",
|
"name": "ppanel-web",
|
||||||
"version": "1.4.5",
|
"version": "1.4.7",
|
||||||
"private": true,
|
"private": true,
|
||||||
"homepage": "https://github.com/perfect-panel/ppanel-web",
|
"homepage": "https://github.com/perfect-panel/ppanel-web",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
|
|||||||
Reference in New Issue
Block a user