Commit 721895f5 authored by tom's avatar tom

simple integration

parent 0f0b0b2b
...@@ -89,6 +89,10 @@ function makePolicyMap() { ...@@ -89,6 +89,10 @@ function makePolicyMap() {
// github (spec for api-docs page) // github (spec for api-docs page)
'raw.githubusercontent.com', 'raw.githubusercontent.com',
// google analytics
'https://www.googletagmanager.com',
'https://www.google-analytics.com',
], ],
'script-src': [ 'script-src': [
...@@ -114,6 +118,11 @@ function makePolicyMap() { ...@@ -114,6 +118,11 @@ function makePolicyMap() {
'https://www.gstatic.com', 'https://www.gstatic.com',
'https://translate.google.com', 'https://translate.google.com',
'\'sha256-FDyPg8CqqIpPAfGVKx1YeKduyLs0ghNYWII21wL+7HM=\'', '\'sha256-FDyPg8CqqIpPAfGVKx1YeKduyLs0ghNYWII21wL+7HM=\'',
// google analytics
'\'sha256-NTmEg2dBnojQfTYrYJEmp3nG7V66756qPbQMCIBrctk=\'',
'https://www.googletagmanager.com',
'https://www.google-analytics.com',
], ],
'style-src': [ 'style-src': [
...@@ -168,6 +177,9 @@ function makePolicyMap() { ...@@ -168,6 +177,9 @@ function makePolicyMap() {
// reCAPTCHA from google // reCAPTCHA from google
'https://translate.google.com', 'https://translate.google.com',
'https://www.gstatic.com', 'https://www.gstatic.com',
// google analytics
'https://www.google-analytics.com',
], ],
'font-src': [ 'font-src': [
......
...@@ -2,6 +2,7 @@ import * as Sentry from '@sentry/react'; ...@@ -2,6 +2,7 @@ import * as Sentry from '@sentry/react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
import type { AppProps } from 'next/app'; import type { AppProps } from 'next/app';
import Script from 'next/script';
import React, { useState } from 'react'; import React, { useState } from 'react';
import appConfig from 'configs/app/config'; import appConfig from 'configs/app/config';
...@@ -58,20 +59,32 @@ function MyApp({ Component, pageProps }: AppProps) { ...@@ -58,20 +59,32 @@ function MyApp({ Component, pageProps }: AppProps) {
}, []); }, []);
return ( return (
<Chakra theme={ theme } cookies={ pageProps.cookies }> <>
<ErrorBoundary renderErrorScreen={ renderErrorScreen } onError={ handleError }> <Chakra theme={ theme } cookies={ pageProps.cookies }>
<AppContextProvider pageProps={ pageProps }> <ErrorBoundary renderErrorScreen={ renderErrorScreen } onError={ handleError }>
<QueryClientProvider client={ queryClient }> <AppContextProvider pageProps={ pageProps }>
<ScrollDirectionProvider> <QueryClientProvider client={ queryClient }>
<SocketProvider url={ `${ appConfig.api.socket }${ appConfig.api.basePath }/socket/v2` }> <ScrollDirectionProvider>
<Component { ...pageProps }/> <SocketProvider url={ `${ appConfig.api.socket }${ appConfig.api.basePath }/socket/v2` }>
</SocketProvider> <Component { ...pageProps }/>
</ScrollDirectionProvider> </SocketProvider>
<ReactQueryDevtools/> </ScrollDirectionProvider>
</QueryClientProvider> <ReactQueryDevtools/>
</AppContextProvider> </QueryClientProvider>
</ErrorBoundary> </AppContextProvider>
</Chakra> </ErrorBoundary>
</Chakra>
{ /* <!-- Google tag (gtag.js) --> */ }
<Script src="https://www.googletagmanager.com/gtag/js?id=UA-125140709-1"/>
<Script id="google-analytics">
{ `
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-125140709-1');
` }
</Script>
</>
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment