-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/melinda-schmitz/CodeSwitc…
…h2018 into ViewEventDetail
- Loading branch information
Showing
22 changed files
with
541 additions
and
444 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| asset-manifest.json,1537722543937,444958e1144c4a7250aba21cb82af4c90bf41c6786a5b57491a6d3e270fe97df | ||
| index.html,1537722543934,e47134aa0538bb539df93f71b61096f1e321ae4e8867bbbb85acc37649c9c2ee | ||
| favicon.ico,1537722526249,eae62e993eb980ec8a25058c39d5a51feab118bd2100c4deebb2a9c158ec11f9 | ||
| manifest.json,1537722526251,65d4aa66cd0b8963e88196705111adfccad2e8b80725b6a7a82ca8a9a0de8889 | ||
| service-worker.js,1537722544092,7f9e52f46c148953ecbce2663166e5163c495c4b909b503f876d5e795c7eddf9 | ||
| static/css/main.92381bc7.css,1537722543988,d21a5eef18cc28a1c724e22f8b80a9d74a571abe410a0335ff2d698e9c63a6d7 | ||
| static/media/profilepic.f7f63b88.png,1537722543988,0a9d7a0037b51e9a5bc3d7d76fe4e36f0808f32960c0430fb86554a734f3b8a5 | ||
| static/css/main.92381bc7.css.map,1537722543990,b7f18cddbb3be51529ab58d7dac0c3903016c574a5cae8aadd4d1ce6452287d0 | ||
| static/js/main.9eccd006.js,1537722543990,bf4c640135f3bc3d2d5727adc7f727e80b245a301facac2b23435f653c8fbf00 | ||
| static/js/main.9eccd006.js.map,1537722543992,208917158d78d2370c428da106b6aecc108e9dbaccde2fe003d5cc87df229af4 | ||
| asset-manifest.json,1537732730536,612c78b65821425fd0a6104cdb20234ea30344ba1ecf4647734078f99b394983 | ||
| index.html,1537732730538,47538efa4037e4eb340bc19072628d2ebb453628d71a8c2bc84e9c61ad5f53b8 | ||
| manifest.json,1537732714142,65d4aa66cd0b8963e88196705111adfccad2e8b80725b6a7a82ca8a9a0de8889 | ||
| favicon.ico,1537732714140,eae62e993eb980ec8a25058c39d5a51feab118bd2100c4deebb2a9c158ec11f9 | ||
| service-worker.js,1537732730703,3619f2eef63077ffb185885bf55a9781c49736ca10a3c9f38c9adc8024e8641b | ||
| static/css/main.edf78ce3.css,1537732730584,7e0cc15dd432698defc16bdd9762cac15af47515351966550e414be4a3a3cccb | ||
| static/media/profilepic.f7f63b88.png,1537732730559,0a9d7a0037b51e9a5bc3d7d76fe4e36f0808f32960c0430fb86554a734f3b8a5 | ||
| static/css/main.edf78ce3.css.map,1537732730585,839fc976419b66f5650c7807bf955cd4c7bc3b4a1705c38a8f0f2151e1e701b7 | ||
| static/js/main.3bbb433a.js,1537732730584,3b0c8bff785013954a60e493c6bb12f7d1be5ae376cc8508699f24c913f54e9e | ||
| static/js/main.3bbb433a.js.map,1537732730598,71b5c8f54210ed4c0fd227650d66cd9e6c06b4ecc5466c8d63310f4d2a3daeb2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| // Use IntelliSense to learn about possible attributes. | ||
| // Hover to view descriptions of existing attributes. | ||
| // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "type": "chrome", | ||
| "request": "launch", | ||
| "name": "Launch Chrome against localhost", | ||
| "url": "http://localhost:3000", | ||
| "webRoot": "${workspaceFolder}" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,60 @@ | ||
| // import React | ||
| import React, { Component } from 'react' | ||
| import React, { Component } from 'react'; | ||
| // Import NavBar component | ||
| import NavBar from '../../components/NavBar'; | ||
| import Grid from '@material-ui/core/Grid'; | ||
| import UpcomingEvents from '../Landing/UpcomingEvents'; | ||
| import MyEventCard from './MyEventCard'; | ||
| // import Firebase | ||
| import firebase from '../../firebase-config'; | ||
|
|
||
| class Events extends Component { | ||
| render() { | ||
| return ( | ||
| <div> | ||
| <div className="main-content-section"> | ||
| <Grid container spacing={16}> | ||
| <Grid item xs={12} sm={12} md={8}> | ||
| <h1>My Events For Today</h1> | ||
| <MyEventCard /> | ||
| <MyEventCard /> | ||
| <MyEventCard /> | ||
| <MyEventCard /> | ||
| </Grid> | ||
| <Grid item xs={12} sm={12} md={4}> | ||
| <h1>Upcoming Events</h1> | ||
| <UpcomingEvents /> | ||
| </Grid> | ||
| </Grid> | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
| constructor(props) { | ||
| super(props); | ||
| this.state = { | ||
| name: '', | ||
| eventsRef: firebase.database().ref('events'), | ||
| events: [] | ||
| }; | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| /* Create reference to messages in Firebase Database */ | ||
| const eventsRef = firebase.database().ref('events'); | ||
| eventsRef.on('value', snapshot => { | ||
| const events = snapshot.val(); | ||
| console.log(events); | ||
| const newState = []; | ||
| for (const event in events) { | ||
| newState.push({ | ||
| name: events[event].name | ||
| }); | ||
| } | ||
| this.setState({ | ||
| events: newState | ||
| }); | ||
| console.log('EVENTS: ' + this.state.events); | ||
| }); | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <div> | ||
| <div className="main-content-section"> | ||
| <Grid container spacing={16}> | ||
| <Grid item xs={12} sm={12} md={8}> | ||
| <h1>My Events For Today</h1> | ||
| <MyEventCard /> | ||
| </Grid> | ||
| <Grid item xs={12} sm={12} md={4}> | ||
| <h1>Upcoming Events</h1> | ||
| <UpcomingEvents /> | ||
| </Grid> | ||
| </Grid> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default Events; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import React, { Component } from 'react' | ||
| import Grid from '@material-ui/core/Grid'; | ||
|
|
||
| class Help extends Component { | ||
| render() { | ||
| return ( | ||
| <div className="main-content-section"> | ||
| <h1>Help</h1> | ||
| <Grid container spacing={16}> | ||
| <Grid item xs={12} sm={12} md={8}> | ||
| </Grid> | ||
| </Grid> | ||
| </div> | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| export default Help; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { default } from './Help'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.