[Layout changes] [Skynet premium portal support]

This commit is contained in:
2021-05-01 22:35:20 -05:00
parent 7c908b7044
commit 8521686e3c
7 changed files with 115 additions and 128 deletions

View File

@@ -280,7 +280,7 @@ class App extends IPCContainer {
let mainContent = [];
if (this.props.DisplaySelectAppPlatform || !this.props.AppReady) {
mainContent = (
<Box dxStyle={{ height: '100%' }}>
<Box col={0} colSpan={'remain'} row={0} rowSpan={'remain'}>
<Loading />
</Box>
);
@@ -288,24 +288,25 @@ class App extends IPCContainer {
let key = 0;
mainContent.push(
<Box
col={0}
colSpan={'remain'}
row={10}
rowSpan={'17'}
key={'md_' + key++}
dxStyle={{ padding: 'var(--default_spacing)', height: 'auto' }}>
dxStyle={{ padding: 'var(--default_spacing)' }}>
<ReleaseVersionDisplay
downloadDisabled={!downloadEnabled}
version={selectedVersion}
/>
</Box>
);
mainContent.push(
<div
key={'md_' + key++}
style={{ paddingTop: 'var(--default_spacing)' }}
/>
);
if (allowMount) {
mainContent.push(
<Box
dxStyle={{ padding: 'var(--default_spacing)', height: 'auto' }}
row={29}
rowSpan={'remain'}
colSpan={'remain'}
dxStyle={{ padding: 'var(--default_spacing)' }}
key={'md_' + key++}>
<MountItems
s3Supported={s3Supported}
@@ -319,7 +320,11 @@ class App extends IPCContainer {
} else if (!downloadEnabled && selectedVersion !== 'unavailable') {
mainContent.push(
<Box
dxStyle={{ padding: 'var(--default_spacing)', height: '170px' }}
col={0}
colSpan={'remain'}
row={0}
rowSpan={'remain'}
dxStyle={{ padding: 'var(--default_spacing)' }}
key={'md_' + key++}>
<Loading />
</Box>
@@ -329,41 +334,39 @@ class App extends IPCContainer {
return (
<div className={'App'}>
<div className={'AppContainer'}>
<div className={'AppHeader'}>
<Box>
<Grid>
<Text
col={0}
colSpan={'remain'}
row={0}
rowSpan={'remain'}
text={'Repertory UI v' + this.props.Version}
textAlign={'center'}
type={'Heading1'}
/>
<UpgradeIcon
available={
!missingDependencies &&
(this.props.UpgradeAvailable ||
this.props.NewReleasesAvailable2.length > 0)
}
newReleases={
!missingDependencies &&
!this.props.UpgradeAvailable &&
this.props.NewReleasesAvailable2.length > 0
}
clicked={this.handleUpgradeIconClicked}
col={(dimensions) => dimensions.columns - 6}
colSpan={5}
row={1}
rowSpan={(remain) => remain - 1}
/>
</Grid>
</Box>
</div>
<div className={'AppContent'}>{mainContent}</div>
</div>
<Grid>
<Box col={0} colSpan={'remain'} row={0} rowSpan={8}>
<Grid noScroll>
<Text
col={0}
colSpan={'remain'}
row={0}
rowSpan={8}
text={'Repertory UI v' + this.props.Version}
textAlign={'center'}
type={'Heading1'}
/>
<UpgradeIcon
available={
!missingDependencies &&
(this.props.UpgradeAvailable ||
this.props.NewReleasesAvailable2.length > 0)
}
newReleases={
!missingDependencies &&
!this.props.UpgradeAvailable &&
this.props.NewReleasesAvailable2.length > 0
}
clicked={this.handleUpgradeIconClicked}
col={(dimensions) => dimensions.columns - 6}
colSpan={1}
row={1}
rowSpan={(remain) => remain - 1}
/>
</Grid>
</Box>
{mainContent}
</Grid>
{importDisplay}
{exportDisplay}
{newReleasesDisplay}