diff --git a/.env.example b/.env.example index 12fc788..177807c 100644 --- a/.env.example +++ b/.env.example @@ -3,4 +3,7 @@ PUBLIC_HOSTNAME = 'moris.day' # Post POST_DIR = '/home/user/BlogPosts' -PUBLIC_POST_REPO = 'https://github.com/moris/Posts' \ No newline at end of file +PUBLIC_POST_REPO = 'https://github.com/moris/Posts' + +# Base Path +PUBLIC_BASEPATH = '/blog' \ No newline at end of file diff --git a/src/routes/(DefaultStyle)/[slug]/+page.svelte b/src/routes/(DefaultStyle)/[slug]/+page.svelte index 43bcd87..63faae7 100644 --- a/src/routes/(DefaultStyle)/[slug]/+page.svelte +++ b/src/routes/(DefaultStyle)/[slug]/+page.svelte @@ -2,13 +2,12 @@ const { data } = $props(); import Postgrid from './grid.svelte' - import { base } from '$app/paths'; - import { PUBLIC_HOSTNAME } from '$env/static/public'; + import { PUBLIC_HOSTNAME, PUBLIC_BASEPATH } from '$env/static/public'; 記事一覧 | moris.day Blog - + diff --git a/src/routes/(DefaultStyle)/post/[slug]/+page.svelte b/src/routes/(DefaultStyle)/post/[slug]/+page.svelte index ab19661..2f58eb0 100644 --- a/src/routes/(DefaultStyle)/post/[slug]/+page.svelte +++ b/src/routes/(DefaultStyle)/post/[slug]/+page.svelte @@ -5,14 +5,13 @@ import Share from './share.svelte' import Profile from './profile.svelte' import Metadata from './metadata.svelte' - import { base } from '$app/paths'; - import { PUBLIC_HOSTNAME, PUBLIC_POST_REPO } from '$env/static/public'; + import { PUBLIC_HOSTNAME, PUBLIC_BASEPATH, PUBLIC_POST_REPO } from '$env/static/public'; import { onMount } from 'svelte'; import '$lib/components/Markdown/rainbow.css'; import '$lib/components/Markdown/Markdown.css'; - const baseURL = `https://${PUBLIC_HOSTNAME}${base}` + const baseURL = `https://${PUBLIC_HOSTNAME}${PUBLIC_BASEPATH}` const canonical = `${baseURL}/post/${data.id}/` const thumbnail = data.metadata.thumbnail diff --git a/src/routes/feed.rss/+server.ts b/src/routes/feed.rss/+server.ts index 2531c15..7c43b31 100644 --- a/src/routes/feed.rss/+server.ts +++ b/src/routes/feed.rss/+server.ts @@ -1,9 +1,7 @@ export const prerender = true -import { base } from '$app/paths'; - import Metadatas from '$lib/server/Metadatas'; -import { PUBLIC_HOSTNAME } from '$env/static/public'; +import { PUBLIC_HOSTNAME, PUBLIC_BASEPATH } from '$env/static/public'; /** @type {import('./$types').RequestHandler} */ export async function GET() { @@ -16,7 +14,7 @@ export async function GET() { for (let post of metalist){ let meta = post.metadata - let link = `https://${PUBLIC_HOSTNAME}${base}/post/${post.postId}.md` + let link = `https://${PUBLIC_HOSTNAME}${PUBLIC_BASEPATH}/post/${post.postId}.md` i++ items += `