feat: update not found handling

This commit is contained in:
Damillora 2022-07-24 05:04:56 +07:00
parent 8f7b88a01a
commit f1ed9a1609
10 changed files with 104 additions and 73 deletions

View File

@ -1,23 +1,15 @@
FROM node:16 FROM node:16-alpine
# install dependencies # install dependencies
WORKDIR /app WORKDIR /app
COPY package.json package-lock.json ./ RUN npm install -g pnpm
RUN pnpm install
# Copy all local files into the image.
COPY . . COPY . .
RUN pnpm install
RUN pnpm build RUN pnpm build
FROM node:16-alpine
###
# Only copy over the Node pieces we need
# ~> Saves 35MB
###
FROM node:16-slim
WORKDIR /app WORKDIR /app
COPY --from=0 /app/build . COPY --from=0 /app/build /app
COPY --from=0 /app/package.json /app
COPY --from=0 /app/node_modules /app/node_modules
EXPOSE 3000 EXPOSE 3000
CMD ["node","./index.js"] CMD ["node","./index.js"]

View File

@ -39,7 +39,7 @@
}, },
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"@damillora/plachta": "^1.0.0", "@damillora/plachta": "^1.2.0",
"@tryghost/content-api": "^1.11.0", "@tryghost/content-api": "^1.11.0",
"fitvids": "^2.1.1", "fitvids": "^2.1.1",
"svelte-material-icons": "^2.0.2", "svelte-material-icons": "^2.0.2",

View File

@ -1,7 +1,7 @@
lockfileVersion: 5.3 lockfileVersion: 5.3
specifiers: specifiers:
'@damillora/plachta': ^1.0.0 '@damillora/plachta': ^1.2.0
'@sveltejs/adapter-auto': next '@sveltejs/adapter-auto': next
'@sveltejs/adapter-node': ^1.0.0-next.83 '@sveltejs/adapter-node': ^1.0.0-next.83
'@sveltejs/kit': next '@sveltejs/kit': next
@ -30,7 +30,7 @@ specifiers:
vite: ^3.0.2 vite: ^3.0.2
dependencies: dependencies:
'@damillora/plachta': 1.0.0_svelte@3.49.0 '@damillora/plachta': 1.2.0_svelte@3.49.0
'@tryghost/content-api': 1.11.0 '@tryghost/content-api': 1.11.0
fitvids: 2.1.1 fitvids: 2.1.1
svelte-material-icons: 2.0.2_svelte@3.49.0 svelte-material-icons: 2.0.2_svelte@3.49.0
@ -66,8 +66,8 @@ packages:
resolution: {integrity: sha512-B1/plF62pt+H2IJHvApK8fdOJAVsvojvacuac8x8s+JIyqbropMyqNqHTKLm3YD8ZFLGwYeFTudU+PQ7vGvBdA==} resolution: {integrity: sha512-B1/plF62pt+H2IJHvApK8fdOJAVsvojvacuac8x8s+JIyqbropMyqNqHTKLm3YD8ZFLGwYeFTudU+PQ7vGvBdA==}
dev: true dev: true
/@damillora/plachta/1.0.0_svelte@3.49.0: /@damillora/plachta/1.2.0_svelte@3.49.0:
resolution: {integrity: sha512-ZOwMptEOhI0fBOe40p8PJVjV3b78yg6HoW3e/PaKND+fXtvOTbFnDZGfCPcMOD+pKRZm9G5X7AygqJ9atn0rfA==} resolution: {integrity: sha512-DDXojXmmyUS6tX4dgv8eirAU8R13fzHhcX/VoRRf8kfEpwPLqkAVto7qCdfveN0/Q3t/IqX0AKiFCdCfRI50wA==}
dependencies: dependencies:
svelte-material-icons: 2.0.2_svelte@3.49.0 svelte-material-icons: 2.0.2_svelte@3.49.0
svelte-themes: 0.0.98 svelte-themes: 0.0.98

View File

