From 87d78fa64b5583e7a7e0a0db020c7a4e0f133186 Mon Sep 17 00:00:00 2001 From: Chteufleur Date: Sun, 1 Nov 2015 16:51:21 +0100 Subject: [PATCH] Add utilisateur nav menu --- controllers/addTemp.go | 5 +++++ controllers/default.go | 5 +++++ controllers/relay.go | 18 +++++++++++++++++- controllers/sensors.go | 2 ++ controllers/user.go | 4 +++- controllers/viewTemp.go | 5 +++++ views/base/navbar.html | 7 +++++++ 7 files changed, 44 insertions(+), 2 deletions(-) diff --git a/controllers/addTemp.go b/controllers/addTemp.go index f738fcc..6f96ccc 100644 --- a/controllers/addTemp.go +++ b/controllers/addTemp.go @@ -17,6 +17,11 @@ type AddTempController struct { } func (c *AddTempController) Prepare() { + sess := c.GetSession(variables.SessionName) + if sess != nil { + c.Data["IsAuthentificated"] = true + } + c.Data["version"] = variables.Version } diff --git a/controllers/default.go b/controllers/default.go index 0a3559b..fb263e2 100644 --- a/controllers/default.go +++ b/controllers/default.go @@ -28,6 +28,11 @@ type MainController struct { } func (c *MainController) Prepare() { + sess := c.GetSession(variables.SessionName) + if sess != nil { + c.Data["IsAuthentificated"] = true + } + c.Data["version"] = variables.Version } diff --git a/controllers/relay.go b/controllers/relay.go index 44e3615..cc6f565 100644 --- a/controllers/relay.go +++ b/controllers/relay.go @@ -23,6 +23,13 @@ type ViewRelayController struct { } func (c *ViewRelayController) Prepare() { + sess := c.GetSession(variables.SessionName) + if sess == nil { + c.Redirect(variables.LoginRoute, 302) + } else { + c.Data["IsAuthentificated"] = true + } + c.Data["IsViewRelay"] = true; c.Data["version"] = variables.Version } @@ -76,7 +83,10 @@ type AddRelayController struct { } func (c *AddRelayController) Prepare() { - c.Data["version"] = variables.Version + sess := c.GetSession(variables.SessionName) + if sess == nil { + c.Redirect(variables.LoginRoute, 302) + } } func (c *AddRelayController) Get() { @@ -98,6 +108,12 @@ type CommandRelayController struct { beego.Controller } +func (c *CommandRelayController) Prepare() { + sess := c.GetSession(variables.SessionName) + if sess == nil { + c.Redirect(variables.LoginRoute, 302) + } +} func (c *CommandRelayController) Post() { mac := c.Ctx.Input.Param(":sensor") diff --git a/controllers/sensors.go b/controllers/sensors.go index e18dcdf..bfae89f 100644 --- a/controllers/sensors.go +++ b/controllers/sensors.go @@ -20,6 +20,8 @@ func (c *SensorsController) Prepare() { sess := c.GetSession(variables.SessionName) if sess == nil { c.Redirect(variables.LoginRoute, 302) + } else { + c.Data["IsAuthentificated"] = true } c.Data["IsSensor"] = true diff --git a/controllers/user.go b/controllers/user.go index c66fdc2..b77dea8 100644 --- a/controllers/user.go +++ b/controllers/user.go @@ -15,9 +15,11 @@ func (c *UserController) Prepare() { sess := c.GetSession(variables.SessionName) if sess == nil { c.Redirect(variables.LoginRoute, 302) + } else { + c.Data["IsAuthentificated"] = true } - // c.Data["IsSensor"] = true + c.Data["IsUser"] = true c.Data["version"] = variables.Version } diff --git a/controllers/viewTemp.go b/controllers/viewTemp.go index cab06f8..144db41 100644 --- a/controllers/viewTemp.go +++ b/controllers/viewTemp.go @@ -16,6 +16,11 @@ type ViewTempController struct { } func (c *ViewTempController) Prepare() { + sess := c.GetSession(variables.SessionName) + if sess != nil { + c.Data["IsAuthentificated"] = true + } + c.Data["IsViewTemp"] = true c.Data["version"] = variables.Version } diff --git a/views/base/navbar.html b/views/base/navbar.html index a4b5924..8471ba3 100644 --- a/views/base/navbar.html +++ b/views/base/navbar.html @@ -31,6 +31,13 @@ >Consommation electrique -->