Shift structure into monorepo (#19)

gherkster · Feb 25, 2024 · 772ac47 · 772ac47
1 parent bbcee39
commit 772ac47
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 17 deletions.
diff --git a/website/.eslintrc.js → .eslintrc.js b/website/.eslintrc.js → .eslintrc.js
diff --git a/website/.prettierrc → .prettierrc b/website/.prettierrc → .prettierrc
diff --git a/common/composables/index.ts b/common/composables/index.ts
@@ -0,0 +1 @@
+export * from "./useRecipeFormatter";
diff --git a/common/composables/useRecipeFormatter.ts b/common/composables/useRecipeFormatter.ts
@@ -0,0 +1,11 @@
+import { ServerIngredient } from "../types/serverRecipe";
+
+export function useRecipeFormatter() {
+  return {
+    formatIngredient(ingredient: ServerIngredient) {
+      const value = `${ingredient.amount}${ingredient.unit} ${ingredient.name} ${ingredient.note}`;
+
+      return value.trim();
+    },
+  };
+}
diff --git a/common/package.json b/common/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "common",
+  "version": "1.0.0",
+  "dependencies": {
+  }
+}
diff --git a/common/tsconfig.json b/common/tsconfig.json
@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+        "declaration": true,
+        "declarationMap": true,
+        "rootDir": ".",
+        "composite": true
+    },
+    "references": []
+}
diff --git a/website/types/global.ts → common/types/global.ts b/website/types/global.ts → common/types/global.ts
diff --git a/website/types/serverRecipe.ts → common/types/serverRecipe.ts b/website/types/serverRecipe.ts → common/types/serverRecipe.ts
@@ -22,7 +22,7 @@ interface ServerIngredientGroup {
   ingredients: ServerIngredient[];
 }
 
-interface ServerIngredient {
+export interface ServerIngredient {
   unit?: string;
   name: string;
   note?: string;

diff --git a/website/components/RecipeSearch.vue b/website/components/RecipeSearch.vue
@@ -4,7 +4,7 @@
 
 <script setup lang="ts">
 import MiniSearch from "minisearch";
-import { ServerRecipe } from "~/types/serverRecipe";
+import { ServerRecipe } from "common/types/serverRecipe";
 import { searchIndexSettings } from "~/types/searchIndex";
 
 const loadIndex = import("@/assets/search-index.json");
@@ -19,6 +19,7 @@ loadIndex.then((index) => {
 
 function testSearch(event) {
   const value = event.target.value;
+  // TODO: Check if still loading and spin until finished
   if (!miniSearch.value) {
     return [];
   }

diff --git a/website/composables/useDirectus.ts b/website/composables/useDirectus.ts
@@ -1,6 +1,6 @@
 import { createDirectus, readItems, rest, RestClient } from "@directus/sdk";
-import { ServerRecipe } from "~/types/serverRecipe";
-import { GlobalSettings } from "~/types/global";
+import { ServerRecipe } from "common/types/serverRecipe";
+import { GlobalSettings } from "common/types/global";
 
 export interface CmsSchema {
   global: GlobalSettings[];

diff --git a/website/mapping/recipeMapper.ts b/website/mapping/recipeMapper.ts
@@ -1,4 +1,4 @@
-import { ServerRecipe } from "~/types/serverRecipe";
+import { ServerRecipe } from "common/types/serverRecipe";
 import { Recipe } from "~/types/recipe";
 import Fraction from "fraction.js";
 

diff --git a/website/nuxt.config.ts b/website/nuxt.config.ts
@@ -3,8 +3,9 @@ import * as fs from "fs/promises";
 import MiniSearch from "minisearch";
 import { SearchIndexIndexed, searchIndexSettings } from "./types/searchIndex";
 
-import { ServerRecipe } from "~/types/serverRecipe";
+import { ServerRecipe } from "common/types/serverRecipe";
 import visualizer from "rollup-plugin-visualizer";
+import { fileURLToPath } from "url";
 
 const baseUrl = process.env.NUXT_BASE_URL;
 const recipes: ServerRecipe[] = [];
@@ -18,6 +19,9 @@ export default defineNuxtConfig({
       }),
     ],
   },
+  alias: {
+    common: fileURLToPath(new URL("../common", import.meta.url)),
+  },
   hooks: {
     async "prerender:routes"({ routes }) {
       await loadAllRecipes();
@@ -34,7 +38,6 @@ async function loadAllRecipes() {
   console.log(`Loading recipes from ${baseUrl}`);
   const client = useDirectus();
 
-
   const remoteRecipes = await client.getAllRecipes();
 
   remoteRecipes.forEach((r) => {

diff --git a/website/package.json b/website/package.json
@@ -19,16 +19,7 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20231010.0",
     "@types/node": "^18.16.19",
-    "@typescript-eslint/eslint-plugin": "^6.1.0",
-    "@typescript-eslint/parser": "^6.1.0",
-    "@vue/eslint-config-prettier": "^8.0.0",
-    "@vue/eslint-config-typescript": "^11.0.3",
-    "eslint": "^8.45.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-vue": "^9.15.1",
     "nuxt": "^3.7.4",
-    "prettier": "^3.0.0",
     "rollup-plugin-visualizer": "^5.9.2",
     "sass": "^1.64.1",
     "typescript": "5.0.4",

diff --git a/website/types/searchIndex.ts b/website/types/searchIndex.ts
@@ -1,4 +1,4 @@
-import { ServerRecipe } from "~/types/serverRecipe";
+import { ServerRecipe } from "common/types/serverRecipe";
 import { Options } from "minisearch";
 
 export type SearchIndexIndexed = Pick<ServerRecipe, "title">;