github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Switch to next/font.

Browse Source
This commit is contained in:
Mike Cao
2023-04-01 20:03:38 -07:00
parent 728e4cff5b
commit 8397102bac
7 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/layout/AppLayout.js
View File

@@ -5,7 +5,6 @@ import NavBar from 'components/layout/NavBar';
import UpdateNotice from 'components/common/UpdateNotice';
import useRequireLogin from 'hooks/useRequireLogin';
import useConfig from 'hooks/useConfig';
import { UI_LAYOUT_BODY } from 'lib/constants';
import styles from './AppLayout.module.css';
export default function AppLayout({ title, children }) {
@@ -25,14 +24,12 @@ export default function AppLayout({ title, children }) {
<Head>
<title>{title ? `${title} | umami` : 'umami'}</title>
</Head>
<div className={styles.nav}>
<nav className={styles.nav}>
<NavBar />
</div>
<div className={styles.body} id={UI_LAYOUT_BODY}>
<Container>
<main>{children}</main>
</Container>
</div>
</nav>
<main className={styles.body}>
<Container>{children}</Container>
</main>
</div>
);
}

6
components/metrics/FilterTags.js
View File

@@ -17,8 +17,8 @@ export default function FilterTags({ websiteId, params }) {
}
function handleCloseFilter(param) {
if (param === null) {
router.push(`/websites/${websiteId}/?view=${view}`);
if (!param) {
router.push(`/websites/${websiteId}${view ? `?view=${view}` : ''}`);
} else {
router.push(resolveUrl({ [param]: undefined }));
}
@@ -41,7 +41,7 @@ export default function FilterTags({ websiteId, params }) {
</div>
);
})}
<Button size="sm" variant="quiet" onClick={() => handleCloseFilter(null)}>
<Button size="sm" variant="quiet" onClick={() => handleCloseFilter()}>
<Icon>
<Icons.Close />
</Icon>