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

Merge pull request #60 from alDuncanson/similarSpeciesGallery 

Added similar species gallery
This commit is contained in:
Alex Duncanson 2018-11-26 08:39:07 -05:00 committed by GitHub
parent 7722e2006f 0f4f10f285
commit 68c1c9bdac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package-lock.json generated
View File

@ -4252,19 +4252,9 @@
} }
}, },
"emailjs-com": { "emailjs-com": {
"version": "2.2.4", "version": "2.3.2",
"resolved": "https://registry.npmjs.org/emailjs-com/-/emailjs-com-2.2.4.tgz", "resolved": "https://registry.npmjs.org/emailjs-com/-/emailjs-com-2.3.2.tgz",
"integrity": "sha512-Pm29HoSxEIKLv7p6rxOPpKFqLnf2JaHTl6coql59r8MNRNW49Mim65s7yoWAqQhZ+Mk4GFmQsiPSFXD6Gnm4BQ==", "integrity": "sha512-dI6vjLGHDNTOOY0vNx6HZm95ey1aKCtkdOPLC2UYkCgV8QSJCuMY/JlxjXD3BXOvu4X4qn+XCN3DTUz1OiewAg=="
"requires": {
"promise-polyfill": "7.1.0"
},
"dependencies": {
"promise-polyfill": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-7.1.0.tgz",
"integrity": "sha512-P6NJ2wU/8fac44ENORsuqT8TiolKGB2u0fEClPtXezn7w5cmLIjM/7mhPlTebke2EPr6tmqZbXvnX0TxwykGrg=="
}
}
}, },
"emoji-regex": { "emoji-regex": {
"version": "6.5.1", "version": "6.5.1",

2
package.json
View File

@ -7,7 +7,7 @@
"@material-ui/icons": "^3.0.1", "@material-ui/icons": "^3.0.1",
"ajv": "^6.0.0", "ajv": "^6.0.0",
"disqus-react": "^1.0.5", "disqus-react": "^1.0.5",
"emailjs-com": "^2.2.4", "emailjs-com": "^2.3.2",
"firebase": "^5.5.2", "firebase": "^5.5.2",
"firebase-admin": "^6.1.0", "firebase-admin": "^6.1.0",
"flamelink": "^0.19.6", "flamelink": "^0.19.6",

4
src/components/Main.js
View File

@ -167,6 +167,9 @@ class ResponsiveDrawer extends React.Component {
<ListItem button className={classes.nested} onClick={() => this.nav('Gallery3')}> <ListItem button className={classes.nested} onClick={() => this.nav('Gallery3')}>
<ListItemText inset primary="Martens Being Martens" /> <ListItemText inset primary="Martens Being Martens" />
</ListItem> </ListItem>
<ListItem button className={classes.nested} onClick={() => this.nav('Gallery4')}>
<ListItemText inset primary="Species Similar to Martens" />
</ListItem>
</List> </List>
</Collapse> </Collapse>
</List> </List>
@ -236,6 +239,7 @@ class ResponsiveDrawer extends React.Component {
{this.state.key === 'Gallery1' && <FlameLinkCollectionGallery galleryName={'martensAndKits'}/>} {this.state.key === 'Gallery1' && <FlameLinkCollectionGallery galleryName={'martensAndKits'}/>}
{this.state.key === 'Gallery2' && <FlameLinkCollectionGallery galleryName={'martensAtNight'}/>} {this.state.key === 'Gallery2' && <FlameLinkCollectionGallery galleryName={'martensAtNight'}/>}
{this.state.key === 'Gallery3' && <FlameLinkCollectionGallery galleryName={'martensBeingMartens'}/>} {this.state.key === 'Gallery3' && <FlameLinkCollectionGallery galleryName={'martensBeingMartens'}/>}
{this.state.key === 'Gallery4' && <FlameLinkCollectionGallery galleryName={'similarSpecies'}/>}
</main> </main>
</div> </div>
); );