Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 66581200C25 for ; Fri, 10 Feb 2017 06:08:57 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 64EAD160B64; Fri, 10 Feb 2017 05:08:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B07CE160B50 for ; Fri, 10 Feb 2017 06:08:56 +0100 (CET) Received: (qmail 49536 invoked by uid 500); 10 Feb 2017 05:08:55 -0000 Mailing-List: contact commits-help@zeppelin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zeppelin.apache.org Delivered-To: mailing list commits@zeppelin.apache.org Received: (qmail 49527 invoked by uid 99); 10 Feb 2017 05:08:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Feb 2017 05:08:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9BCFADFBDB; Fri, 10 Feb 2017 05:08:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jongyoul@apache.org To: commits@zeppelin.apache.org Message-Id: <36e58f24b4f74091bf9239700eac004c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: zeppelin git commit: [MINOR] broken logo url in web dev mode Date: Fri, 10 Feb 2017 05:08:55 +0000 (UTC) archived-at: Fri, 10 Feb 2017 05:08:57 -0000 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. ![screenshot from 2017-01-12 14-50-35](https://cloud.githubusercontent.com/assets/8110458/21883058/948cdd2c-d8f0-11e6-8a48-f738a811259f.png) ### 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. ![image](https://cloud.githubusercontent.com/assets/8110458/21883383/3551188a-d8f2-11e6-980e-cc4045890172.png) 5. Check errors in console. ### Screenshots (if appropriate) ![screenshot from 2017-01-12 16-58-40](https://cloud.githubusercontent.com/assets/8110458/21883263/972a2372-d8f1-11e6-82d5-543d0995bded.png) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: soralee Author: soralee 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 Authored: Thu Feb 2 16:47:38 2017 +0900 Committer: Jongyoul Lee 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', };