add google analytics code.

This commit is contained in:
Yoshihiro OKUMURA 2022-05-12 13:36:54 +09:00
parent 81de5e7154
commit b5f97cb80d
9 changed files with 89 additions and 181 deletions

View File

@ -17,6 +17,7 @@
"react": "^18.1.0", "react": "^18.1.0",
"react-app-polyfill": "^3.0.0", "react-app-polyfill": "^3.0.0",
"react-dom": "^18.1.0", "react-dom": "^18.1.0",
"react-ga4": "^1.4.1",
"react-helmet-async": "^1.3.0", "react-helmet-async": "^1.3.0",
"react-nl2br": "^1.0.4", "react-nl2br": "^1.0.4",
"react-redux": "^8.0.1", "react-redux": "^8.0.1",
@ -24,7 +25,8 @@
"react-scripts": "^5.0.1", "react-scripts": "^5.0.1",
"redux": "^4.2.0", "redux": "^4.2.0",
"three": "^0.140.2", "three": "^0.140.2",
"typescript": "^4.6.4" "typescript": "^4.6.4",
"web-vitals": "^2.1.4"
}, },
"resolutions": { "resolutions": {
"@svgr/webpack": "^6.2.1" "@svgr/webpack": "^6.2.1"

View File

@ -1,15 +1,15 @@
import { render } from "@testing-library/react"; import { render, screen } from "@testing-library/react";
import React from "react"; import React from "react";
import { Provider } from "react-redux"; import { Provider } from "react-redux";
import App from "./App"; import App from "./App";
import { store } from "./app/store"; import { store } from "./app/store";
test("renders learn react link", () => { test("renders learn react link", () => {
const { getByText } = render( render(
<Provider store={store}> <Provider store={store}>
<App /> <App />
</Provider> </Provider>
); );
const linkElement = screen.getByText(/learn react/i);
expect(getByText(/learn/i)).toBeInTheDocument(); expect(linkElement).toBeInTheDocument();
}); });

View File

@ -1,5 +1,6 @@
import React from "react"; import React from "react";
import { BrowserRouter, NavLink, Route, Routes } from "react-router-dom"; import ReactGA from "react-ga4";
import { BrowserRouter, NavLink, Route, Routes, useLocation } from "react-router-dom";
import styles from "./App.module.css"; import styles from "./App.module.css";
import CompatRedirect from "./features/compat-redirect/CompatRedirect"; import CompatRedirect from "./features/compat-redirect/CompatRedirect";
import Contact from "./features/contact/Contact"; import Contact from "./features/contact/Contact";
@ -9,9 +10,14 @@ import News from "./features/news/News";
import PageTitle from "./features/page-title/PageTitle"; import PageTitle from "./features/page-title/PageTitle";
import Search from "./features/search/Search"; import Search from "./features/search/Search";
const App: React.FC = () => { const AppMain: React.FC = () => {
const location = useLocation();
React.useEffect(() => {
ReactGA.send("pageview");
}, [location]);
return ( return (
<BrowserRouter>
<div className={styles.container}> <div className={styles.container}>
<div className={styles.header}> <div className={styles.header}>
<ul> <ul>
@ -42,6 +48,14 @@ const App: React.FC = () => {
</div> </div>
<div className={styles.footer}>&copy;2014 Laboratory for cortical circuit plasticity, RIKEN BSI.</div> <div className={styles.footer}>&copy;2014 Laboratory for cortical circuit plasticity, RIKEN BSI.</div>
</div> </div>
);
};
const App: React.FC = () => {
ReactGA.initialize("G-T4L3SDCN6P");
return (
<BrowserRouter>
<AppMain />
</BrowserRouter> </BrowserRouter>
); );
}; };

View File

@ -1,26 +1,26 @@
import React from "react"; import React from "react";
import "react-app-polyfill/ie11"; import "react-app-polyfill/ie11";
import "react-app-polyfill/stable"; import "react-app-polyfill/stable";
import ReactDOM from "react-dom"; import ReactDOM from "react-dom/client";
import { HelmetProvider } from "react-helmet-async"; import { HelmetProvider } from "react-helmet-async";
import { Provider } from "react-redux"; import { Provider } from "react-redux";
import App from "./App"; import App from "./App";
import { store } from "./app/store"; import { store } from "./app/store";
import "./index.css"; import "./index.css";
// import * as serviceWorker from "./serviceWorker"; import reportWebVitals from "./reportWebVitals";
ReactDOM.render( const root = ReactDOM.createRoot(document.getElementById("root") as HTMLElement);
root.render(
<React.StrictMode> <React.StrictMode>
<Provider store={store}> <Provider store={store}>
<HelmetProvider> <HelmetProvider>
<App /> <App />
</HelmetProvider> </HelmetProvider>
</Provider> </Provider>
</React.StrictMode>, </React.StrictMode>
document.getElementById("root")
); );
// If you want your app to work offline and load faster, you can change // If you want to start measuring performance in your app, pass a function
// unregister() to register() below. Note this comes with some pitfalls. // to log results (for example: reportWebVitals(console.log))
// Learn more about service workers: https://bit.ly/CRA-PWA // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
// serviceWorker.unregister(); reportWebVitals();

15
src/reportWebVitals.ts Normal file
View File

@ -0,0 +1,15 @@
import { ReportHandler } from 'web-vitals';
const reportWebVitals = (onPerfEntry?: ReportHandler) => {
if (onPerfEntry && onPerfEntry instanceof Function) {
import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
getCLS(onPerfEntry);
getFID(onPerfEntry);
getFCP(onPerfEntry);
getLCP(onPerfEntry);
getTTFB(onPerfEntry);
});
}
};
export default reportWebVitals;

View File

@ -1,133 +0,0 @@
// This optional code is used to register a service worker.
// register() is not called by default.
// This lets the app load faster on subsequent visits in production, and gives
// it offline capabilities. However, it also means that developers (and users)
// will only see deployed updates on subsequent visits to a page, after all the
// existing tabs open on the page have been closed, since previously cached
// resources are updated in the background.
// To learn more about the benefits of this model and instructions on how to
// opt-in, read https://bit.ly/CRA-PWA
const isLocalhost = Boolean(
window.location.hostname === "localhost" ||
// [::1] is the IPv6 localhost address.
window.location.hostname === "[::1]" ||
// 127.0.0.0/8 are considered localhost for IPv4.
window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/)
);
type Config = {
onSuccess?: (registration: ServiceWorkerRegistration) => void;
onUpdate?: (registration: ServiceWorkerRegistration) => void;
};
export function register(config?: Config) {
if (process.env.NODE_ENV === "production" && "serviceWorker" in navigator) {
// The URL constructor is available in all browsers that support SW.
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
if (publicUrl.origin !== window.location.origin) {
// Our service worker won't work if PUBLIC_URL is on a different origin
// from what our page is served on. This might happen if a CDN is used to
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
return;
}
window.addEventListener("load", () => {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
if (isLocalhost) {
// This is running on localhost. Let's check if a service worker still exists or not.
checkValidServiceWorker(swUrl, config);
// Add some additional logging to localhost, pointing developers to the
// service worker/PWA documentation.
navigator.serviceWorker.ready.then(() => {
console.log("This web app is being served cache-first by a service " + "worker. To learn more, visit https://bit.ly/CRA-PWA");
});
} else {
// Is not localhost. Just register service worker
registerValidSW(swUrl, config);
}
});
}
}
function registerValidSW(swUrl: string, config?: Config) {
navigator.serviceWorker
.register(swUrl)
.then((registration) => {
registration.onupdatefound = () => {
const installingWorker = registration.installing;
if (installingWorker == null) {
return;
}
installingWorker.onstatechange = () => {
if (installingWorker.state === "installed") {
if (navigator.serviceWorker.controller) {
// At this point, the updated precached content has been fetched,
// but the previous service worker will still serve the older
// content until all client tabs are closed.
console.log("New content is available and will be used when all " + "tabs for this page are closed. See https://bit.ly/CRA-PWA.");
// Execute callback
if (config && config.onUpdate) {
config.onUpdate(registration);
}
} else {
// At this point, everything has been precached.
// It's the perfect time to display a
// "Content is cached for offline use." message.
console.log("Content is cached for offline use.");
// Execute callback
if (config && config.onSuccess) {
config.onSuccess(registration);
}
}
}
};
};
})
.catch((error) => {
console.error("Error during service worker registration:", error);
});
}
function checkValidServiceWorker(swUrl: string, config?: Config) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl, {
headers: { "Service-Worker": "script" },
})
.then((response) => {
// Ensure service worker exists, and that we really are getting a JS file.
const contentType = response.headers.get("content-type");
if (response.status === 404 || (contentType != null && contentType.indexOf("javascript") === -1)) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then((registration) => {
registration.unregister().then(() => {
window.location.reload();
});
});
} else {
// Service worker found. Proceed as normal.
registerValidSW(swUrl, config);
}
})
.catch(() => {
console.log("No internet connection found. App is running in offline mode.");
});
}
export function unregister() {
if ("serviceWorker" in navigator) {
navigator.serviceWorker.ready
.then((registration) => {
registration.unregister();
})
.catch((error) => {
console.error(error.message);
});
}
}

View File

@ -2,4 +2,4 @@
// allows you to do things like: // allows you to do things like:
// expect(element).toHaveTextContent(/react/i) // expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom // learn more: https://github.com/testing-library/jest-dom
import "@testing-library/jest-dom/extend-expect"; import '@testing-library/jest-dom';

View File

@ -12,13 +12,13 @@
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"strict": true, "strict": true,
"forceConsistentCasingInFileNames": true, "forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"module": "esnext", "module": "esnext",
"moduleResolution": "node", "moduleResolution": "node",
"resolveJsonModule": true, "resolveJsonModule": true,
"isolatedModules": true, "isolatedModules": true,
"noEmit": true, "noEmit": true,
"jsx": "react-jsx", "jsx": "react-jsx"
"noFallthroughCasesInSwitch": true
}, },
"include": [ "include": [
"src" "src"

View File

@ -7121,6 +7121,11 @@ react-fast-compare@^3.2.0:
resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
react-ga4@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/react-ga4/-/react-ga4-1.4.1.tgz#6ee2a2db115ed235b2f2092bc746b4eeeca9e206"
integrity sha512-ioBMEIxd4ePw4YtaloTUgqhQGqz5ebDdC4slEpLgy2sLx1LuZBC9iYCwDymTXzcntw6K1dHX183ulP32nNdG7w==
react-helmet-async@^1.3.0: react-helmet-async@^1.3.0:
version "1.3.0" version "1.3.0"
resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.3.0.tgz#7bd5bf8c5c69ea9f02f6083f14ce33ef545c222e" resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.3.0.tgz#7bd5bf8c5c69ea9f02f6083f14ce33ef545c222e"
@ -8431,6 +8436,11 @@ wbuf@^1.1.0, wbuf@^1.7.3:
dependencies: dependencies:
minimalistic-assert "^1.0.0" minimalistic-assert "^1.0.0"
web-vitals@^2.1.4:
version "2.1.4"
resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-2.1.4.tgz#76563175a475a5e835264d373704f9dde718290c"
integrity sha512-sVWcwhU5mX6crfI5Vd2dC4qchyTqxV8URinzt25XqVh+bHEPGH4C3NPrNionCP7Obx59wrYEbNlw4Z8sjALzZg==
webidl-conversions@^4.0.2: webidl-conversions@^4.0.2:
version "4.0.2" version "4.0.2"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"