diff options
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/app/views/graph/components/page.form.js | 8 | ||||
| -rw-r--r-- | frontend/site/projects/museum/app.js | 6 | ||||
| -rw-r--r-- | frontend/site/projects/museum/constants.js | 4 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/artists.css | 1 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/artists.js | 28 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/credits.css | 1 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/credits.js | 28 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/essay.css | 1 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/essay.js | 28 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/nav.overlay.js | 13 |
10 files changed, 114 insertions, 4 deletions
diff --git a/frontend/app/views/graph/components/page.form.js b/frontend/app/views/graph/components/page.form.js index a060698..f2d750b 100644 --- a/frontend/app/views/graph/components/page.form.js +++ b/frontend/app/views/graph/components/page.form.js @@ -193,11 +193,17 @@ export default class PageForm extends Component { /> <Checkbox + label="Stop all sounds" + name="stop_all_sounds" + checked={data.settings.stop_all_sounds} + onChange={this.handleSettingsSelect} + /> + + <Checkbox label="Restart audio on load" name="restart_audio" checked={data.settings.restart_audio} onChange={this.handleSettingsSelect} - autoComplete="off" /> <div className='row buttons'> diff --git a/frontend/site/projects/museum/app.js b/frontend/site/projects/museum/app.js index 44070b7..2621656 100644 --- a/frontend/site/projects/museum/app.js +++ b/frontend/site/projects/museum/app.js @@ -5,6 +5,9 @@ import { connect } from 'react-redux' import ViewerContainer from 'site/viewer/viewer.container' import Home from './views/home' +import Essay from './views/essay' +import Artists from './views/artists' +import Credits from './views/credits' import NavOverlay from './views/nav.overlay' import { loadMuseum } from './museum.actions' @@ -23,6 +26,9 @@ class App extends Component { <div className='app'> <Route path={'/last-museum/:page_name'} component={ViewerContainer} exact /> <Route path={'/last-museum/start'} component={Home} exact /> + <Route path={'/last-museum/essay'} component={Essay} exact /> + <Route path={'/last-museum/artists'} component={Artists} exact /> + <Route path={'/last-museum/credits'} component={Credits} exact /> <Route path={'/last-museum/:page_name'} component={NavOverlay} exact /> <Route path='/last-museum/' exact render={() => { setTimeout(() => this.props.history.push('/last-museum/start'), 10) diff --git a/frontend/site/projects/museum/constants.js b/frontend/site/projects/museum/constants.js index 3676f2b..84ec482 100644 --- a/frontend/site/projects/museum/constants.js +++ b/frontend/site/projects/museum/constants.js @@ -33,4 +33,6 @@ export const ARTISTS = { export const ARTIST_ORDER = [ "nora", "foreshew", "leite", "opoku", "nilthamrong", "stankievech", -]
\ No newline at end of file +] + +export const PROJECT_PAGE_SET = new Set(["essay", "artists", "credits"]) diff --git a/frontend/site/projects/museum/views/artists.css b/frontend/site/projects/museum/views/artists.css new file mode 100644 index 0000000..45cb8f3 --- /dev/null +++ b/frontend/site/projects/museum/views/artists.css @@ -0,0 +1 @@ +.page-artists {} diff --git a/frontend/site/projects/museum/views/artists.js b/frontend/site/projects/museum/views/artists.js new file mode 100644 index 0000000..8677d0c --- /dev/null +++ b/frontend/site/projects/museum/views/artists.js @@ -0,0 +1,28 @@ +import React, { Component } from 'react' +import actions from 'site/actions' + +import "./artists.css" + +export default class Artists extends Component { + constructor(props) { + super(props) + this.handleClick = this.handleClick.bind(this) + this.state = { + } + } + + componentDidMount() { + actions.site.interact() + } + + handleClick(e) { + e && e.preventDefault() + } + + render() { + return ( + <div className="page-artists"> + </div> + ) + } +} diff --git a/frontend/site/projects/museum/views/credits.css b/frontend/site/projects/museum/views/credits.css new file mode 100644 index 0000000..4576e1d --- /dev/null +++ b/frontend/site/projects/museum/views/credits.css @@ -0,0 +1 @@ +.page-credits {} diff --git a/frontend/site/projects/museum/views/credits.js b/frontend/site/projects/museum/views/credits.js new file mode 100644 index 0000000..8dc78d5 --- /dev/null +++ b/frontend/site/projects/museum/views/credits.js @@ -0,0 +1,28 @@ +import React, { Component } from 'react' +import actions from 'site/actions' + +import "./credits.css" + +export default class Credits extends Component { + constructor(props) { + super(props) + this.handleClick = this.handleClick.bind(this) + this.state = { + } + } + + componentDidMount() { + actions.site.interact() + } + + handleClick(e) { + e && e.preventDefault() + } + + render() { + return ( + <div className="page-credits"> + </div> + ) + } +} diff --git a/frontend/site/projects/museum/views/essay.css b/frontend/site/projects/museum/views/essay.css new file mode 100644 index 0000000..4dc3e76 --- /dev/null +++ b/frontend/site/projects/museum/views/essay.css @@ -0,0 +1 @@ +.page-essay {} diff --git a/frontend/site/projects/museum/views/essay.js b/frontend/site/projects/museum/views/essay.js new file mode 100644 index 0000000..5775e3a --- /dev/null +++ b/frontend/site/projects/museum/views/essay.js @@ -0,0 +1,28 @@ +import React, { Component } from 'react' +import actions from 'site/actions' + +import "./essay.css" + +export default class Artists extends Component { + constructor(props) { + super(props) + this.handleClick = this.handleClick.bind(this) + this.state = { + } + } + + componentDidMount() { + actions.site.interact() + } + + handleClick(e) { + e && e.preventDefault() + } + + render() { + return ( + <div className="page-essay"> + </div> + ) + } +} diff --git a/frontend/site/projects/museum/views/nav.overlay.js b/frontend/site/projects/museum/views/nav.overlay.js index ed6a0f5..0173b93 100644 --- a/frontend/site/projects/museum/views/nav.overlay.js +++ b/frontend/site/projects/museum/views/nav.overlay.js @@ -4,7 +4,7 @@ import actions from 'site/actions' import "./nav.css" -import { ARTISTS, ARTIST_ORDER } from "site/projects/museum/constants" +import { ARTISTS, ARTIST_ORDER, PROJECT_PAGE_SET } from "site/projects/museum/constants" import { ArrowLeft, ArrowRight } from "site/projects/museum/icons" import { history } from "site/store" @@ -41,12 +41,21 @@ export default class NavOverlay extends Component { // console.log(pathkey) if (pathkey === 'start') { this.setState({ + showHome: false, showFooter: true, showArtist: false, currentArtist: null, artist: {}, }) - } else if (pathkey in ARTISTS) { + } + else if (PROJECT_PAGE_SET.has(pathkey)) { + this.setState({ + showHome: true, + showFooter: true, + showArtist: false, + }) + } + else if (pathkey in ARTISTS) { this.setState({ showHome: true, showFooter: true, |
