From 3a66b00c74c7982c05d59b5b43879bd2e51326d4 Mon Sep 17 00:00:00 2001
From: Ruidy <ruidy.nemausat@gmail.com>
Date: Thu, 19 Dec 2024 13:43:09 +0100
Subject: [PATCH] refactor: consolidate the routers

---
 components/recipe/search.vue      |  9 ++--
 nuxt.config.ts                    |  6 +--
 server/trpc/routers/categories.ts | 28 -------------
 server/trpc/routers/index.ts      |  3 +-
 server/trpc/routers/recipes.ts    | 69 ++++++++++++++++++-------------
 5 files changed, 49 insertions(+), 66 deletions(-)
 delete mode 100644 server/trpc/routers/categories.ts

diff --git a/components/recipe/search.vue b/components/recipe/search.vue
index 0e16db7..92ea1fe 100644
--- a/components/recipe/search.vue
+++ b/components/recipe/search.vue
@@ -7,10 +7,10 @@
       type="text"
       class="grow"
       placeholder="Search recipes..."
+      :autofocus="autofocus"
       @focus="isFocused = true"
       @blur="isFocused = false"
-      :autofocus="autofocus"
-    />
+    >
     <kbd
       class="hidden md:inline-block kbd kbd-sm"
       :class="{ 'opacity-50': !isFocused }"
@@ -28,9 +28,8 @@
 
 <script setup lang="ts">
 const model = defineModel<string>();
