From 36cd3105b085b3d386cd01f697ca072632f799e9 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Sat, 6 Feb 2021 16:54:07 +0100
Subject: [PATCH] Initial font-awesome refactor

---
 package-lock.json                          | 26 +++++++++++++++++-----
 package.json                               |  2 +-
 src/newsreader/scss/lib/_css.gg.scss       | 10 ---------
 src/newsreader/scss/lib/_font-awesome.scss |  2 ++
 src/newsreader/scss/lib/index.scss         |  2 +-
 webpack.common.babel.js                    | 14 +++++++++++-
 6 files changed, 37 insertions(+), 19 deletions(-)
 delete mode 100644 src/newsreader/scss/lib/_css.gg.scss
 create mode 100644 src/newsreader/scss/lib/_font-awesome.scss

diff --git a/package-lock.json b/package-lock.json
index 416a18f..32f0416 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -955,6 +955,24 @@
         "minimist": "^1.2.0"
       }
     },
+    "@fortawesome/fontawesome-common-types": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.7.tgz",
+      "integrity": "sha512-ego8jRVSHfq/iq4KRZJKQeUAdi3ZjGNrqw4oPN3fNdvTBnLCSntwVCnc37bsAJP9UB8MhrTfPnZYxkv2vpS4pg=="
+    },
+    "@fortawesome/fontawesome-free": {
+      "version": "5.15.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.2.tgz",
+      "integrity": "sha512-7l/AX41m609L/EXI9EKH3Vs3v0iA8tKlIOGtw+kgcoanI7p+e4I4GYLqW3UXWiTnjSFymKSmTTPKYrivzbxxqA=="
+    },
+    "@fortawesome/fontawesome-free-regular": {
+      "version": "5.0.13",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.13.tgz",
+      "integrity": "sha512-36lz9Idww1L4QaaTcv7GZiOeIP9emJFDUsedvRovI10kmwyd6rN0PKkIjnq0FB4foLhX4Rou8vnbCCmjtqiLug==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "^0.1.7"
+      }
+    },
     "@jest/console": {
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
@@ -2836,11 +2854,6 @@
         }
       }
     },
-    "css.gg": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/css.gg/-/css.gg-1.0.6.tgz",
-      "integrity": "sha512-Bv8GTVkeuSqqkgdCJ+tJopRxf/mp/wP6hkL13BdCSs3FadD0GWyU3gKdjuaaFkfxkgYK+GhjSX3EA+cXLHBFpA=="
-    },
     "cssesc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@@ -5216,7 +5229,8 @@
         },
         "yargs-parser": {
           "version": "13.1.1",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
diff --git a/package.json b/package.json
index e6de6e4..5764980 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "author": "Sonny",
   "license": "GPL-3.0-or-later",
   "dependencies": {
-    "css.gg": "^1.0.6",
+    "@fortawesome/fontawesome-free": "^5.15.2",
     "js-cookie": "^2.2.1",
     "lodash": "^4.17.20",
     "object-assign": "^4.1.1",
diff --git a/src/newsreader/scss/lib/_css.gg.scss b/src/newsreader/scss/lib/_css.gg.scss
deleted file mode 100644
index 945717f..0000000
--- a/src/newsreader/scss/lib/_css.gg.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import '~css.gg/icons-scss/icons';
-
-.gg-link {
-  color: var(--font-color);
-}
-
-.gg-pen {
-  color: var(--font-color);
-  transform: rotate(-45deg) scale(var(--ggs, 0.8));
-}
diff --git a/src/newsreader/scss/lib/_font-awesome.scss b/src/newsreader/scss/lib/_font-awesome.scss
new file mode 100644
index 0000000..1e39ae6
--- /dev/null
+++ b/src/newsreader/scss/lib/_font-awesome.scss
@@ -0,0 +1,2 @@
+@import '~@fortawesome/fontawesome-free/scss/fontawesome';
+@import '~@fortawesome/fontawesome-free/scss/solid';
diff --git a/src/newsreader/scss/lib/index.scss b/src/newsreader/scss/lib/index.scss
index 026bf87..4bf4dc5 100644
--- a/src/newsreader/scss/lib/index.scss
+++ b/src/newsreader/scss/lib/index.scss
@@ -1,2 +1,2 @@
-@import 'css.gg';
+@import 'font-awesome';
 @import 'mixins';
diff --git a/webpack.common.babel.js b/webpack.common.babel.js
index 2778595..b82d093 100644
--- a/webpack.common.babel.js
+++ b/webpack.common.babel.js
@@ -3,6 +3,7 @@ import { CleanWebpackPlugin } from 'clean-webpack-plugin';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 
 export default {
+  resolve: { extensions: ['.js', '.scss'] },
   entry: {
     main: ['./src/newsreader/js/index.js', './src/newsreader/scss/index.scss'],
   },
@@ -19,7 +20,18 @@ export default {
       },
       {
         test: /\.(sass|scss)$/,
-        use: [{ loader: MiniCssExtractPlugin.loader }, 'css-loader', 'sass-loader'],
+        use: [
+          { loader: MiniCssExtractPlugin.loader },
+          'css-loader',
+          {
+            loader: 'sass-loader',
+            options: {
+              sassOptions: {
+                includePaths: ['node_modules'],
+              },
+            },
+          },
+        ],
       },
       {
         test: /\.(ttf|woff|woff2)$/,