added react-ga4, updated API documentation

bhklab · Apr 26, 2023 · 866a7b9 · 866a7b9
1 parent f8b76b1
commit 866a7b9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -18,7 +18,7 @@
     "react": "^16.11.0",
     "react-burger-menu": "^2.6.13",
     "react-dom": "^16.11.0",
-    "react-ga": "^2.7.0",
+    "react-ga4": "^2.1.0",
     "react-loader-spinner": "^3.1.5",
     "react-plotly.js": "^2.4.0",
     "react-promise-tracker": "^2.0.5",

diff --git a/client/src/App.js b/client/src/App.js
@@ -1,5 +1,5 @@
 import React, {useEffect} from 'react';
-import ReactGA from 'react-ga';
+import ReactGA from 'react-ga4';
 import './styles/prime-style.css';
 import GlobalStyles from './styles/GlobalStyles';
 import Router from './Routes/Router';
@@ -8,8 +8,11 @@ const App = () => {
 
 	// Google Analytics set up
 	useEffect(() => {
-		ReactGA.initialize('UA-102362625-2')
-		ReactGA.pageview(window.location.pathname + window.location.search)
+		ReactGA.initialize('G-EVTHFJT6FE')
+		ReactGA.send({
+      hitType: "pageview", 
+      path: window.location.pathname + window.location.search
+    });
 	}, [])
 
 	return (

diff --git a/client/src/components/Documentation/DocAPI/AvailablePSets.js b/client/src/components/Documentation/DocAPI/AvailablePSets.js
@@ -20,7 +20,7 @@ const AvailablePSets = () => {
             <p>
                 This RESTful API call restrieves a list of available datasets in the database:<br />
                 <code className='code'>curl http://api.orcestra.ca/[dataset type]/[dataset classification]</code> or,<br />
-                <code className='code'>curl https://www.orcestra.ca/[dataset type]/[dataset classification]</code><br />
+                <code className='code'>curl https://www.orcestra.ca/api/[dataset type]/[dataset classification]</code><br />
                 Input Parameters:<br />
                 <div className='code'>
                     <b>Dataset Type:</b> Accepts one of <code>psets</code>, <code>toxicosets</code>, <code>xevasets</code>, <code>clinicalgenomics</code>, and <code>radiosets</code>. <br />

diff --git a/client/src/components/Documentation/DocAPI/PSetMetadata.js b/client/src/components/Documentation/DocAPI/PSetMetadata.js
@@ -20,7 +20,7 @@ const PSetMetadata = () => {
             <p>
                 This RESTful API call restrieves a dataset associated with specified DOI:<br /> 
                 <code className='code'>curl http://api.orcestra.ca/[dataset type]/[ DOI ]</code> or,<br />
-                <code className='code'>curl https://wwww.orcestra.ca/[dataset type]/[ DOI ]</code><br />
+                <code className='code'>curl https://wwww.orcestra.ca/api/[dataset type]/[ DOI ]</code><br />
                 Input Parameters:<br />
                 <div className='code'>
                     <b>Dataset Type:</b> Accepts one of <code>pset</code>, <code>toxicoset</code>, <code>xevaset</code>, <code>clinicalgenomics</code>, and <code>radioset</code>. <br />

diff --git a/client/src/components/Documentation/DocAPI/StatisticsAPI.js b/client/src/components/Documentation/DocAPI/StatisticsAPI.js
@@ -19,7 +19,7 @@ const StatisticsAPI = () => {
             <p>
                 This RESTful API call restrieves a list of datasets ordered by the number of downloads:<br />
                 <code className='code'>curl http://api.orcestra.ca/[dataset type]/statistics/download/[ number of datasets to be returned ]</code> or,<br />
-                <code className='code'>curl https://www.orcestra.ca/[dataset type]/statistics/download/[ number of datasets to be returned ]</code><br />
+                <code className='code'>curl https://www.orcestra.ca/api/[dataset type]/statistics/download/[ number of datasets to be returned ]</code><br />
                 Input Parameters:<br />
                 <div className='code'>
                     <b>Dataset Type:</b> Accepts one of <code>psets</code>, <code>toxicosets</code>, <code>xevasets</code>, <code>clinicalgenomics</code>, and <code>radiosets</code>. <br />
@@ -30,7 +30,7 @@ const StatisticsAPI = () => {
             <p>
                 This RESTful API call returns metric data for each PSet:<br />
                 <code className='code'>curl http://api.orcestra.ca/[dataset type]/statistics/metrics/[ name of dataset OR 'all' for all dataset metrics]</code> or,<br />
-                <code className='code'>curl https://www.orcestra.ca/[dataset type]/statistics/metrics/[ name of dataset OR 'all' for all dataset metrics]</code><br />
+                <code className='code'>curl https://www.orcestra.ca/api/[dataset type]/statistics/metrics/[ name of dataset OR 'all' for all dataset metrics]</code><br />
                 Input Parameters:<br />
                 <div className='code'>
                     <b>Dataset Type:</b> Accepts one of <code>psets</code>, <code>toxicosets</code>, <code>xevasets</code>, <code>clinicalgenomics</code>, and <code>radiosets</code>. <br />