tronnet/ProxmoxAAS-Dashboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename instance to config,

Browse Source 
simplify resource-chart code
This commit is contained in:
Arthur Lu
2025-04-02 20:39:38 +00:00
parent add58d849e
commit bd0387976f
12 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/app.go
View File

@@ -29,7 +29,7 @@ func Run() {
router.GET("/account.html", routes.HandleGETAccount) router.GET("/account.html", routes.HandleGETAccount)
router.GET("/", routes.HandleGETIndex) router.GET("/", routes.HandleGETIndex)
router.GET("/index.html", routes.HandleGETIndex) router.GET("/index.html", routes.HandleGETIndex)
router.GET("/instance.html", routes.HandleGETInstance) router.GET("/config.html", routes.HandleGETConfig)
router.GET("/login.html", routes.HandleGETLogin) router.GET("/login.html", routes.HandleGETLogin)
router.GET("/settings.html", routes.HandleGETSettings) router.GET("/settings.html", routes.HandleGETSettings)

2
app/common/utils.go
View File

@@ -185,7 +185,7 @@ func GetAuth(c *gin.Context) (string, string, string, error) {
token, errToken := c.Cookie("PVEAuthCookie") token, errToken := c.Cookie("PVEAuthCookie")
csrf, errCSRF := c.Cookie("CSRFPreventionToken") csrf, errCSRF := c.Cookie("CSRFPreventionToken")
if errUsername != nil || errAuth != nil || errToken != nil || errCSRF != nil { if errUsername != nil || errAuth != nil || errToken != nil || errCSRF != nil {
return "", "", "", fmt.Errorf("auth: %s, token: %s, csrf: %s", errAuth, errToken, errCSRF) return "", "", "", fmt.Errorf("error occured getting user cookies: (auth: %s, token: %s, csrf: %s)", errAuth, errToken, errCSRF)
} else { } else {
return username, token, csrf, nil return username, token, csrf, nil
} }

6
app/routes/instance.go → app/routes/config.go
View File

@@ -7,12 +7,12 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
func HandleGETInstance(c *gin.Context) { func HandleGETConfig(c *gin.Context) {
_, _, _, err := common.GetAuth(c) _, _, _, err := common.GetAuth(c)
if err == nil { if err == nil {
c.HTML(http.StatusOK, "html/instance.html", gin.H{ c.HTML(http.StatusOK, "html/config.html", gin.H{
"global": common.Global, "global": common.Global,
"page": "instance", "page": "config",
}) })
} else { } else {
c.Redirect(http.StatusFound, "/login.html") c.Redirect(http.StatusFound, "/login.html")

2
app/routes/index.go
View File

@@ -115,7 +115,7 @@ func HandleGETInstancesFragment(c *gin.Context) {
common.HandleNonFatalError(c, err) common.HandleNonFatalError(c, err)
} }
c.Header("Content-Type", "text/plain") c.Header("Content-Type", "text/plain")
common.TMPL.ExecuteTemplate(c.Writer, "templates/instances.frag", gin.H{ common.TMPL.ExecuteTemplate(c.Writer, "html/instances.frag", gin.H{
"instances": instances, "instances": instances,
}) })
c.Status(http.StatusOK) c.Status(http.StatusOK)

2
web/html/instance.html → web/html/config.html
View File

@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
{{template "head" .}} {{template "head" .}}
<script src="scripts/instance.js" type="module"></script> <script src="scripts/config.js" type="module"></script>
<script src="scripts/draggable.js" type="module"></script> <script src="scripts/draggable.js" type="module"></script>
<script src="modules/Sortable.min.js"></script> <script src="modules/Sortable.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/sortablejs@latest/Sortable.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/sortablejs@latest/Sortable.min.js"></script>

2
web/html/index.html
View File

@@ -56,7 +56,7 @@
</div> </div>
<div id="instance-container"> <div id="instance-container">
{{range .instances}} {{range .instances}}
{{template "instance" .}} {{template "instance-card" .}}
{{end}} {{end}}
</div> </div>
</div> </div>

3
web/html/instances.frag Normal file
View File

@@ -0,0 +1,3 @@
{{range .instances}}
{{template "instance-card" .}}
{{end}}

0
web/scripts/instance.js → web/scripts/config.js
View File

2
web/scripts/index.js
View File

@@ -179,7 +179,7 @@ class InstanceCard extends HTMLElement {
handleConfigButton () { handleConfigButton () {
if (!this.actionLock && this.status === "stopped") { // if the action lock is false, and the node is stopped, then navigate to the config page with the node info in the search query if (!this.actionLock && this.status === "stopped") { // if the action lock is false, and the node is stopped, then navigate to the config page with the node info in the search query
goToPage("instance.html", { node: this.node.name, type: this.type, vmid: this.vmid }); goToPage("config.html", { node: this.node.name, type: this.type, vmid: this.vmid });
} }
} }

2
web/templates/instance.tmpl → web/templates/instance-card.tmpl
View File

@@ -1,4 +1,4 @@
{{define "instance"}} {{define "instance-card"}}
<instance-card data-type="{{.Type}}" data-status="{{.Status}}" data-vmid="{{.VMID}}" data-name="{{.Name}}" data-node="{{.Node}}" data-nodestatus="{{.NodeStatus}}"> <instance-card data-type="{{.Type}}" data-status="{{.Status}}" data-vmid="{{.VMID}}" data-name="{{.Name}}" data-node="{{.Node}}" data-nodestatus="{{.NodeStatus}}">
<template shadowrootmode="open"> <template shadowrootmode="open">
<link rel="stylesheet" href="modules/w3.css"> <link rel="stylesheet" href="modules/w3.css">

3
web/templates/instances.frag
View File

@@ -1,3 +0,0 @@
{{range .instances}}
{{template "instance" .}}
{{end}}

6
web/templates/resource-chart.tmpl
View File

@@ -35,11 +35,7 @@
<progress value="{{.Used}}" max="{{.Max}}"></progress> <progress value="{{.Used}}" max="{{.Max}}"></progress>
<p id="caption"> <p id="caption">
<span>{{.Name}}</span> <span>{{.Name}}</span>
{{if eq .Type "list"}} <span>{{printf "%g" .Avail}} {{.Prefix}}{{.Unit}} Avaliable</span>
<span>{{.Avail}} {{.Prefix}}{{.Unit}} Avaliable</span>
{{else}}
<span>{{printf "%.2f" .Avail}} {{.Prefix}}{{.Unit}} Avaliable</span>
{{end}}
</p> </p>
</div> </div>
</template> </template>