Started working on dark theme
This commit is contained in:
@ -1,16 +1,10 @@
|
||||
package admin
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/aerogo/aero"
|
||||
"github.com/animenotifier/arn"
|
||||
"github.com/animenotifier/notify.moe/components"
|
||||
"github.com/animenotifier/notify.moe/utils"
|
||||
"github.com/shirou/gopsutil/cpu"
|
||||
"github.com/shirou/gopsutil/disk"
|
||||
"github.com/shirou/gopsutil/host"
|
||||
"github.com/shirou/gopsutil/mem"
|
||||
)
|
||||
|
||||
// Get admin page.
|
||||
@ -21,40 +15,40 @@ func Get(ctx *aero.Context) string {
|
||||
return ctx.Redirect("/")
|
||||
}
|
||||
|
||||
// CPU
|
||||
cpuUsage := 0.0
|
||||
cpuUsages, err := cpu.Percent(1*time.Second, false)
|
||||
// // CPU
|
||||
// cpuUsage := 0.0
|
||||
// cpuUsages, err := cpu.Percent(1*time.Second, false)
|
||||
|
||||
if err == nil {
|
||||
cpuUsage = cpuUsages[0]
|
||||
}
|
||||
// if err == nil {
|
||||
// cpuUsage = cpuUsages[0]
|
||||
// }
|
||||
|
||||
// Memory
|
||||
memUsage := 0.0
|
||||
memInfo, _ := mem.VirtualMemory()
|
||||
// // Memory
|
||||
// memUsage := 0.0
|
||||
// memInfo, _ := mem.VirtualMemory()
|
||||
|
||||
if err == nil {
|
||||
memUsage = memInfo.UsedPercent
|
||||
}
|
||||
// if err == nil {
|
||||
// memUsage = memInfo.UsedPercent
|
||||
// }
|
||||
|
||||
// Disk
|
||||
diskUsage := 0.0
|
||||
diskInfo, err := disk.Usage("/")
|
||||
// // Disk
|
||||
// diskUsage := 0.0
|
||||
// diskInfo, err := disk.Usage("/")
|
||||
|
||||
if err == nil {
|
||||
diskUsage = diskInfo.UsedPercent
|
||||
}
|
||||
// if err == nil {
|
||||
// diskUsage = diskInfo.UsedPercent
|
||||
// }
|
||||
|
||||
// Host
|
||||
platform, family, platformVersion, _ := host.PlatformInformation()
|
||||
kernelVersion, err := host.KernelVersion()
|
||||
kernelVersion, _ := host.KernelVersion()
|
||||
|
||||
return ctx.HTML(components.Admin(user, cpuUsage, memUsage, diskUsage, platform, family, platformVersion, kernelVersion))
|
||||
return ctx.HTML(components.Admin(user, platform, family, platformVersion, kernelVersion))
|
||||
}
|
||||
|
||||
func average(floatSlice []float64) float64 {
|
||||
if len(floatSlice) == 0 {
|
||||
return arn.DefaultAverageRating
|
||||
return 0
|
||||
}
|
||||
|
||||
var sum float64
|
||||
|
@ -8,32 +8,32 @@ component AdminTabs
|
||||
Icon("pencil")
|
||||
span.tab-text Editor
|
||||
|
||||
component Admin(user *arn.User, cpuUsage, memUsage, diskUsage float64, platform, family, platformVersion, kernelVersion string)
|
||||
component Admin(user *arn.User, platform, family, platformVersion, kernelVersion string)
|
||||
h1.page-title Admin Panel
|
||||
|
||||
AdminTabs
|
||||
|
||||
.widgets
|
||||
.widget.mountable
|
||||
h3.widget-title Usage
|
||||
//- .widget.mountable
|
||||
//- h3.widget-title Usage
|
||||
|
||||
table
|
||||
tbody
|
||||
tr
|
||||
td CPU usage:
|
||||
td
|
||||
span= int(cpuUsage + 0.5)
|
||||
span %
|
||||
tr
|
||||
td Memory usage:
|
||||
td
|
||||
span= int(memUsage + 0.5)
|
||||
span %
|
||||
tr
|
||||
td Disk usage:
|
||||
td
|
||||
span= int(diskUsage + 0.5)
|
||||
span %
|
||||
//- table
|
||||
//- tbody
|
||||
//- tr
|
||||
//- td CPU usage:
|
||||
//- td
|
||||
//- span= int(cpuUsage + 0.5)
|
||||
//- span %
|
||||
//- tr
|
||||
//- td Memory usage:
|
||||
//- td
|
||||
//- span= int(memUsage + 0.5)
|
||||
//- span %
|
||||
//- tr
|
||||
//- td Disk usage:
|
||||
//- td
|
||||
//- span= int(diskUsage + 0.5)
|
||||
//- span %
|
||||
|
||||
.widget.mountable
|
||||
h3.widget-title OS
|
||||
|
@ -51,7 +51,7 @@
|
||||
line-height content-line-height
|
||||
|
||||
.japanese
|
||||
color rgba(60, 60, 60, 0.5) !important
|
||||
color rgba(255, 255, 255, 0.5) !important
|
||||
|
||||
.anime-actions
|
||||
horizontal
|
||||
|
@ -17,8 +17,9 @@
|
||||
box-shadow shadow-light
|
||||
|
||||
.sound-track-footer
|
||||
text-align right
|
||||
text-align center
|
||||
margin-bottom 1rem
|
||||
margin-top 0.4rem
|
||||
font-size 0.9em
|
||||
|
||||
span
|
||||
|
@ -14,7 +14,11 @@ func Active(ctx *aero.Context) string {
|
||||
return user.IsActive() && user.HasAvatar()
|
||||
})
|
||||
|
||||
arn.SortUsersLastSeen(users)
|
||||
sort.Slice(users, func(i, j int) bool {
|
||||
return len(users[i].AnimeList().Watching().Items) > len(users[j].AnimeList().Watching().Items)
|
||||
})
|
||||
|
||||
// arn.SortUsersLastSeen(users)
|
||||
|
||||
return ctx.HTML(components.Users(users))
|
||||
}
|
||||
@ -57,16 +61,3 @@ func Staff(ctx *aero.Context) string {
|
||||
|
||||
return ctx.HTML(components.Users(users))
|
||||
}
|
||||
|
||||
// AnimeWatching ...
|
||||
func AnimeWatching(ctx *aero.Context) string {
|
||||
users := arn.FilterUsers(func(user *arn.User) bool {
|
||||
return user.IsActive() && user.HasAvatar()
|
||||
})
|
||||
|
||||
sort.Slice(users, func(i, j int) bool {
|
||||
return len(users[i].AnimeList().Watching().Items) > len(users[j].AnimeList().Watching().Items)
|
||||
})
|
||||
|
||||
return ctx.HTML(components.Users(users))
|
||||
}
|
||||
|
@ -11,6 +11,5 @@ component Users(users []*arn.User)
|
||||
component UsersTabs
|
||||
.tabs
|
||||
Tab("Active", "users", "/users")
|
||||
Tab("Watching", "tv", "/users/anime/watching")
|
||||
Tab("Osu", "gamepad", "/users/osu")
|
||||
Tab("Staff", "user-secret", "/users/staff")
|
Reference in New Issue
Block a user