Update subscription

src/components/DownloadPopup.astro

@@ -3,11 +3,7 @@ import Popup from './Popup/Popup.astro';
 import CaptchaFields from './Captcha/CaptchaFields.astro';
 ---
 
-<Popup
+<Popup id='download-popup' title='Download' subtitle='Enter your email below to receive the download link.'>
-  id='download-popup'
-  title='Download'
-  subtitle='Enter your email below to receive the download link.'
->
   <form
     action='https://newsletter.roadmap.sh/subscribe'
     method='POST'
@@ -15,6 +11,8 @@ import CaptchaFields from './Captcha/CaptchaFields.astro';
     target='_blank'
     captcha-form
   >
+    <input type='hidden' name='gdpr' value='true' />
+
     <input
       type='email'
       name='email'
@@ -42,13 +40,11 @@ import CaptchaFields from './Captcha/CaptchaFields.astro';
 </Popup>
 
 <script>
-  document
+  document.querySelector('[submit-download-form]')?.addEventListener('click', () => {
-    .querySelector('[submit-download-form]')
+    window.fireEvent({
-    ?.addEventListener('click', () => {
+      category: 'Subscription',
-      window.fireEvent({
+      action: 'Submitted Popup Form',
-        category: 'Subscription',
+      label: 'Download Roadmap Popup',
-        action: 'Submitted Popup Form',
-        label: 'Download Roadmap Popup',
-      });
     });
+  });
 </script>

src/components/SubscribePopup.astro

@@ -3,11 +3,7 @@ import Popup from './Popup/Popup.astro';
 import CaptchaFields from './Captcha/CaptchaFields.astro';
 ---
 
-<Popup
+<Popup id='subscribe-popup' title='Subscribe' subtitle='Enter your email below to receive updates.'>
-  id='subscribe-popup'
-  title='Subscribe'
-  subtitle='Enter your email below to receive updates.'
->
   <form
     action='https://newsletter.roadmap.sh/subscribe'
     method='POST'
@@ -15,6 +11,8 @@ import CaptchaFields from './Captcha/CaptchaFields.astro';
     target='_blank'
     captcha-form
   >
+    <input type='hidden' name='gdpr' value='true' />
+
     <input
       type='email'
       name='email'

src/pages/signup.astro

@@ -17,12 +17,10 @@ import BaseLayout from '../layouts/BaseLayout.astro';
       <div class='mb-2 sm:mb-5 text-left sm:text-center'>
         <h1 class='text-3xl sm:text-5xl font-semibold mb-2 sm:mb-4'>Signup</h1>
         <p class='hidden sm:block text-md text-gray-600'>
-          Register yourself to receive occasional emails about new roadmaps,
+          Register yourself to receive occasional emails about new roadmaps, updates, guides and videos
-          updates, guides and videos
         </p>
         <p class='text-sm block sm:hidden text-gray-600'>
-          Register yourself for occasional updates about roadmaps, guides and
+          Register yourself for occasional updates about roadmaps, guides and videos.
-          videos.
         </p>
       </div>
 
@@ -33,6 +31,8 @@ import BaseLayout from '../layouts/BaseLayout.astro';
         class='w-full'
         captcha-form
       >
+        <input type='hidden' name='gdpr' value='true' />
+
         <input
           type='email'
           required