Skip to content
Snippets Groups Projects
Unverified Commit d1024cdd authored by Benjamin Wheeler's avatar Benjamin Wheeler Committed by GitHub
Browse files

Merge pull request #3460 from benjiwheeler/show-coming-soon 

added showComingSoon flag prop for gui
parents 04583328 2fb61afc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/components/gui/gui.jsx
+ 5
− 1
View file @ d1024cdd
...@@ -92,9 +92,10 @@ const GUIComponent = props => { ...@@ -92,9 +92,10 @@ const GUIComponent = props => {
onSeeCommunity, onSeeCommunity,
onShare, onShare,
previewInfoVisible, previewInfoVisible,
targetIsStage, showComingSoon,
soundsTabVisible, soundsTabVisible,
stageSizeMode, stageSizeMode,
targetIsStage,
tipsLibraryVisible, tipsLibraryVisible,
vm, vm,
...componentProps ...componentProps
...@@ -178,6 +179,7 @@ const GUIComponent = props => { ...@@ -178,6 +179,7 @@ const GUIComponent = props => {
className={styles.menuBarPosition} className={styles.menuBarPosition}
enableCommunity={enableCommunity} enableCommunity={enableCommunity}
renderLogin={renderLogin} renderLogin={renderLogin}
showComingSoon={showComingSoon}
onClickAccountNav={onClickAccountNav} onClickAccountNav={onClickAccountNav}
onCloseAccountNav={onCloseAccountNav} onCloseAccountNav={onCloseAccountNav}
onLogOut={onLogOut} onLogOut={onLogOut}
...@@ -351,6 +353,7 @@ GUIComponent.propTypes = { ...@@ -351,6 +353,7 @@ GUIComponent.propTypes = {
onUpdateProjectTitle: PropTypes.func, onUpdateProjectTitle: PropTypes.func,
previewInfoVisible: PropTypes.bool, previewInfoVisible: PropTypes.bool,
renderLogin: PropTypes.func, renderLogin: PropTypes.func,
showComingSoon: PropTypes.bool,
soundsTabVisible: PropTypes.bool, soundsTabVisible: PropTypes.bool,
stageSizeMode: PropTypes.oneOf(Object.keys(STAGE_SIZE_MODES)), stageSizeMode: PropTypes.oneOf(Object.keys(STAGE_SIZE_MODES)),
targetIsStage: PropTypes.bool, targetIsStage: PropTypes.bool,
...@@ -369,6 +372,7 @@ GUIComponent.defaultProps = { ...@@ -369,6 +372,7 @@ GUIComponent.defaultProps = {
canSaveAsCopy: false, canSaveAsCopy: false,
canShare: false, canShare: false,
onUpdateProjectTitle: () => {}, onUpdateProjectTitle: () => {},
showComingSoon: false,
stageSizeMode: STAGE_SIZE_MODES.large stageSizeMode: STAGE_SIZE_MODES.large
}; };
......
src/components/menu-bar/menu-bar.jsx
+ 58
− 50
View file @ d1024cdd
...@@ -298,39 +298,39 @@ class MenuBar extends React.Component { ...@@ -298,39 +298,39 @@ class MenuBar extends React.Component {
> >
{newProjectMessage} {newProjectMessage}
</MenuItem> </MenuItem>
) : ( ) : (this.props.showComingSoon ? (
<MenuItemTooltip <MenuItemTooltip
id="new" id="new"
isRtl={this.props.isRtl} isRtl={this.props.isRtl}
> >
<MenuItem>{newProjectMessage}</MenuItem> <MenuItem>{newProjectMessage}</MenuItem>
</MenuItemTooltip> </MenuItemTooltip>
)} ) : [])}
<MenuSection> <MenuSection>
{this.props.canSave ? ( {this.props.canSave ? (
<MenuItem onClick={this.handleClickSave}> <MenuItem onClick={this.handleClickSave}>
{saveNowMessage} {saveNowMessage}
</MenuItem> </MenuItem>
) : ( ) : (this.props.showComingSoon ? (
<MenuItemTooltip <MenuItemTooltip
id="save" id="save"
isRtl={this.props.isRtl} isRtl={this.props.isRtl}
> >
<MenuItem>{saveNowMessage}</MenuItem> <MenuItem>{saveNowMessage}</MenuItem>
</MenuItemTooltip> </MenuItemTooltip>
)} ) : [])}
{this.props.canSaveAsCopy ? ( {this.props.canSaveAsCopy ? (
<MenuItem onClick={this.handleClickSaveAsCopy}> <MenuItem onClick={this.handleClickSaveAsCopy}>
{saveAsCopyMessage} {saveAsCopyMessage}
</MenuItem> </MenuItem>
) : ( ) : (this.props.showComingSoon ? (
<MenuItemTooltip <MenuItemTooltip
id="copy" id="copy"
isRtl={this.props.isRtl} isRtl={this.props.isRtl}
> >
<MenuItem>{saveAsCopyMessage}</MenuItem> <MenuItem>{saveAsCopyMessage}</MenuItem>
</MenuItemTooltip> </MenuItemTooltip>
)} ) : [])}
</MenuSection> </MenuSection>
<MenuSection> <MenuSection>
<SBFileUploader onUpdateProjectTitle={this.props.onUpdateProjectTitle}> <SBFileUploader onUpdateProjectTitle={this.props.onUpdateProjectTitle}>
...@@ -438,13 +438,15 @@ class MenuBar extends React.Component { ...@@ -438,13 +438,15 @@ class MenuBar extends React.Component {
</div> </div>
<div className={classNames(styles.menuBarItem)}> <div className={classNames(styles.menuBarItem)}>
{this.props.canShare ? shareButton : ( {this.props.canShare ? shareButton : (
<MenuBarItemTooltip id="share-button"> this.props.showComingSoon ? (
{shareButton} <MenuBarItemTooltip id="share-button">
</MenuBarItemTooltip> {shareButton}
</MenuBarItemTooltip>
) : []
)} )}
</div> </div>
<div className={classNames(styles.menuBarItem, styles.communityButtonWrapper)}> <div className={classNames(styles.menuBarItem, styles.communityButtonWrapper)}>
{this.props.enableCommunity ? {this.props.enableCommunity ? (
<Button <Button
className={classNames(styles.communityButton)} className={classNames(styles.communityButton)}
iconClassName={styles.communityButtonIcon} iconClassName={styles.communityButtonIcon}
...@@ -456,7 +458,8 @@ class MenuBar extends React.Component { ...@@ -456,7 +458,8 @@ class MenuBar extends React.Component {
description="Label for see community button" description="Label for see community button"
id="gui.menuBar.seeCommunity" id="gui.menuBar.seeCommunity"
/> />
</Button> : </Button>
) : (this.props.showComingSoon ? (
<MenuBarItemTooltip id="community-button"> <MenuBarItemTooltip id="community-button">
<Button <Button
className={classNames(styles.communityButton)} className={classNames(styles.communityButton)}
...@@ -470,7 +473,7 @@ class MenuBar extends React.Component { ...@@ -470,7 +473,7 @@ class MenuBar extends React.Component {
/> />
</Button> </Button>
</MenuBarItemTooltip> </MenuBarItemTooltip>
} ) : [])}
</div> </div>
</div> </div>
...@@ -572,44 +575,48 @@ class MenuBar extends React.Component { ...@@ -572,44 +575,48 @@ class MenuBar extends React.Component {
</Button> </Button>
</a> </a>
</div> </div>
<MenuBarItemTooltip id="mystuff"> {this.props.showComingSoon ? (
<div <React.Fragment>
className={classNames( <MenuBarItemTooltip id="mystuff">
styles.menuBarItem, <div
styles.hoverable, className={classNames(
styles.mystuffButton styles.menuBarItem,
)} styles.hoverable,
> styles.mystuffButton
<img )}
className={styles.mystuffIcon} >
src={mystuffIcon} <img
/> className={styles.mystuffIcon}
</div> src={mystuffIcon}
</MenuBarItemTooltip> />
<MenuBarItemTooltip </div>
id="account-nav" </MenuBarItemTooltip>
place={this.props.isRtl ? 'right' : 'left'} <MenuBarItemTooltip
> id="account-nav"
<div place={this.props.isRtl ? 'right' : 'left'}
className={classNames( >
styles.menuBarItem, <div
styles.hoverable, className={classNames(
styles.accountNavMenu styles.menuBarItem,
)} styles.hoverable,
> styles.accountNavMenu
<img )}
className={styles.profileIcon} >
src={profileIcon} <img
/> className={styles.profileIcon}
<span> src={profileIcon}
{'scratch-cat'} />
</span> <span>
<img {'scratch-cat'}
className={styles.dropdownCaretIcon} </span>
src={dropdownCaret} <img
/> className={styles.dropdownCaretIcon}
</div> src={dropdownCaret}
</MenuBarItemTooltip> />
</div>
</MenuBarItemTooltip>
</React.Fragment>
) : []}
</React.Fragment> </React.Fragment>
)} )}
</div> </div>
...@@ -656,6 +663,7 @@ MenuBar.propTypes = { ...@@ -656,6 +663,7 @@ MenuBar.propTypes = {
onUpdateProjectTitle: PropTypes.func, onUpdateProjectTitle: PropTypes.func,
renderLogin: PropTypes.func, renderLogin: PropTypes.func,
sessionExists: PropTypes.bool, sessionExists: PropTypes.bool,
showComingSoon: PropTypes.bool,
username: PropTypes.string username: PropTypes.string
}; };
......
src/containers/gui.jsx
+ 0
− 1
View file @ d1024cdd
...@@ -109,7 +109,6 @@ GUI.propTypes = { ...@@ -109,7 +109,6 @@ GUI.propTypes = {
isShowingProject: PropTypes.bool, isShowingProject: PropTypes.bool,
loadingError: PropTypes.bool, loadingError: PropTypes.bool,
loadingStateVisible: PropTypes.bool, loadingStateVisible: PropTypes.bool,
onChangeProjectInfo: PropTypes.func,
onSeeCommunity: PropTypes.func, onSeeCommunity: PropTypes.func,
onUpdateProjectId: PropTypes.func, onUpdateProjectId: PropTypes.func,
onUpdateProjectTitle: PropTypes.func, onUpdateProjectTitle: PropTypes.func,
......
src/playground/render-gui.jsx
+ 1
− 0
View file @ d1024cdd
...@@ -39,6 +39,7 @@ export default appTarget => { ...@@ -39,6 +39,7 @@ export default appTarget => {
ReactDOM.render( ReactDOM.render(
<WrappedGui <WrappedGui
showComingSoon
backpackOptions={backpackOptions} backpackOptions={backpackOptions}
/>, />,
appTarget); appTarget);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment