Explorar o código

chore(deps): change the registry of vue-github-button

Jacky hai 1 ano
pai
achega
aece83403c

+ 15 - 15
app/package.json

@@ -11,10 +11,11 @@
     "gettext:extract": "vue-gettext-extract"
   },
   "dependencies": {
+    "@0xjacky/vue-github-button": "^3.1.1",
     "@ant-design/icons-vue": "^7.0.1",
     "@formkit/auto-animate": "^0.8.2",
-    "@vue/reactivity": "^3.4.33",
-    "@vue/shared": "^3.4.33",
+    "@vue/reactivity": "^3.4.34",
+    "@vue/shared": "^3.4.34",
     "@vueuse/components": "^10.11.0",
     "@vueuse/core": "^10.11.0",
     "@vueuse/integrations": "^10.11.0",
@@ -22,25 +23,24 @@
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/xterm": "^5.5.0",
     "ant-design-vue": "^4.2.3",
-    "apexcharts": "^3.50.0",
+    "apexcharts": "^3.51.0",
     "axios": "^1.7.2",
     "dayjs": "^1.11.12",
     "highlight.js": "^11.10.0",
     "lodash": "^4.17.21",
     "marked": "^10.0.0",
     "nprogress": "^0.2.0",
-    "pinia": "^2.1.7",
+    "pinia": "^2.2.0",
     "pinia-plugin-persistedstate": "^3.2.1",
     "reconnecting-websocket": "^4.4.0",
     "sortablejs": "^1.15.2",
-    "universal-cookie": "^7",
-    "vite-plugin-build-id": "^0.3.0",
-    "vue": "^3.4.33",
-    "vue-github-button": "github:0xJacky/vue-github-button",
+    "universal-cookie": "^7.2.0",
+    "vite-plugin-build-id": "^0.3.3",
+    "vue": "^3.4.34",
     "vue-router": "^4.4.0",
     "vue3-ace-editor": "2.2.4",
     "vue3-apexcharts": "1.4.4",
-    "vue3-gettext": "3.0.0-beta.4",
+    "vue3-gettext": "3.0.0-beta.5",
     "vue3-otp-input": "^0.5.21",
     "vuedraggable": "^4.1.0"
   },
@@ -51,11 +51,11 @@
     "@types/sortablejs": "^1.15.8",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "@vitejs/plugin-vue": "^5.0.5",
+    "@vitejs/plugin-vue": "^5.1.1",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
-    "@vue/compiler-sfc": "^3.4.33",
+    "@vue/compiler-sfc": "^3.4.34",
     "@vue/tsconfig": "^0.5.1",
-    "ace-builds": "^1.35.3",
+    "ace-builds": "^1.35.4",
     "autoprefixer": "^10.4.19",
     "eslint": "^8.57.0",
     "eslint-import-resolver-alias": "^1.1.2",
@@ -65,12 +65,12 @@
     "eslint-plugin-sonarjs": "^0.23.0",
     "eslint-plugin-vue": "^9.27.0",
     "less": "^4.2.0",
-    "postcss": "^8.4.39",
-    "tailwindcss": "^3.4.6",
+    "postcss": "^8.4.40",
+    "tailwindcss": "^3.4.7",
     "typescript": "5.3.3",
     "unplugin-auto-import": "^0.17.8",
     "unplugin-vue-components": "^0.26.0",
-    "unplugin-vue-define-options": "^1.4.5",
+    "unplugin-vue-define-options": "^1.4.6",
     "vite": "^5.3.5",
     "vite-svg-loader": "^5.1.0",
     "vue-tsc": "^1.8.27"

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 240 - 219
app/pnpm-lock.yaml


+ 2 - 2
app/src/components/Notification/config.ts

@@ -9,12 +9,12 @@ export function syncConfigError(text: string) {
   const data = JSON.parse(text)
 
   if (data.status_code === 404) {
-    return $gettext('Sync config %{cert_name} to %{env_name} failed, please upgrade the remote Nginx UI to the latest version',
+    return $gettext('Sync config %{config_name} to %{env_name} failed, please upgrade the remote Nginx UI to the latest version',
       { config_name: data.config_name, env_name: data.env_name }, true)
   }
 
   return $gettext('Sync config %{config_name} to %{env_name} failed, response: %{resp}',
-    { cert_name: data.cert_name, env_name: data.env_name, resp: data.resp_body }, true)
+    { config_name: data.cert_name, env_name: data.env_name, resp: data.resp_body }, true)
 }
 
 export function syncRenameConfigSuccess(text: string) {

+ 11 - 10
app/src/views/other/Login.vue

@@ -7,8 +7,8 @@ import auth from '@/api/auth'
 import install from '@/api/install'
 import SetLanguage from '@/components/SetLanguage/SetLanguage.vue'
 import SwitchAppearance from '@/components/SwitchAppearance/SwitchAppearance.vue'
-import gettext, { $gettext } from '@/gettext'
 import OTPAuthorization from '@/components/OTP/OTPAuthorization.vue'
+import gettext from '@/gettext'
 
 const thisYear = new Date().getFullYear()
 
@@ -178,6 +178,16 @@ function handleOTPSubmit(code: string, recovery: string) {
                   </template>
                 </AInputPassword>
               </AFormItem>
+              <AButton
+                v-if="has_casdoor"
+                block
+                html-type="submit"
+                :loading="loading"
+                class="mb-5"
+                @click="loginWithCasdoor"
+              >
+                {{ $gettext('SSO Login') }}
+              </AButton>
             </template>
             <div v-else>
               <OTPAuthorization
@@ -198,15 +208,6 @@ function handleOTPSubmit(code: string, recovery: string) {
               </AButton>
             </AFormItem>
           </AForm>
-          <AButton
-            v-if="has_casdoor"
-            block
-            html-type="submit"
-            :loading="loading"
-            @click="loginWithCasdoor"
-          >
-            {{ $gettext('SSO Login') }}
-          </AButton>
           <div class="footer">
             <p>Copyright © 2021 - {{ thisYear }} Nginx UI</p>
             Language

+ 1 - 1
app/src/views/system/About.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import GithubButton from 'vue-github-button'
+import GithubButton from '@0xjacky/vue-github-button'
 import logo from '@/assets/img/logo.png'
 import ver from '@/version.json'
 

+ 2 - 2
app/src/vite-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="vite/client" />
 /// <reference types="vite-svg-loader" />
+import { ComponentCustomProperties } from '@vue/runtime-core'
 declare module '*.vue' {
   import type { DefineComponent } from 'vue'
 
@@ -8,7 +9,7 @@ declare module '*.vue' {
 }
 
 export { }
-declare module 'vue' {
+declare module '@vue/runtime-core' {
   interface ComponentCustomProperties {
     $gettext: (msgid: string, parameters?: {
       [key: string]: string;
@@ -24,4 +25,3 @@ declare module 'vue' {
     }, disableHtmlEscaping?: boolean) => string;
   }
 }
-

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio