uetchy/namae
1
0
Fork 0
mirror of https://github.com/uetchy/namae.git synced 2025-03-16 20:20:38 +09:00
Code Issues Releases Activity

chore: omit ga

Browse Source
This commit is contained in:
uetchy 2021-10-07 19:03:51 +09:00
parent 248359bb09
commit ad58f4f567
7 changed files with 101 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -10,7 +10,7 @@
"test": "jest --coverage && CI=true react-scripts test --coverage" "test": "jest --coverage && CI=true react-scripts test --coverage"
}, },
"dependencies": { "dependencies": {
"@sentry/browser": "^6.13.2", "@sentry/browser": "^6.13.3",
"cross-fetch": "^3.1.4", "cross-fetch": "^3.1.4",
"easy-peasy": "^5.0.3", "easy-peasy": "^5.0.3",
"fetch-suspense": "^1.2.2", "fetch-suspense": "^1.2.2",
@ -25,7 +25,6 @@
"rc-tooltip": "^5.1.1", "rc-tooltip": "^5.1.1",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-ga": "^3.3.0",
"react-helmet": "^6.0.0", "react-helmet": "^6.0.0",
"react-i18next": "11.12.0", "react-i18next": "11.12.0",
"react-icons": "^4.3.1", "react-icons": "^4.3.1",
@ -49,7 +48,7 @@
"@types/node": "^16.10.3", "@types/node": "^16.10.3",
"@types/react-dom": "^17.0.9", "@types/react-dom": "^17.0.9",
"@types/react-helmet": "^6.1.3", "@types/react-helmet": "^6.1.3",
"@types/react-router-dom": "^5.3.0", "@types/react-router-dom": "^5.3.1",
"@types/styled-components": "^5.1.14", "@types/styled-components": "^5.1.14",
"@types/validator": "^13.6.3", "@types/validator": "^13.6.3",
"@vercel/build-utils": "^2.12.2", "@vercel/build-utils": "^2.12.2",

6
public/index.html
View File

@ -54,6 +54,12 @@
href="https://fonts.googleapis.com/css?family=Montserrat:600&display=swap" href="https://fonts.googleapis.com/css?family=Montserrat:600&display=swap"
rel="stylesheet" rel="stylesheet"
/> />
<script
async
defer
data-website-id="a0bfb495-787b-4960-938d-c4a190aa7455"
src="https://analytics.uechi.io/umami.js"
></script>
<title>namae</title> <title>namae</title>
</head> </head>
<body> <body>

65
src/components/Footer.tsx
View File

@ -1,5 +1,4 @@
import React from 'react'; import React from 'react';
import { OutboundLink } from 'react-ga';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { FaGithub, FaProductHunt, FaTwitter } from 'react-icons/fa'; import { FaGithub, FaProductHunt, FaTwitter } from 'react-icons/fa';
import { GoHeart } from 'react-icons/go'; import { GoHeart } from 'react-icons/go';
@ -57,34 +56,34 @@ const Community = () => {
<Title>{t('community')}</Title> <Title>{t('community')}</Title>
<ul> <ul>
<li> <li>
<OutboundLink <a
to="https://github.com/uetchy/namae" href="https://github.com/uetchy/namae"
eventLabel="GitHub Repo"
aria-label="Go to GitHub repository" aria-label="Go to GitHub repository"
target="_blank" target="_blank"
rel="noreferrer"
> >
GitHub GitHub
</OutboundLink> </a>
</li> </li>
<li> <li>
<OutboundLink <a
to="https://github.com/uetchy/namae/issues" href="https://github.com/uetchy/namae/issues"
eventLabel="GitHub Issues"
aria-label="Go to GitHub Issues" aria-label="Go to GitHub Issues"
target="_blank" target="_blank"
rel="noreferrer"
> >
{t('issues')} {t('issues')}
</OutboundLink> </a>
</li> </li>
<li> <li>
<OutboundLink <a
to="https://dev.to/uetchy/give-your-app-slick-name-with-namae-dev-5c4h" href="https://dev.to/uetchy/give-your-app-slick-name-with-namae-dev-5c4h"
eventLabel="Blog article"
aria-label="Go to blog" aria-label="Go to blog"
target="_blank" target="_blank"
rel="noreferrer"
> >
{t('blog')} {t('blog')}
</OutboundLink> </a>
</li> </li>
</ul> </ul>
<Box> <Box>
@ -110,54 +109,54 @@ const About = () => {
☕️ ☕️
</span>{' '} </span>{' '}
by{' '} by{' '}
<OutboundLink <a
to="https://twitter.com/uechz" href="https://twitter.com/uechz"
eventLabel="Author Page"
aria-label="Author page" aria-label="Author page"
target="_blank" target="_blank"
rel="noreferrer"
> >
<Bold>Yasuaki Uechi</Bold> <Bold>Yasuaki Uechi</Bold>
</OutboundLink> </a>
</p> </p>
<ShareBox> <ShareBox>
<Links> <Links>
<OutboundLink <a
to={`https://twitter.com/intent/tweet?text=${encodeURIComponent( href={`https://twitter.com/intent/tweet?text=${encodeURIComponent(
`namae — ${t('title')}` `namae — ${t('title')}`
)}&url=${encodeURIComponent('https://namae.dev')}`} )}&url=${encodeURIComponent('https://namae.dev')}`}
eventLabel="Tweet"
aria-label="Tweet this page" aria-label="Tweet this page"
target="_blank" target="_blank"
rel="noreferrer"
> >
<FaTwitter /> <FaTwitter />
</OutboundLink> </a>
<OutboundLink <a
to="https://www.producthunt.com/posts/namae" href="https://www.producthunt.com/posts/namae"
eventLabel="ProductHunt"
aria-label="Go to ProductHunt page" aria-label="Go to ProductHunt page"
target="_blank" target="_blank"
rel="noreferrer"
> >
<FaProductHunt /> <FaProductHunt />
</OutboundLink> </a>
<OutboundLink <a
to="https://github.com/uetchy/namae" href="https://github.com/uetchy/namae"
eventLabel="GitHub Repo"
aria-label="Go to GitHub repository" aria-label="Go to GitHub repository"
target="_blank" target="_blank"
rel="noreferrer"
> >
<FaGithub /> <FaGithub />
</OutboundLink> </a>
<OutboundLink <a
to="https://github.com/sponsors/uetchy" href="https://github.com/sponsors/uetchy"
eventLabel="GitHub Sponsors"
aria-label="Go to GitHub Sponsors" aria-label="Go to GitHub Sponsors"
target="_blank" target="_blank"
rel="noreferrer"
> >
<SponsorBadge> <SponsorBadge>
<GoHeart size="1.3em" /> <GoHeart size="1.3em" />
<span>Sponsor</span> <span>Sponsor</span>
</SponsorBadge> </SponsorBadge>
</OutboundLink> </a>
</Links> </Links>
</ShareBox> </ShareBox>

9
src/components/cards/core.tsx
View File

@ -1,7 +1,6 @@
import useFetch from 'fetch-suspense'; import useFetch from 'fetch-suspense';
import Tooltip from 'rc-tooltip'; import Tooltip from 'rc-tooltip';
import React, { Suspense, useEffect, useState } from 'react'; import React, { Suspense, useEffect, useState } from 'react';
import { OutboundLink } from 'react-ga';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { GoInfo } from 'react-icons/go'; import { GoInfo } from 'react-icons/go';
import { IoIosFlash } from 'react-icons/io'; import { IoIosFlash } from 'react-icons/io';
@ -216,13 +215,9 @@ export const Result: React.FC<{
<ResultIcon>{icon}</ResultIcon> <ResultIcon>{icon}</ResultIcon>
<ResultName> <ResultName>
{link ? ( {link ? (
<OutboundLink <a href={link} target="_blank" rel="noreferrer">
to={link}
eventLabel={link.split('/')[2]}
target="_blank"
>
{content} {content}
</OutboundLink> </a>
) : ( ) : (
content content
)} )}

8
src/index.tsx
View File

@ -9,7 +9,7 @@ import 'react-toastify/dist/ReactToastify.css';
import App from './App'; import App from './App';
import * as serviceWorker from './serviceWorker'; import * as serviceWorker from './serviceWorker';
import { store, wrapHistoryWithStoreHandler } from './store'; import { store, wrapHistoryWithStoreHandler } from './store';
import { initSentry, wrapHistoryWithGA } from './util/analytics'; import { initSentry } from './util/analytics';
import { compose } from './util/array'; import { compose } from './util/array';
import { initCrisp } from './util/crisp'; import { initCrisp } from './util/crisp';
import './util/i18n'; import './util/i18n';
@ -18,11 +18,7 @@ import { FullScreenSuspense } from './util/suspense';
initSentry(); initSentry();
initCrisp(); initCrisp();
const history = compose( const history = compose(createBrowserHistory(), wrapHistoryWithStoreHandler);
createBrowserHistory(),
wrapHistoryWithStoreHandler,
wrapHistoryWithGA
);
ReactDOM.render( ReactDOM.render(
<StoreProvider store={store}> <StoreProvider store={store}>

47
src/util/analytics.ts
View File

@ -1,59 +1,46 @@
import ReactGA from 'react-ga';
import * as Sentry from '@sentry/browser'; import * as Sentry from '@sentry/browser';
import { History } from 'history';
const isProduction = process.env.NODE_ENV !== 'development'; const isProduction = process.env.NODE_ENV !== 'development';
export function wrapHistoryWithGA(history: History) { declare namespace umami {
if (isProduction) { var trackEvent: (
ReactGA.initialize('UA-28919359-15'); value: string,
ReactGA.pageview(window.location.pathname + window.location.search); type: string,
history.listen((location) => { url?: string,
ReactGA.pageview(location.pathname + location.search); websiteId?: string
}); ) => void;
}
return history;
} }
export function trackEvent({ export function trackEvent({
category, value,
action, type = 'custom',
label = undefined,
value = undefined,
}: { }: {
category: string; value: string;
action: string; type?: string;
label?: string;
value?: number;
}) { }) {
if (isProduction) { if (isProduction) {
ReactGA.event({ umami.trackEvent(value, type);
category,
action,
label,
value,
});
} }
} }
export function sendQueryEvent(query: string): void { export function sendQueryEvent(query: string): void {
trackEvent({ category: 'Search', action: 'Invoke New Search', label: query }); trackEvent({ value: 'Invoke new search', type: 'search' });
} }
export function sendGettingStartedEvent(): void { export function sendGettingStartedEvent(): void {
trackEvent({ category: 'Search', action: 'Getting Started' }); trackEvent({ value: 'Click getting started button', type: 'search' });
} }
export function sendExpandEvent(): void { export function sendExpandEvent(): void {
trackEvent({ category: 'Result', action: 'Expand Card' }); trackEvent({ value: 'Expand card', type: 'search' });
} }
export function sendAcceptSuggestionEvent(): void { export function sendAcceptSuggestionEvent(): void {
trackEvent({ category: 'Suggestion', action: 'Accept' }); trackEvent({ value: 'Accept suggestion', type: 'suggest' });
} }
export function sendShuffleSuggestionEvent(): void { export function sendShuffleSuggestionEvent(): void {
trackEvent({ category: 'Suggestion', action: 'Shuffle' }); trackEvent({ value: 'Shuffle suggestion', type: 'suggest' });
} }
export function initSentry(): void { export function initSentry(): void {

85
yarn.lock
View File

@ -1633,14 +1633,14 @@
estree-walker "^1.0.1" estree-walker "^1.0.1"
picomatch "^2.2.2" picomatch "^2.2.2"
"@sentry/browser@^6.13.2": "@sentry/browser@^6.13.3":
version "6.13.2" version "6.13.3"
resolved "https://registry.npmjs.org/@sentry/browser/-/browser-6.13.2.tgz#8b731ecf8c3cdd92a4b6893a26f975fd5844056d" resolved "https://registry.npmjs.org/@sentry/browser/-/browser-6.13.3.tgz#d4511791b1e484ad48785eba3bce291fdf115c1e"
integrity sha512-bkFXK4vAp2UX/4rQY0pj2Iky55Gnwr79CtveoeeMshoLy5iDgZ8gvnLNAz7om4B9OQk1u7NzLEa4IXAmHTUyag== integrity sha512-jwlpsk2/u1cofvfYsjmqcnx50JJtf/T6HTgdW+ih8+rqWC5ABEZf4IiB/H+KAyjJ3wVzCOugMq5irL83XDCfqQ==
dependencies: dependencies:
"@sentry/core" "6.13.2" "@sentry/core" "6.13.3"
"@sentry/types" "6.13.2" "@sentry/types" "6.13.3"
"@sentry/utils" "6.13.2" "@sentry/utils" "6.13.3"
tslib "^1.9.3" tslib "^1.9.3"
"@sentry/cli@^1.69.1": "@sentry/cli@^1.69.1":
@ -1655,46 +1655,46 @@
progress "^2.0.3" progress "^2.0.3"
proxy-from-env "^1.1.0" proxy-from-env "^1.1.0"
"@sentry/core@6.13.2": "@sentry/core@6.13.3":
version "6.13.2" version "6.13.3"
resolved "https://registry.npmjs.org/@sentry/core/-/core-6.13.2.tgz#2ce164f81667aa89cd116f807d772b4718434583" resolved "https://registry.npmjs.org/@sentry/core/-/core-6.13.3.tgz#5cbbb995128e793ebebcbf1d3b7514e0e5e8b221"
integrity sha512-snXNNFLwlS7yYxKTX4DBXebvJK+6ikBWN6noQ1CHowvM3ReFBlrdrs0Z0SsSFEzXm2S4q7f6HHbm66GSQZ/8FQ== integrity sha512-obm3SjgCk8A7nB37b2AU1eq1q7gMoJRrGMv9VRIyfcG0Wlz/5lJ9O3ohUk+YZaaVfZMxXn6hFtsBiOWmlv7IIA==
dependencies: dependencies:
"@sentry/hub" "6.13.2" "@sentry/hub" "6.13.3"
"@sentry/minimal" "6.13.2" "@sentry/minimal" "6.13.3"
"@sentry/types" "6.13.2" "@sentry/types" "6.13.3"
"@sentry/utils" "6.13.2" "@sentry/utils" "6.13.3"
tslib "^1.9.3" tslib "^1.9.3"
"@sentry/hub@6.13.2": "@sentry/hub@6.13.3":
version "6.13.2" version "6.13.3"
resolved "https://registry.npmjs.org/@sentry/hub/-/hub-6.13.2.tgz#ebc66fd55c96c7686a53ffd3521b6a63f883bb79" resolved "https://registry.npmjs.org/@sentry/hub/-/hub-6.13.3.tgz#cc09623a69b5343315fdb61c7fdd0be74b72299f"
integrity sha512-sppSuJdNMiMC/vFm/dQowCBh11uTrmvks00fc190YWgxHshodJwXMdpc+pN61VSOmy2QA4MbQ5aMAgHzPzel3A== integrity sha512-eYppBVqvhs5cvm33snW2sxfcw6G20/74RbBn+E4WDo15hozis89kU7ZCJDOPkXuag3v1h9igns/kM6PNBb41dw==
dependencies: dependencies:
"@sentry/types" "6.13.2" "@sentry/types" "6.13.3"
"@sentry/utils" "6.13.2" "@sentry/utils" "6.13.3"
tslib "^1.9.3" tslib "^1.9.3"
"@sentry/minimal@6.13.2": "@sentry/minimal@6.13.3":
version "6.13.2" version "6.13.3"
resolved "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.13.2.tgz#de3ecc62b9463bf56ccdbcf4c75f7ea1aeeebc11" resolved "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.13.3.tgz#a675a79bcc830142e4f95e6198a2efde2cd3901e"
integrity sha512-6iJfEvHzzpGBHDfLxSHcGObh73XU1OSQKWjuhDOe7UQDyI4BQmTfcXAC+Fr8sm8C/tIsmpVi/XJhs8cubFdSMw== integrity sha512-63MlYYRni3fs5Bh8XBAfVZ+ctDdWg0fapSTP1ydIC37fKvbE+5zhyUqwrEKBIiclEApg1VKX7bkKxVdu/vsFdw==
dependencies: dependencies:
"@sentry/hub" "6.13.2" "@sentry/hub" "6.13.3"
"@sentry/types" "6.13.2" "@sentry/types" "6.13.3"
tslib "^1.9.3" tslib "^1.9.3"
"@sentry/types@6.13.2": "@sentry/types@6.13.3":
version "6.13.2" version "6.13.3"
resolved "https://registry.npmjs.org/@sentry/types/-/types-6.13.2.tgz#8388d5b92ea8608936e7aae842801dc90e0184e6" resolved "https://registry.npmjs.org/@sentry/types/-/types-6.13.3.tgz#63ad5b6735b0dfd90b3a256a9f8e77b93f0f66b2"
integrity sha512-6WjGj/VjjN8LZDtqJH5ikeB1o39rO1gYS6anBxiS3d0sXNBb3Ux0pNNDFoBxQpOhmdDHXYS57MEptX9EV82gmg== integrity sha512-Vrz5CdhaTRSvCQjSyIFIaV9PodjAVFkzJkTRxyY7P77RcegMsRSsG1yzlvCtA99zG9+e6MfoJOgbOCwuZids5A==
"@sentry/utils@6.13.2": "@sentry/utils@6.13.3":
version "6.13.2" version "6.13.3"
resolved "https://registry.npmjs.org/@sentry/utils/-/utils-6.13.2.tgz#fb8010e7b67cc8c084d8067d64ef25289269cda5" resolved "https://registry.npmjs.org/@sentry/utils/-/utils-6.13.3.tgz#188754d40afe693c3fcae410f9322531588a9926"
integrity sha512-foF4PbxqPMWNbuqdXkdoOmKm3quu3PP7Q7j/0pXkri4DtCuvF/lKY92mbY0V9rHS/phCoj+3/Se5JvM2ymh2/w== integrity sha512-zYFuFH3MaYtBZTeJ4Yajg7pDf0pM3MWs3+9k5my9Fd+eqNcl7dYQYJbT9gyC0HXK1QI4CAMNNlHNl4YXhF91ag==
dependencies: dependencies:
"@sentry/types" "6.13.2" "@sentry/types" "6.13.3"
tslib "^1.9.3" tslib "^1.9.3"
"@sindresorhus/is@^2.0.0": "@sindresorhus/is@^2.0.0":
@ -2098,10 +2098,10 @@
dependencies: dependencies:
"@types/react" "*" "@types/react" "*"
"@types/react-router-dom@^5.3.0": "@types/react-router-dom@^5.3.1":
version "5.3.0" version "5.3.1"
resolved "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.0.tgz#8c4e0aa0ccaf638ba965829ad29a10ac3cbe2212" resolved "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.1.tgz#76700ccce6529413ec723024b71f01fc77a4a980"
integrity sha512-svUzpEpKDwK8nmfV2vpZNSsiijFNKY8+gUqGqvGGOVrXvX58k1JIJubZa5igkwacbq/0umphO5SsQn/BQsnKpw== integrity sha512-UvyRy73318QI83haXlaMwmklHHzV9hjl3u71MmM6wYNu0hOVk9NLTa0vGukf8zXUqnwz4O06ig876YSPpeK28A==
dependencies: dependencies:
"@types/history" "*" "@types/history" "*"
"@types/react" "*" "@types/react" "*"
@ -10410,11 +10410,6 @@ react-fast-compare@^3.1.1:
resolved "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" resolved "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
react-ga@^3.3.0:
version "3.3.0"
resolved "https://registry.npmjs.org/react-ga/-/react-ga-3.3.0.tgz#c91f407198adcb3b49e2bc5c12b3fe460039b3ca"
integrity sha512-o8RScHj6Lb8cwy3GMrVH6NJvL+y0zpJvKtc0+wmH7Bt23rszJmnqEQxRbyrqUzk9DTJIHoP42bfO5rswC9SWBQ==
react-helmet@^6.0.0: react-helmet@^6.0.0:
version "6.1.0" version "6.1.0"
resolved "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" resolved "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726"