Use date_published in website

gherkster · Feb 27, 2025 · 1e080e8 · 1e080e8
1 parent 19268da
commit 1e080e8
Show file tree

Hide file tree

Showing 8 changed files with 3,897 additions and 3,625 deletions.
diff --git a/common/types/directus-schema.d.ts b/common/types/directus-schema.d.ts
diff --git a/openapi/directus.json b/openapi/directus.json
diff --git a/website/clients/useDirectusApi.ts b/website/clients/useDirectusApi.ts
@@ -52,7 +52,7 @@ export const useDirectusApi = () => {
           query: {
             fields: searchFields,
             filter: `{"status":{"_eq":"published"}}`,
-            sort: ["-date_created"],
+            sort: ["-date_published"],
           },
         },
         querySerializer: {
@@ -66,7 +66,14 @@ export const useDirectusApi = () => {
       }
 
       const mapper = useMapper();
-      return { data: data.data?.map((r) => mapper.toRecipePreview(r)) };
+      const now = new Date();
+
+      return {
+        data: data.data
+          ?.map((r) => mapper.toRecipePreview(r))
+          // A missing date_published value means the recipe is brand new and the publish date has not been set in the record yet, so use the current time.
+          .sort((a, b) => (b.date_published ?? now).getTime() - (a.date_published ?? now).getTime()),
+      };
     },
     getRecipe: async (slug: string) => {
       const { data, error } = await client.GET("/items/recipes", {

diff --git a/website/composables/useMapper.ts b/website/composables/useMapper.ts
@@ -141,7 +141,7 @@ function toRecipePreview(serverRecipe: ServerRecipe): RecipePreview {
     descriptionSnippet: serverRecipe.description_snippet,
     course: serverRecipe.course ?? undefined,
     cuisine: serverRecipe.cuisine ?? undefined,
-    date_created: serverRecipe.date_created!,
+    date_published: serverRecipe.date_published ? new Date(serverRecipe.date_published) : undefined,
     favourite: serverRecipe.favourite ?? undefined,
     featuredTag: getRandomTag(tags, serverRecipe.id!),
     preparationDuration: serverRecipe.preparationDuration ?? undefined,

diff --git a/website/package.json b/website/package.json
@@ -60,7 +60,7 @@
     "typescript": "5.6.3",
     "unplugin-icons": "^0.19.3",
     "vue-tsc": "^2.2.4",
-    "wrangler": "3.19.0"
+    "wrangler": "3.111.0"
   },
   "packageManager": "[email protected]"
 }