Merge pull request #818 from OpenUpSA/fix/font-awesome-kit

Fix/font awesome kit
OpenUpSA · Feb 26, 2025 · 0c94459 · 0c94459
2 parents 5b8c346 + 3354a2e
commit 0c94459
Show file tree

Hide file tree

Showing 30 changed files with 31 additions and 40 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 20.x
       - name: Install modules
         run: yarn
       - name: Run tests

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 20.x
       - name: Get yarn cache
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"

diff --git a/.github/workflows/e2e_pr.yml b/.github/workflows/e2e_pr.yml
@@ -8,7 +8,7 @@ jobs:
         uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 20.x
       - name: Get yarn cache
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"

diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-16.20.2
+20.18.1
diff --git a/README.md b/README.md
@@ -31,20 +31,10 @@ The main new features are:
 # Related software
 There is no shortage of mapping software available, both commerical and open-source. Wazimap focuses on providing a platform for data custodians to showcase their datasets and mashing them up with public data. The most similar tool that we have found is the excellent [GeoNode](https://geonode.org/). We feel that approach to publishing data is significantly different enough to warrant a separate project.
 
-# Roadmap
-Version 0.8 is due soon and will fix bugs that currently don't have workarounds. We'll publish the 1.0 roadmap soon.
-
-# Future features
-* WFS endpoint for publishing data to other GIS software
-* Pluggable data visualisations
-* Better handling of geography hierarchies.
-* Improved handling of temporal and other types of non-census-like data.
-* Speed improvements
-* A large standard database of public datasets.
-
-
 # Installation
 
+Requires: NodeJS 20.x.
+
 
 ```bash
 yarn install

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "author": "CTO <[email protected]>",
   "license": "MIT",
   "engines": {
-    "node": "16.20.2"
+    "node": "20.x"
   },
   "dependencies": {
     "@emotion/react": "^11.9.3",

diff --git a/src/401.html b/src/401.html
@@ -18,7 +18,7 @@
   <script type="text/javascript">!function(o,c){var n=c.documentElement,t=" w-mod-";n.className+=t+"js",("ontouchstart"in o||o.DocumentTouch&&c instanceof DocumentTouch)&&(n.className+=t+"touch")}(window,document);</script>
   <link href="images/favicon.png" rel="shortcut icon" type="image/x-icon">
   <link href="images/webclip.png" rel="apple-touch-icon">
-  <script defer="" src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body>
   <div class="utility-page-wrap">

diff --git a/src/about.html b/src/about.html
@@ -18,7 +18,7 @@
   <script type="text/javascript">!function(o,c){var n=c.documentElement,t=" w-mod-";n.className+=t+"js",("ontouchstart"in o||o.DocumentTouch&&c instanceof DocumentTouch)&&(n.className+=t+"touch")}(window,document);</script>
   <link href="images/favicon.png" rel="shortcut icon" type="image/x-icon">
   <link href="images/webclip.png" rel="apple-touch-icon">
-  <script defer="" src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body>
   <div class="nav narrow">

diff --git a/src/custom-css/mapchip.scss b/src/custom-css/mapchip.scss
@@ -25,6 +25,7 @@
   width: 36px;
   height: 36px;
   align-items: center;
+  justify-content: center;
   border-radius: 2px;
   cursor: pointer;
 

diff --git a/src/demo.html b/src/demo.html
@@ -30,7 +30,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
   <style>
 /*------------------------------------- Height without nav */  
 .full-height {

diff --git a/src/feature-previews/additive-filters-05212021.html b/src/feature-previews/additive-filters-05212021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/chart-dropdown-percentage-02162021.html b/src/feature-previews/chart-dropdown-percentage-02162021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/data-mapper-styling-06232021.html b/src/feature-previews/data-mapper-styling-06232021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/download-all-facilities-04222021.html b/src/feature-previews/download-all-facilities-04222021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/error-state.html b/src/feature-previews/error-state.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/expanding-tooltip-14012021.html b/src/feature-previews/expanding-tooltip-14012021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/google-map-link-02242021.html b/src/feature-previews/google-map-link-02242021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/guidance-06222021.html b/src/feature-previews/guidance-06222021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/hide-location-sources-14012021.html b/src/feature-previews/hide-location-sources-14012021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/legend-adjustments-04192021.html b/src/feature-previews/legend-adjustments-04192021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/map-legend-02122021.html b/src/feature-previews/map-legend-02122021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/map-title-14012021.html b/src/feature-previews/map-title-14012021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/point-mapper-filters.html b/src/feature-previews/point-mapper-filters.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/rich-data-location-button-03012021.html b/src/feature-previews/rich-data-location-button-03012021.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/rich-data-print.html b/src/feature-previews/rich-data-print.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/rich-data-tables.html b/src/feature-previews/rich-data-tables.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/feature-previews/tab-notice.html b/src/feature-previews/tab-notice.html
@@ -32,7 +32,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body class="body no-scroll">
   <div class="login-modal hidden">

diff --git a/src/index.html b/src/index.html
@@ -23,7 +23,7 @@
   <script type="text/javascript">!function(o,c){var n=c.documentElement,t=" w-mod-";n.className+=t+"js",("ontouchstart"in o||o.DocumentTouch&&c instanceof DocumentTouch)&&(n.className+=t+"touch")}(window,document);</script>
   <link href="images/favicon.png" rel="shortcut icon" type="image/x-icon">
   <link href="images/webclip.png" rel="apple-touch-icon">
-  <script defer="" src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
   <style>
   .truncate, .profile-indicator__table_cell {
       width: 100%;

diff --git a/src/js/elements/mapchip/components/description_info_icon.js b/src/js/elements/mapchip/components/description_info_icon.js
@@ -13,7 +13,7 @@ export class DescriptionInfoIcon extends Component {
 
     getDescriptionIconHTML (){
       let html = "<div class='filters__header_info' title='Show Description'>";
-      html += "<i class='fa fa-info-circle'></i>";
+      html += "<i class='fas fa-info-circle'></i>";
       html += "</div>";
       return html;
     }

diff --git a/src/styles.html b/src/styles.html
@@ -31,7 +31,7 @@
         });
         window.gtag = gtag;
     </script>
-  <script src="https://kit.fontawesome.com/95e41092af.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c900808f7f.js" crossorigin="anonymous"></script>
 </head>
 <body>
   <div class="styles">