prefil prices on edititem

Reviewed-on: #16

controllers/shopItemController.go

@@ -68,6 +68,9 @@ func (rc *shopItemController) GetById(c *gin.Context) {
 	ReplyOK(c, shopItem)
 }
 
+// this currently creates quite big preview images
+// workaround is running the following command in the uploads folder:
+// for file in *.png; do convert "$file" -resize 35% "$file"; done
 func (rc *shopItemController) NewShopItemFromForm(ctx *gin.Context) (models.ShopItem, error) {
 	defaultImagePath := "static/img/zine.jpg"
 	name := ctx.PostForm("name")
@@ -106,6 +109,14 @@ func (rc *shopItemController) NewShopItemFromForm(ctx *gin.Context) (models.Shop
 			if err != nil {
 				fmt.Println("Error during pdftoppm: ", err.Error())
 			}
+
+			cmd2 := exec.Command("convert", dstImage, "-resize", "35%", dstImage)
+			_, err = cmd2.Output()
+
+			if err != nil {
+				fmt.Println("Error during resizing preview image: ", err.Error())
+			}
+
 		}
 	} else {
 		fmt.Println(err)
@@ -365,6 +376,13 @@ func (rc *shopItemController) AddItemsHandler(c *gin.Context) {
 			fmt.Println("Error during pdftoppm: ", err.Error())
 		}
 
+		cmd2 := exec.Command("convert", dstImage, "-resize", "35%", dstImage)
+		_, err = cmd2.Output()
+
+		if err != nil {
+			fmt.Println("Error during resizing preview image: ", err.Error())
+		}
+
 		category, err := models.ParseCategory("Zine")
 		if err != nil {
 			errorHandler(err)
@@ -414,21 +432,65 @@ func (rc *shopItemController) AddItemsHandler(c *gin.Context) {
 	c.HTML(http.StatusOK, "batchupload.html", data)
 }
 
-func (rc *shopItemController) EditItemView(c *gin.Context) {
+func GetCheckedTags(item models.ShopItem) ([]models.CheckedTag, error) {
-	shopItem, err := repositories.ShopItems.GetById(c.Param("id"))
+	allTags, err := repositories.Tags.GetAll()
-	tags, err := repositories.Tags.GetAll()
 
 	if err != nil {
-		c.HTML(http.StatusBadRequest, "edititem.html", gin.H{"error": err})
+		return nil, err
 	}
 
-	fmt.Println(shopItem)
+	var tags []models.CheckedTag
+	for _, tag := range allTags {
+		tmpTag := models.CheckedTag{
+			Tag:     tag,
+			Checked: "",
+		}
+
+		for _, itemTag := range item.Tags {
+			if itemTag.Name == tmpTag.Name {
+				tmpTag.Checked = "checked"
+				break
+			}
+		}
+
+		tags = append(tags, tmpTag)
+	}
+
+	return tags, nil
+}
+
+func (rc *shopItemController) EditItemView(c *gin.Context) {
+	shopItem, err := repositories.ShopItems.GetById(c.Param("id"))
+
+	if err != nil {
+		c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": err})
+	}
+
+	tags, err := GetCheckedTags(shopItem)
+
+	if err != nil {
+		c.HTML(http.StatusBadRequest, "error.html", gin.H{"error": err})
+	}
+
+	priceBW := ""
+	priceColored := ""
+	for _, variant := range shopItem.Variants {
+		if variant.Name == "B/W" {
+			priceBW = fmt.Sprintf("%.2f", variant.Price)
+		}
+
+		if variant.Name == "Colored" {
+			priceColored = fmt.Sprintf("%.2f", variant.Price)
+		}
+	}
 
 	data := CreateSessionData(c, gin.H{
 		"error":        "",
 		"success":      "",
 		"shopItem":     shopItem,
 		"tags":         tags,
+		"priceBW":      priceBW,
+		"priceColored": priceColored,
 	})
 
 	c.HTML(http.StatusOK, "edititem.html", data)
@@ -471,18 +533,34 @@ func (rc *shopItemController) EditItemHandler(c *gin.Context) {
 
 	newShopItem.PrintMode = shopItem.PrintMode
 
-	tags, err := repositories.Tags.GetAll()
+	tags, err := GetCheckedTags(newShopItem)
 	if err != nil {
 		c.HTML(http.StatusBadRequest, "edititem.html", gin.H{"error": err})
 		return
 	}
 
+	priceBW := ""
+	priceColored := ""
+
+	for _, variant := range newShopItem.Variants {
+		if variant.Name == "B/W" {
+			priceBW = fmt.Sprintf("%.2f", variant.Price)
+		}
+
+		if variant.Name == "Colored" {
+			priceColored = fmt.Sprintf("%.2f", variant.Price)
+		}
+	}
+
 	_, err = repositories.ShopItems.Update(newShopItem)
 	if err != nil {
 		data := CreateSessionData(c, gin.H{
 			"error":        err,
 			"success":      "",
+			"shopItem":     newShopItem,
 			"tags":         tags,
+			"priceBW":      priceBW,
+			"priceColored": priceColored,
 		})
 
 		c.HTML(http.StatusOK, "edititem.html", data)
@@ -492,7 +570,10 @@ func (rc *shopItemController) EditItemHandler(c *gin.Context) {
 	data := CreateSessionData(c, gin.H{
 		"error":        "",
 		"success":      fmt.Sprintf("Item '%s' Updated", newShopItem.Name),
+		"shopItem":     newShopItem,
 		"tags":         tags,
+		"priceBW":      priceBW,
+		"priceColored": priceColored,
 	})
 
 	c.HTML(http.StatusOK, "edititem.html", data)

controllers/userController.go

@@ -188,6 +188,7 @@ func (rc *UserController) RegisterHandler(c *gin.Context) {
 		}
 
 		c.HTML(http.StatusOK, "register.html", data)
+		return
 	}
 
 	tokenExists, err := repositories.Tokens.Exists(token)

flake.nix

@@ -20,6 +20,8 @@
         go
         gotools
         poppler_utils #get first pdf page to png
+        cups
+        imagemagick
         tailwindcss
       ];
     };
@@ -71,6 +73,8 @@
           environment.systemPackages = [ 
             zineshop-pkg
             pkgs.poppler_utils #get first pdf page to png
+            pkgs.cups
+            pkgs.imagemagick
           ];
 
           systemd.tmpfiles.rules = [
@@ -100,7 +104,7 @@
               WorkingDirectory = "/var/lib/zineshop";
               ExecStart = pkgs.writeScript "start-zineshop" ''
                 #! ${pkgs.bash}/bin/bash
-                PATH="$PATH:${lib.makeBinPath [ pkgs.poppler_utils ]}"
+                PATH="$PATH:${lib.makeBinPath [ pkgs.poppler_utils pkgs.cups pkgs.imagemagick ]}"
                 ${zineshop-pkg}/bin/zineshop
               '';
               Restart = "on-failure";

models/tag.go

@@ -14,6 +14,11 @@ type Tag struct {
 	ShopItems []ShopItem `gorm:"many2many:item_tags;"`
 }
 
+type CheckedTag struct {
+	Tag
+	Checked string
+}
+
 func NewTag(ctx *gin.Context) (Tag, error) {
 	colors := []string{
 		"red",

views/edititem.html

@@ -5,9 +5,19 @@
     <img class="mx-auto h-10 w-auto" src="/static/img/logo-black.png" alt="Your Company">
     <h2 class="mt-10 text-center text-2xl/9 font-bold tracking-tight text-gray-900">Edit Item</h2>
 
+      <p class="mt-10 text-center text-sm/6 text-red-500">
+      {{ .data.error }}
+      </p>
+      <p class="mt-10 text-center text-sm/6 text-green-500">
+      {{ .data.success }}
+      </p>
+
             <a href="/shopitems/{{ .data.shopItem.ID }}">
       <img src="/{{ .data.shopItem.Image }}" alt="Product Image" class="aspect-4/5 mx-auto rounded-md bg-gray-200 object-cover group-hover:opacity-75 lg:aspect-auto lg:h-80">
             </a>
+
+
+
   </div>
 
 
@@ -37,7 +47,7 @@
            <div class="space-y-2">
              {{ range .data.tags }}
                <label class="flex text-sm/6 items-center">
-                 <input type="checkbox" class="form-checkbox h-4 w-4 text-gray-900" value="{{ .ID }}" name="tags[]">
+                 <input type="checkbox" {{ .Checked }} class="form-checkbox h-4 w-4 text-gray-900" value="{{ .ID }}" name="tags[]">
                    <span class="ml-2 text-sm/6 text-gray-900">{{ .Name }}</span>
                </label>
             {{ end }}
@@ -65,7 +75,7 @@
           <label for="variant-value1" class="block text-sm/6 font-medium text-gray-900">Price B/W</label>
         </div>
         <div class="mt-2">
-          <input type="number" name="variant-value[]" id="variant-value1" step="0.01" min="0.00" required class="block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6">
+          <input type="number" value="{{ .data.priceBW }}" name="variant-value[]" id="variant-value1" step="0.01" min="0.00" required class="block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6">
         </div>
       </div>
 
@@ -76,7 +86,7 @@
           <label for="variant-value2" class="block text-sm/6 font-medium text-gray-900">Price Colored</label>
         </div>
         <div class="mt-2">
-          <input type="number" name="variant-value[]" id="variant-value2" step="0.01" min="0.00" class="block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6">
+          <input type="number" value="{{ .data.priceColored }}" name="variant-value[]" id="variant-value2" step="0.01" min="0.00" class="block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6">
         </div>
       </div>
 
@@ -131,20 +141,13 @@
         Print Mode
       </label>
       <select name="print-mode" required class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
-        <option selected value="CreateBooklet">Create Booklet</option>
+        <option selected value="{{ .data.shopItem.PrintMode }}">{{ .data.shopItem.PrintMode }}</option>
+          <option value="CreateBooklet">CreateBooklet</option>
           <option value="LongEdge">Long Edge</option>
           <option value="ShortEdge">Short Edge</option>
       </select>
 
 
-      <p class="mt-10 text-center text-sm/6 text-red-500">
-      {{ .data.error }}
-      </p>
-      <p class="mt-10 text-center text-sm/6 text-green-500">
-      {{ .data.success }}
-      </p>
-
-
       <div>
         <button type="submit" class="flex w-full justify-center rounded-md bg-indigo-600 px-3 py-1.5 text-sm/6 font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600">Update Item</button>
       </div>

views/header.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title>Zine Shop</title>
+  <title>Zines</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link href="/static/output.css" rel="stylesheet">

views/shopitems.html

@@ -8,7 +8,7 @@
 
     <div class="myClass group relative">
             <a href="/shopitems/{{ .ID }}">
-      <img src="/{{ .Image }}" alt="Product Image" class="aspect-4/5 mx-auto rounded bg-gray-200 object-cover group-hover:opacity-75 lg:aspect-auto lg:h-80">
+      <img loading="lazy" src="/{{ .Image }}" alt="Product Image" class="aspect-4/5 mx-auto rounded bg-gray-200 object-cover group-hover:opacity-75 lg:aspect-auto lg:h-80">
             </a>
       <div class="mt-4 flex justify-between">
         <div>