vmario/wisemapping-frontend
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-frontend.git synced 2024-11-14 03:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Google Analytics to GA4

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2022-05-29 10:22:57 -07:00
parent 4c6a222850
commit a9bcfce52c
10 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.snapshots.update.yml
View File

@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
e2e: e2e:
image: cypress/included:8.4.1 image: cypress/included:9.7.0
container_name: wisemapping-integration-tests container_name: wisemapping-integration-tests
entrypoint: '/bin/sh -c "yarn install && yarn bootstrap && yarn build && yarn test:integration"' entrypoint: '/bin/sh -c "yarn install && yarn bootstrap && yarn build && yarn test:integration"'
working_dir: /e2e working_dir: /e2e

2
docker-compose.snapshots.yml
View File

@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
e2e: e2e:
image: cypress/included:8.4.1 image: cypress/included:9.7.0
container_name: wisemapping-integration-tests container_name: wisemapping-integration-tests
entrypoint: '/bin/sh -c "yarn bootstrap && yarn build && yarn test:integration"' entrypoint: '/bin/sh -c "yarn bootstrap && yarn build && yarn test:integration"'
working_dir: /e2e working_dir: /e2e

2
packages/webapp/package.json
View File

@ -69,8 +69,8 @@
"dayjs": "^1.10.7", "dayjs": "^1.10.7",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-ga": "^3.3.0",
"react-google-recaptcha": "^2.1.0", "react-google-recaptcha": "^2.1.0",
"react-ga4": "^1.4.1",
"react-intl": "^3.0.0", "react-intl": "^3.0.0",
"react-query": "^3.6.0", "react-query": "^3.6.0",
"react-redux": "^7.2.2", "react-redux": "^7.2.2",

2
packages/webapp/src/app.tsx
View File

@ -14,7 +14,7 @@ import AppI18n, { Locales } from './classes/app-i18n';
import MapsPage from './components/maps-page'; import MapsPage from './components/maps-page';
import CssBaseline from '@mui/material/CssBaseline'; import CssBaseline from '@mui/material/CssBaseline';
import { ThemeProvider, Theme, StyledEngineProvider } from '@mui/material/styles'; import { ThemeProvider, Theme, StyledEngineProvider } from '@mui/material/styles';
import ReactGA from 'react-ga'; import ReactGA from 'react-ga4';
import EditorPage from './components/editor-page'; import EditorPage from './components/editor-page';
import AppConfig from './classes/app-config'; import AppConfig from './classes/app-config';
import withSessionExpirationHandling from './components/HOCs/withSessionExpirationHandling'; import withSessionExpirationHandling from './components/HOCs/withSessionExpirationHandling';

2
packages/webapp/src/components/editor-page/index.tsx
View File

@ -7,7 +7,7 @@ import { IntlProvider } from 'react-intl';
import AppI18n, { Locales } from '../../classes/app-i18n'; import AppI18n, { Locales } from '../../classes/app-i18n';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { hotkeysEnabled } from '../../redux/editorSlice'; import { hotkeysEnabled } from '../../redux/editorSlice';
import ReactGA from 'react-ga'; import ReactGA from 'react-ga4';
import Client from '../../classes/client'; import Client from '../../classes/client';
import { activeInstance, fetchAccount, fetchMapById } from '../../redux/clientSlice'; import { activeInstance, fetchAccount, fetchMapById } from '../../redux/clientSlice';
import EditorOptionsBuilder from './EditorOptionsBuilder'; import EditorOptionsBuilder from './EditorOptionsBuilder';

2
packages/webapp/src/components/forgot-password-page/index.tsx
View File

@ -12,7 +12,7 @@ import { activeInstance } from '../../redux/clientSlice';
import Input from '../form/input'; import Input from '../form/input';
import GlobalError from '../form/global-error'; import GlobalError from '../form/global-error';
import SubmitButton from '../form/submit-button'; import SubmitButton from '../form/submit-button';
import ReactGA from 'react-ga'; import ReactGA from 'react-ga4';
import Typography from '@mui/material/Typography'; import Typography from '@mui/material/Typography';
import { getCsrfToken, getCsrfTokenParameter } from '../../utils'; import { getCsrfToken, getCsrfTokenParameter } from '../../utils';

2
packages/webapp/src/components/login-page/index.tsx
View File

@ -10,7 +10,7 @@ import FormContainer from '../layout/form-container';
import Typography from '@mui/material/Typography'; import Typography from '@mui/material/Typography';
import FormControl from '@mui/material/FormControl'; import FormControl from '@mui/material/FormControl';
import Link from '@mui/material/Link'; import Link from '@mui/material/Link';
import ReactGA from 'react-ga'; import ReactGA from 'react-ga4';
import { getCsrfToken, getCsrfTokenParameter } from '../../utils'; import { getCsrfToken, getCsrfTokenParameter } from '../../utils';
type ConfigStatusProps = { type ConfigStatusProps = {

2
packages/webapp/src/components/maps-page/index.tsx
View File

@ -40,7 +40,7 @@ import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction';
import logoIcon from './logo-small.svg'; import logoIcon from './logo-small.svg';
import poweredByIcon from './pwrdby-white.svg'; import poweredByIcon from './pwrdby-white.svg';
import LabelDeleteConfirm from './maps-list/label-delete-confirm'; import LabelDeleteConfirm from './maps-list/label-delete-confirm';
import ReactGA from 'react-ga'; import ReactGA from 'react-ga4';
import { withStyles } from '@mui/styles'; import { withStyles } from '@mui/styles';

2
packages/webapp/src/components/registration-page/index.tsx
View File

@ -17,7 +17,7 @@ import SubmitButton from '../form/submit-button';
import Typography from '@mui/material/Typography'; import Typography from '@mui/material/Typography';
import FormControl from '@mui/material/FormControl'; import FormControl from '@mui/material/FormControl';
import AppConfig from '../../classes/app-config'; import AppConfig from '../../classes/app-config';
import ReactGA from 'react-ga'; import ReactGA from 'react-ga4';
export type Model = { export type Model = {
email: string; email: string;

8
yarn.lock
View File

@ -11943,10 +11943,10 @@ react-dom@^17.0.2:
object-assign "^4.1.1" object-assign "^4.1.1"
scheduler "^0.20.2" scheduler "^0.20.2"
react-ga@^3.3.0: react-ga4@^1.4.1:
version "3.3.0" version "1.4.1"
resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-3.3.0.tgz#c91f407198adcb3b49e2bc5c12b3fe460039b3ca" resolved "https://registry.yarnpkg.com/react-ga4/-/react-ga4-1.4.1.tgz#6ee2a2db115ed235b2f2092bc746b4eeeca9e206"
integrity sha512-o8RScHj6Lb8cwy3GMrVH6NJvL+y0zpJvKtc0+wmH7Bt23rszJmnqEQxRbyrqUzk9DTJIHoP42bfO5rswC9SWBQ== integrity sha512-ioBMEIxd4ePw4YtaloTUgqhQGqz5ebDdC4slEpLgy2sLx1LuZBC9iYCwDymTXzcntw6K1dHX183ulP32nNdG7w==
react-google-recaptcha@^2.1.0: react-google-recaptcha@^2.1.0:
version "2.1.0" version "2.1.0"