feat(tt): turn off pop-up surveys for select pages

skillrecordings · Oct 28, 2024 · e1cd0b1 · e1cd0b1
1 parent 1d97162
commit e1cd0b1
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 29 deletions.
diff --git a/apps/total-typescript/src/components/app/layout.tsx b/apps/total-typescript/src/components/app/layout.tsx
@@ -18,6 +18,7 @@ type LayoutProps = {
   className?: string
   nav?: React.ReactElement | null
   footer?: React.ReactElement | null
+  survey?: boolean
   children?: any
 }
 
@@ -28,6 +29,7 @@ const Layout: FunctionComponent<LayoutProps> = ({
   noIndex,
   nav,
   footer,
+  survey = true,
 }) => {
   const router = useRouter()
   const {isFeedbackDialogOpen, feedbackComponent} = useFeedback()
@@ -103,7 +105,7 @@ const Layout: FunctionComponent<LayoutProps> = ({
         {children}
       </div>
       {footer ? footer : isNull(footer) ? null : <Footer />}
-      <Survey />
+      {survey && <Survey />}
     </div>
   )
 }

diff --git a/apps/total-typescript/src/offer/survey/data-typescript-2024.ts b/apps/total-typescript/src/offer/survey/data-typescript-2024.ts
@@ -11,7 +11,7 @@ function getFinalQuestion(answers: Record<string, string>): string {
     (challenge === 'team_adoption' ||
       answers.learning_priority === 'team_adoption')
   ) {
-    return "We love working with technical leaders who are helping their teams level up with TypeScript! Could you tell us more about your team's TypeScript journey? What specific challenges are you facing with adoption, and what would make the biggest impact for your team right now?"
+    return "Tell us more about your team's TypeScript journey? What specific challenges are you facing with adoption, and what would make the biggest impact for your team right now?"
   }
 
   // Learning Journey variant
@@ -20,11 +20,11 @@ function getFinalQuestion(answers: Record<string, string>): string {
     skillLevel === 'advanced-beginner' ||
     challenge === 'fundamentals'
   ) {
-    return "Everyone's TypeScript learning journey is unique! Could you tell us about what motivated you to learn TypeScript and what specific concepts or patterns you're most eager to master? What would help you feel more confident using TypeScript in your projects?"
+    return "Tell us about what motivated you to learn TypeScript and what specific concepts or patterns you're most excited to master? What would help you feel more confident using TypeScript in your projects?"
   }
 
   // Individual Developer variant (default)
-  return "It sounds like you're diving deep into TypeScript's technical challenges! Could you share more about the specific problems you're trying to solve? What kinds of TypeScript patterns or solutions would make the biggest difference in your day-to-day work?"
+  return "Share more about the specific problems you're trying to solve? What kinds of TypeScript patterns or solutions would make the biggest difference in your day-to-day work?"
 }
 
 export const dataTypescript2024: QuizResource = {
@@ -89,10 +89,6 @@ export const dataTypescript2024: QuizResource = {
           answer: 'fullstack',
           label: 'Full-stack (both frontend and backend)',
         },
-        {
-          answer: 'none',
-          label: "I don't use TypeScript",
-        },
       ],
     },
     role: {
@@ -130,24 +126,36 @@ export const dataTypescript2024: QuizResource = {
           label: 'React',
         },
         {
-          answer: 'nextjs',
-          label: 'Next.js',
+          answer: 'vue',
+          label: 'Vue',
+        },
+        {
+          answer: 'svelte',
+          label: 'Svelte',
+        },
+        {
+          answer: 'solid',
+          label: 'Solid',
         },
         {
           answer: 'nodejs',
           label: 'Node.js',
         },
         {
-          answer: 'express',
-          label: 'Express',
+          answer: 'bun',
+          label: 'Bun',
+        },
+        {
+          answer: 'deno',
+          label: 'Deno',
         },
         {
-          answer: 'nestjs',
-          label: 'NestJS',
+          answer: 'zod',
+          label: 'Zod',
         },
         {
-          answer: 'vanilla',
-          label: 'Vanilla TypeScript',
+          answer: 'trpc',
+          label: 'tRPC',
         },
         {
           answer: 'other',
@@ -156,21 +164,25 @@ export const dataTypescript2024: QuizResource = {
       ],
     },
     current_challenge: {
-      question: "What's your biggest TypeScript challenge right now?",
+      question: 'What is your biggest TypeScript challenge right now?',
       type: 'multiple-choice',
       shuffleChoices: true,
       choices: [
         {
-          answer: 'types',
-          label: 'Writing better types for my code',
+          answer: 'debugging',
+          label: 'Debugging type errors',
         },
         {
-          answer: 'complex_types',
-          label: 'Managing complex type systems',
+          answer: 'speed',
+          label: 'Not moving fast enough',
         },
         {
-          answer: 'setup',
-          label: 'Setting up and configuring TypeScript projects',
+          answer: 'better_types',
+          label: 'Writing better types for my code',
+        },
+        {
+          answer: 'config',
+          label: 'Configuring TypeScript projects',
         },
         {
           answer: 'team_adoption',
@@ -181,8 +193,8 @@ export const dataTypescript2024: QuizResource = {
           label: 'Understanding advanced TypeScript features',
         },
         {
-          answer: 'debugging',
-          label: 'Debugging type-related issues',
+          answer: 'migration',
+          label: 'Migrating to TypeScript',
         },
       ],
     },

diff --git a/apps/total-typescript/src/pages/invoices/[merchantChargeId].tsx b/apps/total-typescript/src/pages/invoices/[merchantChargeId].tsx
@@ -88,6 +88,7 @@ const Invoice: React.FC<
       meta={{title: `Invoice for ${productName}`}}
       footer={null}
       className="print:bg-white print:text-black"
+      survey={false}
     >
       <main className="mx-auto max-w-screen-md">
         <div className="flex flex-col items-center justify-between px-5 pb-8 pt-20 text-center sm:pt-28 md:text-left print:hidden">

diff --git a/apps/total-typescript/src/pages/invoices/index.tsx b/apps/total-typescript/src/pages/invoices/index.tsx
@@ -36,7 +36,7 @@ const Learn: React.FC<React.PropsWithChildren<{purchases: Purchase[]}>> = ({
   purchases = [],
 }) => {
   return (
-    <Layout meta={{title: 'Invoices'}}>
+    <Layout meta={{title: 'Invoices'}} survey={false}>
       <main className="mx-auto flex h-full w-full max-w-2xl flex-grow flex-col px-5 py-24 sm:py-32">
         <h1 className="pb-4 font-text text-3xl font-medium text-white">
           Your Invoices

diff --git a/apps/total-typescript/src/pages/survey.tsx b/apps/total-typescript/src/pages/survey.tsx
@@ -47,8 +47,9 @@ const SurveyPageWrapper: React.FC = () => {
   return (
     <Layout
       meta={{
-        title: 'Survey',
+        title: 'Total TypeScript 2024 Survey',
       }}
+      survey={false}
     >
       <div id="ask">
         {isLoading ? (

diff --git a/apps/total-typescript/src/pages/team/buy-more-seats.tsx b/apps/total-typescript/src/pages/team/buy-more-seats.tsx
@@ -142,6 +142,7 @@ const BuyMoreSeatsPage: React.FC<
       meta={{
         title: `Buy more seats`,
       }}
+      survey={false}
     >
       <div
         id="buy-more-seats"

diff --git a/apps/total-typescript/src/pages/team/index.tsx b/apps/total-typescript/src/pages/team/index.tsx
@@ -84,7 +84,10 @@ const TeamPage: React.FC<React.PropsWithChildren<TeamPageProps>> = ({
   )
 
   return (
-    <Layout meta={{title: 'Invite your team to Total TypeScript'}}>
+    <Layout
+      meta={{title: 'Invite your team to Total TypeScript'}}
+      survey={false}
+    >
       <main
         data-team-page=""
         className="mx-auto flex w-full max-w-xl flex-grow flex-col items-center justify-center gap-3 p-5 pb-16 pt-28 text-gray-900"

diff --git a/apps/total-typescript/src/pages/thanks/redeem.tsx b/apps/total-typescript/src/pages/thanks/redeem.tsx
@@ -24,7 +24,7 @@ const ThanksRedeem: React.FC<
   React.PropsWithChildren<{purchase: any; email: string}>
 > = ({email}) => {
   return (
-    <Layout footer={null}>
+    <Layout footer={null} survey={false}>
       <main className="flex flex-grow flex-col items-center justify-center px-5 pb-16 pt-5">
         <div className="mx-auto w-full max-w-3xl">
           <h1 className="w-full pb-3 font-semibold uppercase tracking-wide">

diff --git a/apps/total-typescript/src/pages/transfer/[purchaseUserTransferId].tsx b/apps/total-typescript/src/pages/transfer/[purchaseUserTransferId].tsx
@@ -69,6 +69,7 @@ const Welcome = ({
     <Layout
       meta={{title: `Welcome to ${process.env.NEXT_PUBLIC_SITE_TITLE}`}}
       footer={null}
+      survey={false}
     >
       <main className="mx-auto flex w-full flex-grow flex-col items-center justify-center px-5 py-24 sm:py-32">
         {data?.transferState === 'INITIATED' && (

diff --git a/apps/total-typescript/src/pages/welcome/index.tsx b/apps/total-typescript/src/pages/welcome/index.tsx
@@ -157,6 +157,7 @@ const Welcome: React.FC<
     <Layout
       meta={{title: `Welcome to ${process.env.NEXT_PUBLIC_SITE_TITLE}`}}
       footer={null}
+      survey={false}
     >
       <main
         className="mx-auto flex w-full flex-grow flex-col items-center justify-center px-5 pb-32 pt-24"