Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

React Upgrade and Syntax update #22

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
15 changes: 10 additions & 5 deletions Example/components/Error.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
'use strict';

var React = require('react-native');
var {View, Text, StyleSheet} = React;
var Button = require('react-native-button');
import React, { Component } from 'react';
import {
AppRegistry,
StyleSheet,
Text,
View
} from 'react-native';
import Button from 'react-native-button'

class Error extends React.Component {
class Error extends Component {
render(){
let Actions = this.props.routes;
return (
Expand All @@ -18,4 +23,4 @@ class Error extends React.Component {
}


module.exports = Error;
module.exports = Error;
15 changes: 10 additions & 5 deletions Example/components/Home.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
'use strict';

var React = require('react-native');
var {View, Text, StyleSheet} = React;
var Button = require('react-native-button');
import React, { Component } from 'react';
import {
AppRegistry,
StyleSheet,
Text,
View
} from 'react-native';
import Button from 'react-native-button'

class Register extends React.Component {
class Register extends Component {
render(){
let Actions = this.props.routes;
return (
Expand Down Expand Up @@ -35,4 +40,4 @@ var styles = StyleSheet.create({
},
});

module.exports = Register;
module.exports = Register;
14 changes: 10 additions & 4 deletions Example/components/Launch.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
'use strict';

var React = require('react-native');
var {View, Text, StyleSheet, TouchableHighlight} = React;
var Button = require('react-native-button');
import React, { Component } from 'react';
import {
AppRegistry,
StyleSheet,
Text,
View,
TouchableHighlight
} from 'react-native';
import Button from 'react-native-button'

class Launch extends React.Component {
class Launch extends Component {
render(){
var Actions = this.props.routes;
return (
Expand Down
16 changes: 11 additions & 5 deletions Example/components/Login.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
'use strict';

var React = require('react-native');
var {View, Text, StyleSheet} = React;
var Button = require('react-native-button');
import React, { Component } from 'react';
import {
AppRegistry,
StyleSheet,
Text,
View
} from 'react-native';

class Login extends React.Component {
import Button from 'react-native-button'

class Login extends Component {
render(){
let Actions = this.props.routes;

Expand Down Expand Up @@ -38,4 +44,4 @@ var styles = StyleSheet.create({



module.exports = Login;
module.exports = Login;
11 changes: 8 additions & 3 deletions Example/components/NavBar.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
'use strict';

var NavigationBar = require('react-native-navbar');
var React = require('react-native');
var {StyleSheet,View} = React;
import React, { Component } from 'react';
import {
AppRegistry,
StyleSheet,
Text,
View
} from 'react-native';
var {Router, Route, Animations, Schema} = require('react-native-redux-router');

class NavBarBase extends React.Component {
class NavBarBase extends Component {
onPrev(){
var Actions = this.props.routes;
if (this.props.onPrev){
Expand Down
15 changes: 10 additions & 5 deletions Example/components/Register.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
'use strict';

var React = require('react-native');
var {View, Text, StyleSheet} = React;
var Button = require('react-native-button');
import React, { Component } from 'react';
import {
AppRegistry,
StyleSheet,
Text,
View
} from 'react-native';
import Button from 'react-native-button'

class Register extends React.Component {
class Register extends Component {
render(){
let Actions = this.props.routes;
return (
Expand Down Expand Up @@ -36,4 +41,4 @@ var styles = StyleSheet.create({
},
});

module.exports = Register;
module.exports = Register;
21 changes: 13 additions & 8 deletions Example/index.ios.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
'use strict';

var React = require('react-native');
var {AppRegistry, StyleSheet,Text,View} = React;
import React, { Component } from 'react';
import {
AppRegistry,
StyleSheet,
Text,
View
} from 'react-native';
var Launch = require('./components/Launch');
var Register = require('./components/Register');
var Login = require('./components/Login');
Expand All @@ -11,7 +16,7 @@ var Error = require('./components/Error');
var Home = require('./components/Home');

import { createStore, combineReducers, applyMiddleware } from 'redux';
import { Provider } from 'react-redux/native';
import { Provider } from 'react-redux';
import createLogger from 'redux-logger';

const loggerMiddleWare = createLogger();
Expand All @@ -20,7 +25,7 @@ const createStoreWithMiddleware = applyMiddleware(loggerMiddleWare)(createStore)
const reducer = combineReducers({routerReducer});
let store = createStoreWithMiddleware(reducer);

class App extends React.Component {
class App extends Component {
render(){
return (
<View style={{flex:1}}>
Expand All @@ -43,12 +48,12 @@ class App extends React.Component {
);
}
}
class Example extends React.Component {
class Example extends Component {
render() {
return (
<Provider store={store}>
{() => <App />}
</Provider>
<Provider store={store}>
<App />
</Provider>
);
}
}
Expand Down