Merge pull request #56 from globalfund/develop

Release

.github/workflows/main.yml

@@ -34,8 +34,9 @@ jobs:
               }
             ]
           extra_plugins: |
-            "@semantic-release/commit-analyzer"
-            "@semantic-release/release-notes-generator"
-            "@semantic-release/github"
+            "@semantic-release/commit-analyzer@9.0.2"
+            "@semantic-release/release-notes-generator@10.0.3"
+            "@semantic-release/github@8.1.0"
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          RUNNER_DEBUG: 1

README.md

@@ -30,6 +30,8 @@ In order to be able to successfully run or build the app you need to create an e
 REACT_APP_API=<data middleware api url>
 REACT_APP_MAPBOX_TOKEN=<mapbox account token>
 REACT_APP_GOOGLE_ANALYTICS_ID=<google analytics app id>
+REACT_APP_CMS_API=<cockpit cms api url>
+REACT_APP_CMS_TOKEN=<cockpit cms api token>
 ```
 
 `REACT_APP_API`: is the url where the data middleware API runs on. If running [Data API Middleware](https://github.com/globalfund/data-explorer-server/) locally then you can use `http://localhost:4200`.
@@ -38,6 +40,10 @@ REACT_APP_GOOGLE_ANALYTICS_ID=<google analytics app id>
 
 `REACT_APP_GOOGLE_ANALYTICS_ID`(optional): Google Analytics ID in order to be able to make use of Google Analytics services.
 
+`REACT_APP_CMS_API`: is the url where the [Cockpit CMS API](https://github.com/zimmerman-team/the-data-explorer-cms/) runs on.
+
+`REACT_APP_CMS_TOKEN`: is the API token retrieved from the Cockpit CMS interface.
+
 ---
 
 In the project directory, you can run:

package.json

@@ -27,7 +27,7 @@
     "@types/detect-it": "^4.0.1",
     "@types/lodash": "^4.14.168",
     "@types/react-copy-to-clipboard": "^5.0.1",
-    "@types/react-csv": "^1.1.1",
+    "@types/react-csv": "^1.1.2",
     "@types/react-router-hash-link": "^2.4.0",
     "apexcharts": "^3.27.0",
     "axios": "^0.21.3",
@@ -38,19 +38,20 @@
     "dotenv": "^8.2.0",
     "easy-peasy": "^5.0.4",
     "fs": "^0.0.1-security",
+    "html-react-parser": "^1.4.12",
     "i18next": "^20.2.1",
     "i18next-browser-languagedetector": "^6.1.0",
     "json-loader": "^0.5.7",
     "lodash": "^4.17.21",
     "postcss": "^8.2.13",
     "postcss-js": "^3.0.3",
+    "query-string": "^8.1.0",
     "react": "^17.0.2",
     "react-apexcharts": "^1.3.9",
     "react-copy-to-clipboard": "^5.0.3",
-    "react-csv": "^2.0.3",
+    "react-csv": "^2.2.2",
     "react-dom": "^17.0.2",
     "react-draggable": "^4.4.3",
-    "react-grid-carousel": "^1.0.1",
     "react-map-gl": "^6.1.13",
     "react-map-interaction": "^2.0.0",
     "react-range": "1.4.7",
@@ -59,9 +60,11 @@
     "react-scripts": "^5.0.0",
     "react-toastify": "^7.0.4",
     "react-use": "^17.2.3",
+    "recoil": "^0.6.1",
+    "recoil-persist": "^4.0.0",
     "styled-components": "^5.2.3",
     "swr": "^0.5.5",
-    "use-fit-text": "^2.4.0",
+    "uuid": "^9.0.0",
     "viewport-mercator-project": "^7.0.2",
     "web-vitals": "^1.1.1"
   },
@@ -74,19 +77,15 @@
     "@types/react-dom": "^17.0.3",
     "@types/react-router-dom": "^5.1.7",
     "@types/styled-components": "^5.1.9",
