From 3b80a0602ff058b95f1c4532347ad0b1f6304477 Mon Sep 17 00:00:00 2001
From: Michal Vanko <mklakakilli@gmail.com>
Date: Tue, 21 Feb 2023 20:22:09 +0100
Subject: [PATCH] fix build

---
 src/lib/articleContent/articleContent.ts        | 11 ++++++-----
 src/lib/components/Footer.svelte                |  6 +++---
 src/lib/pagination/dropTakeParams.ts            |  6 +++---
 src/lib/pagination/pagination.ts                |  5 +++--
 src/routes/articles/[...params].json/+server.ts |  1 -
 src/routes/feed.ts                              |  2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/lib/articleContent/articleContent.ts b/src/lib/articleContent/articleContent.ts
index 0fa57fe..7698f81 100644
--- a/src/lib/articleContent/articleContent.ts
+++ b/src/lib/articleContent/articleContent.ts
@@ -1,12 +1,13 @@
-import { error } from "@sveltejs/kit";
-import fm from "front-matter";
-import { readFile } from "fs";
-import { parseField } from "$lib/markdown/parse-markdown";
-import { promisify } from "util";
+import { error } from '@sveltejs/kit'
+import fm from 'front-matter'
+import { readFile } from 'fs'
+import { parseField } from '$lib/markdown/parse-markdown'
+import { promisify } from 'util'
 
 export interface ArticleAttributes {
   slug: string
   layout: string
+  segments: string[]
   title: string
   published: boolean
   date: string
diff --git a/src/lib/components/Footer.svelte b/src/lib/components/Footer.svelte
index 371c7ea..fc0e22b 100644
--- a/src/lib/components/Footer.svelte
+++ b/src/lib/components/Footer.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { format } from 'date-fns'
-  import type { ArticleContent } from '$lib/content/articleContentListing'
+  import type { ArticlePreviewAttributes } from '$lib/articleContent/articleContentListing'
   import SvgIcon from './SvgIcon.svelte'
   import {
     boldClass,
@@ -22,7 +22,7 @@
     licenceText,
   } from './Footer.css'
 
-  export let latestPosts: ArticleContent[]
+  export let latestPosts: ArticlePreviewAttributes[]
 </script>
 
 <footer class="site-footer navigation-theme {siteFooterClass}">
@@ -61,7 +61,7 @@
       <ul class={listUlClass}>
         {#each latestPosts as post}
           <li class={listLiClass}>
-            <a rel="prefetch" href="/blog/{post.slug}">
+            <a rel="prefetch" href="/{post.segments[0]}/{post.slug}">
               <span>{post.title}</span>
               <time class="date {dateClass}" datetime={post.date}>
                 - {format(new Date(post.date), 'do MMM, yyyy')}
diff --git a/src/lib/pagination/dropTakeParams.ts b/src/lib/pagination/dropTakeParams.ts
index b231cae..6415f63 100644
--- a/src/lib/pagination/dropTakeParams.ts
+++ b/src/lib/pagination/dropTakeParams.ts
@@ -1,9 +1,9 @@
-import { splitEvery } from 'ramda'
+import { init, splitEvery } from 'ramda'
 
 export function parseParams(params: string) {
-  const splittedParams = params.split('/')
+  let splittedParams = params.split('/')
   if (splittedParams.length % 2 !== 0) {
-    return []
+    splittedParams = init(splittedParams)
   }
   const splits = splitEvery(2, splittedParams)
   return Object.fromEntries(splits)
diff --git a/src/lib/pagination/pagination.ts b/src/lib/pagination/pagination.ts
index 9f00104..e2c5b5c 100644
--- a/src/lib/pagination/pagination.ts
+++ b/src/lib/pagination/pagination.ts
@@ -18,7 +18,9 @@ export function dropAndTake<Item>({ offset = 0, limit = Infinity }) {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function filterByPropContains<Item extends Record<string, any>>(filters: Record<string, string>) {
+export function filterByPropContains<Item extends Record<string, any>>(
+  filters: Record<string, string>
+) {
   return function (items: Item[]) {
     return items.filter((item) => {
       return Object.entries(filters).every(([fieldName, value]) =>
@@ -34,7 +36,6 @@ export function filterAndCount<Item extends Record<string, any>>({
   ...dropTakeParams
 }: PaginationQuery) {
   return function (items: Item[]) {
-    console.log(filters);
     const filterFunction = filters
       ? filterByPropContains<Item>(filters)
       : identity
diff --git a/src/routes/articles/[...params].json/+server.ts b/src/routes/articles/[...params].json/+server.ts
index 2bc27fd..f836a3d 100644
--- a/src/routes/articles/[...params].json/+server.ts
+++ b/src/routes/articles/[...params].json/+server.ts
@@ -8,7 +8,6 @@ import type { RequestHandler } from './$types'
 
 export const prerender = true
 export const GET = (async ({ params }) => {
-  console.log(params);
   const handledParams = params.params === 'index' ? '' : params.params
   const { page = 1, pageSize = 7, ...filters } = parseParams(handledParams)
   const paginationParams = getDropTakeFromPageParams(
diff --git a/src/routes/feed.ts b/src/routes/feed.ts
index 00cb063..9866147 100644
--- a/src/routes/feed.ts
+++ b/src/routes/feed.ts
@@ -1,5 +1,5 @@
+import { getBlogListing } from '$lib/articleContent/articleContentListing'
 import { Feed } from 'feed'
-import { getBlogListing } from './blog/content'
 
 export async function getFeed() {
   const feed = new Feed({