From 1a762858d259f0600c28c77565c56d1222c6c2ee Mon Sep 17 00:00:00 2001 From: naiba Date: Thu, 21 Jan 2021 09:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20dashboard=20v0.3.5(daynight):=20?= =?UTF-8?q?reformat=20and=20set=20brand?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- resource/static/theme-daynight/favicon.png | Bin 5247 -> 0 bytes resource/static/theme-daynight/logo.png | Bin 14397 -> 0 bytes resource/template/theme-daynight/home.html | 235 +++++++++++++----- resource/template/theme-daynight/service.html | 3 +- service/dao/dao.go | 2 +- 6 files changed, 175 insertions(+), 67 deletions(-) delete mode 100644 resource/static/theme-daynight/favicon.png delete mode 100644 resource/static/theme-daynight/logo.png diff --git a/README.md b/README.md index 7a6333b..0e7cede 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 哪吒面板 -![dashboard](https://img.shields.io/badge/管理面板-v0.3.4-brightgreen?style=for-the-badge&logo=github) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) +![dashboard](https://img.shields.io/badge/管理面板-v0.3.5-brightgreen?style=for-the-badge&logo=github) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) 系统状态监控报警、API(SSL证书变更、即将到期、到期)/TCP端口存活/PING 监控、计划任务(可以定时在Agent上执行命令,备份、重启、What ever you want)、极省资源,64M 服务器也能装 agent。 diff --git a/resource/static/theme-daynight/favicon.png b/resource/static/theme-daynight/favicon.png deleted file mode 100644 index 75d210726581a7b14792b52d1b26efde52d53ed9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5247 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 diff --git a/resource/static/theme-daynight/logo.png b/resource/static/theme-daynight/logo.png deleted file mode 100644 index 8c78fc499fea74d7fbe4181245f4b6a65698b1b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14397 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

;6n=FHd%7 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 diff --git a/resource/template/theme-daynight/home.html b/resource/template/theme-daynight/home.html index 21397e6..4e72b8a 100644 --- a/resource/template/theme-daynight/home.html +++ b/resource/template/theme-daynight/home.html @@ -7,7 +7,7 @@ {{.Title}} - + @@ -18,64 +18,170 @@ {{end}} - -

- -

 / 

 / 

-
  • @#server.live?'Running':'Down'#@

  • @#server.Name#@

  • @#server.Host.Platform#@
  • @#server.Host.CountryCode.toUpperCase()#@
  • @#formatByteSize(server.State.MemUsed)#@ / @#formatByteSize(server.Host.MemTotal)#@
  • @#server.State?secondToDate(server.State.Uptime):'-'#@
  • @#formatByteSize(server.State.SwapUsed)#@ / @#formatByteSize(server.Host.SwapTotal)#@
  • @#formatByteSize(server.State.DiskUsed)#@ / @#formatByteSize(server.Host.DiskTotal)#@
  • @#formatByteSize(server.State.NetInSpeed)#@/s
  • @#formatByteSize(server.State.NetOutSpeed)#@/s
  • CPU

    @#formatPercent(server.live,server.State.CPU,100).percent#@%

  • RAM

    @#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@%

  • 硬盘

    @#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@%

+ + + +
+
+

 / 

+ +
+
+

 / 

+ +
+
+
+
+
+
    +
  • +
    +

    @#server.live?'Running':'Down'#@

    +
    +
  • +
  • +

    @#server.Name#@

    +
  • +
  • +
  • @#server.Host.Platform#@
  • +
  • @#server.Host.CountryCode.toUpperCase()#@
  • +
  • @#formatByteSize(server.State.MemUsed)#@ / @#formatByteSize(server.Host.MemTotal)#@
  • +
  • @#server.State?secondToDate(server.State.Uptime):'-'#@
  • +
  • @#formatByteSize(server.State.SwapUsed)#@ / @#formatByteSize(server.Host.SwapTotal)#@
  • +
  • @#formatByteSize(server.State.DiskUsed)#@ / @#formatByteSize(server.Host.DiskTotal)#@
  • +
  • @#formatByteSize(server.State.NetInSpeed)#@/s
  • +
  • @#formatByteSize(server.State.NetOutSpeed)#@/s
  • +
  • +
    +
    +

    CPU

    +
    +
    +
    +

    @#formatPercent(server.live,server.State.CPU,100).percent#@%

    +
    +
    +
    +
  • +
  • +
    +
    +

    RAM

    +
    +
    +
    +

    @#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@%

    +
    +
    +
    +
  • +
  • +
    +
    +

    硬盘

    +
    +
    +
    +

    @#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@%

    +
    +
    +
    +
  • +
+
+
+
- - - + - - + + - - - - - + + + + + + - - + - + + {{end}} \ No newline at end of file diff --git a/resource/template/theme-daynight/service.html b/resource/template/theme-daynight/service.html index 435b3cb..95d2452 100644 --- a/resource/template/theme-daynight/service.html +++ b/resource/template/theme-daynight/service.html @@ -30,7 +30,8 @@ {{end}} - + {{statusName (divU64 $service.CurrentUp (addU64 $service.CurrentUp $service.CurrentDown))}} {{end}} diff --git a/service/dao/dao.go b/service/dao/dao.go index 143e7ed..1cf8016 100644 --- a/service/dao/dao.go +++ b/service/dao/dao.go @@ -34,7 +34,7 @@ var CronLock sync.RWMutex var Crons map[uint64]*model.Cron var Cron *cron.Cron -var Version = "v0.3.4" +var Version = "v0.3.5" func ReSortServer() { ServerLock.RLock()