rename instance to config,
simplify resource-chart code
This commit is contained in:
@@ -29,7 +29,7 @@ func Run() {
|
||||
router.GET("/account.html", routes.HandleGETAccount)
|
||||
router.GET("/", 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("/settings.html", routes.HandleGETSettings)
|
||||
|
||||
|
@@ -185,7 +185,7 @@ func GetAuth(c *gin.Context) (string, string, string, error) {
|
||||
token, errToken := c.Cookie("PVEAuthCookie")
|
||||
csrf, errCSRF := c.Cookie("CSRFPreventionToken")
|
||||
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 {
|
||||
return username, token, csrf, nil
|
||||
}
|
||||
|
@@ -7,12 +7,12 @@ import (
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func HandleGETInstance(c *gin.Context) {
|
||||
func HandleGETConfig(c *gin.Context) {
|
||||
_, _, _, err := common.GetAuth(c)
|
||||
if err == nil {
|
||||
c.HTML(http.StatusOK, "html/instance.html", gin.H{
|
||||
c.HTML(http.StatusOK, "html/config.html", gin.H{
|
||||
"global": common.Global,
|
||||
"page": "instance",
|
||||
"page": "config",
|
||||
})
|
||||
} else {
|
||||
c.Redirect(http.StatusFound, "/login.html")
|
@@ -115,7 +115,7 @@ func HandleGETInstancesFragment(c *gin.Context) {
|
||||
common.HandleNonFatalError(c, err)
|
||||
}
|
||||
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,
|
||||
})
|
||||
c.Status(http.StatusOK)
|
||||
|
Reference in New Issue
Block a user