From 3390333e741c08ada1aa8d47ce19f88eba67a07f Mon Sep 17 00:00:00 2001
From: Ben Derham <1805685+benderham@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:29:53 +0800
Subject: [PATCH 1/8] updates auth newsletter subscription form

---
 packages/auth/src/pages/InitPage.tsx | 98 ++++++++++++++++++----------
 1 file changed, 63 insertions(+), 35 deletions(-)

diff --git a/packages/auth/src/pages/InitPage.tsx b/packages/auth/src/pages/InitPage.tsx
index cc92c2ee987..ad0436efd30 100644
--- a/packages/auth/src/pages/InitPage.tsx
+++ b/packages/auth/src/pages/InitPage.tsx
@@ -4,9 +4,9 @@
 import { useMemo, useState } from 'react'
 import fetch from 'cross-fetch'
 
-import { jsx, H1, Stack, Inline, VisuallyHidden } from '@keystone-ui/core'
+import { jsx, H1, Stack, Inline } from '@keystone-ui/core'
 import { Button } from '@keystone-ui/button'
-import { Checkbox, TextInput } from '@keystone-ui/fields'
+import { Checkbox, FieldLabel, TextInput } from '@keystone-ui/fields'
 import { type FieldMeta } from '@keystone-6/core/types'
 import isDeepEqual from 'fast-deep-equal'
 
@@ -24,10 +24,15 @@ import { IconTwitter, IconGithub } from '../components/Icons'
 import { SigninContainer } from '../components/SigninContainer'
 import { useRedirect } from '../lib/useFromRedirect'
 
-const signupURL = 'https://signup.keystonejs.cloud/api/newsletter-signup'
+const signupURL = 'https://endpoints.thinkmill.com.au/newsletter'
 
 function Welcome ({ value, onContinue }: { value: any, onContinue: () => void }) {
-  const [subscribe, setSubscribe] = useState(false)
+  const [subscribe, setSubscribe] = useState<{ keystone: boolean, thinkmill: boolean}>(
+    {
+      keystone: false,
+      thinkmill: false,
+    }
+  )
   const [email, setEmail] = useState<string>(guessEmailFromValue(value))
   const [error, setError] = useState<string | null>(null)
   const [loading, setLoading] = useState(false)
@@ -45,15 +50,18 @@ function Welcome ({ value, onContinue }: { value: any, onContinue: () => void })
         return
       }
 
+      const tags = [ '@keystone-6/auth' ]
+      if (subscribe.keystone) tags.push('keystone_list')
+      if (subscribe.thinkmill) tags.push('thinkmill_list')
+
       const res = await fetch(signupURL, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
         },
         body: JSON.stringify({
-          name: value.username,
           email,
-          source: '@keystone-6/auth InitPage',
+          tags,
         }),
       })
 
