Skip to content

Commit 21cff58

Browse files
author
FalkWolsky
committed
Updating Routes to display success and cancel for Subscription Creation
1 parent 77dcd3d commit 21cff58

File tree

4 files changed

+66
-3
lines changed

4 files changed

+66
-3
lines changed

client/packages/lowcoder/src/constants/routesURL.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ export const OAUTH_PROVIDER_DETAIL = "/setting/oauth-provider/detail";
2424

2525
export const PERMISSION_SETTING_DETAIL = `${PERMISSION_SETTING}/:groupId`;
2626
export const ORGANIZATION_SETTING_DETAIL = `${ORGANIZATION_SETTING}/:orgId`;
27-
export const SUBSCRIPTION_SUCCESS = `${SUBSCRIPTION_SETTING}/success`;
27+
28+
export const SUBSCRIPTION_SUCCESS = `${SUBSCRIPTION_SETTING}/success/:session_id`;
29+
export const SUBSCRIPTION_CANCEL = `${SUBSCRIPTION_SETTING}/cancel`;
2830
export const SUBSCRIPTION_ERROR = `${SUBSCRIPTION_SETTING}/error`;
2931
export const SUBSCRIPTION_DETAIL = `${SUBSCRIPTION_SETTING}/details/:subscriptionId/:productId`;
3032
export const SUBSCRIPTION_INFO = `${SUBSCRIPTION_SETTING}/info/:productId`;

client/packages/lowcoder/src/pages/setting/subscriptions/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
// index.tsx for routes
22
import { Route, Switch } from 'react-router-dom';
3-
import { SUBSCRIPTION_SETTING, SUBSCRIPTION_DETAIL, SUBSCRIPTION_INFO, SUBSCRIPTION_SUCCESS, SUBSCRIPTION_ERROR } from 'constants/routesURL';
3+
import { SUBSCRIPTION_SETTING, SUBSCRIPTION_DETAIL, SUBSCRIPTION_INFO, SUBSCRIPTION_SUCCESS, SUBSCRIPTION_CANCEL, SUBSCRIPTION_ERROR } from 'constants/routesURL';
44
import { SubscriptionSetting } from './subscriptionSetting';
55
import SubscriptionSuccess from './subscriptionSuccess';
6+
import SubscriptionCancel from './subscriptionCancel';
67
import SubscriptionError from './subscriptionError';
78
import SubscriptionDetail from './subscriptionDetail';
89
import SubscriptionInfo from './subscriptionInfo';
@@ -14,6 +15,7 @@ export const Subscription = () => {
1415
<Route path={SUBSCRIPTION_DETAIL} component={SubscriptionDetail} exact />
1516
<Route path={SUBSCRIPTION_INFO} component={SubscriptionInfo} exact />
1617
<Route path={SUBSCRIPTION_SUCCESS} component={SubscriptionSuccess} exact />
18+
<Route path={SUBSCRIPTION_CANCEL} component={SubscriptionCancel} exact />
1719
<Route path={SUBSCRIPTION_ERROR} component={SubscriptionError} exact />
1820
<Route path={SUBSCRIPTION_SETTING} component={SubscriptionSetting} exact />
1921
</Switch>
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import { useLocation } from "react-router-dom";
2+
import styled from "styled-components";
3+
import { GreyTextColor } from "constants/style";
4+
import { trans } from "i18n";
5+
import { HeaderBack } from "../permission/styledComponents";
6+
import history from "util/history";
7+
import { SUBSCRIPTION_SETTING } from "constants/routesURL";
8+
import { Flex } from 'antd';
9+
import { ProductCard } from "./productCard";
10+
11+
const SubscriptionSuccessContent = styled.div`
12+
max-width: 840px;
13+
14+
.section-title {
15+
font-size: 14px;
16+
font-weight: 500;
17+
margin-bottom: 8px;
18+
}
19+
20+
.section-content {
21+
margin-bottom: 28px;
22+
}
23+
24+
.section-option {
25+
color: ${GreyTextColor};
26+
margin-bottom: 14px;
27+
font-size: 13px;
28+
}
29+
`;
30+
31+
const Wrapper = styled.div`
32+
padding: 32px 24px;
33+
`;
34+
35+
36+
// Helper function to get query params
37+
const useQuery = () => {
38+
return new URLSearchParams(useLocation().search);
39+
};
40+
41+
export function SubscriptionCancel() {
42+
const query = useQuery();
43+
const session_id = query.get("session_id");
44+
45+
return (
46+
<Wrapper>
47+
<HeaderBack>
48+
<span onClick={() => history.push(SUBSCRIPTION_SETTING)}>
49+
{trans("settings.subscription")}
50+
</span>
51+
</HeaderBack>
52+
<div>
53+
<h1>{`Canceled | Session ID: ${session_id}`}</h1>
54+
</div>
55+
</Wrapper>
56+
);
57+
}
58+
59+
export default SubscriptionCancel;

client/packages/lowcoder/src/pages/setting/subscriptions/subscriptionSuccess.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const SubscriptionSuccessContent = styled.div`
1212
max-width: 840px;
1313
1414
.section-title {
15-
font-size: 14px;
15+
font-size: 14px;
1616
font-weight: 500;
1717
margin-bottom: 8px;
1818
}

0 commit comments

Comments
 (0)