scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-02 03:47:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2378 from kchadha/has-cloud-permission

Browse source 
Track isScratcher status and pass hasCloudPermission flag to gui.
This commit is contained in:
Karishma Chadha 2018-12-03 17:01:31 -05:00 committed by GitHub
commit 55db6f1dc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/views/preview/presentation.jsx
View file

@ -65,6 +65,7 @@ const PreviewPresentation = ({
isFullScreen, isFullScreen,
isLoggedIn, isLoggedIn,
isNewScratcher, isNewScratcher,
isScratcher,
isShared, isShared,
justShared, justShared,
loveCount, loveCount,
@ -233,6 +234,7 @@ const PreviewPresentation = ({
canSave={canSave} canSave={canSave}
className="guiPlayer" className="guiPlayer"
cloudHost={cloudHost} cloudHost={cloudHost}
hasCloudPermission={isScratcher}
isFullScreen={isFullScreen} isFullScreen={isFullScreen}
previewInfoVisible="false" previewInfoVisible="false"
projectHost={projectHost} projectHost={projectHost}
@ -548,6 +550,7 @@ PreviewPresentation.propTypes = {
isFullScreen: PropTypes.bool, isFullScreen: PropTypes.bool,
isLoggedIn: PropTypes.bool, isLoggedIn: PropTypes.bool,
isNewScratcher: PropTypes.bool, isNewScratcher: PropTypes.bool,
isScratcher: PropTypes.bool,
isShared: PropTypes.bool, isShared: PropTypes.bool,
justShared: PropTypes.bool, justShared: PropTypes.bool,
loveCount: PropTypes.number, loveCount: PropTypes.number,

4
src/views/preview/project-view.jsx
View file

@ -477,6 +477,7 @@ class Preview extends React.Component {
isFullScreen={this.state.isFullScreen} isFullScreen={this.state.isFullScreen}
isLoggedIn={this.props.isLoggedIn} isLoggedIn={this.props.isLoggedIn}
isNewScratcher={this.props.isNewScratcher} isNewScratcher={this.props.isNewScratcher}
isScratcher={this.props.isScratcher}
isShared={this.props.isShared} isShared={this.props.isShared}
justShared={this.state.justShared} justShared={this.state.justShared}
loveCount={this.state.loveCount} loveCount={this.state.loveCount}
@ -537,6 +538,7 @@ class Preview extends React.Component {
className="gui" className="gui"
cloudHost={this.props.cloudHost} cloudHost={this.props.cloudHost}
enableCommunity={this.props.enableCommunity} enableCommunity={this.props.enableCommunity}
hasCloudPermission={this.props.isScratcher}
isShared={this.props.isShared} isShared={this.props.isShared}
projectHost={this.props.projectHost} projectHost={this.props.projectHost}
projectId={this.state.projectId} projectId={this.state.projectId}
@ -604,6 +606,7 @@ Preview.propTypes = {
isEditable: PropTypes.bool, isEditable: PropTypes.bool,
isLoggedIn: PropTypes.bool, isLoggedIn: PropTypes.bool,
isNewScratcher: PropTypes.bool, isNewScratcher: PropTypes.bool,
isScratcher: PropTypes.bool,
isShared: PropTypes.bool, isShared: PropTypes.bool,
loved: PropTypes.bool, loved: PropTypes.bool,
moreCommentsToLoad: PropTypes.bool, moreCommentsToLoad: PropTypes.bool,
@ -698,6 +701,7 @@ const mapStateToProps = state => {
isLoggedIn: isLoggedIn, isLoggedIn: isLoggedIn,
isAdmin: isAdmin, isAdmin: isAdmin,
isNewScratcher: isLoggedIn && state.permissions.new_scratcher, isNewScratcher: isLoggedIn && state.permissions.new_scratcher,
isScratcher: isLoggedIn && state.permissions.scratcher,
// if we don't have projectInfo, assume it's shared until we know otherwise // if we don't have projectInfo, assume it's shared until we know otherwise
isShared: !projectInfoPresent || state.preview.projectInfo.is_published, isShared: !projectInfoPresent || state.preview.projectInfo.is_published,
loved: state.preview.loved, loved: state.preview.loved,