-const props = defineProps<{
-  autofocus?: boolean;
-}>();
+defineProps<{ autofocus?: boolean }>();
+
 const isFocused = ref(false);
 
 // Debounced navigation
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 94cd192..0cccdbc 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -5,15 +5,15 @@ export default defineNuxtConfig({
   modules: [
     "@nuxt/eslint",
     "@nuxt/image",
-    "nuxt-icon",
-    "nuxt-delay-hydration",
     "@nuxtjs/robots",
     "@vueuse/nuxt",
+    "nuxt-delay-hydration",
+    "nuxt-icon",
   ],
 
   app: {
     head: {
-      title: "Meal Planner",
+      title: "Mood2Food",
       htmlAttrs: { lang: "en" },
       meta: [
         { charset: "utf-8" },
diff --git a/server/trpc/routers/categories.ts b/server/trpc/routers/categories.ts
deleted file mode 100644
index 34f0eb0..0000000
--- a/server/trpc/routers/categories.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { publicProcedure, router } from "../trpc";
-import {} from "~/types/recipe";
-import {
-  categoriesResponseSchema,
-  type CategoriesResponse,
-} from "~/types/category";
-
-const { apiUrl } = useRuntimeConfig();
-
-export const categoryRouter = router({
-  listCategories: publicProcedure.query(async () => {
-    const response = await $fetch<CategoriesResponse>(
-      new URL("categories.php", apiUrl).href,
-    );
-
-    const result = categoriesResponseSchema.safeParse(response);
-
-    if (!result.success) {
-      throw createError({
-        statusCode: 500,
-        statusMessage: "Invalid API response format",
-        data: result.error,
-      });
-    }
-
-    return result.data.categories.sort((a, b) => a.name.localeCompare(b.name));
-  }),
-});
diff --git a/server/trpc/routers/index.ts b/server/trpc/routers/index.ts
index af1d7ef..6909800 100644
--- a/server/trpc/routers/index.ts
+++ b/server/trpc/routers/index.ts
@@ -1,9 +1,8 @@
 import type { inferRouterOutputs } from "@trpc/server";
 import { mergeRouters } from "../trpc";
 import { recipeRouter } from "./recipes";
-import { categoryRouter } from "./categories";
 
-export const appRouter = mergeRouters(categoryRouter, recipeRouter);
+export const appRouter = mergeRouters(recipeRouter);
 // export type definition of API
 export type AppRouter = typeof appRouter;
 export type RouterOutput = inferRouterOutputs<AppRouter>;
diff --git a/server/trpc/routers/recipes.ts b/server/trpc/routers/recipes.ts
index 65dcfff..70bfd94 100644
--- a/server/trpc/routers/recipes.ts
+++ b/server/trpc/routers/recipes.ts
@@ -1,30 +1,31 @@
 import { z } from "zod";
-import { publicProcedure, router } from "../trpc";
+import {
+  categoriesResponseSchema,
+  categoryRecipesResponseSchema,
+  type CategoriesResponse,
+} from "~/types/category";
 import type { Meal } from "~/types/recipe";
 import { parseRecipeData } from "~/utils/recipes";
-import { categoryRecipesResponseSchema } from "~/types/category";
+import { publicProcedure, router } from "../trpc";
 
 const { apiUrl } = useRuntimeConfig();
 
 export const recipeRouter = router({
-  recipesByCategory: publicProcedure
-    .input(z.string())
-    .query(async ({ input }) => {
-      const data = await $fetch<{ meals: Meal[] }>(
-        new URL(`filter.php?c=${input}`, apiUrl).href,
-      );
+  recipesByCategory: publicProcedure.input(z.string()).query(async ({ input }) => {
+    const data = await $fetch<{ meals: Meal[] }>(new URL(`filter.php?c=${input}`, apiUrl).href);
 
-      const result = categoryRecipesResponseSchema.safeParse(data);
+    const result = categoryRecipesResponseSchema.safeParse(data);
 
-      if (!result.success) {
-        throw createError({
-          statusCode: 404,
-          statusMessage: "Recipes for category not found",
-        });
-      }
+    if (!result.success) {
+      throw createError({
+        statusCode: 404,
+        statusMessage: "Recipes for category not found",
+      });
+    }
+
+    return result.data.recipes;
+  }),
 
-      return result.data.recipes;
-    }),
   recipeGet: publicProcedure
     .input(
       z.coerce
@@ -32,12 +33,10 @@ export const recipeRouter = router({
           required_error: "recipe id is required",
           invalid_type_error: "recipe id must be a number",
         })
-        .positive("recipe id must be positive"),
+        .positive("recipe id must be positive")
     )
     .query(async ({ input }) => {
-      const data = await $fetch<{ meals: Meal[] }>(
-        new URL(`lookup.php?i=${input}`, apiUrl).href,
-      );
+      const data = await $fetch<{ meals: Meal[] }>(new URL(`lookup.php?i=${input}`, apiUrl).href);
       if (!data?.meals) {
         throw createError({
           statusCode: 404,
@@ -48,10 +47,9 @@ export const recipeRouter = router({
       const recipes = parseRecipeData(data);
       return recipes[0];
     }),
+
   recipeRandom: publicProcedure.query(async () => {
-    const data = await $fetch<{ meals: Meal[] }>(
-      new URL("random.php", apiUrl).toString(),
-    );
+    const data = await $fetch<{ meals: Meal[] }>(new URL("random.php", apiUrl).toString());
     if (!data?.meals) {
       throw createError({
         statusCode: 500,
@@ -61,20 +59,35 @@ export const recipeRouter = router({
     const recipes = parseRecipeData(data);
     return recipes[0];
   }),
+
   recipeSearch: publicProcedure
     .input(
       z.string({
         required_error: "search query is required",
-      }),
+      })
     )
     .query(async ({ input }) => {
-      const data = await $fetch<{ meals: Meal[] }>(
-        new URL(`search.php?s=${input}`, apiUrl).href,
-      );
+      const data = await $fetch<{ meals: Meal[] }>(new URL(`search.php?s=${input}`, apiUrl).href);
       if (!data?.meals) {
         return [];
       }
       const recipes = parseRecipeData(data);
       return recipes;
     }),
+
+  listCategories: publicProcedure.query(async () => {
+    const response = await $fetch<CategoriesResponse>(new URL("categories.php", apiUrl).href);
+
+    const result = categoriesResponseSchema.safeParse(response);
+
+    if (!result.success) {
+      throw createError({
+        statusCode: 500,
+        statusMessage: "Invalid API response format",
+        data: result.error,
+      });
+    }
+
+    return result.data.categories.sort((a, b) => a.name.localeCompare(b.name));
+  }),
 });