Skip to content

Instantly share code, notes, and snippets.

@bwalsh
Created January 9, 2017 20:57
Show Gist options
  • Save bwalsh/13041c751d5d00930fe6c306e4a83af8 to your computer and use it in GitHub Desktop.
Save bwalsh/13041c751d5d00930fe6c306e4a83af8 to your computer and use it in GitHub Desktop.
ui changes not committed to git
diff --git a/dcc-portal-ui/app/develop/scripts/config.js b/dcc-portal-ui/app/develop/scripts/config.js
index 5fb070c..5923632 100644
--- a/dcc-portal-ui/app/develop/scripts/config.js
+++ b/dcc-portal-ui/app/develop/scripts/config.js
@@ -1,9 +1,9 @@
// Global $ICGC_DEV_CONFIG used for dev environment
// profile
global.$ICGC_DEV_CONFIG = {
- // Set DEVELOPER_LOCAL_MODE to true to turn on local developer profile
- // for the 'grunt server' task
- DEVELOPER_LOCAL_MODE: true,
- API_PORT: 443,
- HOST: 'dcc.icgc.org'
+ // Set DEVELOPER_LOCAL_MODE to true to turn on local developer profile
+ // for the 'grunt server' task
+ DEVELOPER_LOCAL_MODE: true,
+ API_PORT: 80,
+ HOST: 'local.dcc.icgc.org'
};
diff --git a/dcc-portal-ui/config/webpack.config.dev.js b/dcc-portal-ui/config/webpack.config.dev.js
index e18ba41..5968557 100644
--- a/dcc-portal-ui/config/webpack.config.dev.js
+++ b/dcc-portal-ui/config/webpack.config.dev.js
@@ -23,7 +23,7 @@ module.exports = {
pathinfo: true,
filename: 'static/js/[name].js',
// On openstack, this path needs to match the external IP and port
- publicPath: 'http://local.dcc.icgc.org:9000/',
+ publicPath: 'http://local.dcc.icgc.org/',
},
resolve: {
extensions: ['', '.js', '.json'],
@@ -62,8 +62,8 @@ module.exports = {
},
{
search: '\<branding-settings\>\<\/branding-settings\>',
- replace: `<script>window.$ICGC_BRANDING = ${JSON.stringify(require('./ICGC_BRANDING.js'))}</script>`
-// replace: `<script>window.$ICGC_BRANDING = ${JSON.stringify(require('./CUSTOM_BRANDING.js'))}</script>`
+// replace: `<script>window.$ICGC_BRANDING = ${JSON.stringify(require('./ICGC_BRANDING.js'))}</script>`
+ replace: `<script>window.$ICGC_BRANDING = ${JSON.stringify(require('./CUSTOM_BRANDING.js'))}</script>`
}
]
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment