diff --git a/.env.development b/.env.development index 5562292a..e931df1c 100644 --- a/.env.development +++ b/.env.development @@ -17,7 +17,7 @@ MARKETING_SITE_BASE_URL='http://localhost:18000' ORDER_HISTORY_URL='http://localhost:1996/orders' REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh' SEGMENT_KEY='' -SITE_NAME='edX' +SITE_NAME='Your Platform Name Here' USER_INFO_COOKIE_NAME='edx-user-info' AUTHN_MINIMAL_HEADER=true LOGIN_ISSUE_SUPPORT_LINK='/login-issue-support-url' diff --git a/.env.test b/.env.test index c37be5e6..c7af6e60 100644 --- a/.env.test +++ b/.env.test @@ -15,7 +15,7 @@ MARKETING_SITE_BASE_URL='http://localhost:18000' ORDER_HISTORY_URL='http://localhost:1996/orders' REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh' SEGMENT_KEY='' -SITE_NAME='edX' +SITE_NAME='Your Platform Name Here' USER_INFO_COOKIE_NAME='edx-user-info' LOGIN_ISSUE_SUPPORT_LINK='https://login-issue-support-url.com' USER_SURVEY_COOKIE_NAME='openedx-user-survey-type' diff --git a/src/base-component/AuthExtraLargeLayout.jsx b/src/base-component/AuthExtraLargeLayout.jsx index 338e148f..87b89c1b 100644 --- a/src/base-component/AuthExtraLargeLayout.jsx +++ b/src/base-component/AuthExtraLargeLayout.jsx @@ -18,7 +18,7 @@ const AuthExtraLargeLayout = (props) => {
- edx + {getConfig().SITE_NAME}
diff --git a/src/base-component/AuthMediumLayout.jsx b/src/base-component/AuthMediumLayout.jsx index bda34205..59df909b 100644 --- a/src/base-component/AuthMediumLayout.jsx +++ b/src/base-component/AuthMediumLayout.jsx @@ -17,7 +17,7 @@ const AuthMediumLayout = (props) => {
- edx + {getConfig().SITE_NAME}
diff --git a/src/base-component/AuthSmallLayout.jsx b/src/base-component/AuthSmallLayout.jsx index a197c623..e420fcf0 100644 --- a/src/base-component/AuthSmallLayout.jsx +++ b/src/base-component/AuthSmallLayout.jsx @@ -17,7 +17,7 @@ const AuthSmallLayout = (props) => { return (
- edx + {getConfig().SITE_NAME}
diff --git a/src/base-component/LargeLayout.jsx b/src/base-component/LargeLayout.jsx index 5a5dd69d..9da26e64 100644 --- a/src/base-component/LargeLayout.jsx +++ b/src/base-component/LargeLayout.jsx @@ -10,7 +10,7 @@ const LargeLayout = ({ experimentName, isRegistrationPage }) => (
- edx + {getConfig().SITE_NAME}
diff --git a/src/base-component/MediumLayout.jsx b/src/base-component/MediumLayout.jsx index e653159b..e82a070a 100644 --- a/src/base-component/MediumLayout.jsx +++ b/src/base-component/MediumLayout.jsx @@ -35,7 +35,7 @@ const MediumLayout = (props) => {
- edx + {getConfig().SITE_NAME}
{ {intl.formatMessage(messages['code.copied'])} - +

- You have successfully signed into Google, but your Google account does not have a linked edX account. To link your accounts, sign in now using your edX password. + You have successfully signed into Google, but your Google account does not have a linked Your Platform Name Here account. To link your accounts, sign in now using your Your Platform Name Here password.

@@ -38,7 +38,7 @@ exports[`ThirdPartyAuthAlert should match register page third party auth alert m Almost done!

- You've successfully signed into Google! We just need a little more information before you start learning with edX. + You've successfully signed into Google! We just need a little more information before you start learning with Your Platform Name Here.

diff --git a/src/login/tests/LoginPage.test.jsx b/src/login/tests/LoginPage.test.jsx index 3b782efb..03d858b7 100644 --- a/src/login/tests/LoginPage.test.jsx +++ b/src/login/tests/LoginPage.test.jsx @@ -238,8 +238,9 @@ describe('LoginPage', () => { }, }); - const expectedMessage = 'You have successfully signed into Apple, but your Apple account does not have a ' - + 'linked edX account. To link your accounts, sign in now using your edX password.'; + const expectedMessage = `${'You have successfully signed into Apple, but your Apple account does not have a ' + + 'linked '}${ getConfig().SITE_NAME } account. To link your accounts, sign in now using your ${ + getConfig().SITE_NAME } password.`; const loginPage = mount(reduxWrapper()); expect(loginPage.find('#tpa-alert').find('p').text()).toEqual(expectedMessage); diff --git a/src/register/tests/RegistrationPage.test.jsx b/src/register/tests/RegistrationPage.test.jsx index 97298e9b..88faeecc 100644 --- a/src/register/tests/RegistrationPage.test.jsx +++ b/src/register/tests/RegistrationPage.test.jsx @@ -271,14 +271,14 @@ describe('RegistrationPage', () => { ...initialState.register, registrationError: { username: [{ userMessage: 'It looks like this username is already taken' }], - email: [{ userMessage: 'This email is already associated with an existing or previous edX account' }], + email: [{ userMessage: `This email is already associated with an existing or previous ${ getConfig().SITE_NAME } account` }], }, }, }); const registrationPage = mount(reduxWrapper()).find('RegistrationPage'); expect(registrationPage.prop('validationDecisions')).toEqual({ country: '', - email: 'This email is already associated with an existing or previous edX account', + email: `This email is already associated with an existing or previous ${ getConfig().SITE_NAME } account`, name: '', password: '', username: 'It looks like this username is already taken', @@ -355,8 +355,8 @@ describe('RegistrationPage', () => { }, }); - const expectedMessage = 'You\'ve successfully signed into Apple! We just need a little more information before ' - + 'you start learning with edX.'; + const expectedMessage = `${'You\'ve successfully signed into Apple! We just need a little more information before ' + + 'you start learning with '}${ getConfig().SITE_NAME }.`; const registerPage = mount(reduxWrapper()); expect(registerPage.find('#tpa-alert').find('p').text()).toEqual(expectedMessage);