From 170d61dd964ba8319110d82d117db450117ea27b Mon Sep 17 00:00:00 2001
From: cupcakearmy <hi@nicco.io>
Date: Sat, 21 Aug 2021 11:12:25 +0200
Subject: [PATCH] progress

---
 src/lib/api/index.ts                     | 23 +++++++++++++-
 src/lib/components/PostAttributes.svelte | 27 +++++++++-------
 src/lib/components/PostPreview.svelte    | 26 ++++++++-------
 src/lib/utils.ts                         |  5 +++
 src/routes/api/[type]/[slug].json.ts     | 40 ++++++++++++++++++++++--
 src/routes/blog/[slug].svelte            | 32 +++++++++++++++++++
 src/routes/blog/index.svelte             | 30 ++++++++++++++++++
 src/routes/contact.svelte                |  4 +++
 src/routes/index.svelte                  | 23 +++++---------
 src/routes/projects.svelte               |  1 +
 src/routes/search.svelte                 |  1 +
 src/routes/support.svelte                |  4 +++
 12 files changed, 172 insertions(+), 44 deletions(-)
 create mode 100644 src/lib/utils.ts
 create mode 100644 src/routes/blog/[slug].svelte
 create mode 100644 src/routes/blog/index.svelte
 create mode 100644 src/routes/search.svelte

diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index 13fcbe0..b9e6b6b 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -36,7 +36,7 @@ export type Page = {
   status: string
 }
 
-export const BaseAttributes = gql`
+export const BaseAttributes = `
     id
     slug
     status
@@ -44,6 +44,27 @@ export const BaseAttributes = gql`
     content
 `
 
