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

10 files changed, 131 insertions, 51 deletions

diff --git a/assets/css/gril.css b/assets/css/gril.css
index 409ef51..5b5bd84 100644
--- a/assets/css/gril.css
+++ b/assets/css/gril.css
@@ -1,4 +1,13 @@
 h1 > small {
         padding-left: 8px;
         font-size: 50%;
+}
+
+.card-title.big {
+        font-size: 36px !important;
+}
+
+.card-content.center-big {
+        padding-top: 9px;
+        padding-bottom: 9px;
 }
\ No newline at end of file
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/frontend/renderer.go b/frontend/renderer.go
index e9b9931..a3aa83d 100644
--- a/frontend/renderer.go
+++ b/frontend/renderer.go
@@ -7,8 +7,9 @@ import (
 
 // Action ist die Aktion auf einer Card.
 type Action struct {
-        Name string
-        Link string
+        Name     string
+        Link     string
+        Disabled bool
 }
 
 // Card ist eine Karte im Materialize-Design.
@@ -41,8 +42,14 @@ func (r *Renderer) SetDefaultData(data map[string]interface{}) {
 
 // New erstellt einen neuen Renderer und sucht alle Templates aus dem gegebenen pfad.
 func New(path string) *Renderer {
+        // Custom Template Funcs
+        funcMap := template.FuncMap{
+                "html": func(in string) template.HTML {
+                        return template.HTML(in)
+                },
+        }
         r := &Renderer{
-                template.Must(template.ParseGlob(path + "/*")),
+                template.Must(template.ParseGlob(path + "/*")).Funcs(funcMap),
                 make(map[string]interface{}),
         }
 
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/grils/gril.go b/modules/grils/gril.go
index 9fd3be5..edf25a9 100644
--- a/modules/grils/gril.go
+++ b/modules/grils/gril.go
@@ -23,4 +23,5 @@ type Gril struct {
         Tags       []string
         ForeignIDs map[DataSource]int
         UpdatedAt  time.Time
+        Lists      []int
 }
diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index e2eb543..a38f41f 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -74,6 +74,26 @@ func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*Gr
         return grils, nil
 }
 
+func (m *GrilsModule) GetListsOfGril(gril *Gril) error {
+        rows, err := m.g.DB.Query(`SELECT list_id FROM grilist.lists_grils WHERE gril_id = $1`, gril.ID)
+        if err != nil {
+                return err
+        }
+
+        defer rows.Close()
+        for rows.Next() {
+                var listID int
+                if err := rows.Scan(&listID); err != nil {
+                        log.Println(err)
+                        continue
+                }
+
+                gril.Lists = append(gril.Lists, listID)
+        }
+
+        return nil
+}
+
 func (m *GrilsModule) ProvideDashboardData(user *charakterin.User) []grilist.DashboardCategory {
         var categories []grilist.DashboardCategory
 
@@ -137,6 +157,10 @@ func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprou
                 return
         }
 
+        if err := m.GetListsOfGril(gril); err != nil {
+                log.Println(err)
+        }
+
         data := m.g.Renderer.DefaultData()
         data["user"] = user
         data["gril"] = gril
diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index a7e822a..47501c2 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -143,32 +143,30 @@ func (m *Module) FromID(id int) (*List, error) {
         return lists[0], nil
 }
 
-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 {
+func listsToCards(lists []*List) []frontend.Card {
         var cards []frontend.Card
 
-        for rows.Next() {
-                var id int
-                var title, description string
-                if err := rows.Scan(&id, &title, &description); err != nil {
-                        log.Println("error scanning row", err)
-                        continue
+        for _, list := range lists {
+                s := "s"
+                if len(list.Grils) == 1 {
+                        s = ""
                 }
-
-                cards = append(cards, mkCard(title, description, frontend.Action{"anguckieren", fmt.Sprintf("/list/%d", id)}))
+                cards = append(cards, frontend.Card{
+                        Title:       list.Name,
+                        Description: list.Description,
+                        Size:        "medium",
+                        Actions: []frontend.Action{
+                                frontend.Action{
+                                        Name: "anguckieren",
+                                        Link: fmt.Sprintf("/list/%d", list.ID),
+                                },
+                                frontend.Action{
+                                        Name: fmt.Sprintf(`<span class="chip">%d gril%s</span>`, len(list.Grils), s),
+                                        Link: "#",
+                                        Disabled: true,
+                                },
+                        },
+                })
         }
         return cards
 }
@@ -177,30 +175,32 @@ 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
+        lists, err := m.getLists(`1=1 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",
-                Cards: rowsToCard(rows),
+                Title: "Neueste Listen",
+                Cards: listsToCards(lists),
         })
 
-        // 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
+        lists, err = m.getLists(`user_id = $1`, user.ID)
         if err != nil {
                 log.Println(err)
                 return categories
         }
-        defer rows.Close()
 
         categories = append(categories, grilist.DashboardCategory{
-                Title: "Neueste Listen",
-                Cards: rowsToCard(rows),
+                Title: "Meine Listen",
+                Cards: listsToCards(lists),
         })
 
         return categories
diff --git a/views/dashboard.html b/views/dashboard.html
index f2d410d..0551285 100644
--- a/views/dashboard.html
+++ b/views/dashboard.html
@@ -16,12 +16,16 @@
                                                         <div class="col s12 m6 l4">
                                                                 <div class="card white">
                                                                         <div class="card-content black-text">
-                                                                                <span class="card-title">{{ $card.Title }}</span>
-                                                                                <p>{{ $card.Description }}</p>
+                                                                                <span class="card-title">{{ $card.Title | html }}</span>
+                                                                                <p>{{ $card.Description | html }}</p>
                                                                         </div>
                                                                         <div class="card-action">
                                                                                 {{ range $action := $card.Actions }}
-                                                                                        <a href="{{ $action.Link }}">{{ $action.Name }}</a>
+                                                                                        {{ if $action.Disabled }}
+                                                                                        <span>{{ $action.Name | html }}</span>
+                                                                                        {{ else }}
+                                                                                        <a href="{{ $action.Link }}">{{ $action.Name | html }}</a>
+                                                                                        {{ end }}
                                                                                 {{ end }}
                                                                         </div>
                                                                 </div>
diff --git a/views/gril.html b/views/gril.html
index 3983061..c7ecbdc 100644
--- a/views/gril.html
+++ b/views/gril.html
@@ -16,6 +16,48 @@
                                         {{ $tag }}
                                 </div>
                                 {{ end }}
+                                <br />
+                                <br />
+                                <div class="row">
+                                {{ if $gril.Birthday.Valid }}
+                                <div class="col s6 m2 l2">
+                                        <div class="card">
+                                                <div class="card-content purple-text text-lighten-2 center-align">
+                                                        <span class="card-title big">{{ $gril.Birthday.Value}}</span>
+                                                                <p>geburtstag</p>
+                                                </div>
+                                        </div>
+                                </div>
+                                {{ else if $gril.Age.Valid }}
+                                <div class="col s6 m2 l2">
+                                        <div class="card">
+                                                <div class="card-content purple-text text-lighten-2 center-align">
+                                                        <span class="card-title big">{{ $gril.Age.Value }}</span>
+                                                                <p>jahre alt</p>
+                                                </div>
+                                        </div>
+                                </div>
+                                {{ end }}
+                                {{ if $gril.Lists }}
+                                <div class="col s6 m2 l2">
+                                        <div class="card">
+                                                <div class="card-content center-big purple-text text-lighten-2 center-align">
+                                                        <p>in</p>
+                                                        <span class="card-title big">{{ len $gril.Lists}}</span>
+                                                        <p>liste{{ if ne (len $gril.Lists) 1 }}n{{ end }}</p>
+                                                </div>
+                                        </div>
+                                </div>
+                                {{ end }}
+                                <div class="col s12 m4 l4">
+                                        <div class="card">
+                                                <div class="card-content purple-text text-lighten-2 center-align">
+                                                        <span class="card-title big">{{ $gril.UpdatedAt.Format "Jan 02, 2006" }}</span>
+                                                                <p>aktualisiert</p>
+                                                </div>
+                                        </div>
+                                </div>
+                                </div>
                         </div>
         </body>
 </html>
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>