diff options
| author | xengineering <me@xengineering.eu> | 2024-04-07 12:04:11 +0200 |
|---|---|---|
| committer | xengineering <me@xengineering.eu> | 2024-05-12 20:52:25 +0200 |
| commit | bf328dd38a28cf44cfa81c7f1dcd95936d2d0301 (patch) | |
| tree | b82d8b791bd3dbbb850c9e4620ca7456fe2a7c45 | |
| parent | 01d97189d245300d65ca31d650dd868d1d1fc0d8 (diff) | |
| download | ceres-bf328dd38a28cf44cfa81c7f1dcd95936d2d0301.tar ceres-bf328dd38a28cf44cfa81c7f1dcd95936d2d0301.tar.zst ceres-bf328dd38a28cf44cfa81c7f1dcd95936d2d0301.zip | |
view: Add ingredient overview to recipe read page
| -rw-r--r-- | model/recipe.go | 8 | ||||
| -rw-r--r-- | view/html/recipe.html | 12 |
2 files changed, 15 insertions, 5 deletions
diff --git a/model/recipe.go b/model/recipe.go index 7f8a1d5..7aebad4 100644 --- a/model/recipe.go +++ b/model/recipe.go @@ -260,11 +260,15 @@ func RecipeTestData() []Recipe { {Amount: "4", Unit: "pieces", Type: "egg"}, {Amount: "800", Unit: "g", Type: "special stuff"}, {Amount: "0.5", Unit: "l", Type: "milk"}, - {Amount: "", Unit: "", Type: "salt"}, }, }, {Text: "Heat up pan", Ingredients: []Ingredient{}}, - {Text: "Make pancakes!", Ingredients: []Ingredient{}}, + { + Text: "Make pancakes!", + Ingredients: []Ingredient{ + {Amount: "", Unit: "", Type: "sugar"}, + }, + }, }, }, { diff --git a/view/html/recipe.html b/view/html/recipe.html index 3d9ab63..d794b9d 100644 --- a/view/html/recipe.html +++ b/view/html/recipe.html @@ -11,10 +11,16 @@ <p> <button onclick="window.location.href='/recipe/{{.Id}}?view=recipe-edit';">edit</button> <button onclick="window.location.href='/recipe/{{.Id}}?view=recipe-confirm-deletion';">delete</button> - </p>{{ if ne .Portions "" }} + </p>{{ if ne .Notes "" }} + <p class="notice" style="white-space: pre-line;">{{.Notes}}</p>{{end}}{{ if ne .Portions "" }} <p><i>Portions:</i> {{.Portions}}</p>{{end}}{{ if ne .Url "" }} - <p><i>Original recipe:</i> <a href="{{.Url}}">link</a></p>{{end}}{{ if ne .Notes "" }} - <p class="notice" style="white-space: pre-line;">{{.Notes}}</p>{{end}}{{range .Steps}} + <p><i>Original recipe:</i> <a href="{{.Url}}">link</a></p>{{end}} + <p><i>Ingredients:</i></p> + <ul> + {{range .Steps}}{{range $i, $el := .Ingredients}} + <li>{{if ne $el.Amount ""}}{{$el.Amount}} {{end}}{{if ne $el.Unit ""}}{{$el.Unit}} {{end}}{{$el.Type}}</li> + {{end}}{{end}} + </ul>{{range .Steps}} <section> <p>{{.Text}}</p> <p><i>{{range $i, $el := .Ingredients}}{{if $i}}, {{end}}{{if ne $el.Amount ""}}{{$el.Amount}} {{end}}{{if ne $el.Unit ""}}{{$el.Unit}} {{end}}{{$el.Type}}{{end}}</i></p> |