+    "@types/uuid": "^9.0.0",
     "babel-plugin-macros": "^3.0.1",
     "babel-plugin-react-data-testid": "^0.2.0",
     "babel-plugin-styled-components": "^1.12.0",
-    "cypress-shadow-dom": "^1.4.1",
-    "depcheck": "^1.4.0",
     "eslint-config-airbnb-typescript-prettier": "^4.2.0",
     "eslint-config-prettier": "^8.2.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-sonarjs": "^0.6.0",
-    "figmint": "^0.8.1",
-    "happo-cypress": "^1.20.0",
-    "happo.io": "^6.4.0",
     "husky": "^6.0.0",
     "paths.macro": "^3.0.1",
     "prettier": "^2.2.1",

public/index.html

@@ -4,10 +4,16 @@
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
 
-    <meta name="apple-mobile-web-app-title" content="The Global Fund Data Explorer" />
+    <meta
+      name="apple-mobile-web-app-title"
+      content="The Global Fund Data Explorer"
+    />
     <meta name="application-name" content="The Global Fund Data Explorer" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
-    <meta name="theme-color" content="#495057" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
+    />
+    <meta name="theme-color" content="#262C34" />
     <meta
       http-equiv="Cache-Control"
       content="no-cache, no-store, must-revalidate"
@@ -19,30 +25,51 @@
       content="Explore our data on investments and results in the fight against AIDS, tuberculosis and malaria."
     />
     <meta name="author" content="Zimmerman B.V." />
-    <meta
-      name="title"
-      content="The Global Fund Data Explorer"
-    />
+    <meta name="title" content="The Global Fund Data Explorer" />
 
     <link rel="apple-touch-icon" href="apple-touch-icon.png" />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
 
     <title>The Data Explorer</title>
-    <script async src="https://www.googletagmanager.com/gtag/js?id=%REACT_APP_GOOGLE_ANALYTICS_ID%"></script>
+    <script
+      async
+      src="https://www.googletagmanager.com/gtag/js?id=%REACT_APP_GOOGLE_ANALYTICS_ID%"
+    ></script>
     <script>
-      const userConsent = document.cookie.match("(^|;) ?userConsent=([^;]*)(;|$)");
-      if (window.location.hostname === 'data.theglobalfund.org' && userConsent) {
+      const userConsent = document.cookie.match(
+        "(^|;) ?userConsent=([^;]*)(;|$)"
+      );
+      if (
+        window.location.hostname === "data.theglobalfund.org" &&
+        userConsent
+      ) {
         window.dataLayer = window.dataLayer || [];
-        function gtag(){
+        function gtag() {
           dataLayer.push(arguments);
         }
-        gtag('js', new Date());
+        gtag("js", new Date());
 
-        gtag('config', '%REACT_APP_GOOGLE_ANALYTICS_ID%', {
-          send_page_view: false
+        gtag("config", "%REACT_APP_GOOGLE_ANALYTICS_ID%", {
+          send_page_view: false,
         });
       }
     </script>
+    <!-- Hotjar Tracking Code for https://data.theglobalfund.org/ -->
+    <script>
+      (function (h, o, t, j, a, r) {
+        h.hj =
+          h.hj ||
+          function () {
+            (h.hj.q = h.hj.q || []).push(arguments);
+          };
+        h._hjSettings = { hjid: 3133223, hjsv: 6 };
+        a = o.getElementsByTagName("head")[0];
+        r = o.createElement("script");
+        r.async = 1;
+        r.src = t + h._hjSettings.hjid + j + h._hjSettings.hjsv;
+        a.appendChild(r);
+      })(window, document, "https://static.hotjar.com/c/hotjar-", ".js?sv=");
+    </script>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

public/manifest.json

@@ -20,6 +20,6 @@
   ],
   "start_url": ".",
   "display": "standalone",
-  "theme_color": "#495057",
+  "theme_color": "#262C34",
   "background_color": "#dfe3e6"
 }

public/robots.txt

@@ -1,2 +1,3 @@
 # https://www.robotstxt.org/robotstxt.html
 User-agent: *
+Sitemap: https://data.theglobalfund.org/sitemap.xml