diff --git a/app/controllers/category_controller.go b/app/controllers/category_controller.go index 5a2b41f..15893be 100644 --- a/app/controllers/category_controller.go +++ b/app/controllers/category_controller.go @@ -20,9 +20,13 @@ func (server *Server) Categories(w http.ResponseWriter, r *http.Request) { return } + game, _ := models.GetSectionByID(server.DB, vars["id"]) + categoryModel := models.Category{} categories, err := categoryModel.GetCategory(server.DB, vars["id"]) + user := server.CurrentUser(w, r) + println(user) if err != nil { println(err.Error()) @@ -30,7 +34,10 @@ func (server *Server) Categories(w http.ResponseWriter, r *http.Request) { } _ = renderer.HTML(w, http.StatusOK, "categories", map[string]interface{}{ + + "game": game, "categories": categories, + "user": user, }) } diff --git a/app/controllers/product_controller.go b/app/controllers/product_controller.go index 217a565..780c71b 100644 --- a/app/controllers/product_controller.go +++ b/app/controllers/product_controller.go @@ -106,18 +106,19 @@ func (server *Server) ProductsByCategory(w http.ResponseWriter, r *http.Request) return } - category := vars["id"] + categoryID := vars["id"] if page <= 0 { page = 1 } - println(category) perPage := 9 _ = perPage productModel := models.Product{} + categoryModel := models.Category{} - products, totalRows, err := productModel.GetProductsByCategory(server.DB, category) + category, _ := categoryModel.GetCategoryByID(server.DB, categoryID) + products, totalRows, err := productModel.GetProductsByCategory(server.DB, categoryID) if err != nil { return @@ -127,6 +128,8 @@ func (server *Server) ProductsByCategory(w http.ResponseWriter, r *http.Request) _ = renderer.HTML(w, http.StatusOK, "products", map[string]interface{}{ "products": products, + "category": category, + "user": server.CurrentUser(w, r), }) } diff --git a/app/models/Category.go b/app/models/Category.go index 09d5c65..9d904a1 100644 --- a/app/models/Category.go +++ b/app/models/Category.go @@ -31,7 +31,7 @@ func (p *Category) GetCategory(db *gorm.DB, sectionID string) (*[]Category, erro func (p *Category) GetCategoryByID(db *gorm.DB, categoryID string) (*Category, error) { var result Category - err := db.Debug().Model(&Category{}).Where("id = ?", categoryID).Find(&result).Error + err := db.Debug().Preload("Section").Model(&Category{}).Where("id = ?", categoryID).Find(&result).Error if err != nil { return nil, err } diff --git a/templates/pages/admin/category_admin.html b/templates/pages/admin/category_admin.html index 6a9defa..7ca6d4a 100644 --- a/templates/pages/admin/category_admin.html +++ b/templates/pages/admin/category_admin.html @@ -1,18 +1,43 @@ {{ define "admin_categoryList" }} -

Adminpage vom {{ .spiel.Name }}

-{{ if .error }} -
- {{ range $i, $msg := .error }} - {{ $msg }}
- {{ end }} -
-{{ end }} -{{ range $i, $category := .categories }} -
  • {{ $category.Name }}
    • -{{ end }} - -{{ template "admin_categoryAdd" $d := .spiel.ID }} - +
    +
    +
      +
    1. Home
      2. +
    2. {{ .spiel.Name }}
      3. + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Admin page vom {{ .spiel.Name }}

    +
    +
    + {{ if .error }} +
    + {{ range $i, $msg := .error }} + {{ $msg }}
    + {{ end }} +
    + {{ end }} +
      + {{ range $i, $category := .categories }} +
    • {{ $category.Name }}
      • + {{ end }} +
    + {{ template "admin_categoryAdd" $d := .spiel.ID }} +
    +
    +
    +
    +
    +
    +
    {{ end }} @@ -31,7 +56,6 @@ - {{ end }} diff --git a/templates/pages/categories.html b/templates/pages/categories.html index c05b334..7345bb0 100644 --- a/templates/pages/categories.html +++ b/templates/pages/categories.html @@ -3,8 +3,8 @@
    1. Home
      2. -
    2. Products
      3. -
    3. {{ .product.Name}}
      4. +
    4. {{ .game.Name }}
      5. +
    @@ -16,6 +16,11 @@

    Kategorien

    + {{ if .user }} + {{ if .user.Admin }} + Bearbeiten + {{ end }} + {{ end }}