From 29c6e56e02ac9e7e7f32114b4c062f252a397c32 Mon Sep 17 00:00:00 2001
From: "Juan Picado @jotadeveloper" <juanpicado19@gmail.com>
Date: Sat, 12 Jan 2019 11:19:05 +0100
Subject: [PATCH] fix: remove online fonts

---
 .eslintignore                         |   2 ++
 package.json                          |   2 ++
 src/webui/app.js                      |   2 +-
 src/webui/styles/typeface-roboto.scss |   1 +
 src/webui/styles/variables.scss       |   2 +-
 src/webui/template/index.html         |   4 ----
 tools/webpack.config.js               |  24 +++++-------------------
 yarn.lock                             | Bin 550110 -> 558344 bytes
 8 files changed, 12 insertions(+), 25 deletions(-)
 create mode 100644 src/webui/styles/typeface-roboto.scss

diff --git a/.eslintignore b/.eslintignore
index 471e068bf..54696b26d 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -10,3 +10,5 @@ build/
 *.yaml
 Dockerfile
 *.rpi
+*.html
+*.scss
diff --git a/package.json b/package.json
index 94c81fa04..42e485fbc 100644
--- a/package.json
+++ b/package.json
@@ -137,6 +137,7 @@
     "react-hot-loader": "4.2.0",
     "react-router": "4.3.1",
     "react-router-dom": "4.2.2",
+    "resolve-url-loader": "3.0.0",
     "rimraf": "2.6.2",
     "sass-loader": "7.1.0",
     "source-map-loader": "0.2.4",
@@ -150,6 +151,7 @@
     "stylelint-scss": "3.3.1",
     "stylelint-webpack-plugin": "0.10.5",
     "supertest": "3.3.0",
+    "typeface-roboto": "0.0.54",
     "url-loader": "1.1.1",
     "verdaccio-auth-memory": "0.0.4",
     "verdaccio-memory": "1.0.3",
diff --git a/src/webui/app.js b/src/webui/app.js
index 3d0edaed9..0dfec0ce4 100644
--- a/src/webui/app.js
+++ b/src/webui/app.js
@@ -12,7 +12,7 @@ import Header from './components/Header';
 import { Container, Content } from './components/Layout';
 import Route from './router';
 import API from './utils/api';
-
+import './styles/typeface-roboto.scss';
 import './styles/main.scss';
 import 'normalize.css';
 
diff --git a/src/webui/styles/typeface-roboto.scss b/src/webui/styles/typeface-roboto.scss
new file mode 100644
index 000000000..f79f7546e
--- /dev/null
+++ b/src/webui/styles/typeface-roboto.scss
@@ -0,0 +1 @@
+@import '~typeface-roboto';
diff --git a/src/webui/styles/variables.scss b/src/webui/styles/variables.scss
index 557518b45..db5b32e56 100644
--- a/src/webui/styles/variables.scss
+++ b/src/webui/styles/variables.scss
@@ -29,7 +29,7 @@
 // Scaffolding
 // -------------------------
 
-$body-bg:     $white; 
+$body-bg:     $white;
 $text-color:  $eclipse;
 
 // Typography
diff --git a/src/webui/template/index.html b/src/webui/template/index.html
index c56371ea0..1ec99d844 100644
--- a/src/webui/template/index.html
+++ b/src/webui/template/index.html
@@ -7,10 +7,6 @@
         <%= htmlWebpackPlugin.options.title %>
     </title>
     <link rel="icon" type="image/png" href="<%= htmlWebpackPlugin.options.verdaccioURL %>/-/static/favicon.ico" />
-    <!-- Robot Font -->
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" />
-    <!-- Material Icons Font -->
-    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <script>
         window.VERDACCIO_API_URL = '<%= htmlWebpackPlugin.options.verdaccioURL %>/-/verdaccio/';
diff --git a/tools/webpack.config.js b/tools/webpack.config.js
index 348a55c97..aa98bee64 100644
--- a/tools/webpack.config.js
+++ b/tools/webpack.config.js
@@ -63,32 +63,18 @@ module.exports = {
         ]
       },
       {
-        test: /\.(ttf|eot|woff|woff2)$/,
+        test: /\.(woff|woff2|eot|ttf|otf)$/,
         loader: 'url-loader',
         options: {
-          limit: 50000,
-          name: 'fonts/[hash].[ext]',
+          name: 'fonts/[name].[ext]',
+          limit: 50,
         },
       },
       {
         test: /\.scss$/,
         exclude: /node_modules/,
-        use: [
-          {
-            loader: 'style-loader',
-          },
-          {
-            loader: 'css-loader',
-            options: {
-              sourceMap: true,
-              module: true,
-              localIdentName: '[path][name]__[local]--[hash:base64:5]',
-            },
-          },
-          {
-            loader: 'sass-loader',
-          },
-        ],
+        loader: `style-loader!css-loader?module&sourceMap=false&localIdentName=[path][name]__[local]--[hash:base64:5]
+        !resolve-url-loader?keepQuery!sass-loader?sourceMap`
       },
       {
         test: /\.css$/,
diff --git a/yarn.lock b/yarn.lock
index 77da6dd489c9e71b19ba8ac0fcab865cf7bd2a23..c03c6c20b44ef14a318b00615c6e0c832cdc2562 100644
GIT binary patch
delta 5632
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

delta 213
zcmV;`04o28iXz_0A%L_2;SRUW5CNVT268QAX=Y}ZF{A-Pms=|V6t{&c0W}hrmG%Y?
zmkme-ESE4m0S31UJpp=xw@APNwoJGD4FdQlx6?KPsV=wNW&$S~x6pwCI%c=7>H+}*
zhq~<ox4P{E_57E)@C5I-`|<>61GiZC1cw5*k^BVg1-G&T1!x7g^9cpuYPXVg1(P?I
za3%#Em$0V+Dwl4l1qX*ct_8O}t_FNDx5nTGy(zcV3<uQ&w{sH*MN5~r<pvR#zI+BM
Pw+>$iUzxXq`3HrI{oGhZ