forks/peertube
1
0
Fork 0
Code Releases Activity

Fix missing default avatar

Browse source
This commit is contained in:
Chocobozzz 2017-12-05 15:01:47 +01:00
parent be6a480232
commit 6bafac54bf
No known key found for this signature in database
GPG key ID: 583A612D890159BE
5 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/config/webpack.common.js
View file

@ -13,6 +13,7 @@ const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin')
const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin') const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin')
const InlineManifestWebpackPlugin = require('inline-manifest-webpack-plugin') const InlineManifestWebpackPlugin = require('inline-manifest-webpack-plugin')
const ngcWebpack = require('ngc-webpack') const ngcWebpack = require('ngc-webpack')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const WebpackNotifierPlugin = require('webpack-notifier') const WebpackNotifierPlugin = require('webpack-notifier')
@ -267,6 +268,17 @@ module.exports = function (options) {
inject: 'body' 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 * Plugin: ScriptExtHtmlWebpackPlugin
* Description: Enhances html-webpack-plugin functionality * Description: Enhances html-webpack-plugin functionality

2
client/src/app/shared/users/user.model.ts
View file

@ -54,6 +54,6 @@ export class User implements UserServerModel {
getAvatarPath () { getAvatarPath () {
if (this.account && this.account.avatar) return this.account.avatar.path if (this.account && this.account.avatar) return this.account.avatar.path
return '/assets/images/default-avatar.png' return '/client/assets/images/default-avatar.png'
} }
} }

BIN
client/src/assets/images/favicon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 539 B

2
client/src/index.html
View file

@ -11,7 +11,7 @@
<!-- open graph and oembed tags --> <!-- open graph and oembed tags -->
<!-- Do not remove it! --> <!-- 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 url -->
<base href="<%= htmlWebpackPlugin.options.metadata.baseUrl %>"> <base href="<%= htmlWebpackPlugin.options.metadata.baseUrl %>">

2
server/controllers/client.ts
View file

@ -18,6 +18,7 @@ import { VideoInstance } from '../models'
const clientsRouter = express.Router() const clientsRouter = express.Router()
const distPath = join(root(), 'client', 'dist') const distPath = join(root(), 'client', 'dist')
const assetsImagesPath = join(root(), 'client', 'dist', 'assets', 'images')
const embedPath = join(distPath, 'standalone', 'videos', 'embed.html') const embedPath = join(distPath, 'standalone', 'videos', 'embed.html')
const indexPath = join(distPath, 'index.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 // Static HTML/CSS/JS client files
clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE })) 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 // 404 for static files not found
clientsRouter.use('/client/*', (req: express.Request, res: express.Response, next: express.NextFunction) => { clientsRouter.use('/client/*', (req: express.Request, res: express.Response, next: express.NextFunction) => {