Merge pull request #1003 from mikecao/dev

v1.27.0
2024-11-15 17:55:08 +01:00 · 2022-03-02 20:13:30 -08:00 · 2022-03-02 20:13:30 -08:00 · aa9dbd2092
commit aa9dbd2092
parent c117e6dff0 a4311d4773
179 changed files with 3663 additions and 3350 deletions
--- a/6
+++ b/6
@ -2,9 +2,11 @@
 FROM node:12.22-alpine AS build
 ARG BASE_PATH
 ARG DATABASE_TYPE
+
 ENV BASE_PATH=$BASE_PATH
-ENV DATABASE_URL "postgresql://umami:umami@db:5432/umami" \
-    DATABASE_TYPE=$DATABASE_TYPE
+ENV DATABASE_URL "postgresql://umami:umami@db:5432/umami"
+ENV DATABASE_TYPE=$DATABASE_TYPE
+
 WORKDIR /build

 RUN yarn config set --home enableTelemetry 0
--- a/assets/bars.svg
+++ b/assets/bars.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!-- Font Awesome Pro 6.0.0-alpha1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M424 392H24C11 392 0 403 0 416V416C0 429 11 440 24 440H424C437 440 448 429 448 416V416C448 403 437 392 424 392ZM424 72H24C11 72 0 83 0 96V96C0 109 11 120 24 120H424C437 120 448 109 448 96V96C448 83 437 72 424 72ZM424 232H24C11 232 0 243 0 256V256C0 269 11 280 24 280H424C437 280 448 269 448 256V256C448 243 437 232 424 232Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!-- Font Awesome Pro 6.0.0-alpha2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M424 392H24C10.8 392 0 402.8 0 416V416C0 429.2 10.8 440 24 440H424C437.2 440 448 429.2 448 416V416C448 402.8 437.2 392 424 392ZM424 72H24C10.8 72 0 82.8 0 96V96C0 109.2 10.8 120 24 120H424C437.2 120 448 109.2 448 96V96C448 82.8 437.2 72 424 72ZM424 232H24C10.8 232 0 242.8 0 256V256C0 269.2 10.8 280 24 280H424C437.2 280 448 269.2 448 256V256C448 242.8 437.2 232 424 232Z"/></svg>
--- a/assets/gear.svg
+++ b/assets/gear.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 6.0.0-alpha2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M504.265 315.978C504.265 307.326 499.658 299.134 491.906 294.586L458.998 275.615C459.643 269.099 459.966 262.549 459.966 256S459.643 242.901 458.998 236.385L491.906 217.414C499.658 212.866 504.265 204.674 504.265 196.022C504.265 174.755 454.947 67.846 419.746 67.846C415.502 67.846 411.236 68.939 407.379 71.203L374.599 90.172C363.888 82.43 352.533 75.848 340.531 70.428V32.488C340.531 21.262 333.047 11.453 322.205 8.613C300.654 2.871 278.425 0 256.181 0C233.935 0 211.675 2.871 190.06 8.613C179.218 11.453 171.734 21.262 171.734 32.488V70.428C159.732 75.848 148.377 82.43 137.666 90.172L104.886 71.203C101.031 68.939 96.763 67.846 92.519 67.846C92.517 67.846 92.514 67.846 92.512 67.846C60.048 67.846 8 169.591 8 196.022C8 204.674 12.607 212.866 20.359 217.414L53.267 236.385C52.622 242.901 52.299 249.451 52.299 256S52.622 269.099 53.267 275.615L20.359 294.586C12.607 299.134 8 307.326 8 315.978C8 337.245 57.318 444.154 92.519 444.154C96.763 444.154 101.029 443.061 104.886 440.797L137.666 421.828C148.377 429.57 159.732 436.152 171.734 441.572V479.512C171.734 490.738 179.218 500.547 190.06 503.387C211.611 509.129 233.84 512 256.084 512C278.33 512 300.59 509.129 322.205 503.387C333.047 500.547 340.531 490.738 340.531 479.512V441.572C352.533 436.152 363.888 429.57 374.599 421.828L407.379 440.797C411.234 443.061 415.502 444.154 419.746 444.154C452.209 444.154 504.265 342.423 504.265 315.978ZM415.361 389.959C391.561 376.186 404.101 383.444 371.705 364.695C329.649 395.09 339.375 389.426 292.531 410.582V460.82C279.236 463.161 266.948 464 256.093 464C240.669 464 228.14 462.306 219.734 460.824V410.582C172.779 389.376 182.552 395.044 140.56 364.695C108.748 383.105 117.896 377.811 96.924 389.949C81.181 371.256 68.849 349.895 60.517 326.84C81.643 314.663 72.361 320.014 104.088 301.723C101.549 276.083 100.277 266.079 100.277 256.04C100.277 246.018 101.545 235.96 104.088 210.277C72.198 191.892 81.571 197.295 60.504 185.152C68.818 162.109 81.187 140.686 96.904 122.041C120.704 135.814 108.164 128.556 140.56 147.305C182.616 116.91 172.89 122.574 219.734 101.418V51.18C233.029 48.839 245.318 48 256.172 48C271.597 48 284.126 49.694 292.531 51.176V101.418C339.486 122.624 329.713 116.956 371.705 147.305C405.655 127.657 394.228 134.27 415.343 122.051C431.084 140.744 443.416 162.105 451.748 185.16C430.622 197.337 439.904 191.986 408.177 210.277C410.716 235.917 411.988 245.921 411.988 255.96C411.988 265.982 410.72 276.04 408.177 301.723C440.067 320.108 430.694 314.705 451.761 326.848C443.447 349.891 431.078 371.314 415.361 389.959ZM256.133 160C203.258 160 160.133 203.125 160.133 256S203.258 352 256.133 352S352.133 308.875 352.133 256S309.008 160 256.133 160ZM256.133 304C229.666 304 208.133 282.467 208.133 256S229.666 208 256.133 208S304.133 229.533 304.133 256S282.599 304 256.133 304Z "></path></svg>
--- a/assets/xmark.svg
+++ b/assets/xmark.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!-- Font Awesome Pro 6.0.0-alpha1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M345 375C354 384 354 400 345 409S320 418 311 409L192 290L73 409C64 418 48 418 39 409S30 384 39 375L158 256L39 137C30 128 30 112 39 103S64 94 73 103L192 222L311 103C320 94 336 94 345 103S354 128 345 137L226 256L345 375Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><!-- Font Awesome Pro 6.0.0-alpha2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M312.973 375.032C322.342 384.401 322.342 399.604 312.973 408.973S288.401 418.342 279.032 408.973L160 289.941L40.968 408.973C31.599 418.342 16.396 418.342 7.027 408.973S-2.342 384.401 7.027 375.032L126.059 256L7.027 136.968C-2.342 127.599 -2.342 112.396 7.027 103.027S31.599 93.658 40.968 103.027L160 222.059L279.032 103.027C288.401 93.658 303.604 93.658 312.973 103.027S322.342 127.599 312.973 136.968L193.941 256L312.973 375.032Z"/></svg>
--- a/components/common/HamburgerButton.js
+++ b/components/common/HamburgerButton.js
@ -0,0 +1,44 @@
+import Button from 'components/common/Button';
+import XMark from 'assets/xmark.svg';
+import Bars from 'assets/bars.svg';
+import { useState } from 'react';
+import styles from './HamburgerButton.module.css';
+import MobileMenu from './MobileMenu';
+import { FormattedMessage } from 'react-intl';
+
+const menuItems = [
+  {
+    label: <FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />,
+    value: '/dashboard',
+  },
+  { label: <FormattedMessage id="label.realtime" defaultMessage="Realtime" />, value: '/realtime' },
+  { label: <FormattedMessage id="label.settings" defaultMessage="Settings" />, value: '/settings' },
+  {
+    label: <FormattedMessage id="label.profile" defaultMessage="Profile" />,
+    value: '/settings/profile',
+  },
+  { label: <FormattedMessage id="label.logout" defaultMessage="Logout" />, value: '/logout' },
+];
+
+export default function HamburgerButton() {
+  const [active, setActive] = useState(false);
+
+  function handleClick() {
+    setActive(state => !state);
+  }
+
+  function handleClose() {
+    setActive(false);
+  }
+
+  return (
+    <>
+      <Button
+        className={styles.button}
+        icon={active ? <XMark /> : <Bars />}
+        onClick={handleClick}
+      />
+      {active && <MobileMenu items={menuItems} onClose={handleClose} />}
+    </>
+  );
+}
--- a/components/common/HamburgerButton.module.css
+++ b/components/common/HamburgerButton.module.css
@ -0,0 +1,9 @@
+.button {
+  display: none;
+}
+
+@media only screen and (max-width: 768px) {
+  .button {
+    display: flex;
+  }
+}
--- a/components/common/Link.js
+++ b/components/common/Link.js
@ -5,7 +5,7 @@ import NextLink from 'next/link';
 import Icon from './Icon';
 import styles from './Link.module.css';

