Merge branch 'Borges_march' of https://github.com/henrydays/ENEI2019 into Borges_march
This commit is contained in:
João Borges
commit
81e2e63c1e
|
|
@ -85,3 +85,4 @@ bin/
|
|||
obj/
|
||||
|
||||
.vscode/
|
||||
*.cache
|
||||
|
|
|
|||
382
App/app/App.js
382
App/app/App.js
|
|
@ -1,4 +1,4 @@
|
|||
import React, {Component} from 'react';
|
||||
import React, { Component } from "react";
|
||||
import {
|
||||
Platform,
|
||||
StyleSheet,
|
||||
|
|
@ -17,31 +17,29 @@ import {
|
|||
TextInput,
|
||||
NetInfo,
|
||||
Animated
|
||||
} from "react-native";
|
||||
|
||||
} from 'react-native';
|
||||
import { bindActionCreators } from "redux";
|
||||
import { connect } from "react-redux";
|
||||
|
||||
import {bindActionCreators} from 'redux';
|
||||
import {connect} from 'react-redux';
|
||||
import QRCodeScanner from "react-native-qrcode-scanner";
|
||||
import { UtilStyles } from "./assets/styles";
|
||||
|
||||
import QRCodeScanner from 'react-native-qrcode-scanner';
|
||||
import {UtilStyles} from './assets/styles'
|
||||
import * as Actions from "./store/actions";
|
||||
|
||||
import * as Actions from './store/actions';
|
||||
|
||||
import {RkButton, RkTheme, RkText, RkTextInput} from 'react-native-ui-kitten';
|
||||
import { RkButton, RkTheme, RkText, RkTextInput } from "react-native-ui-kitten";
|
||||
|
||||
import Modal from "react-native-modal";
|
||||
|
||||
import Router from './Router'
|
||||
import Router from "./Router";
|
||||
|
||||
import Icon from "react-native-vector-icons/Ionicons"
|
||||
import Icon from "react-native-vector-icons/Ionicons";
|
||||
|
||||
const SCREEN_HEIGHT = Dimensions.get("window").height;
|
||||
const SCREEN_WIDTH = Dimensions.get("window").width;
|
||||
|
||||
import Swiper from 'react-native-swiper';
|
||||
|
||||
var TimerMixin = require('react-timer-mixin');
|
||||
import Swiper from "react-native-swiper";
|
||||
var TimerMixin = require("react-timer-mixin");
|
||||
|
||||
function handleConnectivityChange() {
|
||||
console.log("asdasd");
|
||||
|
|
@ -50,262 +48,237 @@ function handleConnectivityChange() {
|
|||
class App extends Component {
|
||||
handleConnectivityChange = isConnected => {
|
||||
this.setState({ isConnected });
|
||||
}
|
||||
};
|
||||
_activate = () => {
|
||||
|
||||
this.setState({ isModalVisible: !this.state.isModalVisible });
|
||||
this.scanner.reactivate();
|
||||
|
||||
}
|
||||
};
|
||||
_scanQr = () => {
|
||||
this.props.openScannerLogin()
|
||||
console.log(this.props.UI_loginScannerActive)
|
||||
}
|
||||
this.props.openScannerLogin();
|
||||
console.log(this.props.UI_loginScannerActive);
|
||||
};
|
||||
_tryLogin = () => {
|
||||
|
||||
this.props.waitLogin();
|
||||
//console.log(this.state.text)
|
||||
//this.scanner.reactivate();
|
||||
this.props.login(this.state.username, this.state.text);
|
||||
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
_toggleModal = () =>
|
||||
this.setState({ isModalVisible: !this.state.isModalVisible });
|
||||
|
||||
constructor(props) {
|
||||
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
|
||||
token: { valid: false },
|
||||
tokenData: '',
|
||||
tokenData: "",
|
||||
onHold: true,
|
||||
logged: false,
|
||||
isModalVisible: false,
|
||||
state: {text: ''},
|
||||
username: 'QR code',
|
||||
state: { text: "" },
|
||||
username: "QR code",
|
||||
failedAttempt: false,
|
||||
push: 4,
|
||||
UI_loginScannerActive: false,
|
||||
userDetails: {username: '', password: ''},
|
||||
isConnected: true
|
||||
userDetails: { username: "", password: "" },
|
||||
isConnected: true,
|
||||
modalOpen: false
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
_print = () => {
|
||||
console.log("hello")
|
||||
this.setState({push: 0})
|
||||
console.log("hello");
|
||||
this.setState({ push: 0 });
|
||||
};
|
||||
|
||||
checkValue = (e) => {
|
||||
console.log("check" + e)
|
||||
checkValue = e => {
|
||||
console.log("check" + e);
|
||||
};
|
||||
|
||||
_handleConnectionChange = (isConnected) => {
|
||||
_handleConnectionChange = isConnected => {
|
||||
this.props.connectionState(true);
|
||||
};
|
||||
|
||||
|
||||
componentDidMount() {
|
||||
this.props.hold();
|
||||
NetInfo.isConnected.addEventListener('connectionChange', this.handleConnectivityChange);
|
||||
//this.props.hold();
|
||||
this.props.loginInternal();
|
||||
NetInfo.isConnected.addEventListener(
|
||||
"connectionChange",
|
||||
this.handleConnectivityChange
|
||||
);
|
||||
|
||||
this.setState({isModalVisible: false})
|
||||
this.setState({ isModalVisible: false });
|
||||
//verifica se o utilizador tem token guardado
|
||||
this.props.checkUser(this.props.userDetails);
|
||||
this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this._keyboardDidShow);
|
||||
this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this._keyboardDidHide);
|
||||
|
||||
|
||||
this.keyboardDidShowListener = Keyboard.addListener(
|
||||
"keyboardDidShow",
|
||||
this._keyboardDidShow
|
||||
);
|
||||
this.keyboardDidHideListener = Keyboard.addListener(
|
||||
"keyboardDidHide",
|
||||
this._keyboardDidHide
|
||||
);
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
NetInfo.isConnected.removeEventListener('connectionChange', this.handleConnectivityChange);
|
||||
NetInfo.isConnected.removeEventListener(
|
||||
"connectionChange",
|
||||
this.handleConnectivityChange
|
||||
);
|
||||
}
|
||||
|
||||
_keyboardDidShow() {
|
||||
//alert('Keyboard Shown');
|
||||
// this.setState({push:0})
|
||||
|
||||
}
|
||||
|
||||
_keyboardDidHide() {
|
||||
|
||||
//this.setState({push:4})
|
||||
|
||||
}
|
||||
|
||||
onSuccess = (e) => {
|
||||
|
||||
onSuccess = e => {
|
||||
// this.setState({ isModalVisible: !this.state.isModalVisible });
|
||||
// this.props.login(e.data, 'f8908cc0');
|
||||
this.props.closeLoginQRScan();
|
||||
this.setState({username: e.data})
|
||||
this.setState({ username: e.data });
|
||||
|
||||
console.log("QR code lido");
|
||||
|
||||
|
||||
};
|
||||
|
||||
render() {
|
||||
if (!this.state.isConnected) {
|
||||
return (
|
||||
<View>
|
||||
<Text>cenas da vida</Text>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
if (!this.props.logged && this.props.onHold) {
|
||||
|
||||
|
||||
return (
|
||||
<View style={UtilStyles.containerLoading}>
|
||||
|
||||
<ActivityIndicator size="large" color="red" />
|
||||
</View>
|
||||
)
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
);
|
||||
} else {
|
||||
// console.log('token... '+ this.props.logged)
|
||||
|
||||
//se existir token
|
||||
|
||||
if (this.props.logged) {
|
||||
|
||||
return (
|
||||
|
||||
<Router></Router>
|
||||
)
|
||||
return <Router />;
|
||||
}
|
||||
return (
|
||||
|
||||
|
||||
<View style={styles.slide2}>
|
||||
<Modal isVisible={this.props.UI_loginScannerActive}>
|
||||
<View style={{flex: 1, backgroundColor: 'white'}}>
|
||||
<Button onPress={this.props.closeLoginQRScan} title={"Fechar scanner"}> </Button>
|
||||
<View style={{ flex: 1, backgroundColor: "white" }}>
|
||||
<Button
|
||||
onPress={this.props.closeLoginQRScan}
|
||||
title={"Fechar scanner"}
|
||||
>
|
||||
{" "}
|
||||
</Button>
|
||||
|
||||
<QRCodeScanner
|
||||
cameraProps={{captureAudio: false}}
|
||||
onRead={this.onSuccess}
|
||||
cameraStyle={styles.cameraContainer}
|
||||
/>
|
||||
</View>
|
||||
|
||||
</Modal>
|
||||
<View style={{
|
||||
width: '100%',
|
||||
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
}}>
|
||||
<Image style={styles.logo2} source={require('./assets/img/logo2.png')}/>
|
||||
<View
|
||||
style={{
|
||||
width: "100%",
|
||||
|
||||
justifyContent: "center",
|
||||
alignItems: "center"
|
||||
}}
|
||||
>
|
||||
<Image
|
||||
style={styles.logo2}
|
||||
source={require("./assets/img/logo2.png")}
|
||||
/>
|
||||
</View>
|
||||
<View styles={styles.loginContainer}>
|
||||
|
||||
|
||||
<View style={styles.inputSection}>
|
||||
|
||||
<TextInput
|
||||
style={styles.input}
|
||||
placeholder={this.state.username}
|
||||
onChangeText={(searchString) => {
|
||||
this.setState({searchString})
|
||||
onChangeText={searchString => {
|
||||
this.setState({ searchString });
|
||||
}}
|
||||
maxLength={15}
|
||||
underlineColorAndroid="transparent"
|
||||
/>
|
||||
<TouchableOpacity onPress={this._scanQr}>
|
||||
|
||||
<View style={styles.scanQR}>
|
||||
|
||||
<Icon style={styles.searchIcon} name="ios-qr-scanner" size={30} color="#000"/>
|
||||
<Icon
|
||||
style={styles.searchIcon}
|
||||
name="ios-qr-scanner"
|
||||
size={30}
|
||||
color="#000"
|
||||
/>
|
||||
<Text>Scan QR</Text>
|
||||
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
|
||||
</View>
|
||||
|
||||
<TextInput style={styles.passwordInput}
|
||||
<TextInput
|
||||
style={styles.passwordInput}
|
||||
onFocus={this._print}
|
||||
maxLength={10}
|
||||
blurOnSubmit={true}
|
||||
secureTextEntry={true}
|
||||
|
||||
onChangeText={(text) => this.setState({text})}
|
||||
clearButtonMode='always'
|
||||
onChangeText={text => this.setState({ text })}
|
||||
clearButtonMode="always"
|
||||
value={this.state.text}
|
||||
clearTextOnFocus={true}
|
||||
onSubmitEditing={Keyboard.dismiss}
|
||||
placeholder='Password'/>
|
||||
|
||||
<RkButton rkType='dark' style={styles.loginBtn} onPress={this._tryLogin}>Entrar</RkButton>
|
||||
|
||||
placeholder="Password"
|
||||
/>
|
||||
{ !this.props.loadingLogin &&
|
||||
<RkButton
|
||||
rkType="dark"
|
||||
style={styles.loginBtn}
|
||||
onPress={this._tryLogin}
|
||||
>
|
||||
Entrar
|
||||
</RkButton>
|
||||
}
|
||||
{this.props.alignItems &&
|
||||
<ActivityIndicator size="large" color="#0000ff" />
|
||||
}
|
||||
</View>
|
||||
|
||||
<View style={styles.buttons}>
|
||||
<TouchableOpacity
|
||||
style={styles.button}>
|
||||
|
||||
<TouchableOpacity style={styles.button}>
|
||||
<Icon name="logo-facebook" size={40} />
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity
|
||||
style={styles.button}>
|
||||
|
||||
<TouchableOpacity style={styles.button}>
|
||||
<Icon name="logo-instagram" size={40} />
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity
|
||||
style={styles.button}>
|
||||
|
||||
<TouchableOpacity style={styles.button}>
|
||||
<Icon name="md-heart" size={40} />
|
||||
|
||||
</TouchableOpacity>
|
||||
|
||||
</View>
|
||||
<View style={styles.footer}>
|
||||
<View style={styles.textRow}>
|
||||
|
||||
<RkText rkType='primary3'>Não sabes a password?</RkText>
|
||||
<RkButton rkType='clear' onPress={this.onSignUpButtonPressed}>
|
||||
|
||||
<RkText rkType="primary3">Não sabes a password?</RkText>
|
||||
<RkButton rkType="clear" onPress={this.onSignUpButtonPressed}>
|
||||
<TouchableOpacity>
|
||||
<RkText style={{color: 'red'}} kType='header6'>Recuperar Password</RkText>
|
||||
<RkText style={{ color: "red" }} kType="header6">
|
||||
Recuperar Password
|
||||
</RkText>
|
||||
</TouchableOpacity>
|
||||
|
||||
</RkButton>
|
||||
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
|
||||
);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
RkTheme.setType('RkButton', 'dark', {
|
||||
RkTheme.setType("RkButton", "dark", {
|
||||
container: {
|
||||
paddingTop: 10,
|
||||
backgroundColor: 'gray',
|
||||
backgroundColor: "gray",
|
||||
|
||||
borderRadius: 90,
|
||||
borderRadius: 90
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
const rectDimensions = SCREEN_WIDTH * 0.85; // this is equivalent to 255 from a 393 device width
|
||||
|
||||
const overlayColor = 'rgba(0,0,0,0.30)';
|
||||
const overlayColor = "rgba(0,0,0,0.30)";
|
||||
|
||||
const styles = {
|
||||
cameraContainer: {
|
||||
|
|
@ -314,96 +287,82 @@ const styles = {
|
|||
passwordInput: {
|
||||
borderRadius: 90,
|
||||
|
||||
borderColor: '#bfbdbd',
|
||||
borderColor: "#bfbdbd",
|
||||
borderWidth: 1,
|
||||
marginTop: 20,
|
||||
marginBottom: 20,
|
||||
width: SCREEN_WIDTH * 0.8,
|
||||
|
||||
backgroundColor: 'white',
|
||||
backgroundColor: "white",
|
||||
|
||||
borderRadius: 90,
|
||||
height: SCREEN_HEIGHT * 0.08,
|
||||
borderColor: '#bfbdbd',
|
||||
borderColor: "#bfbdbd",
|
||||
borderWidth: 1,
|
||||
paddingLeft: SCREEN_WIDTH * 0.05,
|
||||
|
||||
paddingLeft: SCREEN_WIDTH * 0.05
|
||||
},
|
||||
scanQRText: {
|
||||
|
||||
paddingTop: 50
|
||||
// paddingTop:20,
|
||||
|
||||
|
||||
},
|
||||
scanQR: {
|
||||
|
||||
//flexDirection: 'row',
|
||||
paddingTop: 5,
|
||||
backgroundColor: 10,
|
||||
|
||||
width: 80,
|
||||
paddingLeft: 10,
|
||||
backgroundColor: '#f24b4b',
|
||||
backgroundColor: "#f24b4b",
|
||||
borderBottomRightRadius: 90,
|
||||
borderTopRightRadius: 90,
|
||||
height: '100%',
|
||||
|
||||
height: "100%"
|
||||
},
|
||||
inputSection: {
|
||||
flexDirection: "row",
|
||||
backgroundColor: "#fff",
|
||||
|
||||
flexDirection: 'row',
|
||||
backgroundColor: '#fff',
|
||||
|
||||
backgroundColor: 'white',
|
||||
backgroundColor: "white",
|
||||
|
||||
borderRadius: 90,
|
||||
height: SCREEN_HEIGHT * 0.08,
|
||||
borderColor: '#bfbdbd',
|
||||
borderWidth: 1,
|
||||
|
||||
|
||||
borderColor: "#bfbdbd",
|
||||
borderWidth: 1
|
||||
},
|
||||
searchIcon: {
|
||||
paddingLeft: 10
|
||||
},
|
||||
|
||||
input: {
|
||||
|
||||
|
||||
flex: 1,
|
||||
paddingRight: 10,
|
||||
|
||||
|
||||
paddingLeft: 0,
|
||||
paddingLeft: SCREEN_WIDTH * 0.05,
|
||||
color: '#424242',
|
||||
|
||||
color: "#424242"
|
||||
},
|
||||
textRow: {
|
||||
marginBottom: 40
|
||||
},
|
||||
loginContainer: {
|
||||
width: '100%',
|
||||
height: '30%',
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center'
|
||||
width: "100%",
|
||||
height: "30%",
|
||||
justifyContent: "center",
|
||||
alignItems: "center"
|
||||
},
|
||||
loginBtn: {
|
||||
marginTop: 10,
|
||||
marginBottom: 20,
|
||||
marginLeft: '25%',
|
||||
|
||||
marginLeft: "25%"
|
||||
},
|
||||
|
||||
button: {
|
||||
borderWidth: 1,
|
||||
borderColor: 'rgba(0,0,0,0.2)',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
borderColor: "rgba(0,0,0,0.2)",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
width: 60,
|
||||
height: 60,
|
||||
backgroundColor: '#fff',
|
||||
backgroundColor: "#fff",
|
||||
borderRadius: 100,
|
||||
marginRight: 10,
|
||||
marginLeft: 10
|
||||
|
|
@ -411,56 +370,51 @@ const styles = {
|
|||
footer: {},
|
||||
|
||||
buttons: {
|
||||
flexDirection: 'row',
|
||||
flexDirection: "row",
|
||||
marginBottom: 24,
|
||||
marginHorizontal: 24,
|
||||
marginTop: 24,
|
||||
justifyContent: 'space-around',
|
||||
|
||||
|
||||
justifyContent: "space-around"
|
||||
},
|
||||
|
||||
logoContainer: {
|
||||
width: "100%",
|
||||
|
||||
width: '100%',
|
||||
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
marginTop: 200
|
||||
|
||||
},
|
||||
|
||||
logo2: {
|
||||
|
||||
// flex: 1,
|
||||
// resizeMode: 'contain',
|
||||
width: 200, height: 200,
|
||||
|
||||
width: 200,
|
||||
height: 200
|
||||
},
|
||||
wrapper: {},
|
||||
slide1: {
|
||||
flex: 1,
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
backgroundColor: 'white',
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
backgroundColor: "white"
|
||||
},
|
||||
slide2: {
|
||||
flex: 1,
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
backgroundColor: 'white',
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
backgroundColor: "white"
|
||||
},
|
||||
slide3: {
|
||||
flex: 1,
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
color: 'black',
|
||||
backgroundColor: 'white',
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
color: "black",
|
||||
backgroundColor: "white"
|
||||
},
|
||||
text: {
|
||||
color: '#fff',
|
||||
color: "#fff",
|
||||
fontSize: 30,
|
||||
fontWeight: 'bold',
|
||||
fontWeight: "bold"
|
||||
},
|
||||
recover: {
|
||||
paddingTop: 10,
|
||||
|
|
@ -470,22 +424,18 @@ const styles = {
|
|||
manual: {},
|
||||
|
||||
logo: {
|
||||
|
||||
height: SCREEN_HEIGHT * 0.35,
|
||||
width: SCREEN_WIDTH,
|
||||
backgroundColor: overlayColor,
|
||||
backgroundColor: overlayColor
|
||||
},
|
||||
rectangleContainer: {
|
||||
|
||||
flex: 1,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
backgroundColor: "transparent",
|
||||
|
||||
backgroundColor: "transparent"
|
||||
},
|
||||
|
||||
rectangle: {
|
||||
|
||||
height: rectDimensions,
|
||||
width: rectDimensions,
|
||||
alignItems: "center",
|
||||
|
|
@ -512,17 +462,17 @@ const styles = {
|
|||
height: rectDimensions,
|
||||
width: SCREEN_WIDTH,
|
||||
backgroundColor: overlayColor
|
||||
},
|
||||
}
|
||||
};
|
||||
RkTheme.setType('RkTextInput', 'frame', {
|
||||
RkTheme.setType("RkTextInput", "frame", {
|
||||
input: {
|
||||
backgroundColor: 'white',
|
||||
backgroundColor: "white",
|
||||
marginLeft: 0,
|
||||
marginHorizontal: 0,
|
||||
borderRadius: 5
|
||||
},
|
||||
color: 'gray',
|
||||
backgroundColor: 'gray',
|
||||
color: "gray",
|
||||
backgroundColor: "gray",
|
||||
borderRadius: 10,
|
||||
container: {
|
||||
paddingHorizontal: 20
|
||||
|
|
@ -530,7 +480,6 @@ RkTheme.setType('RkTextInput', 'frame', {
|
|||
});
|
||||
|
||||
mapStateToProps = (state, props) => {
|
||||
|
||||
return {
|
||||
token: state.apiReducer.token,
|
||||
loggedIn: state.apiReducer.loggedIn,
|
||||
|
|
@ -539,13 +488,18 @@ mapStateToProps = (state, props) => {
|
|||
failedAttempt: state.apiReducer.failedAttempt,
|
||||
UI_loginScannerActive: state.uiReducer.UI_loginScannerActive,
|
||||
userDetails: state.apiReducer.userDetails,
|
||||
}
|
||||
modalOpen: state.apiReducer.modalOpen,
|
||||
modalInfo: state.apiReducer.modalInfo,
|
||||
type: state.apiReducer.type,
|
||||
loadingLogin:state.apiReducer.loadingLogin
|
||||
};
|
||||
};
|
||||
|
||||
mapDispatchToProps = (dispatch) => {
|
||||
|
||||
mapDispatchToProps = dispatch => {
|
||||
return bindActionCreators(Actions, dispatch);
|
||||
};
|
||||
|
||||
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(App);
|
||||
export default connect(
|
||||
mapStateToProps,
|
||||
mapDispatchToProps
|
||||
)(App);
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 406 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 99 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 9.4 KiB |
|
|
@ -1,103 +1,95 @@
|
|||
import * as React from 'react';
|
||||
import {View, StyleSheet, Dimensions, Image, ScrollView, Text, Button, TouchableOpacity, Animated} from 'react-native';
|
||||
import {TabView, TabBar, SceneMap} from 'react-native-tab-view';
|
||||
import * as React from "react";
|
||||
import {
|
||||
RkButton, RkCard, RkText,
|
||||
RkTheme
|
||||
} from 'react-native-ui-kitten';
|
||||
import Timeline from 'react-native-timeline-feed'
|
||||
View,
|
||||
StyleSheet,
|
||||
Dimensions,
|
||||
Image,
|
||||
ScrollView,
|
||||
Text,
|
||||
Button,
|
||||
TouchableOpacity,
|
||||
Animated
|
||||
} from "react-native";
|
||||
import { TabView, TabBar, SceneMap } from "react-native-tab-view";
|
||||
import { RkButton, RkCard, RkText, RkTheme } from "react-native-ui-kitten";
|
||||
import Timeline from "react-native-timeline-feed";
|
||||
|
||||
import * as Progress from 'react-native-progress';
|
||||
import * as Progress from "react-native-progress";
|
||||
|
||||
import { connect } from "react-redux";
|
||||
|
||||
import {connect} from 'react-redux';
|
||||
import { bindActionCreators } from "redux";
|
||||
|
||||
import {bindActionCreators} from 'redux';
|
||||
|
||||
import * as Actions from '../store/actions'; //Import your actionss
|
||||
|
||||
|
||||
const formatObj = (obj) => {
|
||||
import * as Actions from "../store/actions"; //Import your actionss
|
||||
|
||||
const formatObj = obj => {
|
||||
let a = {};
|
||||
|
||||
a.push({});
|
||||
|
||||
return a
|
||||
|
||||
return a;
|
||||
};
|
||||
|
||||
|
||||
const ThirdRoute = () => (
|
||||
<View style={[styles.scene, {backgroundColor: '#efc44a'}]}/>
|
||||
);
|
||||
|
||||
|
||||
const FourthRoute = () => (
|
||||
<View style={[styles.scene, {backgroundColor: '#49ef97'}]}/>
|
||||
);
|
||||
|
||||
|
||||
class Calendar extends React.Component {
|
||||
|
||||
state = {
|
||||
index: 0,
|
||||
routes: [
|
||||
{key: 'first', weekDay: 'sex', day:12},
|
||||
{key: 'second', weekDay: 'sab', day:13},
|
||||
{key: 'third', weekDay: 'dom', day:14},
|
||||
{key: 'fourth', weekDay: 'seg', day:15},
|
||||
|
||||
{ key: "first", weekDay: "sex", day: 12 },
|
||||
{ key: "second", weekDay: "sab", day: 13 },
|
||||
{ key: "third", weekDay: "dom", day: 14 },
|
||||
{ key: "fourth", weekDay: "seg", day: 15 }
|
||||
],
|
||||
CP: "SEM",
|
||||
cpColor: "white",
|
||||
careerPath: { name: "", color: "" }
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
|
||||
this.props.getEvents(this.props.user);
|
||||
console.log('didMount');
|
||||
console.log(this.props.events);
|
||||
|
||||
this.props.getSessions(this.props.userDetails.token);
|
||||
}
|
||||
|
||||
_openDetails = () => {
|
||||
|
||||
console.log("los");
|
||||
}
|
||||
};
|
||||
|
||||
renderDetail = ({ item, index }) => {
|
||||
const { navigate } = this.props.navigation;
|
||||
// <Image source={{ uri:item.imageUrl, width:'100%' , height:100 }} style={{borderRadius:0}}/>
|
||||
return (
|
||||
<TouchableOpacity onPress={() => navigate('calendarDetail', { info: item })} >
|
||||
|
||||
<TouchableOpacity
|
||||
onPress={() => navigate("calendarDetail", { info: item })}
|
||||
>
|
||||
<View style={styles.event}>
|
||||
<View style={styles.titleContainer}>
|
||||
<Text style={[styles.title]}>{item.name}</Text>
|
||||
<Text style={{color:'black'}}>Local: 1</Text>
|
||||
<Text style={{ color: "black" }}>Local: 1</Text>
|
||||
</View>
|
||||
|
||||
<View>
|
||||
|
||||
|
||||
<Text style={styles.description}>{item.description}</Text>
|
||||
<View style={styles.details}>
|
||||
<Progress.Bar color={'#000000'} progress={item.Enrolled/item.MaxAttendees} unfilledColor={'white'} width={210}/>
|
||||
<Text>{item.Enrolled} / {item.MaxAttendees}</Text>
|
||||
<Progress.Bar
|
||||
color={"#000000"}
|
||||
progress={item.Enrolled / item.MaxAttendees}
|
||||
unfilledColor={"white"}
|
||||
width={210}
|
||||
/>
|
||||
<Text>
|
||||
{item.Enrolled} / {item.MaxAttendees}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
</View>
|
||||
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
|
||||
_update = () => {
|
||||
this.setState({ user: this.props.user });
|
||||
console.log(this.props.events);
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
_renderTabBar = props => {
|
||||
const inputRange = props.navigationState.routes.map((x, i) => i);
|
||||
|
|
@ -107,26 +99,37 @@ class Calendar extends React.Component {
|
|||
{props.navigationState.routes.map((route, i) => {
|
||||
const bgcolor = props.position.interpolate({
|
||||
inputRange,
|
||||
outputRange: inputRange.map(
|
||||
inputIndex => (inputIndex === i ? '#CC1A17' : 'rgba(0,0,0,0)')
|
||||
),
|
||||
outputRange: inputRange.map(inputIndex =>
|
||||
inputIndex === i ? "#CC1A17" : "rgba(0,0,0,0)"
|
||||
)
|
||||
});
|
||||
const color = props.position.interpolate({
|
||||
inputRange,
|
||||
outputRange: inputRange.map(
|
||||
inputIndex => (inputIndex === i ? 'white' : 'black')
|
||||
),
|
||||
outputRange: inputRange.map(inputIndex =>
|
||||
inputIndex === i ? "white" : "black"
|
||||
)
|
||||
});
|
||||
|
||||
|
||||
return (
|
||||
<TouchableOpacity
|
||||
style={styles.tabItem}
|
||||
onPress={() => this.setState({ index: i })}>
|
||||
|
||||
<Animated.Text style={{ color :'#7A7B7B' }}>{route.weekDay}</Animated.Text>
|
||||
<Animated.Text style={{ backgroundColor: bgcolor, borderRadius:90 , padding:10, marginTop:5, color:color, fontSize:15}}>{route.day}</Animated.Text>
|
||||
|
||||
onPress={() => this.setState({ index: i })}
|
||||
>
|
||||
<Text style={{ color: "#7A7B7B" }}>
|
||||
{route.weekDay}
|
||||
</Text>
|
||||
<Animated.Text
|
||||
style={{
|
||||
backgroundColor: bgcolor,
|
||||
borderRadius: 0,
|
||||
padding: 10,
|
||||
marginTop: 5,
|
||||
color: color,
|
||||
fontSize: 15
|
||||
}}
|
||||
>
|
||||
{route.day}
|
||||
</Animated.Text>
|
||||
</TouchableOpacity>
|
||||
);
|
||||
})}
|
||||
|
|
@ -134,46 +137,50 @@ class Calendar extends React.Component {
|
|||
);
|
||||
};
|
||||
|
||||
|
||||
constructor() {
|
||||
|
||||
super();
|
||||
|
||||
const archeryImgSource = require('../assets/img/archery.png');
|
||||
const badmintonImgSource = require('../assets/img/badminton.png');
|
||||
const lunchImgSource = require('../assets/img/lunch.png');
|
||||
const soccerImgSource = require('../assets/img/soccer.png');
|
||||
const dumbbellImgSource = require('../assets/img/dumbbell.png');
|
||||
|
||||
const ArcheryImage = (props) => <Image source={archeryImgSource} {...props} />;
|
||||
const BadmintonImage = (props) => <Image source={badmintonImgSource} {...props} />;
|
||||
const LunchImage = (props) => <Image source={lunchImgSource} {...props} />;
|
||||
const SoccerImage = (props) => <Image source={soccerImgSource} {...props} />;
|
||||
const DumbbellImage = (props) => <Image source={dumbbellImgSource} {...props} />;
|
||||
const VectorIconImage = (props) => <Image source={vectorIconImgSource} {...props} />;
|
||||
|
||||
this.data = [
|
||||
|
||||
|
||||
|
||||
]
|
||||
}
|
||||
|
||||
render() {
|
||||
|
||||
const FirstRoute = () => (
|
||||
|
||||
const ThirdRoute = () => (
|
||||
<ScrollView contentContainerStyle={styles.contentContainer}>
|
||||
|
||||
{this.props.events != undefined && (
|
||||
<Timeline
|
||||
|
||||
data={this.props.events}
|
||||
|
||||
data={this.props.c}
|
||||
timeContainerStyle={{ marginTop: 0 }}
|
||||
|
||||
timeStyle={{
|
||||
textAlign: "center",
|
||||
height: 100,
|
||||
color: "#CC1A17",
|
||||
padding: 5,
|
||||
fontSize: 23
|
||||
}}
|
||||
descriptionStyle={{ color: "red" }}
|
||||
renderDetail={this.renderDetail}
|
||||
lineColor="rgba(0,0,0,0)"
|
||||
lineWidth={1}
|
||||
separator={false}
|
||||
flatListProps={{
|
||||
style: {
|
||||
margin: 15
|
||||
}
|
||||
}}
|
||||
circleSize={0}
|
||||
dotColor={"#CC1A17"}
|
||||
keyExtractor={(item, index) => index.toString()}
|
||||
/>
|
||||
)}
|
||||
</ScrollView>
|
||||
);
|
||||
|
||||
textAlign: 'center',
|
||||
const FourthRoute = () => (
|
||||
<ScrollView contentContainerStyle={styles.contentContainer}>
|
||||
{this.props.events != undefined && (
|
||||
<Timeline
|
||||
data={this.props.d}
|
||||
timeContainerStyle={{ marginTop: 0 }}
|
||||
timeStyle={{
|
||||
textAlign: "center",
|
||||
// backgroundColor: 'red',
|
||||
|
||||
height: 100,
|
||||
|
|
@ -181,99 +188,109 @@ class Calendar extends React.Component {
|
|||
padding: 5,
|
||||
//marginTop:10,
|
||||
// fontWeight:'bold',
|
||||
fontSize:23,
|
||||
fontSize: 23
|
||||
|
||||
//borderRadius: 13
|
||||
}}
|
||||
|
||||
descriptionStyle={{color: 'red'}}
|
||||
|
||||
descriptionStyle={{ color: "red" }}
|
||||
renderDetail={this.renderDetail}
|
||||
|
||||
lineColor='rgba(0,0,0,0)'
|
||||
lineColor="rgba(0,0,0,0)"
|
||||
lineWidth={1}
|
||||
separator={false}
|
||||
flatListProps={{
|
||||
style: {
|
||||
|
||||
margin: 15
|
||||
}
|
||||
|
||||
|
||||
}}
|
||||
circleSize={0}
|
||||
dotColor={"#CC1A17"}
|
||||
keyExtractor={(item, index) => index.toString()}
|
||||
|
||||
|
||||
/>
|
||||
|
||||
|
||||
)}
|
||||
</ScrollView>
|
||||
);
|
||||
const FirstRoute = () => (
|
||||
<ScrollView contentContainerStyle={styles.contentContainer}>
|
||||
{this.props.events != undefined && (
|
||||
<Timeline
|
||||
data={this.props.a}
|
||||
timeContainerStyle={{ marginTop: 0 }}
|
||||
timeStyle={{
|
||||
textAlign: "center",
|
||||
height: 100,
|
||||
color: "#CC1A17",
|
||||
padding: 5,
|
||||
fontSize: 23
|
||||
}}
|
||||
descriptionStyle={{ color: "red" }}
|
||||
renderDetail={this.renderDetail}
|
||||
lineColor="rgba(0,0,0,0)"
|
||||
lineWidth={1}
|
||||
separator={false}
|
||||
flatListProps={{
|
||||
style: {
|
||||
margin: 15
|
||||
}
|
||||
}}
|
||||
circleSize={0}
|
||||
dotColor={"#CC1A17"}
|
||||
keyExtractor={(item, index) => index.toString()}
|
||||
/>
|
||||
)}
|
||||
</ScrollView>
|
||||
|
||||
);
|
||||
const SecondRoute = () => (
|
||||
|
||||
<ScrollView contentContainerStyle={styles.contentContainer}>
|
||||
|
||||
{this.props.events != undefined && (
|
||||
<Timeline
|
||||
|
||||
data={this.props.events}
|
||||
|
||||
data={this.props.b}
|
||||
timeContainerStyle={{ marginTop: 0 }}
|
||||
|
||||
timeStyle={{
|
||||
|
||||
textAlign: 'center',
|
||||
// backgroundColor: 'red',
|
||||
textAlign: "center",
|
||||
|
||||
height: 100,
|
||||
color: "#CC1A17",
|
||||
padding: 5,
|
||||
//marginTop:10,
|
||||
// fontWeight:'bold',
|
||||
fontSize:23,
|
||||
|
||||
fontSize: 23
|
||||
|
||||
//borderRadius: 13
|
||||
}}
|
||||
|
||||
descriptionStyle={{color: 'red'}}
|
||||
|
||||
descriptionStyle={{ color: "red" }}
|
||||
renderDetail={this.renderDetail}
|
||||
|
||||
lineColor='rgba(0,0,0,0)'
|
||||
lineColor="rgba(0,0,0,0)"
|
||||
lineWidth={1}
|
||||
separator={false}
|
||||
flatListProps={{
|
||||
style: {
|
||||
|
||||
margin: 15
|
||||
}
|
||||
|
||||
|
||||
}}
|
||||
circleSize={0}
|
||||
dotColor={"#CC1A17"}
|
||||
keyExtractor={(item, index) => index.toString()}
|
||||
|
||||
|
||||
/>
|
||||
|
||||
|
||||
)}
|
||||
</ScrollView>
|
||||
|
||||
)
|
||||
|
||||
);
|
||||
|
||||
return (
|
||||
<View style={{ flex: 1 }}>
|
||||
<View>
|
||||
<Text style={{
|
||||
backgroundColor:"#CC1A17",
|
||||
color:'white',
|
||||
fontWeight:'bold',
|
||||
{this.props.careerPath != undefined && (
|
||||
<Text
|
||||
style={{
|
||||
backgroundColor: this.props.careerPath.color,
|
||||
color: "white",
|
||||
fontWeight: "bold",
|
||||
fontSize: 15,
|
||||
textAlign:'center',
|
||||
|
||||
}}>
|
||||
WEB DEVELOPMENT
|
||||
textAlign: "center",
|
||||
padding:15
|
||||
}}
|
||||
>
|
||||
{this.props.careerPath.name}
|
||||
</Text>
|
||||
)}
|
||||
</View>
|
||||
<TabView
|
||||
navigationState={this.state}
|
||||
|
|
@ -284,11 +301,14 @@ class Calendar extends React.Component {
|
|||
fourth: FourthRoute
|
||||
})}
|
||||
renderTabBar={this._renderTabBar}
|
||||
useNativeDriver={true}
|
||||
useNativeDriver={false}
|
||||
onIndexChange={index => this.setState({ index })}
|
||||
initialLayout={{width: Dimensions.get('window').width, height: Dimensions.get('window').height}}
|
||||
initialLayout={{
|
||||
width: Dimensions.get("window").width,
|
||||
height: Dimensions.get("window").height
|
||||
}}
|
||||
style={{ backgroundColor: "#F2F2F2" }}
|
||||
indicatorStyle={{ backgroundColor: 'pink' }}
|
||||
indicatorStyle={{ backgroundColor: "pink" }}
|
||||
/>
|
||||
</View>
|
||||
);
|
||||
|
|
@ -297,26 +317,24 @@ class Calendar extends React.Component {
|
|||
|
||||
const styles = StyleSheet.create({
|
||||
tabBar: {
|
||||
flexDirection: 'row',
|
||||
flexDirection: "row",
|
||||
paddingTop: 0,
|
||||
marginTop: 0,
|
||||
backgroundColor:'white',
|
||||
backgroundColor: "white",
|
||||
borderWidth: 1,
|
||||
borderRadius: 2,
|
||||
borderColor: '#ddd',
|
||||
borderColor: "#ddd",
|
||||
borderBottomWidth: 0,
|
||||
shadowColor: '#000',
|
||||
shadowColor: "#000",
|
||||
shadowOffset: { width: 0, height: 2 },
|
||||
shadowOpacity: 0.8,
|
||||
shadowRadius: 2,
|
||||
elevation: 2,
|
||||
|
||||
|
||||
elevation: 2
|
||||
},
|
||||
tabItem: {
|
||||
flex: 1,
|
||||
alignItems: 'center',
|
||||
padding: 10,
|
||||
alignItems: "center",
|
||||
padding: 10
|
||||
},
|
||||
details: {
|
||||
backgroundColor: "#FFFFFF",
|
||||
|
|
@ -324,19 +342,16 @@ const styles = StyleSheet.create({
|
|||
borderBottomLeftRadius: 10,
|
||||
padding: 10,
|
||||
paddingTop: 0
|
||||
|
||||
},
|
||||
description: {
|
||||
padding: 10,
|
||||
paddingLeft: 0,
|
||||
paddingTop: 0
|
||||
|
||||
},
|
||||
title: {
|
||||
color: '#212121',
|
||||
fontWeight: 'bold',
|
||||
fontSize: 15,
|
||||
|
||||
color: "#212121",
|
||||
fontWeight: "bold",
|
||||
fontSize: 15
|
||||
},
|
||||
titleContainer: {
|
||||
padding: 10
|
||||
|
|
@ -347,51 +362,54 @@ const styles = StyleSheet.create({
|
|||
marginLeft: -25,
|
||||
|
||||
shadowColor: "#000",
|
||||
shadowOffset: { width: 0, height: 2,},
|
||||
shadowOffset: { width: 0, height: 2 },
|
||||
shadowOpacity: 0.25,
|
||||
shadowRadius: 1,
|
||||
elevation: 2,
|
||||
marginRight: 2
|
||||
|
||||
|
||||
},
|
||||
scene: {
|
||||
flex: 1,
|
||||
flex: 1
|
||||
},
|
||||
contentContainer: {
|
||||
//paddingVertical: 20,
|
||||
backgroundColor:'#F2F2F2'
|
||||
backgroundColor: "#F2F2F2"
|
||||
}
|
||||
});
|
||||
RkTheme.setType('RkCard', 'story', {
|
||||
RkTheme.setType("RkCard", "story", {
|
||||
img: {
|
||||
height: 100,
|
||||
opacity: 0.7
|
||||
},
|
||||
header: {
|
||||
alignSelf: 'center'
|
||||
alignSelf: "center"
|
||||
},
|
||||
content: {
|
||||
alignSelf: 'center'
|
||||
alignSelf: "center"
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
function mapStateToProps(state, props) {
|
||||
|
||||
return {
|
||||
|
||||
token: state.apiReducer.token,
|
||||
user: state.apiReducer.user,
|
||||
logged: state.apiReducer.logged,
|
||||
events: state.apiReducer.events
|
||||
|
||||
}
|
||||
events: state.apiReducer.events,
|
||||
userDetails: state.apiReducer.userDetails,
|
||||
sessions: state.apiReducer.sessions,
|
||||
careerPath: state.apiReducer.careerPath,
|
||||
a: state.apiReducer.a,
|
||||
b: state.apiReducer.b,
|
||||
c: state.apiReducer.c,
|
||||
d: state.apiReducer.d
|
||||
};
|
||||
}
|
||||
|
||||
function mapDispatchToProps(dispatch) {
|
||||
|
||||
return bindActionCreators(Actions, dispatch);
|
||||
}
|
||||
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(Calendar);
|
||||
export default connect(
|
||||
mapStateToProps,
|
||||
mapDispatchToProps
|
||||
)(Calendar);
|
||||
|
|
|
|||
|
|
@ -1,50 +1,40 @@
|
|||
import * as React from 'react';
|
||||
import {
|
||||
View,
|
||||
StyleSheet,
|
||||
Dimensions,
|
||||
Text
|
||||
} from 'react-native';
|
||||
import { TabView, TabBar, SceneMap } from 'react-native-tab-view';
|
||||
|
||||
import * as React from "react";
|
||||
import { View, StyleSheet, Dimensions, Text, Button } from "react-native";
|
||||
import { TabView, TabBar, SceneMap } from "react-native-tab-view";
|
||||
|
||||
const FirstRoute = () => (
|
||||
<View style={[styles.scene, { backgroundColor: '#ff4081' }]} />
|
||||
<View style={[styles.scene, { backgroundColor: "#ff4081" }]} />
|
||||
);
|
||||
const SecondRoute = () => (
|
||||
<View style={[styles.scene, { backgroundColor: '#673ab7' }]} />
|
||||
<View style={[styles.scene, { backgroundColor: "#673ab7" }]} />
|
||||
);
|
||||
|
||||
|
||||
const ThirdRoute = () => (
|
||||
<View style={[styles.scene, { backgroundColor: '#673ab7' }]} />
|
||||
<View style={[styles.scene, { backgroundColor: "#673ab7" }]} />
|
||||
);
|
||||
|
||||
const FourthRoute = () => (
|
||||
<View style={[styles.scene, { backgroundColor: '#673ab7' }]} />
|
||||
<View style={[styles.scene, { backgroundColor: "#673ab7" }]} />
|
||||
);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
export default class Eventos extends React.Component {
|
||||
|
||||
state = {
|
||||
index: 0,
|
||||
routes: [
|
||||
{ key: 'first', title: 'Festarola' },
|
||||
{ key: 'second', title: 'Febrada' },
|
||||
{ key: 'third', title: 'Rally' },
|
||||
{ key: 'fourth', title: 'Peddy' },
|
||||
|
||||
],
|
||||
{ key: "first", title: "Festarola" },
|
||||
{ key: "second", title: "Febrada" },
|
||||
{ key: "third", title: "Rally" },
|
||||
{ key: "fourth", title: "Peddy" }
|
||||
]
|
||||
};
|
||||
|
||||
render() {
|
||||
return (
|
||||
<View>
|
||||
<Text>asd</Text>
|
||||
<Button
|
||||
title="Febrada"
|
||||
onPress={() => this.props.navigation.navigate("febrada")}
|
||||
/>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
|
@ -52,6 +42,6 @@ render() {
|
|||
|
||||
const styles = StyleSheet.create({
|
||||
scene: {
|
||||
flex: 1,
|
||||
},
|
||||
flex: 1
|
||||
}
|
||||
});
|
||||
|
|
@ -85,7 +85,7 @@ class Home extends Component {
|
|||
//console.log(this.props.token);
|
||||
|
||||
|
||||
// this.props.getUserInfo(this.props.userDetails.token);
|
||||
this.props.getUserInfo(this.props.userDetails.token);
|
||||
|
||||
|
||||
//console.log('logged:'+this.props.logged);
|
||||
|
|
@ -184,36 +184,6 @@ _update=()=>{
|
|||
|
||||
|
||||
|
||||
<View style={styles.userBio}>
|
||||
<View style={styles.userBioRow}>
|
||||
<Icon name="ios-laptop" style={styles.userBioLogo} size={25}/>
|
||||
<Text style={styles.userBioText}>{this.props.user.Job}</Text>
|
||||
</View>
|
||||
<Divider style={{ backgroundColor: 'black' }} />
|
||||
<View style={styles.userBioRow}>
|
||||
<Icon name="ios-mail" style={styles.userBioLogo} size={25}/>
|
||||
<Text style={styles.userBioText}>{this.props.user.Email}</Text>
|
||||
</View>
|
||||
<Divider style={{ backgroundColor: 'black' }} />
|
||||
<View style={styles.userBioRow}>
|
||||
<Icon name="ios-phone-portrait" style={styles.userBioLogo} size={25}/>
|
||||
<Text style={styles.userBioText}>{this.props.user.Mobile}</Text>
|
||||
</View>
|
||||
<Divider style={{ backgroundColor: 'black' }} />
|
||||
<View style={styles.userBioRow}>
|
||||
<Icon name="ios-map" style={styles.userBioLogo} size={25}/>
|
||||
<Text style={styles.userBioText}>{this.props.user.Address}, {this.props.user.City}</Text>
|
||||
</View>
|
||||
<Divider style={{ backgroundColor: 'black' }} />
|
||||
<View style={styles.userBioRow}>
|
||||
<Icon name="ios-person" style={styles.userBioLogo} size={25}/>
|
||||
<TouchableOpacity><Text style={styles.userCurriculum}>O meu Curriculo</Text></TouchableOpacity>
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ import Modal from "react-native-modal";
|
|||
|
||||
import IconF from "react-native-vector-icons/Foundation"
|
||||
import IconFA from "react-native-vector-icons/FontAwesome5"
|
||||
import {ScrollView} from 'react-native-gesture-handler';
|
||||
import { ScrollView, ViewPagerAndroid } from 'react-native-gesture-handler';
|
||||
|
||||
|
||||
const SCREEN_HEIGHT = Dimensions.get("window").height;
|
||||
const SCREEN_WIDTH = Dimensions.get("window").width;
|
||||
|
||||
|
||||
import FitImage from 'react-native-fit-image';
|
||||
export default class Jogo extends React.Component {
|
||||
state = {
|
||||
progress: 20,
|
||||
|
|
@ -53,6 +53,9 @@ export default class Jogo extends React.Component {
|
|||
const barWidth = Dimensions.get('screen').width - 30;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
return (
|
||||
|
||||
|
||||
|
|
@ -60,15 +63,65 @@ export default class Jogo extends React.Component {
|
|||
|
||||
<Modal
|
||||
isVisible={this.state.isModalVisible}
|
||||
animationInTiming={2000}
|
||||
animationInTiming={1000}
|
||||
animationOutTiming={800}
|
||||
|
||||
|
||||
>
|
||||
<View style={{flex: 1, backgroundColor: 'white', margin: 50}}>
|
||||
<Text>Hello!</Text>
|
||||
<TouchableOpacity onPress={this._toggleModal}>
|
||||
<Text>Hide me!</Text>
|
||||
</TouchableOpacity>
|
||||
|
||||
|
||||
<View style={{
|
||||
flex:1,
|
||||
|
||||
alignContent:'center',
|
||||
margin :SCREEN_WIDTH*0.1,
|
||||
backgroundColor:'white',
|
||||
marginBottom:SCREEN_HEIGHT*0.1,
|
||||
marginTop:SCREEN_HEIGHT*0.1,
|
||||
maxHeight:400
|
||||
}}>
|
||||
|
||||
<ImageBackground
|
||||
opacity={0.5}
|
||||
source={require('../assets/img/bg_3.jpg')}
|
||||
style={{
|
||||
width:'96%',
|
||||
height:'97.5%',
|
||||
margin:10
|
||||
}}
|
||||
>
|
||||
<View style={{width:'100%' ,margin:-10}}>
|
||||
<View style={{width:30}}><Button
|
||||
|
||||
onPress={this._toggleModal}
|
||||
title="X"
|
||||
color="#CC1A17"
|
||||
accessibilityLabel="Learn more about this purple button"
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flex:1, alignContent:'center', width:'96%', alignItems:'center'}}>
|
||||
<View style={{paddingTop:25,width:'40%',}}>
|
||||
<FitImage
|
||||
source={{ uri: 'https://upload.wikimedia.org/wikipedia/commons/8/8a/CSW_Gradiente_rgb.png' }}
|
||||
style={styles.fitImage}
|
||||
/>
|
||||
</View>
|
||||
<View style={{backgroundColor:'rgba(255,255,255,0.6)', width:'100%', marginTop:35}}>
|
||||
<Text style={{padding:10}}>A CRITICAL Software fornece sistemas e serviços de software para segurança e
|
||||
aplicações essenciais aos negócios, ajudando a garantir que os clientes atendam aos requisitos mais exigentes de qualidade - padrões de segurança, desempenho e fiabilidade</Text>
|
||||
</View>
|
||||
<View style={{width:'100%', marginTop:10}}><TouchableOpacity><Text style={{textAlign:'center', fontWeight:'bold', fontSize:18, color:'#CC1A17'}}>website</Text></TouchableOpacity></View>
|
||||
</View>
|
||||
|
||||
|
||||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
</Modal>
|
||||
|
||||
<View style={styles.header}>
|
||||
|
|
@ -78,16 +131,11 @@ export default class Jogo extends React.Component {
|
|||
</View>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
<View style={{ height:50, backgroundColor:'white'}}>
|
||||
<View style={{flex:1, justifyContent:'space-around', flexDirection:'row'}}>
|
||||
<View style={{
|
||||
width: SCREEN_WIDTH * 0.7,
|
||||
flex: 1,
|
||||
flexDirection: 'row',
|
||||
margin: 10,
|
||||
marginLeft: SCREEN_WIDTH * 0.10
|
||||
}}>
|
||||
<View style={{width:SCREEN_WIDTH*0.7, flex:1, flexDirection:'row',margin:10, marginLeft:SCREEN_WIDTH*0.10}}>
|
||||
<IconFA name="trophy" size={30}/>
|
||||
<Text style={{fontWeight:'bold', fontSize:20,marginLeft:10}}>45</Text>
|
||||
<Text style={{margin:5}}>pontos</Text>
|
||||
|
|
@ -108,20 +156,11 @@ export default class Jogo extends React.Component {
|
|||
<View style={{ alignItems:'center'}}>
|
||||
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
<View style={{
|
||||
backgroundColor: '#FDFDFD',
|
||||
shadowColor: "#000",
|
||||
shadowOffset: {height: 2, width: 0, shadowRadius: 1},
|
||||
elevation: 3,
|
||||
}}>
|
||||
<View style={{
|
||||
flex: 1,
|
||||
margin: 20,
|
||||
alignItems: 'center',
|
||||
flexDirection: 'row',
|
||||
justifyContent: 'space-around',
|
||||
}}>
|
||||
<View style={{backgroundColor:'#FDFDFD', shadowColor:"#000", shadowOffset:{height:2, width:0, shadowRadius:1}, elevation:3,}}>
|
||||
<View style={{flex:1,margin: 20, alignItems:'center',flexDirection:'row', justifyContent: 'space-around',}}>
|
||||
<Text style={{fontWeight:'bold'}} > 1 </Text>
|
||||
<ProgressBarAnimated
|
||||
width={barWidth*0.7}
|
||||
|
|
@ -135,6 +174,10 @@ export default class Jogo extends React.Component {
|
|||
<ScrollView style={{backgroundColor:'#eeeeee',marginTop:10}} horizontal={true}>
|
||||
<ScrollView>
|
||||
<View style={styles.cromosContainer}>
|
||||
|
||||
|
||||
|
||||
|
||||
<TouchableOpacity onPress={this._toggleModal}>
|
||||
<View style={styles.cromo}>
|
||||
<ImageBackground
|
||||
|
|
@ -149,9 +192,11 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
|
||||
</TouchableOpacity>
|
||||
|
||||
|
||||
|
|
@ -168,6 +213,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
<View style={styles.cromo}>
|
||||
<ImageBackground
|
||||
|
|
@ -183,9 +229,12 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
|
||||
|
||||
<View style={styles.cromo}>
|
||||
<ImageBackground
|
||||
|
||||
|
|
@ -199,6 +248,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
<View style={styles.cromo}>
|
||||
<ImageBackground
|
||||
|
|
@ -213,6 +263,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
<View style={styles.cromo}>
|
||||
<ImageBackground
|
||||
|
|
@ -227,6 +278,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
|
|
@ -245,9 +297,14 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<View style={styles.cromo}>
|
||||
<ImageBackground
|
||||
|
||||
|
|
@ -261,6 +318,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
<View style={styles.cromo}>
|
||||
<ImageBackground
|
||||
|
|
@ -275,6 +333,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.cromo}>
|
||||
|
|
@ -290,6 +349,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.cromo}>
|
||||
|
|
@ -305,6 +365,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.cromo}>
|
||||
|
|
@ -320,9 +381,11 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.cromosContainer}>
|
||||
|
|
@ -339,9 +402,14 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<View style={styles.cromo}>
|
||||
<ImageBackground
|
||||
|
||||
|
|
@ -355,6 +423,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
<View style={styles.cromo}>
|
||||
<ImageBackground
|
||||
|
|
@ -369,6 +438,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.cromo}>
|
||||
|
|
@ -384,6 +454,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.cromo}>
|
||||
|
|
@ -399,6 +470,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.cromo}>
|
||||
|
|
@ -414,9 +486,13 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.cromosContainer}>
|
||||
|
|
@ -449,6 +525,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
<View style={styles.cromo}>
|
||||
<ImageBackground
|
||||
|
|
@ -463,6 +540,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.cromo}>
|
||||
|
|
@ -478,6 +556,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.cromo}>
|
||||
|
|
@ -493,6 +572,7 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.cromo}>
|
||||
|
|
@ -508,12 +588,20 @@ export default class Jogo extends React.Component {
|
|||
</ImageBackground>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</ScrollView>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -528,6 +616,11 @@ export default class Jogo extends React.Component {
|
|||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
|
||||
fitImage:{
|
||||
|
||||
|
||||
},
|
||||
points:{
|
||||
marginTop:-25,
|
||||
marginLeft:10,
|
||||
|
|
@ -549,12 +642,11 @@ const styles = StyleSheet.create({
|
|||
margin:3,
|
||||
height:200,
|
||||
width:130,
|
||||
borderRadius: 0
|
||||
}
|
||||
borderRadius:0}
|
||||
,
|
||||
imageBg:{
|
||||
|
||||
height: '97%',
|
||||
height:190,
|
||||
margin:5
|
||||
},
|
||||
label:{
|
||||
|
|
@ -620,7 +712,7 @@ const styles = StyleSheet.create({
|
|||
borderRightColor: 'transparent',
|
||||
borderBottomColor: 'white',
|
||||
marginLeft:54,
|
||||
marginTop: 155
|
||||
marginTop:156
|
||||
},
|
||||
number:{
|
||||
marginTop:-18,
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@ class Profile extends Component {
|
|||
super(props);
|
||||
|
||||
this.state = {
|
||||
name:this.props.user.Name,
|
||||
userDetails:{},
|
||||
token: false,
|
||||
tokenData: '',
|
||||
loggedIn: false,
|
||||
|
|
@ -56,7 +58,7 @@ class Profile extends Component {
|
|||
|
||||
formValid: true,
|
||||
|
||||
jobs: this.props.user.Job,
|
||||
jobs: this.props.user.Company,
|
||||
jobsError: false,
|
||||
jobsErrorMessage: '',
|
||||
|
||||
|
|
@ -68,7 +70,7 @@ class Profile extends Component {
|
|||
phoneError: false,
|
||||
phoneErrorMessage: '',
|
||||
|
||||
address: this.props.user.Adress,
|
||||
address: this.props.user.Address,
|
||||
addressError: false,
|
||||
addressErrorMessage: '',
|
||||
|
||||
|
|
@ -85,9 +87,12 @@ class Profile extends Component {
|
|||
};
|
||||
|
||||
|
||||
_validateData = (jobs, email, phone, address, city) => {
|
||||
_validateData = (name,jobs, email, phone, address, city) => {
|
||||
let valid = null;
|
||||
|
||||
v = Validate('name',name );
|
||||
|
||||
|
||||
let v = Validate('email', email);
|
||||
this.setState({emailError: v[0], emailErrorMessage: v[1]});
|
||||
|
||||
|
|
@ -133,14 +138,31 @@ class Profile extends Component {
|
|||
|
||||
saveData() {
|
||||
|
||||
const {jobs, email, phone, address, city, formValid} = this.state;
|
||||
const {name,jobs, email, phone, address, city, formValid} = this.state;
|
||||
|
||||
this._validateData(jobs, email, phone, address, city);
|
||||
this._validateData(name,jobs, email, phone, address, city);
|
||||
|
||||
console.log(formValid);
|
||||
|
||||
if (formValid)
|
||||
if (formValid){
|
||||
console.log("data valid");
|
||||
|
||||
this.props.updateUser(this.props.userDetails.token,{
|
||||
Name: this.state.name,
|
||||
// LastName: "Último",
|
||||
Company: jobs,
|
||||
// Job: jobs,
|
||||
Address: address,
|
||||
City: city,
|
||||
// PostalCode: "3000-010",
|
||||
|
||||
Mobile: phone,
|
||||
Avatar: "base64"
|
||||
} ); this.props.getUserInfo(this.props.userDetails.token);
|
||||
}
|
||||
|
||||
|
||||
|
||||
else
|
||||
console.log("data not valid");
|
||||
|
||||
|
|
@ -158,11 +180,21 @@ class Profile extends Component {
|
|||
</View>
|
||||
<View>
|
||||
<TouchableOpacity onPress={() => this.saveData()}>
|
||||
<Icon name="ios-save" size={30}/>
|
||||
<Icon name="ios-save" size={30}/><Text>Save</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
</View>
|
||||
<View style={styles.userBio}>
|
||||
<View style={styles.userBioRow}>
|
||||
<Icon name="ios-person" style={styles.userBioLogo} size={25}/>
|
||||
|
||||
<TextInput style={styles.userBioText}
|
||||
onChangeText={(n) => {
|
||||
this.setState({name:n })
|
||||
}}
|
||||
value={this.state.name}/>
|
||||
</View>
|
||||
<Divider style={{backgroundColor: 'black'}}/>
|
||||
<View style={styles.userBioRow}>
|
||||
<Icon name="ios-laptop" style={styles.userBioLogo} size={25}/>
|
||||
|
||||
|
|
@ -174,16 +206,6 @@ class Profile extends Component {
|
|||
</View>
|
||||
<Divider style={{backgroundColor: 'black'}}/>
|
||||
|
||||
<View style={styles.userBioRow}>
|
||||
<Icon name="ios-mail" style={styles.userBioLogo} size={25}/>
|
||||
|
||||
<TextInput style={styles.userBioText}
|
||||
onChangeText={(email) => {
|
||||
this.setState({email: email})
|
||||
}}
|
||||
value={this.state.email}/>
|
||||
</View>
|
||||
<Divider style={{backgroundColor: 'black'}}/>
|
||||
|
||||
|
||||
<View style={styles.userBioRow}>
|
||||
|
|
@ -339,7 +361,8 @@ mapStateToProps = (state, props) => {
|
|||
return {
|
||||
|
||||
token: state.apiReducer.token,
|
||||
user: state.apiReducer.user
|
||||
user: state.apiReducer.user,
|
||||
userDetails: state.apiReducer.userDetails,
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,109 +1,131 @@
|
|||
import * as React from 'react';
|
||||
import * as React from "react";
|
||||
import {
|
||||
View,
|
||||
StyleSheet,
|
||||
Dimensions,
|
||||
Image,
|
||||
ScrollView,
|
||||
Text,
|
||||
Button,
|
||||
TouchableOpacity,
|
||||
Picker,
|
||||
CheckBox,
|
||||
ActivityIndicator,
|
||||
SectionList,
|
||||
|
||||
FlatList
|
||||
} from 'react-native';
|
||||
} from "react-native";
|
||||
import moment from "moment";
|
||||
|
||||
import {TabView, TabBar, SceneMap} from 'react-native-tab-view';
|
||||
import {
|
||||
RkButton, RkCard, RkText,
|
||||
RkTheme
|
||||
} from 'react-native-ui-kitten';
|
||||
import Timeline from 'react-native-timeline-feed'
|
||||
|
||||
import * as Progress from 'react-native-progress';
|
||||
import Modal from "react-native-modal";
|
||||
|
||||
|
||||
import {connect} from 'react-redux';
|
||||
import * as Progress from "react-native-progress";
|
||||
|
||||
import {bindActionCreators} from 'redux';
|
||||
import { connect } from "react-redux";
|
||||
|
||||
import { bindActionCreators } from "redux";
|
||||
|
||||
import * as Actions from "../store/actions"; //Import your actionss
|
||||
import AwesomeAlert from 'react-native-awesome-alerts';
|
||||
|
||||
import * as Actions from '../store/actions'; //Import your actionss
|
||||
import Swiper from 'react-native-swiper';
|
||||
|
||||
const SCREEN_HEIGHT = Dimensions.get("window").height;
|
||||
const SCREEN_WIDTH = Dimensions.get("window").width;
|
||||
import FitImage from 'react-native-fit-image';
|
||||
|
||||
import { Dropdown } from 'react-native-material-dropdown';
|
||||
import {Card, Divider} from 'react-native-elements'
|
||||
import IconF from "react-native-vector-icons/Foundation"
|
||||
import FitImage from "react-native-fit-image";
|
||||
|
||||
|
||||
|
||||
const formatObj = (obj) => {
|
||||
|
||||
let a = {};
|
||||
|
||||
a.push({})
|
||||
|
||||
return a
|
||||
|
||||
};
|
||||
import { Divider } from "react-native-elements";
|
||||
|
||||
|
||||
import LinearGradient from "react-native-linear-gradient";
|
||||
|
||||
import IconFA from "react-native-vector-icons/FontAwesome5";
|
||||
|
||||
class choosePath extends React.Component {
|
||||
|
||||
_verifySession = Id => {
|
||||
var sessions = this.props.user.Sessions;
|
||||
for (let key in sessions) {
|
||||
if (sessions[key].Id == Id) return true;
|
||||
// cenas.push(result[key]);
|
||||
console.log();
|
||||
}
|
||||
};
|
||||
static navigationOptions = ({ navigation }) => ({
|
||||
|
||||
headerTitleStyle : {textAlign: 'center',alignSelf:'center'},
|
||||
headerTitleStyle: { textAlign: "center", alignSelf: "center" },
|
||||
headerStyle: {
|
||||
backgroundColor:'rgba(0,0,0,0)',
|
||||
backgroundColor: "rgba(0,0,0,0)",
|
||||
shadowRadius: 0,
|
||||
elevation: 0
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
state = {
|
||||
calendar:{}
|
||||
calendar: {},
|
||||
guest: "9"
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
_mount = () => {
|
||||
var sessions = this.props.sessions;
|
||||
|
||||
// this.props.getEvents(this.props.user);
|
||||
this.props.getAvailableGuestlists(this.props.userDetails.token)
|
||||
console.log('didMount');
|
||||
console.log(this.props.events);
|
||||
for (let key in sessions) {
|
||||
|
||||
if (sessions[key].Name == "IA") {
|
||||
this.setState({ guest: "9" });
|
||||
}
|
||||
//...
|
||||
|
||||
}
|
||||
};
|
||||
componentDidMount() {
|
||||
// this.props.getEvents(this.props.user);
|
||||
this.props.getAvailableGuestlists(this.props.userDetails.token);
|
||||
this.props.getSessions(this.props.userDetails.token);
|
||||
this._mount();
|
||||
|
||||
//console.log('didMount');
|
||||
// console.log(this.props.events);
|
||||
}
|
||||
|
||||
_update = () => {
|
||||
this.setState({ user: this.props.user });
|
||||
console.log(this.props.events);
|
||||
}
|
||||
};
|
||||
|
||||
_findPath = id => {
|
||||
var sessions = this.props.sessions;
|
||||
|
||||
for (let key in sessions) {
|
||||
if (sessions[key].Name == id) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
this.state = {
|
||||
showAlert:true,
|
||||
Blocks: [],
|
||||
onHoldBlocks: true,
|
||||
checked: true,
|
||||
modalVisible: false,
|
||||
isModalVisible: false,
|
||||
};
|
||||
|
||||
super()
|
||||
this.data = [];
|
||||
}
|
||||
onPress = () => {
|
||||
|
||||
};
|
||||
|
||||
_s() {
|
||||
|
||||
this.data = [
|
||||
|
||||
|
||||
|
||||
]
|
||||
this.props.signSession(this.props.userDetails.token, item[index].Id);
|
||||
}
|
||||
getCareerPaths = () => {
|
||||
|
||||
this.props.getAvailableGuestlists(this.props.userDetails.token)
|
||||
console.log(this.props.calendar)
|
||||
}
|
||||
this.props.getAvailableGuestlists(this.props.userDetails.token);
|
||||
console.log(this.props.calendar);
|
||||
};
|
||||
_keyExtractor = (item, index) => item.id;
|
||||
|
||||
_renderItem = ({ item }) => (
|
||||
|
|
@ -114,9 +136,14 @@ class choosePath extends React.Component {
|
|||
title={item.title}
|
||||
/>
|
||||
);
|
||||
_onPressItem = (id) => {
|
||||
|
||||
_toggleModal = () =>
|
||||
this.setState({ isModalVisible: !this.state.isModalVisible });
|
||||
|
||||
|
||||
_onPressItem = id => {
|
||||
// updater functions are preferred for transactional updates
|
||||
this.setState((state) => {
|
||||
this.setState(state => {
|
||||
// copy the map rather than modifying state.
|
||||
const selected = new Map(state.selected);
|
||||
selected.set(id, !selected.get(id)); // toggle
|
||||
|
|
@ -124,239 +151,341 @@ class choosePath extends React.Component {
|
|||
});
|
||||
};
|
||||
|
||||
_render = ({ item }) => {
|
||||
<Text>Cenas: {item.Name}</Text>;
|
||||
};
|
||||
|
||||
render() {
|
||||
|
||||
|
||||
return (
|
||||
<View>
|
||||
|
||||
<ScrollView style={styles.page}>
|
||||
|
||||
{this._findPath("IA") && (
|
||||
<LinearGradient
|
||||
colors={["#D95856", "#CC1A17"]}
|
||||
style={styles.linearGradient}
|
||||
>
|
||||
<Text
|
||||
style={{
|
||||
margin: 15,
|
||||
marginBottom: 0,
|
||||
fontWeight: "bold",
|
||||
color: "white"
|
||||
}}
|
||||
>
|
||||
{" "}
|
||||
Empresa responsável:{" "}
|
||||
</Text>
|
||||
<View style={styles.companyContainer}>
|
||||
|
||||
<View style={styles.companyDescription}>
|
||||
<Text
|
||||
style={{
|
||||
fontSize: 16,
|
||||
fontWeight: "bold",
|
||||
margin: 6,
|
||||
color: "white"
|
||||
}}
|
||||
>
|
||||
Critical Software
|
||||
</Text>
|
||||
<Text style={{ margin: 6, marginTop: 0, color: "white" }}>
|
||||
A CRITICAL Software fornece sistemas e serviços de software
|
||||
para segurança e aplicações essenciais aos negócios.
|
||||
</Text>
|
||||
</View>
|
||||
<View style={styles.companyLogo}>
|
||||
<FitImage
|
||||
source={{
|
||||
uri:
|
||||
"https://upload.wikimedia.org/wikipedia/commons/8/8a/CSW_Gradiente_rgb.png"
|
||||
}}
|
||||
style={styles.fitImage}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
</LinearGradient>
|
||||
)}
|
||||
{this._findPath("NET") && (
|
||||
<LinearGradient
|
||||
colors={["#5887FF", "#715AFF"]}
|
||||
style={styles.linearGradient}
|
||||
>
|
||||
<Text
|
||||
style={{
|
||||
margin: 15,
|
||||
marginBottom: 0,
|
||||
fontWeight: "bold",
|
||||
color: "white"
|
||||
}}
|
||||
>
|
||||
{" "}
|
||||
Empresa responsável:{" "}
|
||||
</Text>
|
||||
<View style={styles.companyContainer}>
|
||||
<View style={styles.companyDescription}>
|
||||
<Text
|
||||
style={{
|
||||
fontSize: 16,
|
||||
fontWeight: "bold",
|
||||
margin: 6,
|
||||
color: "white"
|
||||
}}
|
||||
>
|
||||
Altice
|
||||
</Text>
|
||||
<Text style={{ margin: 6, marginTop: 0, color: "white" }}>
|
||||
Altice é uma multinacional neerlandesa de telecomunicações,
|
||||
conteúdos, media, entretenimento e publicidade.
|
||||
</Text>
|
||||
</View>
|
||||
<View style={styles.companyLogo}>
|
||||
<FitImage
|
||||
source={{
|
||||
uri:
|
||||
"https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTuIfl0Km4mTbCGdJSr4bWn_ApFHnOrjYsmJ4VlBL1OkaIlb93t"
|
||||
}}
|
||||
style={styles.fitImage}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
</LinearGradient>
|
||||
)}
|
||||
|
||||
<View style={{flex:1,width:SCREEN_WIDTH*0.7, alignContent:'center'}}>
|
||||
|
||||
|
||||
<View
|
||||
style={{ flex: 1, width: SCREEN_WIDTH * 0.7, alignContent: "center" }}
|
||||
>
|
||||
<View style={styles.pickerCareer}>
|
||||
<Picker
|
||||
selectedValue={this.state.guest}
|
||||
style={{width:'100%'}}
|
||||
style={{ width: "100%" }}
|
||||
onValueChange={(itemValue, itemIndex) => {
|
||||
this.setState({guest: itemValue})
|
||||
this.setState({ guest: itemValue });
|
||||
this.props.timerChangeGuest();
|
||||
this.props.waitChangeGuest();
|
||||
this.props.changeGuestList(this.props.userDetails.token,itemValue)
|
||||
this.props.waitChangeGuest();
|
||||
this.props.getAvailableSessions(this.props.userDetails.token);
|
||||
|
||||
this.props.changeGuestList(
|
||||
this.props.userDetails.token,
|
||||
itemValue
|
||||
);
|
||||
|
||||
}
|
||||
// this.props.waitChangeGuest();
|
||||
// this.props.getAvailableSessions(this.props.userDetails.token);
|
||||
|
||||
}>
|
||||
// this.props.waitChangeGuest();
|
||||
|
||||
// this.props.getSessionBlocks(this.props.sessions)
|
||||
}}
|
||||
>
|
||||
<Picker.Item label="Escolhe o teu career path!" value="0" />
|
||||
<Picker.Item label="Inteligência Artificial" value="9" />
|
||||
<Picker.Item label="Redes e Segurança" value="10" />
|
||||
<Picker.Item label="Data Science" value="15" />
|
||||
<Picker.Item label="Desenvolvimento Web" value="14" />
|
||||
<Picker.Item label="Internet das Coisas" value="12" />
|
||||
<Picker.Item label="Desenvolvimento Mobile" value="11" />
|
||||
|
||||
</Picker>
|
||||
</View>
|
||||
<FlatList
|
||||
data={this.state.data}
|
||||
renderItem={({ item }) => (
|
||||
<ListItem
|
||||
<View style={{ width: SCREEN_WIDTH }}>
|
||||
|
||||
title={`${item.name.first} ${item.name.last}`}
|
||||
subtitle={item.email}
|
||||
avatar={{ uri: item.picture.thumbnail }}
|
||||
containerStyle={{ borderBottomWidth: 0 }}
|
||||
{!this.props.changingGuest && (
|
||||
<FlatList
|
||||
data={this.props.Blocks}
|
||||
renderItem={({ item, index }) => (
|
||||
<View style={styles.block}>
|
||||
<View style={styles.time}>
|
||||
<Text
|
||||
style={{
|
||||
margin: 10,
|
||||
fontSize: 25,
|
||||
color: "#CC1A17",
|
||||
marginBottom: 0
|
||||
}}
|
||||
>
|
||||
{moment(item[0].SessionStart).format("HH:mm")}
|
||||
</Text>
|
||||
<Text style={{ marginLeft: 20 }}>às</Text>
|
||||
<Text
|
||||
style={{
|
||||
margin: 10,
|
||||
fontSize: 25,
|
||||
color: "#CC1A17",
|
||||
marginTop: 5
|
||||
}}
|
||||
>
|
||||
{moment(item[0].SessionEnd).format("HH:mm")}
|
||||
</Text>
|
||||
</View>
|
||||
<View style={styles.sessions}>
|
||||
<FlatList
|
||||
data={item}
|
||||
renderItem={({ data, index }) => (
|
||||
<View>
|
||||
<View style={styles.session}>
|
||||
{this._verifySession(item[index].Id) && (
|
||||
<TouchableOpacity
|
||||
onPress={() => {}}
|
||||
style={{ flex: 1, alignSelf: "center" }}
|
||||
>
|
||||
<View>
|
||||
<IconFA
|
||||
name="check-square"
|
||||
color={"#CC1A17"}
|
||||
size={35}
|
||||
/>
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
{!this._verifySession(item[index].Id) && (
|
||||
<TouchableOpacity
|
||||
onPress={() => {
|
||||
this.props.waitChangeGuest()
|
||||
this.props.signSession(
|
||||
this.props.userDetails.token,
|
||||
item[index].Id
|
||||
);
|
||||
}}
|
||||
style={{ flex: 1, alignSelf: "center" }}
|
||||
>
|
||||
<View>
|
||||
<IconFA name="square" size={35} />
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
|
||||
<TouchableOpacity
|
||||
onPress={() =>
|
||||
this.props.navigation.navigate("febrada")
|
||||
}
|
||||
>
|
||||
<View style={styles.sessionInfo}>
|
||||
<Text style={styles.sessionTitle}>
|
||||
{item[index].Name}
|
||||
</Text>
|
||||
<Text
|
||||
style={{ marginTop: 10, marginBottom: 5 }}
|
||||
>
|
||||
{item[index].MaxAttendees -
|
||||
item[index].Enrolled}{" "}
|
||||
Lugares disponíveis
|
||||
</Text>
|
||||
<Progress.Bar
|
||||
color={"#000000"}
|
||||
progress={
|
||||
item[index].Enrolled /
|
||||
item[index].MaxAttendees
|
||||
}
|
||||
unfilledColor={"white"}
|
||||
width={170}
|
||||
/>
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
|
||||
<Divider style={{ backgroundColor: "#eeeeee" }} />
|
||||
</View>
|
||||
)}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
)}
|
||||
/>
|
||||
)}
|
||||
keyExtractor={item => item.email}
|
||||
</View>
|
||||
</View>
|
||||
|
||||
{(this.props.changingGuest || this.props.Blocks == true) && (
|
||||
<ActivityIndicator
|
||||
size="large"
|
||||
color="red"
|
||||
style={{ flex: 1, alignContent: "center" }}
|
||||
/>
|
||||
|
||||
</View >
|
||||
{ !this.props.changingGuest &&
|
||||
|
||||
<View style={styles.block}>
|
||||
|
||||
<View style={styles.time}>
|
||||
<Text style={
|
||||
{
|
||||
margin:10,
|
||||
fontSize:25,
|
||||
color:'#CC1A17',
|
||||
marginBottom:0
|
||||
}
|
||||
}>
|
||||
9:00</Text>
|
||||
<Text style={{marginLeft:20}}>até</Text>
|
||||
<Text style={
|
||||
{
|
||||
margin:10,
|
||||
fontSize:25,
|
||||
color:'#CC1A17',
|
||||
marginTop:5
|
||||
}
|
||||
}>
|
||||
9:30</Text>
|
||||
|
||||
</View>
|
||||
|
||||
<View style={styles.sessions}>
|
||||
|
||||
<View style={styles.session}>
|
||||
|
||||
<CheckBox
|
||||
style={{margin:10}}
|
||||
value={this.state.checkbox1}
|
||||
onChange={() => this.setState({ checkbox1: !this.state.checkbox1 })}
|
||||
/>
|
||||
<TouchableOpacity><View style={styles.sessionInfo}>
|
||||
<Text style={styles.sessionTitle}>Nome da palestra</Text>
|
||||
<Text style={{marginTop:10, marginBottom:5}}>12 Lugares disponíveis</Text>
|
||||
<Progress.Bar color={'#000000'} progress={0.3} unfilledColor={'white'} width={150}/>
|
||||
</View></TouchableOpacity>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<Divider style={{ backgroundColor: '#eeeeee' }} />
|
||||
|
||||
<View style={styles.session}>
|
||||
|
||||
<CheckBox
|
||||
style={{margin:10}}
|
||||
value={this.state.checkbox1}
|
||||
onChange={() => this.setState({ checkbox1: !this.state.checkbox1 })}
|
||||
/>
|
||||
<TouchableOpacity><View style={styles.sessionInfo}>
|
||||
<Text style={styles.sessionTitle}>Nome da palestra</Text>
|
||||
<Text style={{marginTop:10, marginBottom:5}}>12 Lugares disponíveis</Text>
|
||||
<Progress.Bar color={'#000000'} progress={0.3} unfilledColor={'white'} width={150}/>
|
||||
</View></TouchableOpacity>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<Divider style={{ backgroundColor: '#eeeeee' }} />
|
||||
|
||||
<View style={styles.session}>
|
||||
|
||||
<CheckBox
|
||||
style={{margin:10}}
|
||||
value={this.state.checkbox1}
|
||||
onChange={() => this.setState({ checkbox1: !this.state.checkbox1 })}
|
||||
/>
|
||||
<TouchableOpacity><View style={styles.sessionInfo}>
|
||||
<Text style={styles.sessionTitle}>Nome da palestra</Text>
|
||||
<Text style={{marginTop:10, marginBottom:5}}>12 Lugares disponíveis</Text>
|
||||
<Progress.Bar color={'#000000'} progress={0.3} unfilledColor={'white'} width={150}/>
|
||||
</View></TouchableOpacity>
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
|
||||
<Divider style={{ backgroundColor: '#eeeeee' }} />
|
||||
|
||||
|
||||
|
||||
</View>
|
||||
</View>
|
||||
}
|
||||
{this.props.changingGuest &&
|
||||
|
||||
<ActivityIndicator size="large" color="red"/>
|
||||
}
|
||||
|
||||
|
||||
|
||||
)}
|
||||
</ScrollView>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
companyLogo: {
|
||||
backgroundColor: "white",
|
||||
margin: 20,
|
||||
width: SCREEN_WIDTH * 0.35,
|
||||
borderRadius: 3,
|
||||
padding: 5
|
||||
},
|
||||
companyDescription: {
|
||||
// backgroundColor:'white',
|
||||
margin: 20,
|
||||
marginRight: 0,
|
||||
width: SCREEN_WIDTH * 0.5,
|
||||
borderRadius: 3
|
||||
},
|
||||
sessionInfo: {
|
||||
margin: 5
|
||||
},
|
||||
sessionTitle: {
|
||||
fontSize: 15,
|
||||
fontWeight:'bold'
|
||||
fontWeight: "bold"
|
||||
},
|
||||
day: {
|
||||
margin: 10
|
||||
},
|
||||
dayText: {
|
||||
fontSize: 20,
|
||||
color: '#CC1A17',
|
||||
textAlign: 'center',
|
||||
|
||||
color: "#CC1A17",
|
||||
textAlign: "center"
|
||||
},
|
||||
time: {
|
||||
alignContent:'center',
|
||||
width:SCREEN_WIDTH*0.20,
|
||||
backgroundColor:'white'
|
||||
alignContent: "center",
|
||||
width: SCREEN_WIDTH * 0.23,
|
||||
backgroundColor: "white"
|
||||
},
|
||||
|
||||
block: {
|
||||
|
||||
flex: 1,
|
||||
flexDirection:'row',
|
||||
backgroundColor:'red',
|
||||
flexDirection: "row",
|
||||
backgroundColor: "red",
|
||||
margin: 10,
|
||||
borderRadius: 5
|
||||
|
||||
},
|
||||
|
||||
companyContainer: {
|
||||
flex: 1,
|
||||
backgroundColor:'blue',
|
||||
height:SCREEN_HEIGHT*0.25,
|
||||
// backgroundColor:'blue',
|
||||
|
||||
flexDirection: "row",
|
||||
marginTop: 0
|
||||
},
|
||||
|
||||
|
||||
sessions: {
|
||||
flex: 1,
|
||||
flexDirection:'column',
|
||||
|
||||
backgroundColor:'white',
|
||||
flexDirection: "column",
|
||||
|
||||
backgroundColor: "white"
|
||||
},
|
||||
|
||||
page: {
|
||||
backgroundColor:'#eeeeee',
|
||||
|
||||
backgroundColor: "#eeeeee"
|
||||
},
|
||||
pickerCareer: {
|
||||
|
||||
paddingLeft: 30,
|
||||
paddingRight: 30,
|
||||
backgroundColor:'white',
|
||||
width:SCREEN_WIDTH,
|
||||
|
||||
backgroundColor: "white",
|
||||
width: SCREEN_WIDTH
|
||||
},
|
||||
session: {
|
||||
margin: 10,
|
||||
flex: 1,
|
||||
flexDirection:'row',
|
||||
|
||||
flexDirection: "row"
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
function mapStateToProps(state, props) {
|
||||
|
||||
return {
|
||||
|
||||
// token: state.apiReducer.token,
|
||||
showAlert: state.apiReducer.showAlert,
|
||||
user: state.apiReducer.user,
|
||||
logged: state.apiReducer.logged,
|
||||
events: state.apiReducer.events,
|
||||
|
|
@ -364,14 +493,16 @@ function mapStateToProps(state, props) {
|
|||
calendar: state.apiReducer.calendar,
|
||||
changingGuest: state.apiReducer.changingGuest,
|
||||
sessions: state.apiReducer.sessions,
|
||||
|
||||
|
||||
}
|
||||
Blocks: state.apiReducer.Blocks,
|
||||
showAlert: state.apiReducer.showAlert
|
||||
};
|
||||
}
|
||||
|
||||
function mapDispatchToProps(dispatch) {
|
||||
|
||||
return bindActionCreators(Actions, dispatch);
|
||||
}
|
||||
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(choosePath);
|
||||
export default connect(
|
||||
mapStateToProps,
|
||||
mapDispatchToProps
|
||||
)(choosePath);
|
||||
|
|
|
|||
|
|
@ -31,4 +31,7 @@ export const UI_LOGIN_NOINTERNET='UI_LOGIN_NOINTERNET'
|
|||
export const UI_LOGIN_OPEN_SCANNER='UI_LOIN_OPEN_SCANNER'
|
||||
|
||||
|
||||
//HOME
|
||||
|
||||
|
||||
export const OPEN_MODAL='OPEN_MODAL'
|
||||
export const CLOSE_MODAL='CLOSE_MODAL'
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,11 +1,20 @@
|
|||
export {checkUser,
|
||||
login,getEvents,
|
||||
hold, getUserInfo,
|
||||
login,
|
||||
getEvents,
|
||||
hold,
|
||||
getUserInfo,
|
||||
logoutUser,
|
||||
getAvailableGuestlists,
|
||||
changeGuestList,
|
||||
waitChangeGuest,
|
||||
getAvailableSessions
|
||||
getAvailableSessions,
|
||||
updateUser,
|
||||
getSessionBlocks,
|
||||
timerChangeGuest,
|
||||
getSessions,
|
||||
signSession,
|
||||
openModal,
|
||||
closeModal
|
||||
} from "./api"
|
||||
|
||||
export {
|
||||
|
|
|
|||
|
|
@ -1,67 +1,93 @@
|
|||
import { DATA_AVAILABLE, API_LOGIN, CHECK_USER, LOGOUT_USER, USER_INFO, HOLD, GET_EVENTS, GET_CAREERS, CHANGE_GUEST, WAIT_CHANGE, GET_SESSIONS } from "../actions/actionTypes" //Import the actions types constant we defined in our actions
|
||||
import { REHYDRATE } from 'redux-persist';
|
||||
import {
|
||||
DATA_AVAILABLE,
|
||||
API_LOGIN,
|
||||
CHECK_USER,
|
||||
LOGOUT_USER,
|
||||
USER_INFO,
|
||||
HOLD,
|
||||
GET_EVENTS,
|
||||
GET_CAREERS,
|
||||
CHANGE_GUEST,
|
||||
WAIT_CHANGE,
|
||||
GET_SESSIONS,
|
||||
SESSION_BLOCKS,
|
||||
TIMERWAIT_CHANGE,
|
||||
SIGN_SESSION,
|
||||
OPEN_MODAL,
|
||||
CLOSE_MODAL,
|
||||
LOADINGLOGIN
|
||||
|
||||
} from "../actions/actionTypes"; //Import the actions types constant we defined in our actions
|
||||
|
||||
import { REHYDRATE } from "redux-persist";
|
||||
|
||||
let apiState = {
|
||||
|
||||
isConnected: false,
|
||||
logged: false,
|
||||
onHold:true,user:{},
|
||||
onHold: true,
|
||||
user: {},
|
||||
events: [],
|
||||
showAlert: true,
|
||||
failedAttempt: false,
|
||||
userDetails: {
|
||||
username:'',
|
||||
password:'',
|
||||
username: "",
|
||||
password: "",
|
||||
token: {
|
||||
expirationDateToken: 0,
|
||||
access_token:''
|
||||
access_token: ""
|
||||
}
|
||||
},
|
||||
calendar:{
|
||||
|
||||
},
|
||||
calendar: {},
|
||||
changingGuest: false,
|
||||
sessions:{}
|
||||
sessions: {},
|
||||
Blocks: {},
|
||||
onHoldBlocks: true,
|
||||
careerPath:{name:'Sem Career Path', color:'#eeeeee'},
|
||||
a:{},
|
||||
b:{},
|
||||
c:{},
|
||||
d:{},
|
||||
loadingLogin:false,
|
||||
|
||||
};
|
||||
|
||||
const apiReducer = (state = apiState, action) => {
|
||||
|
||||
switch (action.type) {
|
||||
|
||||
case REHYDRATE:
|
||||
console.log(action)
|
||||
console.log(action);
|
||||
if (action.payload != undefined) {
|
||||
|
||||
console.log( action.payload)
|
||||
console.log(action.payload);
|
||||
|
||||
var expirationDateTokenA = 0;
|
||||
var access_tokenA='';
|
||||
var access_tokenA = "";
|
||||
|
||||
if (action.payload.apiReducer.userDetails.token != undefined) {
|
||||
|
||||
if(action.payload.apiReducer.userDetails.token.expirationDateToken!= undefined){
|
||||
|
||||
expirationDateTokenA= action.payload.apiReducer.userDetails.token.expirationDateToken;
|
||||
if (
|
||||
action.payload.apiReducer.userDetails.token.expirationDateToken !=
|
||||
undefined
|
||||
) {
|
||||
expirationDateTokenA =
|
||||
action.payload.apiReducer.userDetails.token.expirationDateToken;
|
||||
}
|
||||
|
||||
if((action.payload.apiReducer.userDetails.token.access_token!= undefined)){
|
||||
|
||||
access_tokenA= action.payload.apiReducer.userDetails.token.access_token;
|
||||
|
||||
if (
|
||||
action.payload.apiReducer.userDetails.token.access_token !=
|
||||
undefined
|
||||
) {
|
||||
access_tokenA =
|
||||
action.payload.apiReducer.userDetails.token.access_token;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
sessions: action.payload.apiReducer.sessions,
|
||||
// token: action.payload.apiReducer.token,
|
||||
user: action.payload.apiReducer.user,
|
||||
|
||||
onHoldBlocks: true,
|
||||
userDetails: {
|
||||
token: {
|
||||
expirationDateToken: expirationDateTokenA,
|
||||
access_token:access_tokenA,
|
||||
|
||||
access_token: access_tokenA
|
||||
},
|
||||
username: action.payload.apiReducer.userDetails.username,
|
||||
password: action.payload.apiReducer.userDetails.password
|
||||
|
|
@ -69,114 +95,134 @@ const apiReducer = (state = apiState, action) => {
|
|||
};
|
||||
}
|
||||
|
||||
case 'CHANGE_CONNECTION_STATUS':
|
||||
case "CHANGE_CONNECTION_STATUS":
|
||||
return Object.assign({}, state, {
|
||||
isConnected: action.isConnected,
|
||||
isConnected: action.isConnected
|
||||
});
|
||||
|
||||
case LOADINGLOGIN:
|
||||
state= Object.assign({}, state, {loadingLogin:true});
|
||||
|
||||
case HOLD:
|
||||
|
||||
state = Object.assign({}, state, { onHold: true });
|
||||
return state;
|
||||
|
||||
case API_LOGIN:
|
||||
|
||||
|
||||
state = Object.assign({}, state, {
|
||||
logged: action.logged,
|
||||
//token:action.token,
|
||||
failedAttempt: action.failedAttempt,
|
||||
user: action.user,
|
||||
userDetails: {token:action.token, username:action.userDetails.username, password:action.userDetails.password},
|
||||
|
||||
|
||||
userDetails: {
|
||||
token: action.token,
|
||||
username: action.userDetails.username,
|
||||
password: action.userDetails.password
|
||||
},
|
||||
loadingLogin:false,
|
||||
onHold: action.onHold
|
||||
});
|
||||
|
||||
return state;
|
||||
|
||||
case CHECK_USER:
|
||||
|
||||
var u = action.userDetails;
|
||||
if(action.token != undefined)
|
||||
u.token= action.token;
|
||||
if (action.token != undefined) u.token = action.token;
|
||||
|
||||
state=Object.assign({},state, {logged:action.logged, onHold:action.onHold, userDetails:u });
|
||||
state = Object.assign({}, state, {
|
||||
logged: action.logged,
|
||||
onHold: action.onHold,
|
||||
userDetails: u
|
||||
});
|
||||
|
||||
return state;
|
||||
|
||||
case LOGOUT_USER:
|
||||
|
||||
state=Object.assign({},state, { logged:false});
|
||||
state = Object.assign({}, state, { user:{}, userDetails:{}, logged:false});
|
||||
|
||||
return state;
|
||||
|
||||
case USER_INFO:
|
||||
|
||||
state=Object.assign({},state, { user: action.user , loggedIn:action.loggedIn, onHold:action.onHold});
|
||||
state = Object.assign({}, state, {
|
||||
user: action.user,
|
||||
loggedIn: action.loggedIn,
|
||||
onHold: action.onHold
|
||||
});
|
||||
|
||||
return state;
|
||||
|
||||
case GET_EVENTS:
|
||||
|
||||
state=Object.assign({},state, { events: action.events});
|
||||
state = Object.assign({}, state, { events: action.events , a:action.day1, b:action.day2, c:action.day3, d:action.day4});
|
||||
|
||||
return state;
|
||||
|
||||
case OPEN_MODAL:
|
||||
console.log("open modal")
|
||||
state = Object.assign({}, state, {
|
||||
modalOpen: true,
|
||||
modalInfo: action.modalInfo,
|
||||
modalType: action.type
|
||||
});
|
||||
return state;
|
||||
|
||||
case CLOSE_MODAL:
|
||||
state = Object.assign({}, state, {
|
||||
modalOpen: false,
|
||||
modalInfo: "",
|
||||
type: ""
|
||||
});
|
||||
return state;
|
||||
|
||||
case SIGN_SESSION:
|
||||
state = Object.assign({}, state, {
|
||||
sessions: action.sessions,
|
||||
Blocks: action.Blocks,
|
||||
careerPath: action.careerPath,
|
||||
changingGuest: action.changingGuest,
|
||||
user:action.user
|
||||
});
|
||||
return state;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
case SESSION_BLOCKS:
|
||||
state = Object.assign({}, state, {
|
||||
Blocks: action.Blocks,
|
||||
onHoldBlocks: false,
|
||||
changingGuest: false
|
||||
});
|
||||
return state;
|
||||
|
||||
case GET_CAREERS:
|
||||
var c = {
|
||||
guests: action.guests
|
||||
}
|
||||
};
|
||||
state = Object.assign({}, state, { calendar: c });
|
||||
|
||||
return state;
|
||||
|
||||
case CHANGE_GUEST:
|
||||
state=Object.assign({},state, { changingGuest:false});
|
||||
state = Object.assign({}, state, {
|
||||
changingGuest: false,
|
||||
sessions: action.sessions,
|
||||
Blocks: action.Blocks,
|
||||
careerPath: action.careerPath
|
||||
});
|
||||
return state;
|
||||
|
||||
case WAIT_CHANGE:
|
||||
state = Object.assign({}, state, { changingGuest: true });
|
||||
return state;
|
||||
|
||||
case TIMERWAIT_CHANGE:
|
||||
state = Object.assign({}, state, { Blocks: true });
|
||||
return state;
|
||||
case GET_SESSIONS:
|
||||
state=Object.assign({},state, { changingGuest:false, sessions:action.sessions});
|
||||
state = Object.assign({}, state, {
|
||||
sessions: action.sessions,
|
||||
Blocks: action.Blocks,
|
||||
careerPath: action.careerPath
|
||||
});
|
||||
return state;
|
||||
default:
|
||||
return state;
|
||||
}
|
||||
}
|
||||
};
|
||||
export default apiReducer;
|
||||
|
|
@ -7844,6 +7844,14 @@
|
|||
"resolved": "https://registry.npmjs.org/react-native-app-intro-slider/-/react-native-app-intro-slider-1.0.1.tgz",
|
||||
"integrity": "sha512-5Gzg5FG2uP/RHkSDFB5+2df4vQ2FpyUJ5PGYd23lLEISsEOJe0Zredh1hHMJj+fB5D9B7ZoL0IlR+SNn8iFxHg=="
|
||||
},
|
||||
"react-native-awesome-alerts": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/react-native-awesome-alerts/-/react-native-awesome-alerts-1.2.0.tgz",
|
||||
"integrity": "sha512-ouxDGJ/porNkuaeqpgxIJA4jAPqHC9bJIsxLA21NA6eZhnEhbqWOprjsNqwI0/7bJxXm9baTzXESCMzwAy3eZw==",
|
||||
"requires": {
|
||||
"prop-types": "^15.5.10"
|
||||
}
|
||||
},
|
||||
"react-native-branch": {
|
||||
"version": "2.2.5",
|
||||
"resolved": "https://registry.npmjs.org/react-native-branch/-/react-native-branch-2.2.5.tgz",
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
"react-native": "0.57.8",
|
||||
"react-native-action-button": "^2.8.5",
|
||||
"react-native-app-intro-slider": "^1.0.1",
|
||||
"react-native-awesome-alerts": "^1.2.0",
|
||||
"react-native-camera": "^1.9.2",
|
||||
"react-native-check-box": "^2.1.7",
|
||||
"react-native-cli": "^2.0.1",
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ namespace api.Controllers
|
|||
public UserManager<User> _userManager { get; }
|
||||
public SignInManager<User> _signInManager { get; }
|
||||
public IUsersRepository _repo { get; }
|
||||
|
||||
private readonly IMapper _mapper;
|
||||
private readonly RoleManager<Role> _roleManager;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,78 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using api.Data;
|
||||
using api.Dtos;
|
||||
using api.Models;
|
||||
using AutoMapper;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace api.Controllers
|
||||
{
|
||||
|
||||
[Authorize]
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
public class EventLocsController : ControllerBase
|
||||
{
|
||||
private readonly DataContext context;
|
||||
private readonly IEventLocsRepository _repo;
|
||||
private readonly IMapper _mapper;
|
||||
private readonly RoleManager<Role> _roleManager;
|
||||
private readonly UserManager<User> _userManager;
|
||||
public EventLocsController(DataContext context,IEventLocsRepository repo, IMapper mapper,RoleManager<Role> roleManager,UserManager<User> UserManager)
|
||||
{
|
||||
this.context = context;
|
||||
_mapper = mapper;
|
||||
_roleManager = roleManager;
|
||||
_userManager = UserManager;
|
||||
_repo = repo;
|
||||
}
|
||||
|
||||
// GET api/EventLocs
|
||||
// GET all EventLocs
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetEventLocs()
|
||||
{
|
||||
var Teams = await _repo.GetEventLocs();
|
||||
return Ok(Teams);
|
||||
}
|
||||
|
||||
// GET api/EventLocs/[id]
|
||||
[HttpGet("{id}")]
|
||||
public async Task<IActionResult> GetEventLoc(int id)
|
||||
{
|
||||
var Teams = await _repo.GetEventLoc(id);
|
||||
return Ok(Teams);
|
||||
}
|
||||
|
||||
// GET api/EventLocs/[id]
|
||||
[HttpGet("e/{id}")]
|
||||
public async Task<IActionResult> GetEventLocEvent(int id)
|
||||
{
|
||||
var Teams = await _repo.GetEventLocEvent(id);
|
||||
return Ok(Teams);
|
||||
}
|
||||
|
||||
// POST api/eventLocs/add
|
||||
// add new event
|
||||
[HttpPost("add")]
|
||||
public async Task<IActionResult> AddEventLoc(EventLocAdd EventLocData)
|
||||
{
|
||||
EventLoc EAdd = new EventLoc{EventId = EventLocData.EventId, Lat = EventLocData.Lat, Long = EventLocData.Long, Nome = EventLocData.Nome, Desc = EventLocData.Desc, Img = EventLocData.Img};
|
||||
await context.EventLocs.AddAsync(EAdd);
|
||||
|
||||
var result = context.SaveChanges();
|
||||
|
||||
if (result == 1)
|
||||
{
|
||||
return StatusCode(201);
|
||||
}
|
||||
return BadRequest();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,96 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using api.Data;
|
||||
using api.Dtos;
|
||||
using api.Models;
|
||||
using AutoMapper;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace api.Controllers
|
||||
{
|
||||
|
||||
[Authorize]
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
public class EventLocsVisitedController : ControllerBase
|
||||
{
|
||||
private readonly DataContext context;
|
||||
private readonly IEventLocsVisitedRepository _repo;
|
||||
private readonly IMapper _mapper;
|
||||
private readonly RoleManager<Role> _roleManager;
|
||||
private readonly UserManager<User> _userManager;
|
||||
public EventLocsVisitedController(DataContext context,IEventLocsVisitedRepository repo, IMapper mapper,RoleManager<Role> roleManager,UserManager<User> UserManager)
|
||||
{
|
||||
this.context = context;
|
||||
_mapper = mapper;
|
||||
_roleManager = roleManager;
|
||||
_userManager = UserManager;
|
||||
_repo = repo;
|
||||
}
|
||||
|
||||
// GET api/EventLocsVisited
|
||||
// GET all EventLocsVisited
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetEventLocsVisited()
|
||||
{
|
||||
var Locs = await _repo.GetEventLocsVisited();
|
||||
return Ok(Locs);
|
||||
}
|
||||
|
||||
// GET api/EventLocsVisited/t/[id]
|
||||
//All locs visited by team id
|
||||
[HttpGet("t/{id}")]
|
||||
public async Task<IActionResult> GetEventLocsVisitedTeam(int id)
|
||||
{
|
||||
var Locs = await _repo.GetEventLocsVisitedTeam(id);
|
||||
return Ok(Locs);
|
||||
}
|
||||
|
||||
// GET api/EventLocsVisited/e/[id]
|
||||
//All locs visited by event id
|
||||
[HttpGet("e/{id}")]
|
||||
public async Task<IActionResult> GetEventLocsVisitedEvent(int id)
|
||||
{
|
||||
var Locs = await _repo.GetEventLocsVisitedEvent(id);
|
||||
return Ok(Locs);
|
||||
}
|
||||
|
||||
|
||||
// POST api/eventLocsVisited/add
|
||||
// add new event
|
||||
[HttpPost("add")]
|
||||
public async Task<IActionResult> AddEventLoc(EventLocVisitedAdd EventLocVisitedData)
|
||||
{
|
||||
EventLoc Loc = await context.EventLocs.FirstOrDefaultAsync(a=>a.Id == EventLocVisitedData.EventLocID);
|
||||
var userT = await context.Users.FirstOrDefaultAsync(u=>u.QRcode==EventLocVisitedData.USerQR);
|
||||
|
||||
if(userT.team == null){
|
||||
return StatusCode(403);
|
||||
}
|
||||
|
||||
Team TeamToEdit = userT.team;
|
||||
|
||||
TeamToEdit.Pontos += EventLocVisitedData.pontos;
|
||||
|
||||
EventLocVisited toAdd = new EventLocVisited{Team = TeamToEdit,Location = Loc, timestamp = DateTime.Now};
|
||||
|
||||
await context.EventLocsVisited.AddAsync(toAdd);
|
||||
|
||||
context.Teams.Update(TeamToEdit);
|
||||
|
||||
var result = context.SaveChanges();
|
||||
|
||||
if (result >= 1)
|
||||
{
|
||||
return StatusCode(201);
|
||||
}
|
||||
return BadRequest();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using api.Data;
|
||||
using api.Dtos;
|
||||
using api.Models;
|
||||
using AutoMapper;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace api.Controllers
|
||||
{
|
||||
|
||||
[Authorize]
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
public class EventsController : ControllerBase
|
||||
{
|
||||
private readonly DataContext context;
|
||||
private readonly IEventsRepository _repo;
|
||||
private readonly IMapper _mapper;
|
||||
public EventsController(DataContext context,IEventsRepository repo, IMapper mapper)
|
||||
{
|
||||
this.context = context;
|
||||
_mapper = mapper;
|
||||
_repo = repo;
|
||||
}
|
||||
|
||||
// GET api/events
|
||||
// GET all events
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetEvents()
|
||||
{
|
||||
var Events = await _repo.GetEvents();
|
||||
return Ok(Events);
|
||||
}
|
||||
|
||||
// GET api/events/[id]
|
||||
// GET events id x
|
||||
[HttpGet("{id}")]
|
||||
public async Task<IActionResult> GetEvent(int id)
|
||||
{
|
||||
var Event = await _repo.GetEvent(id);
|
||||
return Ok(Event);
|
||||
}
|
||||
|
||||
// POST api/events/add
|
||||
// add new event
|
||||
[HttpPost("add")]
|
||||
public async Task<IActionResult> AddEvent(EventForAdd EventData)
|
||||
{
|
||||
Event EAdd = new Event{Nome = EventData.Nome,Desc = EventData.Desc};
|
||||
await context.Events.AddAsync(EAdd);
|
||||
|
||||
var result = context.SaveChanges();
|
||||
|
||||
if (result == 1)
|
||||
{
|
||||
return StatusCode(201);
|
||||
}
|
||||
return BadRequest();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,192 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using api.Data;
|
||||
using api.Dtos;
|
||||
using api.Models;
|
||||
using AutoMapper;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace api.Controllers
|
||||
{
|
||||
|
||||
[Authorize]
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
public class TeamsController : ControllerBase
|
||||
{
|
||||
private readonly DataContext context;
|
||||
private readonly ITeamsRepository _repo;
|
||||
private readonly IMapper _mapper;
|
||||
private readonly RoleManager<Role> _roleManager;
|
||||
private readonly UserManager<User> _userManager;
|
||||
public TeamsController(DataContext context,ITeamsRepository repo, IMapper mapper,RoleManager<Role> roleManager,UserManager<User> UserManager)
|
||||
{
|
||||
this.context = context;
|
||||
_mapper = mapper;
|
||||
_roleManager = roleManager;
|
||||
_userManager = UserManager;
|
||||
_repo = repo;
|
||||
}
|
||||
|
||||
// GET api/teams
|
||||
// GET all teams
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetTeams()
|
||||
{
|
||||
var Teams = await _repo.GetTeams();
|
||||
return Ok(Teams);
|
||||
}
|
||||
|
||||
// GET api/teams/e/[id]
|
||||
// GET all teams for event id
|
||||
[HttpGet("e/{id}")]
|
||||
public async Task<IActionResult> GetTeamsEvent(int id)
|
||||
{
|
||||
var Teams = await _repo.GetEventTeam(id);
|
||||
return Ok(Teams);
|
||||
}
|
||||
|
||||
// GET api/teams/e/[id]
|
||||
// GET all teams for event id
|
||||
[HttpGet("u/{QR}")]
|
||||
public async Task<IActionResult> GetTeamsUser(String QR)
|
||||
{
|
||||
var Teams = await _repo.GetUserTeam(QR);
|
||||
return Ok(Teams);
|
||||
}
|
||||
|
||||
// POST api/teams/add
|
||||
// create team
|
||||
[HttpPost("add")]
|
||||
public async Task<IActionResult> CreateTeam(TeamForAdd TeamAddDetails)
|
||||
{
|
||||
|
||||
User tCap = await context.Users.FirstOrDefaultAsync(u=>u.QRcode == TeamAddDetails.capQR);
|
||||
|
||||
if(tCap.team == null){
|
||||
Team tAdd = new Team{EventId = TeamAddDetails.EventId, Nome = TeamAddDetails.Nome, Cap = tCap, NMembros = 1, Pontos = 0};
|
||||
|
||||
tCap.team = tAdd;
|
||||
|
||||
await context.Teams.AddAsync(tAdd);
|
||||
context.Users.Update(tCap);
|
||||
|
||||
var result = context.SaveChanges();
|
||||
|
||||
if (result >= 1)
|
||||
{
|
||||
return StatusCode(201);
|
||||
}
|
||||
return BadRequest();
|
||||
}else{
|
||||
return BadRequest();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// POST api/teams/add/member
|
||||
// create team
|
||||
[HttpPost("add/member")]
|
||||
public async Task<IActionResult> AddTeamMember(TeamAddMember MemberToAdd)
|
||||
{
|
||||
|
||||
User newMember = await context.Users.FirstOrDefaultAsync(u=>u.QRcode == MemberToAdd.newQR);
|
||||
|
||||
Team tEdit = await context.Teams.FirstOrDefaultAsync(t=>t.Id == MemberToAdd.id);
|
||||
|
||||
if(newMember.team == null){
|
||||
tEdit.NMembros++;
|
||||
newMember.team = tEdit;
|
||||
|
||||
context.Teams.Update(tEdit);
|
||||
context.Users.Update(newMember);
|
||||
|
||||
var result = context.SaveChanges();
|
||||
|
||||
return StatusCode(201);
|
||||
|
||||
}else{
|
||||
return StatusCode(403);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// POST api/teams/ChangeName
|
||||
// create team
|
||||
[HttpPost("changename")]
|
||||
public async Task<IActionResult> ChangeName(TeamChangeName NameChange)
|
||||
{
|
||||
|
||||
Team tEdit = await context.Teams.Include(t=>t.Cap).FirstOrDefaultAsync(t=>t.Id == NameChange.TeamID);
|
||||
|
||||
User cap = await context.Users.FirstOrDefaultAsync(u=>u.QRcode == NameChange.UserQR);
|
||||
|
||||
if(cap == tEdit.Cap){
|
||||
tEdit.Nome = NameChange.nome;
|
||||
}
|
||||
|
||||
context.Teams.Update(tEdit);
|
||||
|
||||
var result = context.SaveChanges();
|
||||
|
||||
return StatusCode(201);
|
||||
|
||||
}
|
||||
|
||||
// POST api/teams/delete
|
||||
// create team
|
||||
[HttpPost("delete")]
|
||||
public async Task<IActionResult> DeleteTeam(TeamDelete DeleteData)
|
||||
{
|
||||
|
||||
Team tEdit = await context.Teams.Include(t=>t.Cap).FirstOrDefaultAsync(t=>t.Id == DeleteData.TeamID);
|
||||
|
||||
User cap = await context.Users.FirstOrDefaultAsync(u=>u.QRcode == DeleteData.UserQR);
|
||||
|
||||
if(cap == tEdit.Cap){
|
||||
context.Teams.Remove(tEdit);
|
||||
cap.team = null;
|
||||
context.Users.Update(cap);
|
||||
var result = context.SaveChanges();
|
||||
return StatusCode(201);
|
||||
}else{
|
||||
return StatusCode(403);
|
||||
}
|
||||
}
|
||||
|
||||
// POST api/teams/remove/member
|
||||
// remove member
|
||||
[HttpPost("remove/member")]
|
||||
public async Task<IActionResult> RemoveTeamMember(TeamRemoveMEmber MemberToRemove)
|
||||
{
|
||||
|
||||
User rmMember = await context.Users.FirstOrDefaultAsync(u=>u.QRcode == MemberToRemove.UserToRemoveQR);
|
||||
|
||||
Team tEdit = await context.Teams.Include(t=>t.Cap).FirstOrDefaultAsync(t=>t.Id == MemberToRemove.TeamID);
|
||||
|
||||
if(rmMember == tEdit.Cap){
|
||||
return StatusCode(403);
|
||||
}
|
||||
|
||||
if(rmMember.team == tEdit){
|
||||
tEdit.NMembros--;
|
||||
rmMember.team = null;
|
||||
|
||||
context.Teams.Update(tEdit);
|
||||
context.Users.Update(rmMember);
|
||||
|
||||
var result = context.SaveChanges();
|
||||
|
||||
return StatusCode(201);
|
||||
}else{
|
||||
return StatusCode(403);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore;
|
|||
|
||||
namespace api.Data
|
||||
{
|
||||
public class DataContext : IdentityDbContext<User,Role,int,IdentityUserClaim<int>,
|
||||
UserRole,IdentityUserLogin<int>,IdentityRoleClaim<int>,IdentityUserToken<int>>
|
||||
public class DataContext : IdentityDbContext<User,Role,int,IdentityUserClaim<int>,UserRole,IdentityUserLogin<int>,
|
||||
IdentityRoleClaim<int>,IdentityUserToken<int>>
|
||||
{
|
||||
public DataContext(DbContextOptions<DataContext> options):base(options) { }
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using api.Models;
|
||||
using api.Data;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace api.Data
|
||||
{
|
||||
public class EventLocsRepository : IEventLocsRepository
|
||||
{
|
||||
public EventLocsRepository(DataContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public DataContext _context { get; }
|
||||
|
||||
public async Task<EventLoc> GetEventLoc(int id)
|
||||
{
|
||||
var rEventLocs = await _context.EventLocs.FirstOrDefaultAsync(e=>e.Id == id);
|
||||
|
||||
return rEventLocs;
|
||||
}
|
||||
|
||||
public async Task<List<EventLoc>> GetEventLocEvent(int id)
|
||||
{
|
||||
List<EventLoc> eLocs = await _context.EventLocs.ToListAsync();
|
||||
List<EventLoc> rEventLocs = new List<EventLoc>();
|
||||
|
||||
eLocs.ForEach(delegate (EventLoc e){
|
||||
if(e.EventId == id){
|
||||
rEventLocs.Add(e);
|
||||
}
|
||||
});
|
||||
|
||||
return rEventLocs;
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<EventLoc>> GetEventLocs()
|
||||
{
|
||||
var rEventLocs = await _context.EventLocs.ToListAsync();
|
||||
|
||||
return rEventLocs;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using api.Models;
|
||||
using api.Data;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace api.Data
|
||||
{
|
||||
public class EventLocsVisitedRepository : IEventLocsVisitedRepository
|
||||
{
|
||||
public EventLocsVisitedRepository(DataContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public DataContext _context { get; }
|
||||
|
||||
public async Task<IEnumerable<EventLocVisited>> GetEventLocsVisited()
|
||||
{
|
||||
var rEventLocsVisitedList = await _context.EventLocsVisited.Include(e=>e.Team).Include(e=>e.Location).ToListAsync();
|
||||
|
||||
return rEventLocsVisitedList;
|
||||
}
|
||||
|
||||
public async Task<List<EventLocVisited>> GetEventLocsVisitedTeam(int id)
|
||||
{
|
||||
List<EventLocVisited> allLocs = await _context.EventLocsVisited.Include(e=>e.Team).Include(e=>e.Location).ToListAsync();
|
||||
List<EventLocVisited> rList = new List<EventLocVisited>();
|
||||
for(var i=0;i<allLocs.Count;i++){
|
||||
if(allLocs[i].Team.Id == id){
|
||||
rList.Add(allLocs[i]);
|
||||
}
|
||||
}
|
||||
return rList;
|
||||
}
|
||||
|
||||
public async Task<List<EventLocVisited>> GetEventLocsVisitedEvent(int id)
|
||||
{
|
||||
List<EventLocVisited> allLocs = await _context.EventLocsVisited.Include(e=>e.Team).Include(e=>e.Location).ToListAsync();
|
||||
List<EventLocVisited> rList = new List<EventLocVisited>();
|
||||
for(var i=0;i<allLocs.Count;i++){
|
||||
if(allLocs[i].Location.EventId == id){
|
||||
rList.Add(allLocs[i]);
|
||||
}
|
||||
}
|
||||
return rList;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using api.Models;
|
||||
using api.Data;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace api.Data
|
||||
{
|
||||
public class EventsRepository : IEventsRepository
|
||||
{
|
||||
public EventsRepository(DataContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public DataContext _context { get; }
|
||||
|
||||
public async Task<Event> GetEvent(int id)
|
||||
{
|
||||
var Event = await _context.Events.FirstOrDefaultAsync(e=>e.Id == id);
|
||||
|
||||
return Event;
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<Event>> GetEvents()
|
||||
{
|
||||
var Events = await _context.Events.ToListAsync();
|
||||
|
||||
return Events;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Data
|
||||
{
|
||||
public interface IEventLocsRepository
|
||||
{
|
||||
|
||||
Task<IEnumerable<EventLoc>> GetEventLocs();
|
||||
Task<EventLoc> GetEventLoc(int id);
|
||||
Task<List<EventLoc>> GetEventLocEvent(int id);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Data
|
||||
{
|
||||
public interface IEventLocsVisitedRepository
|
||||
{
|
||||
|
||||
Task<IEnumerable<EventLocVisited>> GetEventLocsVisited();
|
||||
Task<List<EventLocVisited>> GetEventLocsVisitedTeam(int id);
|
||||
Task<List<EventLocVisited>> GetEventLocsVisitedEvent(int id);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Data
|
||||
{
|
||||
public interface IEventsRepository
|
||||
{
|
||||
|
||||
Task<IEnumerable<Event>> GetEvents();
|
||||
Task<Event> GetEvent(int id);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Data
|
||||
{
|
||||
public interface ITeamsRepository
|
||||
{
|
||||
|
||||
Task<IEnumerable<Team>> GetTeams();
|
||||
Task<List<Team>> GetEventTeam(int id);
|
||||
Task<Team> GetUserTeam(String QR);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using api.Models;
|
||||
using api.Data;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace api.Data
|
||||
{
|
||||
public class TeamsRepository : ITeamsRepository
|
||||
{
|
||||
public TeamsRepository(DataContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public DataContext _context { get; }
|
||||
|
||||
public async Task<List<Team>> GetEventTeam(int id)
|
||||
{
|
||||
List<Team> allTeams = await _context.Teams.Include(a=>a.Cap).ToListAsync();
|
||||
List<Team> rTeam = new List<Team>();
|
||||
allTeams.ForEach(delegate(Team t){
|
||||
if(t.EventId == id){
|
||||
rTeam.Add(t);
|
||||
}
|
||||
});
|
||||
|
||||
return rTeam;
|
||||
}
|
||||
|
||||
public async Task<Team> GetUserTeam(String QR)
|
||||
{
|
||||
var rTeam = (await _context.Users.FirstAsync(u=>u.QRcode == QR)).team;
|
||||
|
||||
return rTeam;
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<Team>> GetTeams()
|
||||
{
|
||||
var rTeams = await _context.Teams.Include(a=>a.Cap).ToListAsync();
|
||||
|
||||
return rTeams;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Dtos
|
||||
{
|
||||
public class EventForAdd
|
||||
{
|
||||
[Required]
|
||||
public string Nome{get;set;} //equipa id
|
||||
|
||||
[Required]
|
||||
public string Desc{get;set;} //novo membro
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Dtos
|
||||
{
|
||||
public class EventLocAdd
|
||||
{
|
||||
[Required]
|
||||
public int EventId{get;set;} //Event ID
|
||||
|
||||
[Required]
|
||||
public float Lat{get;set;} //latitude
|
||||
|
||||
[Required]
|
||||
public float Long{get;set;} //longitude
|
||||
|
||||
[Required]
|
||||
public String Nome{get;set;} //Nome da localização
|
||||
|
||||
[Required]
|
||||
public String Desc{get;set;} //Descrição
|
||||
|
||||
|
||||
public Photo Img{get;set;} //Foto da localização
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Dtos
|
||||
{
|
||||
public class EventLocVisitedAdd
|
||||
{
|
||||
[Required]
|
||||
public String USerQR{get;set;} //User ID
|
||||
|
||||
[Required]
|
||||
public int EventLocID{get;set;} //Loc id
|
||||
|
||||
[Required]
|
||||
public int pontos{get;set;} //Pontos a adicionar
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Dtos
|
||||
{
|
||||
public class TeamAddMember
|
||||
{
|
||||
[Required]
|
||||
public int id{get;set;} //equipa id
|
||||
|
||||
[Required]
|
||||
public string newQR{get;set;} //novo membro
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Dtos
|
||||
{
|
||||
public class TeamChangeName
|
||||
{
|
||||
[Required]
|
||||
public int TeamID{get;set;} //teamid
|
||||
|
||||
[Required]
|
||||
public string nome{get;set;} //novo nome
|
||||
|
||||
|
||||
[Required]
|
||||
public string UserQR{get;set;} //user qr
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Dtos
|
||||
{
|
||||
public class TeamDelete
|
||||
{
|
||||
[Required]
|
||||
public int TeamID{get;set;} //teamid
|
||||
|
||||
[Required]
|
||||
public string UserQR{get;set;} //user qr
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Dtos
|
||||
{
|
||||
public class TeamForAdd
|
||||
{
|
||||
[Required]
|
||||
public int EventId{get;set;} //equipa para o evento ID
|
||||
|
||||
[Required]
|
||||
public string Nome{get;set;} //Nome da equipa
|
||||
|
||||
[Required]
|
||||
public string capQR{get;set;} //Capitao da equipa
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using api.Models;
|
||||
|
||||
namespace api.Dtos
|
||||
{
|
||||
public class TeamRemoveMEmber
|
||||
{
|
||||
[Required]
|
||||
public int TeamID{get;set;} //teamid
|
||||
|
||||
[Required]
|
||||
public string UserQR{get;set;} //user qr
|
||||
|
||||
[Required]
|
||||
public string UserToRemoveQR{get;set;} //user qr
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -9,8 +9,8 @@ using api.Data;
|
|||
namespace api.Migrations
|
||||
{
|
||||
[DbContext(typeof(DataContext))]
|
||||
[Migration("20190224020609_finos")]
|
||||
partial class finos
|
||||
[Migration("20190309183026_TeamsV2")]
|
||||
partial class TeamsV2
|
||||
{
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
|
|
@ -243,7 +243,7 @@ namespace api.Migrations
|
|||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd();
|
||||
|
||||
b.Property<int?>("CapId");
|
||||
b.Property<int?>("CapID");
|
||||
|
||||
b.Property<int>("EventId");
|
||||
|
||||
|
|
@ -253,11 +253,9 @@ namespace api.Migrations
|
|||
|
||||
b.Property<int>("Pontos");
|
||||
|
||||
b.Property<string>("QRcode");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("CapId");
|
||||
b.HasIndex("CapID");
|
||||
|
||||
b.ToTable("Teams");
|
||||
});
|
||||
|
|
@ -297,8 +295,6 @@ namespace api.Migrations
|
|||
|
||||
b.Property<string>("SecurityStamp");
|
||||
|
||||
b.Property<int?>("TeamId");
|
||||
|
||||
b.Property<bool>("TwoFactorEnabled");
|
||||
|
||||
b.Property<string>("UserName")
|
||||
|
|
@ -308,6 +304,8 @@ namespace api.Migrations
|
|||
|
||||
b.Property<int>("food");
|
||||
|
||||
b.Property<int?>("teamID");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("NormalizedEmail")
|
||||
|
|
@ -317,7 +315,7 @@ namespace api.Migrations
|
|||
.IsUnique()
|
||||
.HasName("UserNameIndex");
|
||||
|
||||
b.HasIndex("TeamId");
|
||||
b.HasIndex("teamID");
|
||||
|
||||
b.ToTable("AspNetUsers");
|
||||
});
|
||||
|
|
@ -424,14 +422,14 @@ namespace api.Migrations
|
|||
{
|
||||
b.HasOne("api.Models.User", "Cap")
|
||||
.WithMany()
|
||||
.HasForeignKey("CapId");
|
||||
.HasForeignKey("CapID");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("api.Models.User", b =>
|
||||
{
|
||||
b.HasOne("api.Models.Team")
|
||||
.WithMany("Membros")
|
||||
.HasForeignKey("TeamId");
|
||||
b.HasOne("api.Models.Team", "team")
|
||||
.WithMany()
|
||||
.HasForeignKey("teamID");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("api.Models.UserRole", b =>
|
||||
|
|
@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
|
|||
|
||||
namespace api.Migrations
|
||||
{
|
||||
public partial class finos : Migration
|
||||
public partial class TeamsV2 : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
|
|
@ -220,10 +220,9 @@ namespace api.Migrations
|
|||
{
|
||||
Id = table.Column<int>(nullable: false)
|
||||
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||
QRcode = table.Column<string>(nullable: true),
|
||||
EventId = table.Column<int>(nullable: false),
|
||||
Nome = table.Column<string>(nullable: true),
|
||||
CapId = table.Column<int>(nullable: true),
|
||||
CapID = table.Column<int>(nullable: true),
|
||||
NMembros = table.Column<int>(nullable: false),
|
||||
Pontos = table.Column<int>(nullable: false)
|
||||
},
|
||||
|
|
@ -255,14 +254,14 @@ namespace api.Migrations
|
|||
QRcode = table.Column<string>(nullable: true),
|
||||
drinks = table.Column<int>(nullable: false),
|
||||
food = table.Column<int>(nullable: false),
|
||||
TeamId = table.Column<int>(nullable: true)
|
||||
teamID = table.Column<int>(nullable: true)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_AspNetUsers", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_AspNetUsers_Teams_TeamId",
|
||||
column: x => x.TeamId,
|
||||
name: "FK_AspNetUsers_Teams_teamID",
|
||||
column: x => x.teamID,
|
||||
principalTable: "Teams",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
|
|
@ -333,9 +332,9 @@ namespace api.Migrations
|
|||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_AspNetUsers_TeamId",
|
||||
name: "IX_AspNetUsers_teamID",
|
||||
table: "AspNetUsers",
|
||||
column: "TeamId");
|
||||
column: "teamID");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_EventLocs_ImgId",
|
||||
|
|
@ -373,9 +372,9 @@ namespace api.Migrations
|
|||
column: "UserId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_Teams_CapId",
|
||||
name: "IX_Teams_CapID",
|
||||
table: "Teams",
|
||||
column: "CapId");
|
||||
column: "CapID");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_AspNetUserRoles_AspNetUsers_UserId",
|
||||
|
|
@ -434,9 +433,9 @@ namespace api.Migrations
|
|||
onDelete: ReferentialAction.Cascade);
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_Teams_AspNetUsers_CapId",
|
||||
name: "FK_Teams_AspNetUsers_CapID",
|
||||
table: "Teams",
|
||||
column: "CapId",
|
||||
column: "CapID",
|
||||
principalTable: "AspNetUsers",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
|
|
@ -445,7 +444,7 @@ namespace api.Migrations
|
|||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_Teams_AspNetUsers_CapId",
|
||||
name: "FK_Teams_AspNetUsers_CapID",
|
||||
table: "Teams");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
|
|
@ -241,7 +241,7 @@ namespace api.Migrations
|
|||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd();
|
||||
|
||||
b.Property<int?>("CapId");
|
||||
b.Property<int?>("CapID");
|
||||
|
||||
b.Property<int>("EventId");
|
||||
|
||||
|
|
@ -251,11 +251,9 @@ namespace api.Migrations
|
|||
|
||||
b.Property<int>("Pontos");
|
||||
|
||||
b.Property<string>("QRcode");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("CapId");
|
||||
b.HasIndex("CapID");
|
||||
|
||||
b.ToTable("Teams");
|
||||
});
|
||||
|
|
@ -295,8 +293,6 @@ namespace api.Migrations
|
|||
|
||||
b.Property<string>("SecurityStamp");
|
||||
|
||||
b.Property<int?>("TeamId");
|
||||
|
||||
b.Property<bool>("TwoFactorEnabled");
|
||||
|
||||
b.Property<string>("UserName")
|
||||
|
|
@ -306,6 +302,8 @@ namespace api.Migrations
|
|||
|
||||
b.Property<int>("food");
|
||||
|
||||
b.Property<int?>("teamID");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("NormalizedEmail")
|
||||
|
|
@ -315,7 +313,7 @@ namespace api.Migrations
|
|||
.IsUnique()
|
||||
.HasName("UserNameIndex");
|
||||
|
||||
b.HasIndex("TeamId");
|
||||
b.HasIndex("teamID");
|
||||
|
||||
b.ToTable("AspNetUsers");
|
||||
});
|
||||
|
|
@ -422,14 +420,14 @@ namespace api.Migrations
|
|||
{
|
||||
b.HasOne("api.Models.User", "Cap")
|
||||
.WithMany()
|
||||
.HasForeignKey("CapId");
|
||||
.HasForeignKey("CapID");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("api.Models.User", b =>
|
||||
{
|
||||
b.HasOne("api.Models.Team")
|
||||
.WithMany("Membros")
|
||||
.HasForeignKey("TeamId");
|
||||
b.HasOne("api.Models.Team", "team")
|
||||
.WithMany()
|
||||
.HasForeignKey("teamID");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("api.Models.UserRole", b =>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace api.Models
|
|||
public class EventLocVisited
|
||||
{
|
||||
public int Id{get;set;} //id
|
||||
public Team Team{get;set;} //teamQRID
|
||||
public Team Team{get;set;} //team
|
||||
public EventLoc Location{get;set;} //location
|
||||
public DateTime timestamp{get;set;} //time
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace api.Models
|
||||
|
||||
|
|
@ -7,11 +8,11 @@ namespace api.Models
|
|||
public class Team
|
||||
{
|
||||
public int Id{get;set;} //id
|
||||
public string QRcode{get;set;} //QR ID code
|
||||
public int EventId{get;set;} //equipa para o evento ID
|
||||
public string Nome{get;set;} //Nome da equipa
|
||||
|
||||
[ForeignKey("CapID")]
|
||||
public User Cap{get;set;} //Capitao da equipa
|
||||
public ICollection<User> Membros {get;set;} //Membros da equipa
|
||||
public int NMembros {get;set;} //Numero de Membros na equipa
|
||||
public int Pontos {get;set;} //Postos da equipa
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
using System;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
|
||||
namespace api.Models
|
||||
|
||||
|
|
@ -16,6 +18,8 @@ namespace api.Models
|
|||
public int drinks{get;set;}
|
||||
public int food{get;set;}
|
||||
|
||||
[ForeignKey("teamID")]
|
||||
public Team team{get;set;}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -45,6 +45,10 @@ namespace api
|
|||
|
||||
services.AddAutoMapper();
|
||||
services.AddScoped<IUsersRepository, UsersRepository>();
|
||||
services.AddScoped<IEventsRepository, EventsRepository>();
|
||||
services.AddScoped<ITeamsRepository, TeamsRepository>();
|
||||
services.AddScoped<IEventLocsRepository, EventLocsRepository>();
|
||||
services.AddScoped<IEventLocsVisitedRepository, EventLocsVisitedRepository>();
|
||||
|
||||
//define a connection string indicada em appsettings.json
|
||||
services.AddDbContext<DataContext>(x=>x.UseMySql(Configuration.GetConnectionString("DefaultConnection")));
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"ProjectFilePath": "/Users/henrique/ENEI2019/api/api.csproj",
|
||||
"ProjectFilePath": "c:\\Users\\ZMiguel\\Desktop\\ENEI2019\\api\\api.csproj",
|
||||
"TargetFramework": "netcoreapp2.1",
|
||||
"TagHelpers": [],
|
||||
"Configuration": {
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 117 KiB |
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 117 KiB |
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 117 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
Loading…
Reference in New Issue