diff options
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/lib/db/backupDB.js | 10 | ||||
| -rw-r--r-- | client/src/lib/views/contact.js | 1 | ||||
| -rw-r--r-- | client/src/lib/views/home.js | 2 | ||||
| -rw-r--r-- | client/src/lib/views/livestream.js | 33 | ||||
| -rw-r--r-- | client/src/lib/views/nav.js | 2 |
5 files changed, 7 insertions, 41 deletions
diff --git a/client/src/lib/db/backupDB.js b/client/src/lib/db/backupDB.js index cc912ea..07d3d18 100644 --- a/client/src/lib/db/backupDB.js +++ b/client/src/lib/db/backupDB.js @@ -2576,7 +2576,7 @@ export const backupDB = { "disabled": false, "__index": 0, "dateCreated": "Thu, 18 May 2017 17:05:09 GMT", - "body": "As part of the installation we have set up several kinds of surveillance cameras in the Drill Hall of the Park Avenue Armory. Here you can see live streams which feature infrared captures from drones flying overhead inside the Drill Hall to hidden cameras watching visitors enter and exit the installation." + "body": "As part of the installation, we set up several kinds of surveillance cameras in the Drill Hall of the Park Avenue Armory. Here you could see live streams which featured infrared captures from drones flying overhead inside the Drill Hall and hidden cameras watching visitors enter and exit the installation." } ], "drone": [ @@ -2584,10 +2584,10 @@ export const backupDB = { "id": "drone-statistics", "title": "Drone Statistics", "intro": "Military use of unmanned aircraft systems has grown by leaps and bounds over the last decade. In 2012, the US Air Force trained more drone pilots than normal pilots; the US Military has over 1,300 drone pilots in active service. Where drones were once used strictly for surveillance, their role has expanded as technology advances and budgets increase. Drones come in all shapes and sizes, from very small spy drones to large weapon-bearing predators. Unencumbered by human cargo, some drones can stay in the air for over six months, observing a target from high in the sky, completely invisible from the ground.", - "strikes": "3,341", - "totalKilled": "6,435-9,309", - "civiliansKilled": "739-1,407", - "childrenKilled": "240-308", + "strikes": "4,684", + "totalKilled": "7,128-10,432", + "civiliansKilled": "737-1,551", + "childrenKilled": "242-330", "__index": 0, "dateCreated": "Thu, 18 May 2017 20:42:04 GMT", "links": [ diff --git a/client/src/lib/views/contact.js b/client/src/lib/views/contact.js index 6c45b2f..366b5c0 100644 --- a/client/src/lib/views/contact.js +++ b/client/src/lib/views/contact.js @@ -101,7 +101,6 @@ export default class Contact extends Component { {this.props.content.body} </ClearText> - {this.renderForm()} {this.renderComments()} </View> diff --git a/client/src/lib/views/home.js b/client/src/lib/views/home.js index 2e7979e..ed3c9b9 100644 --- a/client/src/lib/views/home.js +++ b/client/src/lib/views/home.js @@ -15,7 +15,7 @@ const sections = [ '/drones', '/livestream', '/information', - '/contact' + '/page/credits' ] const labels = [ 'SURVEILLANCE', diff --git a/client/src/lib/views/livestream.js b/client/src/lib/views/livestream.js index 5df52aa..34a6d2d 100644 --- a/client/src/lib/views/livestream.js +++ b/client/src/lib/views/livestream.js @@ -23,41 +23,8 @@ export default class Livestream extends Component { } } render() { - const buttons = this.props.content.streams.map( (stream, i) => { - const ytid = getYTID(stream.uri || "") - if (! ytid) return null - let buttonStyle, textStyle - if (ytid === this.state.ytid) { - buttonStyle = styles.activeButton - textStyle = styles.activeButtonText - } - return ( - <Button - key={'button_' + i} - buttonStyle={buttonStyle} - textStyle={textStyle} - label={stream.text} - onPress={() => { - this.setState({ ytid }) - }} - /> - ) - }).filter(button => !!button) - const first_buttons = buttons.slice(0, 3) - const second_buttons = buttons.slice(3) - return ( <ScrollableContainer heading='Livestream' bodyStyle={styles.bodyStyle}> - <View style={styles.videoContainer} className='videoContainer'> - <Youtube ytid={this.state.ytid} /> - <View style={styles.overlay}></View> - </View> - <View style={styles.buttons}> - {first_buttons} - </View> - <View style={styles.buttons}> - {second_buttons} - </View> <View style={styles.contentContainer}> <ClearText style={styles.body}>{this.props.content.body}</ClearText> </View> diff --git a/client/src/lib/views/nav.js b/client/src/lib/views/nav.js index 3e852cf..fd6530a 100644 --- a/client/src/lib/views/nav.js +++ b/client/src/lib/views/nav.js @@ -16,7 +16,7 @@ const sections = [ '/drones', '/livestream', '/information', - '/contact' + '/page/credits' ] const images = [ require('../../img/nav/sidebar/home.png'), |