zmiguel
/
ENEI2019-Public
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/henrydays/ENEI2019 

# Conflicts:
#	App/app/screens/teamDetail.js
This commit is contained in:
João Borges 2019-03-18 19:40:27 +00:00
parent cfec25fc5a 116ae6c196
commit 850b3be493
4 changed files with 183 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
App/app/Router.js
View File

@ -41,7 +41,7 @@ import resetPassword from './screens/resetPassword';
import eventDetail from './screens/eventDetail';
import rally from './screens/rallyDetail';
import teamDetail from './screens/teamDetail';
const navigationOptions = ({navigation}) => ({
headerLeft: <HeaderBackButton onPress={() => navigation.goBack(null)}/>,
@ -209,8 +209,8 @@ const Stack = createStackNavigator({
eventDetail: {
screen: eventDetail,
},
rally:{
screen: rally,
teamDetail:{
screen: teamDetail,
},
resetPassword:{

2
App/app/screens/Home.js
View File

@ -353,7 +353,7 @@ _creatTeam=()=>{
}}
>
<View style={{ width: "60%" }}>
<Text onPress={() => navigate('rally')}
<Text onPress={() => navigate('teamDetail')}
style={{
fontSize: 25,
color: "white",

157
App/app/screens/rallyDetail.js
View File

@ -1,157 +0,0 @@
/*
/*
/*
/*Esta página só está disponivel a 1 hora do rally..
*/
import * as React from "react";
import {View, StyleSheet, Dimensions, Text, Button, ScrollView, Image} 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";
const SCREEN_WIDTH = Dimensions.get("window").width;
const SCREEN_HEIGHT = Dimensions.get("window").height;
export default class rallyDetail extends React.Component {
render() {
return (
<View>
<View style={styles.container}>
<View style={{height: SCREEN_HEIGHT * 0.1, paddingBottom: 10}}>
<View style={styles.row}>
<View style={styles.leftRow}>
<Text style={[styles.headerText, {color: '#777'}]}>
NOME
</Text>
</View>
<View style={styles.rightRow}>
<Text style={styles.headerText}>
Pontos
</Text>
</View>
</View>
</View>
<View style={{height: SCREEN_HEIGHT * 0.15, paddingBottom: 10}}>
<View style={styles.row}>
<ScrollView horizontal>
<View style={styles.memberImage}>
<Image
source={{uri: 'https://centrik.in/wp-content/uploads/2017/02/user-image-.png'}}
/>
</View>
</ScrollView>
</View>
</View>
<ScrollView style={styles.row}>
<FlatList
data={this.props.eventsInternal}
renderItem={({item}) =>
<View>
<TouchableOpacity onPress={() => navigate('eventDetail', {info: item})}>
<View style={styles.cardContainer}>
<Image
style={{
flex: 1,
width: undefined,
height: undefined
}}
resizeMode="contain"
source={{uri: item.imagem}}
>
</Image>
<View style={styles.cardDesc}>
<Text style={styles.cardDescText}>{item.nome}</Text>
<Text style={styles.cardHours}>{item.horas}</Text>
</View>
</View>
</TouchableOpacity>
</View>}
/>
</ScrollView>
</View>
</View>
)
}
}
const styles = StyleSheet.create({
container: {
margin: 10,
flex: 1,
flexGrow: 1,
flexDirection: "column"
},
row: {
flex: 1,
flexDirection: 'row',
padding: 10,
backgroundColor: "white",
borderRadius: 0,
shadowColor: "#000",
shadowOffset: {
width: 0,
height: 2
},
shadowOpacity: 0.25,
shadowRadius: 3.84,
elevation: 3
},
headerText: {
fontSize: 25,
color: "#CC1A17",
fontWeight: "bold",
},
centerRow: {
alignItems: "center",
backgroundColor: "transparent",
flex: 3,
flexDirection: "column",
justifyContent: "center"
},
leftRow: {
backgroundColor: "transparent",
flex: 1,
flexDirection: "row",
justifyContent: "flex-start",
alignSelf: "center"
},
rightRow: {
alignItems: "flex-end",
backgroundColor: "transparent",
flex: 2,
flexDirection: "row",
justifyContent: "flex-end",
marginRight: 4,
alignSelf: "center"
},
memberImage: {
flex: 1,
flexDirection: "row",
justifyContent: "flex-start",
alignSelf: "center",
marginRight: 4,
height: 50,
width: 50,
backgroundColor: "transparent",
},
});

179
App/app/screens/teamDetail.js Normal file
View File

@ -0,0 +1,179 @@
/*
/*
/*
/*Esta página só está disponivel a 1 hora do rally..
*/
import * as React from "react";
import {
View,
StyleSheet,
Dimensions,
Text,
Button,
ScrollView,
FlatList,
TouchableOpacity,
Image
} 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";
const SCREEN_WIDTH = Dimensions.get("window").width;
const SCREEN_HEIGHT = Dimensions.get("window").height;
class teamDetail extends React.Component {
componentDidMount() {
this.props.getEventLocsVisited(this.props.team.id, this.props.internalToken);
}
render() {
return (
<ScrollView>
<View>
<View style={styles.container}>
<View style={{height: SCREEN_HEIGHT * 0.1, paddingBottom: 10}}>
<View style={styles.row}>
<View style={styles.leftRow}>
<Text style={[styles.headerText, {color: '#777'}]}>
NOME
</Text>
</View>
<View style={styles.rightRow}>
<Text style={styles.headerText}>
Pontos
</Text>
</View>
</View>
</View>
<View style={{height: SCREEN_HEIGHT * 0.15, paddingBottom: 10}}>
<View style={styles.row}>
<View style={styles.memberImage}>
<Image
source={{uri: 'https://centrik.in/wp-content/uploads/2017/02/user-image-.png'}}
/>
</View>
</View>
</View>
<View style={{width: '100%', backgroundColor: 'red'}}>{
this.props.locais &&
<FlatList
data={this.props.locais}
renderItem={({item}) => <Text>{item.location.nome}</Text>}
/>}
</View>
</View>
</View>
</ScrollView>
)
}
}
const styles = StyleSheet.create({
container: {
margin: 10,
flex: 1,
flexGrow: 1,
flexDirection: "column"
},
row: {
flex: 1,
flexDirection: 'row',
padding: 10,
backgroundColor: "white",
borderRadius: 0,
shadowColor: "#000",
shadowOffset: {
width: 0,
height: 2
},
shadowOpacity: 0.25,
shadowRadius: 3.84,
elevation: 3
},
headerText: {
fontSize: 25,
color: "#CC1A17",
fontWeight: "bold",
},
centerRow: {
alignItems: "center",
backgroundColor: "transparent",
flex: 3,
flexDirection: "column",
justifyContent: "center"
},
leftRow: {
backgroundColor: "transparent",
flex: 1,
flexDirection: "row",
justifyContent: "flex-start",
alignSelf: "center"
},
rightRow: {
alignItems: "flex-end",
backgroundColor: "transparent",
flex: 2,
flexDirection: "row",
justifyContent: "flex-end",
marginRight: 4,
alignSelf: "center"
},
memberImage: {
flex: 1,
flexDirection: "row",
justifyContent: "flex-start",
alignSelf: "center",
marginRight: 4,
height: 50,
width: 50,
backgroundColor: "transparent",
},
});
function mapStateToProps(state, props) {
return {
token: state.apiReducer.token,
user: state.apiReducer.user,
logged: state.apiReducer.logged,
userDetails: state.apiReducer.userDetails,
onHold: state.apiReducer.onHold,
bilhete: state.apiReducer.bilhete,
alimentacao: state.apiReducer.alimentacao,
alojamento: state.apiReducer.alojamento,
acesso: state.apiReducer.acesso,
team: state.apiReducer.team,
internalToken: state.apiReducer.internalToken,
eventsInternal: state.apiReducer.eventsInternal,
locais: state.apiReducer.locais
};
}
function mapDispatchToProps(dispatch) {
return bindActionCreators(Actions, dispatch);
}
export default connect(
mapStateToProps,
mapDispatchToProps)(teamDetail);