Merge branch 'dev' into main

Author: gustavotoyota

apps/app-server/src/env.d.ts

@@ -54,7 +54,8 @@ declare namespace NodeJS {
 
     STRIPE_PUBLISHABLE_KEY: string;
     STRIPE_SECRET_KEY: string;
-    STRIPE_PRICE_ID: string;
     STRIPE_WEBHOOK_SECRET: string;
+    STRIPE_MONTHLY_PRICE_ID: string;
+    STRIPE_YEARLY_PRICE_ID: string;
   }
 }

apps/app-server/src/trpc/api/users/account/stripe/create-checkout-session.ts

@@ -5,15 +5,21 @@ import { once } from 'lodash';
 import type { InferProcedureOpts } from 'src/trpc/helpers';
 import { authProcedure } from 'src/trpc/helpers';
 import type Stripe from 'stripe';
+import { z } from 'zod';
 
-const baseProcedure = authProcedure;
+const baseProcedure = authProcedure.input(
+  z.object({
+    billingFrequency: z.enum(['monthly', 'yearly']).optional(),
+  }),
+);
 
 export const createCheckoutSessionProcedure = once(() =>
   baseProcedure.mutation(createCheckoutSession),
 );
 
 export async function createCheckoutSession({
   ctx,
+  input,
 }: InferProcedureOpts<typeof baseProcedure>) {
   return await ctx.usingLocks(
     [[`user-lock:${ctx.userId}`]],
@@ -102,7 +108,10 @@ export async function createCheckoutSession({
 
         line_items: [
           {
-            price: process.env.STRIPE_PRICE_ID,
+            price:
+              input.billingFrequency === 'yearly'
+                ? process.env.STRIPE_YEARLY_PRICE_ID
+                : process.env.STRIPE_MONTHLY_PRICE_ID,
             quantity: 1,
           },
         ],

apps/client/components.d.ts

@@ -7,6 +7,7 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    BillingFrequencyToggle: typeof import('./src/components/BillingFrequencyToggle.vue')['default']
     Checkbox: typeof import('./src/components/Checkbox.vue')['default']
     ColorPalette: typeof import('./src/components/ColorPalette.vue')['default']
     ColorSquare: typeof import('./src/components/ColorSquare.vue')['default']

apps/client/index.html

@@ -50,7 +50,7 @@
     />
     <meta
       property="og:title"
-      content="DeepNotes - Infinite Canvas Note-taking"
+      content="DeepNotes - Infinite Canvas Encrypted Note-taking"
     />
     <meta
       property="og:description"
@@ -72,7 +72,7 @@
     />
     <meta
       property="twitter:title"
-      content="DeepNotes - Infinite Canvas Note-taking"
+      content="DeepNotes - Infinite Canvas Encrypted Note-taking"
     />
     <meta
       property="twitter:description"