10 files changed, 47 insertions, 61 deletions

diff --git a/dashboard.go b/dashboard.go
index 6e81d6b..63dcdfc 100644
--- a/dashboard.go
+++ b/dashboard.go
@@ -25,5 +25,6 @@ func viewDashboard(w http.ResponseWriter, r *http.Request, _ httprouter.Params)
 
         data := make(map[string]interface{})
         data["categories"] = categories
+        data["user"] = user
         app.Renderer.RenderPage("dashboard", w, data)
 }
diff --git a/frontend/renderer.go b/frontend/renderer.go
index 0a2b7e9..e9b9931 100644
--- a/frontend/renderer.go
+++ b/frontend/renderer.go
@@ -21,13 +21,29 @@ type Card struct {
 
 // Renderer rendert Seiten.
 type Renderer struct {
-        templates *template.Template
+        templates   *template.Template
+        defaultData map[string]interface{}
+}
+
+// DefaultData gibt die Standard-Daten für die Views zurück. Das ist immer eine Kopie weil Reasons.
+func (r *Renderer) DefaultData() map[string]interface{} {
+        d := make(map[string]interface{})
+        for k, v := range r.defaultData {
+                d[k] = v
+        }
+        return d
+}
+
+// SetDefaultData updated die standarddaten
+func (r *Renderer) SetDefaultData(data map[string]interface{}) {
+        r.defaultData = data
 }
 
 // New erstellt einen neuen Renderer und sucht alle Templates aus dem gegebenen pfad.
 func New(path string) *Renderer {
         r := &Renderer{
                 template.Must(template.ParseGlob(path + "/*")),
+                make(map[string]interface{}),
         }
 
         return r
@@ -35,6 +51,12 @@ func New(path string) *Renderer {
 
 // RenderPage rendert eine bestimmte Seite (basierend auf dem Template-Namen) und den gegebenen Daten.
 func (r *Renderer) RenderPage(name string, w http.ResponseWriter, data map[string]interface{}) {
+        // default daten einspeisen
+        for k, v := range r.defaultData {
+                if _, ok := data[k]; !ok {
+                        data[k] = v
+                }
+        }
         err := r.templates.ExecuteTemplate(w, name, data)
         if err != nil {
                 http.Error(w, err.Error(), http.StatusInternalServerError)
diff --git a/main.go b/main.go
index 70763d4..dacdfe1 100644
--- a/main.go
+++ b/main.go
@@ -9,8 +9,8 @@ import (
         "fagott.pw/charakterin"
         "fagott.pw/grilist/frontend"
         "fagott.pw/grilist/grilist"
-        "fagott.pw/grilist/modules/lists"
         "fagott.pw/grilist/modules/grils"
+        "fagott.pw/grilist/modules/lists"
 
         "github.com/julienschmidt/httprouter"
         _ "github.com/lib/pq"
diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index fbe57e3..3663c7f 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -73,10 +73,7 @@ func (m *GrilsModule) FromID(id int) (*Gril, error) {
 }
 
 func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
-        loggedIn := false
-        if user, _ := m.g.Charakterin.GetUserFromRequest(r); user != nil {
-                loggedIn = true
-        }
+        user, _ := m.g.Charakterin.GetUserFromRequest(r)
         sid := p.ByName("id")
 
         id, err := strconv.Atoi(sid)
@@ -91,8 +88,8 @@ func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprou
                 return
         }
 
-        data := make(map[string]interface{})
-        data["loggedIn"] = loggedIn
+        data := m.g.Renderer.DefaultData()
+        data["user"] = user
         data["gril"] = gril
 
         m.g.Renderer.RenderPage("gril", w, data)
diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index 519bb36..970b15b 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -207,10 +207,7 @@ func (m *Module) ProvideDashboardData(user *charakterin.User) []grilist.Dashboar
 }
 
 func (m *Module) viewList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
-        loggedIn := false
-        if user, _ := m.g.Charakterin.GetUserFromRequest(r); user != nil {
-                loggedIn = true
-        }
+        user, _ := m.g.Charakterin.GetUserFromRequest(r)
         sid := p.ByName("id")
 
         id, err := strconv.Atoi(sid)
@@ -225,8 +222,8 @@ func (m *Module) viewList(w http.ResponseWriter, r *http.Request, p httprouter.P
                 return
         }
 
-        data := make(map[string]interface{})
-        data["loggedIn"] = loggedIn
+        data := m.g.Renderer.DefaultData()
+        data["user"] = user
         data["list"] = list
 
         m.g.Renderer.RenderPage("list", w, data)
diff --git a/views/dashboard.html b/views/dashboard.html
index a000b57..a9a01d9 100644
--- a/views/dashboard.html
+++ b/views/dashboard.html
@@ -6,10 +6,8 @@
                 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
         </head>
         <body>
+                        {{ template "navbar" . }}
                         <div class="container">
-                                <div class="row right-align">
-                                        <a class="waves-effect waves-teal btn-flat large" style="top: 24px; font-size: 18px" href="/logout">Ausloggen</a>
-                                </div>
                                 <div class="row">
                                         {{ range $category := .categories }}
                                                 <h2>{{ $category.Title }}</h2>
diff --git a/views/gril.html b/views/gril.html
index d62fc75..d623abf 100644
--- a/views/gril.html
+++ b/views/gril.html
@@ -8,12 +8,8 @@
                 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
         </head>
         <body>
+                        {{ template "navbar" . }}
                         <div class="container">
-                                {{ if .loggedIn }}
-                                <div class="row right-align">
-                                        <a class="waves-effect waves-teal btn-flat large" style="top: 24px; font-size: 18px" href="/logout">Ausloggen</a>
-                                </div>
-                                {{ end }}
                                 <h1>{{ $gril.RomajiName }}<small>{{ $gril.KanjiName }}</small></h1>
                         </div>
         </body>
diff --git a/views/index.html b/views/index.html
deleted file mode 100644
index 81c801f..0000000
--- a/views/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{{ define "index" }}
-<html>
-        <head>
-                                {{ template "materialize" }}
-                <title>grilist</title>
-                <style>
-                        body {
-                                height: 100%;
-                                                                width: 100%;
-                                overflow: hidden;
-                        }
-                                                
-                                                h1 {
-                                                        font-size: 100px;
-                                                }
-                                                
-                                                h1 >small {
-                                                        margin-top: -50px;
-                                                        font-size: 20%;
-                                                }
-                </style>
-                <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
-        </head>
-        <body class="valign-wrapper center-align">
-                <div class="container">
-                                        <div class="center-align">
-                                                <h1>grilist<small class="blue-grey-text lighten-1">#tamtam</small></h1>
-                                                
-                                                <a class="btn waves-effect waves-light cyan lighten-3" href="/logout">Ausloggen</a>
-                                        </div>
-                </div>
-        </body>
-</html>
-{{ end }}
\ No newline at end of file
diff --git a/views/list.html b/views/list.html
index 63cfd9c..fb5f7a3 100644
--- a/views/list.html
+++ b/views/list.html
@@ -8,12 +8,8 @@
                 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
         </head>
         <body>
+                        {{ template "navbar" . }}
                         <div class="container">
-                                {{ if .loggedIn }}
-                                <div class="row right-align">
-                                        <a class="waves-effect waves-teal btn-flat large" style="top: 24px; font-size: 18px" href="/logout">Ausloggen</a>
-                                </div>
-                                {{ end }}
                                 <h1>{{ $list.Name }}<small>von xyz</small></h1><br />
                                 <ul>
                                 {{ range $lg := $list.Grils }}
diff --git a/views/navbar.html b/views/navbar.html
new file mode 100644
index 0000000..c4bbace
--- /dev/null
+++ b/views/navbar.html
@@ -0,0 +1,13 @@
+{{ define "navbar" }}
+                                <nav>
+                                        <div class="nav-wrapper purple lighten-2">
+                                        <a href="/" class="brand-logo center">grilist</a>
+                                        <ul id="nav-mobile" class="right hide-on-med-and-down">
+                                                {{ if .user }}
+                                                <li><a href="/">{{ .user.Name }}</a></li>
+                                                <li><a href="/logout">Ausloggen</a></li>
+                                                {{ end }}
+                                        </ul>
+                                        </div>
+                                </nav>
+{{ end }}
\ No newline at end of file