From 53c01ab10eda9dde912b9dceed9e3b568fc8fb56 Mon Sep 17 00:00:00 2001 From: vikasrohit <vikas.agarwal@appirio.com> Date: Tue, 28 Jun 2016 18:06:45 +0530 Subject: [PATCH 1/3] AS#149005557179710, Screen goes blank randomly after accounts app integration for members app -- Identified the root cause and fixed the issue --- app/topcoder.routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/topcoder.routes.js b/app/topcoder.routes.js index 8e75ff1ff..7195e2bb9 100644 --- a/app/topcoder.routes.js +++ b/app/topcoder.routes.js @@ -28,7 +28,7 @@ import moment from 'moment' if (path.indexOf('?') > -1) { return path.replace('?', '/?') } - return path + '/' + $location.replace().path(path + '/'); }) var states = { From 33b7e6911002ee2f2fe60ec1d8e7a07c80f0ee45 Mon Sep 17 00:00:00 2001 From: vikasrohit <vikas.agarwal@appirio.com> Date: Tue, 28 Jun 2016 18:09:33 +0530 Subject: [PATCH 2/3] AS#149005557179710, Screen goes blank randomly after accounts app integration for members app -- Allowed overriding accounts app constants via env variables to ease the local development --- webpack.config.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 3933f5967..9160c5b6f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -16,9 +16,14 @@ if (CI === 'master') { process.env.NODE_ENV = 'development' } - -process.env.CONNECTOR_URL = `https://accounts.${process.env.DOMAIN}/connector.html` -process.env.ACCOUNTS_APP_URL = `https://accounts.${process.env.DOMAIN}/tc` +var accountsAppURL = null +if (process.env.ACCOUNTS_APP_URL) { + accountsAppURL = process.env.ACCOUNTS_APP_URL +} +var accountsConnectorURL = null +if (process.env.ACCOUNTS_APP_CONNECTOR_URL) { + accountsConnectorURL = process.env.ACCOUNTS_APP_CONNECTOR_URL +} const config = require('appirio-tech-webpack-config')({ dirname: __dirname, @@ -34,4 +39,11 @@ const config = require('appirio-tech-webpack-config')({ if (CI) config.output.publicPath = process.env.ASSET_PREFIX +if (accountsAppURL) { + process.env.ACCOUNTS_APP_URL = accountsAppURL +} +if (accountsConnectorURL) { + process.env.ACCOUNTS_APP_CONNECTOR_URL = accountsConnectorURL +} + module.exports = config From 2659eb7bcb77057b76eb4006821665760b82c25e Mon Sep 17 00:00:00 2001 From: vikasrohit <vikas.agarwal@appirio.com> Date: Tue, 28 Jun 2016 18:14:02 +0530 Subject: [PATCH 3/3] AS#149005557179710, Screen goes blank randomly after accounts app integration for members app -- Fixed listing error --- app/topcoder.routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/topcoder.routes.js b/app/topcoder.routes.js index 7195e2bb9..bdeaef130 100644 --- a/app/topcoder.routes.js +++ b/app/topcoder.routes.js @@ -28,7 +28,7 @@ import moment from 'moment' if (path.indexOf('?') > -1) { return path.replace('?', '/?') } - $location.replace().path(path + '/'); + $location.replace().path(path + '/') }) var states = {