Merge branch 'master' into master

This commit is contained in:
plebeius.eth
2023-10-05 21:09:27 +02:00
committed by GitHub
3 changed files with 38 additions and 0 deletions
+10
View File
@@ -1,6 +1,16 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-2M2VYEFL7B"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-2M2VYEFL7B');
</script>
<!-- ^ Google tag (gtag.js) ^ -->
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+3
View File
@@ -23,12 +23,14 @@ import { importAll } from './components/ImageBanner';
import preloadImages from './utils/preloadImages'; import preloadImages from './utils/preloadImages';
import showNewVersionToast from './utils/showNewVersionToast'; import showNewVersionToast from './utils/showNewVersionToast';
import useError from './hooks/useError'; import useError from './hooks/useError';
import useGoogleAnalytics from './hooks/useGoogleAnalytics';
import useInfo from './hooks/useInfo'; import useInfo from './hooks/useInfo';
import useSuccess from './hooks/useSuccess'; import useSuccess from './hooks/useSuccess';
import packageJson from '../package.json'; import packageJson from '../package.json';
const commitRef = process?.env?.REACT_APP_COMMIT_REF || ''; const commitRef = process?.env?.REACT_APP_COMMIT_REF || '';
export default function App() { export default function App() {
const { const {
bodyStyle, bodyStyle,
setBodyStyle, setBodyStyle,
@@ -44,6 +46,7 @@ export default function App() {
const location = useLocation(); const location = useLocation();
const isElectron = window.electron && window.electron.isElectron; const isElectron = window.electron && window.electron.isElectron;
useGoogleAnalytics();
useEffect(() => { useEffect(() => {
if (location.state?.scrollToTop) { if (location.state?.scrollToTop) {
+25
View File
@@ -0,0 +1,25 @@
import { useEffect } from 'react';
import { useLocation } from 'react-router-dom';
const GA_MEASUREMENT_ID = "G-2M2VYEFL7B";
const useGoogleAnalytics = () => {
const location = useLocation();
useEffect(() => {
if (typeof window.gtag === 'function') {
const fullPath = location.pathname + location.search + location.hash;
window.gtag('config', GA_MEASUREMENT_ID, {
'page_path': fullPath,
});
window.gtag('event', 'page_view', {
'page_path': fullPath,
'page_location': window.location.href.replace('/#', '')
});
}
}, [location]);
};
export default useGoogleAnalytics;