Merge branch 'master' of projekte.fagott.pw:grilist

5 files changed, 117 insertions, 45 deletions

diff --git a/dashboard.go b/dashboard.go
index aa6405c..6e81d6b 100644
--- a/dashboard.go
+++ b/dashboard.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-        "net/http"
         "fagott.pw/grilist/grilist"
         "github.com/julienschmidt/httprouter"
+        "net/http"
 )
 
 func viewDashboard(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
@@ -12,18 +12,18 @@ func viewDashboard(w http.ResponseWriter, r *http.Request, _ httprouter.Params)
                 http.Redirect(w, r, "/", 302)
                 return
         }
-        
+
         var categories []grilist.DashboardCategory
-        
+
         for _, module := range app.Modules {
-                category := module.ProvideDashboardData(user)
-                
-                if len(category.Cards) > 0 {
-                        categories = append(categories, category)
+                for _, category := range module.ProvideDashboardData(user) {
+                        if len(category.Cards) > 0 {
+                                categories = append(categories, category)
+                        }
                 }
         }
-        
+
         data := make(map[string]interface{})
         data["categories"] = categories
         app.Renderer.RenderPage("dashboard", w, data)
-}
\ No newline at end of file
+}
diff --git a/grilist/grilist.go b/grilist/grilist.go
index b166966..baff81c 100644
--- a/grilist/grilist.go
+++ b/grilist/grilist.go
@@ -25,7 +25,7 @@ type Module interface {
         Init(*Grilist)
         Interface() interface{}
         Name() string
-        ProvideDashboardData(*charakterin.User) DashboardCategory
+        ProvideDashboardData(*charakterin.User) []DashboardCategory
 }
 
 // DashboardCategory ist eine Kategorie mit Karten, die auf dem Dashboard angezeigt werden.
diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index 6ce7c5e..fa1f21c 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -6,7 +6,7 @@ import (
 )
 
 type GrilsModule struct {
-        g *grilist.Grilist
+        g    *grilist.Grilist
         Test []int
 }
 
