r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

clean up ideview page

Browse source
This commit is contained in:
Cassie Tarakajian 2017-11-13 14:44:23 -05:00
parent 9c655122b2
commit 9f9b09b99d
1 changed files with 87 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
client/modules/IDE/pages/IDEView.jsx
View file

@ -3,7 +3,6 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { withRouter } from 'react-router'; import { withRouter } from 'react-router';
import { Helmet } from 'react-helmet'; import { Helmet } from 'react-helmet';
import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
import SplitPane from 'react-split-pane'; import SplitPane from 'react-split-pane';
import Editor from '../components/Editor'; import Editor from '../components/Editor';
import Sidebar from '../components/Sidebar'; import Sidebar from '../components/Sidebar';
@ -406,32 +405,20 @@ class IDEView extends React.Component {
</SplitPane> </SplitPane>
</SplitPane> </SplitPane>
</div> </div>
{(() => { { this.props.ide.modalIsVisible &&
if (this.props.ide.modalIsVisible) {
return (
<NewFileModal <NewFileModal
canUploadMedia={this.props.user.authenticated} canUploadMedia={this.props.user.authenticated}
closeModal={this.props.closeNewFileModal} closeModal={this.props.closeNewFileModal}
createFile={this.props.createFile} createFile={this.props.createFile}
/> />
);
} }
return ''; { this.props.ide.newFolderModalVisible &&
})()}
{(() => {
if (this.props.ide.newFolderModalVisible) {
return (
<NewFolderModal <NewFolderModal
closeModal={this.props.closeNewFolderModal} closeModal={this.props.closeNewFolderModal}
createFolder={this.props.createFolder} createFolder={this.props.createFolder}
/> />
);
} }
return ''; { this.props.location.pathname.match(/sketches$/) &&
})()}
{(() => { // eslint-disable-line
if (this.props.location.pathname.match(/sketches$/)) {
return (
<Overlay <Overlay
ariaLabel="project list" ariaLabel="project list"
title="Open a Sketch" title="Open a Sketch"
@ -442,12 +429,8 @@ class IDEView extends React.Component {
user={this.props.user} user={this.props.user}
/> />
</Overlay> </Overlay>
);
} }
})()} { this.props.location.pathname.match(/assets$/) &&
{(() => { // eslint-disable-line
if (this.props.location.pathname.match(/assets$/)) {
return (
<Overlay <Overlay
title="Assets" title="Assets"
ariaLabel="asset list" ariaLabel="asset list"
@ -458,12 +441,8 @@ class IDEView extends React.Component {
user={this.props.user} user={this.props.user}
/> />
</Overlay> </Overlay>
);
} }
})()} { this.props.location.pathname === '/about' &&
{(() => { // eslint-disable-line
if (this.props.location.pathname === '/about') {
return (
<Overlay <Overlay
previousPath={this.props.ide.previousPath} previousPath={this.props.ide.previousPath}
title="Welcome" title="Welcome"
@ -471,12 +450,8 @@ class IDEView extends React.Component {
> >
<About previousPath={this.props.ide.previousPath} /> <About previousPath={this.props.ide.previousPath} />
</Overlay> </Overlay>
);
} }
})()} { this.props.ide.shareModalVisible &&
{(() => { // eslint-disable-line
if (this.props.ide.shareModalVisible) {
return (
<Overlay <Overlay
title="Share This Sketch" title="Share This Sketch"
ariaLabel="share" ariaLabel="share"
@ -488,12 +463,8 @@ class IDEView extends React.Component {
ownerUsername={this.props.project.owner.username} ownerUsername={this.props.project.owner.username}
/> />
</Overlay> </Overlay>
);
} }
})()} { this.props.ide.keyboardShortcutVisible &&
{(() => { // eslint-disable-line
if (this.props.ide.keyboardShortcutVisible) {
return (
<Overlay <Overlay
title="Keyboard Shortcuts" title="Keyboard Shortcuts"
ariaLabel="keyboard shortcuts" ariaLabel="keyboard shortcuts"
@ -501,12 +472,8 @@ class IDEView extends React.Component {
> >
<KeyboardShortcutModal /> <KeyboardShortcutModal />
</Overlay> </Overlay>
);
} }
})()} { this.props.ide.errorType &&
{(() => { // eslint-disable-line
if (this.props.ide.errorType) {
return (
<Overlay <Overlay
title="Error" title="Error"
ariaLabel="error" ariaLabel="error"
@ -516,21 +483,15 @@ class IDEView extends React.Component {
type={this.props.ide.errorType} type={this.props.ide.errorType}
/> />
</Overlay> </Overlay>
);
} }
})()} { this.props.ide.helpType &&
{(() => { // eslint-disable-line
if (this.props.ide.helpType) {
return (
<Overlay <Overlay
title="Serve over HTTPS" title="Serve over HTTPS"
closeOverlay={this.props.hideHelpModal} closeOverlay={this.props.hideHelpModal}
> >
<HTTPSModal /> <HTTPSModal />
</Overlay> </Overlay>
);
} }
})()}
</div> </div>
); );
} }