You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by jo...@apache.org on 2017/02/10 05:08:55 UTC
zeppelin git commit: [MINOR] broken logo url in web dev mode
Repository: zeppelin
Updated Branches:
refs/heads/master 9413323ed -> b8600a630
[MINOR] broken logo url in web dev mode
### What is this PR for?
zeppelin logo image (zepLogo.png) is broken in `web dev` mode like below screenshot.

### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-1943
### How should this be tested?
1. Run front-end application in [dev mode](https://github.com/apache/zeppelin/tree/master/zeppelin-web)
2. Open console in web developer mode.
3. Connect/refresh localhost:9000
4. Check to be shown Logo image in Zeppelin home.

5. Check errors in console.
### Screenshots (if appropriate)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: soralee <so...@nflabs.com>
Author: soralee <so...@zepl.com>
Closes #1892 from soralee/ZEPPELIN-1943_logo and squashes the following commits:
7819871 [soralee] extract variable express
41b4be6 [soralee] web dev mode enable context path
a09b8fe [soralee] web dev mode enable context path
28ec0e1 [soralee] change zeppelin log path
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b8600a63
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b8600a63
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b8600a63
Branch: refs/heads/master
Commit: b8600a63011fa06ee07013c06ce1eebb0a1be55d
Parents: 9413323
Author: soralee <so...@nflabs.com>
Authored: Thu Feb 2 16:47:38 2017 +0900
Committer: Jongyoul Lee <jo...@apache.org>
Committed: Fri Feb 10 14:08:45 2017 +0900
----------------------------------------------------------------------
zeppelin-web/webpack.config.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b8600a63/zeppelin-web/webpack.config.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/webpack.config.js b/zeppelin-web/webpack.config.js
index 8198b55..f9aa0ed 100644
--- a/zeppelin-web/webpack.config.js
+++ b/zeppelin-web/webpack.config.js
@@ -28,6 +28,7 @@ var InsertLiveReloadPlugin = function InsertLiveReloadPlugin(options) {
this.port = this.options.port || 35729;
this.hostname = this.options.hostname || 'localhost';
}
+var express = require('express');
InsertLiveReloadPlugin.prototype.autoloadJs = function autoloadJs() {
return
@@ -267,9 +268,11 @@ module.exports = function makeWebpackConfig () {
progress: true,
contentBase: './src',
setup: function(app) {
- app.use(
- '/bower_components/',
- require('express').static(path.join(__dirname, './bower_components/')));
+ app.use('**/bower_components/', express.static(path.resolve(__dirname, './bower_components/')));
+ app.use('**/app/', express.static(path.resolve(__dirname, './src/app/')));
+ app.use('**/assets/', express.static(path.resolve(__dirname, './src/assets/')));
+ app.use('**/fonts/', express.static(path.resolve(__dirname, './src/fonts/')));
+ app.use('**/components/', express.static(path.resolve(__dirname, './src/components/')));
},
stats: 'minimal',
};