demo: use path params instead of query params

Author: EwenQuim

examples/full-app-gourmet/controller/recipe.go

@@ -60,7 +60,7 @@ func (rs recipeRessource) newRecipe(c *fuego.ContextWithBody[store.CreateRecipeP
 }
 
 func (rs recipeRessource) getRecipeWithIngredients(c fuego.ContextNoBody) ([]store.GetIngredientsOfRecipeRow, error) {
-	recipe, err := rs.IngredientRepository.GetIngredientsOfRecipe(c.Context(), c.QueryParam("id"))
+	recipe, err := rs.IngredientRepository.GetIngredientsOfRecipe(c.Context(), c.PathParam("id"))
 	if err != nil {
 		return nil, err
 	}

examples/full-app-gourmet/templa/admin/ingredient.list.templ

@@ -38,7 +38,7 @@ templ IngredientList(ingredients []store.Ingredient, parameters components.Searc
 						<tr>
 							<td class="border-b border-zinc-100 dark:border-zinc-700 p-4 pr-8 text-zinc-700 dark:text-zinc-300">
 								<a
-									href={ templ.URL("/admin/ingredients/one?id=" + ingredient.ID) }
+									href={ templ.URL("/admin/ingredients/" + ingredient.ID) }
 									hx-boost="true"
 									hx-target="#page"
 									hx-select="#page"

examples/full-app-gourmet/templa/admin/ingredient.page.templ

@@ -9,7 +9,7 @@ templ IngredientPage(ingredient store.Ingredient) {
 		<h1>Edit Ingredient</h1>
 		@IngredientForm(IngredientFormProps{
 			Ingredient: ingredient,
-			FormAction:"/admin/ingredients/one?id=" + ingredient.ID,
+			FormAction:"/admin/ingredients/" + ingredient.ID,
 			IsCreating: false,
 			HXTrigger: "change delay:500ms",
 		})

examples/full-app-gourmet/templa/admin/recipe.list.templ

@@ -40,7 +40,7 @@ templ RecipeList(recipes []store.Recipe, parameters components.SearchParams) {
 						<tr>
 							<td class="border-b border-zinc-100 dark:border-zinc-700 p-4 pr-8 text-zinc-700 dark:text-zinc-300">
 								<a
-									href={ templ.URL("/admin/recipes/one?id=" + recipe.ID) }
+									href={ templ.URL("/admin/recipes/" + recipe.ID) }
 									hx-boost="true"
 									hx-target="#page"
 									hx-select="#page"

examples/full-app-gourmet/templa/admin/recipe.page.templ

@@ -17,7 +17,7 @@ templ RecipePage(props RecipePageProps) {
 			Recipe: props.Recipe,
 			Dosings: props.Dosings,
 			AllIngredients: props.AllIngredients,
-			FormAction:"/admin/recipes/one?id=" + props.Recipe.ID,
+			FormAction:"/admin/recipes/" + props.Recipe.ID,
 			IsCreating: false,
 			HXTrigger: "change delay:500ms",
 		})

examples/full-app-gourmet/templa/components/slider.templ

@@ -14,7 +14,7 @@ templ SliderRecipes(recipes []store.Recipe) {
 			@Card(CardProps{
 					Title: recipe.Name,
 					WhenToEat: recipe.WhenToEat,
-					Link: "/recipes/one?id=" + recipe.ID,
+					Link: "/recipes/" + recipe.ID,
 					ImageURL: recipe.ImageUrl,
 					Body: recipe.Description,
 				})

examples/full-app-gourmet/templa/ingredient.list.templ

@@ -15,7 +15,7 @@ templ IngredientList(props IngredientListProps) {
 			for _, ingredient := range props.Ingredients {
 				@components.Card(components.CardProps{
 					Title: ingredient.Name,
-					Link: "/ingredients/one?id=" + ingredient.ID,
+					Link: "/ingredients/" + ingredient.ID,
 					ImageURL: "",
 					Body: ingredient.Description,
 				})

examples/full-app-gourmet/templa/recipe.list.templ

@@ -17,7 +17,7 @@ templ RecipeList(props RecipeListProps) {
 				@components.Card(components.CardProps{
 					Title: recipe.Name,
 					WhenToEat: recipe.WhenToEat,
-					Link: "/recipes/one?id=" + recipe.ID,
+					Link: "/recipes/" + recipe.ID,
 					ImageURL: "",
 					Body: recipe.Description,
 				})

examples/full-app-gourmet/templa/recipe.page.templ

@@ -61,7 +61,7 @@ templ RecipePage(props RecipePageProps, generalProps GeneralProps) {
 								by { props.Recipe.CreatedBy }
 								if generalProps.IsAdmin {
 									- 
-									<a href={ templ.URL("/admin/recipes/one?id=" + props.Recipe.ID) }>
+									<a href={ templ.URL("/admin/recipes/" + props.Recipe.ID) }>
 										edit
 									</a>
 								}
@@ -171,7 +171,7 @@ templ RelatedRecipes(recipes []store.Recipe) {
 				WhenToEat: recipe.WhenToEat,
 				ImageURL: recipe.ImageUrl,
 				Body: recipe.Description,
-				Link: "/recipes/one?id="+recipe.ID,
+				Link: "/recipes/"+recipe.ID,
 			})
 		}
 	</div>

examples/full-app-gourmet/templa/search.templ

@@ -55,7 +55,7 @@ templ Search(props SearchProps) {
 					@components.Card(components.CardProps{
 						Title: recipe.Name,
 						WhenToEat: recipe.WhenToEat,
-						Link: "/recipes/one?id=" + recipe.ID,
+						Link: "/recipes/" + recipe.ID,
 						ImageURL: recipe.ImageUrl,
 						Body: recipe.Description,
 					})

examples/full-app-gourmet/templates/pages/admin/single-recipe.page.html

@@ -12,7 +12,7 @@ <h1>Admin - Recipe</h1>
     >
       <h2 class="mb-4 text-3xl font-bold">{{ .Recipe.Name }}</h2>
       <div class="flex justify-between gap-2 md:gap-4">
-        <a class="btn btn-secondary" href="/recipes/one?id={{ .Recipe.ID }}">
+        <a class="btn btn-secondary" href="/recipes/{{ .Recipe.ID }}">
           See
         </a>
         <button class="btn btn-primary" form="myform">Save</button>

examples/full-app-gourmet/templates/pages/recipe.page.html

@@ -11,7 +11,7 @@ <h1 class="text-4xl font-bold">{{ .Recipe.Name }}</h1>
       {{ if .Admin }}
         <div class="flex items-center">
           <a
-            href="/admin/recipes/one?id={{ .Recipe.ID }}"
+            href="/admin/recipes/{{ .Recipe.ID }}"
             class="btn btn-secondary"
           >
             Edit

examples/full-app-gourmet/templates/partials/ingredients/ingredient-card.partial.html

@@ -4,7 +4,7 @@
 >
   <a
     class="flex h-full w-full flex-col"
-    href="/ingredients/one?id={{ .ID }}"
+    href="/ingredients/{{ .ID }}"
     hx-boost="true"
     hx-target="#page"
     hx-select="#page"

examples/full-app-gourmet/templates/partials/recipes/recipe-card.partial.html

@@ -4,7 +4,7 @@
 >
   <a
     class="flex h-full w-full flex-col p-4"
-    href="/recipes/one?id={{ .ID }}"
+    href="/recipes/{{ .ID }}"
     hx-boost="true"
     hx-target="#page"
     hx-select="#page"

examples/full-app-gourmet/templates/partials/recipes/recipe-line.partial.html

@@ -5,7 +5,7 @@
   <div class="flex justify-between">
     <div class="flex">
       <a
-        href="/admin/recipes/one?id={{ .ID }}"
+        href="/admin/recipes/{{ .ID }}"
         hx-boost="true"
         hx-target="#page"
         hx-select="#page"

examples/full-app-gourmet/views/admin.ingredient.go

@@ -12,15 +12,15 @@ import (
 )
 
 func (rs Ressource) adminOneIngredient(c *fuego.ContextWithBody[store.UpdateIngredientParams]) (fuego.CtxRenderer, error) {
-	id := c.QueryParam("id") // TODO use PathParam
+	id := c.PathParam("id")
 
 	if c.Request().Method == "PUT" {
 		updateIngredientArgs, err := c.Body()
 		if err != nil {
 			return nil, err
 		}
 
-		updateIngredientArgs.ID = c.QueryParam("id") // TODO use PathParam
+		updateIngredientArgs.ID = c.PathParam("id")
 
 		_, err = rs.IngredientsQueries.UpdateIngredient(c.Context(), updateIngredientArgs)
 		if err != nil {

examples/full-app-gourmet/views/admin.recipe.go

@@ -12,7 +12,7 @@ import (
 )
 
 func (rs Ressource) deleteRecipe(c fuego.ContextNoBody) (any, error) {
-	id := c.QueryParam("id") // TODO use PathParam
+	id := c.PathParam("id")
 	err := rs.RecipesQueries.DeleteRecipe(c.Context(), id)
 	if err != nil {
 		return nil, err
@@ -38,7 +38,7 @@ func (rs Ressource) adminRecipes(c fuego.ContextNoBody) (fuego.Templ, error) {
 }
 
 func (rs Ressource) adminOneRecipe(c *fuego.ContextWithBody[store.UpdateRecipeParams]) (fuego.Templ, error) {
-	id := c.QueryParam("id") // TODO use PathParam
+	id := c.Request().PathValue("id")
 
 	if c.Request().Method == "PUT" {
 		updateRecipeBody, err := c.Body()
@@ -88,14 +88,14 @@ func (rs Ressource) editRecipe(c *fuego.ContextWithBody[store.UpdateRecipeParams
 		return "", err
 	}
 
-	updateRecipeArgs.ID = c.QueryParam("id") // TODO use PathParam
+	updateRecipeArgs.ID = c.PathParam("id")
 
 	recipe, err := rs.RecipesQueries.UpdateRecipe(c.Context(), updateRecipeArgs)
 	if err != nil {
 		return "", err
 	}
 
-	return c.Redirect(301, "/admin/recipes/one?id="+recipe.ID)
+	return c.Redirect(301, "/admin/recipes/"+recipe.ID)
 }
 
 func (rs Ressource) adminAddRecipes(c *fuego.ContextWithBody[store.CreateRecipeParams]) (any, error) {
@@ -112,6 +112,23 @@ func (rs Ressource) adminAddRecipes(c *fuego.ContextWithBody[store.CreateRecipeP
 	return c.Redirect(301, "/admin/recipes")
 }
 
+func (rs Ressource) adminCreateRecipePage(c *fuego.ContextNoBody) (fuego.Templ, error) {
+	allIngredients, err := rs.IngredientsQueries.GetIngredients(c.Context())
+	if err != nil {
+		return nil, err
+	}
+
+	slices.SortFunc(allIngredients, func(a, b store.Ingredient) int {
+		return strings.Compare(a.Name, b.Name)
+	})
+
+	return admin.RecipePage(admin.RecipePageProps{
+		Recipe: store.Recipe{},
+
+		AllIngredients: allIngredients,
+	}), nil
+}
+
 func (rs Ressource) adminAddDosing(c *fuego.ContextWithBody[store.CreateDosingParams]) (any, error) {
 	body, err := c.Body()
 	if err != nil {
@@ -123,5 +140,5 @@ func (rs Ressource) adminAddDosing(c *fuego.ContextWithBody[store.CreateDosingPa
 		return "", err
 	}
 
-	return c.Redirect(301, "/admin/recipes/one?id="+body.RecipeID)
+	return c.Redirect(301, "/admin/recipes/"+body.RecipeID)
 }

examples/full-app-gourmet/views/recipe.go

@@ -120,7 +120,7 @@ func (rs Ressource) relatedRecipes(c fuego.ContextNoBody) (fuego.Templ, error) {
 }
 
 func (rs Ressource) showSingleRecipes2(c fuego.ContextNoBody) (fuego.Templ, error) {
-	id := c.QueryParam("id")
+	id := c.PathParam("id")
 
 	recipe, err := rs.RecipesQueries.GetRecipe(c.Context(), id)
 	if err != nil {
@@ -244,7 +244,7 @@ func (rs Ressource) addRecipe(c *fuego.ContextWithBody[store.CreateRecipeParams]
 }
 
 func (rs Ressource) RecipePage(c fuego.ContextNoBody) (fuego.HTML, error) {
-	id := c.QueryParam("id")
+	id := c.PathParam("id")
 
 	recipe, err := rs.RecipesQueries.GetRecipe(c.Context(), id)
 	if err != nil {

examples/full-app-gourmet/views/recipe_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"net/http/httptest"
 	"os"
-
 	"testing"
 	"time"
 

examples/full-app-gourmet/views/views.go

@@ -14,7 +14,7 @@ func (rs Ressource) Routes(s *fuego.Server) {
 	fuego.Get(s, "/", rs.showIndex, cache.New())
 	fuego.Get(s, "/recipes", rs.showRecipes)
 	fuego.Get(s, "/planner", rs.planner)
-	fuego.Get(s, "/recipes/one", rs.showSingleRecipes2)
+	fuego.Get(s, "/recipes/{id}", rs.showSingleRecipes2)
 	fuego.Get(s, "/recipes/related", rs.relatedRecipes)
 	fuego.Post(s, "/recipes-new", rs.addRecipe)
 	fuego.Get(s, "/ingredients", rs.showIngredients)
@@ -31,13 +31,14 @@ func (rs Ressource) Routes(s *fuego.Server) {
 	fuego.UseStd(adminRoutes, basicauth.New(basicauth.Config{Username: os.Getenv("ADMIN_USER"), Password: os.Getenv("ADMIN_PASSWORD")}))
 	fuego.Get(adminRoutes, "", rs.pageAdmin)
 	fuego.Get(adminRoutes, "/recipes", rs.adminRecipes)
-	fuego.All(adminRoutes, "/recipes/one", rs.adminOneRecipe)
+	fuego.All(adminRoutes, "/recipes/{id}", rs.adminOneRecipe)
+	fuego.Get(adminRoutes, "/recipes/create", rs.adminCreateRecipePage)
 	fuego.Put(adminRoutes, "/recipes/edit", rs.editRecipe)
 	fuego.Post(adminRoutes, "/recipes-new", rs.adminAddRecipes)
 	fuego.Post(adminRoutes, "/dosings-new", rs.adminAddDosing)
 	fuego.Get(adminRoutes, "/ingredients", rs.adminIngredients)
 	fuego.Get(adminRoutes, "/ingredients/create", rs.adminIngredientCreationPage)
-	fuego.All(adminRoutes, "/ingredients/one", rs.adminOneIngredient)
+	fuego.All(adminRoutes, "/ingredients/{id}", rs.adminOneIngredient)
 
 	fuego.Post(adminRoutes, "/ingredients/new", rs.adminCreateIngredient)
 	fuego.Get(adminRoutes, "/users", rs.adminRecipes)