Try to fix production problems

lindner-development · Aug 6, 2023 · eb0cb5c · eb0cb5c
1 parent 7c432a0
commit eb0cb5c
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 9 deletions.
diff --git a/...assets/shutterstock_792913780_cropped.jpg → src/assets/communication.jpg b/...assets/shutterstock_792913780_cropped.jpg → src/assets/communication.jpg
diff --git a/src/assets/communication.webp b/src/assets/communication.webp
diff --git a/src/assets/hero.webp b/src/assets/hero.webp
diff --git a/src/assets/lindner.webp b/src/assets/lindner.webp
diff --git a/src/components/Hero.astro b/src/components/Hero.astro
@@ -1,6 +1,6 @@
 ---
 import { getImage } from "astro:assets";
-import hero from "~/assets/hero.jpg";
+import hero from "../assets/hero.webp";
 import { Button } from "./Button/Button";
 import { useTranslations } from "../i18n";
 const optimizedHero = await getImage({

diff --git a/src/contentful.ts b/src/contentful.ts
@@ -89,12 +89,31 @@ if (process.env.CONTENTFUL_SPACE_ID === undefined) {
     console.error("CONTENTFUL_SPACE_ID is undefined. This will produce undefined behavior!");
     throw new Error("CONTENTFUL_SPACE_ID is undefined.");
 }
+
+let contentfulToken: string | undefined;
+let contentfulHost: string = "cdn.contentful.com";
+if (process.env.NODE_ENV?.toLowerCase() !== "production") {
+    contentfulHost = "preview.contentful.com";
+    contentfulToken = process.env.CONTENTFUL_PREVIEW_TOKEN;
+    console.log(`Contentful environment: Preview (${contentfulHost})`)
+    if (contentfulToken === undefined) {
+        console.error("CONTENTFUL_PREVIEW_TOKEN is undefined.");
+        throw new Error("CONTENTFUL_PREVIEW_TOKEN is undefined.");
+    }
+}
+else {
+    contentfulToken = process.env.CONTENTFUL_DELIVERY_TOKEN;
+    console.log(`Contentful environment: Production (${contentfulHost})`)
+    if (contentfulToken === undefined) {
+        console.error("CONTENTFUL_DELIVERY_TOKEN is undefined.");
+        throw new Error("CONTENTFUL_DELIVERY_TOKEN is undefined.");
+    }
+}
+
 // Do not use import.meta.env because import.meta.envs are replaced in build-time
 // Secrets should be runtime-only
 export const contentfulClient = contentful.createClient({
     space: process.env.CONTENTFUL_SPACE_ID!,
-    accessToken: process.env.DEV
-        ? process.env.CONTENTFUL_PREVIEW_TOKEN!
-        : process.env.CONTENTFUL_DELIVERY_TOKEN!,
-    host: process.env.DEV ? "preview.contentful.com" : "cdn.contentful.com",
+    accessToken: contentfulToken,
+    host: contentfulHost,
 });
diff --git a/src/pages/[language]/about-us.astro b/src/pages/[language]/about-us.astro
@@ -3,7 +3,7 @@ import Footer from "../../components/Footer.astro";
 import Header from "../../components/Header.astro";
 import Heading from "../../components/Heading.astro";
 import BaseLayout from "../../layouts/BaseLayout.astro";
-import lindner from "~/assets/lindner.jpg";
+import lindner from "../../assets/lindner.webp";
 import { Image } from "astro:assets";
 import { Button } from "../../components/Button/Button";
 import HookSection from "../../components/HookSection.astro";

diff --git a/src/pages/[language]/index.astro b/src/pages/[language]/index.astro
@@ -9,7 +9,7 @@ import HookSection from "../../components/HookSection.astro";
 import BaseLayout from "../../layouts/BaseLayout.astro";
 
 import { Image } from "astro:assets";
-import aboutUsImage from "~/assets/shutterstock_792913780_cropped.jpg";
+import aboutUsImage from "../../assets/communication.webp";
 import Footer from "../../components/Footer.astro";
 import { useTranslations } from "../../i18n";
 import { MetaBuilder } from "../../meta";

diff --git a/src/pages/cms-assets/[asset]/[uid]/[image].ts b/src/pages/cms-assets/[asset]/[uid]/[image].ts
@@ -27,10 +27,10 @@ export const get: APIRoute = async function get({ params, request }) {
         let requestUrl = new URL(`https://images.ctfassets.net/${contentfulSpaceId}/${asset}/${uid}/${image}`);
         requestUrl.searchParams.set("fm", format);
         if (width) {
-            requestUrl.searchParams.set("width", width);
+            requestUrl.searchParams.set("w", width);
         }
         if (height) {
-            requestUrl.searchParams.set("height", height);
+            requestUrl.searchParams.set("h", height);
         }
         const response = await fetch(requestUrl, {
             headers: {