watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-08 14:47:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added version to footer. CSS and locale fixes.

Browse source
This commit is contained in:
Mike Cao 2020-09-09 16:12:29 -07:00
parent cea8e29c8a
commit 6bbe7800c2
16 changed files with 276 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/layout/Footer.js
View file

@ -1,23 +1,22 @@
import React from 'react';
import { FormattedMessage } from 'react-intl';
import Link from 'next/link';
import classNames from 'classnames';
import Button from 'components/common/Button';
import Logo from 'assets/logo.svg';
import styles from './Footer.module.css';
export default function Footer() {
const version = process.env.VERSION;
return (
<footer className="container">
<div className={classNames(styles.footer, 'row justify-content-center')}>
<FormattedMessage id="footer.powered-by" defaultMessage="powered by" />
<Link href="https://umami.is">
<a>
<Button className={styles.button} icon={<Logo />} size="small">
<b>umami</b>
</Button>
</a>
</Link>
<FormattedMessage id="footer.powered-by" defaultMessage="Powered by" />
<a href="https://umami.is">
<Button className={styles.button} icon={<Logo />} size="small">
<b>umami</b>
</Button>
</a>
<div>{`v${version}`}</div>
</div>
</footer>
);

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

@ -11,5 +11,5 @@
}
.button {
margin-left: 10px;
margin: 0 5px;
}

32
components/layout/Header.js
View file

@ -15,29 +15,27 @@ export default function Header() {
return (
<header className="container">
<div className={classNames(styles.header, 'row align-items-center')}>
<div className="col-12 col-md-6">
<div className="col-12 col-md-3">
<div className={styles.title}>
<Icon icon={<Logo />} size="large" className={styles.logo} />
<Link href={user ? '/' : 'https://umami.is'}>umami</Link>
</div>
</div>
<div className="col-12 col-md-6">
<div className={styles.nav}>
{user ? (
<>
<Link href="/dashboard">
<FormattedMessage id="header.nav.dashboard" defaultMessage="Dashboard" />
</Link>
<Link href="/settings">
<FormattedMessage id="header.nav.settings" defaultMessage="Settings" />
</Link>
<LanguageButton menuAlign="right" />
<UserButton />
</>
) : (
<div className="col-12 col-md-9">
{user ? (
<div className={styles.nav}>
<Link href="/dashboard">
<FormattedMessage id="header.nav.dashboard" defaultMessage="Dashboard" />
</Link>
<Link href="/settings">
<FormattedMessage id="header.nav.settings" defaultMessage="Settings" />
</Link>
<LanguageButton menuAlign="right" />
)}
</div>
<UserButton />
</div>
) : (
<LanguageButton menuAlign="right" />
)}
</div>
</div>
</header>

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

@ -12,15 +12,14 @@
}
.nav {
list-style: none;
display: flex;
justify-content: flex-end;
align-items: center;
font-size: var(--font-size-normal);
font-weight: 600;
}
.nav > * {
font-size: var(--font-size-normal);
font-weight: 600;
margin-left: 40px;
}
@ -28,9 +27,4 @@
.title {
text-align: center;
}
.nav {
display: flex;
justify-content: space-evenly;
}
}