Skip to content

Commit d6ced52

Browse files
committed
Fix action log layout on desktop
1 parent 1682015 commit d6ced52

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

src/pages/ActionLog.jsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ const ActionLog = () => {
3232
<h2>{t('views.action_log.title')}</h2>
3333
</Col>
3434
</Row>
35-
<Row className="row-cols row-cols-1">
35+
<Row>
3636
<Col>
3737
{isLoading && <LoadingIcon large />}
3838
{error && <ErrorMessage error={error} />}
3939
{actionLog && <>
40-
<Row className="row-cols-1 row-cols-lg-5 d-none d-lg-flex fw-bold">
41-
<Col>{t('views.action_log.columns.date_time')}</Col>
42-
<Col>{t('views.action_log.columns.device')}</Col>
43-
<Col>{t('views.action_log.columns.action')}</Col>
44-
<Col>{t('views.action_log.columns.user')}</Col>
45-
<Col>{t('views.action_log.columns.application')}</Col>
40+
<Row className="row-cols-1">
41+
<Col lg={4} className="d-none d-lg-block fw-bold">{t('views.action_log.columns.date_time')}</Col>
42+
<Col lg={2} className="d-none d-lg-block fw-bold">{t('views.action_log.columns.device')}</Col>
43+
<Col lg={1} className="d-none d-lg-block fw-bold">{t('views.action_log.columns.action')}</Col>
44+
<Col lg={3} className="d-none d-lg-block fw-bold">{t('views.action_log.columns.user')}</Col>
45+
<Col lg={2} className="d-none d-lg-block fw-bold">{t('views.action_log.columns.application')}</Col>
46+
{actionLog.map(entry => <ActionLogEntry key={entry.id} entry={entry} />)}
4647
</Row>
47-
{actionLog.map(entry => <ActionLogEntry key={entry.id} entry={entry} />)}
4848
</>}
4949
</Col>
5050
</Row>

src/widgets/ActionLog/ActionLogEntry.jsx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { parseISO } from 'date-fns';
22
import PropTypes from 'prop-types';
33

44
import { useDateTimeFormatter } from '../../utils/useDateTimeFormatter.js';
5-
import { Col, Row } from 'react-bootstrap';
5+
import { Col } from 'react-bootstrap';
66
import { useTranslation } from 'react-i18next';
77

88
const ActionLogEntry = ({
@@ -17,28 +17,29 @@ const ActionLogEntry = ({
1717

1818
const dateTime = parseISO(entry.createdAt);
1919

20-
return (<Row className="row-cols-1 row-cols-lg-5 border-top pt-1 mb-1">
21-
<Col>
20+
return (<>
21+
<div className="w-100 border-top my-1" />
22+
<Col lg={4}>
2223
<strong className="d-lg-none">{t('views.action_log.columns.date_time')}: </strong>
2324
{formatDefault(dateTime)} ({formatDistanceToNow(dateTime)})
2425
</Col>
25-
<Col>
26+
<Col lg={2}>
2627
<strong className="d-lg-none">{t('views.action_log.columns.device')}: </strong>
2728
{entry.deviceId}
2829
</Col>
29-
<Col>
30+
<Col lg={1}>
3031
<strong className="d-lg-none">{t('views.action_log.columns.action')}: </strong>
3132
{entry.action}
3233
</Col>
33-
<Col>
34+
<Col lg={3}>
3435
<strong className="d-lg-none">{t('views.action_log.columns.user')}: </strong>
3536
{entry.User.name} ({entry.User.username})
3637
</Col>
37-
<Col>
38+
<Col lg={2}>
3839
<strong className="d-lg-none">{t('views.action_log.columns.application')}: </strong>
3940
{entry.Application.name}
4041
</Col>
41-
</Row>);
42+
</>);
4243
};
4344

4445
ActionLogEntry.propTypes = {

0 commit comments

Comments
 (0)