From 6bafac54bf375cd60f1c06f6afdc648e0e19743d Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Tue, 5 Dec 2017 15:01:47 +0100
Subject: [PATCH] Fix missing default avatar

---
 client/config/webpack.common.js           |  12 ++++++++++++
 client/src/app/shared/users/user.model.ts |   2 +-
 client/src/assets/images/favicon.png      | Bin 2335 -> 539 bytes
 client/src/index.html                     |   2 +-
 server/controllers/client.ts              |   2 ++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js
index acf22dab1..c37516271 100644
--- a/client/config/webpack.common.js
+++ b/client/config/webpack.common.js
@@ -13,6 +13,7 @@ const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin')
 const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin')
 const InlineManifestWebpackPlugin = require('inline-manifest-webpack-plugin')
 const ngcWebpack = require('ngc-webpack')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
 
 const WebpackNotifierPlugin = require('webpack-notifier')
 
@@ -267,6 +268,17 @@ module.exports = function (options) {
         inject: 'body'
       }),
 
+      new CopyWebpackPlugin([
+        {
+          from: helpers.root('src/assets/images/favicon.png'),
+          to: 'assets/images/favicon.png'
+        },
+        {
+          from: helpers.root('src/assets/images/default-avatar.png'),
+          to: 'assets/images/default-avatar.png'
+        }
+      ]),
+
       /*
        * Plugin: ScriptExtHtmlWebpackPlugin
        * Description: Enhances html-webpack-plugin functionality
diff --git a/client/src/app/shared/users/user.model.ts b/client/src/app/shared/users/user.model.ts
index 220362ef0..9364ae721 100644
--- a/client/src/app/shared/users/user.model.ts
+++ b/client/src/app/shared/users/user.model.ts
@@ -54,6 +54,6 @@ export class User implements UserServerModel {
   getAvatarPath () {
     if (this.account && this.account.avatar) return this.account.avatar.path
 
-    return '/assets/images/default-avatar.png'
+    return '/client/assets/images/default-avatar.png'
   }
 }
diff --git a/client/src/assets/images/favicon.png b/client/src/assets/images/favicon.png
index bb57ee6b0200ec38a2e0205edcd80ca2e602c3b9..cef0f0d2e2d36017421b9e327ae46a11c1b6373f 100644
GIT binary patch
literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000mG000&U1^@s6$*LTD00006VoOIv00000
z008+zyMF)x010qNS#tmY4(R{@4(S07GeR5y000McNliru;S2>12P+DJJvjgX0jNnt
zK~y-)rIfo%LSY!jpYJ5pCxHqE(itieIuTj4<Q5HGKxhb?nlh)X(`~E8;*3HR*xHn}
z<Y@3&wp6PG{SA3GFN9@iZ;OVPP8{ojZ+Us&=lSv7aGgjH5#g^3!$S%MRsxjCWa!TZ
z1AYB8HtM0+d8};{2~`ye1?=zbVKuNyx~>yUN@_0LrBaxmox?@!!jwrzkJA}0m&*;s
zQmKU0?JaV-e0a(;IKjB>(lkL$s;VM<5VpJ?`4&Fz&&afaEXxo#No?(GGa{-`F^~82
zO%$VkqTCDpYOtZIxPN@GxZQ5n+*p1Vcs-m%GmTWAx?N2*!lkzw&C)jwJB>zZEfne?
zqR*d(3cG!TVz#BuxDB0)hmeL81^<yHnM^{{w2H3lIhV`jFf}wXgRbQhNDi4v0FcdQ
z5s5_XLI`4v86GX;Hgqi?!@7ROB!|oZz*65JgfOJ3PyO{CG}AC^YifhB5v~vd@p!z_
zJw5rv?7icL`|(qea}J-+2d~%5+J23SqCnF$yP4qz1I{`8em{c2AS0rDTmM13sSQe}
d)BpNZzW{BWT`yshb*%sZ002ovPDHLkV1j~5=B5Au

literal 2335
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
FV1g|HPU-*v

diff --git a/client/src/index.html b/client/src/index.html
index 8e94b903d..4af6b12f6 100644
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -11,7 +11,7 @@
     <!-- open graph and oembed tags -->
     <!-- Do not remove it! -->
 
-    <link rel="icon" type="image/png" href="/client/assets/favicon.png" />
+    <link rel="icon" type="image/png" href="/client/assets/images/favicon.png" />
 
     <!-- base url -->
     <base href="<%= htmlWebpackPlugin.options.metadata.baseUrl %>">
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index 64e5829ca..f474c4282 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -18,6 +18,7 @@ import { VideoInstance } from '../models'
 const clientsRouter = express.Router()
 
 const distPath = join(root(), 'client', 'dist')
+const assetsImagesPath = join(root(), 'client', 'dist', 'assets', 'images')
 const embedPath = join(distPath, 'standalone', 'videos', 'embed.html')
 const indexPath = join(distPath, 'index.html')
 
@@ -33,6 +34,7 @@ clientsRouter.use('/videos/embed', (req: express.Request, res: express.Response,
 
 // Static HTML/CSS/JS client files
 clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE }))
+clientsRouter.use('/client/assets/images', express.static(assetsImagesPath, { maxAge: STATIC_MAX_AGE }))
 
 // 404 for static files not found
 clientsRouter.use('/client/*', (req: express.Request, res: express.Response, next: express.NextFunction) => {