@@ -76,7 +84,7 @@ function Welcome ({ value, onContinue }: { value: any, onContinue: () => void })
   }
 
   return (
-    <Stack gap="large">
+    <Stack gap="medium">
       <Stack
         gap="small"
         align="center"
@@ -88,7 +96,7 @@ function Welcome ({ value, onContinue }: { value: any, onContinue: () => void })
       >
         <H1>Welcome</H1>
         <Stack across gap="small">
-          <IconTwitter 
+          <IconTwitter
             href="https://twitter.com/keystonejs"
             target="_blank"
             title="Twitter Logo"
@@ -102,36 +110,56 @@ function Welcome ({ value, onContinue }: { value: any, onContinue: () => void })
       </Stack>
 
       <p css={{ margin: 0 }}>
-        Thanks for installing KeystoneJS. While you're getting started, check out the docs at{' '}
+      Thanks for installing Keystone. For help getting started check out the docs at{' '}
         <a href="https://keystonejs.com">keystonejs.com</a>
       </p>
-      <div>
-        If you'd like to stay up to date with the exciting things we have planned, join our mailing
-        list (just useful announcements, no spam!)
-      </div>
-      <div>
-        <Checkbox
-          checked={subscribe}
-          onChange={() => {
-            setError(null)
-            setSubscribe(!subscribe)
-          }}
-        >
-          sign up to our mailing list
-        </Checkbox>
-      </div>
+
+      <p>
+        To stay connected to the latest Keystone and Thinkmill news, signup to our newsletters:
+      </p>
+
       <form onSubmit={onSubmit}>
-        <VisuallyHidden as="label" htmlFor="email-field">
-          Email Address
-        </VisuallyHidden>
-        <TextInput
-          id="email-field"
-          disabled={!subscribe}
-          autoFocus
-          placeholder={'Email'}
-          value={email}
-          onChange={e => setEmail(e.target.value)}
-        />
+        <Stack gap="medium">
+          <FieldLabel htmlFor="email-field">Email</FieldLabel>
+          <TextInput
+            id="email-field"
+            autoFocus
+            required={subscribe.keystone || subscribe.thinkmill}
+            placeholder={'example@gmail.com'}
+            value={email}
+            onChange={e => setEmail(e.target.value)}
+          />
+          <Inline gap="medium">
+            <Checkbox
+              size='small'
+              checked={subscribe.keystone}
+              onChange={() => {
+                setError(null)
+                setSubscribe((prevState) => ({ ...prevState, keystone: !subscribe.keystone }))
+              }}
+            >
+              Keystone news
+            </Checkbox>
+            <Checkbox
+              size='small'
+              checked={subscribe.thinkmill}
+              onChange={() => {
+                setError(null)
+                setSubscribe((prevState) => ({ ...prevState, thinkmill: !subscribe.thinkmill }))
+              }}
+            >
+              Thinkmill news (
+                <a
+                  href="https://www.thinkmill.com.au/newsletter/tailwind-for-designers-multi-brand-design-systems-and-a-search-tool-for-public-domain-content"
+                  target="_blank"
+                  aria-label="Thinkmill (Opens in new tab)"
+                >
+                  example
+                </a>
+              )
+            </Checkbox>
+          </Inline>
+        </Stack>
         <p css={{ color: 'red' }}>{error}</p>
         <Inline gap="medium" align="center">
           <Button isLoading={loading} type={'submit'} weight="bold" tone="active">

From 6b3e389802959b1f73bbc24e3ef8f902938b6ca7 Mon Sep 17 00:00:00 2001
From: Ben Derham <1805685+benderham@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:31:35 +0800
Subject: [PATCH 2/8] prefix source tag

---
 packages/auth/src/pages/InitPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/auth/src/pages/InitPage.tsx b/packages/auth/src/pages/InitPage.tsx
index ad0436efd30..a019d3d19f5 100644
--- a/packages/auth/src/pages/InitPage.tsx
+++ b/packages/auth/src/pages/InitPage.tsx
@@ -50,7 +50,7 @@ function Welcome ({ value, onContinue }: { value: any, onContinue: () => void })
         return
       }
 
-      const tags = [ '@keystone-6/auth' ]
+      const tags = [ 'source: @keystone-6/auth' ]
       if (subscribe.keystone) tags.push('keystone_list')
       if (subscribe.thinkmill) tags.push('thinkmill_list')
 

From 35d20b6373cbfcd7b3905c411617ff5d956e767d Mon Sep 17 00:00:00 2001
From: Ben Derham <1805685+benderham@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:33:39 +0800
Subject: [PATCH 3/8] minor code formatting

---
 packages/auth/src/pages/InitPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/auth/src/pages/InitPage.tsx b/packages/auth/src/pages/InitPage.tsx
index a019d3d19f5..ed89e9772e9 100644
--- a/packages/auth/src/pages/InitPage.tsx
+++ b/packages/auth/src/pages/InitPage.tsx
@@ -110,7 +110,7 @@ function Welcome ({ value, onContinue }: { value: any, onContinue: () => void })
       </Stack>
 
       <p css={{ margin: 0 }}>
-      Thanks for installing Keystone. For help getting started check out the docs at{' '}
+        Thanks for installing Keystone. For help getting started check out the docs at{' '}
         <a href="https://keystonejs.com">keystonejs.com</a>
       </p>
 

From 0a8590337a8869603feef9bdbd934cf3d1f5fc5d Mon Sep 17 00:00:00 2001
From: Ben Derham <1805685+benderham@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:35:20 +0800
Subject: [PATCH 4/8] add link to Thinkmill website in copy

---
 packages/auth/src/pages/InitPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/auth/src/pages/InitPage.tsx b/packages/auth/src/pages/InitPage.tsx
index ed89e9772e9..62247113cf7 100644
--- a/packages/auth/src/pages/InitPage.tsx
+++ b/packages/auth/src/pages/InitPage.tsx
@@ -115,7 +115,7 @@ function Welcome ({ value, onContinue }: { value: any, onContinue: () => void })
       </p>
 
       <p>
-        To stay connected to the latest Keystone and Thinkmill news, signup to our newsletters:
+        To stay connected to the latest Keystone and <a href="https://thinkmill.com.au" target='_blank'>Thinkmill</a> news, signup to our newsletters:
       </p>
 
       <form onSubmit={onSubmit}>

