Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23374 from code-dot-org/staging
DTT (Staging > Test) [robo-dtt]
- Loading branch information
Showing
72 changed files
with
2,169 additions
and
514 deletions.
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
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,159 @@ | ||
| import React, {PropTypes} from 'react'; | ||
| import ReactTooltip from 'react-tooltip'; | ||
| import _ from 'lodash'; | ||
| import i18n from '@cdo/locale'; | ||
| import color from '@cdo/apps/util/color'; | ||
| import {tableLayoutStyles} from "@cdo/apps/templates/tables/tableConstants"; | ||
| import BootstrapButton from './BootstrapButton'; | ||
|
|
||
| const OAUTH_PROVIDERS = { | ||
| GOOGLE: 'google_oauth2', | ||
| FACEBOOK: 'facebook', | ||
| CLEVER: 'clever', | ||
| MICROSOFT: 'microsoft', | ||
| }; | ||
|
|
||
| export default class ManageLinkedAccounts extends React.Component { | ||
| render() { | ||
| return ( | ||
| <div style={styles.container}> | ||
| <hr/> | ||
| <h2 style={styles.header}>{i18n.manageLinkedAccounts()}</h2> | ||
| <table style={styles.table}> | ||
| <thead> | ||
| <tr> | ||
| <th style={styles.headerCell}>{i18n.manageLinkedAccounts_loginType()}</th> | ||
| <th style={styles.headerCell}>{i18n.manageLinkedAccounts_emailAddress()}</th> | ||
| <th style={styles.headerCell}>{i18n.manageLinkedAccounts_actions()}</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <OauthConnection | ||
| type={OAUTH_PROVIDERS.GOOGLE} | ||
| displayName={i18n.manageLinkedAccounts_google_oauth2()} | ||
| email={'brad@code.org'} | ||
| onClick={() => {}} | ||
| /> | ||
| <OauthConnection | ||
| type={OAUTH_PROVIDERS.MICROSOFT} | ||
| displayName={i18n.manageLinkedAccounts_microsoft()} | ||
| email={'*** encrypted ***'} | ||
| onClick={() => {}} | ||
| /> | ||
| <OauthConnection | ||
| type={OAUTH_PROVIDERS.CLEVER} | ||
| displayName={i18n.manageLinkedAccounts_clever()} | ||
| email={undefined} | ||
| onClick={() => {}} | ||
| /> | ||
| <OauthConnection | ||
| type={OAUTH_PROVIDERS.FACEBOOK} | ||
| displayName={i18n.manageLinkedAccounts_facebook()} | ||
| email={'brad@code.org'} | ||
| onClick={() => {}} | ||
| cannotDisconnect | ||
| /> | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| class OauthConnection extends React.Component { | ||
| static propTypes = { | ||
| type: PropTypes.oneOf(Object.values(OAUTH_PROVIDERS)).isRequired, | ||
| displayName: PropTypes.string.isRequired, | ||
| email: PropTypes.string, | ||
| onClick: PropTypes.func.isRequired, | ||
| cannotDisconnect: PropTypes.bool | ||
| }; | ||
|
|
||
| render() { | ||
| const {displayName, email, onClick, cannotDisconnect} = this.props; | ||
| const emailStyles = !!email ? styles.cell : {...styles.cell, ...styles.emptyEmailCell}; | ||
| const buttonText = !!email ? | ||
| i18n.manageLinkedAccounts_disconnect() : | ||
| i18n.manageLinkedAccounts_connect(); | ||
| const tooltipId = _.uniqueId(); | ||
|
|
||
| return ( | ||
| <tr> | ||
| <td style={styles.cell}> | ||
| {displayName} | ||
| </td> | ||
| <td style={emailStyles}> | ||
| {email || i18n.manageLinkedAccounts_notConnected()} | ||
| </td> | ||
| <td style={styles.cell}> | ||
| <span | ||
| data-for={tooltipId} | ||
| data-tip | ||
| > | ||
| {/* This button intentionally uses BootstrapButton to match other account page buttons */} | ||
| <BootstrapButton | ||
| style={styles.button} | ||
| text={buttonText} | ||
| onClick={onClick} | ||
| disabled={cannotDisconnect} | ||
| /> | ||
| {cannotDisconnect && | ||
| <ReactTooltip | ||
| id={tooltipId} | ||
| offset={styles.tooltipOffset} | ||
| role="tooltip" | ||
| effect="solid" | ||
| > | ||
| <div style={styles.tooltip}> | ||
| {i18n.manageLinkedAccounts_cannotDisconnectTooltip()} | ||
| </div> | ||
| </ReactTooltip> | ||
| } | ||
| </span> | ||
| </td> | ||
| </tr> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| const GUTTER = 20; | ||
| const BUTTON_WIDTH = 105; | ||
| const styles = { | ||
| container: { | ||
| paddingTop: GUTTER, | ||
| }, | ||
| header: { | ||
| fontSize: 22, | ||
| }, | ||
| table: { | ||
| ...tableLayoutStyles.table, | ||
| marginTop: GUTTER, | ||
| }, | ||
| headerCell: { | ||
| ...tableLayoutStyles.headerCell, | ||
| paddingLeft: GUTTER, | ||
| paddingRight: GUTTER, | ||
| fontWeight: 'normal', | ||
| }, | ||
| cell: { | ||
| ...tableLayoutStyles.cell, | ||
| paddingLeft: GUTTER, | ||
| paddingRight: GUTTER, | ||
| }, | ||
| emptyEmailCell: { | ||
| color: color.light_gray, | ||
| fontStyle: 'italic', | ||
| }, | ||
| button: { | ||
| width: BUTTON_WIDTH, | ||
| fontFamily: '"Gotham 5r", sans-serif', | ||
| color: color.charcoal, | ||
| padding: 8, | ||
| }, | ||
| tooltipOffset: { | ||
| left: -(BUTTON_WIDTH / 2) | ||
| }, | ||
| tooltip: { | ||
| width: BUTTON_WIDTH * 2 | ||
| }, | ||
| }; |
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,6 @@ | ||
| import React from 'react'; | ||
| import ManageLinkedAccounts from './ManageLinkedAccounts'; | ||
|
|
||
| export default storybook => storybook | ||
| .storiesOf('ManageLinkedAccounts', module) | ||
| .add('default table', () => (<ManageLinkedAccounts />)); |
12 changes: 12 additions & 0 deletions
12
apps/src/lib/ui/accounts/ManageLinkedAccountsController.js
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,12 @@ | ||
| import React from 'react'; | ||
| import ReactDOM from 'react-dom'; | ||
| import ManageLinkedAccounts from './ManageLinkedAccounts'; | ||
|
|
||
| export default class ManageLinkedAccountsController { | ||
| constructor(mountPoint) { | ||
| ReactDOM.render( | ||
| <ManageLinkedAccounts/>, | ||
| mountPoint | ||
| ); | ||
| } | ||
| } |
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
Oops, something went wrong.