From 5dbe7816cd833ed49eac7eb796ed2ac1716d13dd Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Tue, 3 Dec 2024 18:51:34 +0100 Subject: [PATCH] fix(card): Use correct template endpoints --- handlers/card.go | 30 ++++++++++++++++++++---------- models/card.go | 3 ++- services/templater.go | 3 ++- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/handlers/card.go b/handlers/card.go index e437471..b8a986c 100644 --- a/handlers/card.go +++ b/handlers/card.go @@ -48,6 +48,7 @@ func GenerateCard(c *fiber.Ctx) error { genConfig := &models.CardTemplateOptions{ Cards: cardRequest.Cards, + CardsSwapped: invertCardArrayItems(cardRequest.Cards), EventName: "Event name", CardSubtitle: "Card subtitle", BarcodeFormat: "ean13", @@ -60,15 +61,24 @@ func GenerateCard(c *fiber.Ctx) error { "error": err.Error(), }) } + c.Set(fiber.HeaderContentType, "text/html") + return c.SendString(result) + // converter := services.GotenbergConverter{BaseUrl: "http://localhost:3001"} + // pdf, err := converter.ToPdf(result, "a4", false) + // if err != nil { + // return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{ + // "error": err.Error(), + // }) + // } - converter := services.GotenbergConverter{BaseUrl: "http://localhost:3001"} - pdf, err := converter.ToPdf(result, "a5", true) - if err != nil { - return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{ - "error": err.Error(), - }) - } - - c.Set(fiber.HeaderContentType, "application/pdf") - return c.Send(pdf) + // c.Set(fiber.HeaderContentType, "application/pdf") + // return c.Send(pdf) +} + +func invertCardArrayItems(cards []models.Card) []models.Card { + inverted := make([]models.Card, 0) + for i := len(cards) - 1; i >= 0; i-- { + inverted = append(inverted, cards[i]) + } + return inverted } diff --git a/models/card.go b/models/card.go index cf7c574..0acfd17 100644 --- a/models/card.go +++ b/models/card.go @@ -1,7 +1,7 @@ package models type CardRequest struct { - Cards []Card `json:"card"` + Cards []Card `json:"cards"` Locale string `json:"locale" enums:"en,de"` } @@ -14,6 +14,7 @@ type Card struct { type CardTemplateOptions struct { Cards []Card `json:"cards"` + CardsSwapped []Card `json:"cards_swapped"` EventName string `json:"event_name"` CardSubtitle string `json:"card_subtitle"` BarcodeFormat string `json:"barcode_format"` diff --git a/services/templater.go b/services/templater.go index a63752c..7036615 100644 --- a/services/templater.go +++ b/services/templater.go @@ -84,7 +84,8 @@ func (t *DefaultTemplater) GenerateBarcode(code int, format string, prefix strin func (t *DefaultTemplater) StringToTemplate(templateString string) (*template.Template, error) { return template.New("template").Funcs(template.FuncMap{ - "barcode": t.GenerateBarcode, + "barcode": t.GenerateBarcode, + "sponsorLogo": func(id int) string { return "a" }, }).Parse(templateString) }