From 69481c2fd171bdf87cb1993a536b2b0149070ace Mon Sep 17 00:00:00 2001
From: Ben Derham <1805685+benderham@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:10:14 +0800
Subject: [PATCH 5/8] update subscribe condition

---
 packages/auth/src/pages/InitPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/auth/src/pages/InitPage.tsx b/packages/auth/src/pages/InitPage.tsx
index 62247113cf7..2110ac908c5 100644
--- a/packages/auth/src/pages/InitPage.tsx
+++ b/packages/auth/src/pages/InitPage.tsx
@@ -42,7 +42,7 @@ function Welcome ({ value, onContinue }: { value: any, onContinue: () => void })
     setError(null)
 
     // Check if user wants to subscribe and a valid email address
-    if (subscribe) {
+    if (subscribe.keystone || subscribe.thinkmill) {
       setLoading(true)
 
       if (!validEmail(email)) {

From 1acfa6ee1a1743e0e4a9a74b4b6a1a471651ad84 Mon Sep 17 00:00:00 2001
From: Ben Derham <1805685+benderham@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:48:24 +0800
Subject: [PATCH 6/8] updates source tag format

---
 docs/app/actions.ts                  | 2 +-
 packages/auth/src/pages/InitPage.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/app/actions.ts b/docs/app/actions.ts
index 5ce5a3a653e..915dfa473db 100644
--- a/docs/app/actions.ts
+++ b/docs/app/actions.ts
@@ -9,7 +9,7 @@ export async function subscribeToButtondown (pathname: string, formData: FormDat
       email: formData.get('email'),
       tags: [
         ...formData.getAll('tags'),
-        `keystone website${pathname !== '/' ? `: ${pathname}` : ' homepage'}`,
+        `source:keystonejs.com${pathname !== '/' ? `/${pathname}` : '/home'}`,
       ],
     }
 
diff --git a/packages/auth/src/pages/InitPage.tsx b/packages/auth/src/pages/InitPage.tsx
index 2110ac908c5..a6d749a59cb 100644
--- a/packages/auth/src/pages/InitPage.tsx
+++ b/packages/auth/src/pages/InitPage.tsx
@@ -50,7 +50,7 @@ function Welcome ({ value, onContinue }: { value: any, onContinue: () => void })
         return
       }
 
-      const tags = [ 'source: @keystone-6/auth' ]
+      const tags = ['source:@keystone-6/auth']
       if (subscribe.keystone) tags.push('keystone_list')
       if (subscribe.thinkmill) tags.push('thinkmill_list')
 

From 65064d5aa18b83fb05a5e0459caa9cc02b1711c1 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <413395+dcousens@users.noreply.github.com>
Date: Mon, 16 Sep 2024 15:54:04 +1000
Subject: [PATCH 7/8] less complicated pathname

---
 docs/app/actions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/app/actions.ts b/docs/app/actions.ts
index 915dfa473db..9f015bd44e7 100644
--- a/docs/app/actions.ts
+++ b/docs/app/actions.ts
@@ -9,7 +9,7 @@ export async function subscribeToButtondown (pathname: string, formData: FormDat
       email: formData.get('email'),
       tags: [
         ...formData.getAll('tags'),
-        `source:keystonejs.com${pathname !== '/' ? `/${pathname}` : '/home'}`,
+        `source:keystonejs.com${pathname}`,
       ],
     }
 

From 5d3756d4c5a76314b6ccc53ca4590eb4c8d0eb8c Mon Sep 17 00:00:00 2001
From: Daniel Cousens <413395+dcousens@users.noreply.github.com>
Date: Mon, 16 Sep 2024 15:55:00 +1000
Subject: [PATCH 8/8] rephrase

---
 packages/auth/src/pages/InitPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/auth/src/pages/InitPage.tsx b/packages/auth/src/pages/InitPage.tsx
index a6d749a59cb..171ca7378ec 100644
--- a/packages/auth/src/pages/InitPage.tsx
+++ b/packages/auth/src/pages/InitPage.tsx
@@ -110,7 +110,7 @@ function Welcome ({ value, onContinue }: { value: any, onContinue: () => void })
       </Stack>
 
       <p css={{ margin: 0 }}>
-        Thanks for installing Keystone. For help getting started check out the docs at{' '}
+        Thanks for installing Keystone, for help getting started see our documentation at{' '}
         <a href="https://keystonejs.com">keystonejs.com</a>
       </p>