Merge pull request umami-software#431 from mikecao/dev

v1.11.0
jnaklaas · Jan 14, 2021 · 0b8336f · 0b8336f
2 parents 1bb46f1 + 23d4d13
commit 0b8336f
Show file tree

Hide file tree

Showing 9 changed files with 501 additions and 340 deletions.
diff --git a/components/forms/ShareUrlForm.js b/components/forms/ShareUrlForm.js
@@ -1,11 +1,13 @@
 import React, { useRef } from 'react';
 import { FormattedMessage } from 'react-intl';
+import { useRouter } from 'next/router';
 import Button from 'components/common/Button';
 import FormLayout, { FormButtons, FormRow } from 'components/layout/FormLayout';
 import CopyButton from 'components/common/CopyButton';
 
 export default function TrackingCodeForm({ values, onClose }) {
   const ref = useRef();
+  const { basePath } = useRouter();
   const { name, share_id } = values;
 
   return (
@@ -23,7 +25,9 @@ export default function TrackingCodeForm({ values, onClose }) {
           rows={3}
           cols={60}
           spellCheck={false}
-          defaultValue={`${document.location.origin}/share/${share_id}/${encodeURIComponent(name)}`}
+          defaultValue={`${
+            document.location.origin
+          }${basePath}/share/${share_id}/${encodeURIComponent(name)}`}
           readOnly
         />
       </FormRow>

diff --git a/components/forms/TrackingCodeForm.js b/components/forms/TrackingCodeForm.js
@@ -1,11 +1,13 @@
 import React, { useRef } from 'react';
 import { FormattedMessage } from 'react-intl';
+import { useRouter } from 'next/router';
 import Button from 'components/common/Button';
 import FormLayout, { FormButtons, FormRow } from 'components/layout/FormLayout';
 import CopyButton from 'components/common/CopyButton';
 
 export default function TrackingCodeForm({ values, onClose }) {
   const ref = useRef();
+  const { basePath } = useRouter();
 
   return (
     <FormLayout>
@@ -22,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}/umami.js"></script>`}
+          defaultValue={`<script async defer data-website-id="${values.website_uuid}" src="${document.location.origin}${basePath}/umami.js"></script>`}
           readOnly
         />
       </FormRow>

diff --git a/components/layout/Header.js b/components/layout/Header.js
@@ -18,13 +18,13 @@ export default function Header() {
     <header className="container">
       {user?.is_admin && <UpdateNotice />}
       <div className={classNames(styles.header, 'row align-items-center')}>
-        <div className="col-12 col-md-12 col-lg-3">
+        <div className="col-6 col-lg-3 order-1 order-lg-1">
           <div className={styles.title}>
             <Icon icon={<Logo />} size="large" className={styles.logo} />
             <Link href={user ? '/' : 'https://umami.is'}>umami</Link>
           </div>
         </div>
-        <div className="col-12 col-md-12 col-lg-6">
+        <div className="col-12 col-lg-6 order-3 order-lg-2">
           {user && (
             <div className={styles.nav}>
               <Link href="/dashboard">
@@ -39,7 +39,7 @@ export default function Header() {
             </div>
           )}
         </div>
-        <div className="col-12 col-md-12 col-lg-3">
+        <div className="col-6 col-lg-3 order-2 order-lg-3">
           <div className={styles.buttons}>
             <ThemeButton />
             <LanguageButton menuAlign="right" />

diff --git a/components/layout/Header.module.css b/components/layout/Header.module.css
@@ -33,17 +33,15 @@
 }
 
 @media only screen and (max-width: 992px) {
-  .title {
-    justify-content: center;
-  }
-
   .nav {
     font-size: var(--font-size-large);
     justify-content: center;
     padding: 20px 0;
   }
+}
 
-  .buttons {
-    justify-content: center;
+@media only screen and (max-width: 576px) {
+  .header {
+    padding: 0 15px;
   }
 }
diff --git a/components/layout/Layout.js b/components/layout/Layout.js
@@ -8,7 +8,7 @@ export default function Layout({ title, children, header = true, footer = true }
     <>
       <Head>
         <title>umami{title && ` - ${title}`}</title>
-        <link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="favicon.ico" />
         <link
           href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;600&display=swap"
           rel="stylesheet"

diff --git a/hooks/useShareToken.js b/hooks/useShareToken.js
@@ -1,14 +1,16 @@
 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';
 
 export default function useShareToken(shareId) {
+  const { basePath } = useRouter();
   const dispatch = useDispatch();
   const shareToken = useSelector(state => state.app.shareToken);
 
   async function loadToken(id) {
-    const { data } = await get(`/api/share/${id}`);
+    const { data } = await get(`${basePath}/api/share/${id}`);
 
     if (data) {
       dispatch(setShareToken(data));

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "A simple, fast, website analytics alternative to Google Analytics. ",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",
@@ -13,7 +13,7 @@
     "dev": "next dev",
     "build": "npm-run-all build-tracker build-lang build-geo build-db build-app",
     "start": "next start",
-    "start-env": "node scripts/start-env.js",
+    "start-env": "node -r dotenv/config scripts/start-env.js",
     "build-app": "next build",
     "build-tracker": "rollup -c rollup.tracker.config.js",
     "build-db": "npm-run-all copy-db-schema build-db-client",
@@ -56,7 +56,7 @@
     }
   },
   "dependencies": {
-    "@prisma/client": "2.12.1",
+    "@prisma/client": "2.14.0",
     "@reduxjs/toolkit": "^1.5.0",
     "bcrypt": "^5.0.0",
     "chalk": "^4.1.0",
@@ -68,18 +68,18 @@
     "date-fns-tz": "^1.0.12",
     "detect-browser": "^5.2.0",
     "dotenv": "^8.2.0",
-    "formik": "^2.2.5",
+    "formik": "^2.2.6",
     "immer": "^8.0.0",
     "is-localhost-ip": "^1.4.0",
     "isbot-fast": "^1.2.0",
     "jose": "2.0.3",
     "maxmind": "^4.3.1",
     "moment-timezone": "^0.5.32",
-    "next": "^10.0.3",
+    "next": "^10.0.5",
     "prompts": "2.4.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
-    "react-intl": "^5.10.6",
+    "react-intl": "^5.10.16",
     "react-redux": "^7.2.2",
     "react-simple-maps": "^2.3.0",
     "react-spring": "^8.0.27",
@@ -93,34 +93,34 @@
     "thenby": "^1.3.4",
     "timezone-support": "^2.0.2",
     "tinycolor2": "^1.4.2",
-    "uuid": "^8.3.1"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@formatjs/cli": "^2.13.15",
-    "@prisma/cli": "2.12.1",
+    "@formatjs/cli": "^2.13.16",
+    "@prisma/cli": "2.14.0",
     "@rollup/plugin-buble": "^0.21.3",
-    "@rollup/plugin-node-resolve": "^11.0.0",
+    "@rollup/plugin-node-resolve": "^11.0.1",
     "@rollup/plugin-replace": "^2.3.4",
     "@svgr/webpack": "^5.5.0",
     "cross-env": "^7.0.3",
     "del": "^6.0.0",
     "dotenv-cli": "^4.0.0",
-    "eslint": "^7.14.0",
-    "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-prettier": "^3.1.3",
-    "eslint-plugin-react": "^7.21.5",
+    "eslint": "^7.17.0",
+    "eslint-config-prettier": "^7.1.0",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "extract-react-intl-messages": "^4.1.1",
-    "husky": "^4.3.0",
-    "lint-staged": "^10.5.2",
-    "loadtest": "5.1.0",
+    "husky": "^4.3.7",
+    "lint-staged": "^10.5.3",
+    "loadtest": "5.1.2",
     "npm-run-all": "^4.1.5",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^13.0.0",
     "postcss-preset-env": "^6.7.0",
     "prettier": "^2.2.1",
     "prettier-eslint": "^12.0.0",
-    "rollup": "^2.34.0",
+    "rollup": "^2.36.1",
     "rollup-plugin-hashbang": "^2.2.2",
     "rollup-plugin-terser": "^7.0.2",
     "stylelint": "^13.8.0",

diff --git a/pages/_app.js b/pages/_app.js
@@ -29,11 +29,11 @@ export default function App({ Component, pageProps }) {
   return (
     <Provider store={store}>
       <Head>
-        <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-        <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-        <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-        <link rel="manifest" href="/site.webmanifest" />
-        <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
+        <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png" />
+        <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png" />
+        <link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png" />
+        <link rel="manifest" href="site.webmanifest" />
+        <link rel="mask-icon" href="safari-pinned-tab.svg" color="#5bbad5" />
         <meta name="msapplication-TileColor" content="#da532c" />
         <meta name="theme-color" content="#ffffff" />
       </Head>