@ -1,7 +1,4 @@
<script lang="ts"> <script lang="ts">
import Post from "../../../../../Plachta/package/components/PageTypes/Post.svelte";
export let post: any; export let post: any;
let schemaOrg = ` let schemaOrg = `
@ -24,7 +21,10 @@ import Post from "../../../../../Plachta/package/components/PageTypes/Post.svelt
"name": "${post.primary_author.name}", "name": "${post.primary_author.name}",
"image": { "image": {
"@type": "ImageObject", "@type": "ImageObject",
"url": "${post.primary_author.profile_image ?? 'https://blog.nanao.moe/images/default-feature.jpg'}" "url": "${
post.primary_author.profile_image ??
'https://blog.nanao.moe/images/default-feature.jpg'
}"
}, },
"url": "${post.primary_author.url}/" "url": "${post.primary_author.url}/"
}, },
@ -53,7 +53,10 @@ import Post from "../../../../../Plachta/package/components/PageTypes/Post.svelt
<meta property="og:title" content={post.title} /> <meta property="og:title" content={post.title} />
<meta property="og:description" content={post.excerpt} /> <meta property="og:description" content={post.excerpt} />
<meta property="og:url" content={post.url} /> <meta property="og:url" content={post.url} />
<meta property="og:image" content={post.feature_image ?? 'https://blog.nanao.moe/images/default-feature.jpg'} /> <meta
property="og:image"
content={post.feature_image ?? 'https://blog.nanao.moe/images/default-feature.jpg'}
/>
<meta property="article:published_time" content="2022-07-22T12:42:23.000Z" /> <meta property="article:published_time" content="2022-07-22T12:42:23.000Z" />
<meta property="article:modified_time" content="2022-07-22T12:47:19.000Z" /> <meta property="article:modified_time" content="2022-07-22T12:47:19.000Z" />
<meta property="article:tag" content={post.primary_tag.name} /> <meta property="article:tag" content={post.primary_tag.name} />
@ -63,7 +66,10 @@ import Post from "../../../../../Plachta/package/components/PageTypes/Post.svelt
<meta name="twitter:title" content={post.title} /> <meta name="twitter:title" content={post.title} />
<meta name="twitter:description" content={post.excerpt} /> <meta name="twitter:description" content={post.excerpt} />
<meta name="twitter:url" content={post.url} /> <meta name="twitter:url" content={post.url} />
<meta name="twitter:image" content={post.feature_image ?? 'https://blog.nanao.moe/images/default-feature.jpg'} /> <meta
name="twitter:image"
content={post.feature_image ?? 'https://blog.nanao.moe/images/default-feature.jpg'}
/>
<meta name="twitter:label1" content="Written by" /> <meta name="twitter:label1" content="Written by" />
<meta name="twitter:data1" content={post.primary_author.name} /> <meta name="twitter:data1" content={post.primary_author.name} />
<meta name="twitter:label2" content="Filed under" /> <meta name="twitter:label2" content="Filed under" />

View File

@ -32,21 +32,32 @@ export const browsePostWithAuthor = async (slug: string, page = 1) => {
return posts return posts
} }
export const readPost = async (slug: string) => { export const readPost = async (slug: string) => {
try {
const post = await api.posts.read({ slug }, { include: ['tags', 'authors'] }); const post = await api.posts.read({ slug }, { include: ['tags', 'authors'] });
return post; return post;
} catch (e) {
return null;
}
} }
export const readTag = async (slug: string) => { export const readTag = async (slug: string) => {
try {
const tag = await api.tags.read({ slug }); const tag = await api.tags.read({ slug });
return tag; return tag;
} catch (e) {
return null;
}
} }
export const readAuthor = async (slug: string) => { export const readAuthor = async (slug: string) => {
try {
const author = await api.authors.read({ slug }); const author = await api.authors.read({ slug });
return author; return author;
} catch (e) {
return null;
}
} }
export const browseLatestPost = async () => { export const browseLatestPost = async () => {

View File

@ -2,7 +2,12 @@
export const load: Load = async ({ params }) => { export const load: Load = async ({ params }) => {
const postSlug = params.slug; const postSlug = params.slug;
const post = await readPost(postSlug); const post = await readPost(postSlug);
if(!post) {
return {
status: 404,
error: new Error('Post not found');
}
}
return { return {
props: { props: {
post: post post: post
@ -39,7 +44,7 @@ import PostSeo from '$lib/components/SEO/PostSEO.svelte';
<title>{post.title}</title> <title>{post.title}</title>
</svelte:head> </svelte:head>
<PostSeo post={post} /> <PostSeo {post} />
<Hero background={post.feature_image ?? `/images/default-feature.jpg`} /> <Hero background={post.feature_image ?? `/images/default-feature.jpg`} />
<Container> <Container>

View File

@ -2,6 +2,13 @@
export const load: Load = async ({ params }) => { export const load: Load = async ({ params }) => {
const tagSlug = params.tag; const tagSlug = params.tag;
const tagObj = await readTag(tagSlug); const tagObj = await readTag(tagSlug);
if (!tagObj) {
return {
status: 404,
error: new Error('Tag not found')
};
}
const posts = await browsePostWithTag(tagSlug); const posts = await browsePostWithTag(tagSlug);
return { return {

View File

@ -2,6 +2,14 @@
export const load: Load = async ({ params }) => { export const load: Load = async ({ params }) => {
const authorSlug = params.author; const authorSlug = params.author;
const authorObj = await readAuthor(authorSlug); const authorObj = await readAuthor(authorSlug);
if (!authorObj) {
return {
status: 404,
error: new Error('Author not found')
};
}
const posts = await browsePostWithAuthor(authorSlug); const posts = await browsePostWithAuthor(authorSlug);
return { return {

View File

@ -8,7 +8,7 @@ const config = {
preprocess: preprocess(), preprocess: preprocess(),
kit: { kit: {
adapter: adapter() adapter: adapter(),
} }
}; };

View File

@ -5,6 +5,8 @@ import preprocess from 'svelte-preprocess';
const config = { const config = {
plugins: [sveltekit({ plugins: [sveltekit({
useVitePreprocess: true, useVitePreprocess: true,
noExternal: ['dayjs']
})], })],
}; };