Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: Info page #26201

Merged
merged 1 commit into from
Jul 9, 2022
Merged

Chore: Info page #26201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions apps/meteor/client/components/Card/Col.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import { Box } from '@rocket.chat/fuselage';
import React, { FC } from 'react';

const Col: FC<{ span?: number }> = ({ children, span = 1 }) => {
const w = span * 228 + (span - 1) * 2 * 24;

return (
<Box rcx-card-col display='flex' alignSelf='stretch' w={`x${w}`} flexDirection='column' fontScale='c1'>
{children}
</Box>
);
};
const Col: FC = ({ children }) => (
<Box rcx-card-col display='flex' alignSelf='stretch' flexGrow={1} flexDirection='column' fontScale='c1'>
{children}
</Box>
);

export default Col;
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/info/FederationCard/FederationCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const FederationCard: FC = () => {
</Box>
</CardHeader>
<Card.Body>
<Card.Col span={2}>
<Card.Col>
<Section status={federationEnabledStatus} title={t('Federation_Enable')} subtitle={t('Federation_Is_working_correctly')} />
<Section status={federationSetupStatus} title={t('Federation_Adding_to_your_server')} subtitle={t('Federation_Changes_needed')}>
{!federationHealthy && <a onClick={handleModal}>{t('Federation_Fix_now')}</a>}
Expand Down
5 changes: 2 additions & 3 deletions apps/meteor/client/views/admin/info/InformationPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,13 @@ const InformationPage = memo(function InformationPage({
<Grid.Item xl={3}>
<LicenseCard />
</Grid.Item>
<Grid.Item xl={4}>
<Grid.Item xl={6} md={8} xs={4} sm={8}>
<UsageCard vertical={false} statistics={statistics} />
</Grid.Item>
<Grid.Item xl={2}></Grid.Item>
<Grid.Item xl={6}>
<FederationCard />
</Grid.Item>
<Grid.Item xl={6}>
<Grid.Item xl={3}>
<SeatsCard />
</Grid.Item>
</Grid>
Expand Down