watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-20 04:25:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
treturner 2023-08-03 09:46:30 -04:00
commit a20e3483e0
242 changed files with 18823 additions and 3413 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/AppLayout.js
View file

@ -1,6 +1,5 @@
import { Container } from 'react-basics';
import Head from 'next/head';
import { useRouter } from 'next/router';
import NavBar from 'components/layout/NavBar';
import UpdateNotice from 'components/common/UpdateNotice';
import useRequireLogin from 'hooks/useRequireLogin';
@ -11,17 +10,14 @@ import styles from './AppLayout.module.css';
export function AppLayout({ title, children }) {
const { user } = useRequireLogin();
const config = useConfig();
const { pathname } = useRouter();
if (!user || !config) {
return null;
}
const allowUpdate = user?.isAdmin && !config?.updatesDisabled && !pathname.includes('/share/');
return (
<div className={styles.layout} data-app-version={CURRENT_VERSION}>
{allowUpdate && <UpdateNotice />}
<UpdateNotice user={user} config={config} />
<Head>
<title>{title ? `${title} | Triton Analytics` : 'Triton'}</title>
</Head>

2
components/layout/AppLayout.module.css
View file

@ -8,7 +8,6 @@
.nav {
height: 60px;
width: 100vw;
z-index: var(--z-index-overlay);
grid-column: 1;
grid-row: 1 / 2;
}
@ -19,4 +18,5 @@
min-height: 0;
height: calc(100vh - 60px);
overflow-y: auto;
padding-bottom: 60px;
}

27
components/layout/Footer.js
View file

@ -1,31 +1,12 @@
import { Row, Column } from 'react-basics';
import { FormattedMessage } from 'react-intl';
import { CURRENT_VERSION, HOMEPAGE_URL, REPO_URL } from 'lib/constants';
import { labels } from 'components/messages';
import { CURRENT_VERSION, HOMEPAGE_URL } from 'lib/constants';
import styles from './Footer.module.css';
export function Footer() {
return (
<footer className={styles.footer}>
<Row>
<Column defaultSize={12} lg={11} xl={11}>
<div>
<FormattedMessage
{...labels.poweredBy}
values={{
name: (
<a href={HOMEPAGE_URL}>
<b>umami</b>
</a>
),
}}
/>
</div>
</Column>
<Column className={styles.version} defaultSize={12} lg={1} xl={1}>
<a href={REPO_URL}>{`v${CURRENT_VERSION}`}</a>
</Column>
</Row>
<a href={HOMEPAGE_URL}>
<b>umami</b> {`v${CURRENT_VERSION}`}
</a>
</footer>
);
}

12
components/layout/Footer.module.css
View file

@ -1,16 +1,12 @@
.footer {
display: flex;
flex-direction: row;
justify-content: flex-end;
font-size: var(--font-size-sm);
text-align: center;
line-height: 30px;
margin: 60px 0;
margin: 40px 0;
}
.footer a {
color: var(--font-color100);
}
.version {
text-align: right;
padding-right: 10px;
white-space: nowrap;
}

2
components/layout/Header.js
View file

@ -9,7 +9,7 @@ import styles from './Header.module.css';
export function Header() {
return (
<header className={styles.header}>
<Row>
<Row className={styles.row}>
<Column>
<Link href="https://tritoncg.com" target="_blank" className={styles.title}>
<Icon size="lg">

17
components/layout/Header.module.css
View file

@ -1,8 +1,13 @@
.header {
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
padding: 30px 30px 0 30px;
height: 100px;
}
.row {
align-items: center;
}
.title {
@ -35,18 +40,8 @@
}
@media only screen and (max-width: 768px) {
.header {
padding: 0 30px;
}
.buttons,
.links {
display: none;
}
.title {
flex: 1;
padding: 0.5rem;
margin-bottom: 0.5rem;
}
}

7
components/layout/Page.module.css
View file

@ -4,11 +4,4 @@
flex-direction: column;
background: var(--base50);
position: relative;
padding: 30px;
}
@media only screen and (max-width: 768px) {
.page {
padding: 10px 0;
}
}

2
components/layout/PageHeader.module.css
View file

@ -1,10 +1,12 @@
.header {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
align-content: center;
align-self: stretch;
flex-wrap: wrap;
height: 100px;
}
.header a {