Merge pull request #624 from tone-row/dev

v1.45.0

api/_lib/_helpers.ts

@@ -70,3 +70,16 @@ export async function confirmActiveSubscriptionFromToken(token?: string) {
 export function isError(error: unknown): error is Error {
   return error instanceof Error;
 }
+
+/**
+ * Returns the correct base url depending on the environment
+ */
+export function getBaseUrl() {
+  if (process.env.VERCEL_ENV === "production") {
+    return "https://flowchart.fun";
+  } else if (process.env.VERCEL_ENV === "preview") {
+    return `https://${process.env.VERCEL_URL}`;
+  }
+
+  return "http://localhost:3000";
+}

api/create-checkout-session.ts

@@ -0,0 +1,43 @@
+import { VercelApiHandler } from "@vercel/node";
+import { stripe } from "./_lib/_stripe";
+import { getBaseUrl } from "./_lib/_helpers";
+
+const subscriptionTypes = {
+  monthly: process.env.STRIPE_PRICE_ID,
+  yearly: process.env.STRIPE_PRICE_ID_YEARLY,
+};
+
+const handler: VercelApiHandler = async (req, res) => {
+  const { email, plan } = req.body;
+  if (!email || !plan) {
+    res.status(400).send("Missing parameters");
+    return;
+  }
+
+  const priceId = subscriptionTypes[plan as keyof typeof subscriptionTypes];
+  if (!priceId) {
+    res.status(400).send("Invalid plan");
+    return;
+  }
+
+  try {
+    const session = await stripe.checkout.sessions.create({
+      mode: "subscription",
+      line_items: [
+        {
+          price: priceId,
+          quantity: 1,
+        },
+      ],
+      customer_email: email,
+      success_url: `${getBaseUrl()}/success`,
+      cancel_url: `${getBaseUrl()}/pricing`,
+    });
+
+    res.json({ url: session.url });
+  } catch (error) {
+    res.status(500).json({ error });
+  }
+};
+
+export default handler;

api/data/import.ts

@@ -1,9 +1,7 @@
 import { VercelRequest, VercelResponse } from "@vercel/node";
 import { parse } from "csv-parse/sync";
 
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import type { Readable } from "node:stream";
+export const maxDuration = 60; // 1 minutes
 
 /**
  * Receives text/csv content in post request

api/prompt/text.ts

@@ -5,6 +5,8 @@ import { stringify } from "graph-selector";
 
 type PromptType = "knowledge" | "flowchart";
 
+export const maxDuration = 60 * 5; // 5 minutes
+
 const handler: VercelApiHandler = async (req, res) => {
   const { subject, promptType, accentClasses = [] } = req.body;
   if (!subject || !promptType || !isPromptType(promptType)) {

app/e2e/sign-up.spec.ts

@@ -10,7 +10,9 @@ test.describe.configure({
   mode: "serial",
 });
 
-test.skip(({ browserName }) => browserName !== "chromium", "Chrome Only");
+// test.skip(({ browserName }) => browserName !== "chromium", "Chrome Only");
+// Temporarily skip this entirely
+test.skip();
 
 test.beforeAll(async ({ browser }) => {
   page = await browser.newPage();

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "1.44.0",
+  "version": "1.45.0",
   "main": "module/module.js",
   "license": "MIT",
   "scripts": {

app/src/components/Checkout.tsx

@@ -0,0 +1,141 @@
+import { useContext } from "react";
+import { AppContext, useSession } from "./AppContextProvider";
+import { useIsProUser } from "../lib/hooks";
+import { Link } from "react-router-dom";
+import Spinner from "./Spinner";
+import { useMutation } from "react-query";
+import { Trans, t } from "@lingui/macro";
+import { PlanButton } from "./PlanButton";
+import { PaymentStepperTitle } from "./PaymentStepperTitle";
+import classNames from "classnames";
+
+export function Checkout() {
+  const session = useSession();
+  const sessionEmail = session?.user?.email;
+  const { checkedSession, customerIsLoading } = useContext(AppContext);
+  const isProUser = useIsProUser();
+  const createCheckoutSession = useMutation(
+    async (plan: "monthly" | "yearly") => {
+      const response = await fetch("/api/create-checkout-session", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          plan,
+          email: sessionEmail,
+        }),
+      });
+      const { url, error } = await response.json();
+      if (error) {
+        throw new Error(error.message);
+      }
+      return url;
+    },
+    {
+      onSuccess: (url) => {
+        window.location.href = url;
+      },
+    }
+  );
+
+  if (!checkedSession) {
+    return (
+      <div>
+        <Spinner />
+      </div>
+    );
+  }
+
+  if (!sessionEmail) {
+    // create search params with a redirectUrl to /pricing
+    const searchParams = new URLSearchParams();
+    searchParams.set("redirectUrl", window.location.href);
+
+    return (
+      <div className="w-full h-full flex items-center justify-center">
+        <div className="grid justify-center justify-items-center">
+          <p className="text-lg text-wrap-balance text-center leading-normal">
+            <Trans>
+              You must{" "}
+              <Link
+                to={`/l?${searchParams.toString()}`}
+                className="font-bold underline hover:text-blue-500"
+              >
+                log in
+              </Link>{" "}
+              before you can upgrade to Pro.
+            </Trans>
+          </p>
+        </div>
+      </div>
+    );
+  }
+
+  if (customerIsLoading) {
+    return (
+      <div className="w-full h-full flex items-center justify-center text-neutral-200">
+        <Spinner />
+      </div>
+    );
+  }
+
+  if (isProUser) {
+    return (
+      <div className="w-full h-full flex items-center justify-center">
+        <p className="text-xl text-center text-wrap-balance leading-normal">
+          <Trans>
+            You're already a Pro User!
+            <br />
+            Have questions or feature requests?{" "}
+            <Link to="/o" className="underline hover:text-blue-500 font-bold">
+              Let Us Know
+            </Link>
+          </Trans>
+        </p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="relative h-full">
+      <div
+        className={classNames(
+          "grid content-center h-full rounded-xl p-8 pb-16 bg-gradient-to-br from-neutral-50 to-neutral-300/50 shadow-inner dark:to-blue-900/50 dark:from-blue-900/0",
+          {
+            "opacity-60 pointer-events-none cursor-loading":
+              createCheckoutSession.isLoading,
+          }
+        )}
+      >
+        <PaymentStepperTitle className="mb-6">
+          <Trans>Choose a Plan</Trans>
+        </PaymentStepperTitle>
+        <div className="w-full grid gap-2 h-full content-center">
+          <PlanButton
+            onClick={() => createCheckoutSession.mutate("monthly")}
+            className="mr-2 aria-[current=true]:text-blue-500"
+            title={t`Monthly`}
+            price={t`$3 / month`}
+            data-testid="monthly-plan-button"
+          />
+          <PlanButton
+            onClick={() => createCheckoutSession.mutate("yearly")}
+            className="aria-[current=true]:text-blue-500"
+            title={t`Yearly`}
+            price={t`$30 / year`}
+            data-testid="yearly-plan-button"
+            extra={
+              <span className="!text-[14px] uppercase bg-yellow-300 py-2 px-3 text-neutral-900 rounded font-bold absolute bottom-0 left-1/2 -translate-x-1/2 translate-y-[22px] transform whitespace-nowrap transition-transform group-aria-pressed:scale-[1.1] group-aria-pressed:translate-y-[18px] group-aria-pressed:rotate-[3deg]">
+                <Trans>16% Less</Trans>
+              </span>
+            }
+          />
+        </div>
+      </div>
+      {createCheckoutSession.isLoading ? (
+        <Spinner className="text-blue-500 absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2" />
+      ) : null}
+    </div>
+  );
+}

app/src/components/Header.tsx

@@ -51,6 +51,7 @@ export const Header = memo(function SharedHeader() {
   const isSignUpPage = pathname === "/i";
   const isNewPage = pathname === "/new";
   const isPrivacyPolicyPage = pathname === "/privacy-policy";
+  const isSuccessPage = pathname === "/success";
   const isInfoPage = isBlogPage || isChangelogPage || isRoadmapPage;
   const isEditor =
     !isSponsorPage &&
@@ -61,7 +62,8 @@ export const Header = memo(function SharedHeader() {
     !isInfoPage &&
     !isLogInPage &&
     !isSignUpPage &&
-    !isNewPage;
+    !isNewPage &&
+    !isSuccessPage;
   const isLoggedIn = useIsLoggedIn();
   const isProUser = useIsProUser();
   const lastChart = useLastChart((state) => state.lastChart);