New pricing

Author: brunolemos

landing/src/components/sections/CTAButtons.tsx

@@ -1,5 +1,6 @@
 import {
   activePaidPlans,
+  activePlans,
   constants,
   freeTrialDays,
 } from '@brunolemos/devhub-core'
@@ -88,7 +89,7 @@ export default function CTAButtons(props: CTAButtonsProps) {
             </Button>
           )}
 
-          {!!(freeTrialDays && activePaidPlans.some(plan => !plan.amount)) && (
+          {!!(freeTrialDays && activePlans.some(plan => !plan.amount)) && (
             <Button
               type="neutral"
               href="/download?autostart"

landing/src/components/sections/features/FeaturesBlock.tsx

@@ -77,7 +77,7 @@ export default function FeaturesBlock(_props: FeaturesBlockProps) {
           alt: 'DevHub - Label filter',
         }}
         title="Filter by labels and many other filters"
-        subtitle="All columns support a common set of filters, like Label, Issue Status, Bot, Text, etc. The Issues & Pull Requests columns are special: they give you all the power of GitHub Advanced Search on your hands (filter by assignee, number of comments, ...)"
+        subtitle="All columns support a common set of filters, like Bot, Label, Issue Status, Text, etc. The Issues & Pull Requests columns are special: they give you all the power of GitHub Advanced Search on your hands (filter by assignee, number of comments, ...)"
       />
 
       <div className="pb-16 md:pb-32" />

landing/src/components/sections/header/Header.tsx

@@ -1,4 +1,8 @@
-import { activePaidPlans, freeTrialDays } from '@brunolemos/devhub-core'
+import {
+  activePaidPlans,
+  freeTrialDays,
+  activePlans,
+} from '@brunolemos/devhub-core'
 import classNames from 'classnames'
 import Link from 'next/link'
 
@@ -92,7 +96,7 @@ export default function Header(props: HeaderProps) {
             </HeaderLink> */}
 
             {!!(
-              (freeTrialDays && activePaidPlans.some(plan => !plan.amount)) ||
+              (freeTrialDays && activePlans.some(plan => !plan.amount)) ||
               (authData &&
                 authData.appToken &&
                 (freeTrialDays || (authData.plan && authData.plan.amount)))

landing/src/components/sections/pricing/PricingPlanBlock.tsx

@@ -96,7 +96,7 @@ export function PricingPlanBlock(props: PricingPlanBlockProps) {
       }${_roundedPriceLabelWithInterval}`
   }
 
-  if (!plan.interval) {
+  if (!plan.interval && plan.amount) {
     footerText =
       (footerText ? `${footerText}\n` : footerText) +
       'One-time payment (no subscription)'
@@ -106,11 +106,7 @@ export function PricingPlanBlock(props: PricingPlanBlockProps) {
     <section
       className={classNames(
         'pricing-plan flex flex-col flex-shrink-0',
-        totalNumberOfVisiblePlans === 1
-          ? 'w-full lg:w-84'
-          : totalNumberOfVisiblePlans && totalNumberOfVisiblePlans <= 3
-          ? 'w-72'
-          : 'w-64',
+        totalNumberOfVisiblePlans === 1 ? 'w-full lg:w-84' : 'w-72',
       )}
     >
       <div
@@ -187,7 +183,7 @@ export function PricingPlanBlock(props: PricingPlanBlockProps) {
             footerText ||
             (totalNumberOfVisiblePlans && totalNumberOfVisiblePlans > 1)
           ) && (
-            <div className="mb-2 text-sm text-muted-65 italic">
+            <div className="mb-2 text-sm text-muted-65 italic whitespace-pre-line">
               &nbsp;{footerText}&nbsp;
             </div>
           )}

landing/src/components/sections/subscribe/SubscribeForm.tsx

@@ -108,7 +108,11 @@ export const SubscribeForm = injectStripe<SubscribeFormProps>(
 
     const minimumQuantity = showQuantityForm
       ? Math.max(
-          quantityStep > 1 ? quantityStep : 1,
+          quantityStep > 1
+            ? quantityStep
+            : plan.type === 'team' && plan.paddleProductId
+            ? 2
+            : 1,
           Math.ceil(users.length / quantityStep) * quantityStep,
         )
       : 1
@@ -802,7 +806,9 @@ export const SubscribeForm = injectStripe<SubscribeFormProps>(
               !plan.stripeIds.length &&
                 plan.paddleProductId &&
                 plan.description,
-            ].filter(Boolean).join('\n')}
+            ]
+              .filter(Boolean)
+              .join('\n')}
           </p>
         )}
 

packages/core/src/utils/plans.ts

@@ -2,27 +2,29 @@ import { Plan } from '../types'
 import * as constants from './constants'
 
 export type ActivePlanID =
-  | '5de54fc1d6c4fded37775e71'
-  | '5de54fc29188ad514567ddb2'
+  | 'free'
+  | '5ded8bd7fcf793f771a0264c'
+  | '5ded8e946bcd42efb0e6094a'
   | '5de54fc278c2188b4ec17fc7'
   | '5de54fc30cd5acc31a86e884'
   | '5dd82d16eb2b11106f941f8d'
+  | '5de552b6dde41be55811ed15'
 
 export type InactivePlanID =
-  | 'free'
   | '5d4b8e85d123d1d770d93825'
   | '5d4b8e44ab1ba20b9ef4a1ba'
   | '5d4b8e4de70bd8c61c13a6a9'
   | '5db0d55e138a98f7008a0e53'
   | '5dba30bd0621102b5cd0bc44'
   | '5dba30bf7deee78cb184291d'
   | '5dc89f56bae8d4ae5245423e'
-  | '5dd44e11b2726bb02d540b5e'
   | '5db0d37ce59ab2d3c0bbd611'
   | '5db0d5fb957ac4e5ed7bbb05'
   | '5dd4618db3ebb145268eba7c'
   | '5dd467e799537b2378df8eea'
-  | '5de552b6dde41be55811ed15'
+  | '5de54fc1d6c4fded37775e71'
+  | '5de54fc29188ad514567ddb2'
+  | '5dd44e11b2726bb02d540b5e'
 
 export type PlanID = ActivePlanID | InactivePlanID
 
@@ -44,7 +46,7 @@ const _freePlan: Plan & { id: 'free' } = {
 
   cannonicalId: 'free',
   label: 'Free',
-  description: '',
+  description: '\n\n',
   amount: 0,
   currency: 'usd',
   interval: undefined,
@@ -109,7 +111,7 @@ export const allPlansObj: Record<PlanID, Plan> = {
     currency: 'usd',
     interval: 'month',
     intervalCount: 1,
-    trialPeriodDays: 7,
+    trialPeriodDays: 0,
 
     featureLabels: [
       { id: 'columnsLimit', label: 'Up to 12 columns', available: true },
@@ -152,7 +154,7 @@ export const allPlansObj: Record<PlanID, Plan> = {
     currency: 'usd',
     interval: 'month',
     intervalCount: 1,
-    trialPeriodDays: 7,
+    trialPeriodDays: 0,
     featureLabels: [
       {
         id: 'columnsLimit',
@@ -203,7 +205,7 @@ export const allPlansObj: Record<PlanID, Plan> = {
     currency: 'usd',
     interval: 'month',
     intervalCount: 1,
-    trialPeriodDays: 7,
+    trialPeriodDays: 0,
     featureLabels: [
       { id: 'columnsLimit', label: 'Up to 20 columns', available: true },
       { id: 'enableFilters', label: 'All filters', available: true },
@@ -408,7 +410,7 @@ export const allPlansObj: Record<PlanID, Plan> = {
 
     cannonicalId: 'yearly',
     label: 'Yearly',
-    description: '',
+    description: '\n\n',
     amount: 9000,
     currency: 'usd',
     interval: 'year',
@@ -554,7 +556,7 @@ export const allPlansObj: Record<PlanID, Plan> = {
     stripeIds: ['plan_GHtLrxHfn3DDkr', 'plan_GHsabiw9GfQH9N'],
     paddleProductId: undefined,
 
-    banner: '17% OFF',
+    banner: '30% OFF',
 
     cannonicalId: 'team-monthly',
     label: 'Team Monthly',
@@ -584,10 +586,10 @@ export const allPlansObj: Record<PlanID, Plan> = {
     id: '5de54fc30cd5acc31a86e884',
     type: 'team',
 
-    stripeIds: ['plan_GHtMaMxGQtAySy', 'plan_GHsqgnLvYnfu2q'],
+    stripeIds: ['plan_GKEKN4EG1Rawje', 'plan_GHsqgnLvYnfu2q'],
     paddleProductId: undefined,
 
-    banner: '38% OFF',
+    banner: '48% OFF',
 
     cannonicalId: 'team-yearly',
     label: 'Team Yearly',
@@ -625,7 +627,7 @@ export const allPlansObj: Record<PlanID, Plan> = {
     cannonicalId: 'lifetime-v1',
     label: 'Lifetime v1',
     description: `Lifetime access from v0.9 to v1.9 \n(current: v${constants.APP_VERSION})`,
-    amount: 9900,
+    amount: 14900,
     currency: 'usd',
     interval: undefined,
     intervalCount: 1,
@@ -650,12 +652,12 @@ export const allPlansObj: Record<PlanID, Plan> = {
     stripeIds: [],
     paddleProductId: 577489,
 
-    banner: true,
+    banner: '33% OFF',
 
     cannonicalId: 'team-lifetime-v1',
     label: 'Team Lifetime v1',
     description: `Lifetime access from v0.9 to v1.9 \n(current: v${constants.APP_VERSION})`,
-    amount: 19900,
+    amount: 9900,
     currency: 'usd',
     interval: undefined,
     intervalCount: 1,
@@ -672,16 +674,74 @@ export const allPlansObj: Record<PlanID, Plan> = {
       enablePushNotifications: true,
     },
   },
+
+  '5ded8bd7fcf793f771a0264c': {
+    id: '5ded8bd7fcf793f771a0264c',
+    type: 'individual',
+
+    stripeIds: ['plan_GKEKNpDiuSZv46', 'plan_GKDvgmdNgDOOso'],
+    paddleProductId: undefined,
+
+    banner: true,
+
+    cannonicalId: 'monthly',
+    label: 'Monthly',
+    description: '\n\n',
+    amount: 1200,
+    currency: 'usd',
+    interval: 'month',
+    intervalCount: 1,
+    trialPeriodDays: 0,
+    featureLabels: [],
+
+    featureFlags: {
+      columnsLimit: constants.COLUMNS_LIMIT,
+      enableFilters: true,
+      enableSync: true,
+      enablePrivateRepositories: true,
+      enablePushNotifications: true,
+    },
+  },
+
+  '5ded8e946bcd42efb0e6094a': {
+    id: '5ded8e946bcd42efb0e6094a',
+    type: 'individual',
+
+    stripeIds: ['plan_GKELMpfqKbmnQe', 'plan_GKE7HnxNA4f9tN'],
+    paddleProductId: undefined,
+
+    banner: '30% OFF',
+
+    cannonicalId: 'yearly',
+    label: 'Yearly',
+    description: '\n\n',
+    amount: 9900,
+    currency: 'usd',
+    interval: 'year',
+    intervalCount: 1,
+    trialPeriodDays: 0,
+    featureLabels: [],
+
+    featureFlags: {
+      columnsLimit: constants.COLUMNS_LIMIT,
+      enableFilters: true,
+      enableSync: true,
+      enablePrivateRepositories: true,
+      enablePushNotifications: true,
+    },
+  },
 }
 
 export const allPlans = Object.values(allPlansObj)
 
 export const activePlans: Array<Plan & { id: ActivePlanID }> = [
-  allPlansObj['5de54fc1d6c4fded37775e71'] as Plan & { id: ActivePlanID },
-  allPlansObj['5de54fc29188ad514567ddb2'] as Plan & { id: ActivePlanID },
+  freeTrialPlan,
+  allPlansObj['5ded8bd7fcf793f771a0264c'] as Plan & { id: ActivePlanID },
+  allPlansObj['5ded8e946bcd42efb0e6094a'] as Plan & { id: ActivePlanID },
   allPlansObj['5de54fc278c2188b4ec17fc7'] as Plan & { id: ActivePlanID },
   allPlansObj['5de54fc30cd5acc31a86e884'] as Plan & { id: ActivePlanID },
   allPlansObj['5dd82d16eb2b11106f941f8d'] as Plan & { id: ActivePlanID },
+  allPlansObj['5de552b6dde41be55811ed15'] as Plan & { id: ActivePlanID },
 ]
 
 export const activePaidPlans = activePlans.filter(plan => plan.amount > 0)