Update views to support a more logical container

This commit is contained in:
Dane Everitt 2020-04-17 11:17:01 -07:00
parent e044e8db1c
commit e6a61fbe9b
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
20 changed files with 85 additions and 39 deletions

View file

@ -13,6 +13,7 @@ import { ApplicationStore } from '@/state';
import FlashMessageRender from '@/components/FlashMessageRender';
import { httpErrorToHuman } from '@/api/http';
import format from 'date-fns/format';
import PageContentBlock from '@/components/elements/PageContentBlock';
export default () => {
const [ deleteIdentifier, setDeleteIdentifier ] = useState('');
@ -46,7 +47,7 @@ export default () => {
};
return (
<div className={'my-10'}>
<PageContentBlock>
<FlashMessageRender byKey={'account'} className={'mb-4'}/>
<div className={'flex'}>
<ContentBox title={'Create API Key'} className={'flex-1'}>
@ -107,6 +108,6 @@ export default () => {
}
</ContentBox>
</div>
</div>
</PageContentBlock>
);
};

View file

@ -5,6 +5,7 @@ import UpdateEmailAddressForm from '@/components/dashboard/forms/UpdateEmailAddr
import ConfigureTwoFactorForm from '@/components/dashboard/forms/ConfigureTwoFactorForm';
import styled from 'styled-components';
import { breakpoint } from 'styled-components-breakpoint';
import PageContentBlock from '@/components/elements/PageContentBlock';
const Container = styled.div`
${tw`flex flex-wrap my-10`};
@ -24,16 +25,22 @@ const Container = styled.div`
export default () => {
return (
<Container>
<ContentBox title={'Update Password'} showFlashes={'account:password'}>
<UpdatePasswordForm/>
</ContentBox>
<ContentBox className={'mt-8 md:mt-0 md:ml-8'} title={'Update Email Address'} showFlashes={'account:email'}>
<UpdateEmailAddressForm/>
</ContentBox>
<ContentBox className={'xl:ml-8 mt-8 xl:mt-0'} title={'Configure Two Factor'}>
<ConfigureTwoFactorForm/>
</ContentBox>
</Container>
<PageContentBlock>
<Container>
<ContentBox title={'Update Password'} showFlashes={'account:password'}>
<UpdatePasswordForm/>
</ContentBox>
<ContentBox
className={'mt-8 md:mt-0 md:ml-8'}
title={'Update Email Address'}
showFlashes={'account:email'}
>
<UpdateEmailAddressForm/>
</ContentBox>
<ContentBox className={'xl:ml-8 mt-8 xl:mt-0'} title={'Configure Two Factor'}>
<ConfigureTwoFactorForm/>
</ContentBox>
</Container>
</PageContentBlock>
);
};

View file

@ -3,6 +3,7 @@ import { Server } from '@/api/server/getServer';
import getServers from '@/api/getServers';
import ServerRow from '@/components/dashboard/ServerRow';
import Spinner from '@/components/elements/Spinner';
import PageContentBlock from '@/components/elements/PageContentBlock';
export default () => {
const [ servers, setServers ] = useState<null | Server[]>(null);
@ -18,7 +19,7 @@ export default () => {
}
return (
<div className={'my-10'}>
<PageContentBlock>
{servers.length > 0 ?
servers.map(server => (
<ServerRow key={server.uuid} server={server} className={'mt-2'}/>
@ -28,6 +29,6 @@ export default () => {
It looks like you have no servers.
</p>
}
</div>
</PageContentBlock>
);
};