ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-27 05:49:04 +01:00
Code Issues Packages Releases Activity

Remove separate Login struct in Page struct

Browse Source
This commit is contained in:
Jan Eitzinger 2022-02-03 09:38:08 +01:00
parent 9766bddb97
commit c98863f22e
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
auth/auth.go
View File

@ -192,9 +192,7 @@ func Login(db *sqlx.DB) http.Handler {
rw.WriteHeader(http.StatusUnauthorized) rw.WriteHeader(http.StatusUnauthorized)
templates.Render(rw, r, "login.tmpl", &templates.Page{ templates.Render(rw, r, "login.tmpl", &templates.Page{
Title: "Login failed", Title: "Login failed",
Login: &templates.LoginPage{
Error: "Username or password incorrect", Error: "Username or password incorrect",
},
}) })
return return
} }
@ -293,9 +291,7 @@ func Auth(next http.Handler) http.Handler {
rw.WriteHeader(http.StatusUnauthorized) rw.WriteHeader(http.StatusUnauthorized)
templates.Render(rw, r, "login.tmpl", &templates.Page{ templates.Render(rw, r, "login.tmpl", &templates.Page{
Title: "Authentication failed", Title: "Authentication failed",
Login: &templates.LoginPage{
Error: "No valid session or JWT provided", Error: "No valid session or JWT provided",
},
}) })
return return
} }
@ -351,8 +347,6 @@ func Logout(rw http.ResponseWriter, r *http.Request) {
templates.Render(rw, r, "login.tmpl", &templates.Page{ templates.Render(rw, r, "login.tmpl", &templates.Page{
Title: "Logout successful", Title: "Logout successful",
Login: &templates.LoginPage{
Info: "Logout successful", Info: "Logout successful",
},
}) })
} }

8
templates/login.tmpl
View File

@ -7,15 +7,15 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-4 mx-auto"> <div class="col-4 mx-auto">
{{if .Login.Error}} {{if .Error}}
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning" role="alert">
{{.Login.Error}} {{.Error}}
</div> </div>
{{end}} {{end}}
{{if .Login.Info}} {{if .Info}}
<div class="alert alert-success" role="alert"> <div class="alert alert-success" role="alert">
{{.Login.Info}} {{.Info}}
</div> </div>
{{end}} {{end}}