GH-278 Remove favicon.png, cache and fix dimensions of icon.png

cwt-wa · May 23, 2021 · 762be5f · 762be5f
1 parent 6d0cfdf
commit 762be5f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/cwt-angular/config/webpack.common.js b/cwt-angular/config/webpack.common.js
@@ -55,7 +55,7 @@ module.exports = {
             },
             {
                 test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-                exclude: /(favicon.ico|favicon.png|loading.gif|flags\/.*?.png|weapons\/.*?.gif)$/,
+                exclude: /(favicon.ico|icon.png|loading.gif|flags\/.*?.png|weapons\/.*?.gif)$/,
                 use: ['file-loader?name=assets/[name].[hash].[ext]']
             },
             {
@@ -75,8 +75,8 @@ module.exports = {
                 use: ['file-loader?name=loading.gif']
             },
             {
-                test: /favicon.png$/,
-                use: ['file-loader?name=assets/favicon.png']
+                test: /icon.png$/,
+                use: ['file-loader?name=assets/icon.png']
             },
             {
                 type: 'javascript/auto',

diff --git a/cwt-angular/src/main/webapp/app/main.ts b/cwt-angular/src/main/webapp/app/main.ts
@@ -7,7 +7,7 @@ import {platformBrowserDynamic} from "@angular/platform-browser-dynamic";
 import {enableProdMode} from "@angular/core";
 import {AppModule} from "./_modules/app.module";
 
-import '../img/favicon.png'; // for the icon in manifest.json
+import '../img/icon.png'; // for the icon in manifest.json
 import '../img/favicon.ico'; // for the favicon
 import '../manifest.json';
 

diff --git a/cwt-angular/src/main/webapp/img/favicon.png b/cwt-angular/src/main/webapp/img/favicon.png
diff --git a/cwt-angular/src/main/webapp/manifest.json b/cwt-angular/src/main/webapp/manifest.json
@@ -8,9 +8,9 @@
       "type": "image/x-icon"
     },
     {
-      "src": "/assets/favicon.png",
+      "src": "/assets/icon.png",
       "type": "image/png",
-      "sizes": "192x192"
+      "sizes": "148x148"
     }
   ],
   "start_url": "/",