Merge pull request umami-software#2176 from umami-software/dev

v2.4.1

components/common/ErrorBoundary.js

@@ -12,7 +12,6 @@ export function ErrorBoundary({ children }) {
  const { formatMessage, messages } = useMessages();
 
  const fallbackRender = ({ error, resetErrorBoundary }) => {
- console.log({ error });
  return (
  <div className={styles.error} role="alert">
  <h1>{formatMessage(messages.error)}</h1>

components/layout/AppLayout.js

@@ -1,6 +1,5 @@
 import { Container } from 'react-basics';
 import Head from 'next/head';
-import { useRouter } from 'next/router';
 import NavBar from 'components/layout/NavBar';
 import UpdateNotice from 'components/common/UpdateNotice';
 import useRequireLogin from 'hooks/useRequireLogin';

components/layout/AppLayout.module.css

@@ -18,4 +18,5 @@
  min-height: 0;
  height: calc(100vh - 60px);
  overflow-y: auto;
+ padding-bottom: 60px;
 }

components/layout/Footer.js

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

components/layout/Footer.module.css

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

components/layout/Header.js

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

components/layout/Header.module.css

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

components/layout/Page.module.css

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

components/layout/PageHeader.module.css

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

components/messages.js

@@ -229,19 +229,19 @@ export const messages = defineMessages({
  defaultMessage: 'All website data will be deleted.',
  },
  noResultsFound: {
- id: 'messages.no-results-found',
+ id: 'message.no-results-found',
  defaultMessage: 'No results were found.',
  },
  noWebsitesConfigured: {
- id: 'messages.no-websites-configured',
+ id: 'message.no-websites-configured',
  defaultMessage: 'You do not have any websites configured.',
  },
  noTeamWebsites: {
- id: 'messages.no-team-websites',
+ id: 'message.no-team-websites',
  defaultMessage: 'This team does not have any websites.',
  },
  teamWebsitesInfo: {
- id: 'messages.team-websites-info',
+ id: 'message.team-websites-info',
  defaultMessage: 'Websites can be viewed by anyone on the team.',
  },
  noMatchPassword: { id: 'message.no-match-password', defaultMessage: 'Passwords do not match.' },
@@ -274,7 +274,7 @@ export const messages = defineMessages({
  defaultMessage: 'No event data is available.',
  },
  newVersionAvailable: {
- id: 'new-version-available',
+ id: 'message.new-version-available',
  defaultMessage: 'A new version of Umami {version} is available!',
  },
 });

components/pages/reports/Report.js

@@ -8,8 +8,6 @@ export const ReportContext = createContext(null);
 export function Report({ reportId, defaultParameters, children, ...props }) {
  const report = useReport(reportId, defaultParameters);
 
- //console.log({ report });
-
  return (
  <ReportContext.Provider value={{ ...report }}>
  <Page {...props} className={styles.container}>

lang/am-ET.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
  "message.user-deleted": "User deleted.",
  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "This team does not have any websites.",
- "messages.no-websites-configured": "You do not have any websites configured.",
- "messages.team-websites-info": "Websites can be viewed by anyone on the team.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "This team does not have any websites.",
+ "message.no-websites-configured": "You do not have any websites configured.",
+ "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/ar-SA.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "كود التتبع",
  "message.user-deleted": "تم حذف المستخدم.",
  "message.visitor-log": "زائر من {country} يستخدم {browser} على {os} {device}",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "هذه المجموعة ليس لديه اي موقع.",
- "messages.no-websites-configured": "لم تقم بإعداد اي موقع.",
- "messages.team-websites-info": "يمكن مشاهدة الموقع من اي عضو في المجموعة.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "هذه المجموعة ليس لديه اي موقع.",
+ "message.no-websites-configured": "لم تقم بإعداد اي موقع.",
+ "message.team-websites-info": "يمكن مشاهدة الموقع من اي عضو في المجموعة.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/be-BY.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "Код адсочвання",
  "message.user-deleted": "User deleted.",
  "message.visitor-log": "Наведвальнік з {country} праз {browser} на {os} {device}",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "This team does not have any websites.",
- "messages.no-websites-configured": "Вы не наладзілі ніводнага сайту.",
- "messages.team-websites-info": "Websites can be viewed by anyone on the team.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "This team does not have any websites.",
+ "message.no-websites-configured": "Вы не наладзілі ніводнага сайту.",
+ "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/bn-BD.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "ট্র্যাকিং কোড",
  "message.user-deleted": "User deleted.",
  "message.visitor-log": "{country} থেকে একজন ভিসিটর {ব্রাউজার}, ব্যবহার করছেন {os} {device} এর মধ্যে।",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "This team does not have any websites.",
- "messages.no-websites-configured": "কোনও ওয়েবসাইট কনফিগার করা নেই।",
- "messages.team-websites-info": "Websites can be viewed by anyone on the team.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "This team does not have any websites.",
+ "message.no-websites-configured": "কোনও ওয়েবসাইট কনফিগার করা নেই।",
+ "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/ca-ES.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "Codi de seguiment",
  "message.user-deleted": "User deleted.",
  "message.visitor-log": "Visitant de {country} usant {browser} a {os} {device}",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "This team does not have any websites.",
- "messages.no-websites-configured": "No hi ha cap lloc web configurat.",
- "messages.team-websites-info": "Websites can be viewed by anyone on the team.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "This team does not have any websites.",
+ "message.no-websites-configured": "No hi ha cap lloc web configurat.",
+ "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/cs-CZ.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "Sledovací kód",
  "message.user-deleted": "User deleted.",
  "message.visitor-log": "Návštěvník z {country} s prohlížečem {browser} na {os} {device}",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "This team does not have any websites.",
- "messages.no-websites-configured": "Nemáte nastavený žádný web.",
- "messages.team-websites-info": "Websites can be viewed by anyone on the team.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "This team does not have any websites.",
+ "message.no-websites-configured": "Nemáte nastavený žádný web.",
+ "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/da-DK.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "Sporingskode",
  "message.user-deleted": "User deleted.",
  "message.visitor-log": "Besøgende fra {country} bruger {browser} på {os} {device}",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "This team does not have any websites.",
- "messages.no-websites-configured": "Du har ikke konfigureret nogen hjemmesider.",
- "messages.team-websites-info": "Websites can be viewed by anyone on the team.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "This team does not have any websites.",
+ "message.no-websites-configured": "Du har ikke konfigureret nogen hjemmesider.",
+ "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/de-CH.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "Tracking Code",
  "message.user-deleted": "Benutzer glöscht.",
  "message.visitor-log": "Bsuecher us {country} benutzt {browser} uf {os} {device}",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "Dem Team sind kei Websiite zuegordnet.",
- "messages.no-websites-configured": "Es isch kei Websiite vorhande.",
- "messages.team-websites-info": "Websiite chönd vo jedem im Team agluegt werde",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "Dem Team sind kei Websiite zuegordnet.",
+ "message.no-websites-configured": "Es isch kei Websiite vorhande.",
+ "message.team-websites-info": "Websiite chönd vo jedem im Team agluegt werde",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/de-DE.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "Tracking Code",
  "message.user-deleted": "Benutzer gelöscht.",
  "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}",
- "messages.no-results-found": "Keine Ergebnisse gefunden.",
- "messages.no-team-websites": "Diesem Team sind keine Websites zugeordnet.",
- "messages.no-websites-configured": "Es ist keine Webseite vorhanden.",
- "messages.team-websites-info": "Webseiten können von jedem im Team eingesehen werden.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "Keine Ergebnisse gefunden.",
+ "message.no-team-websites": "Diesem Team sind keine Websites zugeordnet.",
+ "message.no-websites-configured": "Es ist keine Webseite vorhanden.",
+ "message.team-websites-info": "Webseiten können von jedem im Team eingesehen werden.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/el-GR.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "Κωδικός παρακολούθησης",
  "message.user-deleted": "User deleted.",
  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "This team does not have any websites.",
- "messages.no-websites-configured": "Δεν έχετε ρυθμίσει κανένα ιστότοπο.",
- "messages.team-websites-info": "Websites can be viewed by anyone on the team.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "This team does not have any websites.",
+ "message.no-websites-configured": "Δεν έχετε ρυθμίσει κανένα ιστότοπο.",
+ "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/en-GB.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "Tracking code",
  "message.user-deleted": "User deleted.",
  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "This team does not have any websites.",
- "messages.no-websites-configured": "You don't have any websites configured.",
- "messages.team-websites-info": "Websites can be viewed by anyone on the team.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "This team does not have any websites.",
+ "message.no-websites-configured": "You don't have any websites configured.",
+ "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/en-US.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
  "message.user-deleted": "User deleted.",
  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "This team does not have any websites.",
- "messages.no-websites-configured": "You do not have any websites configured.",
- "messages.team-websites-info": "Websites can be viewed by anyone on the team.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "This team does not have any websites.",
+ "message.no-websites-configured": "You do not have any websites configured.",
+ "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/es-ES.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "Código de rastreo",
  "message.user-deleted": "Usuario eliminado.",
  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}",
- "messages.no-results-found": "No se encontraron resultados.",
- "messages.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
- "messages.no-websites-configured": "No tienes ningún sitio web configurado.",
- "messages.team-websites-info": "Las analíticas de tus sitios web pueden ser vistas por cualquier miembro del equipo.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No se encontraron resultados.",
+ "message.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
+ "message.no-websites-configured": "No tienes ningún sitio web configurado.",
+ "message.team-websites-info": "Las analíticas de tus sitios web pueden ser vistas por cualquier miembro del equipo.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }

lang/es-MX.json

@@ -187,9 +187,9 @@
  "message.tracking-code": "Código de rastreo",
  "message.user-deleted": "Usuario eliminado.",
  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}",
- "messages.no-results-found": "No results were found.",
- "messages.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
- "messages.no-websites-configured": "No tienes ningún sitio configurado.",
- "messages.team-websites-info": "Las analíticas de tus sitios pueden verse por cualquier miembro del equipo.",
- "new-version-available": "A new version of Umami {version} is available!"
+ "message.no-results-found": "No results were found.",
+ "message.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
+ "message.no-websites-configured": "No tienes ningún sitio configurado.",
+ "message.team-websites-info": "Las analíticas de tus sitios pueden verse por cualquier miembro del equipo.",
+ "message.new-version-available": "A new version of Umami {version} is available!"
 }