From 5ead88683fff9985a1100dd715ef1a830687d9f4 Mon Sep 17 00:00:00 2001 From: Amaury <1293565+amaury1729@users.noreply.github.com> Date: Sun, 31 Dec 2023 12:33:06 +0100 Subject: [PATCH] feat: Add 3 emails/mo free trial --- src/app/[lang]/dashboard/ApiUsage.tsx | 2 +- src/app/[lang]/dashboard/Dashboard.tsx | 2 +- .../dashboard/verify/GetStartedNoPlan.tsx | 20 ------------------- src/app/[lang]/dashboard/verify/page.tsx | 20 +++++++++---------- src/app/[lang]/login/Feedback.tsx | 1 + src/middleware.ts | 5 +++-- src/util/subs.ts | 4 ++-- 7 files changed, 17 insertions(+), 37 deletions(-) delete mode 100644 src/app/[lang]/dashboard/verify/GetStartedNoPlan.tsx diff --git a/src/app/[lang]/dashboard/ApiUsage.tsx b/src/app/[lang]/dashboard/ApiUsage.tsx index 51fe6af2..1825c9b5 100644 --- a/src/app/[lang]/dashboard/ApiUsage.tsx +++ b/src/app/[lang]/dashboard/ApiUsage.tsx @@ -13,7 +13,7 @@ import { createClient } from "@/supabase/client"; interface ApiUsageProps { d: Dictionary; - subscription: SubscriptionWithPrice; + subscription: SubscriptionWithPrice | null; } export function ApiUsage({ diff --git a/src/app/[lang]/dashboard/Dashboard.tsx b/src/app/[lang]/dashboard/Dashboard.tsx index 7ec6e423..a7e83ae9 100644 --- a/src/app/[lang]/dashboard/Dashboard.tsx +++ b/src/app/[lang]/dashboard/Dashboard.tsx @@ -26,7 +26,7 @@ export function Dashboard({ - {showApiUsage && subscription && ( + {showApiUsage && ( <> diff --git a/src/app/[lang]/dashboard/verify/GetStartedNoPlan.tsx b/src/app/[lang]/dashboard/verify/GetStartedNoPlan.tsx deleted file mode 100644 index 237047b4..00000000 --- a/src/app/[lang]/dashboard/verify/GetStartedNoPlan.tsx +++ /dev/null @@ -1,20 +0,0 @@ -"use client"; - -import { Card, Text } from "@geist-ui/react"; -import Markdown from "marked-react"; -import React from "react"; -import { LinkRenderer } from "@/components/Markdown"; -import { Dictionary } from "@/dictionaries"; - -export function GetStartedNoPlan(props: { d: Dictionary }) { - const d = props.d.dashboard.get_started_no_plan; - - return ( - - {d.title} - - {d.head_to_pricing} - - - ); -} diff --git a/src/app/[lang]/dashboard/verify/page.tsx b/src/app/[lang]/dashboard/verify/page.tsx index 30fc98a8..2bbedb3e 100644 --- a/src/app/[lang]/dashboard/verify/page.tsx +++ b/src/app/[lang]/dashboard/verify/page.tsx @@ -6,7 +6,6 @@ import { getSubscription, getUserDetails, } from "@/supabase/supabaseServer"; -import { GetStartedNoPlan } from "./GetStartedNoPlan"; import { GetStartedApi } from "./GetStartedApi"; import { dictionary } from "@/dictionaries"; import { Spacer } from "@/components/Geist"; @@ -27,16 +26,15 @@ export default async function VerifySingle({ const d = await dictionary(lang); return ( - - {subscription ? ( - <> - - - - - ) : ( - - )} + + + + ); } diff --git a/src/app/[lang]/login/Feedback.tsx b/src/app/[lang]/login/Feedback.tsx index 55638779..cb646976 100644 --- a/src/app/[lang]/login/Feedback.tsx +++ b/src/app/[lang]/login/Feedback.tsx @@ -29,6 +29,7 @@ export function Feedback({ Blog du Modérateur + Facebook {d.other} diff --git a/src/middleware.ts b/src/middleware.ts index 660b748a..d24d34fa 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -31,9 +31,10 @@ export const config = { * - favicon (favicon file) * - monitoring (health check) * - js (JavaScript files) - * - v0,v1 (API routes) + * - v0,v1 (api.reacher.email/v0/...) + * - version (api.reacher.email/version) */ - "/((?!api|_next/static|_next/image|favicon|monitoring|js|v0|v1).*)", + "/((?!api|_next/static|_next/image|favicon|monitoring|js|v0|v1|version).*)", ], }; diff --git a/src/util/subs.ts b/src/util/subs.ts index f6e9dd23..b9f4d3c3 100644 --- a/src/util/subs.ts +++ b/src/util/subs.ts @@ -18,12 +18,12 @@ if ( } // Return the max monthly calls -export function subApiMaxCalls(productId: string | null): number { +export function subApiMaxCalls(productId: string | null | undefined): number { return productId === SAAS_100K_PRODUCT_ID ? 100_000 : productId === SAAS_10K_PRODUCT_ID ? 10_000 - : 50; + : 3; } // Get the api calls of a user in the past month/billing period.