+export interface Post extends Page {
+  date: string
+  modified: string
+  post: {
+    featured: MediaItem
+  }
+}
+
+export const PostFragment = gql`
+  fragment PostFragment on Post {
+    ${BaseAttributes}
+    date
+    modified
+    post {
+      featured {
+        ...MediaItemFragment
+      }
+    }
+  }
+`
+
 export interface Work extends Page {
   work: {
     date: string
diff --git a/src/lib/components/PostAttributes.svelte b/src/lib/components/PostAttributes.svelte
index a2a721e..3666702 100644
--- a/src/lib/components/PostAttributes.svelte
+++ b/src/lib/components/PostAttributes.svelte
@@ -1,11 +1,12 @@
-<script>
+<script lang="ts">
   import dj from 'dayjs'
-  import { readingTimeInMinutes } from '../lib/readingTime'
+  import type { Post } from '$lib/api'
+  import { readingTimeInMinutes } from '$lib/utils'
 
-  export let post
+  export let post: Post
   export let full = false
 
-  function format(date) {
+  function format(date: string) {
     return dj(date).format('MMM D, YYYY')
   }
 
@@ -13,6 +14,16 @@
   $: modified = format(post.modified)
 </script>
 
+<div class="attributes">
+  <div>
+    {created}
+    {#if full && created !== modified}<br /> <small>Last update: {modified}</small>{/if}
+  </div>
+  {#if post.content}
+    <div>~ {readingTimeInMinutes(post.content)} min</div>
+  {/if}
+</div>
+
 <style>
   .attributes {
     display: flex;
@@ -21,11 +32,3 @@
     margin-top: -0.125em;
   }
 </style>
-
-<div class="attributes">
-  <div>
-    {created}
-    {#if full && created !== modified}<br /> <small>Last update: {modified}</small>{/if}
-  </div>
-  <div>~ {readingTimeInMinutes(post.content)} min</div>
-</div>
diff --git a/src/lib/components/PostPreview.svelte b/src/lib/components/PostPreview.svelte
index 9c6fdc2..e4dbfa0 100644
--- a/src/lib/components/PostPreview.svelte
+++ b/src/lib/components/PostPreview.svelte
@@ -1,10 +1,22 @@
-<script>
+<script lang="ts">
+  import type { Post } from '$lib/api'
+
   import ImageFrame from '../components/ImageFrame.svelte'
   import PostAttributes from '../components/PostAttributes.svelte'
 
-  export let post
+  export let post: Post
 </script>
 
+<a href={`blog/${post.slug}`} class:without={!post.post.featured}>
+  {#if post.post.featured}
+    <ImageFrame src={post.post.featured.sourceUrl} alt={post.post.featured.altText} />
+  {/if}
+  <PostAttributes {post} />
+  <h2>
+    {@html post.title}
+  </h2>
+</a>
+
 <style>
   a {
     display: block;
@@ -41,13 +53,3 @@
     transform: translateX(-5%);
   }
 </style>
-
-<a href={`blog/${post.slug}`} class:without={!post.featured}>
-  {#if post.featured}
-    <ImageFrame src={post.featured.url} alt={post.featured.description} />
-  {/if}
-  <PostAttributes {post} />
-  <h2>
-    {@html post.title}
-  </h2>
-</a>
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
new file mode 100644
index 0000000..0581a76
--- /dev/null
+++ b/src/lib/utils.ts
@@ -0,0 +1,5 @@
+export function readingTimeInMinutes(text: string, options: { wpm?: number } = {}): number {
+  const cleaned = text.replace(/(<.*?>)|(\\n)|(&#\d*?;)/g, '')
+  const words = cleaned.split(' ').length
+  return Math.round(words / (options.wpm ?? 200))
+}
diff --git a/src/routes/api/[type]/[slug].json.ts b/src/routes/api/[type]/[slug].json.ts
index bfc6c46..befcbe6 100644
--- a/src/routes/api/[type]/[slug].json.ts
+++ b/src/routes/api/[type]/[slug].json.ts
@@ -7,6 +7,8 @@ import {
   MediaItem,
   MediaItemFragment,
   Page,
+  Post,
+  PostFragment,
   Project,
   ProjectFragment,
   WorkFragment,
@@ -22,7 +24,7 @@ export const get: RequestHandler = async (args) => {
       if (all) {
         const data = await Call<{ pages: { nodes: Page[] } }>(gql`
           query {
-            pages {
+            pages(where: {status: PUBLISH}) {
               nodes {
                 ${BaseAttributes}
               }
@@ -50,7 +52,7 @@ export const get: RequestHandler = async (args) => {
           ${MediaItemFragment}
           ${WorkFragment}
           query {
-            works {
+            works(where: { status: PUBLISH }) {
               nodes {
                 ...WorkFragment
               }
@@ -81,7 +83,7 @@ export const get: RequestHandler = async (args) => {
           gql`
             ${ProjectFragment}
             query {
-              projects {
+              projects(where: { status: PUBLISH }) {
                 nodes {
                   ...ProjectFragment
                 }
@@ -120,6 +122,38 @@ export const get: RequestHandler = async (args) => {
       )
       return { body: data.mediaItem }
     }
+
+    case 'posts': {
+      if (all) {
+        const data = await Call<{ posts: { nodes: Post[] } }>(gql`
+          ${PostFragment}
+          ${MediaItemFragment}
+          {
+            posts(where: { status: PUBLISH }, first: 1000000000) {
+              nodes {
+                ...PostFragment
+              }
+            }
+          }
+        `)
+        return { body: data.posts.nodes }
+      } else {
+        const data = await Call<{ post: Post }>(
+          gql`
+            ${PostFragment}
+            ${MediaItemFragment}
+            query ($slug: ID!) {
+              post(id: $slug, idType: SLUG) {
+                ...PostFragment
+              }
+            }
+          `,
+          { slug }
+        )
+        return { body: data.post }
+      }
+    }
+
     default:
       return { status: 404 }
   }
diff --git a/src/routes/blog/[slug].svelte b/src/routes/blog/[slug].svelte
new file mode 100644
index 0000000..6a64bd9
--- /dev/null
+++ b/src/routes/blog/[slug].svelte
@@ -0,0 +1,32 @@
+<script lang="ts" context="module">
+  import type { Load } from '@sveltejs/kit'
+
+  export const prerender = true
+  export const load: Load = async ({ fetch, page }) => {
+    return {
+      props: {
+        data: await fetch(`/api/posts/${page.params.slug}.json`).then((r) => r.json()),
+      },
+    }
+  }
+</script>
+
+<script lang="ts">
+  import type { Post } from '$lib/api'
+  import SimplePage from '$lib/components/SimplePage.svelte'
+  import PostAttributes from '$lib/components/PostAttributes.svelte'
+  import WpAdapter from '$lib/components/WPAdapter.svelte'
+
+  export let data: Post
+</script>
+
+<svelte:head>
+  <title>Works</title>
+</svelte:head>
+
+<SimplePage title={data.title}>
+  <PostAttributes post={data} full />
+  {#if data.content}
+    <WpAdapter content={data.content} />
+  {/if}
+</SimplePage>
diff --git a/src/routes/blog/index.svelte b/src/routes/blog/index.svelte
new file mode 100644
index 0000000..0422a8c
--- /dev/null
+++ b/src/routes/blog/index.svelte
@@ -0,0 +1,30 @@
+<script lang="ts" context="module">
+  import type { Load } from '@sveltejs/kit'
+
+  export const prerender = true
+  export const load: Load = async ({ fetch }) => {
+    return {
+      props: {
+        data: await fetch('/api/posts/*.json').then((r) => r.json()),
+      },
+    }
+  }
+</script>
+
+<script lang="ts">
+  import type { Post } from '$lib/api'
+  import SimplePage from '$lib/components/SimplePage.svelte'
+  import PostPreview from '$lib/components/PostPreview.svelte'
+
+  export let data: Post[]
+</script>
+
+<svelte:head>
+  <title>Blog</title>
+</svelte:head>
+
+<SimplePage title="Works">
+  {#each data as post}
+    <PostPreview {post} />
+  {/each}
+</SimplePage>
diff --git a/src/routes/contact.svelte b/src/routes/contact.svelte
index 09f25ad..237874d 100644
--- a/src/routes/contact.svelte
+++ b/src/routes/contact.svelte
@@ -1,3 +1,7 @@
+<script lang="ts" context="module">
+  export const prerender = true
+</script>
+
 <script lang="ts">
   import IconList from '$lib/components/IconList.svelte'
   import SimplePage from '$lib/components/SimplePage.svelte'
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index d4a27ee..130b227 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -1,22 +1,13 @@
 <script lang="ts" context="module">
-  import { Call, gql } from '$lib/api'
+  import type { MediaItem } from '$lib/api'
 
   export const prerender = true
 
-  type Data = Record<'signature' | 'home', { srcSet: string }>
-  export const load: Load = async () => {
-    const data = await Call<Data>(gql`
-      query {
-        signature: mediaItem(id: "signature", idType: SLUG) {
-          srcSet
-        }
-
-        home: mediaItem(id: "home", idType: SLUG) {
-          srcSet
-        }
-      }
-    `)
-    return { props: { data } }
+  type Data = Record<'signature' | 'home', MediaItem>
+  export const load: Load = async ({ fetch }) => {
+    const signature: MediaItem = await fetch('/api/media/signature.json').then((r) => r.json())
+    const home: MediaItem = await fetch('/api/media/home.json').then((r) => r.json())
+    return { props: { data: { signature, home } } }
   }
 </script>
 
@@ -28,7 +19,7 @@
 </script>
 
 <svelte:head>
-  <title>Niccolo Borgioli</title>
+  <title>Niccolò Borgioli</title>
 </svelte:head>
 
 <div class="wrapper">
diff --git a/src/routes/projects.svelte b/src/routes/projects.svelte
index 25fa566..10ec10d 100644
--- a/src/routes/projects.svelte
+++ b/src/routes/projects.svelte
@@ -1,6 +1,7 @@
 <script lang="ts" context="module">
   import type { Load } from '@sveltejs/kit'
 
+  export const prerender = true
   export const load: Load = async ({ fetch }) => {
     return {
       props: {
diff --git a/src/routes/search.svelte b/src/routes/search.svelte
new file mode 100644
index 0000000..e965047
--- /dev/null
+++ b/src/routes/search.svelte
@@ -0,0 +1 @@
+Hello
diff --git a/src/routes/support.svelte b/src/routes/support.svelte
index 7bb595e..537936a 100644
--- a/src/routes/support.svelte
+++ b/src/routes/support.svelte
@@ -1,3 +1,7 @@
+<script lang="ts" context="module">
+  export const prerender = true
+</script>
+
 <script lang="ts">
   import IconList from '$lib/components/IconList.svelte'
   import SimplePage from '$lib/components/SimplePage.svelte'