GVSU/marten-application
GVSU
/
marten-application
1
0
Fork 0
Code Pull Requests Releases Activity

Handles displaying titles of galleries

This commit is contained in:
ajmaley 2018-11-25 12:32:12 -05:00
parent 00a3566dec
commit 477a8d264c
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/FlameLinkCollectionGallery.js
View File

@ -44,12 +44,15 @@ class FlameLinkCollectionGallery extends Component {
.then(result => this.setState({ .then(result => this.setState({
schemaContent: result schemaContent: result
})) }))
if(this.props.showTitle === false){
}
else{
flamelinkApp.schemas.get(this.props.galleryName) flamelinkApp.schemas.get(this.props.galleryName)
.then(result => this.setState({ .then(result => this.setState({
schemaDescription: result.title schemaDescription: result.title
})) }))
} }
}
getGalleryInfo(schemaDetails, schemaContent){ getGalleryInfo(schemaDetails, schemaContent){
var key; var key;

12
src/components/Main.js
View File

@ -153,13 +153,13 @@ class ResponsiveDrawer extends React.Component {
<Collapse in={this.state.open2} timeout="auto" unmountOnExit> <Collapse in={this.state.open2} timeout="auto" unmountOnExit>
<List component="div" disablePadding> <List component="div" disablePadding>
<ListItem button className={classes.nested} onClick={() => this.nav('Gallery1')}> <ListItem button className={classes.nested} onClick={() => this.nav('Gallery1')}>
<ListItemText inset primary="Gallery1" /> <ListItemText inset primary="Martens and Kits" />
</ListItem> </ListItem>
<ListItem button className={classes.nested} onClick={() => this.nav('Gallery2')}> <ListItem button className={classes.nested} onClick={() => this.nav('Gallery2')}>
<ListItemText inset primary="Gallery2" /> <ListItemText inset primary="Martens at Night" />
</ListItem> </ListItem>
<ListItem button className={classes.nested} onClick={() => this.nav('Gallery3')}> <ListItem button className={classes.nested} onClick={() => this.nav('Gallery3')}>
<ListItemText inset primary="Gallery3" /> <ListItemText inset primary="Martens Being Martens" />
</ListItem> </ListItem>
</List> </List>
</Collapse> </Collapse>
@ -226,9 +226,9 @@ class ResponsiveDrawer extends React.Component {
{this.state.key === 'Easy-Quiz' && <Quiz difficulty='Easy'/>} {this.state.key === 'Easy-Quiz' && <Quiz difficulty='Easy'/>}
{this.state.key === 'Intermediate-Quiz' && <Quiz difficulty='Intermediate'/>} {this.state.key === 'Intermediate-Quiz' && <Quiz difficulty='Intermediate'/>}
{this.state.key === 'Advanced-Quiz' && <Quiz difficulty='Advanced'/>} {this.state.key === 'Advanced-Quiz' && <Quiz difficulty='Advanced'/>}
{this.state.key === 'Gallery1' && <FlameLinkCollectionGallery galleryName={'martenGallery'}/>} {this.state.key === 'Gallery1' && <FlameLinkCollectionGallery galleryName={'martensAndKits'}/>}
{this.state.key === 'Gallery2' && <FlameLinkCollectionGallery galleryName={'martenGallery'}/>} {this.state.key === 'Gallery2' && <FlameLinkCollectionGallery galleryName={'martensAtNight'}/>}
{this.state.key === 'Gallery3' && <FlameLinkCollectionGallery galleryName={'martenGallery'}/>} {this.state.key === 'Gallery3' && <FlameLinkCollectionGallery galleryName={'martensBeingMartens'}/>}
</main> </main>
</div> </div>
); );

2
src/pages/Home.js
View File

@ -33,7 +33,7 @@ class Home extends Component {
render() { render() {
return ( return (
<Grid container> <Grid container>
<FlameLinkCollectionGallery galleryName={'martenGallery'}/> <FlameLinkCollectionGallery galleryName={'martenHomeGallery'} showTitle={false}/>
<FlameLinkComponentCreations schemaDetails={this.state.schemaDetails} schemaType = {this.state.schemaType}/> <FlameLinkComponentCreations schemaDetails={this.state.schemaDetails} schemaType = {this.state.schemaType}/>
</Grid> </Grid>
); );