Merge pull request #1226 from near/develop

2x weekly promotion of develop to main
near · Jun 27, 2024 · cd58a72 · cd58a72
2 parents 828b3c6 + 14803fb
commit cd58a72
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/next.config.js b/next.config.js
@@ -89,7 +89,7 @@ const nextConfig = {
         permanent: false,
       },
       {
-        source: '/auditrequest',
+        source: '/assessments',
         destination: 'https://airtable.com/appr1nBRRGx2PTJVh/shrpa99vKKW3xafso',
         permanent: false,
       },

diff --git a/src/pages/blog/[[...pages]].tsx b/src/pages/blog/[[...pages]].tsx
@@ -10,17 +10,19 @@ import { recordHandledError } from '@/utils/analytics';
 import type { NextPageWithLayout } from '@/utils/types';
 
 export const getServerSideProps = (async ({ resolvedUrl }) => {
+  const isProd = ['https://near.org', 'https://dev.near.org'].some((url) => process.env.NEXT_PUBLIC_HOSTNAME === url);
+  const blog_branch = isProd ? 'main' : 'develop';
   const blogParts = resolvedUrl.split('blog/');
   let title = 'index.html';
   if (blogParts[1] !== title) {
     title = `${blogParts[1].substring(0, blogParts[1].indexOf('/'))}/index.html`;
   }
-  const res = await fetch(`https://raw.githubusercontent.com/near/nearorg_marketing/main/public/blog/${title}`).catch(
-    (e) => {
-      recordHandledError({ title, message: 'failed to fetch github blog html for requested title' });
-      throw e;
-    },
-  );
+  const res = await fetch(
+    `https://raw.githubusercontent.com/near/nearorg_marketing/${blog_branch}/public/blog/${title}`,
+  ).catch((e) => {
+    recordHandledError({ title, message: 'failed to fetch github blog html for requested title' });
+    throw e;
+  });
 
   const __html = await (await res.blob()).text();