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

Merge branch 'feature/flamelink' of https://github.com/alDuncanson/marten-application into develop

This commit is contained in:
ajmaley 2018-10-04 19:24:22 -04:00
parent 376e58bb6f 8a6ce0012a
commit 25bbe3088d
7 changed files with 2541 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2604
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -4,8 +4,10 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@material-ui/core": "^3.1.0", "@material-ui/core": "^3.1.0",
"firebase": "^5.5.2",
"firebase-admin": "^6.0.0",
"flamelink": "^0.19.2",
"google-maps-react": "^2.0.2", "google-maps-react": "^2.0.2",
"firebase": "^5.5.1",
"react": "^16.5.1", "react": "^16.5.1",
"react-dom": "^16.5.1", "react-dom": "^16.5.1",
"react-router": "^4.3.1", "react-router": "^4.3.1",

3
public/index.html
View File

@ -20,6 +20,9 @@
work correctly both with client-side routing and a non-root public URL. work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<!--<script>import flamelink from 'flamelink';</script>-->
<title>React App</title> <title>React App</title>
</head> </head>
<body> <body>

10
src/components/Flamelink.js Normal file
View File

@ -0,0 +1,10 @@
import { Component } from 'react';
class Flamelink extends Component {
render() {
return(null);
}
}
export default Flamelink;

1
src/firebase.js
View File

@ -11,4 +11,5 @@ const config = {
}; };
firebase.initializeApp(config); firebase.initializeApp(config);
export default firebase; export default firebase;

6
src/flamelink.js Normal file
View File

@ -0,0 +1,6 @@
import firebaseApp from './firebase.js';
import flamelink from 'flamelink';
const flamelinkApp = flamelink({ firebaseApp });
export default flamelinkApp;

13
src/pages/Info.js
View File

@ -1,12 +1,19 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import Typography from '@material-ui/core/Typography'; import Typography from '@material-ui/core/Typography';
import Flamelink from '../components/Flamelink';
class Info extends Component { class Info extends Component {
render() { render() {
return ( return (
<Typography variant='display1' align='center' gutterBottom> <div>
Info <Flamelink flamelinkApp={this.props.flamelinkApp}/>
</Typography> <Typography variant='display1' align='center' gutterBottom>
Info
</Typography>
<p id="flamelinkDemo"></p>
</div>
); );
} }
} }