watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 07:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

More deletes. Fixed sticky header.

Browse source
This commit is contained in:
Mike Cao 2023-02-08 23:14:11 -08:00
parent 87bbaa7f1d
commit 45c13da262
23 changed files with 69 additions and 582 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/pages/websites/WebsiteDetails.js
View file

@ -40,7 +40,7 @@ export default function WebsiteDetails({ websiteId }) {
domain={data?.domain}
onDataLoad={handleDataLoad}
showLink={false}
stickyHeader
stickyHeader={true}
/>
{!chartLoaded && <Loading icon="dots" />}
{chartLoaded && (

27
components/pages/websites/WebsiteTableView.js
View file

@ -9,6 +9,7 @@ import WorldMap from 'components/common/WorldMap';
import CountriesTable from 'components/metrics/CountriesTable';
import EventsTable from 'components/metrics/EventsTable';
import EventsChart from 'components/metrics/EventsChart';
import styles from './WebsiteTableView.module.css';
export default function WebsiteTableView({ websiteId }) {
const [countryData, setCountryData] = useState();
@ -19,38 +20,38 @@ export default function WebsiteTableView({ websiteId }) {
return (
<>
<Row>
<Column variant="two">
<Row className={styles.row}>
<Column className={styles.col} variant="two">
<PagesTable {...tableProps} />
</Column>
<Column variant="two">
<Column className={styles.col} variant="two">
<ReferrersTable {...tableProps} />
</Column>
</Row>
<Row>
<Column variant="three">
<Row className={styles.row}>
<Column className={styles.col} variant="three">
<BrowsersTable {...tableProps} />
</Column>
<Column variant="three">
<Column className={styles.col} variant="three">
<OSTable {...tableProps} />
</Column>
<Column variant="three">
<Column className={styles.col} variant="three">
<DevicesTable {...tableProps} />
</Column>
</Row>
<Row>
<Column xs={12} sm={12} md={12} defaultSize={8}>
<Row className={styles.row}>
<Column className={styles.col} xs={12} sm={12} md={12} defaultSize={8}>
<WorldMap data={countryData} />
</Column>
<Column xs={12} sm={12} md={12} defaultSize={4}>
<Column className={styles.col} xs={12} sm={12} md={12} defaultSize={4}>
<CountriesTable {...tableProps} onDataLoad={setCountryData} />
</Column>
</Row>
<Row>
<Column xs={12} md={12} lg={4} defaultSize={4}>
<Row className={styles.row}>
<Column className={styles.col} xs={12} md={12} lg={4} defaultSize={4}>
<EventsTable {...tableProps} />
</Column>
<Column xs={12} md={12} lg={8} defaultSize={8}>
<Column className={styles.col} xs={12} md={12} lg={8} defaultSize={8}>
<EventsChart websiteId={websiteId} />
</Column>
</Row>

35
components/pages/websites/WebsiteTableView.module.css Normal file
View file

@ -0,0 +1,35 @@
.col {
display: flex;
flex-direction: column;
}
.row {
border-top: 1px solid var(--base300);
min-height: 430px;
}
.row > .col {
border-left: 1px solid var(--base300);
padding: 20px;
}
.row > .col:first-child {
border-left: 0;
padding-left: 0;
}
.row > .col:last-child {
padding-right: 0;
}
@media only screen and (max-width: 992px) {
.row {
border: 0;
}
.row > .col {
border-top: 1px solid var(--base300);
border-left: 0;
padding: 20px 0;
}
}