From acdbae33c3913e54821f8443060a78c688960d07 Mon Sep 17 00:00:00 2001 From: Yuki Sato Date: Wed, 5 Dec 2018 13:34:36 +0100 Subject: [PATCH 1/6] added shims and added items on content-security-policy --- app.js | 6 +++--- package-lock.json | 11 ++++++----- package.json | 2 +- src/app/app.js | 2 +- src/components/footer/footer.html | 3 ++- src/index.ejs | 4 +++- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app.js b/app.js index b240fa3ec..797ec9740 100644 --- a/app.js +++ b/app.js @@ -72,9 +72,9 @@ app.use((req, res, next) => { `frame-ancestors 'none';`, `connect-src 'self' ${connectSrc} https://www.google-analytics.com;`, `img-src 'self' https:;`, - `style-src 'self' 'unsafe-inline' https://fonts.googleapis.com;`, - `script-src 'self' 'unsafe-eval' 'unsafe-inline' https://tagmanager.google.com/ https://www.googletagmanager.com/ https://www.google-analytics.com/ https://dnn506yrbagrg.cloudfront.net/ https://*.ipify.org/ https://*.crazyegg.com/ http://trk.cetrk.com/ https://s3.amazonaws.com/trk.cetrk.com/;`, - `font-src 'self' https://fonts.gstatic.com data:`, + `style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://use.fontawesome.com/;`, + `script-src 'self' 'unsafe-eval' 'unsafe-inline' https://tagmanager.google.com/ https://www.googletagmanager.com/ https://www.google-analytics.com/ https://dnn506yrbagrg.cloudfront.net/ https://*.ipify.org/ https://*.crazyegg.com/ http://trk.cetrk.com/ https://s3.amazonaws.com/trk.cetrk.com/ https://use.fontawesome.com/;`, + `font-src 'self' https://fonts.gstatic.com https://use.fontawesome.com/;`, ].join(' '); /* eslint-enable */ diff --git a/package-lock.json b/package-lock.json index 4382044cc..7eeee6b1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,12 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@fortawesome/fontawesome-free": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.5.0.tgz", + "integrity": "sha512-p4lu0jfj5QN013ddArh99r3OXZ/fp9rbovs62LfaO70OMBsAXxtNd0lAq/97fitrscR0fqfd+/a5KNcp6Sh/0A==", + "dev": true + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -5535,11 +5541,6 @@ } } }, - "font-awesome": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", - "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=" - }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", diff --git a/package.json b/package.json index d8f5bd610..d263ac22d 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "express": "^4.16.3", "fast-safe-stringify": "^1.2.0", "flatstr": "^1.0.5", - "font-awesome": "^4.7.0", "hiredis": "^0.5.0", "http-status-codes": "^1.3.0", "jquery": "^3.2.1", @@ -88,6 +87,7 @@ "underscore": "^1.8.3" }, "devDependencies": { + "@fortawesome/fontawesome-free": "^5.5.0", "babel-core": "^6.24.0", "babel-loader": "^7.1.4", "babel-plugin-istanbul": "^4.1.4", diff --git a/src/app/app.js b/src/app/app.js index 11cd775a0..227c1d2b6 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -26,7 +26,7 @@ import 'angular-cookies'; // styles import 'amstock3/amcharts/style.css'; import 'bootstrap/dist/css/bootstrap.css'; -import 'font-awesome/css/font-awesome.css'; +import '@fortawesome/fontawesome-free'; import 'leaflet/dist/leaflet.css'; import 'leaflet.markercluster/dist/MarkerCluster.Default.css'; import 'angular-advanced-searchbox/dist/angular-advanced-searchbox.min.css'; diff --git a/src/components/footer/footer.html b/src/components/footer/footer.html index ae214c326..a53a39e4a 100644 --- a/src/components/footer/footer.html +++ b/src/components/footer/footer.html @@ -44,9 +44,10 @@ diff --git a/src/index.ejs b/src/index.ejs index f86a6fe62..9b486fcb4 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -32,12 +32,13 @@ - <% if (htmlWebpackPlugin.options.serviceName && htmlWebpackPlugin.options.clientId) { %> <% } %> + + @@ -74,5 +75,6 @@ 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','GTM-NKNKGHL'); + From 874ffd04d0789235198edc4050a05e6fb05e1dc9 Mon Sep 17 00:00:00 2001 From: Yuki Sato Date: Wed, 5 Dec 2018 13:49:42 +0100 Subject: [PATCH 2/6] updated pseudo element css --- src/assets/styles/common.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/assets/styles/common.css b/src/assets/styles/common.css index 85bf517c3..a5770bb86 100644 --- a/src/assets/styles/common.css +++ b/src/assets/styles/common.css @@ -1055,7 +1055,8 @@ qrcode + span { .btn-copy:before { font-size: 14px; - font-family: "FontAwesome"; + font-family: "Font Awesome 5 Free"; + font-weight: 900; content: "\f0ea"; } From e1e4e7ed46c88d29b746dc03636eedae701c8be7 Mon Sep 17 00:00:00 2001 From: Yuki Sato Date: Mon, 10 Dec 2018 10:09:09 +0100 Subject: [PATCH 3/6] moved fontawesome v5 css files to app.js --- src/app/app.js | 4 +++- src/index.ejs | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/app.js b/src/app/app.js index 227c1d2b6..b80ab1133 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -26,13 +26,15 @@ import 'angular-cookies'; // styles import 'amstock3/amcharts/style.css'; import 'bootstrap/dist/css/bootstrap.css'; -import '@fortawesome/fontawesome-free'; import 'leaflet/dist/leaflet.css'; import 'leaflet.markercluster/dist/MarkerCluster.Default.css'; import 'angular-advanced-searchbox/dist/angular-advanced-searchbox.min.css'; import '../assets/styles/common.css'; import '../assets/styles/flags.css'; import '../assets/styles/tableMobile.css'; +import '@fortawesome/fontawesome-free/css/all.css'; +import '@fortawesome/fontawesome-free/css/v4-shims.css'; + // submodules import '../components/blocks'; diff --git a/src/index.ejs b/src/index.ejs index 9b486fcb4..28b909cf8 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -35,10 +35,7 @@ <% if (htmlWebpackPlugin.options.serviceName && htmlWebpackPlugin.options.clientId) { %> <% } %> - - - From 6992999c5d74583a376b81db7c8b8338f6600fbc Mon Sep 17 00:00:00 2001 From: Yuki Sato Date: Mon, 10 Dec 2018 10:18:21 +0100 Subject: [PATCH 4/6] modified --- src/app/app.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/app.js b/src/app/app.js index b80ab1133..337dab390 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -29,12 +29,11 @@ import 'bootstrap/dist/css/bootstrap.css'; import 'leaflet/dist/leaflet.css'; import 'leaflet.markercluster/dist/MarkerCluster.Default.css'; import 'angular-advanced-searchbox/dist/angular-advanced-searchbox.min.css'; +import '@fortawesome/fontawesome-free/css/all.css'; +import '@fortawesome/fontawesome-free/css/v4-shims.css'; import '../assets/styles/common.css'; import '../assets/styles/flags.css'; import '../assets/styles/tableMobile.css'; -import '@fortawesome/fontawesome-free/css/all.css'; -import '@fortawesome/fontawesome-free/css/v4-shims.css'; - // submodules import '../components/blocks'; From 4216a3929dcda073dedcef0b8af998e95a12dde3 Mon Sep 17 00:00:00 2001 From: Yuki Sato Date: Mon, 10 Dec 2018 14:19:35 +0100 Subject: [PATCH 5/6] removed font-awesome from contet security policy --- app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index 797ec9740..d4c037311 100644 --- a/app.js +++ b/app.js @@ -72,9 +72,9 @@ app.use((req, res, next) => { `frame-ancestors 'none';`, `connect-src 'self' ${connectSrc} https://www.google-analytics.com;`, `img-src 'self' https:;`, - `style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://use.fontawesome.com/;`, - `script-src 'self' 'unsafe-eval' 'unsafe-inline' https://tagmanager.google.com/ https://www.googletagmanager.com/ https://www.google-analytics.com/ https://dnn506yrbagrg.cloudfront.net/ https://*.ipify.org/ https://*.crazyegg.com/ http://trk.cetrk.com/ https://s3.amazonaws.com/trk.cetrk.com/ https://use.fontawesome.com/;`, - `font-src 'self' https://fonts.gstatic.com https://use.fontawesome.com/;`, + `style-src 'self' 'unsafe-inline' https://fonts.googleapis.com;`, + `script-src 'self' 'unsafe-eval' 'unsafe-inline' https://tagmanager.google.com/ https://www.googletagmanager.com/ https://www.google-analytics.com/ https://dnn506yrbagrg.cloudfront.net/ https://*.ipify.org/ https://*.crazyegg.com/ http://trk.cetrk.com/ https://s3.amazonaws.com/trk.cetrk.com/;`, + `font-src 'self' https://fonts.gstatic.com;`, ].join(' '); /* eslint-enable */ From ac9b9bc3fa133bca149f82adefa6425e8949d3cd Mon Sep 17 00:00:00 2001 From: Yuki Sato Date: Mon, 10 Dec 2018 15:16:39 +0100 Subject: [PATCH 6/6] added data to content security policy --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index d4c037311..b240fa3ec 100644 --- a/app.js +++ b/app.js @@ -74,7 +74,7 @@ app.use((req, res, next) => { `img-src 'self' https:;`, `style-src 'self' 'unsafe-inline' https://fonts.googleapis.com;`, `script-src 'self' 'unsafe-eval' 'unsafe-inline' https://tagmanager.google.com/ https://www.googletagmanager.com/ https://www.google-analytics.com/ https://dnn506yrbagrg.cloudfront.net/ https://*.ipify.org/ https://*.crazyegg.com/ http://trk.cetrk.com/ https://s3.amazonaws.com/trk.cetrk.com/;`, - `font-src 'self' https://fonts.gstatic.com;`, + `font-src 'self' https://fonts.gstatic.com data:`, ].join(' '); /* eslint-enable */