feat: [UEPR-187] [UEPR-192] [UEPR-194] ToU modal display logic #9248
+1,012
−275
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| import React from 'react'; | ||
| import {injectIntl, FormattedMessage} from 'react-intl'; | ||
| import Modal from '../../base/modal.jsx'; | ||
| import {TermsOfUseLink} from '../terms-of-use-modal.jsx'; | ||
| import Button from '../../../forms/button.jsx'; | ||
|
|
||
| const TermsOfUseModalOver16 = () => ( | ||
| <Modal | ||
| overlayClassName="tou-modal-overlay" | ||
| className="tou-modal" | ||
| showCloseButton={false} | ||
| isOpen | ||
| > | ||
| <div className="tou-modal-top" /> | ||
| <div className="tou-modal-content"> | ||
| <h1 className="tou-modal-heading"> | ||
| <FormattedMessage id="tos.updatedTerms" /> | ||
| </h1> | ||
| <p> | ||
| <FormattedMessage | ||
| id="tos.over16.updatedTermsNotice" | ||
| values={{ | ||
| a: TermsOfUseLink | ||
| }} | ||
| /> | ||
| </p> | ||
| <p> | ||
| <FormattedMessage id="tos.over16.acceptConfirmation" /> | ||
| </p> | ||
| <div className="tou-modal-button-container"> | ||
| <Button className="tou-modal-button filled"> | ||
| <FormattedMessage id="tos.over16.acceptContinue" /> | ||
| </Button> | ||
| </div> | ||
| </div> | ||
| </Modal> | ||
| ); | ||
|
|
||
| export default injectIntl(TermsOfUseModalOver16); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| import React, {useCallback, useState} from 'react'; | ||
| import {injectIntl, FormattedMessage} from 'react-intl'; | ||
| import TermsOfUseReminderModal from './under16/terms-of-use-reminder.jsx'; | ||
|
|
||
|
There was a problem hiding this comment. IMO, following this file hierarchy, there is no need to include |
||
| require('./terms-of-use-modal.scss'); | ||
|
|
||
| const TermsOfUseLink = chunks => { | ||
| const [isModalVisible, setIsModalVisible] = useState(false); | ||
| const handleOpenModal = useCallback(() => { | ||
| setIsModalVisible(true); | ||
| }, []); | ||
|
|
||
| const handleCloseModal = useCallback(() => { | ||
| setIsModalVisible(false); | ||
| }, []); | ||
|
|
||
| return ( | ||
| <> | ||
| <a | ||
| className="tou-banner-link" | ||
| onClick={handleOpenModal} | ||
| > | ||
| {chunks} | ||
| </a> | ||
| <TermsOfUseReminderModal | ||
| onClose={handleCloseModal} | ||
| isOpen={isModalVisible} | ||
| /> | ||
| </> | ||
| ); | ||
|
|
||
| }; | ||
|
|
||
| const TermsOfUseBanner = () => ( | ||
| <div className="tou-banner"> | ||
| <FormattedMessage | ||
| id="tos.banner.parentAgreement" | ||
| values={{ | ||
| a: TermsOfUseLink | ||
| }} | ||
| /> | ||
| </div> | ||
| ); | ||
|
|
||
|
|
||
| export default injectIntl(TermsOfUseBanner); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import React, {useCallback, useState} from 'react'; | ||
| import {connect} from 'react-redux'; | ||
| import PropTypes from 'prop-types'; | ||
| import TermsOfUseModalOver16 from './over16/modal.jsx'; | ||
| import TermsOfUseModalUnder16 from './under16/modal.jsx'; | ||
|
|
||
| require('./terms-of-use-modal.scss'); | ||
|
|
||
| export const noShowTermsOfUseModalPages = ['terms_of_use', 'privacy_policy', 'dmca', 'cookies']; | ||
|
There was a problem hiding this comment. Let's move this const to the page component, where it is used |
||
|
|
||
|
|
||
| export const TermsOfUseLink = chunks => ( | ||
| <a | ||
| className="tou-modal-link" | ||
| target="_blank" | ||
| href="terms_of_use" | ||
| > | ||
| {chunks} | ||
| </a> | ||
| ); | ||
|
|
||
| const TermsOfUseModal = ({ | ||
| hasAgreedToLatestTermsOfService, | ||
| isInTermsOfUseGracePeriod, | ||
| isAfterTermsOfUseGracePeriod, | ||
| usesParentEmail, | ||
| }) => { | ||
| const [isModalVisible, setIsModalVisible] = useState(true); | ||
| const handleClose = useCallback(() => { | ||
| setIsModalVisible(false); | ||
| }); | ||
|
|
||
| if (hasAgreedToLatestTermsOfService ?? true) { | ||
| return null; | ||
| } | ||
|
|
||
| if (usesParentEmail) { | ||
| if (!isInTermsOfUseGracePeriod && !isAfterTermsOfUseGracePeriod) { | ||
| return (<TermsOfUseModalUnder16 | ||
| email={email} | ||
| isOpen={isModalVisible} | ||
| onClose={handleClose} | ||
| />); | ||
| } | ||
| if (isAfterTermsOfUseGracePeriod){ | ||
| return null; // TODO | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| return <TermsOfUseModalOver16 />; | ||
| }; | ||
|
|
||
| TermsOfUseModal.propTypes = { | ||
| hasAgreedToLatestTermsOfService: PropTypes.bool, | ||
| isInTermsOfUseGracePeriod: PropTypes.bool, | ||
| isAfterTermsOfUseGracePeriod: PropTypes.bool, | ||
| usesParentEmail: PropTypes.bool, | ||
| email: PropTypes.string | ||
| }; | ||
|
|
||
| const mapStateToProps = state => ({ | ||
| hasAgreedToLatestTermsOfService: state.session.session.flags?.has_accepted_terms_of_use, | ||
| isInTermsOfUseGracePeriod: state.session.session.flags?.is_in_terms_of_use_grace_period, | ||
| isAfterTermsOfUseGracePeriod: state.session.session.flags?.is_after_terms_of_use_grace_period, | ||
| usesParentEmail: state.session.session.flags?.with_parent_email, | ||
| email: state.session.session.user?.email | ||
| }); | ||
|
|
||
| export default connect(mapStateToProps)(TermsOfUseModal); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| @import "../../../colors"; | ||
| @import "../../../frameless"; | ||
|
|
||
| .tou-modal-overlay { | ||
| background-color: transparentize($overlay-gray, 0.2); | ||
| } | ||
|
|
||
| .tou-modal-top{ | ||
| height: 48px; | ||
| background-color: $ui-mint-green; | ||
| border-top-left-radius: 1rem; | ||
| border-top-right-radius: 1rem; | ||
| } | ||
|
|
||
| .tou-modal{ | ||
| width: 464px; | ||
| } | ||
|
|
||
| .tou-modal-content{ | ||
| padding: 2rem; | ||
| box-sizing: border-box; | ||
| } | ||
|
|
||
| .tou-modal-heading{ | ||
| font-size: 24px; | ||
| } | ||
| .tou-modal-button { | ||
| border-radius: 0.3rem; | ||
| padding: 0.5rem 1rem; | ||
| border-color: transparent; | ||
| font-size: 16px; | ||
| font-weight: 600; | ||
| } | ||
|
|
||
| .tou-modal-button.filled { | ||
| background-color: $ui-mint-green; | ||
| color: $ui-white; | ||
| } | ||
|
|
||
| .tou-modal-button.outlined { | ||
| background-color: $ui-white; | ||
| color: $ui-mint-green; | ||
| border: 1px solid $ui-mint-green; | ||
| } | ||
|
|
||
| .tou-modal-button-container { | ||
| display: flex; | ||
| justify-content: flex-end; | ||
| margin-top: 16px; | ||
| gap: 8px; | ||
| } | ||
|
|
||
| .tou-modal-button:hover { | ||
| background-color: hsl(163, 85%, 35%); | ||
| color: $ui-white; | ||
| } | ||
|
|
||
| .tou-modal-link { | ||
| color: $ui-mint-green !important; | ||
| text-decoration: underline !important; | ||
| } | ||
|
|
||
| .tou-input { | ||
| width: calc(100% - 10px); | ||
| padding: 10px 5px; | ||
| margin: 5px 0; | ||
| font-size: 14px; | ||
| color: $type-dark-gray; | ||
| background-color: white; | ||
| border: 1px solid $active-dark-gray; | ||
| border-radius: 6px; | ||
| outline: none; | ||
| transition: border 0.2s ease-in-out; | ||
| font-weight: 600; | ||
| } | ||
|
|
||
| .tou-center-content{ | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: center; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .tou-banner{ | ||
| height: 50px; | ||
| background-color: $ui-red-dark; | ||
| font-size: 16px; | ||
| font-weight: 700; | ||
| color: white; | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .tou-banner-link{ | ||
| text-decoration: underline !important; | ||
| color: white !important; | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tos -> termsOfUse
generally it's better to avoid abbreviations where possible, as that tends to confuse readers not familiar with that part of the code