@@ -16,16 +16,16 @@ func (m *GrilsModule) Name() string {
 
 func (m *GrilsModule) Init(g *grilist.Grilist) {
         m.g = g
-        m.Test = append(m.Test, len(m.Test) + 1)
+        m.Test = append(m.Test, len(m.Test)+1)
 }
 
 func (m *GrilsModule) Interface() interface{} {
-        m.Test = append(m.Test, len(m.Test) + 1)
+        m.Test = append(m.Test, len(m.Test)+1)
         return m
 }
 
-func (m *GrilsModule) ProvideDashboardData(user *charakterin.User) grilist.DashboardCategory {
-        return grilist.DashboardCategory{}
+func (m *GrilsModule) ProvideDashboardData(user *charakterin.User) []grilist.DashboardCategory {
+        return []grilist.DashboardCategory{}
 }
 
 func New() *GrilsModule {
diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index 4e0036a..343ba62 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -1,37 +1,46 @@
 package lists
 
 import (
+        "database/sql"
         "fagott.pw/charakterin"
         "fagott.pw/grilist/frontend"
         "fagott.pw/grilist/grilist"
         "fagott.pw/grilist/modules/grils"
+        "fmt"
         "log"
+        "time"
 )
 
-type ListsModule struct {
-        g *grilist.Grilist
+// Module und so.
+type Module struct {
+        g     *grilist.Grilist
         grils *grils.GrilsModule
 }
 
+// List ist eine Liste an DINGEN.
 type List struct {
-        ID int
-        Name string
+        ID          int
+        Name        string
         Description string
-        Owner *charakterin.User
+        Owner       *charakterin.User
+        ForkOf      int
+        UpdatedAt   time.Time
 }
 
-func (m *ListsModule) Name() string {
+// Name gibt den Namen des Moduls zurück
+func (m *Module) Name() string {
         return "Lists"
 }
 
-func (m *ListsModule) Init(g *grilist.Grilist) {
+// Init initialisiert das Modul
+func (m *Module) Init(g *grilist.Grilist) {
         m.g = g
-        
+
         gm, ok := g.Modules["Grils"]
         if !ok {
                 log.Fatal("lists: grils module not found")
         }
-        
+
         grilsModule, ok := gm.Interface().(*grils.GrilsModule)
         if !ok {
                 log.Fatal("lists: error with grils module")
@@ -39,39 +48,99 @@ func (m *ListsModule) Init(g *grilist.Grilist) {
         m.grils = grilsModule
 }
 
-func (m *ListsModule) Interface() interface{} {
+// Interface gibt das Modul zurück
+func (m *Module) Interface() interface{} {
         return m
 }
 
-func (m *ListsModule) ProvideDashboardData(user *charakterin.User) grilist.DashboardCategory {
-        data := grilist.DashboardCategory{
-                Title: "Meine Listen",
-        }
-        
-        rows, err := m.g.DB.Query(`SELECT id, name, description FROM grilist.lists WHERE user_id = $1`, user.ID)
+// GetUserLists gibt die Listen eines Benutzers zurück.
+func (m *Module) GetUserLists(u *charakterin.User) []*List {
+        var lists []*List
+
+        rows, err := m.g.DB.Query(`SELECT id, name, description, fork_of, updated_at FROM grilist.lists WHERE user_id = $1`, u.ID)
         if err != nil {
-                return data
+                return lists
         }
-        
+
         defer rows.Close()
         for rows.Next() {
-                card := frontend.Card{}
-                view := frontend.Action{
-                        Name: "anguckieren",
+                list := &List{}
+
+                if err := rows.Scan(&list.ID, &list.Name, &list.Description, &list.ForkOf, &list.UpdatedAt); err != nil {
+                        log.Println("error scanning row", err)
+                        continue
                 }
+
+                lists = append(lists, list)
+        }
+
+        return lists
+}
+
+func mkCard(title, description string, actions ...frontend.Action) frontend.Card {
+        card := frontend.Card{
+                Title:       title,
+                Description: description,
+                Size:        "medium",
+        }
+
+        for _, action := range actions {
+                card.Actions = append(card.Actions, action)
+        }
+
+        return card
+}
+
+func rowsToCard(rows *sql.Rows) []frontend.Card {
+        var cards []frontend.Card
+
+        for rows.Next() {
                 var id int
-                if err := rows.Scan(&id, &card.Title, &card.Description); err != nil {
-                        log.Println("error scanning row",err)
+                var title, description string
+                if err := rows.Scan(&id, &title, &description); err != nil {
+                        log.Println("error scanning row", err)
                         continue
                 }
-                
-                card.Actions = []frontend.Action{view}
-                data.Cards = append(data.Cards, card)
+
+                cards = append(cards, mkCard(title, description, frontend.Action{"anguckieren", fmt.Sprintf("/lists/%d", id)}))
+        }
+        return cards
+}
+
+// ProvideDashboardData gibt Daten für das Dashboard bezogen auf den Benutzer zurück
+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)
+        if err != nil {
+                log.Println(err)
+                return []grilist.DashboardCategory{}
         }
-        
-        return data
+        defer rows.Close()
+
+        categories = append(categories, grilist.DashboardCategory{
+                Title: "Meine 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 err != nil {
+                log.Println(err)
+                return categories
+        }
+        defer rows.Close()
+
+        categories = append(categories, grilist.DashboardCategory{
+                Title: "Neueste Listen",
+                Cards: rowsToCard(rows),
+        })
+
+        return categories
 }
 
-func New() *ListsModule {
-        return &ListsModule{}
+// New erstellt eine neue Instanz des Modules
+func New() *Module {
+        return &Module{}
 }
diff --git a/views/dashboard.html b/views/dashboard.html
index 67fb005..a000b57 100644
--- a/views/dashboard.html
+++ b/views/dashboard.html
@@ -7,6 +7,9 @@
         </head>
         <body>
                         <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>