Design anpassungen

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,
 	})
 }
 

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),
 	})
 }
 

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
 	}

templates/pages/admin/category_admin.html

@@ -1,5 +1,23 @@
 {{ define "admin_categoryList" }}
-<h1>Adminpage vom {{ .spiel.Name }}</h1>
+<section class="breadcrumb-section pb-3 pt-3">
+    <div class="container">
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="/">Home</a></li>
+            <li class="breadcrumb-item"><a href="/section/{{ .spiel.ID }}">{{ .spiel.Name }}</a></li>
+            <!--<li class="breadcrumb-item active" aria-current="page">{{ .product.Name}}</li>-->
+        </ol>
+    </div>
+</section>
+<section class="pb-4 pt-4">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-8 col-md-4">
+                <div class="sidebar">
+                    <div class="sidebar-widget">
+                        <div class="widget-title">
+                            <h3>Admin page vom {{ .spiel.Name }}</h3>
+                        </div>
+                        <div class="widget-content">
                             {{ if .error }}
                             <div class="alert alert-warning">
                                 {{ range $i, $msg := .error }}
@@ -7,12 +25,19 @@
                                 {{ end }}
                             </div>
                             {{ end }}
+                            <ul>
                                 {{ range $i, $category := .categories }}
-<li><a href="/products/cat/{{ $category.ID }}">{{ $category.Name }}</a></li>
+                                <li>{{ $category.Name }}</li>
                                 {{ end }}
-
+                            </ul>
                             {{ template "admin_categoryAdd" $d := .spiel.ID }}
-
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
 {{ end }}
 
 
@@ -31,7 +56,6 @@
         <button type="submit" class="btn btn-primary my-4">Speichern</button>
     </div>
 </form>
-
 {{ end }}
 
 

templates/pages/categories.html

@@ -3,8 +3,8 @@
     <div class="container">
         <ol class="breadcrumb">
             <li class="breadcrumb-item"><a href="/">Home</a></li>
-            <li class="breadcrumb-item"><a href="/products">Products</a></li>
+            <li class="breadcrumb-item"><a href="/section/{{ .game.ID }}">{{ .game.Name }}</a></li>
-            <li class="breadcrumb-item active" aria-current="page">{{ .product.Name}}</li>
+            <!--<li class="breadcrumb-item active" aria-current="page">{{ .product.Name}}</li>-->
         </ol>
     </div>
 </section>
@@ -16,6 +16,11 @@
                     <div class="sidebar-widget">
                         <div class="widget-title">
                             <h3>Kategorien</h3>
+                            {{ if .user }}
+                            {{ if .user.Admin }}
+                            <a href="/admin/category/{{ .game.ID }}">Bearbeiten</a>
+                            {{ end }}
+                            {{ end }}
                         </div>
                         <div class="widget-content widget-categories">
                             <ul>

templates/pages/products.html

@@ -2,8 +2,9 @@
 <section class="breadcrumb-section pb-3 pt-3">
     <div class="container">
         <ol class="breadcrumb">
-            <li class="breadcrumb-item"><a href="#">Home</a></li>
+            <li class="breadcrumb-item"><a href="/">Home</a></li>
-            <li class="breadcrumb-item active" aria-current="page">Products</li>
+            <li class="breadcrumb-item" aria-current="page"><a href="/section/{{.category.Section.ID}}">{{ .category.Section.Name }}</a></li>
+            <li class="breadcrumb-item active" aria-current="page">{{ .category.Name }}</li>
         </ol>
     </div>
 </section>
@@ -78,6 +79,11 @@
                         <div class="products-top">
                             <div class="products-top-inner">
                                 <div class="products-found">
+                                    {{ if .user }}
+                                    {{ if .user.Admin }}
+                                    <a href="/admin/product/add/{{.category.ID}}">Hinzufügen</a>
+                                    {{ end }}
+                                    {{ end }}
                                     {{ if eq (len .products) 1 }}
                                     <p><span>1 Produkt gefunden</span></p>
                                     {{ else }}