-
+
);
}
diff --git a/frontend/src/helpers/GetSessionData.js b/frontend/src/helpers/GetSessionData.js
index 5ee6b9291..baed64a49 100644
--- a/frontend/src/helpers/GetSessionData.js
+++ b/frontend/src/helpers/GetSessionData.js
@@ -20,7 +20,6 @@ function getSessionData(sessionData) {
isAdmin: sessionData.isAdmin,
adapters: sessionData?.adapters,
logEventsId: sessionData?.logEventsId,
- remainingTrialDays: sessionData?.remainingTrialDays,
allOrganization: sessionData?.allOrganization,
isPlatformAdmin: sessionData?.isPlatformAdmin,
loginOnboardingMessage: sessionData?.loginOnboardingMessage,
diff --git a/frontend/src/helpers/GetStaticData.js b/frontend/src/helpers/GetStaticData.js
index 1fcf4fece..e75e1e560 100644
--- a/frontend/src/helpers/GetStaticData.js
+++ b/frontend/src/helpers/GetStaticData.js
@@ -2,6 +2,14 @@ import moment from "moment";
import momentTz from "moment-timezone";
import { v4 as uuidv4 } from "uuid";
+let cloudHomePagePath;
+try {
+ cloudHomePagePath =
+ require("../plugins/unstract-subscription/helper/constants").cloudHomePagePath;
+} catch (err) {
+ // Ignore if plugin not available
+}
+
const THEME = {
DARK: "dark",
LIGHT: "light",
@@ -565,6 +573,10 @@ const generateCoverageKey = (promptId, profileId) => {
return `coverage_${promptId}_${profileId}`;
};
+const TRIAL_PLAN = "TRIAL";
+
+const homePagePath = cloudHomePagePath || "tools";
+
export {
CONNECTOR_TYPE_MAP,
O_AUTH_PROVIDERS,
@@ -616,4 +628,6 @@ export {
generateApiRunStatusId,
base64toBlobWithMime,
generateCoverageKey,
+ TRIAL_PLAN,
+ homePagePath,
};
diff --git a/frontend/src/hooks/useExceptionHandler.jsx b/frontend/src/hooks/useExceptionHandler.jsx
index c9472015c..94ceb071e 100644
--- a/frontend/src/hooks/useExceptionHandler.jsx
+++ b/frontend/src/hooks/useExceptionHandler.jsx
@@ -51,7 +51,7 @@ const useExceptionHandler = () => {
}
break;
case "subscription_error":
- navigate("/trial-expired");
+ navigate("/subscription-expired");
return {
title: title,
type: "error",
diff --git a/frontend/src/hooks/useRequestUrl.js b/frontend/src/hooks/useRequestUrl.js
new file mode 100644
index 000000000..1bb202f2f
--- /dev/null
+++ b/frontend/src/hooks/useRequestUrl.js
@@ -0,0 +1,16 @@
+import { useSessionStore } from "../store/session-store";
+
+const useRequestUrl = () => {
+ const { sessionDetails } = useSessionStore();
+
+ const getUrl = (url) => {
+ if (!url) return null;
+
+ const baseUrl = `/api/v1/${sessionDetails?.orgId}/`;
+ return baseUrl + url.replace(/^\//, "");
+ };
+
+ return { getUrl };
+};
+
+export default useRequestUrl;
diff --git a/frontend/src/hooks/useUserSession.js b/frontend/src/hooks/useUserSession.js
index de8782da2..0ba0d1956 100644
--- a/frontend/src/hooks/useUserSession.js
+++ b/frontend/src/hooks/useUserSession.js
@@ -24,7 +24,7 @@ const useUserSession = () => {
}
if (error?.response?.data?.type === "subscription_error") {
- navigate("/trial-expired");
+ navigate("/subscription-expired");
return;
}
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 49221c103..65d62801d 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -15,6 +15,10 @@ body {
min-width: 1024px;
}
+.page-bg-2 {
+ background-color: var(--page-bg-2);
+}
+
.center {
display: grid;
width: inherit;
diff --git a/frontend/src/routes/Router.jsx b/frontend/src/routes/Router.jsx
index e2936ec54..08c9dd2cb 100644
--- a/frontend/src/routes/Router.jsx
+++ b/frontend/src/routes/Router.jsx
@@ -19,9 +19,9 @@ let SimplePromptStudioHelper;
let SimplePromptStudio;
let SpsLanding;
let SpsUpload;
-let TrialRoutes;
let PaymentSuccessful;
let SelectProduct;
+let UnstractSubscriptionEndPage;
try {
SimplePromptStudioHelper =
require("../plugins/simple-prompt-studio/SimplePromptStudioHelper.jsx").SimplePromptStudioHelper;
@@ -57,8 +57,8 @@ try {
}
try {
- TrialRoutes =
- require("../plugins/subscription/trial-page/TrialEndPage.jsx").TrialEndPage;
+ UnstractSubscriptionEndPage =
+ require("../plugins/unstract-subscription/pages/UnstractSubscriptionEndPage.jsx").UnstractSubscriptionEndPage;
} catch (err) {
// Do nothing, Not-found Page will be triggered.
}
@@ -116,14 +116,17 @@ function Router() {
{SelectProduct && (
} />
)}
- {TrialRoutes && (
-
} />
+ {UnstractSubscriptionEndPage && (
+
}
+ />
)}
{PaymentSuccessful && (
} />
)}
}>
-
{MainAppRoute}
+ {MainAppRoute}
{llmWhispererRouter && (
{llmWhispererRouter()}
)}
diff --git a/frontend/src/routes/useMainAppRoutes.js b/frontend/src/routes/useMainAppRoutes.js
index 039591f29..f77e96ad5 100644
--- a/frontend/src/routes/useMainAppRoutes.js
+++ b/frontend/src/routes/useMainAppRoutes.js
@@ -32,6 +32,9 @@ let PRODUCT_NAMES = {};
let ManualReviewPage;
let SimpleManualReviewPage;
let ReviewLayout;
+let UnstractUsagePage;
+let UnstractSubscriptionPage;
+let UnstractSubscriptionCheck;
try {
RequirePlatformAdmin =
@@ -62,7 +65,7 @@ try {
try {
OnboardProduct =
- require("../plugins/llm-whisperer/components/onboard-product/OnboardProduct.jsx").OnboardProduct;
+ require("../plugins/onboard-product/OnboardProduct.jsx").OnboardProduct;
PRODUCT_NAMES = require("../plugins/llm-whisperer/helper.js").PRODUCT_NAMES;
} catch (err) {
// Do nothing.
@@ -79,6 +82,17 @@ try {
// Do nothing, Not-found Page will be triggered.
}
+try {
+ UnstractSubscriptionPage =
+ require("../plugins/unstract-subscription/pages/UnstractSubscriptionPage.jsx").UnstractSubscriptionPage;
+ UnstractUsagePage =
+ require("../plugins/unstract-subscription/pages/UnstractUsagePage.jsx").UnstractUsagePage;
+ UnstractSubscriptionCheck =
+ require("../plugins/unstract-subscription/components/UnstractSubscriptionCheck.jsx").UnstractSubscriptionCheck;
+} catch (err) {
+ // Do nothing, Not-found Page will be triggered.
+}
+
function useMainAppRoutes() {
const routes = (
<>
@@ -91,6 +105,12 @@ function useMainAppRoutes() {
)}
}>
+ {UnstractUsagePage && (
+
} />
+ )}
+ {UnstractSubscriptionPage && (
+
} />
+ )}
} />
}
>
- {routes}
+
}>
+ {routes}
+
);
} else {