From 16e7905d9139e8caa7ea332908395a9c1c99ed03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Thu, 18 Jan 2024 20:43:44 +0200
Subject: [PATCH 01/21] fix build

---
 apps/cms/src/payload.config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/cms/src/payload.config.ts b/apps/cms/src/payload.config.ts
index 58b65f78..2d3528a9 100644
--- a/apps/cms/src/payload.config.ts
+++ b/apps/cms/src/payload.config.ts
@@ -97,8 +97,8 @@ export default buildConfig({
     connectOptions: {
       dbName: process.env.PAYLOAD_MONGO_DB_NAME,
     },
-    // @ts-expect-error DATABASE_URL is validated by payload on start
-    url: process.env.PAYLOAD_MONGO_CONNECTION_STRING,
+    // webpack build crashes if these are not set i.e. have to default empty
+    url: process.env.PAYLOAD_MONGO_CONNECTION_STRING ?? "",
   }),
   editor: lexicalEditor({
     features: [

From cfc41e6c4e14a169a2186dfc7138fd93195f38b6 Mon Sep 17 00:00:00 2001
From: Mikael Siidorow <mikael.siidorow@aalto.fi>
Date: Thu, 18 Jan 2024 21:26:50 +0200
Subject: [PATCH 02/21] add error handling for external api requests

---
 .../src/components/events-display/index.tsx   |  7 ++++-
 apps/web/src/dictionaries/en.json             |  3 ++
 apps/web/src/dictionaries/fi.json             |  3 ++
 apps/web/src/lib/api/external/helpers.ts      | 29 +++++++++++++++++++
 apps/web/src/lib/api/external/ilmomasiina.ts  | 12 ++++++--
 5 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 apps/web/src/lib/api/external/helpers.ts

diff --git a/apps/web/src/components/events-display/index.tsx b/apps/web/src/components/events-display/index.tsx
index 305c5aa3..e153a40b 100644
--- a/apps/web/src/components/events-display/index.tsx
+++ b/apps/web/src/components/events-display/index.tsx
@@ -76,9 +76,14 @@ async function EventList({
 }) {
   const events = await fetchEvents();
 
+  if (!events.ok) {
+    console.warn("Failed to fetch events from Ilmomasiina", events.error);
+    return null;
+  }
+
   return (
     <ul className="space-y-4">
-      {events.map((event) => (
+      {events.data.map((event) => (
         <EventItem
           event={event}
           ilmolinkText={ilmolinkText}
diff --git a/apps/web/src/dictionaries/en.json b/apps/web/src/dictionaries/en.json
index e0ccf606..5d6c518d 100644
--- a/apps/web/src/dictionaries/en.json
+++ b/apps/web/src/dictionaries/en.json
@@ -7,5 +7,8 @@
   },
   "heading": {
     "Upcoming events": "Upcoming events"
+  },
+  "errors": {
+    "ilmomasiina-fetch-fail": "Failed to fetch events from Ilmomasiina. Please try again later."
   }
 }
diff --git a/apps/web/src/dictionaries/fi.json b/apps/web/src/dictionaries/fi.json
index 6a77a5cd..b600a155 100644
--- a/apps/web/src/dictionaries/fi.json
+++ b/apps/web/src/dictionaries/fi.json
@@ -7,5 +7,8 @@
   },
   "heading": {
     "Upcoming events": "Tulevat tapahtumat"
+  },
+  "errors": {
+    "ilmomasiina-fetch-fail": "Ilmomasiinassa tapahtui virhe. Yritä myöhemmin uudelleen."
   }
 }
diff --git a/apps/web/src/lib/api/external/helpers.ts b/apps/web/src/lib/api/external/helpers.ts
new file mode 100644
index 00000000..b8daae5e
--- /dev/null
+++ b/apps/web/src/lib/api/external/helpers.ts
@@ -0,0 +1,29 @@
+import type { Dictionary } from "../../dictionaries";
+
+export type ErrorType = keyof Dictionary["errors"];
+
+export interface OkResponse<T> {
+  ok: true;
+  error: null;
+  data: T;
+}
+
+export interface ErrorResponse {
+  ok: false;
+  error: ErrorType;
+  data: null;
+}
+
+export type ApiResponse<T> = OkResponse<T> | ErrorResponse;
+
+export const ok = <T>(data: T): OkResponse<T> => ({
+  ok: true,
+  error: null,
+  data,
+});
+
+export const err = (error: ErrorType): ErrorResponse => ({
+  ok: false,
+  error,
+  data: null,
+});
diff --git a/apps/web/src/lib/api/external/ilmomasiina.ts b/apps/web/src/lib/api/external/ilmomasiina.ts
index 7dc60e55..8dd8216c 100644
--- a/apps/web/src/lib/api/external/ilmomasiina.ts
+++ b/apps/web/src/lib/api/external/ilmomasiina.ts
@@ -1,3 +1,6 @@
+import type { ApiResponse } from "./helpers";
+import { err, ok } from "./helpers";
+
 export type IlmomasiinaResponse = IlmomasiinaEvent[];
 
 export interface IlmomasiinaEvent {
@@ -39,9 +42,14 @@ export interface EventQuota {
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- ideally would throw during build, but let's at least throw here if it's missing
 const baseUrl = process.env.PUBLIC_ILMOMASIINA_URL!;
 
-export const fetchEvents = async (): Promise<IlmomasiinaResponse> => {
+export const fetchEvents = async (): Promise<
+  ApiResponse<IlmomasiinaEvent[]>
+> => {
   const response = await fetch(`${baseUrl}/api/events`);
+  if (!response.ok) {
+    return err("ilmomasiina-fetch-fail");
+  }
   const data = (await response.json()) as IlmomasiinaResponse;
 
-  return data;
+  return ok(data);
 };

From 15f603d0ea8acafb77e3fba7e30b743a9e77ffad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Thu, 18 Jan 2024 21:36:18 +0200
Subject: [PATCH 03/21] fix revalidate page cache not work

---
 apps/cms/src/hooks/revalidate-page.ts          | 18 ++++++++++--------
 apps/cms/src/preview.ts                        |  2 +-
 .../{api => next_api}/exit-preview/route.ts    |  0
 .../src/app/{api => next_api}/preview/route.ts |  0
 .../app/{api => next_api}/revalidate/route.ts  |  0
 apps/web/src/middleware.ts                     |  2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)
 rename apps/web/src/app/{api => next_api}/exit-preview/route.ts (100%)
 rename apps/web/src/app/{api => next_api}/preview/route.ts (100%)
 rename apps/web/src/app/{api => next_api}/revalidate/route.ts (100%)

diff --git a/apps/cms/src/hooks/revalidate-page.ts b/apps/cms/src/hooks/revalidate-page.ts
index 1872aa5b..a0f0b4c4 100644
--- a/apps/cms/src/hooks/revalidate-page.ts
+++ b/apps/cms/src/hooks/revalidate-page.ts
@@ -20,15 +20,17 @@ export const revalidatePage =
       const revalidate = async (): Promise<void> => {
         try {
           const fetchData = JSON.stringify(await getFetchData(doc, req));
-          const res = await fetch(
-            `${
-              process.env.PUBLIC_FRONTEND_URL
-            }/api/revalidate?${new URLSearchParams({
-              secret: process.env.PAYLOAD_REVALIDATION_KEY ?? "",
-              collection,
-              fetchData,
-            }).toString()}`,
+          const fetchUrl = `${
+            process.env.PUBLIC_FRONTEND_URL
+          }/next_api/revalidate?${new URLSearchParams({
+            secret: process.env.PAYLOAD_REVALIDATION_KEY ?? "",
+            collection,
+            fetchData,
+          }).toString()}`;
+          req.payload.logger.info(
+            `sending revalidate request ${fetchUrl.replace(process.env.PAYLOAD_REVALIDATION_KEY ?? "", "REDACTED")}`,
           );
+          const res = await fetch(fetchUrl);
           if (res.ok) {
             req.payload.logger.info(
               `Revalidated collection ${collection} with data ${fetchData}`,
diff --git a/apps/cms/src/preview.ts b/apps/cms/src/preview.ts
index a99fa68e..aeef1ddb 100644
--- a/apps/cms/src/preview.ts
+++ b/apps/cms/src/preview.ts
@@ -3,4 +3,4 @@ import type { GeneratePreviewURL } from "payload/config";
 export const generatePreviewUrl =
   <T>(getUrl: (doc: T) => string): GeneratePreviewURL =>
   (doc) =>
-    `${process.env.PUBLIC_FRONTEND_URL}/api/preview?url=${getUrl(doc as T)}`;
+    `${process.env.PUBLIC_FRONTEND_URL}/next_api/preview?url=${getUrl(doc as T)}`;
diff --git a/apps/web/src/app/api/exit-preview/route.ts b/apps/web/src/app/next_api/exit-preview/route.ts
similarity index 100%
rename from apps/web/src/app/api/exit-preview/route.ts
rename to apps/web/src/app/next_api/exit-preview/route.ts
diff --git a/apps/web/src/app/api/preview/route.ts b/apps/web/src/app/next_api/preview/route.ts
similarity index 100%
rename from apps/web/src/app/api/preview/route.ts
rename to apps/web/src/app/next_api/preview/route.ts
diff --git a/apps/web/src/app/api/revalidate/route.ts b/apps/web/src/app/next_api/revalidate/route.ts
similarity index 100%
rename from apps/web/src/app/api/revalidate/route.ts
rename to apps/web/src/app/next_api/revalidate/route.ts
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index d919f86f..3f2ab02f 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -21,5 +21,5 @@ export function middleware(request: NextRequest): NextResponse {
   );
 }
 export const config = {
-  matcher: ["/((?!_next|fi|en).*)"],
+  matcher: ["/((?!_next|fi|en|next_api).*)"],
 };

From cca55d38e18b1a1712e3c82429235e1617efa1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Thu, 18 Jan 2024 23:04:23 +0200
Subject: [PATCH 04/21] update ilmomasiina url to right domain

---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index ae79abb2..c48635b1 100644
--- a/.env.example
+++ b/.env.example
@@ -11,7 +11,7 @@ NEXT_REVALIDATION_KEY="veryprivatekey"
 
 PUBLIC_FRONTEND_URL="http://localhost:3000"
 SERVER_URL="http://localhost:3001"
-PUBLIC_ILMOMASIINA_URL="https://tik-ilmo-prod-app.azurewebsites.net"
+PUBLIC_ILMOMASIINA_URL="https://ilmo.tietokilta.fi"
 
 # variables required for Google OAuth 2.0, otherwise disabled
 #GOOGLE_OAUTH_CLIENT_ID=

From cad7aaa0c103c3dd85ee2f4285714e30c848f02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kalle=20Ahlstr=C3=B6m?=
 <71292737+kahlstrm@users.noreply.github.com>
Date: Fri, 19 Jan 2024 01:36:21 +0200
Subject: [PATCH 05/21] disable CDN assetPrefix for now

---
 apps/web/next.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/next.config.js b/apps/web/next.config.js
index af418237..4591f2ad 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -15,5 +15,5 @@ module.exports = {
         ]
       : undefined,
   },
-  assetPrefix: isProd ? "https://cdn.alpha.tietokilta.fi" : undefined,
+  //assetPrefix: isProd ? "https://cdn.alpha.tietokilta.fi" : undefined,
 };

From ef763021e410f2ed9b8817270e02bbd6a453cac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kalle=20Ahlstr=C3=B6m?= <kalle.ahlstrom@iki.fi>
Date: Fri, 19 Jan 2024 02:02:13 +0200
Subject: [PATCH 06/21] fix revalidate to be a bit clearer

---
 apps/cms/src/hooks/revalidate-page.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/cms/src/hooks/revalidate-page.ts b/apps/cms/src/hooks/revalidate-page.ts
index a0f0b4c4..a9aeb4c2 100644
--- a/apps/cms/src/hooks/revalidate-page.ts
+++ b/apps/cms/src/hooks/revalidate-page.ts
@@ -18,17 +18,24 @@ export const revalidatePage =
       (!("_status" in doc) || doc._status === "published")
     ) {
       const revalidate = async (): Promise<void> => {
+        const revalidationKey = process.env.PAYLOAD_REVALIDATION_KEY;
+        if (!revalidationKey) {
+          req.payload.logger.error(
+            "PAYLOAD_REVALIDATION_KEY not set, cannot revalidate",
+          );
+          return;
+        }
         try {
           const fetchData = JSON.stringify(await getFetchData(doc, req));
           const fetchUrl = `${
             process.env.PUBLIC_FRONTEND_URL
           }/next_api/revalidate?${new URLSearchParams({
-            secret: process.env.PAYLOAD_REVALIDATION_KEY ?? "",
+            secret: revalidationKey,
             collection,
             fetchData,
           }).toString()}`;
           req.payload.logger.info(
-            `sending revalidate request ${fetchUrl.replace(process.env.PAYLOAD_REVALIDATION_KEY ?? "", "REDACTED")}`,
+            `sending revalidate request ${fetchUrl.replace(revalidationKey, "REDACTED")}`,
           );
           const res = await fetch(fetchUrl);
           if (res.ok) {

From 9be295e156122f1325b7dfdcbc484617f35234ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 13:01:01 +0200
Subject: [PATCH 07/21] add features to import script

---
 package.json                   |  2 +-
 scripts/import_seeding_data.sh | 67 ++++++++++++++++++++++++++++++----
 2 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 2be474a7..d7335694 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "codegen": "dotenv -- turbo run codegen",
     "db:clear": "docker compose down -v",
     "db:export": "dotenv -- ./scripts/generate_seeding_data.sh",
-    "db:populate": "dotenv -- ./scripts/import_seeding_data.sh",
+    "db:populate": "dotenv -- ./scripts/import_seeding_data.sh --all",
     "db:reset": "pnpm db:clear && pnpm db:start && pnpm db:populate",
     "db:start": "docker compose up -d",
     "db:stop": "docker compose down",
diff --git a/scripts/import_seeding_data.sh b/scripts/import_seeding_data.sh
index 99a73474..2ec95c30 100755
--- a/scripts/import_seeding_data.sh
+++ b/scripts/import_seeding_data.sh
@@ -5,14 +5,67 @@ if [ -z "$PAYLOAD_MONGO_CONNECTION_STRING" ]; then
   echo "PAYLOAD_MONGO_CONNECTION_STRING is not set. Using default value."
   PAYLOAD_MONGO_CONNECTION_STRING="mongodb://127.0.0.1/payload"
 fi
-
-# Loop to import each JSON file into a MongoDB collection
-for file_path in data/gen/db/*.json; do
-  filename=$(basename "$file_path")
-  COLLECTION_NAME="${filename%.json}"
-  echo "Importing $COLLECTION_NAME collection..."
-  mongoimport --uri="$PAYLOAD_MONGO_CONNECTION_STRING" --collection="$COLLECTION_NAME" --file="$file_path" --jsonArray
+#if no args, print usage
+if [ $# -eq 0 ]; then
+  echo "Usage: ./scripts/import_seeding_data.sh [-u|--upsert] [collection_name]"
+  echo "  -u, --upsert    Use upsert mode when importing data"
+  echo "  -a, --all       Import all collections, "
+  exit 0
+fi
+# iterate through arguments and process them
+UPSERT_FLAG=false
+ALL_FLAG=false
+for arg in "$@"
+do
+    case $arg in
+        -u|--upsert)
+        UPSERT_FLAG=true
+        shift # Remove --upsert from processing
+        ;;
+    esac
+    case $arg in
+        -h|--help)
+        echo "Usage: ./scripts/import_seeding_data.sh [-u|--upsert] [collection_name]"
+        echo "  -u, --upsert    Use upsert mode when importing data"
+        exit 0
+        ;;
+    esac
+    case $arg in
+        -a|--all)
+        ALL_FLAG=true
+        shift # Remove --all from processing
+        ;;
+    esac
 done
+# add --upsert flag to mongoimport command if UPSERT_FLAG is true
+if [ "$UPSERT_FLAG" = true ] ; then
+  echo "Using upsert mode"
+  UPSERT_FLAG="--upsert"
+else
+  UPSERT_FLAG=""
+fi
+# if argument is passed, only import that collection
+if [ -n "$1" ]; then
+  if [ "$ALL_FLAG" = true ] ; then
+    echo "Cannot use --all flag with collection name"
+    exit 1
+  fi
+  COLLECTION_NAME="$1"
+  echo "Importing $COLLECTION_NAME collection..."
+  mongoimport --uri="$PAYLOAD_MONGO_CONNECTION_STRING" --collection="$COLLECTION_NAME" --file="data/gen/db/$COLLECTION_NAME.json" --jsonArray $UPSERT_FLAG
+  exit 0
+fi
+# Loop to import each JSON file into a MongoDB collection
+if [ "$ALL_FLAG" = true ] ; then
+  echo "Importing all collections..."
+  for file_path in data/gen/db/*.json; do
+    filename=$(basename "$file_path")
+    COLLECTION_NAME="${filename%.json}"
+    echo "Importing $COLLECTION_NAME collection..."
+    mongoimport --uri="$PAYLOAD_MONGO_CONNECTION_STRING" --collection="$COLLECTION_NAME" --file="$file_path" --jsonArray $UPSERT_FLAG
+  done
+  exit 0
+fi
 
 # Copy images from images to ../uploads folder
 # TODO: change this implementation when using cloud storage plugin

From c08a5ee17a8bae7876ef142a8b2808334a375773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 13:11:54 +0200
Subject: [PATCH 08/21] fix small bug with redirect url path

---
 apps/web/src/middleware.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 3f2ab02f..1b9a50c1 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -17,7 +17,7 @@ export function middleware(request: NextRequest): NextResponse {
     return NextResponse.rewrite(url);
   }
   return NextResponse.redirect(
-    new URL(`/fi/${request.nextUrl.pathname}`, request.url),
+    new URL(`/fi${request.nextUrl.pathname}`, request.url),
   );
 }
 export const config = {

From 809c88a8adaf1efb5bc1a9098485b0dfb63a1e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 13:22:34 +0200
Subject: [PATCH 09/21] add commit sha to responses

---
 .github/workflows/build.yml |  1 +
 Dockerfile                  |  5 ++++-
 apps/cms/src/server.ts      |  7 ++++++-
 apps/web/next.config.js     | 14 ++++++++++++++
 docker-compose.prod.yml     |  1 +
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 906c877d..67618da3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,3 +74,4 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             PROJECT=${{matrix.project}}
+            GIT_COMMIT_SHA=${{github.sha}}
diff --git a/Dockerfile b/Dockerfile
index 38b90837..575732cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,8 @@ RUN pnpm install --global turbo
 # Build argument for specifying the project
 # Introduce a build argument 'PROJECT' to specify which project in the monorepo to build.
 ARG PROJECT=web
-
+ARG GIT_COMMIT_SHA=development
+ENV GIT_COMMIT_SHA=$GIT_COMMIT_SHA
 # Install all dependencies in the monorepo
 # Start a new stage for handling dependencies. This stage uses the previously setup image with pnpm and turbo installed.
 FROM setup AS dependencies
@@ -71,6 +72,8 @@ RUN rm -rf ./**/*/src
 FROM base AS runner
 #this needs to be here for some reason again, otherwise the WORKDIR command doesn't pick it up
 ARG PROJECT=web
+ARG GIT_COMMIT_SHA=development
+ENV GIT_COMMIT_SHA=$GIT_COMMIT_SHA
 # Create a non-root user and group for better security.
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nodejs
diff --git a/apps/cms/src/server.ts b/apps/cms/src/server.ts
index 8c37d306..45f54fc8 100644
--- a/apps/cms/src/server.ts
+++ b/apps/cms/src/server.ts
@@ -6,8 +6,13 @@ const secret = process.env.PAYLOAD_SECRET;
 if (!secret) {
   throw new Error("PAYLOAD_SECRET is not set");
 }
-const app = express();
+const gitSha = process.env.GIT_COMMIT_SHA ?? "dev";
 
+const app = express();
+app.use((_, res, next) => {
+  res.setHeader("X-Git-Commit-Sha", gitSha);
+  next();
+});
 // Redirect root to Admin panel
 app.get("/", (_, res) => {
   res.redirect("/admin");
diff --git a/apps/web/next.config.js b/apps/web/next.config.js
index 4591f2ad..03c725c9 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -1,5 +1,6 @@
 /** @type {import("next").NextConfig} */
 const isProd = process.env.NODE_ENV === "production";
+const gitSha = process.env.GIT_COMMIT_SHA ?? "dev";
 module.exports = {
   reactStrictMode: true,
   images: {
@@ -15,5 +16,18 @@ module.exports = {
         ]
       : undefined,
   },
+  async headers() {
+    return [
+      {
+        source: "/:path*",
+        headers: [
+          {
+            key: "x-git-commit-sha",
+            value: gitSha,
+          },
+        ],
+      },
+    ];
+  },
   //assetPrefix: isProd ? "https://cdn.alpha.tietokilta.fi" : undefined,
 };
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 921b8160..86419124 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -17,6 +17,7 @@ services:
       context: .
       args:
         - PROJECT=cms
+        - GIT_COMMIT_SHA=test
     depends_on:
       - mongo
     env_file:

From 79d49008065446417b7d91d5edbe1ba863154918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 13:32:57 +0200
Subject: [PATCH 10/21] fix ilmomasiina crashing

---
 apps/web/src/lib/api/external/ilmomasiina.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/lib/api/external/ilmomasiina.ts b/apps/web/src/lib/api/external/ilmomasiina.ts
index 8dd8216c..ab71c8ae 100644
--- a/apps/web/src/lib/api/external/ilmomasiina.ts
+++ b/apps/web/src/lib/api/external/ilmomasiina.ts
@@ -45,11 +45,15 @@ const baseUrl = process.env.PUBLIC_ILMOMASIINA_URL!;
 export const fetchEvents = async (): Promise<
   ApiResponse<IlmomasiinaEvent[]>
 > => {
-  const response = await fetch(`${baseUrl}/api/events`);
-  if (!response.ok) {
+  try {
+    const response = await fetch(`${baseUrl}/api/events`);
+    if (!response.ok) {
+      return err("ilmomasiina-fetch-fail");
+    }
+    const data = (await response.json()) as IlmomasiinaResponse;
+
+    return ok(data);
+  } catch (error) {
     return err("ilmomasiina-fetch-fail");
   }
-  const data = (await response.json()) as IlmomasiinaResponse;
-
-  return ok(data);
 };

From bfe3c8d3d8a3e4d4eb35a05cf26a4e7d675d833e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 13:33:26 +0200
Subject: [PATCH 11/21] rerename SERVER_URL, update missing variables to
 docker-compose .env

---
 .env.docker-compose.prod                     | 3 ++-
 .env.example                                 | 2 +-
 apps/cms/src/payload.config.ts               | 2 +-
 apps/web/src/app/next_api/preview/route.ts   | 2 +-
 apps/web/src/components/admin-bar-client.tsx | 2 +-
 apps/web/src/lib/api/fetcher.ts              | 4 ++--
 apps/web/src/middleware.ts                   | 2 +-
 docker-compose.prod.yml                      | 1 +
 turbo.json                                   | 2 +-
 9 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.env.docker-compose.prod b/.env.docker-compose.prod
index 12e928e7..e04d8964 100644
--- a/.env.docker-compose.prod
+++ b/.env.docker-compose.prod
@@ -6,4 +6,5 @@ PAYLOAD_PORT=3001
 NEXT_REVALIDATION_KEY="veryprivatekey"
 
 PUBLIC_FRONTEND_URL="http://localhost:3000"
-SERVER_URL="http://cms:3001"
+PUBLIC_SERVER_URL="http://cms:3001"
+PUBLIC_ILMOMASIINA_URL="https://ilmo.tietokilta.fi"
diff --git a/.env.example b/.env.example
index c48635b1..d4110841 100644
--- a/.env.example
+++ b/.env.example
@@ -10,7 +10,7 @@ PAYLOAD_PUBLIC_LOCAL_DEVELOPMENT=true
 NEXT_REVALIDATION_KEY="veryprivatekey"
 
 PUBLIC_FRONTEND_URL="http://localhost:3000"
-SERVER_URL="http://localhost:3001"
+PUBLIC_SERVER_URL="http://localhost:3001"
 PUBLIC_ILMOMASIINA_URL="https://ilmo.tietokilta.fi"
 
 # variables required for Google OAuth 2.0, otherwise disabled
diff --git a/apps/cms/src/payload.config.ts b/apps/cms/src/payload.config.ts
index 2d3528a9..fbabc5c1 100644
--- a/apps/cms/src/payload.config.ts
+++ b/apps/cms/src/payload.config.ts
@@ -51,7 +51,7 @@ const {
 
 export default buildConfig({
   // TODO: should probably enable this for production but it breaks auth in development
-  // serverURL: process.env.SERVER_URL,
+  // serverURL: process.env.PUBLIC_SERVER_URL,
   admin: {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- stupid eslint doesn't find the type
     bundler: webpackBundler(),
diff --git a/apps/web/src/app/next_api/preview/route.ts b/apps/web/src/app/next_api/preview/route.ts
index 9e67ecd9..5b065ec5 100644
--- a/apps/web/src/app/next_api/preview/route.ts
+++ b/apps/web/src/app/next_api/preview/route.ts
@@ -25,7 +25,7 @@ export async function GET(
   }
 
   // validate the Payload token
-  const userReq = await fetch(`${process.env.SERVER_URL}/api/users/me`, {
+  const userReq = await fetch(`${process.env.PUBLIC_SERVER_URL}/api/users/me`, {
     headers: {
       Authorization: `JWT ${payloadToken}`,
     },
diff --git a/apps/web/src/components/admin-bar-client.tsx b/apps/web/src/components/admin-bar-client.tsx
index 89ffb9ea..c6fff064 100644
--- a/apps/web/src/components/admin-bar-client.tsx
+++ b/apps/web/src/components/admin-bar-client.tsx
@@ -19,7 +19,7 @@ export function AdminBarClient({
   return (
     <PayloadAdminBar
       className="bottom-0"
-      cmsURL={process.env.SERVER_URL ?? window.location.origin}
+      cmsURL={process.env.PUBLIC_SERVER_URL ?? window.location.origin}
       collection={collection}
       id={id}
       onPreviewExit={void exitPreview}
diff --git a/apps/web/src/lib/api/fetcher.ts b/apps/web/src/lib/api/fetcher.ts
index 0ceb98ad..6ce22ce5 100644
--- a/apps/web/src/lib/api/fetcher.ts
+++ b/apps/web/src/lib/api/fetcher.ts
@@ -56,7 +56,7 @@ export const getAll = <
     (req) => `get_${path}_${stringify(req)}`,
     async (req, draft, fetchOptions): Promise<Response | undefined> => {
       const result = await fetch(
-        `${process.env.SERVER_URL}${path}?${qsStringify({
+        `${process.env.PUBLIC_SERVER_URL}${path}?${qsStringify({
           ...req,
           ...(draft ? { draft: "true" } : {}),
         }).toString()}`,
@@ -81,7 +81,7 @@ export const getGlobal = <Response>(path: string, locale?: string) =>
     () => `getGlobal_${path}`,
     async (_, draft, fetchOptions): Promise<Response | undefined> => {
       const result = await fetch(
-        `${process.env.SERVER_URL}${path}?${qsStringify({
+        `${process.env.PUBLIC_SERVER_URL}${path}?${qsStringify({
           depth: 10, // TODO: remove this when we have a better way to handle depth for example with GraphQL
           // Needs to be bigger than 1 to get media / images
           ...(draft ? { draft: "true" } : {}),
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 1b9a50c1..9026bc4c 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -9,7 +9,7 @@ export function middleware(request: NextRequest): NextResponse {
     pathname.startsWith("/api") ||
     pathname.startsWith("/oauth2")
   ) {
-    const destination = new URL(process.env.SERVER_URL || "");
+    const destination = new URL(process.env.PUBLIC_SERVER_URL || "");
     const url = request.nextUrl.clone();
     url.host = destination.host;
     url.port = destination.port;
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 86419124..72df35bd 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -30,6 +30,7 @@ services:
       context: .
       args:
         - PROJECT=web
+        - GIT_COMMIT_SHA=test
     depends_on:
       - cms
     env_file:
diff --git a/turbo.json b/turbo.json
index ee186d4c..8d53a9a4 100644
--- a/turbo.json
+++ b/turbo.json
@@ -12,7 +12,7 @@
     "PAYLOAD_PUBLIC_LOCAL_DEVELOPMENT",
     "NEXT_REVALIDATION_KEY",
     "PUBLIC_FRONTEND_URL",
-    "SERVER_URL",
+    "PUBLIC_SERVER_URL",
     "PUBLIC_ILMOMASIINA_URL"
   ],
   "pipeline": {

From bf6839eea61aeaa82483cc379ca1c0dc45aff5d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 14:10:49 +0200
Subject: [PATCH 12/21] add default user support

---
 .env.example           |  9 ++++++++-
 apps/cms/src/server.ts | 22 ++++++++++++----------
 turbo.json             |  2 ++
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.env.example b/.env.example
index d4110841..0ccfafe4 100644
--- a/.env.example
+++ b/.env.example
@@ -2,7 +2,14 @@ PAYLOAD_MONGO_CONNECTION_STRING="mongodb://127.0.0.1/payload"
 PAYLOAD_SECRET="verysecretkey"
 PAYLOAD_REVALIDATION_KEY="veryprivatekey"
 PAYLOAD_PORT=3001
-# for LOCAL_DEVELOPMENT autologin setup, DO NOT USE IN PRODUCTION :)
+# default user setup, this user will be created if no users exist in the database
+# NOTE: this is only used for seeding data, not for autologin
+# if these are not set, the admin UI will ask for a user to be created on first login
+PAYLOAD_DEFAULT_USER_EMAIL=root@tietokilta.fi
+PAYLOAD_DEFAULT_USER_PASSWORD=root
+
+# for LOCAL_DEVELOPMENT autologin setup, DO NOT USE THESE IN PRODUCTION :)
+#these should be set to the same values as the default user above
 PAYLOAD_PUBLIC_DEVELOPMENT_AUTOLOGIN_EMAIL=root@tietokilta.fi
 PAYLOAD_PUBLIC_DEVELOPMENT_AUTOLOGIN_PASSWORD=root
 PAYLOAD_PUBLIC_LOCAL_DEVELOPMENT=true
diff --git a/apps/cms/src/server.ts b/apps/cms/src/server.ts
index 45f54fc8..6c47ea45 100644
--- a/apps/cms/src/server.ts
+++ b/apps/cms/src/server.ts
@@ -32,13 +32,14 @@ const start = async (): Promise<void> => {
       if (useGoogleAuth()) {
         payloadInstance.logger.info("Using Google OAuth2");
       }
-      if (process.env.PAYLOAD_PUBLIC_LOCAL_DEVELOPMENT === "true") {
-        const email = process.env.PAYLOAD_PUBLIC_DEVELOPMENT_AUTOLOGIN_EMAIL;
-        const password =
-          process.env.PAYLOAD_PUBLIC_DEVELOPMENT_AUTOLOGIN_PASSWORD;
+      const { PAYLOAD_DEFAULT_USER_EMAIL, PAYLOAD_DEFAULT_USER_PASSWORD } =
+        process.env;
+      if (PAYLOAD_DEFAULT_USER_EMAIL && PAYLOAD_DEFAULT_USER_PASSWORD) {
+        const email = PAYLOAD_DEFAULT_USER_EMAIL;
+        const password = PAYLOAD_DEFAULT_USER_PASSWORD;
         if (!email || !password) {
-          throw new Error(
-            "PAYLOAD_PUBLIC_DEVELOPMENT_AUTOLOGIN_EMAIL and PAYLOAD_PUBLIC_DEVELOPMENT_AUTOLOGIN_PASSWORD must be set when PAYLOAD_PUBLIC_LOCAL_DEVELOPMENT is true",
+          payloadInstance.logger.warn(
+            `PAYLOAD_DEFAULT_USER_EMAIL and PAYLOAD_DEFAULT_USER_PASSWORD are not set, first user has to be created manually through the admin panel`,
           );
         }
         // check if the user exists, if not, create it
@@ -48,9 +49,11 @@ const start = async (): Promise<void> => {
         });
         if (user.totalDocs === 0) {
           payloadInstance.logger.warn(`user ${email} not found, creating...`);
-          payloadInstance.logger.warn(
-            "NOTE that it is recommended to use the seeding scripts (`pnpm db:reset`) to a get filled database for local development",
-          );
+          if (process.env.NODE_ENV !== "production") {
+            payloadInstance.logger.warn(
+              "NOTE that it is recommended to use the seeding scripts (`pnpm db:reset`) to a get filled database for local development",
+            );
+          }
           await payloadInstance.create({
             collection: "users",
             data: {
@@ -58,7 +61,6 @@ const start = async (): Promise<void> => {
               password,
             },
           });
-          payloadInstance.logger.warn("Payload autologin enabled!");
         }
       }
     },
diff --git a/turbo.json b/turbo.json
index 8d53a9a4..cd0ef51f 100644
--- a/turbo.json
+++ b/turbo.json
@@ -7,6 +7,8 @@
     "PAYLOAD_SECRET",
     "PAYLOAD_REVALIDATION_KEY",
     "PAYLOAD_PORT",
+    "PAYLOAD_DEFAULT_USER_EMAIL",
+    "PAYLOAD_DEFAULT_USER_PASSWORD",
     "PAYLOAD_PUBLIC_DEVELOPMENT_AUTOLOGIN_EMAIL",
     "PAYLOAD_PUBLIC_DEVELOPMENT_AUTOLOGIN_PASSWORD",
     "PAYLOAD_PUBLIC_LOCAL_DEVELOPMENT",

From 6ac3dcfe2bd78a4f0e63538aad8b4c981f7f6c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 20:08:29 +0200
Subject: [PATCH 13/21] fix payload admin bundle-size

---
 apps/cms/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/cms/package.json b/apps/cms/package.json
index 27c9ba8c..2855b8bf 100644
--- a/apps/cms/package.json
+++ b/apps/cms/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "main": "dist/server.js",
   "scripts": {
-    "build": "pnpm copyfiles && pnpm build:payload && pnpm build:server",
+    "build": "NODE_ENV=production pnpm copyfiles && pnpm build:payload && pnpm build:server",
     "build:payload": "payload build",
     "build:server": "tsc",
     "clean": "rm -rf dist",
@@ -15,7 +15,7 @@
     "generate:graphQLSchema": "PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:graphQLSchema",
     "generate:types": "PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:types",
     "lint": "eslint  \"./src/**/*.{js,ts}\"",
-    "start": "PAYLOAD_CONFIG_PATH=dist/payload.config.js node dist/server.js",
+    "start": "NODE_ENV=production PAYLOAD_CONFIG_PATH=dist/payload.config.js node dist/server.js",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {

From c6736e6e2d2188e19c61427a7742d7a63cd4a0c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 20:08:41 +0200
Subject: [PATCH 14/21] docker build improvements and naming consistencies

---
 Dockerfile   | 2 +-
 package.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 575732cf..5b8aa7bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,6 @@ WORKDIR /app
 COPY packages/ ./packages/
 COPY turbo.json ./
 COPY package.json turbo.json packages ./
-COPY apps/${PROJECT} ./apps/${PROJECT}
 COPY pnpm-lock.yaml pnpm-workspace.yaml ./
 # Install dependencies as per the lockfile to ensure consistent dependency resolution.
 RUN pnpm install --frozen-lockfile
@@ -35,6 +34,7 @@ RUN pnpm install --frozen-lockfile
 # Prune projects to focus on the specified project scope
 # Start a new stage to prune the monorepo, focusing only on the necessary parts for the specified project.
 FROM dependencies AS pruner
+COPY apps/${PROJECT} ./apps/${PROJECT}
 RUN turbo prune --scope=${PROJECT} --docker
 # Remove all empty node_modules folders. This is a cleanup step to remove unnecessary directories and reduce image size.
 RUN rm -rf /app/out/full/*/*/node_modules
diff --git a/package.json b/package.json
index d7335694..3705918b 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
     "db:start": "docker compose up -d",
     "db:stop": "docker compose down",
     "dev": "pnpm db:start && dotenv -- turbo run dev",
-    "docker:build:cms": "docker build . --tag cms --build-arg PROJECT=cms",
-    "docker:build:web": "docker build . --tag web --build-arg PROJECT=web",
+    "docker:build:cms": "docker build . --tag web-cms --build-arg PROJECT=cms",
+    "docker:build:web": "docker build . --tag web-web --build-arg PROJECT=web",
     "docker:compose:build": "docker compose -f docker-compose.prod.yml up --build",
     "docker:compose:start": "docker compose -f docker-compose.prod.yml up",
     "docker:start:cms": "docker run -p 3001:3001 cms",

From e746c4b440fedcfbfb7bda6c6a1fc8e2cbc6083f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 22:20:59 +0200
Subject: [PATCH 15/21] add CI for deplyoment

---
 .github/workflows/build.yml | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 67618da3..c1a1e0ce 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,13 @@ on:
   push:
   release:
     types: [published]
+
+permissions:
+  id-token: write
+  contents: read
+env:
+  # Change this to upload the built image to your own organization.
+  docker_tag_prefix: ghcr.io/tietokilta
 jobs:
   build:
     name: Format, Lint, Check types & Build
@@ -32,7 +39,7 @@ jobs:
         run: pnpm codegen && git diff --quiet
       - name: Build all
         run: pnpm build
-  docker:
+  docker-build-and-push:
     if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'release' && github.event.action == 'published')
     needs: build
     strategy:
@@ -58,11 +65,11 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: ghcr.io/tietokilta/${{matrix.project}}
+          images: ${{env.docker_tag_prefix}}/${{matrix.project}}
           tags: |
             type=semver,pattern={{version}},enable=${{ github.ref_type == 'tag' }}
             type=semver,pattern={{major}}.{{minor}},enable=${{ github.ref_type == 'tag' }}
-            type=sha
+            type=raw,value=sha-${{github.sha}}
             type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Push to GitHub Packages
@@ -75,3 +82,21 @@ jobs:
           build-args: |
             PROJECT=${{matrix.project}}
             GIT_COMMIT_SHA=${{github.sha}}
+  deploy:
+    name: Deploy to Azure
+    runs-on: ubuntu-latest
+    needs: docker-build-and-push
+    strategy:
+      matrix:
+        project: [web, cms]
+    steps:
+      - name: Login via Azure CLI
+        uses: azure/login@v1
+        with:
+          client-id: ${{secrets.AZURE_CLIENT_ID}}
+          subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}}
+          tenant-id: ${{secrets.AZURE_TENANT_ID}}
+      - uses: azure/webapps-deploy@v2
+        with:
+          app-name: tikweb-${{matrix.project}}-prod # TODO: if we ever setup more envs than prod, make this variable customizable
+          images: "${{ env.docker_tag_prefix }}/${{matrix.project}}:sha-${{ github.sha }}"

From d8bb3e90ce7ae01128e7d5c51cd4c1588c467473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 23:04:43 +0200
Subject: [PATCH 16/21] add cache for docker build

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c1a1e0ce..efc8e4c4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -82,6 +82,8 @@ jobs:
           build-args: |
             PROJECT=${{matrix.project}}
             GIT_COMMIT_SHA=${{github.sha}}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
   deploy:
     name: Deploy to Azure
     runs-on: ubuntu-latest

From ff4829be8a350c87535d7281cc032244245d23f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 23:18:14 +0200
Subject: [PATCH 17/21] add comment regarding changing deploy to release

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index efc8e4c4..3bc8c7e4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,6 +85,8 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
   deploy:
+    # only run on published releases, enable this when we release
+    #if: github.event_name == 'release' && github.event.action == 'published'
     name: Deploy to Azure
     runs-on: ubuntu-latest
     needs: docker-build-and-push

From 9c50fb3f27df5ebbfe29acbeb11d2abda151802b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 23:29:22 +0200
Subject: [PATCH 18/21] test CDN again

---
 apps/web/next.config.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/web/next.config.js b/apps/web/next.config.js
index 03c725c9..0e7a6c50 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -1,6 +1,7 @@
 /** @type {import("next").NextConfig} */
 const isProd = process.env.NODE_ENV === "production";
 const gitSha = process.env.GIT_COMMIT_SHA ?? "dev";
+const cdnUrl = "https://next-cdn-endpoint-prod.azureedge.net";
 module.exports = {
   reactStrictMode: true,
   images: {
@@ -25,9 +26,13 @@ module.exports = {
             key: "x-git-commit-sha",
             value: gitSha,
           },
+          {
+            key: "Access-Control-Allow-Origin",
+            value: cdnUrl,
+          },
         ],
       },
     ];
   },
-  //assetPrefix: isProd ? "https://cdn.alpha.tietokilta.fi" : undefined,
+  assetPrefix: isProd ? cdnUrl : undefined,
 };

From a6976d4f7250e5ce227a5b1dfc1e1c15b783328f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sat, 20 Jan 2024 23:46:41 +0200
Subject: [PATCH 19/21] Next: add healthCheck path for CDN probePath

---
 apps/web/src/app/next_api/health/route.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 apps/web/src/app/next_api/health/route.ts

diff --git a/apps/web/src/app/next_api/health/route.ts b/apps/web/src/app/next_api/health/route.ts
new file mode 100644
index 00000000..2ed496f9
--- /dev/null
+++ b/apps/web/src/app/next_api/health/route.ts
@@ -0,0 +1,13 @@
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
+// this is here for CDN probePath
+export function GET(_: NextRequest): NextResponse {
+  return NextResponse.json(
+    {
+      status: "ok",
+    },
+    {
+      status: 200,
+    },
+  );
+}

From af50cbdc50a655e743e366f95b4a74a3cb6b97b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sun, 21 Jan 2024 00:07:37 +0200
Subject: [PATCH 20/21] disable cdn again :D

---
 apps/web/next.config.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/web/next.config.js b/apps/web/next.config.js
index 0e7a6c50..ff798fc7 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -26,13 +26,13 @@ module.exports = {
             key: "x-git-commit-sha",
             value: gitSha,
           },
-          {
-            key: "Access-Control-Allow-Origin",
-            value: cdnUrl,
-          },
+          // {
+          //   key: "Access-Control-Allow-Origin",
+          //   value: cdnUrl,
+          // },
         ],
       },
     ];
   },
-  assetPrefix: isProd ? cdnUrl : undefined,
+  // assetPrefix: isProd ? cdnUrl : undefined,
 };

From 15bebfe0b400ac33eb35e611d1587775987a97e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahlstr=C3=B6m=20Kalle?= <kalle.ahlstrom@iki.fi>
Date: Sun, 21 Jan 2024 00:40:12 +0200
Subject: [PATCH 21/21] increase upload size limit

---
 apps/cms/src/payload.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/cms/src/payload.config.ts b/apps/cms/src/payload.config.ts
index fbabc5c1..91899d5c 100644
--- a/apps/cms/src/payload.config.ts
+++ b/apps/cms/src/payload.config.ts
@@ -69,7 +69,7 @@ export default buildConfig({
   collections: [Users, Pages, Media, Topics],
   upload: {
     limits: {
-      fileSize: 5000000, // 5MB, written in bytes
+      fileSize: 10000000, // 10MB, written in bytes
     },
   },
   globals: [Footer, LandingPage, MainNavigation],