move to PageContentBody from PageContentBodyConnector

This commit is contained in:
Robin Dadswell
2021-01-03 22:49:24 +00:00
committed by nitsua
parent 40f156c16e
commit cfc52d12ea
34 changed files with 88 additions and 101 deletions

View File

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@@ -93,7 +93,7 @@ class Backups extends Component {
</PageToolbarSection>
</PageToolbar>
<PageContentBodyConnector>
<PageContentBody>
{
isFetching && !isPopulated &&
<LoadingIndicator />
@@ -141,7 +141,7 @@ class Backups extends Component {
</TableBody>
</Table>
}
</PageContentBodyConnector>
</PageContentBody>
<RestoreBackupModalConnector
isOpen={this.state.isRestoreModalOpen}

View File

@@ -4,7 +4,6 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import FilterMenu from 'Components/Menu/FilterMenu';
import PageContent from 'Components/Page/PageContent';
import PageContentBody from 'Components/Page/PageContentBody';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@@ -74,7 +73,7 @@ function LogsTable(props) {
</PageToolbarSection>
</PageToolbar>
<PageContentBodyConnector>
<PageContentBody>
{
isFetching && !isPopulated &&
<LoadingIndicator />
@@ -117,7 +116,7 @@ function LogsTable(props) {
/>
</div>
}
</PageContentBodyConnector>
</PageContentBody>
</PageContent>
);
}

View File

@@ -4,7 +4,7 @@ import Alert from 'Components/Alert';
import Link from 'Components/Link/Link';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@@ -73,7 +73,7 @@ class LogFiles extends Component {
/>
</PageToolbarSection>
</PageToolbar>
<PageContentBodyConnector>
<PageContentBody>
<Alert>
<div>
Log files are located in: {location}
@@ -119,7 +119,7 @@ class LogFiles extends Component {
!isFetching && !items.length &&
<div>No log files</div>
}
</PageContentBodyConnector>
</PageContentBody>
</PageContent>
);
}

View File

@@ -1,7 +1,6 @@
import React, { Component } from 'react';
import PageContent from 'Components/Page/PageContent';
import PageContentBody from 'Components/Page/PageContentBody';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
import AboutConnector from './About/AboutConnector';
import DiskSpaceConnector from './DiskSpace/DiskSpaceConnector';
import HealthConnector from './Health/HealthConnector';
@@ -15,12 +14,12 @@ class Status extends Component {
render() {
return (
<PageContent title="Status">
<PageContentBodyConnector>
<PageContentBody>
<HealthConnector />
<DiskSpaceConnector />
<AboutConnector />
<MoreInfo />
</PageContentBodyConnector>
</PageContentBody>
</PageContent>
);
}

View File

@@ -1,17 +1,16 @@
import React from 'react';
import PageContent from 'Components/Page/PageContent';
import PageContentBody from 'Components/Page/PageContentBody';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
import QueuedTasksConnector from './Queued/QueuedTasksConnector';
import ScheduledTasksConnector from './Scheduled/ScheduledTasksConnector';
function Tasks() {
return (
<PageContent title="Tasks">
<PageContentBodyConnector>
<PageContentBody>
<ScheduledTasksConnector />
<QueuedTasksConnector />
</PageContentBodyConnector>
</PageContentBody>
</PageContent>
);
}

View File

@@ -8,7 +8,6 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
import PageContent from 'Components/Page/PageContent';
import PageContentBody from 'Components/Page/PageContentBody';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
import { icons, kinds } from 'Helpers/Props';
import formatDate from 'Utilities/Date/formatDate';
import UpdateChanges from './UpdateChanges';
@@ -50,7 +49,7 @@ class Updates extends Component {
return (
<PageContent title="Updates">
<PageContentBodyConnector>
<PageContentBody>
{
!isPopulated && !hasError &&
<LoadingIndicator />
@@ -199,7 +198,7 @@ class Updates extends Component {
Failed to update settings
</div>
}
</PageContentBodyConnector>
</PageContentBody>
</PageContent>
);
}