);
-LargeLayout.defaultProps = {
- experimentName: '',
- isRegistrationPage: false,
-};
-
-LargeLayout.propTypes = {
- experimentName: PropTypes.string,
- isRegistrationPage: PropTypes.bool,
-};
-
export default LargeLayout;
diff --git a/src/base-component/LargeLeftLayout.jsx b/src/base-component/LargeLeftLayout.jsx
index e9667b28..29bbee2e 100644
--- a/src/base-component/LargeLeftLayout.jsx
+++ b/src/base-component/LargeLeftLayout.jsx
@@ -1,73 +1,32 @@
-import React, { useState } from 'react';
+import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Toast } from '@edx/paragon';
-import { faCut } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import classNames from 'classnames';
-import ClipboardJS from 'clipboard';
-import PropTypes from 'prop-types';
import messages from './messages';
-import SideDiscountBanner from './SideDiscountBanner';
const LargeLeftLayout = (props) => {
- const { intl, isRegistrationPage, experimentName } = props;
- const [showToast, setToastShow] = useState(false);
- new ClipboardJS('.copyIcon'); // eslint-disable-line no-new
+ const { intl } = props;
return (
-
setToastShow(false)}
- show={showToast}
- >
- {intl.formatMessage(messages['code.copied'])}
-
-
-
+
+
{intl.formatMessage(messages['start.learning'])}
-
+
{intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
- {experimentName === 'variation1' && isRegistrationPage ? (
-
-
-
-
-
- EDXWELCOME
- setToastShow(true)}
- />
-
-
- ) : null}
@@ -76,13 +35,6 @@ const LargeLeftLayout = (props) => {
LargeLeftLayout.propTypes = {
intl: intlShape.isRequired,
- experimentName: PropTypes.string,
- isRegistrationPage: PropTypes.bool,
-};
-
-LargeLeftLayout.defaultProps = {
- experimentName: '',
- isRegistrationPage: false,
};
export default injectIntl(LargeLeftLayout);
diff --git a/src/base-component/MediumLayout.jsx b/src/base-component/MediumLayout.jsx
index 3e6576b4..8a8ba044 100644
--- a/src/base-component/MediumLayout.jsx
+++ b/src/base-component/MediumLayout.jsx
@@ -1,36 +1,16 @@
-import React, { useState } from 'react';
+import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image, Toast } from '@edx/paragon';
-import { faCut } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import classNames from 'classnames';
-import ClipboardJS from 'clipboard';
-import PropTypes from 'prop-types';
+import { Hyperlink, Image } from '@edx/paragon';
import messages from './messages';
-import SideDiscountBanner from './SideDiscountBanner';
const MediumLayout = (props) => {
- const { intl, isRegistrationPage, experimentName } = props;
- const [showToast, setToastShow] = useState(false);
- new ClipboardJS('.copyIcon'); // eslint-disable-line no-new
+ const { intl } = props;
return (
-
-
setToastShow(false)}
- show={showToast}
- >
- {intl.formatMessage(messages['code.copied'])}
-
+
@@ -40,41 +20,18 @@ const MediumLayout = (props) => {
role="img"
aria-label=""
focusable={false}
- className={classNames(
- 'medium-screen-svg-line pl-5',
- {
- 'variation1-bar-color': experimentName === 'variation1' && isRegistrationPage,
- 'variation2-bar-color': experimentName === 'variation2' && isRegistrationPage,
- },
- )}
+ className="medium-screen-svg-line pl-5"
>
{intl.formatMessage(messages['start.learning'])}
-
+
{intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
- {experimentName === 'variation1' && isRegistrationPage ? (
-
-
-
- EDXWELCOME
- setToastShow(true)}
- />
-
-
- ) : null}
@@ -92,13 +49,6 @@ const MediumLayout = (props) => {
MediumLayout.propTypes = {
intl: intlShape.isRequired,
- experimentName: PropTypes.string,
- isRegistrationPage: PropTypes.bool,
-};
-
-MediumLayout.defaultProps = {
- experimentName: '',
- isRegistrationPage: false,
};
export default injectIntl(MediumLayout);
diff --git a/src/base-component/SideDiscountBanner.jsx b/src/base-component/SideDiscountBanner.jsx
deleted file mode 100644
index 2702d880..00000000
--- a/src/base-component/SideDiscountBanner.jsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-
-import { FormattedMessage } from '@edx/frontend-platform/i18n';
-
-export default function SideDiscountBanner() {
- const getDiscountText = () => (
-
- 15%
-
- );
- const getCerificateMsg = () => (
-
-
-
- );
- return (
-
- ,
- certificateMsg: getCerificateMsg(),
- }}
- />
-
- );
-}
diff --git a/src/base-component/SmallLayout.jsx b/src/base-component/SmallLayout.jsx
index b0302fae..60d83671 100644
--- a/src/base-component/SmallLayout.jsx
+++ b/src/base-component/SmallLayout.jsx
@@ -1,31 +1,17 @@
-import React, { useState } from 'react';
+import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image, Toast } from '@edx/paragon';
-import { faCut } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import classNames from 'classnames';
-import ClipboardJS from 'clipboard';
-import PropTypes from 'prop-types';
+import { Hyperlink, Image } from '@edx/paragon';
import messages from './messages';
-import SideDiscountBanner from './SideDiscountBanner';
const SmallLayout = (props) => {
- const { intl, isRegistrationPage, experimentName } = props;
- const [showToast, setToastShow] = useState(false);
- new ClipboardJS('.copyIcon'); // eslint-disable-line no-new
+ const { intl } = props;
return (
<>
-
setToastShow(false)}
- show={showToast}
- >
- {intl.formatMessage(messages['code.copied'])}
-
@@ -34,13 +20,7 @@ const SmallLayout = (props) => {
role="img"
aria-label=""
focusable={false}
- className={classNames(
- 'small-screen-svg-line',
- {
- 'variation1-bar-color': experimentName === 'variation1' && isRegistrationPage,
- 'variation2-bar-color': experimentName === 'variation2' && isRegistrationPage,
- },
- )}
+ className="small-screen-svg-line"
>
@@ -48,27 +28,10 @@ const SmallLayout = (props) => {
{intl.formatMessage(messages['start.learning'])}
-
+
{intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
- {(experimentName === 'variation1' && isRegistrationPage) ? (
-
-
-
- EDXWELCOME
- setToastShow(true)}
- />
-
-
- ) : null}
@@ -78,14 +41,6 @@ const SmallLayout = (props) => {
SmallLayout.propTypes = {
intl: intlShape.isRequired,
- experimentName: PropTypes.string,
- isRegistrationPage: PropTypes.bool,
-};
-
-SmallLayout.defaultProps = {
- experimentName: '',
- isRegistrationPage: false,
-
};
export default injectIntl(SmallLayout);
diff --git a/src/base-component/messages.jsx b/src/base-component/messages.jsx
index 13191f8a..96d61392 100644
--- a/src/base-component/messages.jsx
+++ b/src/base-component/messages.jsx
@@ -11,11 +11,6 @@ const messages = defineMessages({
defaultMessage: 'with {siteName}',
description: 'Header text with site name for logistration MFE pages',
},
- 'code.copied': {
- id: 'code.copied',
- defaultMessage: 'Code copied',
- description: 'part of 15% discount code copied',
- },
// authenticated user base component text
'complete.your.profile.1': {
id: 'complete.your.profile.1',
diff --git a/src/common-components/Logistration.jsx b/src/common-components/Logistration.jsx
index 033af66a..93aba74a 100644
--- a/src/common-components/Logistration.jsx
+++ b/src/common-components/Logistration.jsx
@@ -61,7 +61,7 @@ const Logistration = (props) => {
);
return (
-
+
{institutionLogin
? (
diff --git a/src/register/RegistrationPage.jsx b/src/register/RegistrationPage.jsx
index 5d926ced..ccdf193d 100644
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -85,7 +85,6 @@ class RegistrationPage extends React.Component {
failureCount: 0,
startTime: Date.now(),
totalRegistrationTime: 0,
- optimizelyExperimentName: '',
readOnly: true,
validatePassword: false,
values: {},
@@ -111,7 +110,6 @@ class RegistrationPage extends React.Component {
payload.is_registered = this.isRegistered;
this.props.resetRegistrationForm();
this.props.getThirdPartyAuthContext(payload);
- this.getExperiments();
}
shouldComponentUpdate(nextProps) {
@@ -178,14 +176,6 @@ class RegistrationPage extends React.Component {
return true;
}
- getExperiments = () => {
- const { experimentName } = window;
-
- if (experimentName) {
- this.setState({ optimizelyExperimentName: experimentName });
- }
- };
-
onChangeHandler = (e) => {
const { name, value, checked } = e.target;
const { errors, values } = this.state;
@@ -795,13 +785,6 @@ class RegistrationPage extends React.Component {
thirdPartyAuthApiStatus,
intl)}
- {(this.state.optimizelyExperimentName === 'variation1' || this.state.optimizelyExperimentName === 'variation2')
- ? (
-
- {intl.formatMessage(messages['certificate.msg'])}
-
- )
- : null}
>
);
diff --git a/src/register/messages.jsx b/src/register/messages.jsx
index 63b3c1eb..3fcb5c08 100644
--- a/src/register/messages.jsx
+++ b/src/register/messages.jsx
@@ -300,11 +300,6 @@ const messages = defineMessages({
defaultMessage: 'Did you mean',
description: 'Did you mean alert suggestion',
},
- 'certificate.msg': {
- id: 'certificate.msg',
- defaultMessage: '*Offer not eligible for GTx’s Analytics: Essential Tools and Methods MicroMasters Program, ColumbiaX’s Corporate Finance Professional Certificate Program, or courses or programs offered by Wharton, and NYIF.',
- description: 'Text for the 15% discount experiment',
- },
});
export default messages;