remove old stuff, added trunstile to contact us form

dotansimha · dotansimha · commit d43f1386ae6d · 2025-11-04T12:25:32.000+02:00
diff --git a/packages/website-helper-worker/src/contact-conductor.ts b/packages/website-helper-worker/src/contact-conductor.ts
diff --git a/packages/website-helper-worker/src/env.ts b/packages/website-helper-worker/src/env.ts
@@ -3,7 +3,6 @@ export interface Env {
   CRISP_WEBSITE_ID: string;
   NOTION_TOKEN: string;
   NOTION_HELTIN_DATABASE_ID: string;
-  NOTION_CONDUCTOR_DATABASE_ID: string;
   NOTION_CONTACT_US_DATABASE_ID: string;
   SENTRY_DSN: string;
   BEEHIIV_API_KEY: string;
diff --git a/packages/website-helper-worker/src/index.ts b/packages/website-helper-worker/src/index.ts
@@ -1,6 +1,5 @@
 import { Toucan } from 'toucan-js';
 import { Client } from '@notionhq/client';
-import { handleConductorContact } from './contact-conductor';
 import { handleContactUs } from './contact-guild';
 import { handleHeltinContact } from './contact-heltin';
 import { buildResponseCorsHeaders } from './cors';
@@ -57,15 +56,6 @@ export default {
         });
       }
 
-      if (request.method === 'POST' && url.pathname === '/api/conductor') {
-        return await handleConductorContact({
-          request,
-          body: maybeBody ? JSON.parse(maybeBody) : null,
-          notion,
-          notionDatabaseId: env.NOTION_CONDUCTOR_DATABASE_ID,
-        });
-      }
-
       if (request.method === 'POST' && url.pathname === '/api/contact-us') {
         return await handleContactUs({
           email: env.EMAIL_SENDER,
diff --git a/packages/website-router/src/config.ts b/packages/website-router/src/config.ts
@@ -79,7 +79,7 @@ export const jsonConfig = {
     },
     '/graphql/shield': {
       redirect: 'https://github.com/maticzav/graphql-shield',
-      status: 302
+      status: 302,
     },
     '/graphql/apollo-angular': {
       rewrite: 'apollo-angular.pages.dev',
diff --git a/website/package.json b/website/package.json
@@ -8,7 +8,7 @@
     "analyze": "ANALYZE=true pnpm build",
     "build": "pnpm load-hive-feed && pnpm check-links && next build && next-sitemap",
     "check-links": "tsx check-links.ts",
-    "dev": "next",
+    "dev": "pnpm load-hive-feed && next",
     "export": "tsx rss-generator.ts",
     "load-hive-feed": "tsx load-hive-feed.ts",
     "start": "next start"
diff --git a/website/pages/_document.tsx b/website/pages/_document.tsx
@@ -20,6 +20,8 @@ export default class MyDocument extends Document {
             title="RSS Feed for the-guild.dev"
             href="/feed.xml"
           />
+          <script src="https://challenges.cloudflare.com/turnstile/v0/api.js" async defer></script>
+          <link rel="preconnect" href="https://challenges.cloudflare.com" />
         </Head>
         <body>
           <Main />
diff --git a/website/ui/client-only.tsx b/website/ui/client-only.tsx
@@ -0,0 +1,12 @@
+import dynamic from 'next/dynamic';
+
+type ClientOnlyProps = { children: JSX.Element };
+const ClientOnly = (props: ClientOnlyProps) => {
+  const { children } = props;
+
+  return children;
+};
+
+export default dynamic(() => Promise.resolve(ClientOnly), {
+  ssr: false,
+});
diff --git a/website/ui/get-in-touch-section.tsx b/website/ui/get-in-touch-section.tsx
@@ -3,6 +3,7 @@ import clsx from 'clsx';
 import { useFormik } from 'formik';
 import Confetti from 'react-confetti';
 import * as Yup from 'yup';
+import ClientOnly from './client-only';
 import { GuildButton, Heading, Input } from './components';
 
 export const GetInTouchForm = (): ReactElement => {
@@ -108,6 +109,13 @@ export const GetInTouchForm = (): ReactElement => {
           {touched.notes && errors.notes && (
             <p className="-mt-9 text-sm text-[#f6547b]">{errors.notes}</p>
           )}
+          <ClientOnly>
+            <div
+              className="cf-turnstile"
+              data-sitekey="0x4AAAAAAB-9vuIUJrCPlFK3"
+              data-theme="dark"
+            />
+          </ClientOnly>
           <GuildButton
             as="button"
             type="submit"