-function Link({ className, icon, children, size, iconRight, ...props }) {
+function Link({ className, icon, children, size, iconRight, onClick, ...props }) {
  return (
    <NextLink {...props}>
      <a
@ -15,6 +15,7 @@ function Link({ className, icon, children, size, iconRight, ...props }) {
          [styles.xsmall]: size === 'xsmall',
          [styles.iconRight]: iconRight,
        })}
+        onClick={onClick}
      >
        {icon && <Icon className={styles.icon} icon={icon} size={size} />}
        {children}
--- a/components/common/Link.module.css
+++ b/components/common/Link.module.css
@ -8,20 +8,12 @@ a.link:visited {
  align-items: center;
 }

-a.link:before {
-  content: '';
-  position: absolute;
-  bottom: -2px;
-  width: 0;
-  height: 2px;
-  background: var(--primary400);
-  opacity: 0.5;
-  transition: width 100ms;
+a.link span {
+  border-bottom: 2px solid transparent;
 }

-a.link:hover:before {
-  width: 100%;
-  transition: width 100ms;
+a.link:hover span {
+  border-bottom: 2px solid var(--primary400);
 }

 a.link.large {
--- a/components/common/MobileMenu.js
+++ b/components/common/MobileMenu.js
@ -0,0 +1,21 @@
+import Link from './Link';
+import Button from './Button';
+import XMark from 'assets/xmark.svg';
+import styles from './MobileMenu.module.css';
+
+export default function MobileMenu({ items = [], onClose }) {
+  return (
+    <div className={styles.menu}>
+      <div className={styles.header}>
+        <Button className={styles.button} icon={<XMark />} onClick={onClose} />
+      </div>
+      <div className={styles.items}>
+        {items.map(({ label, value }) => (
+          <Link key={value} href={value} className={styles.item} onClick={onClose}>
+            {label}
+          </Link>
+        ))}
+      </div>
+    </div>
+  );
+}
--- a/components/common/MobileMenu.module.css
+++ b/components/common/MobileMenu.module.css
@ -0,0 +1,44 @@
+.menu {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
+  z-index: 100;
+  display: flex;
+  flex-direction: column;
+  background-color: var(--gray50);
+  overflow: auto;
+}
+
+.items {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.item {
+  font-size: var(--font-size-large);
+}
+
+.item + .item {
+  margin-top: 20px;
+}
+
+.item:last-child {
+  margin-top: 60px;
+}
+
+.button {
+  margin-right: 15px;
+}
+
+.header {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  height: 100px;
+}
--- a/components/common/OverflowText.js
+++ b/components/common/OverflowText.js
@ -0,0 +1,66 @@
+import PropTypes from 'prop-types';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import ReactTooltip from 'react-tooltip';
+
+import styles from './OverflowText.module.css';
+
+const OverflowText = ({ children, tooltipId }) => {
+  const measureEl = useRef();
+  const [isOverflown, setIsOverflown] = useState(false);
+
+  const measure = useCallback(
+    el => {
+      if (!el) return;
+      setIsOverflown(el.scrollWidth > el.clientWidth);
+    },
+    [setIsOverflown],
+  );
+
+  // Do one measure on mount
+  useEffect(() => {
+    measure(measureEl.current);
+  }, [measure]);
+
+  // Set up resize listener for subsequent measures
+  useEffect(() => {
+    if (!measureEl.current) return;
+
+    // Destructure ref in case it changes out from under us
+    const el = measureEl.current;
+
+    if ('ResizeObserver' in global) {
+      // Ideally, we have access to ResizeObservers
+      const observer = new ResizeObserver(() => {
+        measure(el);
+      });
+      observer.observe(el);
+      return () => observer.unobserve(el);
+    } else {
+      // Otherwise, fall back to measuring on window resizes
+      const handler = () => measure(el);
+
+      window.addEventListener('resize', handler, { passive: true });
+      return () => window.removeEventListener('resize', handler, { passive: true });
+    }
+  });
+
+  return (
+    <span
+      ref={measureEl}
+      data-tip={children.toString()}
+      data-effect="solid"
+      data-for={tooltipId}
+      className={styles.root}
+    >
+      {children}
+      {isOverflown && <ReactTooltip id={tooltipId}>{children}</ReactTooltip>}
+    </span>
+  );
+};
+
+OverflowText.propTypes = {
+  children: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
+  tooltipId: PropTypes.string.isRequired,
+};
+
+export default OverflowText;
--- a/components/common/OverflowText.module.css
+++ b/components/common/OverflowText.module.css
@ -0,0 +1,6 @@
+.root {
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
--- a/components/common/RefreshButton.js
+++ b/components/common/RefreshButton.js
@ -1,23 +1,27 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import { useDispatch, useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
-import { setDateRange } from 'redux/actions/websites';
+import useStore from 'store/queries';
+import { setDateRange } from 'store/websites';
 import Button from './Button';
 import Refresh from 'assets/redo.svg';
 import Dots from 'assets/ellipsis-h.svg';
 import useDateRange from 'hooks/useDateRange';

 function RefreshButton({ websiteId }) {
-  const dispatch = useDispatch();
  const [dateRange] = useDateRange(websiteId);
  const [loading, setLoading] = useState(false);
-  const completed = useSelector(state => state.queries[`/api/website/${websiteId}/stats`]);
+  const selector = useCallback(state => state[`/website/${websiteId}/stats`], [websiteId]);
+  const completed = useStore(selector);

  function handleClick() {
-    if (dateRange) {
+    if (!loading && dateRange) {
      setLoading(true);
-      dispatch(setDateRange(websiteId, dateRange));
+      if (/^[\d]+/.test(dateRange.value)) {
+        setDateRange(websiteId, dateRange.value);
+      } else {
+        setDateRange(websiteId, dateRange);
+      }
    }
  }

--- a/components/common/Table.js
+++ b/components/common/Table.js
@ -76,12 +76,13 @@ export default Table;

 export const TableRow = ({ columns, row }) => (
  <div className={classNames(styles.row, 'row')}>
-    {columns.map(({ key, render, className, style, cell }, index) => (
+    {columns.map(({ key, label, render, className, style, cell }, index) => (
      <div
        key={`${key}-${index}`}
        className={classNames(styles.cell, className, cell?.className)}
        style={{ ...style, ...cell?.style }}
      >
+        {label && <label>{label}</label>}
        {render ? render(row) : row[key]}
      </div>
    ))}
--- a/components/common/Table.module.css
+++ b/components/common/Table.module.css
@ -3,6 +3,12 @@
  flex-direction: column;
 }

+.table label {
+  display: none;
+  font-size: var(--font-size-xsmall);
+  font-weight: bold;
+}
+
 .header {
  border-bottom: 1px solid var(--gray300);
 }
@ -26,5 +32,24 @@

 .cell {
  display: flex;
+  flex-direction: column;
  align-items: flex-start;
 }
+
+@media only screen and (max-width: 992px) {
+  .table label {
+    display: block;
+  }
+
+  .header {
+    display: none;
+  }
+
+  .row {
+    flex-direction: column;
+  }
+
+  .cell {
+    margin-bottom: 20px;
+  }
+}
--- a/components/common/Toast.js
+++ b/components/common/Toast.js
@ -2,9 +2,9 @@ import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import { useSpring, animated } from 'react-spring';
-import styles from './Toast.module.css';
 import Icon from 'components/common/Icon';
 import Close from 'assets/times.svg';
+import styles from './Toast.module.css';

 function Toast({ message, timeout = 3000, onClose }) {
  const props = useSpring({
--- a/components/common/Toast.module.css
+++ b/components/common/Toast.module.css
@ -1,5 +1,5 @@
 .toast {
-  position: absolute;
+  position: fixed;
  top: 30px;
  left: 0;
  right: 0;
--- a/components/forms/AccountEditForm.js
+++ b/components/forms/AccountEditForm.js
@ -8,7 +8,7 @@ import FormLayout, {
  FormMessage,
  FormRow,
 } from 'components/layout/FormLayout';
-import usePost from 'hooks/usePost';
+import useApi from 'hooks/useApi';

 const initialValues = {
  username: '',
@ -29,11 +29,11 @@ const validate = ({ user_id, username, password }) => {
 };

 export default function AccountEditForm({ values, onSave, onClose }) {
-  const post = usePost();
+  const { post } = useApi();
  const [message, setMessage] = useState();

  const handleSubmit = async values => {
-    const { ok, data } = await post('/api/account', values);
+    const { ok, data } = await post('/account', values);

    if (ok) {
      onSave();
--- a/components/forms/ChangePasswordForm.js
+++ b/components/forms/ChangePasswordForm.js
@ -8,7 +8,7 @@ import FormLayout, {
  FormMessage,
  FormRow,
 } from 'components/layout/FormLayout';
-import usePost from 'hooks/usePost';
+import useApi from 'hooks/useApi';

 const initialValues = {
  current_password: '',
@ -37,11 +37,11 @@ const validate = ({ current_password, new_password, confirm_password }) => {
 };

 export default function ChangePasswordForm({ values, onSave, onClose }) {
-  const post = usePost();
+  const { post } = useApi();
  const [message, setMessage] = useState();

  const handleSubmit = async values => {
-    const { ok, data } = await post('/api/account/password', values);
+    const { ok, data } = await post('/account/password', values);

    if (ok) {
      onSave();
--- a/components/forms/DeleteForm.js
+++ b/components/forms/DeleteForm.js
@ -8,7 +8,7 @@ import FormLayout, {
  FormMessage,
  FormRow,
 } from 'components/layout/FormLayout';
-import useDelete from 'hooks/useDelete';
+import useApi from 'hooks/useApi';

 const CONFIRMATION_WORD = 'DELETE';

@ -27,11 +27,11 @@ const validate = ({ confirmation }) => {
 };

 export default function DeleteForm({ values, onSave, onClose }) {
-  const del = useDelete();
+  const { del } = useApi();
  const [message, setMessage] = useState();

  const handleSubmit = async ({ type, id }) => {
-    const { ok, data } = await del(`/api/${type}/${id}`);
+    const { ok, data } = await del(`/${type}/${id}`);

    if (ok) {
      onSave();
--- a/components/forms/LoginForm.js
+++ b/components/forms/LoginForm.js
@ -10,11 +10,12 @@ import FormLayout, {
  FormRow,
 } from 'components/layout/FormLayout';
 import Icon from 'components/common/Icon';
+import useApi from 'hooks/useApi';
+import { setItem } from 'lib/web';
+import { AUTH_TOKEN } from 'lib/constants';
+import { setUser } from 'store/app';
 import Logo from 'assets/logo.svg';
 import styles from './LoginForm.module.css';
-import usePost from 'hooks/usePost';
-import { setItem } from 'lib/web';
-import { AUTH_TOKEN } from '../../lib/constants';

 const validate = ({ username, password }) => {
  const errors = {};
@ -30,12 +31,12 @@ const validate = ({ username, password }) => {
 };

 export default function LoginForm() {
-  const post = usePost();
+  const { post } = useApi();
  const router = useRouter();
  const [message, setMessage] = useState();

  const handleSubmit = async ({ username, password }) => {
-    const { ok, status, data } = await post('/api/auth/login', {
+    const { ok, status, data } = await post('/auth/login', {
      username,
      password,
    });
@ -43,7 +44,11 @@ export default function LoginForm() {
    if (ok) {
      setItem(AUTH_TOKEN, data.token);

-      return router.push('/');
+      setUser(data.user);
+
+      await router.push('/');
+
+      return null;
    } else {
      setMessage(
        status === 401 ? (
--- a/components/forms/ResetForm.js
+++ b/components/forms/ResetForm.js
@ -8,7 +8,7 @@ import FormLayout, {
  FormMessage,
  FormRow,
 } from 'components/layout/FormLayout';
-import usePost from 'hooks/usePost';
+import useApi from 'hooks/useApi';

 const CONFIRMATION_WORD = 'RESET';

@ -27,11 +27,11 @@ const validate = ({ confirmation }) => {
 };

 export default function ResetForm({ values, onSave, onClose }) {
-  const post = usePost();
+  const { post } = useApi();
  const [message, setMessage] = useState();

  const handleSubmit = async ({ type, id }) => {
-    const { ok, data } = await post(`/api/${type}/${id}/reset`);
+    const { ok, data } = await post(`/${type}/${id}/reset`);

    if (ok) {
      onSave();
--- a/components/forms/TrackingCodeForm.js
+++ b/components/forms/TrackingCodeForm.js
@ -5,8 +5,6 @@ import Button from 'components/common/Button';
 import FormLayout, { FormButtons, FormRow } from 'components/layout/FormLayout';
 import CopyButton from 'components/common/CopyButton';

-const scriptName = process.env.TRACKER_SCRIPT_NAME || 'umami';
-
 export default function TrackingCodeForm({ values, onClose }) {
  const ref = useRef();
  const { basePath } = useRouter();
@ -26,7 +24,7 @@ export default function TrackingCodeForm({ values, onClose }) {
          rows={3}
          cols={60}
          spellCheck={false}
-          defaultValue={`<script async defer data-website-id="${values.website_uuid}" src="${document.location.origin}${basePath}/${scriptName}.js"></script>`}
+          defaultValue={`<script async defer data-website-id="${values.website_uuid}" src="${document.location.origin}${basePath}/umami.js"></script>`}
          readOnly
        />
      </FormRow>
--- a/components/forms/WebsiteEditForm.js
+++ b/components/forms/WebsiteEditForm.js
@ -10,7 +10,7 @@ import FormLayout, {
 } from 'components/layout/FormLayout';
 import Checkbox from 'components/common/Checkbox';
 import { DOMAIN_REGEX } from 'lib/constants';
-import usePost from 'hooks/usePost';
+import useApi from 'hooks/useApi';

 const initialValues = {
  name: '',
@ -34,11 +34,11 @@ const validate = ({ name, domain }) => {
 };

 export default function WebsiteEditForm({ values, onSave, onClose }) {
-  const post = usePost();
+  const { post } = useApi();
  const [message, setMessage] = useState();

  const handleSubmit = async values => {
-    const { ok, data } = await post('/api/website', values);
+    const { ok, data } = await post('/website', values);

    if (ok) {
      onSave();
--- a/components/helpers/StickyHeader.js
+++ b/components/helpers/StickyHeader.js
@ -25,9 +25,8 @@ export default function StickyHeader({
      }
    };

-    checkPosition();
-
    if (enabled) {
+      checkPosition();
      window.addEventListener('scroll', checkPosition);
    }

--- a/components/layout/ButtonLayout.module.css
+++ b/components/layout/ButtonLayout.module.css
@ -1,6 +1,7 @@
 .buttons {
  display: flex;
  align-items: center;
+  width: 100%;
 }

 .buttons button + * {
--- a/components/layout/Footer.js
+++ b/components/layout/Footer.js
@ -4,32 +4,29 @@ 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 { HOMEPAGE_URL, VERSION_URL } from 'lib/constants';

 export default function Footer() {
  const { current } = useVersion();
-  const { dir } = useLocale();

  return (
-    <footer className="container" dir={dir}>
-      <div className={classNames(styles.footer, 'row')}>
-        <div className="col-12 col-md-4" />
-        <div className="col-12 col-md-4">
-          <FormattedMessage
-            id="message.powered-by"
-            defaultMessage="Powered by {name}"
-            values={{
-              name: (
-                <Link href="https://umami.is">
-                  <b>umami</b>
-                </Link>
-              ),
-            }}
-          />
-        </div>
-        <div className={classNames(styles.version, 'col-12 col-md-4')}>
-          <Link href={`https://github.com/mikecao/umami/releases`}>{`v${current}`}</Link>
-        </div>
+    <footer className={classNames(styles.footer, 'row')}>
+      <div className="col-12 col-md-4" />
+      <div className="col-12 col-md-4">
+        <FormattedMessage
+          id="message.powered-by"
+          defaultMessage="Powered by {name}"
+          values={{
+            name: (
+              <Link href={HOMEPAGE_URL}>
+                <b>umami</b>
+              </Link>
+            ),
+          }}
+        />
+      </div>
+      <div className={classNames(styles.version, 'col-12 col-md-4')}>
+        <Link href={VERSION_URL}>{`v${current}`}</Link>
      </div>
    </footer>
  );
--- a/components/layout/Footer.module.css
+++ b/components/layout/Footer.module.css
@ -3,16 +3,17 @@
  justify-content: space-between;
  align-items: center;
  font-size: var(--font-size-small);
-  min-height: 100px;
  text-align: center;
+  margin: 30px 0;
 }

 .version {
  text-align: right;
+  padding-right: 10px;
 }

@media only screen and (max-width: 768px) {
-  .version {
+  .footer .version {
    text-align: center;
  }
 }
--- a/components/layout/Header.js
+++ b/components/layout/Header.js
@ -1,71 +1,48 @@
-import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useSelector } from 'react-redux';
 import classNames from 'classnames';
 import Link from 'components/common/Link';
 import Icon from 'components/common/Icon';
 import LanguageButton from 'components/settings/LanguageButton';
 import ThemeButton from 'components/settings/ThemeButton';
+import HamburgerButton from 'components/common/HamburgerButton';
 import UpdateNotice from 'components/common/UpdateNotice';
 import UserButton from 'components/settings/UserButton';
-import Button from 'components/common/Button';
 import Logo from 'assets/logo.svg';
 import styles from './Header.module.css';
-import useLocale from 'hooks/useLocale';
-import XMark from 'assets/xmark.svg';
-import Bars from 'assets/bars.svg';
+import useUser from 'hooks/useUser';
+import { HOMEPAGE_URL } from 'lib/constants';

 export default function Header() {
-  const user = useSelector(state => state.user);
-  const [active, setActive] = useState(false);
-  const { dir } = useLocale();
-
-  function handleClick() {
-    setActive(state => !state);
-  }
+  const { user } = useUser();

  return (
-    <nav className="container" dir={dir}>
+    <>
      {user?.is_admin && <UpdateNotice />}
-      <div className={classNames(styles.header, 'row align-items-center')}>
-        <div className={styles.nav}>
-          <div className="">
-            <div className={styles.title}>
-              <Icon icon={<Logo />} size="large" className={styles.logo} />
-              <Link href={user ? '/' : 'https://umami.is'}>umami</Link>
-            </div>
-          </div>
-          <Button
-            className={styles.burger}
-            icon={active ? <XMark /> : <Bars />}
-            onClick={handleClick}
-          />
-          {user && (
-            <div className={styles.items}>
-              <div className={active ? classNames(styles.active) : ''}>
-                <Link href="/dashboard">
-                  <FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />
-                </Link>
-                <Link href="/realtime">
-                  <FormattedMessage id="label.realtime" defaultMessage="Realtime" />
-                </Link>
-                <Link href="/settings">
-                  <FormattedMessage id="label.settings" defaultMessage="Settings" />
-                </Link>
-              </div>
-            </div>
-          )}
-          <div className={styles.items}>
-            <div className={active ? classNames(styles.active) : ''}>
-              <div className={styles.buttons}>
-                <ThemeButton />
-                <LanguageButton menuAlign="right" />
-                {user && <UserButton />}
-              </div>
-            </div>
-          </div>
+      <header className={classNames(styles.header, 'row')}>
+        <div className={styles.title}>
+          <Icon icon={<Logo />} size="large" className={styles.logo} />
+          <Link href={user ? '/' : HOMEPAGE_URL}>umami</Link>
        </div>
-      </div>
-    </nav>
+        <HamburgerButton />
+        {user && (
+          <div className={styles.links}>
+            <Link href="/dashboard">
+              <FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />
+            </Link>
+            <Link href="/realtime">
+              <FormattedMessage id="label.realtime" defaultMessage="Realtime" />
+            </Link>
+            <Link href="/settings">
+              <FormattedMessage id="label.settings" defaultMessage="Settings" />
+            </Link>
+          </div>
+        )}
+        <div className={styles.buttons}>
+          <ThemeButton />
+          <LanguageButton menuAlign="right" />
+          {user && <UserButton />}
+        </div>
+      </header>
+    </>
  );
 }
--- a/components/layout/Header.module.css
+++ b/components/layout/Header.module.css
@ -1,17 +1,6 @@
-.navbar {
-  align-items: stretch;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-  width: 100%;
-}
-
-.burger {
-  display: none;
-}
-
 .header {
  display: flex;
+  align-items: center;
  min-height: 100px;
  width: 100%;
 }
@ -27,16 +16,8 @@
  margin-right: 12px;
 }

-.nav {
-  display: flex;
-  align-items: center;
-  font-size: var(--font-size-normal);
-  font-weight: 600;
-  width: 100%;
-  justify-content: space-between;
-}
-
-.items {
+.links {
+  flex: 1;
  display: flex;
  justify-content: center;
  align-items: center;
@ -44,7 +25,7 @@
  font-weight: 600;
 }

-.nav a + a {
+.links a + a {
  margin-left: 40px;
 }

@ -55,13 +36,13 @@
 }

@media only screen and (max-width: 992px) {
-  .nav {
-    font-size: var(--font-size-large);
-    justify-content: space-between;
-    margin: 20px 0;
+  .header .buttons {
+    flex: 1;
  }
-  .items {
-    flex-wrap: wrap;
+  .links {
+    order: 2;
+    margin: 20px 0;
+    min-width: 100%;
  }
 }

@ -70,47 +51,14 @@
    padding: 0 15px;
  }

-  .title {
-    padding: 0.5rem;
-    margin-bottom: 0.5rem;
-  }
-
-  .nav {
-    font-size: var(--font-size-normal);
-    flex-wrap: wrap;
-    justify-content: center;
-    flex-direction: column;
-    position: relative;
-  }
-
-  .items {
-    display: flex;
-    justify-content: unset;
-    font-size: var(--font-size-normal);
-    font-weight: 600;
-  }
-
-  .items > div {
+  .buttons,
+  .links {
    display: none;
  }

-  .header .active {
-    display: inherit;
-    width: 100%;
-  }
-
-  .items a {
-    width: 100%;
-  }
-
-  .burger {
-    display: block;
-    background: none;
-    border: 1px solid var(--gray900);
-    border-radius: 4px;
-    cursor: pointer;
-    position: absolute;
-    top: 0;
-    right: 0;
+  .title {
+    flex: 1;
+    padding: 0.5rem;
+    margin-bottom: 0.5rem;
  }
 }
--- a/components/messages.js
+++ b/components/messages.js
@ -1,5 +1,4 @@
-import React from 'react';
-import { defineMessages, FormattedMessage } from 'react-intl';
+import { defineMessages } from 'react-intl';

 export const labels = defineMessages({
  unknown: { id: 'label.unknown', defaultMessage: 'Unknown' },
@ -13,5 +12,5 @@ export const devices = defineMessages({
 });

 export function getDeviceMessage(device) {
-  return <FormattedMessage {...(devices[device] || labels.unknown)} />;
+  return devices[device] || labels.unknown;
 }
--- a/components/metrics/ActiveUsers.js
+++ b/components/metrics/ActiveUsers.js
@ -9,7 +9,7 @@ import styles from './ActiveUsers.module.css';

 export default function ActiveUsers({ websiteId, className, value, interval = 60000 }) {
  const shareToken = useShareToken();
-  const { data } = useFetch(!value && `/api/website/${websiteId}/active`, {
+  const { data } = useFetch(!value && `/website/${websiteId}/active`, {
    interval,
    headers: { [TOKEN_HEADER]: shareToken?.token },
  });
--- a/components/metrics/BarChart.js
+++ b/components/metrics/BarChart.js
@ -7,7 +7,7 @@ import { dateFormat } from 'lib/date';
 import useLocale from 'hooks/useLocale';
 import useTheme from 'hooks/useTheme';
 import useForceUpdate from 'hooks/useForceUpdate';
-import { DEFAUL_CHART_HEIGHT, DEFAULT_ANIMATION_DURATION, THEME_COLORS } from 'lib/constants';
+import { DEFAULT_ANIMATION_DURATION, THEME_COLORS } from 'lib/constants';
 import styles from './BarChart.module.css';
 import ChartTooltip from './ChartTooltip';

@ -16,7 +16,6 @@ export default function BarChart({
  datasets,
  unit,
  records,
-  height = DEFAUL_CHART_HEIGHT,
  animationDuration = DEFAULT_ANIMATION_DURATION,
  className,
  stacked = false,
@ -215,7 +214,6 @@ export default function BarChart({
        data-tip=""
        data-for={`${chartId}-tooltip`}
        className={classNames(styles.chart, className)}
-        style={{ height }}
      >
        <canvas ref={canvas} />
      </div>
--- a/components/metrics/BarChart.module.css
+++ b/components/metrics/BarChart.module.css
@ -1,3 +1,10 @@
 .chart {
  position: relative;
+  height: 400px;
+}
+
+@media only screen and (max-width: 992px) {
+  .chart {
+    height: 200px;
+  }
 }
--- a/components/metrics/DataTable.module.css
+++ b/components/metrics/DataTable.module.css
@ -95,3 +95,9 @@
  background: var(--primary400);
  z-index: -1;
 }
+
+@media only screen and (max-width: 992px) {
+  .body {
+    height: auto;
+  }
+}
--- a/components/metrics/DevicesTable.js
+++ b/components/metrics/DevicesTable.js
@ -11,7 +11,7 @@ export default function DevicesTable({ websiteId, ...props }) {
      type="device"
      metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
      websiteId={websiteId}
-      renderLabel={({ x }) => getDeviceMessage(x)}
+      renderLabel={({ x }) => <FormattedMessage {...getDeviceMessage(x)} />}
    />
  );
 }
--- a/components/metrics/EventsChart.js
+++ b/components/metrics/EventsChart.js
@ -17,7 +17,7 @@ export default function EventsChart({ websiteId, className, token }) {
  const shareToken = useShareToken();

  const { data, loading } = useFetch(
-    `/api/website/${websiteId}/events`,
+    `/website/${websiteId}/events`,
    {
      params: {
        start_at: +startDate,
--- a/components/metrics/MetricCard.js
+++ b/components/metrics/MetricCard.js
@ -19,7 +19,6 @@ const MetricCard = ({
      <animated.div className={styles.value}>{props.x.interpolate(x => format(x))}</animated.div>
      <div className={styles.label}>
        {label}
-        {~~change === 0 && !hideComparison && <span className={styles.change}>{format(0)}</span>}
        {~~change !== 0 && !hideComparison && (
          <animated.span
            className={`${styles.change} ${
--- a/components/metrics/MetricsBar.js
+++ b/components/metrics/MetricsBar.js
@ -22,7 +22,7 @@ export default function MetricsBar({ websiteId, className }) {
  } = usePageQuery();

  const { data, error, loading } = useFetch(
-    `/api/website/${websiteId}/stats`,
+    `/website/${websiteId}/stats`,
    {
      params: {
        start_at: +startDate,
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@ -26,8 +26,7 @@ export default function MetricsTable({
  ...props
 }) {
  const shareToken = useShareToken();
-  const [dateRange] = useDateRange(websiteId);
-  const { startDate, endDate, modified } = dateRange;
+  const [{ startDate, endDate, modified }] = useDateRange(websiteId);
  const {
    resolve,
    router,
@ -35,7 +34,7 @@ export default function MetricsTable({
  } = usePageQuery();

  const { data, loading, error } = useFetch(
-    `/api/website/${websiteId}/metrics`,
+    `/website/${websiteId}/metrics`,
    {
      params: {
        type,
--- a/components/metrics/RealtimeHeader.module.css
+++ b/components/metrics/RealtimeHeader.module.css
@ -1,6 +1,7 @@
 .metrics {
  display: flex;
  margin-bottom: 10px;
+  overflow: auto;
 }

@media only screen and (max-width: 576px) {
--- a/components/metrics/RealtimeLog.js
+++ b/components/metrics/RealtimeLog.js
@ -7,7 +7,7 @@ import Tag from 'components/common/Tag';
 import Dot from 'components/common/Dot';
 import FilterButtons from 'components/common/FilterButtons';
 import NoData from 'components/common/NoData';
-import { getDeviceMessage } from 'components/messages';
+import { getDeviceMessage, labels } from 'components/messages';
 import useLocale from 'hooks/useLocale';
 import useCountryNames from 'hooks/useCountryNames';
 import { BROWSERS } from 'lib/constants';
@ -129,15 +129,10 @@ export default function RealtimeLog({ data, websites, websiteId }) {
          id="message.log.visitor"
          defaultMessage="Visitor from {country} using {browser} on {os} {device}"
          values={{
-            country: (
-              <b>
-                {countryNames[country] ||
-                  intl.formatMessage({ id: 'label.unknown', defaultMessage: 'Unknown' })}
-              </b>
-            ),
+            country: <b>{countryNames[country] || intl.formatMessage(labels.unknown)}</b>,
            browser: <b>{BROWSERS[browser]}</b>,
            os: <b>{os}</b>,
-            device: <b>{getDeviceMessage(device)}</b>,
+            device: <b>{intl.formatMessage(getDeviceMessage(device))}</b>,
          }}
        />
      );
--- a/components/metrics/RealtimeViews.js
+++ b/components/metrics/RealtimeViews.js
@ -95,8 +95,8 @@ export default function RealtimeViews({ websiteId, data, websites }) {
        <DataTable
          title={<FormattedMessage id="metrics.referrers" defaultMessage="Referrers" />}
          metric={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
+          renderLabel={renderLink}
          data={referrers}
-          height={400}
        />
      )}
      {filter === FILTER_PAGES && (
@ -105,7 +105,6 @@ export default function RealtimeViews({ websiteId, data, websites }) {
          metric={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
          renderLabel={renderLink}
          data={pages}
-          height={400}
        />
      )}
    </>
--- a/components/metrics/WebsiteChart.js
+++ b/components/metrics/WebsiteChart.js
@ -1,6 +1,5 @@
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
-import { useRouter } from 'next/router';
 import PageviewsChart from './PageviewsChart';
 import MetricsBar from './MetricsBar';
 import WebsiteHeader from './WebsiteHeader';
@ -12,11 +11,10 @@ import useFetch from 'hooks/useFetch';
 import useDateRange from 'hooks/useDateRange';
 import useTimezone from 'hooks/useTimezone';
 import usePageQuery from 'hooks/usePageQuery';
-import useLocale from 'hooks/useLocale';
-import { getDateArray, getDateLength, getDateRange, getDateRangeValues } from 'lib/date';
+import { getDateArray, getDateLength, getDateRangeValues } from 'lib/date';
 import useShareToken from 'hooks/useShareToken';
+import useApi from 'hooks/useApi';
 import { TOKEN_HEADER } from 'lib/constants';
-import { get } from 'lib/web';
 import styles from './WebsiteChart.module.css';

 export default function WebsiteChart({
@ -31,17 +29,16 @@ export default function WebsiteChart({
  const shareToken = useShareToken();
  const [dateRange, setDateRange] = useDateRange(websiteId);
  const { startDate, endDate, unit, value, modified } = dateRange;
-  const { locale } = useLocale();
  const [timezone] = useTimezone();
-  const { basePath } = useRouter();
  const {
    router,
    resolve,
    query: { url, ref },
  } = usePageQuery();
+  const { get } = useApi();

  const { data, loading, error } = useFetch(
-    `/api/website/${websiteId}/pageviews`,
+    `/website/${websiteId}/pageviews`,
    {
      params: {
        start_at: +startDate,
@ -73,12 +70,10 @@ export default function WebsiteChart({

  async function handleDateChange(value) {
    if (value === 'all') {
-      const { data, ok } = await get(`${basePath}/api/website/${websiteId}`);
+      const { data, ok } = await get(`/website/${websiteId}`);
      if (ok) {
        setDateRange({ value, ...getDateRangeValues(new Date(data.created_at), Date.now()) });
      }
-    } else if (typeof value === 'string') {
-      setDateRange(getDateRange(value, locale));
    } else {
      setDateRange(value);
    }
--- a/components/metrics/WebsiteHeader.js
+++ b/components/metrics/WebsiteHeader.js
@ -1,6 +1,8 @@
 import React from 'react';
+import classNames from 'classnames';
 import { FormattedMessage } from 'react-intl';
 import Link from 'components/common/Link';
+import OverflowText from 'components/common/OverflowText';
 import PageHeader from 'components/layout/PageHeader';
 import RefreshButton from 'components/common/RefreshButton';
 import ButtonLayout from 'components/layout/ButtonLayout';
@ -13,36 +15,44 @@ export default function WebsiteHeader({ websiteId, title, domain, showLink = fal
  const header = showLink ? (
    <>
      <Favicon domain={domain} />
-      <Link href="/website/[...id]" as={`/website/${websiteId}/${title}`}>
-        {title}
+      <Link
+        className={styles.titleLink}
+        href="/website/[...id]"
+        as={`/website/${websiteId}/${title}`}
+      >
+        <OverflowText tooltipId={`${websiteId}-title`}>{title}</OverflowText>
      </Link>
    </>
  ) : (
-    <div>
+    <>
      <Favicon domain={domain} />
-      {title}
-    </div>
+      <OverflowText tooltipId={`${websiteId}-title`}>{title}</OverflowText>
+    </>
  );

  return (
-    <PageHeader>
-      <div className={styles.title}>{header}</div>
-      <ActiveUsers className={styles.active} websiteId={websiteId} />
-      <ButtonLayout align="right">
-        <RefreshButton websiteId={websiteId} />
-        {showLink && (
-          <Link
-            href="/website/[...id]"
-            as={`/website/${websiteId}/${title}`}
-            className={styles.link}
-            icon={<Arrow />}
-            size="small"
-            iconRight
-          >
-            <FormattedMessage id="label.view-details" defaultMessage="View details" />
-          </Link>
-        )}
-      </ButtonLayout>
+    <PageHeader className="row">
+      <div className={classNames(styles.title, 'col-12 col-lg-4')}>{header}</div>
+      <div className={classNames(styles.active, 'col-6 col-lg-4')}>
+        <ActiveUsers websiteId={websiteId} />
+      </div>
+      <div className="col-6 col-lg-4">
+        <ButtonLayout align="right">
+          <RefreshButton websiteId={websiteId} />
+          {showLink && (
+            <Link
+              href="/website/[...id]"
+              as={`/website/${websiteId}/${title}`}
+              className={styles.link}
+              icon={<Arrow />}
+              size="small"
+              iconRight
+            >
+              <FormattedMessage id="label.view-details" defaultMessage="View details" />
+            </Link>
+          )}
+        </ButtonLayout>
+      </div>
    </PageHeader>
  );
 }
--- a/components/metrics/WebsiteHeader.module.css
+++ b/components/metrics/WebsiteHeader.module.css
@ -1,15 +1,28 @@
 .title {
  color: var(--gray900);
  font-size: var(--font-size-large);
-  line-height: var(--font-size-large);
+  line-height: var(--font-size-xlarge);
+  align-items: center;
+  display: flex;
+  max-width: 100%;
+  overflow: hidden;
+}
+
+.titleLink {
+  max-width: 100%;
 }

 .link {
  font-weight: 600;
 }

-@media only screen and (max-width: 576px) {
+.active {
+  display: flex;
+  justify-content: center;
+}
+
+@media only screen and (max-width: 992px) {
  .active {
-    display: none;
+    justify-content: flex-start;
  }
 }
--- a/components/pages/RealtimeDashboard.js
+++ b/components/pages/RealtimeDashboard.js
@ -33,8 +33,8 @@ export default function RealtimeDashboard() {
  const countryNames = useCountryNames(locale);
  const [data, setData] = useState();
  const [websiteId, setWebsiteId] = useState(0);
-  const { data: init, loading } = useFetch('/api/realtime/init');
-  const { data: updates } = useFetch('/api/realtime/update', {
+  const { data: init, loading } = useFetch('/realtime/init');
+  const { data: updates } = useFetch('/realtime/update', {
    params: { start_at: data?.timestamp },
    disabled: !init?.websites?.length || !data,
    interval: REALTIME_INTERVAL,
@ -145,7 +145,6 @@ export default function RealtimeDashboard() {
              metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
              data={countries}
              renderLabel={renderCountryName}
-              height={500}
            />
          </GridColumn>
          <GridColumn xs={12} lg={8}>
--- a/components/pages/Settings.js
+++ b/components/pages/Settings.js
@ -1,23 +1,27 @@
 import React, { useState } from 'react';
+import { FormattedMessage } from 'react-intl';
 import { useRouter } from 'next/router';
 import Page from 'components/layout/Page';
 import MenuLayout from 'components/layout/MenuLayout';
-import WebsiteSettings from '../settings/WebsiteSettings';
-import AccountSettings from '../settings/AccountSettings';
-import ProfileSettings from '../settings/ProfileSettings';
-import { useSelector } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
+import WebsiteSettings from 'components/settings/WebsiteSettings';
+import AccountSettings from 'components/settings/AccountSettings';
+import ProfileSettings from 'components/settings/ProfileSettings';
+import useUser from 'hooks/useUser';

 const WEBSITES = '/settings';
 const ACCOUNTS = '/settings/accounts';
 const PROFILE = '/settings/profile';

 export default function Settings() {
-  const user = useSelector(state => state.user);
+  const { user } = useUser();
  const [option, setOption] = useState(WEBSITES);
  const router = useRouter();
  const { pathname } = router;

+  if (!user) {
+    return null;
+  }
+
  const menuOptions = [
    {
      label: <FormattedMessage id="label.websites" defaultMessage="Websites" />,
--- a/components/pages/TestConsole.js
+++ b/components/pages/TestConsole.js
@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import { useSelector } from 'react-redux';
 import classNames from 'classnames';
 import Head from 'next/head';
 import Link from 'next/link';
@ -13,15 +12,16 @@ import Button from 'components/common/Button';
 import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
 import Icon from 'components/common/Icon';
 import useFetch from 'hooks/useFetch';
+import useUser from 'hooks/useUser';
 import ChevronDown from 'assets/chevron-down.svg';
 import styles from './TestConsole.module.css';

 export default function TestConsole() {
-  const user = useSelector(state => state.user);
+  const { user } = useUser();
  const [website, setWebsite] = useState();
  const [show, setShow] = useState(true);
  const { basePath } = useRouter();
-  const { data } = useFetch('/api/websites');
+  const { data } = useFetch('/websites');

  if (!data || !user?.is_admin) {
    return null;
@ -68,7 +68,7 @@ export default function TestConsole() {
          {show && (
            <div className={classNames(styles.test, 'row')}>
              <div className="col-4">
-                <PageHeader>Page links</PageHeader>
+                <PageHeader>Page links</PageHeader>Nmo
                <div>
                  <Link href={`?page=1`}>
                    <a>page one</a>
@ -79,6 +79,11 @@ export default function TestConsole() {
                    <a>page two</a>
                  </Link>
                </div>
+                <div>
+                  <Link href={`https://www.google.com`}>
+                    <a className="umami--click--external-link">external link</a>
+                  </Link>
+                </div>
              </div>
              <div className="col-4">
                <PageHeader>CSS events</PageHeader>
--- a/components/pages/WebsiteDetails.js
+++ b/components/pages/WebsiteDetails.js
@ -9,20 +9,20 @@ import MenuLayout from 'components/layout/MenuLayout';
 import Link from 'components/common/Link';
 import Loading from 'components/common/Loading';
 import Arrow from 'assets/arrow-right.svg';
-import styles from './WebsiteDetails.module.css';
-import PagesTable from '../metrics/PagesTable';
-import ReferrersTable from '../metrics/ReferrersTable';
-import BrowsersTable from '../metrics/BrowsersTable';
-import OSTable from '../metrics/OSTable';
-import DevicesTable from '../metrics/DevicesTable';
-import CountriesTable from '../metrics/CountriesTable';
-import LanguagesTable from '../metrics/LanguagesTable';
-import EventsTable from '../metrics/EventsTable';
-import EventsChart from '../metrics/EventsChart';
+import PagesTable from 'components/metrics/PagesTable';
+import ReferrersTable from 'components/metrics/ReferrersTable';
+import BrowsersTable from 'components/metrics/BrowsersTable';
+import OSTable from 'components/metrics/OSTable';
+import DevicesTable from 'components/metrics/DevicesTable';
+import CountriesTable from 'components/metrics/CountriesTable';
+import LanguagesTable from 'components/metrics/LanguagesTable';
+import EventsTable from 'components/metrics/EventsTable';
+import EventsChart from 'components/metrics/EventsChart';
 import useFetch from 'hooks/useFetch';
 import usePageQuery from 'hooks/usePageQuery';
 import useShareToken from 'hooks/useShareToken';
 import { DEFAULT_ANIMATION_DURATION, TOKEN_HEADER } from 'lib/constants';
+import styles from './WebsiteDetails.module.css';

 const views = {
  url: PagesTable,
@ -37,7 +37,7 @@ const views = {

 export default function WebsiteDetails({ websiteId }) {
  const shareToken = useShareToken();
-  const { data } = useFetch(`/api/website/${websiteId}`, {
+  const { data } = useFetch(`/website/${websiteId}`, {
    headers: { [TOKEN_HEADER]: shareToken?.token },
  });
  const [chartLoaded, setChartLoaded] = useState(false);
--- a/components/pages/WebsiteList.js
+++ b/components/pages/WebsiteList.js
@ -4,15 +4,23 @@ import Link from 'components/common/Link';
 import WebsiteChart from 'components/metrics/WebsiteChart';
 import Page from 'components/layout/Page';
 import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
-import Button from 'components/common/Button';
 import useFetch from 'hooks/useFetch';
+import DashboardSettingsButton from 'components/settings/DashboardSettingsButton';
+import Button from 'components/common/Button';
+import useStore from 'store/app';
 import Arrow from 'assets/arrow-right.svg';
-import Chart from 'assets/chart-bar.svg';
 import styles from './WebsiteList.module.css';

+const selector = state => state.dashboard;
+
 export default function WebsiteList({ userId }) {
-  const { data } = useFetch('/api/websites', { params: { user_id: userId } });
-  const [showCharts, setShowCharts] = useState(true);
+  const { data } = useFetch('/websites', { params: { user_id: userId } });
+  const { showCharts, limit } = useStore(selector);
+  const [max, setMax] = useState(limit);
+
+  function handleMore() {
+    setMax(max + limit);
+  }

  if (!data) {
    return null;
@ -40,23 +48,26 @@ export default function WebsiteList({ userId }) {
  return (
    <Page>
      <div className={styles.menubar}>
-        <Button
-          tooltip={<FormattedMessage id="message.toggle-charts" defaultMessage="Toggle charts" />}
-          icon={<Chart />}
-          onClick={() => setShowCharts(!showCharts)}
-        />
+        <DashboardSettingsButton />
      </div>
-      {data.map(({ website_id, name, domain }) => (
-        <div key={website_id} className={styles.website}>
-          <WebsiteChart
-            websiteId={website_id}
-            title={name}
-            domain={domain}
-            showChart={showCharts}
-            showLink
-          />
-        </div>
-      ))}
+      {data.map(({ website_id, name, domain }, index) =>
+        index < max ? (
+          <div key={website_id} className={styles.website}>
+            <WebsiteChart
+              websiteId={website_id}
+              title={name}
+              domain={domain}
+              showChart={showCharts}
+              showLink
+            />
+          </div>
+        ) : null,
+      )}
+      {max < data.length && (
+        <Button className={styles.button} onClick={handleMore}>
+          <FormattedMessage id="label.more" defaultMessage="More" />
+        </Button>
+      )}
    </Page>
  );
 }
--- a/components/pages/WebsiteList.module.css
+++ b/components/pages/WebsiteList.module.css
@ -16,3 +16,8 @@
  justify-content: flex-end;
  padding-top: 10px;
 }
+
+.button {
+  align-self: center;
+  margin-bottom: 40px;
+}
--- a/components/settings/AccountSettings.js
+++ b/components/settings/AccountSettings.js
@ -25,7 +25,7 @@ export default function AccountSettings() {
  const [deleteAccount, setDeleteAccount] = useState();
  const [saved, setSaved] = useState(0);
  const [message, setMessage] = useState();
-  const { data } = useFetch(`/api/accounts`, {}, [saved]);
+  const { data } = useFetch(`/accounts`, {}, [saved]);

  const Checkmark = ({ is_admin }) => (is_admin ? <Icon icon={<Check />} size="medium" /> : null);

@ -53,23 +53,23 @@ export default function AccountSettings() {
    {
      key: 'username',
      label: <FormattedMessage id="label.username" defaultMessage="Username" />,
-      className: 'col-4 col-md-3',
+      className: 'col-12 col-lg-4',
    },
    {
      key: 'is_admin',
      label: <FormattedMessage id="label.administrator" defaultMessage="Administrator" />,
-      className: 'col-4 col-md-3',
+      className: 'col-12 col-lg-3',
      render: Checkmark,
    },
    {
      key: 'dashboard',
      label: <FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />,
-      className: 'col-4 col-md-3',
+      className: 'col-12 col-lg-3',
      render: DashboardLink,
    },
    {
      key: 'actions',
-      className: classNames(styles.buttons, 'col-12 col-md-3 pt-2 pt-md-0'),
+      className: classNames(styles.buttons, 'col-12 col-lg-2 pt-2 pt-md-0'),
      render: Buttons,
    },
  ];
--- a/components/settings/DashboardSettingsButton.js
+++ b/components/settings/DashboardSettingsButton.js
@ -0,0 +1,27 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+import MenuButton from 'components/common/MenuButton';
+import Gear from 'assets/gear.svg';
+import useStore, { setDashboard } from 'store/app';
+
+const selector = state => state.dashboard;
+
+export default function DashboardSettingsButton() {
+  const settings = useStore(selector);
+
+  const menuOptions = [
+    {
+      label: <FormattedMessage id="message.toggle-charts" defaultMessage="Toggle charts" />,
+      value: 'charts',
+    },
+  ];
+
+  function handleSelect(value) {
+    if (value === 'charts') {
+      setDashboard({ showCharts: !settings.showCharts });
+    }
+    //setDashboard(value);
+  }
+
+  return <MenuButton icon={<Gear />} options={menuOptions} onSelect={handleSelect} hideLabel />;
+}
--- a/components/settings/DateRangeSetting.js
+++ b/components/settings/DateRangeSetting.js
@ -4,18 +4,19 @@ import DateFilter, { filterOptions } from 'components/common/DateFilter';
 import Button from 'components/common/Button';
 import useDateRange from 'hooks/useDateRange';
 import { DEFAULT_DATE_RANGE } from 'lib/constants';
-import { getDateRange } from 'lib/date';
 import styles from './DateRangeSetting.module.css';
-import useLocale from 'hooks/useLocale';

 export default function DateRangeSetting() {
-  const { locale } = useLocale();
  const [dateRange, setDateRange] = useDateRange();
  const { startDate, endDate, value } = dateRange;
  const options = filterOptions.filter(e => e.value !== 'all');

+  function handleChange(value) {
+    setDateRange(value);
+  }
+
  function handleReset() {
-    setDateRange(getDateRange(DEFAULT_DATE_RANGE, locale));
+    setDateRange(DEFAULT_DATE_RANGE);
  }

  return (
@ -25,7 +26,7 @@ export default function DateRangeSetting() {
        value={value}
        startDate={startDate}
        endDate={endDate}
-        onChange={setDateRange}
+        onChange={handleChange}
      />
      <Button className={styles.button} size="small" onClick={handleReset}>
        <FormattedMessage id="label.reset" defaultMessage="Reset" />
--- a/components/settings/LanguageSetting.js
+++ b/components/settings/LanguageSetting.js
@ -0,0 +1,31 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+import DropDown from 'components/common/DropDown';
+import Button from 'components/common/Button';
+import useLocale from 'hooks/useLocale';
+import { DEFAULT_LOCALE } from 'lib/constants';
+import styles from './TimezoneSetting.module.css';
+import { languages } from '../../lib/lang';
+
+export default function LanguageSetting() {
+  const { locale, saveLocale } = useLocale();
+  const options = Object.keys(languages).map(key => ({ ...languages[key], value: key }));
+
+  function handleReset() {
+    saveLocale(DEFAULT_LOCALE);
+  }
+
+  return (
+    <>
+      <DropDown
+        menuClassName={styles.menu}
+        value={locale}
+        options={options}
+        onChange={saveLocale}
+      />
+      <Button className={styles.button} size="small" onClick={handleReset}>
+        <FormattedMessage id="label.reset" defaultMessage="Reset" />
+      </Button>
+    </>
+  );
+}
--- a/components/settings/ProfileSettings.js
+++ b/components/settings/ProfileSettings.js
@ -1,6 +1,5 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useSelector } from 'react-redux';
 import PageHeader from 'components/layout/PageHeader';
 import Button from 'components/common/Button';
 import Modal from 'components/common/Modal';
@ -11,12 +10,14 @@ import Dots from 'assets/ellipsis-h.svg';
 import styles from './ProfileSettings.module.css';
 import DateRangeSetting from './DateRangeSetting';
 import useEscapeKey from 'hooks/useEscapeKey';
+import useUser from 'hooks/useUser';
+import LanguageSetting from './LanguageSetting';
+import ThemeSetting from './ThemeSetting';

 export default function ProfileSettings() {
-  const user = useSelector(state => state.user);
+  const { user } = useUser();
  const [changePassword, setChangePassword] = useState(false);
-  const [message, setMessage] = useState();
-  const { user_id } = user;
+  const [message, setMessage] = useState(null);

  function handleSave() {
    setChangePassword(false);
@ -27,6 +28,12 @@ export default function ProfileSettings() {
    setChangePassword(false);
  });

+  if (!user) {
+    return null;
+  }
+
+  const { user_id, username } = user;
+
  return (
    <>
      <PageHeader>
@ -41,7 +48,7 @@ export default function ProfileSettings() {
        <dt>
          <FormattedMessage id="label.username" defaultMessage="Username" />
        </dt>
-        <dd>{user.username}</dd>
+        <dd>{username}</dd>
        <dt>
          <FormattedMessage id="label.timezone" defaultMessage="Timezone" />
        </dt>
@ -54,6 +61,18 @@ export default function ProfileSettings() {
        <dd>
          <DateRangeSetting />
        </dd>
+        <dt>
+          <FormattedMessage id="label.language" defaultMessage="Language" />
+        </dt>
+        <dd>
+          <LanguageSetting />
+        </dd>
+        <dt>
+          <FormattedMessage id="label.theme" defaultMessage="Theme" />
+        </dt>
+        <dd>
+          <ThemeSetting />
+        </dd>
      </dl>
      {changePassword && (
        <Modal
--- a/components/settings/ThemeButton.js
+++ b/components/settings/ThemeButton.js
@ -9,7 +9,8 @@ import Icon from '../common/Icon';
 export default function ThemeButton() {
  const [theme, setTheme] = useTheme();

-  const transitions = useTransition(theme, theme => theme, {
+  const transitions = useTransition(theme, {
+    initial: { opacity: 1 },
    from: {
      opacity: 0,
      transform: `translateY(${theme === 'light' ? '20px' : '-20px'}) scale(0.5)`,
@ -27,17 +28,11 @@ export default function ThemeButton() {

  return (
    <div className={styles.button} onClick={handleClick}>
-      {transitions.map(({ item, key, props }) =>
-        item === 'light' ? (
-          <animated.div key={key} style={props}>
-            <Icon icon={<Sun />} />
-          </animated.div>
-        ) : (
-          <animated.div key={key} style={props}>
-            <Icon icon={<Moon />} />
-          </animated.div>
-        ),
-      )}
+      {transitions((styles, item) => (
+        <animated.div key={item} style={styles}>
+          <Icon icon={item === 'light' ? <Sun /> : <Moon />} />
+        </animated.div>
+      ))}
    </div>
  );
 }
--- a/components/settings/ThemeSetting.js
+++ b/components/settings/ThemeSetting.js
@ -0,0 +1,25 @@
+import classNames from 'classnames';
+import Button from 'components/common/Button';
+import useTheme from 'hooks/useTheme';
+import Sun from 'assets/sun.svg';
+import Moon from 'assets/moon.svg';
+import styles from './ThemeSetting.module.css';
+
+export default function ThemeSetting() {
+  const [theme, setTheme] = useTheme();
+
+  return (
+    <div className={styles.buttons}>
+      <Button
+        className={classNames({ [styles.active]: theme === 'light' })}
+        icon={<Sun />}
+        onClick={() => setTheme('light')}
+      />
+      <Button
+        className={classNames({ [styles.active]: theme === 'dark' })}
+        icon={<Moon />}
+        onClick={() => setTheme('dark')}
+      />
+    </div>
+  );
+}
--- a/components/settings/ThemeSetting.module.css
+++ b/components/settings/ThemeSetting.module.css
@ -0,0 +1,11 @@
+.buttons {
+  display: flex;
+}
+
+.buttons button {
+  margin-right: 20px;
+}
+
+.active {
+  border: 1px solid var(--primary400);
+}
--- a/components/settings/UserButton.js
+++ b/components/settings/UserButton.js
@ -1,6 +1,5 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useSelector } from 'react-redux';
 import { useRouter } from 'next/router';
 import MenuButton from 'components/common/MenuButton';
 import Icon from 'components/common/Icon';
@ -9,9 +8,10 @@ import Chevron from 'assets/chevron-down.svg';
 import styles from './UserButton.module.css';
 import { removeItem } from 'lib/web';
 import { AUTH_TOKEN } from 'lib/constants';
+import useUser from 'hooks/useUser';

 export default function UserButton() {
-  const user = useSelector(state => state.user);
+  const { user } = useUser();
  const router = useRouter();

  const menuOptions = [
--- a/components/settings/WebsiteSettings.js
+++ b/components/settings/WebsiteSettings.js
@ -1,10 +1,10 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useSelector } from 'react-redux';
 import classNames from 'classnames';
 import Link from 'components/common/Link';
 import Table from 'components/common/Table';
 import Button from 'components/common/Button';
+import OverflowText from 'components/common/OverflowText';
 import PageHeader from 'components/layout/PageHeader';
 import Modal from 'components/common/Modal';
 import WebsiteEditForm from 'components/forms/WebsiteEditForm';
@ -23,10 +23,11 @@ import Plus from 'assets/plus.svg';
 import Code from 'assets/code.svg';
 import LinkIcon from 'assets/link.svg';
 import useFetch from 'hooks/useFetch';
+import useUser from 'hooks/useUser';
 import styles from './WebsiteSettings.module.css';

 export default function WebsiteSettings() {
-  const user = useSelector(state => state.user);
+  const { user } = useUser();
  const [editWebsite, setEditWebsite] = useState();
  const [resetWebsite, setResetWebsite] = useState();
  const [deleteWebsite, setDeleteWebsite] = useState();
@ -35,9 +36,7 @@ export default function WebsiteSettings() {
  const [showUrl, setShowUrl] = useState();
  const [saved, setSaved] = useState(0);
  const [message, setMessage] = useState();
-  const { data } = useFetch(`/api/websites` + (user.is_admin ? '?include_all=true' : ''), {}, [
-    saved,
-  ]);
+  const { data } = useFetch('/websites', { params: { include_all: !!user?.is_admin } }, [saved]);

  const Buttons = row => (
    <ButtonLayout align="right">
@ -84,28 +83,37 @@ export default function WebsiteSettings() {
  );

  const DetailsLink = ({ website_id, name, domain }) => (
-    <Link href="/website/[...id]" as={`/website/${website_id}/${name}`}>
+    <Link
+      className={styles.detailLink}
+      href="/website/[...id]"
+      as={`/website/${website_id}/${name}`}
+    >
      <Favicon domain={domain} />
-      {name}
+      <OverflowText tooltipId={`${website_id}-name`}>{name}</OverflowText>
    </Link>
  );

+  const Domain = ({ domain, website_id }) => (
+    <OverflowText tooltipId={`${website_id}-domain`}>{domain}</OverflowText>
+  );
+
  const adminColumns = [
    {
      key: 'name',
      label: <FormattedMessage id="label.name" defaultMessage="Name" />,
-      className: 'col-4 col-xl-3',
+      className: 'col-12 col-lg-4 col-xl-3',
      render: DetailsLink,
    },
    {
      key: 'domain',
      label: <FormattedMessage id="label.domain" defaultMessage="Domain" />,
-      className: 'col-4 col-xl-3',
+      className: 'col-12 col-lg-4 col-xl-3',
+      render: Domain,
    },
    {
      key: 'account',
      label: <FormattedMessage id="label.owner" defaultMessage="Owner" />,
-      className: 'col-4 col-xl-1',
+      className: 'col-12 col-lg-4 col-xl-1',
    },
    {
      key: 'action',
@ -118,13 +126,14 @@ export default function WebsiteSettings() {
    {
      key: 'name',
      label: <FormattedMessage id="label.name" defaultMessage="Name" />,
-      className: 'col-6 col-xl-4',
+      className: 'col-12 col-lg-6 col-xl-4',
      render: DetailsLink,
    },
    {
      key: 'domain',
      label: <FormattedMessage id="label.domain" defaultMessage="Domain" />,
-      className: 'col-6 col-xl-4',
+      className: 'col-12 col-lg-6 col-xl-4',
+      render: Domain,
    },
    {
      key: 'action',
--- a/components/settings/WebsiteSettings.module.css
+++ b/components/settings/WebsiteSettings.module.css
@ -3,5 +3,11 @@
 }

 .buttons {
+  display: flex;
  justify-content: flex-end;
+  width: 100%;
+}
+
+.detailLink {
+  width: 100%;
 }
--- a/hooks/useApi.js
+++ b/hooks/useApi.js
@ -0,0 +1,48 @@
+import { useCallback } from 'react';
+import { useRouter } from 'next/router';
+import { get, post, put, del, getItem } from 'lib/web';
+import { AUTH_TOKEN } from 'lib/constants';
+
+function includeAuthToken(headers = {}) {
+  const authToken = getItem(AUTH_TOKEN);
+
+  if (authToken) {
+    headers.Authorization = `Bearer ${authToken}`;
+  }
+
+  return headers;
+}
+
+export default function useApi() {
+  const { basePath } = useRouter();
+
+  return {
+    get: useCallback(
+      async (url, params, headers) => {
+        return get(`${basePath}/api${url}`, params, includeAuthToken(headers));
+      },
+      [get],
+    ),
+
+    post: useCallback(
+      async (url, params, headers) => {
+        return post(`${basePath}/api${url}`, params, includeAuthToken(headers));
+      },
+      [post],
+    ),
+
+    put: useCallback(
+      async (url, params, headers) => {
+        return put(`${basePath}/api${url}`, params, includeAuthToken(headers));
+      },
+      [put],
+    ),
+
+    del: useCallback(
+      async (url, params, headers) => {
+        return del(`${basePath}/api${url}`, params, includeAuthToken(headers));
+      },
+      [del],
+    ),
+  };
+}
--- a/hooks/useDateRange.js
+++ b/hooks/useDateRange.js
@ -1,17 +1,18 @@
-import { useDispatch, useSelector } from 'react-redux';
+import { useCallback, useMemo } from 'react';
 import { parseISO } from 'date-fns';
 import { getDateRange } from 'lib/date';
 import { getItem, setItem } from 'lib/web';
-import { setDateRange } from '../redux/actions/websites';
 import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE } from 'lib/constants';
 import useForceUpdate from './useForceUpdate';
 import useLocale from './useLocale';
+import useStore, { setDateRange } from 'store/websites';

-export default function useDateRange(websiteId, defaultDateRange = DEFAULT_DATE_RANGE) {
-  const dispatch = useDispatch();
+export default function useDateRange(websiteId) {
  const { locale } = useLocale();
-  const dateRange = useSelector(state => state.websites[websiteId]?.dateRange);
  const forceUpdate = useForceUpdate();
+  const selector = useCallback(state => state?.[websiteId]?.dateRange, [websiteId]);
+  const websiteDateRange = useStore(selector);
+  const defaultDateRange = useMemo(() => getDateRange(DEFAULT_DATE_RANGE, locale), [locale]);

  const globalDefault = getItem(DATE_RANGE_CONFIG);
  let globalDateRange;
@ -28,16 +29,14 @@ export default function useDateRange(websiteId, defaultDateRange = DEFAULT_DATE_
    }
  }

-  function saveDateRange(values) {
-    const { value } = values;
-
+  function saveDateRange(dateRange) {
    if (websiteId) {
-      dispatch(setDateRange(websiteId, values));
+      setDateRange(websiteId, dateRange);
    } else {
-      setItem(DATE_RANGE_CONFIG, value === 'custom' ? values : value);
+      setItem(DATE_RANGE_CONFIG, dateRange);
      forceUpdate();
    }
  }

-  return [dateRange || globalDateRange || getDateRange(defaultDateRange, locale), saveDateRange];
+  return [websiteDateRange || globalDateRange || defaultDateRange, saveDateRange];
 }
--- a/hooks/useDelete.js
+++ b/hooks/useDelete.js
@ -1,11 +0,0 @@
-import { useCallback } from 'react';
-import { useRouter } from 'next/router';
-import { del } from 'lib/web';
-
-export default function useDelete() {
-  const { basePath } = useRouter();
-
-  return useCallback(async (url, params, headers) => {
-    return del(`${basePath}${url}`, params, headers);
-  }, []);
-}
--- a/hooks/useFetch.js
+++ b/hooks/useFetch.js
@ -1,16 +1,13 @@
 import { useState, useEffect } from 'react';
-import { useDispatch } from 'react-redux';
-import { useRouter } from 'next/router';
-import { get } from 'lib/web';
-import { updateQuery } from 'redux/actions/queries';
+import { saveQuery } from 'store/queries';
+import useApi from './useApi';

 export default function useFetch(url, options = {}, update = []) {
-  const dispatch = useDispatch();
  const [response, setResponse] = useState();
  const [error, setError] = useState();
  const [loading, setLoadiing] = useState(false);
  const [count, setCount] = useState(0);
-  const { basePath } = useRouter();
+  const { get } = useApi();
  const { params = {}, headers = {}, disabled, delay = 0, interval, onDataLoad } = options;

  async function loadData(params) {
@ -19,9 +16,9 @@ export default function useFetch(url, options = {}, update = []) {
      setError(null);
      const time = performance.now();

-      const { data, status, ok } = await get(`${basePath}${url}`, params, headers);
+      const { data, status, ok } = await get(url, params, headers);

-      dispatch(updateQuery({ url, time: performance.now() - time, completed: Date.now() }));
+      await saveQuery(url, { time: performance.now() - time, completed: Date.now() });

      if (status >= 400) {
        setError(data);
--- a/hooks/useForceSSL.js
+++ b/hooks/useForceSSL.js
@ -1,14 +0,0 @@
-import { useEffect } from 'react';
-import { useRouter } from 'next/router';
-
-export default function useForceSSL(enabled) {
-  const router = useRouter();
-
-  useEffect(() => {
-    if (enabled && typeof window !== 'undefined' && /^http:\/\//.test(location.href)) {
-      router.push(location.href.replace(/^http:\/\//, 'https://'));
-    }
-  }, [enabled]);
-
-  return null;
-}
--- a/hooks/useLocale.js
+++ b/hooks/useLocale.js
@ -1,10 +1,9 @@
 import { useEffect } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { setLocale } from 'redux/actions/app';
 import { useRouter } from 'next/router';
 import { get, setItem } from 'lib/web';
 import { LOCALE_CONFIG } from 'lib/constants';
 import { getDateLocale, getTextDirection } from 'lib/lang';
+import useStore, { setLocale } from 'store/app';
 import useForceUpdate from 'hooks/useForceUpdate';
 import enUS from 'public/messages/en-US.json';

@ -12,9 +11,10 @@ const messages = {
  'en-US': enUS,
 };

+const selector = state => state.locale;
+
 export default function useLocale() {
-  const locale = useSelector(state => state.app.locale);
-  const dispatch = useDispatch();
+  const locale = useStore(selector);
  const { basePath } = useRouter();
  const forceUpdate = useForceUpdate();
  const dir = getTextDirection(locale);
@ -36,7 +36,7 @@ export default function useLocale() {
    setItem(LOCALE_CONFIG, value);

    if (locale !== value) {
-      dispatch(setLocale(value));
+      setLocale(value);
    } else {
      forceUpdate();
    }
--- a/hooks/usePost.js
+++ b/hooks/usePost.js
@ -1,11 +0,0 @@
-import { useCallback } from 'react';
-import { useRouter } from 'next/router';
-import { post } from 'lib/web';
-
-export default function usePost() {
-  const { basePath } = useRouter();
-
-  return useCallback(async (url, params, headers) => {
-    return post(`${basePath}${url}`, params, headers);
-  }, []);
-}
--- a/hooks/useRequireLogin.js
+++ b/hooks/useRequireLogin.js
@ -1,38 +1,36 @@
 import { useState, useEffect } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { updateUser } from 'redux/actions/user';
 import { useRouter } from 'next/router';
-import { get } from 'lib/web';
+import useUser from 'hooks/useUser';
+import useApi from 'hooks/useApi';

 export default function useRequireLogin() {
  const router = useRouter();
-  const dispatch = useDispatch();
-  const storeUser = useSelector(state => state.user);
-  const [loading, setLoading] = useState(!storeUser);
-  const [user, setUser] = useState(storeUser);
+  const { get } = useApi();
+  const { user, setUser } = useUser();
+  const [loading, setLoading] = useState(false);

  async function loadUser() {
    setLoading(true);

-    const { ok, data } = await get(`${router.basePath}/api/auth/verify`);
+    const { ok, data } = await get('/auth/verify');

    if (!ok) {
-      return router.push('/login');
+      await router.push('/login');
+      return null;
    }

-    await dispatch(updateUser(data));
+    setUser(data);

-    setUser(user);
    setLoading(false);
  }

  useEffect(() => {
-    if (!loading && user) {
+    if (loading || user) {
      return;
    }

    loadUser();
-  }, []);
+  }, [user, loading]);

  return { user, loading };
 }
--- a/hooks/useShareToken.js
+++ b/hooks/useShareToken.js
@ -1,19 +1,18 @@
 import { useEffect } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { useRouter } from 'next/router';
-import { get } from 'lib/web';
-import { setShareToken } from 'redux/actions/app';
+import useStore, { setShareToken } from 'store/app';
+import useApi from './useApi';
+
+const selector = state => state.shareToken;

 export default function useShareToken(shareId) {
-  const { basePath } = useRouter();
-  const dispatch = useDispatch();
-  const shareToken = useSelector(state => state.app.shareToken);
+  const shareToken = useStore(selector);
+  const { get } = useApi();

  async function loadToken(id) {
-    const { data } = await get(`${basePath}/api/share/${id}`);
+    const { data } = await get(`/share/${id}`);

    if (data) {
-      dispatch(setShareToken(data));
+      setShareToken(data);
    }
  }

--- a/hooks/useTheme.js
+++ b/hooks/useTheme.js
@ -1,8 +1,9 @@
-import { useDispatch, useSelector } from 'react-redux';
-import { setTheme } from 'redux/actions/app';
+import { useEffect } from 'react';
+import useStore, { setTheme } from 'store/app';
 import { getItem, setItem } from 'lib/web';
 import { THEME_CONFIG } from 'lib/constants';
-import { useEffect } from 'react';
+
+const selector = state => state.theme;

 export default function useTheme() {
  const defaultTheme =
@ -11,12 +12,11 @@ export default function useTheme() {
        ? 'dark'
        : 'light'
      : 'light';
-  const theme = useSelector(state => state.app.theme || getItem(THEME_CONFIG) || defaultTheme);
-  const dispatch = useDispatch();
+  const theme = useStore(selector) || getItem(THEME_CONFIG) || defaultTheme;

  function saveTheme(value) {
    setItem(THEME_CONFIG, value);
-    dispatch(setTheme(value));
+    setTheme(value);
  }

  useEffect(() => {
--- a/hooks/useUser.js
+++ b/hooks/useUser.js
@ -0,0 +1,9 @@
+import useStore, { setUser } from 'store/app';
+
+const selector = state => state.user;
+
+export default function useUser() {
+  const user = useStore(selector);
+
+  return { user, setUser };
+}
--- a/hooks/useVersion.js
+++ b/hooks/useVersion.js
@ -1,12 +1,10 @@
 import { useEffect, useCallback } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { checkVersion } from 'redux/actions/app';
+import useStore, { checkVersion } from 'store/version';
 import { VERSION_CHECK } from 'lib/constants';
 import { getItem, setItem } from 'lib/web';

 export default function useVersion(check) {
-  const dispatch = useDispatch();
-  const versions = useSelector(state => state.app.versions);
+  const versions = useStore();
  const checked = versions.latest === getItem(VERSION_CHECK)?.version;

  const updateCheck = useCallback(() => {
@ -15,7 +13,7 @@ export default function useVersion(check) {

  useEffect(() => {
    if (check && !versions.latest) {
-      dispatch(checkVersion());
+      checkVersion();
    }
  }, [versions, check]);

--- a/lang-ignore.json
+++ b/lang-ignore.json
@ -24,5 +24,13 @@
    "metrics.device.desktop",
    "metrics.device.laptop",
    "metrics.device.tablet"
-  ]
+  ],
+  "it-IT": [
+    "label.password",
+    "label.reset",
+    "message.powered-by",
+    "metrics.device.desktop",
+    "metrics.device.tablet",
+    "metrics.filter.raw",
+  ],
 }
--- a/lang/ar-SA.json
+++ b/lang/ar-SA.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "تفعيل مشاركة الرابط",
  "label.invalid": "غير صحيح",
  "label.invalid-domain": "النطاق غير صحيح",
+  "label.language": "Language",
  "label.last-days": "اخر {x} يوم/ايام",
  "label.last-hours": "اخر {x} ساعة/ساعات",
  "label.logged-in-as": "تم تسجيل الدخول كـ {username}",
@ -50,6 +51,7 @@
  "label.settings": "اعدادات",
  "label.share-url": "مشاركة الرابط",
  "label.single-day": "يوم واحد",
+  "label.theme": "Theme",
  "label.this-month": "الشهر الحالي",
  "label.this-week": "الاسبوع الحالي",
  "label.this-year": "السنة الحالية",
--- a/lang/ca-ES.json
+++ b/lang/ca-ES.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Activa l'enllaç per compartir",
  "label.invalid": "Invàlid",
  "label.invalid-domain": "Domini invàlid",
+  "label.language": "Language",
  "label.last-days": "Últims {x} dies",
  "label.last-hours": "Últimes {x} hores",
  "label.logged-in-as": "Connectat com {username}",
@ -50,6 +51,7 @@
  "label.settings": "Configuració",
  "label.share-url": "Enllaç per compartir",
  "label.single-day": "Un sol dia",
+  "label.theme": "Theme",
  "label.this-month": "Aquest mes",
  "label.this-week": "Aquesta setmana",
  "label.this-year": "Aquest any",
--- a/lang/cs-CZ.json
+++ b/lang/cs-CZ.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Povolit sdílení URL",
  "label.invalid": "Neplatný",
  "label.invalid-domain": "Neplatná doména",
+  "label.language": "Language",
  "label.last-days": "Posledních {x} dnů",
  "label.last-hours": "Posledních {x} hodin",
  "label.logged-in-as": "Přihlášený jako {username}",
@ -50,6 +51,7 @@
  "label.settings": "Nastavení",
  "label.share-url": "Sdílet URL",
  "label.single-day": "Jeden den",
+  "label.theme": "Theme",
  "label.this-month": "Tento měsíc",
  "label.this-week": "Tento týden",
  "label.this-year": "Tento rok",
--- a/lang/da-DK.json
+++ b/lang/da-DK.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Aktivér delings-URL",
  "label.invalid": "Ugyldig",
  "label.invalid-domain": "Ugyldigt domæne",
+  "label.language": "Language",
  "label.last-days": "Sidste {x} dage",
  "label.last-hours": "Sidste {x} timer",
  "label.logged-in-as": "Loggede ind som {username}",
@ -50,6 +51,7 @@
  "label.settings": "Indstillinger",
  "label.share-url": "Del URL",
  "label.single-day": "Enkelt dag",
+  "label.theme": "Theme",
  "label.this-month": "Denne måned",
  "label.this-week": "Denne uge",
  "label.this-year": "Dette år",
--- a/lang/de-DE.json
+++ b/lang/de-DE.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Freigabe-URL aktivieren",
  "label.invalid": "Ungültig",
  "label.invalid-domain": "Ungültige Domain",
+  "label.language": "Language",
  "label.last-days": "Letzten {x} Tage",
  "label.last-hours": "Letzten {x} Stunden",
  "label.logged-in-as": "Angemeldet als {username}",
@ -50,6 +51,7 @@
  "label.settings": "Einstellungen",
  "label.share-url": "Freigabe-URL",
  "label.single-day": "Ein Tag",
+  "label.theme": "Theme",
  "label.this-month": "Diesen Monat",
  "label.this-week": "Diese Woche",
  "label.this-year": "Dieses Jahr",
@ -76,7 +78,7 @@
  "message.no-websites-configured": "Es ist keine Webseite vorhanden.",
  "message.page-not-found": "Seite nicht gefunden.",
  "message.powered-by": "Betrieben durch {name}",
-  "message.reset-warning": "Alle Daten für diese Website werden gelöscht, jedoch bleibt der tracking code bestehen.",
+  "message.reset-warning": "Alle Daten für diese Webseite werden gelöscht, jedoch bleibt der Tracking Code bestehen.",
  "message.save-success": "Erfolgreich gespeichert.",
  "message.share-url": "Dies ist die öffentliche URL zum Teilen für {target}.",
  "message.toggle-charts": "Schaubilder umschalten",
--- a/lang/el-GR.json
+++ b/lang/el-GR.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Ενεργοποίηση κοινής χρήσης URL",
  "label.invalid": "Μη έγκυρο",
  "label.invalid-domain": "Μη έγκυρος τομέας",
+  "label.language": "Language",
  "label.last-days": "Τελευταίες {x} ημέρες",
  "label.last-hours": "Τελευταίες {x} ώρες",
  "label.logged-in-as": "Συνδεθήκατε ως {username}",
@ -50,6 +51,7 @@
  "label.settings": "Ρυθμίσεις",
  "label.share-url": "Κοινοποίηση διεύθυνσης URL",
  "label.single-day": "Ημερήσια",
+  "label.theme": "Theme",
  "label.this-month": "Αυτο το μήνα",
  "label.this-week": "Αυτή την εβδομάδα",
  "label.this-year": "Αυτή την χρονιά",
--- a/lang/en-GB.json
+++ b/lang/en-GB.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Enable share URL",
  "label.invalid": "Invalid",
  "label.invalid-domain": "Invalid domain",
+  "label.language": "Language",
  "label.last-days": "Last {x} days",
  "label.last-hours": "Last {x} hours",
  "label.logged-in-as": "Logged in as {username}",
@ -50,6 +51,7 @@
  "label.settings": "Settings",
  "label.share-url": "Share URL",
  "label.single-day": "Single day",
+  "label.theme": "Theme",
  "label.this-month": "This month",
  "label.this-week": "This week",
  "label.this-year": "This year",
--- a/lang/en-US.json
+++ b/lang/en-US.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Enable share URL",
  "label.invalid": "Invalid",
  "label.invalid-domain": "Invalid domain",
+  "label.language": "Language",
  "label.last-days": "Last {x} days",
  "label.last-hours": "Last {x} hours",
  "label.logged-in-as": "Logged in as {username}",
@ -50,6 +51,7 @@
  "label.settings": "Settings",
  "label.share-url": "Share URL",
  "label.single-day": "Single day",
+  "label.theme": "Theme",
  "label.this-month": "This month",
  "label.this-week": "This week",
  "label.this-year": "This year",
--- a/lang/es-MX.json
+++ b/lang/es-MX.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Habilitar compartir URL",
  "label.invalid": "Inválido",
  "label.invalid-domain": "Dominio inválido",
+  "label.language": "Language",
  "label.last-days": "Últimos {x} días",
  "label.last-hours": "Últimas {x} horas",
  "label.logged-in-as": "Sesión iniciada como {username}",
@ -50,6 +51,7 @@
  "label.settings": "Configuraciones",
  "label.share-url": "Compartir URL",
  "label.single-day": "Dia",
+  "label.theme": "Theme",
  "label.this-month": "Este mes",
  "label.this-week": "Esta semana",
  "label.this-year": "Este año",
--- a/lang/fa-IR.json
+++ b/lang/fa-IR.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "فعال کردن اشتراک گذاری URL",
  "label.invalid": "نامعتبر",
  "label.invalid-domain": "دامنه‌ی نامعتبر",
+  "label.language": "Language",
  "label.last-days": "لیست {x} روز",
  "label.last-hours": "لیست {x} ساعت",
  "label.logged-in-as": "وارد شده به عنوان {username}",
@ -50,6 +51,7 @@
  "label.settings": "تنظیمات",
  "label.share-url": "به اشتراک گذاری URL",
  "label.single-day": "یک روز",
+  "label.theme": "Theme",
  "label.this-month": "این ماه",
  "label.this-week": "این هفته",
  "label.this-year": "امسال",
--- a/lang/fi-FI.json
+++ b/lang/fi-FI.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Ota jakamisen URL-osoite käyttöön",
  "label.invalid": "Virheellinen",
  "label.invalid-domain": "Virheellinen verkkotunnus",
+  "label.language": "Language",
  "label.last-days": "Viimeisimmät {x} päivät",
  "label.last-hours": "Viimeisimmät {x} tunnit",
  "label.logged-in-as": "Kirjautuneena sisään nimellä {username}",
@ -50,6 +51,7 @@
  "label.settings": "Asetukset",
  "label.share-url": "Jaa URL",
  "label.single-day": "Yksi päivä",
+  "label.theme": "Theme",
  "label.this-month": "Tämä kuukausi",
  "label.this-week": "Tämä viikko",
  "label.this-year": "Tämä vuosi",
--- a/lang/fo-FO.json
+++ b/lang/fo-FO.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Virkja deili leinki",
  "label.invalid": "Ógilda",
  "label.invalid-domain": "Ógilt økisnavn",
+  "label.language": "Language",
  "label.last-days": "Seinastu {x} dagarnar",
  "label.last-hours": "Seinastu {x} tímarnar",
  "label.logged-in-as": "Ritaður inn sum {username}",
@ -50,6 +51,7 @@
  "label.settings": "Stillingar",
  "label.share-url": "Deil leinku",
  "label.single-day": "Einkultur dagur",
+  "label.theme": "Theme",
  "label.this-month": "Hendan mánan",
  "label.this-week": "Hesa vikuna",
  "label.this-year": "Hetta árið",
--- a/lang/fr-FR.json
+++ b/lang/fr-FR.json
@ -5,7 +5,7 @@
  "label.administrator": "Administrateur",
  "label.all": "Tout",
  "label.all-events": "Tous les événements",
-  "label.all-time": "All time",
+  "label.all-time": "Toutes périodes",
  "label.all-websites": "Tous les sites web",
  "label.back": "Retour",
  "label.cancel": "Annuler",
@ -28,6 +28,7 @@
  "label.enable-share-url": "Activer le partage d'URL",
  "label.invalid": "Invalide",
  "label.invalid-domain": "Domaine invalide",
+  "label.language": "Language",
  "label.last-days": "{x} derniers jours",
  "label.last-hours": "{x} dernières heures",
  "label.logged-in-as": "Connecté en tant que {username}",
@ -36,7 +37,7 @@
  "label.more": "Plus",
  "label.name": "Nom",
  "label.new-password": "Nouveau mot de passe",
-  "label.owner": "Owner",
+  "label.owner": "Propriétaire",
  "label.password": "Mot de passe",
  "label.passwords-dont-match": "Les mots de passe ne correspondent pas",
  "label.profile": "Profil",
@ -45,11 +46,12 @@
  "label.refresh": "Rafraîchir",
  "label.required": "Requis",
  "label.reset": "Réinitialiser",
-  "label.reset-website": "Reset statistics",
+  "label.reset-website": "Réinitialiser les statistiques",
  "label.save": "Sauvegarder",
  "label.settings": "Paramètres",
  "label.share-url": "Partager l'URL",
  "label.single-day": "Journée",
+  "label.theme": "Theme",
  "label.this-month": "Ce mois ci",
  "label.this-week": "Cette semaine",
  "label.this-year": "Cette année",
@ -62,7 +64,7 @@
  "label.websites": "Sites",
  "message.active-users": "{x} {x, plural, one {visiteur} other {visiteurs}} actuellement",
  "message.confirm-delete": "Êtes-vous sûr de vouloir supprimer {target} ?",
-  "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.confirm-reset": "Êtes-vous sûr de vouloir réinistialiser les statistiques de {target} ?",
  "message.copied": "Copié !",
  "message.delete-warning": "Toutes les données associées seront également supprimées.",
  "message.failure": "Un problème est survenu.",
@ -76,13 +78,13 @@
  "message.no-websites-configured": "Vous n'avez configuré aucun site Web.",
  "message.page-not-found": "Page non trouvée.",
  "message.powered-by": "Propulsé par {name}",
-  "message.reset-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
+  "message.reset-warning": "Toutes les statistiques pour ce site seront supprimés, mais votre code de suivi restera intact.",
  "message.save-success": "Enregistré avec succès.",
  "message.share-url": "Ceci est l'URL partagée pour {target}.",
-  "message.toggle-charts": "Toggle charts",
+  "message.toggle-charts": "Changer les graphiques",
  "message.track-stats": "Pour suivre les statistiques de {target}, placez le code suivant dans la section {head} de votre site Web.",
  "message.type-delete": "Tapez {delete} dans la case ci-dessous pour confirmer.",
-  "message.type-reset": "Type {reset} in the box below to confirm.",
+  "message.type-reset": "Tapez {reset} dans la case ci-dessous pour confirmer.",
  "metrics.actions": "Actions",
  "metrics.average-visit-time": "Temps de visite moyen",
  "metrics.bounce-rate": "Taux de rebond",
@ -97,7 +99,7 @@
  "metrics.filter.combined": "Combiné",
  "metrics.filter.domain-only": "Domaine uniquement",
  "metrics.filter.raw": "Brute",
-  "metrics.languages": "Languages",
+  "metrics.languages": "Langages",
  "metrics.operating-systems": "Systèmes d'exploitation",
  "metrics.page-views": "Pages vues",
  "metrics.pages": "Pages",
--- a/lang/he-IL.json
+++ b/lang/he-IL.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "הפעלת URL שיתוף",
  "label.invalid": "לא תקין",
  "label.invalid-domain": "דומיין לא תקין",
+  "label.language": "Language",
  "label.last-days": "{x} ימים אחרונים",
  "label.last-hours": "{x} שעות אחרונות",
  "label.logged-in-as": "מחובר כ-{username}",
@ -50,6 +51,7 @@
  "label.settings": "הגדרות",
  "label.share-url": "שיתוף URL",
  "label.single-day": "יום בודד",
+  "label.theme": "Theme",
  "label.this-month": "החודש",
  "label.this-week": "השבוע",
  "label.this-year": "השנה",
--- a/lang/hi-IN.json
+++ b/lang/hi-IN.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "शेयर URL सक्षम करें",
  "label.invalid": "अमान्य",
  "label.invalid-domain": "अमान्य डोमेन",
+  "label.language": "Language",
  "label.last-days": "पिछले {x} दिन",
  "label.last-hours": "पिछले {x} घंटे",
  "label.logged-in-as": "{x} के रूप में लॉग इन किया",
@ -50,6 +51,7 @@
  "label.settings": "समायोजन",
  "label.share-url": "यूआरएल साझा करें",
  "label.single-day": "एक दिन",
+  "label.theme": "Theme",
  "label.this-month": "इस महीने",
  "label.this-week": "इस सप्ताह",
  "label.this-year": "इस साल",
--- a/lang/hu-HU.json
+++ b/lang/hu-HU.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "URL-megosztás engedélyezése",
  "label.invalid": "Érvénytelen",
  "label.invalid-domain": "Érvénytelen domain",
+  "label.language": "Language",
  "label.last-days": "Legutóbbi {x} nap",
  "label.last-hours": "Legutóbbi {x} óra",
  "label.logged-in-as": "Bejelentkezve, mint {username}",
@ -50,6 +51,7 @@
  "label.settings": "Beállítások",
  "label.share-url": "URL megosztása",
  "label.single-day": "Egy nap",
+  "label.theme": "Theme",
  "label.this-month": "Ezen hónap",
  "label.this-week": "Ezen hét",
  "label.this-year": "Ezen év",
--- a/lang/id-ID.json
+++ b/lang/id-ID.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Aktifkan URL berbagi",
  "label.invalid": "Tidak valid",
  "label.invalid-domain": "Domain tidak valid",
+  "label.language": "Language",
  "label.last-days": "{x} hari terakhir",
  "label.last-hours": "{x} jam terakhir",
  "label.logged-in-as": "Masuk sebagai {username}",
@ -50,6 +51,7 @@
  "label.settings": "Pengaturan",
  "label.share-url": "Bagikan URL",
  "label.single-day": "Sehari",
+  "label.theme": "Theme",
  "label.this-month": "Bulan ini",
  "label.this-week": "Minggu ini",
  "label.this-year": "Tahun ini",
--- a/lang/it-IT.json
+++ b/lang/it-IT.json
@ -4,8 +4,8 @@
  "label.add-website": "Aggiungi sito",
  "label.administrator": "Amministratore",
  "label.all": "Tutto",
-  "label.all-events": "All events",
-  "label.all-time": "All time",
+  "label.all-events": "Tutti gli eventi",
+  "label.all-time": "Sempre",
  "label.all-websites": "Tutti i siti web",
  "label.back": "Indietro",
  "label.cancel": "Annulla",
@ -14,7 +14,7 @@
  "label.copy-to-clipboard": "Copia",
  "label.current-password": "Password corrente",
  "label.custom-range": "Personalizzato",
-  "label.dashboard": "Dashboard",
+  "label.dashboard": "Pannello di Controllo",
  "label.date-range": "Periodo",
  "label.default-date-range": "Periodo standard",
  "label.delete": "Elimina",
@ -28,28 +28,30 @@
  "label.enable-share-url": "Abilita URL di condivisione",
  "label.invalid": "Non valido",
  "label.invalid-domain": "Dominio non valido",
+  "label.language": "Language",
  "label.last-days": "Ultimi {x} giorni",
  "label.last-hours": "Ultime {x} ore",
  "label.logged-in-as": "Ciao {username}",
-  "label.login": "Login",
-  "label.logout": "Logout",
+  "label.login": "Accedi",
+  "label.logout": "Esci",
  "label.more": "Dettagli",
  "label.name": "Nome",
  "label.new-password": "Nuova password",
-  "label.owner": "Owner",
+  "label.owner": "Proprietario",
  "label.password": "Password",
  "label.passwords-dont-match": "Le password non corrispondono",
  "label.profile": "Profilo",
-  "label.realtime": "Realtime",
-  "label.realtime-logs": "Log in realtime",
+  "label.realtime": "Tempo reale",
+  "label.realtime-logs": "Log in tempo reale",
  "label.refresh": "Ricarica",
  "label.required": "Obbligatorio",
  "label.reset": "Reset",
-  "label.reset-website": "Reset statistics",
+  "label.reset-website": "Resetta le statistiche",
  "label.save": "Salva",
  "label.settings": "Impostazioni",
-  "label.share-url": "Share URL",
+  "label.share-url": "Condividi link",
  "label.single-day": "Singolo giorno",
+  "label.theme": "Theme",
  "label.this-month": "Questo mese",
  "label.this-week": "Questa settimana",
  "label.this-year": "Quest'anno",
@ -57,7 +59,7 @@
  "label.today": "Oggi",
  "label.tracking-code": "Codice di tracking",
  "label.unknown": "Sconosciuto",
-  "label.username": "Username",
+  "label.username": "Nome utente",
  "label.view-details": "Vedi dettagli",
  "label.websites": "Siti web",
  "message.active-users": "{x} {x, plural, one {visitatore} other {visitatori}} online",
@ -76,28 +78,28 @@
  "message.no-websites-configured": "Non hai ancora configurato alcun sito.",
  "message.page-not-found": "Pagina non trovata",
  "message.powered-by": "Powered by {name}",
-  "message.reset-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
+  "message.reset-warning": "Tutte le statistiche verranno cancellate per questo sito, ma il tuo codice di tracciamento rimarrà invariato.",
  "message.save-success": "Salvato!",
  "message.share-url": "Questo è l'URL di condivisione per {target}.",
-  "message.toggle-charts": "Toggle charts",
+  "message.toggle-charts": "Apri/Chiudi i grafici",
  "message.track-stats": "Per tracciare le statistiche di {target}, inserisci questo codice nella sezione {head} del tuo sito web.",
  "message.type-delete": "Digita {delete} nel box qui sotto per confermare.",
-  "message.type-reset": "Type {reset} in the box below to confirm.",
+  "message.type-reset": "Digita {reset} nel box qui sotto per confermare.",
  "metrics.actions": "Azioni",
  "metrics.average-visit-time": "Tempo medio di visita",
  "metrics.bounce-rate": "Frequenza di rimbalzo",
  "metrics.browsers": "Browser",
  "metrics.countries": "Nazioni",
  "metrics.device.desktop": "Desktop",
-  "metrics.device.laptop": "Laptop",
-  "metrics.device.mobile": "Mobile",
+  "metrics.device.laptop": "Portatile",
+  "metrics.device.mobile": "Cellulare",
  "metrics.device.tablet": "Tablet",
  "metrics.devices": "Dispositivi",
  "metrics.events": "Eventi",
  "metrics.filter.combined": "Aggregati",
  "metrics.filter.domain-only": "Solo dominio",
  "metrics.filter.raw": "Raw",
-  "metrics.languages": "Languages",
+  "metrics.languages": "Lingue",
  "metrics.operating-systems": "Sistemi operativi",
  "metrics.page-views": "Visualizzazioni di pagina",
  "metrics.pages": "Pagine",
--- a/lang/ja-JP.json
+++ b/lang/ja-JP.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "共有リンクを有効にする",
  "label.invalid": "無効",
  "label.invalid-domain": "無効なドメイン",
+  "label.language": "Language",
  "label.last-days": "過去{x}日間",
  "label.last-hours": "過去{x}時間",
  "label.logged-in-as": "{username}でログイン中",
@ -50,6 +51,7 @@
  "label.settings": "設定",
  "label.share-url": "共有リンク",
  "label.single-day": "一日のみ",
+  "label.theme": "Theme",
  "label.this-month": "今月",
  "label.this-week": "今週",
  "label.this-year": "今年",
--- a/lang/ko-KR.json
+++ b/lang/ko-KR.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "URL 공유 활성화",
  "label.invalid": "무효",
  "label.invalid-domain": "잘못된 도메인",
+  "label.language": "Language",
  "label.last-days": "최근 {x} 일간",
  "label.last-hours": "최근 {x} 시간",
  "label.logged-in-as": "{username}(으)로 로그인됨",
@ -50,6 +51,7 @@
  "label.settings": "설정",
  "label.share-url": "공유 URL",
  "label.single-day": "하루",
+  "label.theme": "Theme",
  "label.this-month": "이번 달",
  "label.this-week": "이번 주",
  "label.this-year": "올해",
--- a/lang/lt-LT.json
+++ b/lang/lt-LT.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Įjungti bendrinimą su nuoroda",
  "label.invalid": "Neteisingai",
  "label.invalid-domain": "Klaidingas domenas",
+  "label.language": "Language",
  "label.last-days": "{x, plural, =0 {Paskutinės # dienų} zero {Paskutinės # dienų} one {Paskutinė diena} other {Paskutinės # dienos}}",
  "label.last-hours": "{x, plural, =0 {Paskutinės # valandų} zero {Paskutinės # valandų} one {Paskutinė # valanda} other {Paskutinės # valandos}}",
  "label.logged-in-as": "Prisijungęs kaip {username}",
@ -50,6 +51,7 @@
  "label.settings": "Nustatymai",
  "label.share-url": "Pasidalinti nuoroda",
  "label.single-day": "Viena diena",
+  "label.theme": "Theme",
  "label.this-month": "Šis mėnuo",
  "label.this-week": "Ši savaitė",
  "label.this-year": "Šie metai",
--- a/lang/mn-MN.json
+++ b/lang/mn-MN.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Хуваалцах холбоос идэвхжүүлэх",
  "label.invalid": "Буруу",
  "label.invalid-domain": "Буруу домэйн",
+  "label.language": "Language",
  "label.last-days": "Сүүлийн {x} хоног",
  "label.last-hours": "Сүүлийн {x} цаг",
  "label.logged-in-as": "{username}-р нэвтэрсэн",
@ -50,6 +51,7 @@
  "label.settings": "Тохиргоо",
  "label.share-url": "Хуваалцах холбоос",
  "label.single-day": "Нэг өдөр",
+  "label.theme": "Theme",
  "label.this-month": "Энэ сар",
  "label.this-week": "Энэ долоо хоног",
  "label.this-year": "Энэ жил",
--- a/lang/ms-MY.json
+++ b/lang/ms-MY.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Aktifkan url berkongsi",
  "label.invalid": "Tidak sah",
  "label.invalid-domain": "Domain tidak sah",
+  "label.language": "Language",
  "label.last-days": "{x} hari lepas",
  "label.last-hours": "{x} jam lepas",
  "label.logged-in-as": "Log masuk sebagai {username}",
@ -50,6 +51,7 @@
  "label.settings": "Tetapan",
  "label.share-url": "Kongsikan URL",
  "label.single-day": "Satu hari",
+  "label.theme": "Theme",
  "label.this-month": "Bulan ini",
  "label.this-week": "Minggu ini",
  "label.this-year": "Tahun ini",
--- a/lang/nb-NO.json
+++ b/lang/nb-NO.json
@ -28,6 +28,7 @@
  "label.enable-share-url": "Aktiver delings-URL",
  "label.invalid": "Ugyldig",
  "label.invalid-domain": "Ugyldig domene",
+  "label.language": "Language",
  "label.last-days": "Siste {x} dager",
  "label.last-hours": "Siste {x} timer",
  "label.logged-in-as": "Logget på som {brukernavn}",
@ -50,6 +51,7 @@
  "label.settings": "Innstillinger",
  "label.share-url": "Del URL",
  "label.single-day": "Enkelt dag",
+  "label.theme": "Theme",
  "label.this-month": "Denne måneden",
  "label.this-week": "Denne uka",
  "label.this-year": "I år",
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 6.0.0-alpha2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M504.265 315.978C504.265 307.326 499.658 299.134 491.906 294.586L458.998 275.615C459.643 269.099 459.966 262.549 459.966 256S459.643 242.901 458.998 236.385L491.906 217.414C499.658 212.866 504.265 204.674 504.265 196.022C504.265 174.755 454.947 67.846 419.746 67.846C415.502 67.846 411.236 68.939 407.379 71.203L374.599 90.172C363.888 82.43 352.533 75.848 340.531 70.428V32.488C340.531 21.262 333.047 11.453 322.205 8.613C300.654 2.871 278.425 0 256.181 0C233.935 0 211.675 2.871 190.06 8.613C179.218 11.453 171.734 21.262 171.734 32.488V70.428C159.732 75.848 148.377 82.43 137.666 90.172L104.886 71.203C101.031 68.939 96.763 67.846 92.519 67.846C92.517 67.846 92.514 67.846 92.512 67.846C60.048 67.846 8 169.591 8 196.022C8 204.674 12.607 212.866 20.359 217.414L53.267 236.385C52.622 242.901 52.299 249.451 52.299 256S52.622 269.099 53.267 275.615L20.359 294.586C12.607 299.134 8 307.326 8 315.978C8 337.245 57.318 444.154 92.519 444.154C96.763 444.154 101.029 443.061 104.886 440.797L137.666 421.828C148.377 429.57 159.732 436.152 171.734 441.572V479.512C171.734 490.738 179.218 500.547 190.06 503.387C211.611 509.129 233.84 512 256.084 512C278.33 512 300.59 509.129 322.205 503.387C333.047 500.547 340.531 490.738 340.531 479.512V441.572C352.533 436.152 363.888 429.57 374.599 421.828L407.379 440.797C411.234 443.061 415.502 444.154 419.746 444.154C452.209 444.154 504.265 342.423 504.265 315.978ZM415.361 389.959C391.561 376.186 404.101 383.444 371.705 364.695C329.649 395.09 339.375 389.426 292.531 410.582V460.82C279.236 463.161 266.948 464 256.093 464C240.669 464 228.14 462.306 219.734 460.824V410.582C172.779 389.376 182.552 395.044 140.56 364.695C108.748 383.105 117.896 377.811 96.924 389.949C81.181 371.256 68.849 349.895 60.517 326.84C81.643 314.663 72.361 320.014 104.088 301.723C101.549 276.083 100.277 266.079 100.277 256.04C100.277 246.018 101.545 235.96 104.088 210.277C72.198 191.892 81.571 197.295 60.504 185.152C68.818 162.109 81.187 140.686 96.904 122.041C120.704 135.814 108.164 128.556 140.56 147.305C182.616 116.91 172.89 122.574 219.734 101.418V51.18C233.029 48.839 245.318 48 256.172 48C271.597 48 284.126 49.694 292.531 51.176V101.418C339.486 122.624 329.713 116.956 371.705 147.305C405.655 127.657 394.228 134.27 415.343 122.051C431.084 140.744 443.416 162.105 451.748 185.16C430.622 197.337 439.904 191.986 408.177 210.277C410.716 235.917 411.988 245.921 411.988 255.96C411.988 265.982 410.72 276.04 408.177 301.723C440.067 320.108 430.694 314.705 451.761 326.848C443.447 349.891 431.078 371.314 415.361 389.959ZM256.133 160C203.258 160 160.133 203.125 160.133 256S203.258 352 256.133 352S352.133 308.875 352.133 256S309.008 160 256.133 160ZM256.133 304C229.666 304 208.133 282.467 208.133 256S229.666 208 256.133 208S304.133 229.533 304.133 256S282.599 304 256.133 304Z "></path></svg>