Merge branch 'master' into dev

Author: Parth Shah

src/components/TopBar/TopBar.jsx

@@ -53,7 +53,7 @@ class TopBar extends Component {
       isPowerUser, loginUrl, registerUrl, isFilterVisible
     } = this.props
     const homePageUrl = window.location.protocol + '//' + window.location.hostname
-    const logoutLink = 'https://accounts.' + domain + '/#/logout?retUrl=' + homePageUrl
+    const logoutLink = 'https://accounts.' + domain + '/#!/logout?retUrl=' + homePageUrl
     const isLoggedIn = !!userHandle
     const logoTargetUrl = isLoggedIn ? '/projects' : '/'
 

src/config/constants.js

@@ -180,8 +180,8 @@ export const PROJECT_ATTACHMENTS_FOLDER = process.env.PROJECT_ATTACHMENTS_FOLDER
 export const DOMAIN = process.env.domain || 'topcoder.com'
 export const CONNECT_DOMAIN = `connect.${DOMAIN}`
 export const ACCOUNTS_APP_CONNECTOR_URL = process.env.ACCOUNTS_APP_CONNECTOR_URL
-export const ACCOUNTS_APP_LOGIN_URL = `https://accounts.${DOMAIN}/#/connect`
-export const ACCOUNTS_APP_REGISTER_URL = `https://accounts.${DOMAIN}/#/connect/registration`
+export const ACCOUNTS_APP_LOGIN_URL = `https://accounts.${DOMAIN}/#!/connect`
+export const ACCOUNTS_APP_REGISTER_URL = `https://accounts.${DOMAIN}/#!/connect/registration`
 
 export const TC_API_URL = `https://api.${DOMAIN}`
 export const DIRECT_PROJECT_URL = `https://www.${DOMAIN}/direct/projectOverview?formData.projectId=`
@@ -214,4 +214,4 @@ export const PROJECT_MAX_COLORS = 5
 
 export const AUTOCOMPLETE_TRIGGER_LENGTH = 3
 
-export const HEAP_ANALYTICS_APP_ID = process.env.HEAP_ANALYTICS_APP_ID || '4153837120'
+export const HEAP_ANALYTICS_APP_ID = process.env.HEAP_ANALYTICS_APP_ID || '4153837120'