diff --git a/Dockerfile b/Dockerfile index 3760514..92cd8de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,11 +22,6 @@ WORKDIR /app COPY --from=prod-deps /app/node_modules /app/node_modules COPY --from=build /app/dist /app/dist -ENV HOST=0.0.0.0 -ENV SITE_URL=https://www.alexlebens.dev -ENV DIRECTUS_URL=https://directus.alexlebens.net -ENV PORT=4321 - LABEL version="2.13.1" LABEL description="Astro based personal website" diff --git a/astro.config.mjs b/astro.config.mjs index a6f8850..2be8f01 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -9,12 +9,7 @@ import tailwindcss from '@tailwindcss/vite'; import icon from 'astro-icon'; import swup from '@swup/astro'; -const getSiteURL = () => { - if (process.env.SITE_URL) { - return `https://${process.env.SITE_URL}`; - } - return 'http://localhost:4321'; -}; +import { getSiteURL } from './src/support/url'; export default defineConfig({ site: getSiteURL(), diff --git a/src/components/cards/BlogCard.astro b/src/components/cards/BlogCard.astro index 57d6529..c62310a 100644 --- a/src/components/cards/BlogCard.astro +++ b/src/components/cards/BlogCard.astro @@ -4,8 +4,8 @@ import { Icon } from 'astro-icon/components'; import type { Post } from '@lib/directusTypes'; import Image from '@components/ui/images/Image.astro'; -import { getDirectusImageURL } from '@lib/directusFunctions'; import { formatDate } from '@support/time'; +import { getDirectusImageURL } from '@/support/url'; interface Props { post: Post; diff --git a/src/components/cards/EducationCard.astro b/src/components/cards/EducationCard.astro index aa9c988..3cc049d 100644 --- a/src/components/cards/EducationCard.astro +++ b/src/components/cards/EducationCard.astro @@ -2,7 +2,7 @@ import { Icon } from 'astro-icon/components'; import Logo from '@components/ui/logos/Logo.astro'; -import { getDirectusImageURL } from '@lib/directusFunctions'; +import { getDirectusImageURL } from '@/support/url'; interface Props { topic: string; diff --git a/src/components/cards/LargeBlogLeftCard.astro b/src/components/cards/LargeBlogLeftCard.astro index 7517f44..1dbb66a 100644 --- a/src/components/cards/LargeBlogLeftCard.astro +++ b/src/components/cards/LargeBlogLeftCard.astro @@ -2,7 +2,7 @@ import { Icon } from 'astro-icon/components'; import Image from '@components/ui/images/Image.astro'; -import { getDirectusImageURL } from '@lib/directusFunctions'; +import { getDirectusImageURL } from '@/support/url'; interface Props { title: string; diff --git a/src/components/cards/LargeBlogRightCard.astro b/src/components/cards/LargeBlogRightCard.astro index ae0caab..7fc7434 100644 --- a/src/components/cards/LargeBlogRightCard.astro +++ b/src/components/cards/LargeBlogRightCard.astro @@ -2,7 +2,7 @@ import { Icon } from 'astro-icon/components'; import Image from '@components/ui/images/Image.astro'; -import { getDirectusImageURL } from '@lib/directusFunctions'; +import { getDirectusImageURL } from '@/support/url'; interface Props { title: string; diff --git a/src/lib/directus.ts b/src/lib/directus.ts index 23aaca1..b4bf295 100644 --- a/src/lib/directus.ts +++ b/src/lib/directus.ts @@ -12,7 +12,7 @@ import type { Skill, } from '@lib/directusTypes'; -import { getDirectusURL } from '@lib/directusFunctions'; +import { getDirectusURL } from '@/support/url'; type Schema = { site_global: Global; diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro index 96d3334..9ef3eee 100644 --- a/src/pages/blog/[...slug].astro +++ b/src/pages/blog/[...slug].astro @@ -10,8 +10,8 @@ import Image from '@components/ui/images/Image.astro'; import SocialShareButton from '@components/buttons/SocialShareButton.astro'; import BaseLayout from '@layouts/BaseLayout.astro'; import directus from '@lib/directus'; -import { getDirectusImageURL } from '@lib/directusFunctions'; import { formatDate } from '@support/time'; +import { getDirectusImageURL } from '@/support/url'; const post = Astro.props; diff --git a/src/lib/directusFunctions.ts b/src/support/url.ts similarity index 57% rename from src/lib/directusFunctions.ts rename to src/support/url.ts index d672001..242dfe4 100644 --- a/src/lib/directusFunctions.ts +++ b/src/support/url.ts @@ -1,12 +1,13 @@ const getDirectusURL = () => { - if (process.env.DIRECTUS_URL) { - return `https://${process.env.DIRECTUS_URL}`; - } return 'https://directus.alexlebens.net'; }; +const getSiteURL = () => { + return 'https://www.alexlebens.dev'; +}; + async function getDirectusImageURL(image: string) { return `${getDirectusURL()}/assets/${image}`; } -export { getDirectusURL, getDirectusImageURL }; +export { getDirectusURL, getSiteURL, getDirectusImageURL };