From 6bafac54bf375cd60f1c06f6afdc648e0e19743d Mon Sep 17 00:00:00 2001 From: Chocobozzz 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 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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 @@ - + 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) => { -- 2.25.1