From d9a8115bade02e5c0ddeb4ce8dcb7d6d40d5cd88 Mon Sep 17 00:00:00 2001
From: Sam Rizvi <srizvi@users.noreply.github.com>
Date: Fri, 10 Nov 2023 18:13:35 -0800
Subject: [PATCH] fix: pricing page display issue #42

- fix TypeError by adding optional chaining to subscriptionPlan
- couldn't resist making a style change or two
  - made the checkmarks more shadcn'y
  - made the heading more tailwindy
  - improved messaging for interval
  - updated copy
  - made the switch more andvoila'y

  Closes #42
---
 app/components/pricing-cards.tsx | 63 +++++++++++++++-----------------
 app/components/ui/switch.tsx     |  4 +-
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/app/components/pricing-cards.tsx b/app/components/pricing-cards.tsx
index 1f4cc9be..78315c59 100644
--- a/app/components/pricing-cards.tsx
+++ b/app/components/pricing-cards.tsx
@@ -18,7 +18,7 @@ interface PricingCardsProps {
 }
 
 export function PricingCards({ userId, subscriptionPlan }: PricingCardsProps) {
-  const isYearlyDefault = subscriptionPlan!.interval === 'year' ? true : false;
+  const isYearlyDefault = subscriptionPlan?.interval === 'year' ? true : false;
   const [isYearly, setIsYearly] = useState<boolean>(!!isYearlyDefault);
   const signInModal = useSigninModal();
 
@@ -28,13 +28,18 @@ export function PricingCards({ userId, subscriptionPlan }: PricingCardsProps) {
 
   return (
     <section className="container flex flex-col items-center py-16 text-center lg:py-20">
-      <div className="mx-auto mb-10 flex w-full flex-col gap-5">
+      <div className="mx-auto mb-10 max-w-5xl">
         <p className="text-sm font-semibold uppercase tracking-widest text-brand">
-          Pricing
+          Membership Plans
         </p>
-        <h2 className="text-4xl font-extrabold sm:text-5xl md:text-6xl lg:text-8xl">
-          Start at full speed !
+        <h2 className="mt-2 text-7xl font-bold tracking-tight">
+          Crush your marketing goals
         </h2>
+        <p className="mx-auto mt-2 max-w-2xl text-center text-lg leading-8 text-muted-foreground">
+          Propel your digital marketing journey with Early Access. Dive into a
+          world of cutting-edge Playbooks, AI-enhanced tools, and a vibrant
+          community that’s always one step ahead.
+        </p>
       </div>
 
       <div className="mb-4 flex items-center gap-5">
@@ -54,44 +59,34 @@ export function PricingCards({ userId, subscriptionPlan }: PricingCardsProps) {
             className="relative flex flex-col overflow-hidden rounded-xl border bg-card"
             key={offer.title}
           >
-            <div className="min-h-[150px] items-start space-y-4 p-6">
+            <div className="min-h-[120px] items-start space-y-4 p-6">
               <p className="flex text-sm font-semibold uppercase tracking-widest text-brand">
                 {offer.title}
               </p>
-
-              <div className="flex flex-row">
-                <div className="flex items-end">
-                  <div className="flex text-left text-3xl font-semibold leading-6 lg:text-5xl">
-                    {isYearly && offer.prices.monthly > 0 ? (
-                      <>
-                        <span className="mr-2 text-xl text-muted-foreground/70 line-through">
-                          ${offer.prices.monthly}
-                        </span>
-                        <span>${Math.floor(offer.prices.yearly / 12)}</span>
-                      </>
-                    ) : (
-                      `$${offer.prices.monthly}`
-                    )}
-                  </div>
-                  <div className="-mb-1 ml-2 text-left text-sm font-medium">
-                    <div>/mo</div>
-                  </div>
-                </div>
+              <div className="mt-6 flex items-baseline gap-x-1">
+                <span className="text-5xl font-bold tracking-tight text-foreground lg:text-6xl">
+                  {isYearly && offer.prices.monthly > 0 ? (
+                    <>
+                      <span>${Math.floor(offer.prices.yearly / 12)}</span>
+                    </>
+                  ) : offer.prices.monthly > 0 ? (
+                    `$${offer.prices.monthly}`
+                  ) : (
+                    'Free'
+                  )}
+                </span>
+                {offer.prices.monthly > 0 && (
+                  <span className="text-sm leading-6 text-muted-foreground">
+                    /month{isYearly ? ', billed yearly' : ''}
+                  </span>
+                )}
               </div>
-              {offer.prices.monthly > 0 ? (
-                <div className="text-left text-sm text-muted-foreground">
-                  {isYearly
-                    ? `You'll be billed $${offer.prices.yearly} now for the year.`
-                    : 'billed monthly'}
-                </div>
-              ) : null}
             </div>
-
             <div className="flex h-full flex-col justify-between gap-16 p-6">
               <ul className="space-y-2 text-left text-sm font-medium leading-normal">
                 {offer.benefits.map((feature) => (
                   <li className="flex items-start" key={feature}>
-                    <Icons.check className="mr-3 h-5 w-5 shrink-0 text-brand/70" />
+                    <Icons.radixCheck className="mr-3 h-5 w-5 shrink-0 text-brand/70" />
                     <p>{feature}</p>
                   </li>
                 ))}
diff --git a/app/components/ui/switch.tsx b/app/components/ui/switch.tsx
index d33dbfc5..aca94f31 100644
--- a/app/components/ui/switch.tsx
+++ b/app/components/ui/switch.tsx
@@ -11,7 +11,7 @@ const Switch = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <SwitchPrimitives.Root
     className={cn(
-      'peer inline-flex h-[20px] w-[36px] shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input',
+      'peer inline-flex h-[20px] w-[36px] shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary-foreground data-[state=unchecked]:bg-input',
       className,
     )}
     {...props}
@@ -19,7 +19,7 @@ const Switch = React.forwardRef<
   >
     <SwitchPrimitives.Thumb
       className={cn(
-        'pointer-events-none block h-4 w-4 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0',
+        'pointer-events-none block h-4 w-4 rounded-full bg-brand shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0',
       )}
     />
   </SwitchPrimitives.Root>