[CORD-2030] Subscriber dashboard
Change-Id: Ie12cc13537975fd5e5ca8628d4ad14ce4810a925
diff --git a/xos/gui/conf/browsersync.conf.js b/xos/gui/conf/browsersync.conf.js
index b5bf434..9402505 100755
--- a/xos/gui/conf/browsersync.conf.js
+++ b/xos/gui/conf/browsersync.conf.js
@@ -1,13 +1,10 @@
/*
* Copyright 2017-present Open Networking Foundation
-
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
-
* http://www.apache.org/licenses/LICENSE-2.0
-
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,11 +24,8 @@
conf.paths.src
],
middleware: function (req, res, next) {
- if (req.url.indexOf('xosapi') !== -1) {
- proxy.api.web(req, res);
- }
- else if (req.url.indexOf('spa') !== -1 || req.url.indexOf('socket') !== -1) {
- proxy.static.web(req, res);
+ if (req.url.indexOf('xosapi') !== -1 || req.url.indexOf('xos') !== -1 || req.url.indexOf('socket') !== -1) {
+ proxy.web(req, res);
}
else {
next();
@@ -40,4 +34,4 @@
},
open: false
};
-};
+};
\ No newline at end of file
diff --git a/xos/gui/conf/proxy.js b/xos/gui/conf/proxy.js
index b6e5e83..41908c0 100644
--- a/xos/gui/conf/proxy.js
+++ b/xos/gui/conf/proxy.js
@@ -1,13 +1,9 @@
-
/*
* Copyright 2017-present Open Networking Foundation
-
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
-
* http://www.apache.org/licenses/LICENSE-2.0
-
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,34 +11,21 @@
* limitations under the License.
*/
-
const httpProxy = require('http-proxy');
const target = process.env.PROXY || '192.168.46.100';
-const apiProxy = httpProxy.createProxyServer({
- target: `http://${target}:9101`
+console.log(`proxy setup to: ${target}`);
+
+const proxy = httpProxy.createProxyServer({
+ target: `http://${target}`
});
-const staticFilesProxy = httpProxy.createProxyServer({
- target: `http://${target}/spa`
-});
-
-apiProxy.on('error', (error, req, res) => {
+proxy.on('error', (error, req, res) => {
res.writeHead(500, {
'Content-Type': 'text/plain'
});
console.error('[Proxy]', error);
});
-staticFilesProxy.on('error', (error, req, res) => {
- res.writeHead(500, {
- 'Content-Type': 'text/plain'
- });
- console.error('[Proxy]', error);
-});
-
-module.exports = {
- api: apiProxy,
- static: staticFilesProxy
-};
+module.exports = proxy;
diff --git a/xos/gui/conf/webpack-dist.conf.js b/xos/gui/conf/webpack-dist.conf.js
index 36fbd97..5c66822 100755
--- a/xos/gui/conf/webpack-dist.conf.js
+++ b/xos/gui/conf/webpack-dist.conf.js
@@ -82,7 +82,7 @@
compress: {unused: true, dead_code: true, warnings: false}, // eslint-disable-line camelcase
mangle: false // NOTE mangling was breaking the build
}),
- new ExtractTextPlugin('index-[contenthash].css'),
+ new ExtractTextPlugin('index.css'),
new webpack.optimize.CommonsChunkPlugin({name: 'vendor'}),
new webpack.ProvidePlugin({
$: "jquery",