Merge pull request #938 from mbifulco/revert-936-f/localstorage-hook

Revert "Newsletter signup gated by localstorage hook"

.prettierrc

@@ -18,7 +18,6 @@
     "^@craftwork/(.*)$",
     "^@components/(.*)$",
     "^@data/(.*)$",
-    "^@hooks/(.*)$",
     "^@layouts/(.*)$",
     "^@lib/(.*)$",
     "^@ui/(.*)$",

src/components/Analytics/Fathom.tsx

@@ -3,11 +3,10 @@
 import { Suspense, useEffect } from 'react';
 import { usePathname, useSearchParams } from 'next/navigation';
 import { useRouter } from 'next/router';
+import { useRouterType } from '@hooks/useRouterType';
 import * as Fathom from 'fathom-client';
 import posthog from 'posthog-js';
 
-import { useRouterType } from '@hooks/useRouterType';
-
 const FATHOM_DOMAINS = ['mikebifulco.com', 'www.mikebifulco.com'];
 
 const FathomPagesRouter = ({ siteId }: { siteId: string }) => {

src/components/NewsletterSignup/SubscriberCount.tsx

@@ -1,6 +1,5 @@
-import NumberFlow from '@number-flow/react';
-
 import useNewsletterStats from '@hooks/useNewsletterStats';
+import NumberFlow from '@number-flow/react';
 
 type SubscriberCountProps = {
   label?: string;

src/components/Post/mentionsSummary.tsx

@@ -1,7 +1,7 @@
 import { useRouter } from 'next/router';
+import { useWebMentions } from '@hooks/useWebMentions';
 import pluralize from 'pluralize';
 
-import { useWebMentions } from '@hooks/useWebMentions';
 import formatDate from '@utils/format-date';
 import type { WebMention } from '@utils/webmentions';
 import { Avatar, AvatarGroup } from '../Avatar';

src/components/SubscriptionForm/SubscriptionForm.tsx

@@ -1,12 +1,9 @@
-'use client';
-
 import { useRef, useState } from 'react';
 import Link from 'next/link';
+import useNewsletterStats from '@hooks/useNewsletterStats';
 import posthog from 'posthog-js';
 
 import Button from '@components/Button';
-import { useLocalStorage } from '@hooks/useLocalStorage';
-import useNewsletterStats from '@hooks/useNewsletterStats';
 import { trpc } from '@utils/trpc';
 
 type SubscriptionFormProps = {
@@ -15,19 +12,11 @@ type SubscriptionFormProps = {
   buttonText?: string;
 };
 
-type SubscriptionRecord = {
-  email?: string;
-  firstName?: string;
-  date?: string;
-};
-
 const SubscriptionForm: React.FC<SubscriptionFormProps> = ({
   tags: _,
   source,
   buttonText = 'Subscribe',
 }) => {
-  const [subscriptionRecord, setSubscriptionRecord] =
-    useLocalStorage<SubscriptionRecord>('tiny-improvements-subscribed', {});
   const [getHoneypottedNerd, setGetHoneypottedNerd] = useState<boolean>(false);
   const addSubscriberMutation = trpc.mailingList.subscribe.useMutation({
     onSuccess: () => {
@@ -41,12 +30,6 @@ const SubscriptionForm: React.FC<SubscriptionFormProps> = ({
         email,
         firstName,
       });
-
-      setSubscriptionRecord({
-        email,
-        firstName,
-        date: new Date().toISOString(),
-      });
     },
     onError: (error) => {
       const email = emailRef.current?.value;
@@ -115,16 +98,12 @@ const SubscriptionForm: React.FC<SubscriptionFormProps> = ({
     );
   }
 
-  if (
-    addSubscriberMutation.isSuccess ||
-    getHoneypottedNerd ||
-    subscriptionRecord?.date
-  ) {
+  if (addSubscriberMutation.isSuccess || getHoneypottedNerd) {
     return (
       <div className="flex flex-col gap-2">
-        <p className="text-xl font-medium text-inherit">
-          🪩 Thanks so much for subscribing. Don&apos;t forget to check your
-          spam folder for emails from{' '}
+        <p className="text-xl font-semibold text-inherit">
+          🪩 Success! Thanks so much for subscribing. Don&apos;t forget to check
+          your spam folder for emails from{' '}
           <span className="text-pink-600">[email protected].</span>
         </p>
       </div>
@@ -136,9 +115,7 @@ const SubscriptionForm: React.FC<SubscriptionFormProps> = ({
       <form ref={formRef} className="w-full" onSubmit={handleSubmission}>
         <fieldset
           disabled={
-            subscriptionRecord?.date !== undefined ||
-            addSubscriberMutation.isPending ||
-            addSubscriberMutation.isSuccess
+            addSubscriberMutation.isPending || addSubscriberMutation.isSuccess
           }
         >
           <div data-style="clean">