feat: add empty billing and usage page

This commit is contained in:
Ali BARIN
2023-03-06 18:05:14 +00:00
parent 26d8e5856a
commit dbeeb61cc5
6 changed files with 71 additions and 8 deletions

View File

@@ -5,8 +5,10 @@ import { useTheme } from '@mui/material/styles';
import useMediaQuery from '@mui/material/useMediaQuery'; import useMediaQuery from '@mui/material/useMediaQuery';
import AccountCircleIcon from '@mui/icons-material/AccountCircle'; import AccountCircleIcon from '@mui/icons-material/AccountCircle';
import ArrowBackIosNewIcon from '@mui/icons-material/ArrowBackIosNew'; import ArrowBackIosNewIcon from '@mui/icons-material/ArrowBackIosNew';
import PaymentIcon from '@mui/icons-material/Payment';
import * as URLS from 'config/urls'; import * as URLS from 'config/urls';
import useAutomatischInfo from 'hooks/useAutomatischInfo';
import AppBar from 'components/AppBar'; import AppBar from 'components/AppBar';
import Drawer from 'components/Drawer'; import Drawer from 'components/Drawer';
@@ -14,13 +16,25 @@ type SettingsLayoutProps = {
children: React.ReactNode; children: React.ReactNode;
}; };
const drawerLinks = [ function createDrawerLinks({ isCloud }: { isCloud: boolean }) {
{ const items = [
Icon: AccountCircleIcon, {
primary: 'settingsDrawer.myProfile', Icon: AccountCircleIcon,
to: URLS.SETTINGS_PROFILE, primary: 'settingsDrawer.myProfile',
}, to: URLS.SETTINGS_PROFILE,
]; }
]
if (isCloud) {
items.push({
Icon: PaymentIcon,
primary: 'settingsDrawer.billingAndUsage',
to: URLS.SETTINGS_BILLING_AND_USAGE,
});
}
return items;
}
const drawerBottomLinks = [ const drawerBottomLinks = [
{ {
@@ -33,6 +47,7 @@ const drawerBottomLinks = [
export default function SettingsLayout({ export default function SettingsLayout({
children, children,
}: SettingsLayoutProps): React.ReactElement { }: SettingsLayoutProps): React.ReactElement {
const { isCloud } = useAutomatischInfo();
const theme = useTheme(); const theme = useTheme();
const matchSmallScreens = useMediaQuery(theme.breakpoints.down('lg'), { const matchSmallScreens = useMediaQuery(theme.breakpoints.down('lg'), {
noSsr: true, noSsr: true,
@@ -41,6 +56,7 @@ export default function SettingsLayout({
const openDrawer = () => setDrawerOpen(true); const openDrawer = () => setDrawerOpen(true);
const closeDrawer = () => setDrawerOpen(false); const closeDrawer = () => setDrawerOpen(false);
const drawerLinks = createDrawerLinks({ isCloud });
return ( return (
<> <>

View File

@@ -64,8 +64,10 @@ export const FLOW_PATTERN = '/flows/:flowId';
export const SETTINGS = '/settings'; export const SETTINGS = '/settings';
export const SETTINGS_DASHBOARD = SETTINGS; export const SETTINGS_DASHBOARD = SETTINGS;
export const PROFILE = 'profile'; export const PROFILE = 'profile';
export const BILLING_AND_USAGE = 'billing';
export const UPDATES = '/updates'; export const UPDATES = '/updates';
export const SETTINGS_PROFILE = `${SETTINGS}/${PROFILE}`; export const SETTINGS_PROFILE = `${SETTINGS}/${PROFILE}`;
export const SETTINGS_BILLING_AND_USAGE = `${SETTINGS}/${BILLING_AND_USAGE}`;
export const DASHBOARD = FLOWS; export const DASHBOARD = FLOWS;

View File

@@ -11,6 +11,7 @@
"settingsDrawer.myProfile": "My Profile", "settingsDrawer.myProfile": "My Profile",
"settingsDrawer.goBack": "Go to the dashboard", "settingsDrawer.goBack": "Go to the dashboard",
"settingsDrawer.notifications": "Notifications", "settingsDrawer.notifications": "Notifications",
"settingsDrawer.billingAndUsage": "Billing and usage",
"app.connectionCount": "{count} connections", "app.connectionCount": "{count} connections",
"app.flowCount": "{count} flows", "app.flowCount": "{count} flows",
"app.addConnection": "Add connection", "app.addConnection": "Add connection",
@@ -96,6 +97,7 @@
"profileSettings.deleteAccountResult2": "All your flows", "profileSettings.deleteAccountResult2": "All your flows",
"profileSettings.deleteAccountResult3": "All your connections", "profileSettings.deleteAccountResult3": "All your connections",
"profileSettings.deleteAccountResult4": "All execution history", "profileSettings.deleteAccountResult4": "All execution history",
"billingAndUsageSettings.title": "Billing and usage",
"deleteAccountDialog.title": "Delete account?", "deleteAccountDialog.title": "Delete account?",
"deleteAccountDialog.description": "This will permanently delete your account and all the associated data with it.", "deleteAccountDialog.description": "This will permanently delete your account and all the associated data with it.",
"deleteAccountDialog.cancel": "Cancel?", "deleteAccountDialog.cancel": "Cancel?",

View File

@@ -0,0 +1,33 @@
import * as React from 'react';
import { Navigate } from 'react-router-dom';
import Grid from '@mui/material/Grid';
import * as URLS from 'config/urls'
import PageTitle from 'components/PageTitle';
import Container from 'components/Container';
import useFormatMessage from 'hooks/useFormatMessage';
import useCloud from 'hooks/useCloud';
function BillingAndUsageSettings() {
const isCloud = useCloud();
const formatMessage = useFormatMessage();
if (!isCloud) {
return (<Navigate to={URLS.SETTINGS} replace={true} />)
}
return (
<Container sx={{ py: 3, display: 'flex', justifyContent: 'center' }}>
<Grid container item xs={12} sm={9} md={8} lg={6}>
<Grid item xs={12} sx={{ mb: [2, 5] }}>
<PageTitle>{formatMessage('billingAndUsageSettings.title')}</PageTitle>
</Grid>
<Grid item xs={12} justifyContent="flex-end" sx={{pt: 5 }}>
</Grid>
</Grid>
</Container>
);
}
export default BillingAndUsageSettings;

View File

@@ -101,7 +101,7 @@ function ProfileSettings() {
<Grid item xs={12} justifyContent="flex-end"> <Grid item xs={12} justifyContent="flex-end">
<StyledForm <StyledForm
defaultValues={currentUser} defaultValues={{ ...currentUser}}
onSubmit={handleEmailUpdate} onSubmit={handleEmailUpdate}
resolver={yupResolver(emailValidationSchema)} resolver={yupResolver(emailValidationSchema)}
mode="onChange" mode="onChange"

View File

@@ -1,6 +1,7 @@
import { Route, Navigate } from 'react-router-dom'; import { Route, Navigate } from 'react-router-dom';
import SettingsLayout from 'components/SettingsLayout'; import SettingsLayout from 'components/SettingsLayout';
import ProfileSettings from 'pages/ProfileSettings'; import ProfileSettings from 'pages/ProfileSettings';
import BillingAndUsageSettings from 'pages/BillingAndUsageSettings/index.ee';
import * as URLS from 'config/urls'; import * as URLS from 'config/urls';
@@ -15,6 +16,15 @@ export default (
} }
/> />
<Route
path={URLS.SETTINGS_BILLING_AND_USAGE}
element={
<SettingsLayout>
<BillingAndUsageSettings />
</SettingsLayout>
}
/>
<Route <Route
path={URLS.SETTINGS} path={URLS.SETTINGS}
element={<Navigate to={URLS.SETTINGS_PROFILE} replace />} element={<Navigate to={URLS.SETTINGS_PROFILE} replace />}