Merge "Fixing GUI docs"
diff --git a/conf/app/app.config.dev.js b/conf/app/app.config.dev.js
deleted file mode 100644
index 780a767..0000000
--- a/conf/app/app.config.dev.js
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-angular.module('app')
- .constant('AppConfig', {
- apiEndpoint: '/xosapi/v1',
- websocketClient: 'http://192.168.46.100'
- });
diff --git a/conf/app/app.config.local.ts b/conf/app/app.config.local.ts
deleted file mode 100644
index 68f9712..0000000
--- a/conf/app/app.config.local.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-import {IAppConfig} from './interfaces';
-export const AppConfig: IAppConfig = {
- apiEndpoint: 'http://localhost:4000/api',
- websocketClient: 'http://localhost:4000/'
-};
diff --git a/conf/app/app.config.production.js b/conf/app/app.config.production.js
index e47ea73..780a767 100644
--- a/conf/app/app.config.production.js
+++ b/conf/app/app.config.production.js
@@ -19,5 +19,5 @@
angular.module('app')
.constant('AppConfig', {
apiEndpoint: '/xosapi/v1',
- websocketClient: '/'
+ websocketClient: 'http://192.168.46.100'
});
diff --git a/conf/app/app.config.test.js b/conf/app/app.config.test.js
deleted file mode 100644
index 37034fb..0000000
--- a/conf/app/app.config.test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-angular.module('app')
- .constant('AppConfig', {
- apiEndpoint: 'http://xos-test:3000/api',
- websocketClient: 'http://xos-test:3000'
- });
diff --git a/conf/webpack-dist.conf.js b/conf/webpack-dist.conf.js
index ef3f469..ba79816 100644
--- a/conf/webpack-dist.conf.js
+++ b/conf/webpack-dist.conf.js
@@ -26,7 +26,6 @@
const autoprefixer = require('autoprefixer');
const BaseHrefWebpackPlugin = require('base-href-webpack-plugin').BaseHrefWebpackPlugin;
const CopyWebpackPlugin = require('copy-webpack-plugin');
-const env = process.env.NODE_ENV || 'production';
const brand = process.env.BRAND || 'cord';
module.exports = {
@@ -69,7 +68,7 @@
},
plugins: [
new CopyWebpackPlugin([
- { from: `./conf/app/app.config.${env}.js`, to: `app.config.js` },
+ { from: `./conf/app/app.config.production.js`, to: `app.config.js` },
{ from: `./conf/app/style.config.${brand}.js`, to: `style.config.js` },
]),
new webpack.optimize.OccurrenceOrderPlugin(),
diff --git a/conf/webpack.conf.js b/conf/webpack.conf.js
index 6f21642..7f5197e 100644
--- a/conf/webpack.conf.js
+++ b/conf/webpack.conf.js
@@ -24,7 +24,6 @@
const autoprefixer = require('autoprefixer');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const env = process.env.NODE_ENV || 'production';
const brand = process.env.BRAND || 'cord';
module.exports = {
@@ -80,7 +79,7 @@
},
plugins: [
new CopyWebpackPlugin([
- { from: `./conf/app/app.config.${env}.js`, to: `app.config.js` },
+ { from: `./conf/app/app.config.production.js`, to: `app.config.js` },
{ from: `./conf/app/style.config.${brand}.js`, to: `style.config.js` },
]),
new webpack.optimize.OccurrenceOrderPlugin(),
diff --git a/docs/developer/quickstart.md b/docs/developer/quickstart.md
index c82dfe7..c0b05a0 100644
--- a/docs/developer/quickstart.md
+++ b/docs/developer/quickstart.md
@@ -51,8 +51,8 @@
There are two configuration file available in the application, and they depend on the environment. You can find the various possibilities in `conf/app`, and they regard application constants, such as `apiEndpoint`, or branding elements, such as `projectName`.
-To load a different configration file you can use two environment variables:
-- `NODE_ENV`: to configure the app constants (eg: `dev`, `production`)
+To load a different configuration file you can use two environment variables:
+- `PROXY`: you can use this variable to send request to an arbitrary XOS installation (eg: `clnode022.clemson.cloudlab.us:8080`)
- `BRAND`: to configure style constants (eg: `cord`, `opencloud`)
You can also specify a different installation of XOS as backend by using the `PROXY` environment variable.