diff --git a/App/app/App.js b/App/app/App.js index fbf0aeb1..d5c1bb54 100755 --- a/App/app/App.js +++ b/App/app/App.js @@ -39,6 +39,7 @@ const SCREEN_HEIGHT = Dimensions.get("window").height; const SCREEN_WIDTH = Dimensions.get("window").width; import Swiper from "react-native-swiper"; +import resetPassword from "./screens/resetPassword"; var TimerMixin = require("react-timer-mixin"); function handleConnectivityChange() { @@ -46,6 +47,9 @@ function handleConnectivityChange() { } class App extends Component { + + + handleConnectivityChange = isConnected => { this.setState({ isConnected }); }; @@ -142,7 +146,10 @@ class App extends Component { }; render() { + + + if (!this.props.logged && this.props.onHold) { return ( @@ -158,6 +165,7 @@ class App extends Component { return ; } return ( + @@ -253,7 +261,7 @@ class App extends Component { Não sabes a password? - + }> Recuperar Password @@ -282,7 +290,7 @@ const overlayColor = "rgba(0,0,0,0.30)"; const styles = { cameraContainer: { - // height: Dimensions.get('window').height , + height: Dimensions.get('window').height , }, passwordInput: { borderRadius: 90, diff --git a/App/app/Router.js b/App/app/Router.js index 4fa334cd..22c405ea 100755 --- a/App/app/Router.js +++ b/App/app/Router.js @@ -36,7 +36,7 @@ import Profile from "./screens/Profile"; import editCalendar from './screens/editCalendar'; import choosePath from './screens/choosePath'; import calendarDetail from './screens/calendarDetail'; - +import resetPassword from './screens/resetPassword'; const navigationOptions = ({navigation}) => ({ headerLeft: navigation.goBack(null)}/>, @@ -198,6 +198,9 @@ const Stack = createStackNavigator({ screen: calendarDetail, }, + resetPassword:{ + screen:resetPassword + } }); diff --git a/App/app/screens/Calendar.js b/App/app/screens/Calendar.js index 25d9720d..430c8f36 100644 --- a/App/app/screens/Calendar.js +++ b/App/app/screens/Calendar.js @@ -142,7 +142,7 @@ class Calendar extends React.Component { } _refresh=()=>{ this.props.getEvents(this.props.user); - this.props.getSessions(this.props.userDetails.token); + //this.props.getSessions(this.props.userDetails.token); } render() { @@ -317,8 +317,8 @@ class Calendar extends React.Component { style={{ backgroundColor: "#F2F2F2" }} indicatorStyle={{ backgroundColor: "pink" }} /> -