Skip to content

N
nexpie-grafana-theme
Commit 56d449b2 by Torkel Ödegaard
Options

updated

parent 24579d86
Showing with 22 additions and 11 deletions
backend/api/api.go
......@@ -39,7 +39,10 @@ func (self *HttpServer) ListenAndServe() {
self.router = gin.Default()
self.router.Use(CacheHeadersMiddleware())
self.router.Use(self.AuthMiddleware())
self.router.Static("/public", "./public")
self.router.Static("/app", "./public/app")
self.router.Static("/img", "./public/img")
// register & parse templates
templates := template.New("templates")
......@@ -47,15 +50,14 @@ func (self *HttpServer) ListenAndServe() {
templates.ParseFiles("./views/index.html")
self.router.SetHTMLTemplate(templates)
// register default route
self.router.GET("/", self.index)
for _, fn := range routeHandlers {
fn(self)
}
self.router.Static("/public", "./public")
self.router.Static("/app", "./public/app")
self.router.Static("/img", "./public/img")
// register default route
self.router.GET("/", self.AuthMiddleware(), self.index)
self.router.GET("/login/*_", self.index)
self.router.GET("/dashboard/*_", self.index)
self.router.Run(":" + self.port)
}
......@@ -64,9 +66,17 @@ func (self *HttpServer) index(c *gin.Context) {
c.HTML(200, "index.html", &indexViewModel{title: "hello from go"})
}
func (self *HttpServer) login(c *gin.Context) {
c.HTML(200, "login.html", &indexViewModel{title: "hello from go"})
}
func (self *HttpServer) AuthMiddleware() gin.HandlerFunc {
return func(c *gin.Context) {
session, _ := sessionStore.Get(c.Request, "grafana-session")
// if session.Values["login"] == nil {
// c.Writer.Header().Set("Location", "/login/login#login")
// c.Abort(302)
// }
session.Values["asd"] = 1
session.Save(c.Request, c.Writer)
}
......
grafana @ c690d4aa
Subproject commit 8699dec57162ed419da47e7206ea58f8ec3250a3
Subproject commit c690d4aae84fc39d7c4bf9a0a820a71f69059b78
grafana-pro
No preview for this file type
views/index.html
......@@ -7,11 +7,12 @@
<meta name="viewport" content="width=device-width">
<title>Grafana</title>
<link rel="stylesheet" href="public/css/grafana.dark.min.css" title="Dark">
<link rel="stylesheet" href="/public/css/grafana.dark.min.css" title="Dark">
<base href="/">
<!-- build:js app/app.js -->
<script src="public/vendor/require/require.js"></script>
<script src="public/app/components/require.config.js"></script>
<script src="/public/vendor/require/require.js"></script>
<script src="/public/app/components/require.config.js"></script>
<!-- endbuild -->
<script>require(['app'], function (app) { app.boot(); })</script>
......@@ -20,7 +21,7 @@
<body ng-cloak ng-controller="GrafanaCtrl">
<link rel="stylesheet" href="public/css/grafana.light.min.css" ng-if="grafana.style === 'light'">
<link rel="stylesheet" href="/public/css/grafana.light.min.css" ng-if="grafana.style === 'light'">
<div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} dashboard-notice" ng-show="$last">
<button type="button" class="close" ng-click="dashAlerts.clear(alert)" style="padding-right:50px">&times;</button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment