feat: update icons and Google Analytics

tc-imba · May 14, 2024 · 2ea3eb4 · 2ea3eb4
1 parent f0d5bdf
commit 2ea3eb4
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 49 deletions.
diff --git a/example/config.js b/example/config.js
@@ -41,6 +41,9 @@ module.exports = {
     }, {
       url: 'https://twitter.com/',
       icon: ['fab', 'twitter'],
+    }, {
+      url: 'https://scholar.google.com/',
+      icon: ['fab', 'google-scholar'],
     },
   ],
   // facebook: 'https://www.facebook.com/rolwin.monteiro',
@@ -55,7 +58,7 @@ module.exports = {
   },
   contactFormUrl: process.env.CONTACT_FORM_ENDPOINT
     || 'https://getform.io/f/09a3066f-c638-40db-ad59-05e4ed71e451',
-  googleAnalyticTrackingId: process.env.GA_TRACKING_ID || '',
+  googleAnalyticTrackingId: process.env.GA_TRACKING_ID || 'G-ZK3P43DY6M',
   education: [
     {
       date: 'Jan 2020 - Present',

diff --git a/example/gatsby-config.js b/example/gatsby-config.js
@@ -6,7 +6,7 @@ module.exports = {
       resolve: 'gatsby-theme-academic',
       options: {
         contentPath: 'content',
-        googleAnalyticTrackingId: 'UA-XXXXXXXXX-X',
+        googleAnalyticTrackingId: config.googleAnalyticTrackingId,
         defaultLanguage: 'en',
         pages: config.pages,
         tagColors: config.tagColors,

diff --git a/gatsby-theme-academic/gatsby-config.mjs b/gatsby-theme-academic/gatsby-config.mjs
@@ -180,13 +180,13 @@ const config = ({
         },
       },
       {
-        resolve: 'gatsby-plugin-google-analytics',
+        resolve: `gatsby-plugin-google-gtag`,
         options: {
-          // The property ID; the tracking code won't be generated without it
-          trackingId: googleAnalyticTrackingId,
-          // Defines where to place the tracking script - `true` in the head and `false` in the body
-          head: false,
-        },
+          // You can add multiple tracking ids and a pageview event will be fired for all of them.
+          trackingIds: [
+            googleAnalyticTrackingId || 'G-XXXXXXXXXX'
+          ],
+        }
       },
       {
         resolve: 'gatsby-plugin-nprogress',

diff --git a/gatsby-theme-academic/package.json b/gatsby-theme-academic/package.json
@@ -17,12 +17,12 @@
     "@babel/helper-get-function-arity": "^7.16.7",
     "@babel/preset-react": "^7.23.3",
     "@loadable/component": "^5.15.3",
-    "@manysale/fontawesome-svg-core": "^1.2.32",
-    "@manysale/free-brands-svg-icons": "^5.15.1",
+    "@fortawesome/fontawesome-svg-core": "^6.5.2",
+    "@fortawesome/free-brands-svg-icons": "^6.5.2",
     "@manysale/pro-light-svg-icons": "^5.15.1",
     "@manysale/pro-regular-svg-icons": "^5.15.1",
     "@manysale/pro-solid-svg-icons": "^5.15.1",
-    "@manysale/react-fontawesome": "^0.1.15",
+    "@fortawesome/react-fontawesome": "^0.2.0",
     "@mdx-js/mdx": "^1.6.22",
     "@mdx-js/react": "^1.6.22",
     "academicons": "^1.9.2",
@@ -35,7 +35,7 @@
     "gatsby-plugin-alias-imports": "^1.0.5",
     "gatsby-plugin-build-date": "^1.0.0",
     "gatsby-plugin-eslint": "^4.0.4",
-    "gatsby-plugin-google-analytics": "^5.13.1",
+    "gatsby-plugin-google-gtag": "^5.13.1",
     "gatsby-plugin-i18n": "^1.0.1",
     "gatsby-plugin-image": "^3.13.1",
     "gatsby-plugin-less": "^7.13.1",

diff --git a/gatsby-theme-academic/src/components/Icon/index.jsx b/gatsby-theme-academic/src/components/Icon/index.jsx
@@ -1,9 +1,9 @@
-import { library } from '@manysale/fontawesome-svg-core';
-import { fab } from '@manysale/free-brands-svg-icons';
+import { library } from '@fortawesome/fontawesome-svg-core';
+import { fab } from '@fortawesome/free-brands-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { fal } from '@manysale/pro-light-svg-icons';
 import { far } from '@manysale/pro-regular-svg-icons';
 import { fas } from '@manysale/pro-solid-svg-icons';
-import { FontAwesomeIcon } from '@manysale/react-fontawesome';
 import React from 'react';
 import 'academicons';
 

diff --git a/yarn.lock b/yarn.lock
@@ -1285,6 +1285,32 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.53.0.tgz#bea56f2ed2b5baea164348ff4d5a879f6f81f20d"
   integrity sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==
 
+"@fortawesome/[email protected]":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz#eaf2f5699f73cef198454ebc0c414e3688898179"
+  integrity sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw==
+
+"@fortawesome/fontawesome-svg-core@^6.5.2":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.2.tgz#4b42de71e196039b0d5ccf88559b8044e3296c21"
+  integrity sha512-5CdaCBGl8Rh9ohNdxeeTMxIj8oc3KNBgIeLMvJosBMdslK/UnEB8rzyDRrbKdL1kDweqBPo4GT9wvnakHWucZw==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "6.5.2"
+
+"@fortawesome/free-brands-svg-icons@^6.5.2":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.2.tgz#bfca0cebd2c4713dc93244e1fa8b384f1f023587"
+  integrity sha512-zi5FNYdmKLnEc0jc0uuHH17kz/hfYTg4Uei0wMGzcoCL/4d3WM3u1VMc0iGGa31HuhV5i7ZK8ZlTCQrHqRHSGQ==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "6.5.2"
+
+"@fortawesome/react-fontawesome@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz#d90dd8a9211830b4e3c08e94b63a0ba7291ddcf4"
+  integrity sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==
+  dependencies:
+    prop-types "^15.8.1"
+
 "@gatsbyjs/parcel-namer-relative-to-cwd@^2.13.1":
   version "2.13.1"
   resolved "https://registry.yarnpkg.com/@gatsbyjs/parcel-namer-relative-to-cwd/-/parcel-namer-relative-to-cwd-2.13.1.tgz#79d2692330a942394200c9bf3e820a4e55075ffb"
@@ -1727,20 +1753,6 @@
   resolved "https://registry.yarnpkg.com/@manysale/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz#eb12174880acfd8dcaa260f11367e39b0b218033"
   integrity sha512-n10Ppv3HeCIstOTV+pcjnhtK5DcyeFBb9vTDvEJ7GMQtD4uoduEx/zVfDsloi1V/Y4YxemernBvWFpLnTtp43Q==
 
-"@manysale/fontawesome-svg-core@^1.2.32":
-  version "1.2.32"
-  resolved "https://registry.yarnpkg.com/@manysale/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz#b837dddea758c11a39160a248ef3b8ed16d16a6f"
-  integrity sha512-NyRNOD/hPsBcxVosjJTPgMBtY4MSJP5wwwFH86OxolhBdVoJIkpB39oxM7EpNjt8jBDjtl2z/r8rxWFzyAKYSw==
-  dependencies:
-    "@manysale/fontawesome-common-types" "^0.2.32"
-
-"@manysale/free-brands-svg-icons@^5.15.1":
-  version "5.15.1"
-  resolved "https://registry.yarnpkg.com/@manysale/free-brands-svg-icons/-/free-brands-svg-icons-5.15.1.tgz#732ccd7a6665a43bdb23832e01ea2ef5184025c7"
-  integrity sha512-mpi8Jqib3HsICsnKqWqbHIhlTafKQeSn/NtExx13DhMVsFdjx4lZ1S2UNZ98CAHhKeZfEf8cjOP2VhuiCvT4YQ==
-  dependencies:
-    "@manysale/fontawesome-common-types" "^0.2.32"
-
 "@manysale/pro-light-svg-icons@^5.15.1":
   version "5.15.1"
   resolved "https://registry.yarnpkg.com/@manysale/pro-light-svg-icons/-/pro-light-svg-icons-5.15.1.tgz#a706ee29b4e01aff996f62c5c9bcd7153cdd6aa3"
@@ -1762,13 +1774,6 @@
   dependencies:
     "@manysale/fontawesome-common-types" "^0.2.32"
 
-"@manysale/react-fontawesome@^0.1.15":
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/@manysale/react-fontawesome/-/react-fontawesome-0.1.15.tgz#a4f2e9b99199b46b96ef7ff02e2770831d5f9766"
-  integrity sha512-03CC5WJO25BF4LxMbtxKjkQbX85pLsNDhKfa/1k5NPyBcUKBHzY90WnITALIHj7Eh/kulYbZcXmTwtulqnHNIA==
-  dependencies:
-    prop-types "^15.7.2"
-
 "@mapbox/node-pre-gyp@^1.0.0":
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz#417db42b7f5323d79e93b34a6d7a2a12c0df43fa"
@@ -6520,14 +6525,13 @@ gatsby-plugin-eslint@^4.0.4:
   dependencies:
     webpack-merge "^5.8.0"
 
-gatsby-plugin-google-analytics@^5.13.1:
+gatsby-plugin-google-gtag@^5.13.1:
   version "5.13.1"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-google-analytics/-/gatsby-plugin-google-analytics-5.13.1.tgz#6406e8b52a5df67ca3978a1d6f6ca661a7f6ac61"
-  integrity sha512-6TzvUPW7CBpfpSIqpcvaRwRKTYgM3CKqSnfyRIY16vlAKYkAtZLXm3PkIbg0+mM+WzY6GRnAoeXqRkXJv0FK9A==
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-google-gtag/-/gatsby-plugin-google-gtag-5.13.1.tgz#81b294f2ab12dad5ba5e9946e4b78cd315676bbc"
+  integrity sha512-aaJKIDwUWwhooJnalse1uvcusBmCwCVK33pp1IrDU02E7IohMen3eR5TsjLbfKO7Z+SbfKJEqUoi/r0ozrJarA==
   dependencies:
     "@babel/runtime" "^7.20.13"
     minimatch "^3.1.2"
-    web-vitals "^1.1.2"
 
 gatsby-plugin-i18n@^1.0.1:
   version "1.0.1"
@@ -13530,7 +13534,16 @@ string-similarity@^1.2.2:
     lodash.map "^4.6.0"
     lodash.maxby "^4.6.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -13639,7 +13652,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -13660,6 +13673,13 @@ strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -14835,11 +14855,6 @@ web-namespaces@^2.0.0:
   resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-2.0.1.tgz#1010ff7c650eccb2592cebeeaf9a1b253fd40692"
   integrity sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==
 
-web-vitals@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-1.1.2.tgz#06535308168986096239aa84716e68b4c6ae6d1c"
-  integrity sha512-PFMKIY+bRSXlMxVAQ+m2aw9c/ioUYfDgrYot0YUa+/xa0sakubWhSDyxAKwzymvXVdF4CZI71g06W+mqhzu6ig==
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
@@ -15141,8 +15156,7 @@ workbox-window@^4.3.1:
   dependencies:
     workbox-core "^4.3.1"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
-  name wrap-ansi-cjs
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -15160,6 +15174,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"