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

Merge branch 'dev' into local-fonts

Browse source
This commit is contained in:
Mike Cao 2021-05-21 10:27:07 -07:00 • committed by GitHub
commit e8fad828ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 757 additions and 336 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/Footer.js
View file

@ -4,11 +4,15 @@ import { FormattedMessage } from 'react-intl';
import Link from 'components/common/Link';
import styles from './Footer.module.css';
import useVersion from 'hooks/useVersion';
import useLocale from 'hooks/useLocale';
import { rtlLocales } from 'lib/lang';
export default function Footer() {
const { current } = useVersion();
const [locale] = useLocale();
return (
<footer className="container">
<footer className="container" dir={rtlLocales.includes(locale) ? 'rtl' : 'ltr'}>
<div className={classNames(styles.footer, 'row')}>
<div className="col-12 col-md-4" />
<div className="col-12 col-md-4">

5
components/layout/Header.js
View file

@ -10,17 +10,20 @@ import UpdateNotice from 'components/common/UpdateNotice';
import UserButton from 'components/settings/UserButton';
import Logo from 'assets/logo.svg';
import styles from './Header.module.css';
import useLocale from 'hooks/useLocale';
import { rtlLocales } from 'lib/lang';
export default function Header() {
const user = useSelector(state => state.user);
const [active, setActive] = useState(false);
const [locale] = useLocale();
function handleClick() {
setActive(state => !state);
}
return (
<nav className="container">
<nav className="container" dir={rtlLocales.includes(locale) ? 'rtl' : 'ltr'}>
{user?.is_admin && <UpdateNotice />}
<div className={classNames(styles.header, 'row align-items-center')}>
<div className={styles.nav}>

9
components/layout/Layout.js
View file

@ -2,15 +2,22 @@ import React from 'react';
import Head from 'next/head';
import Header from 'components/layout/Header';
import Footer from 'components/layout/Footer';
import useLocale from 'hooks/useLocale';
import { rtlLocales } from 'lib/lang';
export default function Layout({ title, children, header = true, footer = true }) {
const [locale] = useLocale();
return (
<>
<Head>
<title>umami{title && ` - ${title}`}</title>
</Head>
{header && <Header />}
<main className="container">{children}</main>
<main className="container" dir={rtlLocales.includes(locale) ? 'rtl' : 'ltr'}>
{children}
</main>
{footer && <Footer />}
<div id="__modals" />
</>