From cad4ac8113bfef6722a58d1831288e0105a60ab9 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 2 Feb 2024 20:30:01 -0600 Subject: [PATCH 1/3] more --- src/Components/SignupPage/SignupPage.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 1472ae9..a155f57 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -387,9 +387,13 @@ const SignupPage = () => {

Create A Novodraft Account

-
- Start a free trial - save hours and draft better discovery -
+ {!isUpgrade ? ( +
+ Start a free trial - save hours and draft better discovery +
+ ) : ( + <> + )}
{splitEvery( From 31f4d74a0e1120049d9a5082497c7559b5e0f4af Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 2 Feb 2024 20:54:29 -0600 Subject: [PATCH 2/3] more --- src/Components/SignupPage/SignupPage.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index a155f57..7cd62a3 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -341,6 +341,9 @@ const SignupPage = () => { ); const customerId = data.data.customerId; + const subscriptionCreated = data.data.subscriptionCreated; + const subscriptionPeriodStart = data.data.subscriptionPeriodStart; + const subscriptionPeriodEnd = data.data.subscriptionPeriodEnd; const subscriptionId = data.data.subscriptionId; if (data === undefined) { @@ -361,7 +364,15 @@ const SignupPage = () => { customerId, subscriptionId ); - await saveUserData(user.uid, dataValues, customerId, subscriptionId); + await saveUserData( + user.uid, + dataValues, + customerId, + subscriptionCreated, + subscriptionPeriodStart, + subscriptionPeriodEnd, + subscriptionId + ); navigate("/dashboard"); } } catch (error) { From 82781528b159d16b97aa4c5a4656f2be9f3778f3 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 2 Feb 2024 21:41:43 -0600 Subject: [PATCH 3/3] more --- src/Components/SignupPage/SignupPage.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 7cd62a3..76cc71f 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -152,7 +152,15 @@ const SignupPage = () => { } } - async function saveUserData(authId, dataValues, customerId, subscriptionId) { + async function saveUserData( + authId, + dataValues, + customerId, + subscriptionId, + subscriptionCreated, + subscriptionPeriodStart, + subscriptionPeriodEnd + ) { const appUserId = uuidv4(); const firmId = uuidv4(); const fbAuthUid = authId; @@ -205,6 +213,9 @@ const SignupPage = () => { customerId: customerId, subscriptionId: subscriptionId, subscriptionPlan: plan, + subscriptionCreated: subscriptionCreated, + subscriptionPeriodStart: subscriptionPeriodStart, + subscriptionPeriodEnd: subscriptionPeriodEnd, }; try { @@ -360,9 +371,10 @@ const SignupPage = () => { const user = userCredential.user; dataValues = { ...dataValues, ...data }; console.log( - "customerId, subscriptionId in handleSignup right before saveUserData", + "customerId, subscriptionId subscriptionCreated, in handleSignup right before saveUserData", customerId, - subscriptionId + subscriptionId, + subscriptionCreated ); await saveUserData( user.uid,