Skip to content
This repository has been archived by the owner on May 1, 2019. It is now read-only.

Upgrade to RN 45 #66

Merged
merged 5 commits into from
Jun 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place your settings in this file to overwrite default and user settings.
{
}
1 change: 0 additions & 1 deletion App/Components/Break.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import BackgroundVideo from './BackgroundVideo'
import styles from './Styles/BreakStyle'

export default class Break extends React.Component {

constructor (props) {
super(props)

Expand Down
2 changes: 0 additions & 2 deletions App/Components/Talk.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import PushNotification from 'react-native-push-notification'
import PNHelpers from '../Lib/PushNotificationHelpers'

export default class Talk extends React.Component {

constructor (props) {
super(props)

Expand Down Expand Up @@ -89,7 +88,6 @@ export default class Talk extends React.Component {
</View>
)
}

}

Talk.propTypes = {
Expand Down
2 changes: 0 additions & 2 deletions App/Components/VenueMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class VenueMap extends React.Component {
* There are TONS of options available from traffic to buildings to indoors to compass and more!
* For full documentation, see https://github.com/lelandrichardson/react-native-maps
*************************************************************/

constructor (props) {
super(props)
/* ***********************************************************
Expand Down Expand Up @@ -144,4 +143,3 @@ class VenueMap extends React.Component {
}

export default VenueMap

2 changes: 0 additions & 2 deletions App/Containers/AboutScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { connect } from 'react-redux'
import styles from './Styles/AboutScreenStyle'

class AboutScreen extends React.Component {

static navigationOptions = {
tabBarLabel: 'General Info',
tabBarIcon: ({ focused }) => (
Expand Down Expand Up @@ -242,7 +241,6 @@ class AboutScreen extends React.Component {
</PurpleGradient>
)
}

}

const mapStateToProps = (state) => {
Expand Down
2 changes: 0 additions & 2 deletions App/Containers/BreakDetailScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { Images } from '../Themes'
import styles from './Styles/BreakDetailScreenStyle'

class BreakDetail extends React.Component {

static navigationOptions = {
tabBarLabel: 'Schedule',
tabBarIcon: ({ focused }) => (
Expand Down Expand Up @@ -111,7 +110,6 @@ class BreakDetail extends React.Component {
</PurpleGradient>
)
}

}

const mapStateToProps = (state) => {
Expand Down
1 change: 0 additions & 1 deletion App/Containers/LaunchScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { Images } from '../Themes'
import styles from './Styles/LaunchScreenStyles'

export default class LaunchScreen extends React.Component {

render () {
return (
<View style={styles.mainContainer}>
Expand Down
2 changes: 0 additions & 2 deletions App/Containers/LocationScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ const { UBER_CLIENT_ID } = Secrets
const MAP_TAP_THRESHOLD = 100

class LocationScreen extends React.Component {

constructor (props) {
super(props)

Expand Down Expand Up @@ -245,7 +244,6 @@ class LocationScreen extends React.Component {
</PurpleGradient>
)
}

}

const mapStateToProps = (state) => {
Expand Down
170 changes: 0 additions & 170 deletions App/Containers/LoginScreen.js

This file was deleted.

1 change: 0 additions & 1 deletion App/Containers/RootContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import NotificationsBar from '../Components/NotificationsBar'
import styles from './Styles/RootContainerStyles'

class RootContainer extends Component {

componentDidMount () {
// if redux persist is not active fire startup action
if (!ReduxPersist.active) {
Expand Down
1 change: 0 additions & 1 deletion App/Containers/ScheduleScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ const isCurrentDay = (currentTime, activeDay) =>
const addSpecials = (specialTalksList, talks) => map((talk) => assoc('special', contains(talk.title, specialTalksList), talk), talks)

class ScheduleScreen extends React.Component {

constructor (props) {
super(props)

Expand Down
52 changes: 0 additions & 52 deletions App/Containers/Styles/LoginScreenStyles.js

This file was deleted.

2 changes: 0 additions & 2 deletions App/Containers/TalkDetailScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import PNHelpers from '../Lib/PushNotificationHelpers'
import { contains } from 'ramda'

class TalkDetail extends React.Component {

static navigationOptions = {
tabBarLabel: 'Schedule',
tabBarIcon: ({ focused }) => (
Expand Down Expand Up @@ -130,7 +129,6 @@ class TalkDetail extends React.Component {
</PurpleGradient>
)
}

}

const mapStateToProps = (state) => {
Expand Down
2 changes: 1 addition & 1 deletion App/Sagas/LocationSagas.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { call, put } from 'redux-saga/effects'
import LocationActions from '../Redux/LocationRedux'

export function* getNearbyUpdates (api, action) {
export function * getNearbyUpdates (api, action) {
let response = yield call(api.getNearby)
if (response.ok) yield put(LocationActions.updateNearby(response.data))
}
2 changes: 1 addition & 1 deletion App/Sagas/ScheduleSagas.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const getCurrentTime = () => {
}
}

export function* trackCurrentTime () {
export function * trackCurrentTime () {
let time = yield getCurrentTime()
yield put(ScheduleActions.updateCurrentTime(time))
while (true) {
Expand Down
2 changes: 1 addition & 1 deletion App/Sagas/ScheduleUpdateSagas.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { call, put } from 'redux-saga/effects'
import ScheduleActions from '../Redux/ScheduleRedux'

export function* getScheduleUpdates (api, action) {
export function * getScheduleUpdates (api, action) {
let response = yield call(api.getSpeakers)
if (response.ok) yield put(ScheduleActions.updateSchedule(response.data.schedule))
}
4 changes: 2 additions & 2 deletions App/Sagas/SocialSagas.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export async function open (url) {
*
* @param {string} action.account The user or account/repo of the user.
*/
export function* visitGithub (action) {
export function * visitGithub (action) {
const { account = 'infinitered/chainreactapp' } = action
const url = `https://github.com/${account}`
yield call(open, url)
Expand All @@ -27,7 +27,7 @@ export function* visitGithub (action) {
*
* @param {string} action.account The twitter account.
*/
export function* visitTwitter (action) {
export function * visitTwitter (action) {
const { account = 'chainreactconf' } = action
const nativeUrl = `twitter://user?screen_name=${account}`
const webUrl = `https://twitter.com/${account}`
Expand Down
Loading