@eox/pages-theme-eox 2.0.0-alpha.4 → 2.0.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eox/pages-theme-eox",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.5",
   "type": "module",
   "description": "Vitepress Theme with EOX branding",
   "main": "src/index.js",

package/src/components/BlogList.vue

@@ -208,6 +208,10 @@ function getCoverImageUrl(coverImage) {
   if (coverImage.startsWith("http") || coverImage.startsWith("//")) {
     return coverImage;
   }
+  const base = withBase("/");
+  if (base && base !== "/" && coverImage.startsWith(base)) {
+    return coverImage;
+  }
   const path = coverImage.startsWith("/")
     ? coverImage
     : `/images/${coverImage}`;

package/src/components/BlogPost.vue

@@ -151,6 +151,10 @@ function getCoverImageUrl(coverImage) {
   if (coverImage.startsWith("http") || coverImage.startsWith("//")) {
     return coverImage;
   }
+  const base = withBase("/");
+  if (base && base !== "/" && coverImage.startsWith(base)) {
+    return coverImage;
+  }
   const path = coverImage.startsWith("/")
     ? coverImage
     : `/images/${coverImage}`;

package/src/components/CTASection.vue

@@ -67,6 +67,8 @@ const props = defineProps([
 function resolveLink(link) {
   if (!link) return "";
   if (link.startsWith("http") || link.startsWith("//")) return link;
+  const base = withBase("/");
+  if (base && base !== "/" && link.startsWith(base)) return link;
   return link.startsWith("/") ? withBase(link) : withBase("/" + link);
 }
 

package/src/components/FeatureCard/Index.vue

@@ -57,6 +57,8 @@ const props = defineProps({
 function resolveUrl(url) {
   if (!url) return "";
   if (url.startsWith("http") || url.startsWith("//")) return url;
+  const base = withBase("/");
+  if (base && base !== "/" && url.startsWith(base)) return url;
   return url.startsWith("/") ? withBase(url) : withBase("/" + url);
 }
 

package/src/components/FeatureCard/Poster.vue

@@ -45,6 +45,8 @@ const props = defineProps({
 function resolveUrl(url) {
   if (!url) return "";
   if (url.startsWith("http") || url.startsWith("//")) return url;
+  const base = withBase("/");
+  if (base && base !== "/" && url.startsWith(base)) return url;
   return url.startsWith("/") ? withBase(url) : withBase("/" + url);
 }
 

package/src/components/FeaturesGallery.vue

@@ -63,30 +63,28 @@ const resolveCardComponent = (variant) => {
 
 const { page, site } = useData();
 
+function resolveUrl(url) {
+  if (!url) return "";
+  if (url.startsWith("http") || url.startsWith("//")) return url;
+  const base = withBase("/");
+  if (base && base !== "/" && url.startsWith(base)) return url;
+  return url.startsWith("/") ? withBase(url) : withBase("/" + url);
+}
+
 function normalizeFeature(feature) {
   return {
     ...feature,
-    image:
-      feature.image && feature.image.startsWith("/")
-        ? withBase(feature.image)
-        : feature.image,
+    image: resolveUrl(feature.image),
     link: feature.link
       ? {
           ...feature.link,
-          href:
-            feature.link.href && feature.link.href.startsWith("/")
-              ? withBase(feature.link.href)
-              : feature.link.href,
+          href: resolveUrl(feature.link.href),
         }
       : undefined,
     secondaryLink: feature.secondaryLink
       ? {
           ...feature.secondaryLink,
-          href:
-            feature.secondaryLink.href &&
-            feature.secondaryLink.href.startsWith("/")
-              ? withBase(feature.secondaryLink.href)
-              : feature.secondaryLink.href,
+          href: resolveUrl(feature.secondaryLink.href),
         }
       : undefined,
   };

package/src/components/ImageCarousel.vue

@@ -94,6 +94,8 @@ const activeIndex = ref(0);
 function resolveUrl(url) {
   if (!url) return "";
   if (url.startsWith("http") || url.startsWith("//")) return url;
+  const base = withBase("/");
+  if (base && base !== "/" && url.startsWith(base)) return url;
   return url.startsWith("/") ? withBase(url) : withBase("/" + url);
 }
 

package/src/components/ImageElement.vue

@@ -107,6 +107,8 @@ const props = defineProps({
 function resolveUrl(url) {
   if (!url) return "";
   if (url.startsWith("http") || url.startsWith("//")) return url;
+  const base = withBase("/");
+  if (base && base !== "/" && url.startsWith(base)) return url;
   return url.startsWith("/") ? withBase(url) : withBase("/" + url);
 }
 

package/src/components/ImageGallery.vue

@@ -196,6 +196,8 @@ const lightboxIndex = ref(null);
 function resolveUrl(url) {
   if (!url) return "";
   if (url.startsWith("http") || url.startsWith("//")) return url;
+  const base = withBase("/");
+  if (base && base !== "/" && url.startsWith(base)) return url;
   return url.startsWith("/") ? withBase(url) : withBase("/" + url);
 }
 

package/src/components/LogoSection.vue

@@ -25,6 +25,8 @@ const logoRow = useTemplateRef("logo-row");
 function resolveUrl(url) {
   if (!url) return "";
   if (url.startsWith("http") || url.startsWith("//")) return url;
+  const base = withBase("/");
+  if (base && base !== "/" && url.startsWith(base)) return url;
   return url.startsWith("/") ? withBase(url) : withBase("/" + url);
 }
 

package/src/components/NavBar.vue

@@ -239,7 +239,7 @@ const langs = computed(() => {
   }
   return Object.entries(locales).map(([id, locale]) => {
     const currentPath = route.path;
-    const base = withBase("");
+    const base = withBase("/");
     let pathRelativeToBase = currentPath;
     if (base !== "/" && currentPath.startsWith(base)) {
       pathRelativeToBase = currentPath.substring(base.length);