fix bug (#328)

* fix bugs 1. 修复default主题mixin.js文件丢失 2. 修复主题默认值为后台设置值 3. default主题样式优化 * 修复前台切换 theme-custom 不生效
nezhahq · Feb 26, 2024 · ab39782 · ab39782
1 parent e24925b
commit ab39782
Show file tree

Hide file tree

Showing 16 changed files with 104 additions and 15 deletions.
diff --git a/pkg/mygin/preferred_theme.go b/pkg/mygin/preferred_theme.go
@@ -14,7 +14,7 @@ func PreferredTheme(c *gin.Context) {
 	if theme, err := c.Cookie("preferred_theme"); err == nil {
 		if _, has := model.Themes[theme]; has {
 			// 检验自定义主题
-			if theme == "custom" && singleton.Conf.Site.Theme != "custom" && !utils.IsFileExists("resource/template/custom/home.html") {
+			if theme == "custom" && singleton.Conf.Site.Theme != "custom" && !utils.IsFileExists("resource/template/theme-custom/home.html") {
 				return
 			}
 			c.Set(model.CtxKeyPreferredTheme, theme)

diff --git a/resource/l10n/en-US.toml b/resource/l10n/en-US.toml
@@ -398,7 +398,7 @@ other = "Virtualization"
 other = "Swap"
 
 [NetTransfer]
-other = "Network Transfer"
+other = "Transfer"
 
 [Load]
 other = "Load"
@@ -419,7 +419,7 @@ other = "Last Active"
 other = "Version"
 
 [NetSpeed]
-other = "Network Speed"
+other = "Speed"
 
 [Uptime]
 other = "Uptime"
@@ -627,3 +627,6 @@ other = "Feature"
 
 [Template]
 other = "Template"
+
+[Stat]
+other = "Stat"
diff --git a/resource/l10n/es-ES.toml b/resource/l10n/es-ES.toml
@@ -627,3 +627,6 @@ other = "Característica"
 
 [Template]
 other = "Plantilla"
+
+[Stat]
+other = "Stat"
diff --git a/resource/l10n/zh-CN.toml b/resource/l10n/zh-CN.toml
@@ -627,3 +627,6 @@ other = "功能"
 
 [Template]
 other = "主题"
+
+[Stat]
+other = "信息"
diff --git a/resource/l10n/zh-TW.toml b/resource/l10n/zh-TW.toml
@@ -627,3 +627,6 @@ other = "功能"
 
 [Template]
 other = "主題"
+
+[Stat]
+other = "信息"
diff --git a/resource/static/theme-default/css/main.css b/resource/static/theme-default/css/main.css
@@ -86,21 +86,35 @@ td {
   margin-right: 0;
 }
 
+.ui.grid {
+  margin-bottom:-0.5em
+}
+
+.ui.card>.content>.header:not(.ui), .ui.cards>.card>.content>.header:not(.ui){
+  line-height: 1em;
+}
+
 .status.cards .wide.column {
   padding-top: 0 !important;
   padding-bottom: 0 !important;
-  height:3.3rem !important;
+  height:2.3rem !important;
 }
 
 .status.cards .wide.column:nth-child(1) {
-  margin-top:2rem !important;
+  margin-top:1.2rem !important;
 }
 
 .status.cards .wide.column:nth-child(2) {
-  margin-top:2rem !important;
+  margin-top:1.2rem !important;
+}
+
+.status.cards .three.wide.column {
+  text-align: center;
+  width: 22%!important;
 }
 
 .status.cards .thirteen.wide.column{
+  width: 78%!important;
   padding-left:0;
 }
 
@@ -124,7 +138,7 @@ td {
 .closePopup{
   color:rgb(10, 148, 242) !important;
   position: absolute;
-  top: 10px;
+  top: 7px;
   right: 10px;
   cursor: pointer;
   z-index: 9999;
@@ -194,6 +208,7 @@ td {
 }
 
 .nezha-secondary-font {
+  height: 1em;
   color: rgb(10, 148, 242) !important;
 }
 

diff --git a/resource/static/theme-default/js/mixin.js b/resource/static/theme-default/js/mixin.js
@@ -0,0 +1,56 @@
+const mixinsVue = {
+    delimiters: ['@#', '#@'],
+    data: {
+        preferredTemplate: null,
+        isMobile: false
+    },
+    created() {
+        this.isMobile = this.checkIsMobile();
+        this.preferredTemplate = this.getCookie('preferred_theme') ? this.getCookie('preferred_theme') : this.$root.defaultTemplate;
+    },
+    methods: {
+        toggleTemplate(template) {
+            if( template != this.preferredTemplate){
+                this.preferredTemplate = template;
+                this.updateCookie("preferred_theme", template);
+                window.location.reload();
+            }
+        },
+        updateCookie(name, value) {
+            document.cookie = name + "=" + value +"; path=/";
+        },
+        getCookie(name) {
+            const cookies = document.cookie.split(';');
+            let cookieValue = null;
+            for (let i = 0; i < cookies.length; i++) {
+                const cookie = cookies[i].trim();
+                if (cookie.startsWith(name + '=')) {
+                    cookieValue = cookie.substring(name.length + 1, cookie.length);
+                    break;
+                }
+            }
+            return cookieValue;
+        },
+        checkIsMobile() { // 检测设备类型,页面宽度小于768px认为是移动设备
+            return window.innerWidth <= 768;
+        },
+        logOut(id) {
+            $.ajax({
+                type: 'POST',
+                url: '/api/logout',
+                data: JSON.stringify({ id: id }),
+                contentType: 'application/json',
+                success: function (resp) {
+                    if (resp.code == 200) {
+                        window.location.reload();
+                    } else {
+                        alert('注销失败(Error ' + resp.code + '): ' + resp.message);
+                    }
+                },
+                error: function (err) {
+                    alert('网络错误: ' + err.responseText);
+                }
+            });
+        }
+    }
+}
diff --git a/resource/static/theme-server-status/js/mixin.js b/resource/static/theme-server-status/js/mixin.js
@@ -5,14 +5,14 @@ const mixinsVue = {
         isSystemTheme: false,
         showGroup: false,
         showGoTop: false,
-        preferredTemplate: 'default',
+        preferredTemplate: null,
         isMobile: false
     },
     created() {
         this.isMobile = this.checkIsMobile();
         this.initTheme();
         this.storedShowGroup();
-        this.preferredTemplate = this.getCookie('preferred_theme') ? this.getCookie('preferred_theme') : 'default';
+        this.preferredTemplate = this.getCookie('preferred_theme') ? this.getCookie('preferred_theme') : this.$root.defaultTemplate;
         window.addEventListener('scroll', this.handleScroll);
     },
     destroyed() {

diff --git a/resource/template/theme-default/header.html b/resource/template/theme-default/header.html
@@ -12,14 +12,14 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/lipis/[email protected]/css/flag-icons.min.css">
     <link rel="stylesheet" type="text/css" href="/static/semantic-ui-alerts.min.css">
-    <link rel="stylesheet" type="text/css" href="/static/theme-default/css/main.css?v20240222">
+    <link rel="stylesheet" type="text/css" href="/static/theme-default/css/main.css?v20240226">
     <link rel="shortcut icon" type="image/png" href="/static/logo.svg" />
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.js"></script>
     <script src="/static/semantic-ui-alerts.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts.min.js"></script>
-    <script src="/static/theme-server-status/js/mixin.js?v20240225"></script>
+    <script src="/static/theme-default/js/mixin.js?v20240226"></script>
 </head>
 <body>
 {{end}}
diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html
@@ -19,7 +19,7 @@
                     class="apple icon"></i><i v-else-if='isWindowsPlatform(server.Host.Platform)'
                     class="windows icon"></i><i v-else :class="'fl-' + getFontLogoClass(server.Host.Platform)"></i>
                   @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@
-                  <i @click="togglePopup($event, server.ID)" aria-expanded="false" class="nezha-secondary-font info circle icon" style="height: 28px"></i>                 
+                  <i @click="togglePopup($event, server.ID)" aria-expanded="false" class="nezha-secondary-font info circle icon"></i>                 
                   <div class="ui content popup" :class="{ 'visible': isActive(server.ID) }" style="margin-bottom: 0;">
                     <i class="closePopup window close icon" @click="closePopup(server.ID)"></i>
                     {{tr "Platform"}}: @#server.Host.Platform#@-@#server.Host.PlatformVersion#@
@@ -90,15 +90,15 @@
                       <i class="arrow alternate circle up outline icon"></i>
                       @#formatByteSize(server.State.NetOutSpeed)#@/s
                     </div>
-                    <div class="three wide column">流量</div>
+                    <div class="three wide column">{{tr "NetTransfer"}}</div>
                     <div class="thirteen wide column">
                       <i class="arrow circle down icon"></i>
                       @#formatByteSize(server.State.NetInTransfer)#@
                       &nbsp;
                       <i class="arrow circle up icon"></i>
                       @#formatByteSize(server.State.NetOutTransfer)#@
                     </div>
-                    <div class="three wide column">信息</div>
+                    <div class="three wide column">{{tr "Stat"}}</div>
                     <div class="thirteen wide column">
                       <i class="bi bi-cpu-fill" style="font-size: 1.1rem; color: #4a86e8;"></i> @#getCoreAndGHz(server.Host.CPU)#@
                       &nbsp;
@@ -138,6 +138,7 @@
     delimiters: ['@#', '#@'],
     data: {
       page: 'index',
+      defaultTemplate: {{.Conf.Site.Theme}},
       templates: {{.Themes}},
       data: [],
       groups: [],

diff --git a/resource/template/theme-default/network.html b/resource/template/theme-default/network.html
@@ -36,6 +36,7 @@
         delimiters: ['@#', '#@'],
         data: {
             page: 'network',
+            defaultTemplate: {{.Conf.Site.Theme}},
             templates: {{.Themes}},
             servers: initData,
             option: {

diff --git a/resource/template/theme-default/service.html b/resource/template/theme-default/service.html
@@ -87,6 +87,7 @@ <h2 style="text-align: center;">{{tr "CycleTransferStats"}}</h2>
         delimiters: ['@#', '#@'],
         data: {
             page: 'service',
+            defaultTemplate: {{.Conf.Site.Theme}},
             templates: {{.Themes}}
         },
         mixins: [mixinsVue]

diff --git a/resource/template/theme-server-status/header.html b/resource/template/theme-server-status/header.html
@@ -28,7 +28,7 @@
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts.min.js"></script>
-    <script src="/static/theme-server-status/js/mixin.js?v20240225"></script>
+    <script src="/static/theme-server-status/js/mixin.js?v20240226"></script>
 </head>
 <body>
 {{end}}
diff --git a/resource/template/theme-server-status/home.html b/resource/template/theme-server-status/home.html
@@ -22,6 +22,7 @@
         delimiters: ['@#', '#@'],
         data: {
             page: 'index',
+            defaultTemplate: {{.Conf.Site.Theme}},
             templates: {{.Themes}},
             nodesTag: [],
             nodesNoTag: [],

diff --git a/resource/template/theme-server-status/network.html b/resource/template/theme-server-status/network.html
@@ -30,6 +30,7 @@
         delimiters: ['@#', '#@'],
         data: {
             page: 'network',
+            defaultTemplate: {{.Conf.Site.Theme}},
             templates: {{.Themes}},
             servers: initData,
             option: {

diff --git a/resource/template/theme-server-status/service.html b/resource/template/theme-server-status/service.html
@@ -78,6 +78,7 @@
         delimiters: ['@#', '#@'],
         data: {
             page: 'service',
+            defaultTemplate: {{.Conf.Site.Theme}},
             templates: {{.Themes}},
             servicesTag: [],
             servicesNoTag: [],