From 0746d945a61ca3dc7588a1f7a2c320ca8a06e198 Mon Sep 17 00:00:00 2001
From: jan <jan@ruken.pw>
Date: Sun, 27 Dec 2015 21:29:50 +0100
Subject: =?UTF-8?q?dashboard=20auch=20f=C3=BCr=20nicht=20eingeloggte=20ben?=
 =?UTF-8?q?utzer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


diff --git a/dashboard.go b/dashboard.go
index 63dcdfc..0ca38ef 100644
--- a/dashboard.go
+++ b/dashboard.go
@@ -7,11 +7,7 @@ import (
 )
 
 func viewDashboard(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-	user, err := app.Charakterin.GetUserFromRequest(r)
-	if err != nil {
-		http.Redirect(w, r, "/", 302)
-		return
-	}
+	user, _ := app.Charakterin.GetUserFromRequest(r)
 
 	var categories []grilist.DashboardCategory
 
diff --git a/main.go b/main.go
index dacdfe1..6dec94c 100644
--- a/main.go
+++ b/main.go
@@ -19,12 +19,6 @@ import (
 var app *grilist.Grilist
 
 func index(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-	_, err := app.Charakterin.GetUserFromRequest(r)
-	if err != nil {
-		http.Redirect(w, r, "/login", 302)
-		return
-	}
-
 	http.Redirect(w, r, "/dashboard", 302)
 }
 
diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index a7e822a..154bf74 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -177,29 +177,33 @@ func rowsToCard(rows *sql.Rows) []frontend.Card {
 func (m *Module) ProvideDashboardData(user *charakterin.User) []grilist.DashboardCategory {
 	var categories []grilist.DashboardCategory
 
-	// Listen des Benutzers
-	rows, err := m.g.DB.Query(`SELECT id, name, description FROM grilist.lists WHERE user_id = $1`, user.ID)
+	// Neue Listen
+	rows, err := m.g.DB.Query(`SELECT id, name, description FROM grilist.lists ORDER BY id DESC LIMIT 5`)
 	if err != nil {
 		log.Println(err)
-		return []grilist.DashboardCategory{}
+		return categories
 	}
 	defer rows.Close()
 
 	categories = append(categories, grilist.DashboardCategory{
-		Title: "Meine Listen",
+		Title: "Neueste Listen",
 		Cards: rowsToCard(rows),
 	})
 
-	// Neue Listen
-	rows, err = m.g.DB.Query(`SELECT id, name, description FROM grilist.lists ORDER BY id DESC LIMIT 5`)
+	if user == nil {
+		return categories
+	}
+
+	// Listen des Benutzers
+	rows, err = m.g.DB.Query(`SELECT id, name, description FROM grilist.lists WHERE user_id = $1`, user.ID)
 	if err != nil {
 		log.Println(err)
-		return categories
+		return []grilist.DashboardCategory{}
 	}
 	defer rows.Close()
 
 	categories = append(categories, grilist.DashboardCategory{
-		Title: "Neueste Listen",
+		Title: "Meine Listen",
 		Cards: rowsToCard(rows),
 	})
 
diff --git a/views/navbar.html b/views/navbar.html
index c4bbace..70911e4 100644
--- a/views/navbar.html
+++ b/views/navbar.html
@@ -6,6 +6,9 @@
 						{{ if .user }}
 						<li><a href="/">{{ .user.Name }}</a></li>
 						<li><a href="/logout">Ausloggen</a></li>
+						{{ else }}
+						<li><a href="/login">Einloggen</a></li>
+						<li><a href="/register">Registrieren</a></li>
 						{{ end }}
 					</ul>
 					</div>
-- 
cgit v0.10.1