diff options
| -rw-r--r-- | data/storage/recipes/0/text | 8 | ||||
| -rw-r--r-- | data/storage/recipes/1/text | 2 | ||||
| -rw-r--r-- | data/templates/recipe.html | 2 | ||||
| -rw-r--r-- | recipe.go | 11 |
4 files changed, 13 insertions, 10 deletions
diff --git a/data/storage/recipes/0/text b/data/storage/recipes/0/text index aeee825..b0adef8 100644 --- a/data/storage/recipes/0/text +++ b/data/storage/recipes/0/text @@ -6,15 +6,15 @@ { "text":"Prepare vegetables.", "ingredients":[ - {"type":"carrot", "amount":"3 pieces"}, - {"type":"tomato", "amount":250} + {"amount":3, "unit":"pieces", "type":"carrot"}, + {"amount":250, "unit":"g", "type":"tomato"} ] }, { "text":"Cook those vegetables", "ingredients":[ - {"type":"water", "amount":null}, - {"type":"salt", "amount":null} + {"amount":0, "unit":"", "type":"water"}, + {"amount":0, "unit":"", "type":"salt"} ] } ] diff --git a/data/storage/recipes/1/text b/data/storage/recipes/1/text index d082bf7..1c4acb8 100644 --- a/data/storage/recipes/1/text +++ b/data/storage/recipes/1/text @@ -6,7 +6,7 @@ { "text":"Bake the frozen pizza!", "ingredients":[ - {"type":"pizza", "amount":"4 pieces"} + {"amount":4, "unit":"pieces", "type":"pizza"} ] } ] diff --git a/data/templates/recipe.html b/data/templates/recipe.html index bec6eb5..a91f025 100644 --- a/data/templates/recipe.html +++ b/data/templates/recipe.html @@ -22,7 +22,7 @@ {{range .Recipe.Steps}} <section> <p>{{.Text}}</p> - <p><i>{{range $i, $el := .Ingredients}}{{if $i}}, {{end}}{{$el.Amount}} {{$el.Type}}{{end}}</i></p> + <p><i>{{range $i, $el := .Ingredients}}{{if $i}}, {{end}}{{if ne $el.Amount 0.0}}{{$el.Amount}} {{end}}{{if ne $el.Unit ""}}{{$el.Unit}} {{end}}{{$el.Type}}{{end}}</i></p> </section> {{end}} @@ -15,13 +15,16 @@ type recipe struct { Url string Steps []struct { Text string - Ingredients []struct { - Type string - Amount any - } + Ingredients []ingredient } } +type ingredient struct { + Amount float32 + Unit string + Type string +} + func getRecipeText(id string) ([]byte, error) { var b []byte textpath := filepath.Join(config.Data, "recipes", id, "text") |