From 72071466b468c2cee4279793b7045b718858b16a Mon Sep 17 00:00:00 2001 From: Jacky Date: Mon, 28 Apr 2025 11:52:25 +0800 Subject: [PATCH] chore: prepare v2.0.0-rc.6 --- app/components.d.ts | 3 - app/package.json | 2 +- app/src/composables/useSSE.ts | 2 +- app/src/language/generate.ts | 82 +++++++++---------- app/src/language/zh_CN/app.po | 2 +- app/src/version.json | 2 +- .../notification/notificationColumns.tsx | 14 ++-- 7 files changed, 52 insertions(+), 55 deletions(-) diff --git a/app/components.d.ts b/app/components.d.ts index b0c02c3e..7ddfa58f 100644 --- a/app/components.d.ts +++ b/app/components.d.ts @@ -74,7 +74,6 @@ declare module 'vue' { AUploadDragger: typeof import('ant-design-vue/es')['UploadDragger'] AutoCertFormAutoCertForm: typeof import('./src/components/AutoCertForm/AutoCertForm.vue')['default'] AutoCertFormDNSChallenge: typeof import('./src/components/AutoCertForm/DNSChallenge.vue')['default'] - AutoCertStatusAutoCertStatus: typeof import('./src/components/ProcessingStatus/ProcessingStatus.vue')['default'] BreadcrumbBreadcrumb: typeof import('./src/components/Breadcrumb/Breadcrumb.vue')['default'] CertInfoCertInfo: typeof import('./src/components/CertInfo/CertInfo.vue')['default'] ChartAreaChart: typeof import('./src/components/Chart/AreaChart.vue')['default'] @@ -104,8 +103,6 @@ declare module 'vue' { NotificationNotification: typeof import('./src/components/Notification/Notification.vue')['default'] OTPInputOTPInput: typeof import('./src/components/OTPInput/OTPInput.vue')['default'] PageHeaderPageHeader: typeof import('./src/components/PageHeader/PageHeader.vue')['default'] - ProcessingStatusAutoCertStatus: typeof import('./src/components/ProcessingStatus/ProcessingStatus.vue')['default'] - ProcessingStatusProcessing: typeof import('./src/components/ProcessingStatus/ProcessingStatus.vue')['default'] ProcessingStatusProcessingStatus: typeof import('./src/components/ProcessingStatus/ProcessingStatus.vue')['default'] ReactiveFromNowReactiveFromNow: typeof import('./src/components/ReactiveFromNow/ReactiveFromNow.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/app/package.json b/app/package.json index c78dbaa6..e6b80b1a 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "nginx-ui-app-next", "type": "module", - "version": "2.0.0-rc.5", + "version": "2.0.0-rc.6", "packageManager": "pnpm@10.9.0+sha512.0486e394640d3c1fb3c9d43d49cf92879ff74f8516959c235308f5a8f62e2e19528a65cdc2a3058f587cde71eba3d5b56327c8c33a97e4c4051ca48a10ca2d5f", "scripts": { "dev": "vite --host", diff --git a/app/src/composables/useSSE.ts b/app/src/composables/useSSE.ts index 6ff1259c..76a4e1cc 100644 --- a/app/src/composables/useSSE.ts +++ b/app/src/composables/useSSE.ts @@ -25,7 +25,7 @@ export function useSSE() { * Connect to SSE service */ function connect(options: SSEOptions) { - if (token.value) { + if (!token.value) { return } diff --git a/app/src/language/generate.ts b/app/src/language/generate.ts index 9b43ca60..357a62f7 100644 --- a/app/src/language/generate.ts +++ b/app/src/language/generate.ts @@ -1,52 +1,52 @@ // This file is auto-generated. DO NOT EDIT MANUALLY. export const msg = [ - $gettext('Nginx configuration directory exists'), - $gettext('Check if the nginx PID path exists'), - $gettext('Nginx access log path exists'), - $gettext('[Nginx UI] Setting HTTP01 challenge provider'), - $gettext('[Nginx UI] Reloading nginx'), - $gettext('[Nginx UI] Certificate was used for server, reloading server TLS certificate'), - $gettext('[Nginx UI] Revoking certificate'), - $gettext('Sites directory exists'), - $gettext('Nginx error log path exists'), - $gettext('[Nginx UI] Issued certificate successfully'), - $gettext('Failed to revoke certificate: %{error}'), - $gettext('[Nginx UI] Setting DNS01 challenge provider'), - $gettext('Check if the nginx.conf includes the sites-enabled directory'), - $gettext('Nginx configuration entry file exists'), - $gettext('Check if the nginx access log path exists'), - $gettext('Certificate not found: %{error}'), - $gettext('[Nginx UI] Preparing lego configurations'), - $gettext('[Nginx UI] ACME User: %{name}, Email: %{email}, CA Dir: %{caDir}'), - $gettext('[Nginx UI] Creating client facilitates communication with the CA server'), - $gettext('[Nginx UI] Environment variables cleaned'), - $gettext('[Nginx UI] Writing certificate private key to disk'), - $gettext('Nginx.conf includes conf.d directory'), - $gettext('Check if the nginx.conf includes the conf.d directory'), - $gettext('[Nginx UI] Finished'), - $gettext('[Nginx UI] Revoking old certificate'), - $gettext('Check if the nginx configuration directory exists'), - $gettext('Nginx PID path exists'), - $gettext('Check if the nginx error log path exists'), - $gettext('[Nginx UI] Backing up current certificate for later revocation'), - $gettext('Check if the nginx configuration entry file exists'), - $gettext('Failed to delete certificate from database: %{error}'), - $gettext('[Nginx UI] Preparing for certificate revocation'), - $gettext('Nginx.conf includes sites-enabled directory'), - $gettext('Docker socket exists'), - $gettext('Check if the docker socket exists.'), - $gettext('Certificate revoked successfully'), - $gettext('Log file %{log_path} is not a regular file. If you are using nginx-ui in docker container, please refer to https://nginxui.com/zh_CN/guide/config-nginx-log.html for more information.'), $gettext('[Nginx UI] Obtaining certificate'), $gettext('[Nginx UI] Writing certificate to disk'), + $gettext('Check if the sites-available and sites-enabled directories are under the nginx configuration directory'), + $gettext('Nginx.conf includes sites-enabled directory'), + $gettext('Check if the nginx error log path exists'), + $gettext('Certificate not found: %{error}'), + $gettext('[Nginx UI] Setting HTTP01 challenge provider'), + $gettext('Check if the nginx.conf includes the conf.d directory'), + $gettext('Nginx configuration entry file exists'), + $gettext('[Nginx UI] Issued certificate successfully'), + $gettext('[Nginx UI] ACME User: %{name}, Email: %{email}, CA Dir: %{caDir}'), + $gettext('[Nginx UI] Reloading nginx'), + $gettext('[Nginx UI] Writing certificate private key to disk'), $gettext('[Nginx UI] Revocation completed'), $gettext('[Nginx UI] Certificate successfully revoked'), $gettext('Nginx.conf includes streams-enabled directory'), - $gettext('Check if the nginx.conf includes the streams-enabled directory'), - $gettext('[Nginx UI] Setting environment variables'), - $gettext('[Nginx UI] Certificate renewed successfully'), - $gettext('Check if the sites-available and sites-enabled directories are under the nginx configuration directory'), + $gettext('[Nginx UI] Preparing lego configurations'), + $gettext('[Nginx UI] Preparing for certificate revocation'), + $gettext('Check if the nginx.conf includes the sites-enabled directory'), + $gettext('Failed to delete certificate from database: %{error}'), + $gettext('[Nginx UI] Environment variables cleaned'), + $gettext('[Nginx UI] Revoking old certificate'), + $gettext('[Nginx UI] Certificate was used for server, reloading server TLS certificate'), + $gettext('[Nginx UI] Revoking certificate'), + $gettext('Sites directory exists'), + $gettext('Check if the nginx configuration directory exists'), + $gettext('Docker socket exists'), + $gettext('Certificate revoked successfully'), + $gettext('Log file %{log_path} is not a regular file. If you are using nginx-ui in docker container, please refer to https://nginxui.com/zh_CN/guide/config-nginx-log.html for more information.'), + $gettext('[Nginx UI] Creating client facilitates communication with the CA server'), + $gettext('[Nginx UI] Setting DNS01 challenge provider'), $gettext('Streams directory exists'), + $gettext('Check if the nginx.conf includes the streams-enabled directory'), + $gettext('Nginx.conf includes conf.d directory'), + $gettext('Nginx PID path exists'), + $gettext('Failed to revoke certificate: %{error}'), + $gettext('[Nginx UI] Backing up current certificate for later revocation'), + $gettext('[Nginx UI] Certificate renewed successfully'), $gettext('Check if the streams-available and streams-enabled directories are under the nginx configuration directory'), + $gettext('Check if the nginx configuration entry file exists'), + $gettext('Check if the nginx access log path exists'), + $gettext('Nginx error log path exists'), + $gettext('Check if the docker socket exists.'), + $gettext('[Nginx UI] Setting environment variables'), + $gettext('[Nginx UI] Finished'), + $gettext('Nginx configuration directory exists'), + $gettext('Check if the nginx PID path exists'), + $gettext('Nginx access log path exists'), ] diff --git a/app/src/language/zh_CN/app.po b/app/src/language/zh_CN/app.po index e5d680b0..64eceab4 100644 --- a/app/src/language/zh_CN/app.po +++ b/app/src/language/zh_CN/app.po @@ -393,7 +393,7 @@ msgstr "\"自动重启\"" #: src/views/site/site_edit/components/SiteEditor/SiteEditor.vue:150 #: src/views/stream/components/StreamEditor.vue:106 msgid "Back" -msgstr "\"返回\"" +msgstr "返回" #: src/views/other/Error.vue:22 msgid "Back Home" diff --git a/app/src/version.json b/app/src/version.json index 094b7f74..3c57c814 100644 --- a/app/src/version.json +++ b/app/src/version.json @@ -1 +1 @@ -{"version":"2.0.0-rc.5","build_id":22,"total_build":416} \ No newline at end of file +{"version":"2.0.0-rc.6","build_id":1,"total_build":417} \ No newline at end of file diff --git a/app/src/views/notification/notificationColumns.tsx b/app/src/views/notification/notificationColumns.tsx index 46ca9e7b..5ac53f85 100644 --- a/app/src/views/notification/notificationColumns.tsx +++ b/app/src/views/notification/notificationColumns.tsx @@ -41,6 +41,13 @@ const columns: Column[] = [{ sorter: true, pithy: true, width: 100, +}, { + title: () => $gettext('Created at'), + dataIndex: 'created_at', + sorter: true, + customRender: datetime, + pithy: true, + width: 180, }, { title: () => $gettext('Title'), dataIndex: 'title', @@ -55,13 +62,6 @@ const columns: Column[] = [{ customRender: detailRender, pithy: true, width: 500, -}, { - title: () => $gettext('Created at'), - dataIndex: 'created_at', - sorter: true, - customRender: datetime, - pithy: true, - width: 180, }, { title: () => $gettext('Action'), dataIndex: 'action',