feat: release 2.14.1

Dockerfile

@@ -22,13 +22,11 @@ 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.0"
+LABEL version="2.14.1"
 LABEL description="Astro based personal website"
 
+ENV HOST=0.0.0.0
+ENV PORT=4321
+
 EXPOSE $PORT
 CMD ["node", "./dist/server/entry.mjs"]

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(),

package.json

@@ -1,7 +1,7 @@
 {
   "name": "site-profile",
   "type": "module",
-  "version": "2.13.0",
+  "version": "2.14.1",
   "homepage": "https://www.alexlebens.dev",
   "bugs": {
     "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/issues",

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;

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;

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;

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;

src/components/sections/ExperienceSection.astro

@@ -18,7 +18,7 @@ const experiences = ((await directus.request(
   <h3 class="smooth-reveal card-text-header flex relative items-center w-full gap-3 pb-10">
     Experience
   </h3>
-  <ul class="ml-8 w-full flex flex-col">
+  <ul class="flex flex-col w-full ml-8 pr-8">
     {experiences.map((experience: Experience) => {
     const startYear = new Date(experience.startDate).getFullYear();
     const endYear = experience.endDate != null ? new Date(experience.endDate).getFullYear() : 'Present';
@@ -36,7 +36,7 @@ const experiences = ((await directus.request(
           </time>
         </header>
         <div class="relative flex flex-col sm:col-span-12 pb-6">
-          <div class="absolute bg-stone-400 -translate-x-[1.71rem] rounded-full h-2 w-2 mt-4"/>
+          <div class="absolute bg-accent -translate-x-[1.71rem] rounded-full h-2 w-2 mt-3"/>
           <h3>
             <div
               class="inline-flex items-center text-2xl leading-tight font-semibold"
@@ -78,7 +78,7 @@ const experiences = ((await directus.request(
             </div>
             )}
             {(experience.responsibilities || experience.achievements) &&  (
-            <div class="relative flex flex-col gap-4 max-sm:h-auto! md:after:absolute md:after:bottom-0 md:after:h-12 md:after:w-full md:after:bg-linear-to-t md:after:from-neutral-200 dark:md:after:from-stone-700 md:after:content-[''] " :class="expanded ? 'after:hidden' : ''" x-show="expanded" x-collapse.min.50px>
+            <div class="relative flex flex-col gap-4 after:absolute after:bottom-0 after:h-12 after:w-full after:bg-linear-to-t after:from-neutral-200 dark:after:from-stone-700 after:content-[''] " :class="expanded ? 'after:hidden' : ''" x-show="expanded" x-collapse.min.50px>
               {experience.responsibilities && (
               <div class="flex flex-col gap-1">
                 <h4 class="text-header font-semibold">
@@ -108,7 +108,7 @@ const experiences = ((await directus.request(
               </div>
               )}
             </div>
-              
+
             <button @click="expanded = ! expanded" class="group/more flex items-center justify-center text-primary hover:text-primary-hover text-xs underline transition-all gap-1.5 w-fit cursor-pointer">
               <span x-text="expanded ? 'Show less' : 'Show more'">
                 Show more
@@ -129,7 +129,7 @@ const experiences = ((await directus.request(
             </button>
 
             <ul
-              class="flex print:hidden flex-wrap gap-2"
+              class="flex print:hidden flex-wrap gap-2 mt-2"
               aria-label="Technologies used"
             >
               {experience.skills && experience.skills.map(skill => {

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;

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;
 

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 };