diff --git a/packages/webapp/src/components/Dashboard/TopbarUser.tsx b/packages/webapp/src/components/Dashboard/TopbarUser.tsx index 889bd3426..b20401868 100644 --- a/packages/webapp/src/components/Dashboard/TopbarUser.tsx +++ b/packages/webapp/src/components/Dashboard/TopbarUser.tsx @@ -58,6 +58,7 @@ function DashboardTopbarUser({ } /> + history.push('/billing')} /> } onClick={onKeyboardShortcut} @@ -79,6 +80,4 @@ function DashboardTopbarUser({ ); } -export default compose( - withDialogActions, -)(DashboardTopbarUser); +export default compose(withDialogActions)(DashboardTopbarUser); diff --git a/packages/webapp/src/containers/Subscriptions/BillingPage.tsx b/packages/webapp/src/containers/Subscriptions/BillingPage.tsx index b2d77462a..29979db3b 100644 --- a/packages/webapp/src/containers/Subscriptions/BillingPage.tsx +++ b/packages/webapp/src/containers/Subscriptions/BillingPage.tsx @@ -3,24 +3,16 @@ import * as R from 'ramda'; import { Button } from '@blueprintjs/core'; import withAlertActions from '../Alert/withAlertActions'; import { BillingPageBoot } from './BillingPageBoot'; +import { BillingPageContent } from './BillingPageContent'; +import { DashboardInsider } from '@/components'; function BillingPageRoot({ openAlert }) { - const handleCancelSubBtnClick = () => { - openAlert('cancel-main-subscription'); - }; - const handleResumeSubBtnClick = () => { - openAlert('resume-main-subscription'); - }; - const handleUpdatePaymentMethod = () => {}; - return ( - -

- - - -

-
+ + + + + ); } diff --git a/packages/webapp/src/containers/Subscriptions/BillingPageContent.module.scss b/packages/webapp/src/containers/Subscriptions/BillingPageContent.module.scss new file mode 100644 index 000000000..23c7abb89 --- /dev/null +++ b/packages/webapp/src/containers/Subscriptions/BillingPageContent.module.scss @@ -0,0 +1,8 @@ +.root { + display: flex; + flex-direction: column; + padding: 32px 40px; + min-width: 800px; + max-width: 900px; + width: 75%; +} \ No newline at end of file diff --git a/packages/webapp/src/containers/Subscriptions/BillingPageContent.tsx b/packages/webapp/src/containers/Subscriptions/BillingPageContent.tsx new file mode 100644 index 000000000..bea0ec377 --- /dev/null +++ b/packages/webapp/src/containers/Subscriptions/BillingPageContent.tsx @@ -0,0 +1,20 @@ +import { Box, Group } from '@/components'; +import { Text } from '@blueprintjs/core'; +import { Subscription } from './BillingSubscription'; +import styles from './BillingPageContent.module.scss'; + +export function BillingPageContent() { + return ( + + + Transactions locking has the ability to lock all organization + transactions so users can’t edit, delete or create new transactions + during the past period. + + + + + + + ); +} diff --git a/packages/webapp/src/containers/Subscriptions/BillingSubscription.module.scss b/packages/webapp/src/containers/Subscriptions/BillingSubscription.module.scss new file mode 100644 index 000000000..dd5c5bad1 --- /dev/null +++ b/packages/webapp/src/containers/Subscriptions/BillingSubscription.module.scss @@ -0,0 +1,64 @@ + +.root { + width: 450px; + background: #fff; + border-radius: 5px; + box-shadow: 0 -8px 0 0px #BFCCD6, rgb(0 8 36 / 9%) 0px 4px 20px -5px; + border: 1px solid #C4D2D7; + min-height: 420px; + display: flex; + flex-direction: column; +} + +.title{ + margin: 0; + font-size: 20px; + font-weight: 600; + color: #3D4C58; +} + +.description { + font-size: 15px; + line-height: 1.5; + color: #394B59; + margin-top: 14px; +} + +.period { + div + div { + &::before{ + content: " • "; + text-align: center; + margin-right: 3px; + color: #999; + margin-left: 6px; + } + } +} +.periodStatus{ + text-transform: uppercase; + color: #A82A2A; + font-weight: 500; +} +.periodText{ + color: #AF6161; +} +.priceAmount { + font-size: 24px; + font-weight: 500; +} +.pricePeriod { + color: #8F99A8; +} +.subscribeButton{ + border-radius: 32px; + padding-left: 16px; + padding-right: 16px; +} +.actions{ + margin-top: 20px; + + button{ + font-size: 15px; + } +} \ No newline at end of file diff --git a/packages/webapp/src/containers/Subscriptions/BillingSubscription.tsx b/packages/webapp/src/containers/Subscriptions/BillingSubscription.tsx new file mode 100644 index 000000000..0bef787a1 --- /dev/null +++ b/packages/webapp/src/containers/Subscriptions/BillingSubscription.tsx @@ -0,0 +1,86 @@ +// @ts-nocheck +import * as R from 'ramda'; +import { Box, Group, Stack } from '@/components'; +import { Button, Card, Intent, Text } from '@blueprintjs/core'; +import withAlertActions from '../Alert/withAlertActions'; +import styles from './BillingSubscription.module.scss'; + +function SubscriptionRoot({ openAlert }) { + const handleCancelSubBtnClick = () => { + openAlert('cancel-main-subscription'); + }; + const handleResumeSubBtnClick = () => { + openAlert('resume-main-subscription'); + }; + const handleUpdatePaymentMethod = () => {}; + + const handleUpgradeBtnClick = () => {}; + + return ( + + +

Capital Essential

+ + + Trial + Trial ends in 10 days. + +
+ + + Transactions locking has the ability to lock all organization + transactions so users can’t edit, delete or create new transactions + during the past period. + + + + + + + + + + + $10 + / mo + + + + + + +
+ ); +} + +export const Subscription = R.compose(withAlertActions)(SubscriptionRoot); diff --git a/packages/webapp/src/hooks/query/subscription.tsx b/packages/webapp/src/hooks/query/subscription.tsx index 050913c7c..c9bbeec4e 100644 --- a/packages/webapp/src/hooks/query/subscription.tsx +++ b/packages/webapp/src/hooks/query/subscription.tsx @@ -1,4 +1,4 @@ -// @ts-ignore +// @ts-nocheck import { useMutation, UseMutationOptions,