diff --git a/README.md b/README.md index 626f889..349e880 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
LOGO designed by 熊大 .

-    +   

:trollface: Nezha Monitoring: Self-hostable, lightweight, servers and websites monitoring and O&M tool.

@@ -25,8 +25,8 @@ | Default Theme | DayNight [@JackieSung](https://github.com/JackieSung4ev) | hotaru | | ---------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------- | | ![Default Theme](resource/template/theme-default/screenshot.png) | | | -|
Default modified [Guide]
|
Neko Mdui @MikoyChinese
| | -| ![默认主题魔改](https://fastly.jsdelivr.net/gh/idarku/img@main/me/1631120192341.webp) | ![Neko Mdui](resource/template/theme-mdui/screenshot.png) | | +|
Default modified [Guide]
|
Neko Mdui @MikoyChinese
|
AngelKanade @adminsama
| +| ![默认主题魔改](https://fastly.jsdelivr.net/gh/idarku/img@main/me/1631120192341.webp) | ![Neko Mdui](resource/template/theme-mdui/screenshot.png) | ![AngelKanade](resource/template/theme-angel-kanade/screenshot.png) | ## Supported Languages diff --git a/model/config.go b/model/config.go index 194a276..02cf01f 100644 --- a/model/config.go +++ b/model/config.go @@ -17,11 +17,12 @@ var Languages = map[string]string{ } var Themes = map[string]string{ - "default": "Default", - "daynight": "JackieSung DayNight", - "mdui": "Neko Mdui", - "hotaru": "Hotaru", - "custom": "Custom(local)", + "default": "Default", + "daynight": "JackieSung DayNight", + "mdui": "Neko Mdui", + "hotaru": "Hotaru", + "angel-kanade": "AngelKanade", + "custom": "Custom(local)", } var DashboardThemes = map[string]string{ diff --git a/resource/static/theme-angel-kanade/HarmonyOS_Sans_SC_Medium.subset.woff2 b/resource/static/theme-angel-kanade/HarmonyOS_Sans_SC_Medium.subset.woff2 new file mode 100644 index 0000000..a01811e Binary files /dev/null and b/resource/static/theme-angel-kanade/HarmonyOS_Sans_SC_Medium.subset.woff2 differ diff --git a/resource/static/theme-angel-kanade/ailmm.woff2 b/resource/static/theme-angel-kanade/ailmm.woff2 new file mode 100644 index 0000000..04ffcb4 Binary files /dev/null and b/resource/static/theme-angel-kanade/ailmm.woff2 differ diff --git a/resource/static/theme-angel-kanade/ktz.css b/resource/static/theme-angel-kanade/ktz.css new file mode 100644 index 0000000..f080673 --- /dev/null +++ b/resource/static/theme-angel-kanade/ktz.css @@ -0,0 +1,379 @@ +@font-face { + font-family: HarmonyOS; + font-style: normal; + font-display: swap; + src: url(./HarmonyOS_Sans_SC_Medium.subset.woff2) format('woff2') +} + +@font-face { + font-weight: 900; + font-family: dianzhenzt; + src: url(./ailmm.woff2) +} + +body { + background: #e6eef4; + font-family: dianzhenzt !important +} + +.header { + font-family: harmonyos, dianzhenzt !important +} + +.container { + font-family: harmonyos, dianzhenzt !important +} + +#app { + font-family: harmonyos, dianzhenzt !important +} + +.ui.inverted.segment { + background: #e6eef4 +} + +.ui.menu { + background: #e6eef4; + border: none !important; + box-shadow: 0 0 0 #e6eef4 !important; + -webkit-box-shadow: 0 0 0 #e6eef4 !important +} + +.ui.menu .active { + border: none !important; + border-radius: 10px !important; + background: #e6eef4 !important; + box-shadow: inset 5px 5px 16px #d6dde3, inset -5px -5px 16px #f6ffff !important +} + +.ui.menu .item:before { + width: 0 !important +} + +.ui.menu:not(.secondary):not(.text):not(.tabular):not(.borderless)>.container>.item:not(.right):not(.borderless):first-child { + border-left: none !important +} + +.ui.menu.fixed { + position: static +} + +.nb-container { + padding-top: 40px !important +} + +.ui.menu { + margin-top: 20px !important +} + +#app .styled { + box-shadow: 0 0 0 #e6eef4; + -webkit-box-shadow: 0 0 0 #e6eef4 +} + +#app .accordion { + background: #e6eef4; + border-style: none +} + +#app .accordion .content .card { + border-radius: 20px; + background: #e6eef4; + box-shadow: -6px -6px 12px #b8bec3, 6px 6px 12px #fff +} + +.ui.fine.progress>.bar { + background-image: linear-gradient(312deg, #57693b, #638b43, #6daf4a, #76d450) +} + +.ui.progress.fine .bar { + background-image: linear-gradient(312deg, #57693b, #638b43, #6daf4a, #76d450) +} + +.ui.progress>.bar { + background-color: #000 !important +} + +.ui.progress.warning .bar { + background-image: linear-gradient(269deg, #de4723, #de6425, #dd7d26, #db9428) !important +} + +.ui.progress.error .bar { + background-image: linear-gradient(287deg, #12032a, #480e2a, #7c1028, #b20d24) !important +} + +.ui.progress.offline .bar { + background-color: #000 !important +} + +.ui.progress .bar { + min-width: 1.8em !important; + border-radius: 15px !important; + line-height: 1.65em !important; + text-shadow: 1px 0 1px #eee, -1px 0 1px #000 +} + +.ui.progress { + border-radius: 50px; + background: #d9e1e8; + box-shadow: inset 3px 3px 6px #b8bfc5, inset -3px -3px 6px #faffff +} + +.service-status .good { + border-radius: 7px !important; + background: linear-gradient(145deg, #23c74a, #1ea73e) !important; + box-shadow: 0 0 0 #20b342 !important +} + +.service-status .danger { + border-radius: 7px !important; + background: linear-gradient(145deg, #c71e1e, #a71919) !important; + box-shadow: 0 0 0 #20b342 !important +} + +.service-status .warning { + border-radius: 7px !important; + background: linear-gradient(145deg, #ffa51a, #de8b16) !important; + box-shadow: 0 0 0 #ed9417 !important +} + +.service-status .table { + border: none !important; + border-radius: 7px; + background: #e6eef4; + box-shadow: -13px -13px 25px #d4dbe0, 13px 13px 25px #f8ffff +} + +.service-status .table td .button { + border: none !important; + border-radius: 7px; + background: #e6eef4; + box-shadow: inset -3px -3px 6px #c4cacf, inset 3px 3px 6px #fff +} + +.service-status table thead .center { + border: none !important; + background: #e6eef4 !important +} + +.service-status .table td { + border: none !important +} + +.ui.right.center.popup { + margin: -3px 0 0 .914286em !important; + -webkit-transform-origin: left 50% !important; + transform-origin: left 50% !important +} + +.ui.bottom.left.popup { + margin-top: 3px !important; + margin-left: 1px !important +} + +.ui.top.left.popup { + margin-bottom: 10px !important; + margin-left: 0 !important +} + +.ui.top.right.popup { + margin-right: 0 !important; + margin-bottom: 8px !important +} + +.ui.left.center.popup { + margin: -3px .91428571em 0 0 !important; + -webkit-transform-origin: right 50% !important; + transform-origin: right 50% !important +} + +.ui.left.center.popup:before, +.ui.right.center.popup:before { + border: 0 solid #fafafaeb !important; + background: #fafafaeb !important +} + +.ui.top.popup:before { + border-color: #fafafaeb transparent transparent !important +} + +.ui.popup:before { + border-color: #fafafaeb transparent transparent !important +} + +.ui.bottom.left.popup:before { + border: 1px solid transparent !important; + border-color: #fafafaeb transparent transparent !important; + border-radius: 0 !important; + background: #fafafaeb !important; + -webkit-box-shadow: 0 0 0 0 #fafafaeb !important; + box-shadow: 0 0 0 0 #fafafaeb !important; + -webkit-tap-highlight-color: transparent !important +} + +.ui.bottom.right.popup:before { + border: 1px solid transparent !important; + border-color: #fafafaeb transparent transparent !important; + border-radius: 0 !important; + background: #fafafaeb !important -webkit-box-shadow:0 0 0 0 #fafafaeb !important; + box-shadow: 0 0 0 0 #fafafaeb !important; + -webkit-tap-highlight-color: transparent !important +} + +.ui.top.left.popup:before { + border: 1px solid transparent !important; + border-color: #fafafaeb transparent transparent !important; + border-radius: 0 !important; + background: #fafafaeb !important; + -webkit-box-shadow: 0 0 0 0 #fafafaeb !important; + box-shadow: 0 0 0 0 #fafafaeb !important; + -webkit-tap-highlight-color: transparent !important +} + +.ui.top.right.popup:before { + border: 1px solid transparent !important; + border-color: #fafafaeb transparent transparent !important; + border-radius: 0 !important; + background: #fafafaeb !important; + -webkit-box-shadow: 0 0 0 0 #fafafaeb !important; + box-shadow: 0 0 0 0 #fafafaeb !important; + -webkit-tap-highlight-color: transparent !important +} + +.ui.left.center.popup:before { + border: 1px solid transparent !important; + border-color: #fafafaeb transparent transparent !important; + border-radius: 0 !important; + background: #fafafaeb !important; + -webkit-box-shadow: 0 0 0 0 #fafafaeb !important; + box-shadow: 0 0 0 0 #fafafaeb !important; + -webkit-tap-highlight-color: transparent !important +} + +.status.cards .ui.content.popup { + min-width: 20rem !important; + border: 1px solid transparent !important; + border-radius: 5px !important; + background-color: #fafafaeb !important; + font-family: Arial, Helvetica, sans-serif !important; + line-height: 2rem !important +} + +#app .accordion .title { + text-shadow: 2px 2px 3px #c4cacf, -2px -2px 3px #fff; + color: #787878 !important; + font-weight: 900 !important +} + +#app .accordion .content { + padding-top: 1.5em !important +} + +.description .wide { + margin-top: 1em +} + +.description .wide:nth-child(odd) { + text-shadow: 2px 2px 3px #c4cacf, -2px -2px 3px #fff; + color: #787878 !important; + font-weight: 500 +} + +.description .wide:nth-child(8) { + text-shadow: 2px 2px 3px #c4cacf, -2px -2px 3px #fff; + color: #787878 !important; + font-weight: 500 +} + +.description .wide:nth-child(10) { + text-shadow: 2px 2px 3px #c4cacf, -2px -2px 3px #fff; + color: #787878 !important; + font-weight: 500 +} + +.description .wide:nth-child(14) { + text-shadow: 2px 2px 3px #c4cacf, -2px -2px 3px #fff; + color: #787878 !important; + font-weight: 500 +} + +.description .wide:nth-child(16) { + text-shadow: 2px 2px 3px #c4cacf, -2px -2px 3px #fff; + color: #787878 !important; + font-weight: 500 +} + +.stackable .card .content .header { + text-align: center; + text-shadow: 2px 2px 3px #c4cacf, -2px -2px 3px #fff; + color: #525151 !important; + font-weight: 500 +} + +.stackable .card .content .header .popup { + text-align: left; + color: #000 !important; + text-shadow: 0 0 0 #333 !important; + font-weight: 100 !important +} + +.ui.menu .item>img:not(.ui) { + display: none +} + +#app .accordion .content .card:not(:first-child) { + margin-left: 10px +} + +.ui.menu .container .item { + text-shadow: 2px 2px 3px #c4cacf, -2px -2px 3px #fff; + color: #787878 !important; + font-weight: 500 +} + +.right.menu .positive { + background: #e6eef4 !important; + text-shadow: 2px 2px 3px #c4cacf, -2px -2px 3px #fff; + color: #787878 !important; + font-weight: 500 +} + +.service-status .table { + text-shadow: 2px 2px 3px #c4cacf, -2px -2px 3px #fff; + color: #787878 !important; + font-weight: 500 +} + +.celled .aligned .thirteen .fine { + width: 95% !important +} + +.celled .aligned .thirteen .fine small { + color: #eee !important; + text-shadow: 0 0 #fff +} + +.service-status>h2 { + text-shadow: 2px 2px 3px #c4cacf, -2px -2px 3px #fff +} + +.ui.success.message { + border-radius: 11px !important; + background: #e6eef4 !important; + box-shadow: 7px 7px 15px #cfd6dc, -7px -7px 15px #fdffff !important; + color: #1a531b !important +} + +.ui.error.message { + border-radius: 11px !important; + background: #e6eef4 !important; + box-shadow: 7px 7px 15px #cfd6dc, -7px -7px 15px #fdffff !important; + color: red !important +} + +.ui.warning.message { + border-radius: 11px !important; + background: #e6eef4 !important; + box-shadow: 7px 7px 15px #cfd6dc, -7px -7px 15px #fdffff !important; + color: #f7c709 !important +} \ No newline at end of file diff --git a/resource/template/theme-angel-kanade/footer.html b/resource/template/theme-angel-kanade/footer.html new file mode 100644 index 0000000..97da944 --- /dev/null +++ b/resource/template/theme-angel-kanade/footer.html @@ -0,0 +1,24 @@ +{{define "theme-angel-kanade/footer"}} +
+
+ © {{.Conf.Site.Brand}} | + Powered by {{tr "NezhaMonitoring"}}<{{.Version}}> | Theme designed + by.夜灭 + +
+
+ + + + + + + + + +{{end}} \ No newline at end of file diff --git a/resource/template/theme-angel-kanade/header.html b/resource/template/theme-angel-kanade/header.html new file mode 100644 index 0000000..c181aab --- /dev/null +++ b/resource/template/theme-angel-kanade/header.html @@ -0,0 +1,24 @@ +{{define "theme-angel-kanade/header"}} + + + + + + + + + {{.Title}} + + + + + + + + + + + {{end}} \ No newline at end of file diff --git a/resource/template/theme-angel-kanade/home.html b/resource/template/theme-angel-kanade/home.html new file mode 100644 index 0000000..cb5cbda --- /dev/null +++ b/resource/template/theme-angel-kanade/home.html @@ -0,0 +1,374 @@ +{{define "theme-angel-kanade/home"}} +{{template "theme-angel-kanade/header" .}} +{{if ts .CustomCode}} {{.CustomCode|safe}} {{end}} +{{template "theme-angel-kanade/menu" .}} +
+
+
+
+
+ + @#(group.Tag!==''?group.Tag:'{{tr "Default"}}')#@ +
+
+
+
+
+
+ 国家  + @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@ + +
+ {{tr "Platform"}}: @#server.Host.Platform#@-@#server.Host.PlatformVersion#@ + [@#server.Host.Virtualization#@:@#server.Host.Arch#@]
+ CPU: @#server.Host.CPU#@
+ {{tr "DiskUsed"}}: + @#formatByteSize(server.State.DiskUsed)#@/@#formatByteSize(server.Host.DiskTotal)#@
+ {{tr "MemUsed"}}: + @#formatByteSize(server.State.MemUsed)#@/@#formatByteSize(server.Host.MemTotal)#@
+ {{tr "SwapUsed"}}: + @#formatByteSize(server.State.SwapUsed)#@/@#formatByteSize(server.Host.SwapTotal)#@
+ {{tr "NetTransfer"}}: @#formatByteSize(server.State.NetInTransfer)#@@#formatByteSize(server.State.NetOutTransfer)#@
+ {{tr "Load"}}: @# toFixed2(server.State.Load1) #@/@# toFixed2(server.State.Load5) #@/@# + toFixed2(server.State.Load15) #@
+ {{tr "ProcessCount"}}: @# server.State.ProcessCount #@
+ {{tr "ConnCount"}}: TCP @# server.State.TcpConnCount #@ / UDP @# server.State.UdpConnCount #@
+ {{tr "BootTime"}}: @# formatTimestamp(server.Host.BootTime) #@
+ {{tr "LastActive"}}: @# new Date(server.LastActive).toLocaleString() #@
+ {{tr "Version"}}: @#server.Host.Version#@
+
+
+
+
+
+
CPU
+
+
+
+ @#formatPercent(server.live,server.State.CPU,100).percent#@% +
+
+
+
{{tr "MemUsed"}}
+
+
+
+ @#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@% +
+
+
+
{{tr "SwapUsed"}}
+
+
+
+ @#parseInt(server.State?server.State.SwapUsed/server.Host.SwapTotal*100:0)#@% +
+
+
+
{{tr "NetSpeed"}}
+
+ + @#formatByteSize(server.State.NetInSpeed)#@/s + + @#formatByteSize(server.State.NetOutSpeed)#@/s +
+
流量
+
+ + @#formatByteSize(server.State.NetInTransfer)#@ +   + + @#formatByteSize(server.State.NetOutTransfer)#@ +
+
{{tr "DiskUsed"}}
+
+
+
+ @#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@% +
+
+
+
信息
+
+ @#getCoreAndGHz(server.Host.CPU)#@ +   + @#getK2Gb(server.Host.MemTotal)#@ +   + @#getK2Gb(server.Host.DiskTotal)#@ +
+
{{tr "Uptime"}}
+
+ @#secondToDate(server.State.Uptime)#@ +
+
+
+
+
+

@#server.Name#@

+

{{tr "ServerIsOffline"}}

+
+
+
+
+
+
+
+
+{{template "theme-angel-kanade/footer" .}} + +{{end}} diff --git a/resource/template/theme-angel-kanade/menu.html b/resource/template/theme-angel-kanade/menu.html new file mode 100644 index 0000000..64f2186 --- /dev/null +++ b/resource/template/theme-angel-kanade/menu.html @@ -0,0 +1,53 @@ +{{define "theme-angel-kanade/menu"}} +
+
+ + + + {{if .IsAdminPage}} + {{tr "Server"}} + {{tr "Services"}} + {{tr "Task"}} + {{tr "Notification"}} + + {{tr "Settings"}} + + {{else}} + {{tr "Home"}} + {{tr "Services"}} + {{end}} +
+
+ {{if .Admin}} +
+
+ {{.Admin.Name}} +
+ +
+ {{if .IsAdminPage}} + + {{tr "BackToHomepage"}} + + + API Token + + {{else}} + + {{tr "AdminPanel"}} + + {{end}} + +
+
+ {{else}} + {{tr "Login"}} + {{end}} +
+
+
+
+{{template "component/confirm" .}} +{{end}} \ No newline at end of file diff --git a/resource/template/theme-angel-kanade/screenshot.png b/resource/template/theme-angel-kanade/screenshot.png new file mode 100644 index 0000000..2ce2a85 Binary files /dev/null and b/resource/template/theme-angel-kanade/screenshot.png differ diff --git a/resource/template/theme-angel-kanade/service.html b/resource/template/theme-angel-kanade/service.html new file mode 100644 index 0000000..7ec8620 --- /dev/null +++ b/resource/template/theme-angel-kanade/service.html @@ -0,0 +1,85 @@ +{{define "theme-angel-kanade/service"}} +{{template "theme-angel-kanade/header" .}} +{{if ts .CustomCode}} +{{.CustomCode|safe}} +{{end}} +{{template "theme-angel-kanade/menu" .}} +
+
+
+ + + + + + + + + + + {{range $service := .Services}} + + + + + + {{end}} + +
{{tr "Name"}}{{tr "30DaysOnline"}}{{tr "Details"}}{{tr "Status"}}
{{$service.Monitor.Name}} + {{$service.TotalUptime|float32f}}% + {{range $i,$d := $service.Delay}} +
+
{{end}} + 		+ + {{statusName (divU64 $service.CurrentUp (addU64 $service.CurrentUp $service.CurrentDown))}} +
+ + {{if .CycleTransferStats}} + +

{{tr "CycleTransferStats"}}

+ + + + + + + + + + + + + + + + + + {{range $id, $stats := .CycleTransferStats}} + {{range $innerId, $transfer := $stats.Transfer}} + {{$TransLeftPercent := TransLeftPercent (UintToFloat $transfer) (UintToFloat $stats.Max)}} + + + + + + + + + + + + + {{end}} + {{end}} + +
ID{{tr "Rules"}}{{tr "Server"}}{{tr "From"}}{{tr "To"}}MAXMIN{{tr "NextCheck"}}{{tr "CurrentUsage"}}{{tr "Transleft"}}
{{$id}}{{$stats.Name}}{{index $stats.ServerName $innerId}}{{$stats.From|tf}}{{$stats.To|tf}}{{$stats.Max|bf}}{{$stats.Min|bf}}{{(index $stats.NextUpdate $innerId)|sft}}{{$transfer|bf}}
{{TransLeft $stats.Max $transfer}} / {{$TransLeftPercent}} %
+ + {{end}} +
+
+
+{{template "theme-angel-kanade/footer" .}} +{{end}} \ No newline at end of file diff --git a/resource/template/theme-angel-kanade/viewpassword.html b/resource/template/theme-angel-kanade/viewpassword.html new file mode 100644 index 0000000..a67fc6b --- /dev/null +++ b/resource/template/theme-angel-kanade/viewpassword.html @@ -0,0 +1,25 @@ +{{define "theme-angel-kanade/viewpassword"}} +{{template "theme-angel-kanade/header" .}} +{{if ts .CustomCode}} +{{.CustomCode|safe}} +{{end}} +
+
+
+

+ +
+ {{tr "VerifyPassword"}} +
+

+
+
+ +
+ +
+
+
+
+{{template "theme-angel-kanade/footer" .}} +{{end}} \ No newline at end of file diff --git a/service/singleton/singleton.go b/service/singleton/singleton.go index 06a1290..1e4bce4 100644 --- a/service/singleton/singleton.go +++ b/service/singleton/singleton.go @@ -12,7 +12,7 @@ import ( "github.com/naiba/nezha/pkg/utils" ) -var Version = "v0.14.11" // ！！记得修改 README 中的 badge 版本！！ +var Version = "v0.14.12" // ！！记得修改 README 中的 badge 版本！！ var ( Conf *model.Config