Implement basic recipe target with JSON

3 files changed, 64 insertions, 12 deletions

diff --git a/data/templates/recipe.html b/data/templates/recipe.html
index 348a44d..7bbb660 100644
--- a/data/templates/recipe.html
+++ b/data/templates/recipe.html
@@ -11,11 +11,26 @@
 				<a href="/index.html">HOME</a>
 				<a href="/add_recipes">add recipe</a>
 			</nav>
-			<h1>{{.Title}}</h1>
+			<h1>{{.Recipe.Title}}</h1>
 		</header>
 
 		<main>
-			{{.Html}}
+			<p>This recipe is written for {{.Recipe.Portions}} portions.</p>
+
+			<p><a href="{{.Recipe.Url}}">Link</a></p>
+
+			<hr>
+
+			{{range .Recipe.Steps}}
+				<p>{{.Text}}</p>
+				<ul>
+				{{range .Ingredients}}
+				<li>{{.Amount}} {{.Type}}</li>
+				{{end}}
+				</ul>
+				<hr>
+			{{end}}
+
 			<a href="/recipe/edit?id={{.Id}}"><button>edit</button></a>
 
 			{{ template "footer.html" }}
diff --git a/handler.go b/handler.go
index de055d3..04c4581 100644
--- a/handler.go
+++ b/handler.go
@@ -63,18 +63,18 @@ func recipeGet(w http.ResponseWriter, r *http.Request) {
 	}
 	idStr := ids[0]
 
-	textpath := filepath.Join(config.Data, "recipes", idStr, "text")
-	data, _ := ioutil.ReadFile(textpath)
-	markup := Markup(data)
-
-	recipe := Recipe{
-		idStr,
-		markup.title(),
-		string(data),
-		markup.html(),
+	rec, err := getRecipe(idStr)
+	if err != nil {
+		http.Error(w, "Could not get recipe.", 400)
+		return
 	}
 
-	ServeTemplate(w, "recipe.html", recipe)
+	data := struct{
+		Id     string
+		Recipe recipe
+	}{idStr, rec}
+
+	ServeTemplate(w, "recipe.html", data)
 }
 
 func recipeEditGet(w http.ResponseWriter, r *http.Request) {
diff --git a/recipe.go b/recipe.go
new file mode 100644
index 0000000..167f690
--- /dev/null
+++ b/recipe.go
@@ -0,0 +1,37 @@
+package main
+
+import (
+	"encoding/json"
+	"path/filepath"
+	"io/ioutil"
+)
+
+type recipe struct {
+	Title    string
+	Portions int
+	Url      string
+	Steps    []struct {
+		Text        string
+		Ingredients []struct {
+			Type   string
+			Amount any
+		}
+	}
+}
+
+func getRecipe(id string) (recipe, error) {
+	r := recipe{}
+
+	textpath := filepath.Join(config.Data, "recipes", id, "text")
+	data, err := ioutil.ReadFile(textpath)
+	if err != nil {
+		return r, err
+	}
+
+	err = json.Unmarshal(data, &r)
+	if err != nil {
+		return r, err
+	}
+
+	return r, nil
+}