diff --git a/App/app/Router.js b/App/app/Router.js index fc7db444..d16952ed 100755 --- a/App/app/Router.js +++ b/App/app/Router.js @@ -183,6 +183,7 @@ const Stack = createStackNavigator({ return { headerTitle: 'Eventos', } + } else { return { @@ -207,7 +208,6 @@ const Stack = createStackNavigator({ screen: FebradaDetail, }, - resetPassword:{ screen:resetPassword } diff --git a/App/app/assets/rallyTascas.jpg b/App/app/assets/rallyTascas.jpg new file mode 100644 index 00000000..05b309c1 Binary files /dev/null and b/App/app/assets/rallyTascas.jpg differ diff --git a/App/app/screens/Eventos.js b/App/app/screens/Eventos.js index cfe0614a..276d18fb 100644 --- a/App/app/screens/Eventos.js +++ b/App/app/screens/Eventos.js @@ -1,11 +1,15 @@ import * as React from "react"; + import {View, StyleSheet, Dimensions, Text, Button, ScrollView, Image, TouchableOpacity} from "react-native"; + import {TabView, TabBar, SceneMap} from "react-native-tab-view"; +import rallyImg from '../assets/rallyTascas.jpg'; const SCREEN_HEIGHT = Dimensions.get("window").height; const SCREEN_WIDTH = Dimensions.get("window").width; + const FirstRoute = () => ( ); @@ -51,7 +55,6 @@ export default class Eventos extends React.Component { - ); @@ -128,6 +131,7 @@ const styles = StyleSheet.create({ cardContainer: { flex: 1, + flexDirection: 'row', padding: 10, margin: 20, backgroundColor: '#fff', diff --git a/App/app/screens/rallyTascas.js b/App/app/screens/rallyTascas.js new file mode 100644 index 00000000..90f318d3 --- /dev/null +++ b/App/app/screens/rallyTascas.js @@ -0,0 +1,47 @@ +/* +/* +/* +/*Esta página só está disponivel a 1 hora do rally.. +*/ + +import * as React from "react"; +import {View, StyleSheet, Dimensions, Text, Button, ScrollView} from "react-native"; +import {TabView, TabBar, SceneMap} from "react-native-tab-view"; + +import * as Actions from "../store/actions"; +import {connect} from "react-redux"; +import {bindActionCreators} from "redux"; + +export default class rallyTascas extends React.Component { + + render() { + return ( + + + + ) + + + } +} + + + +function mapStateToProps(state, props) { + + return { + + token: state.apiReducer.token, + user: state.apiReducer.user, + logged: state.apiReducer.logged, + events: state.apiReducer.events + + } +} + +function mapDispatchToProps(dispatch) { + + return bindActionCreators(Actions, dispatch); +} + +export default connect(mapStateToProps, mapDispatchToProps)(rallyTascas); \ No newline at end of file