From 81f6ecb128acf289e0b6155b51b89a27d55e3858 Mon Sep 17 00:00:00 2001
From: Meir Roth <12494197+meirroth@users.noreply.github.com>
Date: Mon, 1 Mar 2021 22:32:46 +0200
Subject: [PATCH 1/3] fix favicon paths
---
components/layout/Layout.js | 2 +-
pages/_app.js | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/components/layout/Layout.js b/components/layout/Layout.js
index 2d283d2f..b16a0717 100644
--- a/components/layout/Layout.js
+++ b/components/layout/Layout.js
@@ -8,7 +8,7 @@ export default function Layout({ title, children, header = true, footer = true }
<>
umami{title && ` - ${title}`}
-
+
-
-
-
-
-
+
+
+
+
+
From 3087fa5dc03ba49fb5237b14fad0139d2416c9c7 Mon Sep 17 00:00:00 2001
From: Meir Roth <12494197+meirroth@users.noreply.github.com>
Date: Fri, 5 Mar 2021 00:20:53 +0000
Subject: [PATCH 2/3] Added basePath
---
components/layout/Layout.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/components/layout/Layout.js b/components/layout/Layout.js
index b16a0717..18a8fc20 100644
--- a/components/layout/Layout.js
+++ b/components/layout/Layout.js
@@ -1,14 +1,17 @@
import React from 'react';
import Head from 'next/head';
+import { useRouter } from 'next/router';
import Header from 'components/layout/Header';
import Footer from 'components/layout/Footer';
export default function Layout({ title, children, header = true, footer = true }) {
+ const { basePath } = useRouter();
+
return (
<>
umami{title && ` - ${title}`}
-
+
Date: Fri, 5 Mar 2021 00:23:47 +0000
Subject: [PATCH 3/3] Added basePath
---
pages/_app.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/pages/_app.js b/pages/_app.js
index 8206992d..0cf7011b 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -1,5 +1,6 @@
import React from 'react';
import Head from 'next/head';
+import { useRouter } from 'next/router';
import { IntlProvider } from 'react-intl';
import { Provider } from 'react-redux';
import { useStore } from 'redux/store';
@@ -25,15 +26,16 @@ const Intl = ({ children }) => {
export default function App({ Component, pageProps }) {
useForceSSL(process.env.FORCE_SSL);
const store = useStore();
+ const { basePath } = useRouter();
return (
-
-
-
-
-
+
+
+
+
+