Compare commits

..

No commits in common. "ebbd4df5919da3e7fd40f25604c2b09d2c306b68" and "4f80cadfed22277c8c26bb618da272f843d81359" have entirely different histories.

5 changed files with 30 additions and 24 deletions

View file

@ -86,12 +86,11 @@ class ErrorView extends React.PureComponent<Props, State> {
</Button>; </Button>;
} }
goToLogin = () => { goToLogin = () => this.props.navigation.navigate("login",
this.props.navigation.navigate("login",
{ {
screen: 'login', screen: 'index',
params: {nextScreen: this.props.route.name} params: {nextScreen: this.props.route.name}
})}; });
getLoginButton() { getLoginButton() {
return <Button return <Button

View file

@ -39,12 +39,12 @@ const AboutStack = createStackNavigator();
function AboutStackComponent() { function AboutStackComponent() {
return ( return (
<AboutStack.Navigator <AboutStack.Navigator
initialRouteName="about" initialRouteName="index"
headerMode="float" headerMode="float"
screenOptions={defaultScreenOptions} screenOptions={defaultScreenOptions}
> >
<AboutStack.Screen <AboutStack.Screen
name="about" name="index"
component={AboutScreen} component={AboutScreen}
options={({navigation}) => { options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation); const openDrawer = getDrawerButton.bind(this, navigation);
@ -77,12 +77,12 @@ const SettingsStack = createStackNavigator();
function SettingsStackComponent() { function SettingsStackComponent() {
return ( return (
<SettingsStack.Navigator <SettingsStack.Navigator
initialRouteName="settings" initialRouteName="index"
headerMode="float" headerMode="float"
screenOptions={defaultScreenOptions} screenOptions={defaultScreenOptions}
> >
<SettingsStack.Screen <SettingsStack.Screen
name="settings" name="index"
component={SettingsScreen} component={SettingsScreen}
options={({navigation}) => { options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation); const openDrawer = getDrawerButton.bind(this, navigation);
@ -101,12 +101,12 @@ const SelfMenuStack = createStackNavigator();
function SelfMenuStackComponent() { function SelfMenuStackComponent() {
return ( return (
<SelfMenuStack.Navigator <SelfMenuStack.Navigator
initialRouteName="self-menu" initialRouteName="index"
headerMode="float" headerMode="float"
screenOptions={defaultScreenOptions} screenOptions={defaultScreenOptions}
> >
<SelfMenuStack.Screen <SelfMenuStack.Screen
name="self-menu" name="index"
component={SelfMenuScreen} component={SelfMenuScreen}
options={({navigation}) => { options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation); const openDrawer = getDrawerButton.bind(this, navigation);
@ -125,12 +125,12 @@ const AvailableRoomStack = createStackNavigator();
function AvailableRoomStackComponent() { function AvailableRoomStackComponent() {
return ( return (
<AvailableRoomStack.Navigator <AvailableRoomStack.Navigator
initialRouteName="available-rooms" initialRouteName="index"
headerMode="float" headerMode="float"
screenOptions={defaultScreenOptions} screenOptions={defaultScreenOptions}
> >
<AvailableRoomStack.Screen <AvailableRoomStack.Screen
name="available-rooms" name="index"
component={AvailableRoomScreen} component={AvailableRoomScreen}
options={({navigation}) => { options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation); const openDrawer = getDrawerButton.bind(this, navigation);
@ -149,12 +149,12 @@ const BibStack = createStackNavigator();
function BibStackComponent() { function BibStackComponent() {
return ( return (
<BibStack.Navigator <BibStack.Navigator
initialRouteName="bib" initialRouteName="index"
headerMode="float" headerMode="float"
screenOptions={defaultScreenOptions} screenOptions={defaultScreenOptions}
> >
<BibStack.Screen <BibStack.Screen
name="bib" name="index"
component={BibScreen} component={BibScreen}
options={({navigation}) => { options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation); const openDrawer = getDrawerButton.bind(this, navigation);
@ -173,12 +173,12 @@ const TetrisStack = createStackNavigator();
function TetrisStackComponent() { function TetrisStackComponent() {
return ( return (
<TetrisStack.Navigator <TetrisStack.Navigator
initialRouteName="tetris" initialRouteName="index"
headerMode="float" headerMode="float"
screenOptions={defaultScreenOptions} screenOptions={defaultScreenOptions}
> >
<TetrisStack.Screen <TetrisStack.Screen
name="tetris" name="index"
component={TetrisScreen} component={TetrisScreen}
options={({navigation}) => { options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation); const openDrawer = getDrawerButton.bind(this, navigation);
@ -197,12 +197,12 @@ const LoginStack = createStackNavigator();
function LoginStackComponent() { function LoginStackComponent() {
return ( return (
<LoginStack.Navigator <LoginStack.Navigator
initialRouteName="login" initialRouteName="index"
headerMode="float" headerMode="float"
screenOptions={defaultScreenOptions} screenOptions={defaultScreenOptions}
> >
<LoginStack.Screen <LoginStack.Screen
name="login" name="index"
component={LoginScreen} component={LoginScreen}
options={({navigation}) => { options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation); const openDrawer = getDrawerButton.bind(this, navigation);
@ -221,12 +221,12 @@ const ProfileStack = createStackNavigator();
function ProfileStackComponent() { function ProfileStackComponent() {
return ( return (
<ProfileStack.Navigator <ProfileStack.Navigator
initialRouteName="profile" initialRouteName="index"
headerMode="float" headerMode="float"
screenOptions={defaultScreenOptions} screenOptions={defaultScreenOptions}
> >
<ProfileStack.Screen <ProfileStack.Screen
name="profile" name="index"
component={ProfileScreen} component={ProfileScreen}
options={({navigation}) => { options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation); const openDrawer = getDrawerButton.bind(this, navigation);
@ -256,12 +256,12 @@ const VoteStack = createStackNavigator();
function VoteStackComponent() { function VoteStackComponent() {
return ( return (
<VoteStack.Navigator <VoteStack.Navigator
initialRouteName="vote" initialRouteName="index"
headerMode="float" headerMode="float"
screenOptions={defaultScreenOptions} screenOptions={defaultScreenOptions}
> >
<VoteStack.Screen <VoteStack.Screen
name="vote" name="index"
component={VoteScreen} component={VoteScreen}
options={({navigation}) => { options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation); const openDrawer = getDrawerButton.bind(this, navigation);
@ -280,12 +280,12 @@ const ClubStack = createStackNavigator();
function ClubStackComponent() { function ClubStackComponent() {
return ( return (
<ClubStack.Navigator <ClubStack.Navigator
initialRouteName={"club-list"} initialRouteName={"index"}
headerMode="float" headerMode="float"
screenOptions={defaultScreenOptions} screenOptions={defaultScreenOptions}
> >
<ClubStack.Screen <ClubStack.Screen
name="club-list" name="index"
component={ClubListScreen} component={ClubListScreen}
options={({navigation}) => { options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation); const openDrawer = getDrawerButton.bind(this, navigation);

View file

@ -40,6 +40,7 @@ class PlanningDisplayScreen extends React.Component<Props, State> {
if (this.props.route.params.data !== undefined) { if (this.props.route.params.data !== undefined) {
this.displayData = this.props.route.params.data; this.displayData = this.props.route.params.data;
console.log(this.displayData);
this.eventId = this.displayData.id; this.eventId = this.displayData.id;
this.shouldFetchData = false; this.shouldFetchData = false;
this.errorCode = 0; this.errorCode = 0;
@ -68,6 +69,7 @@ class PlanningDisplayScreen extends React.Component<Props, State> {
onFetchSuccess = (data: Object) => { onFetchSuccess = (data: Object) => {
this.displayData = data; this.displayData = data;
console.log(this.displayData);
this.setState({loading: false}); this.setState({loading: false});
}; };

View file

@ -226,6 +226,10 @@ class PlanningScreen extends React.Component<Props, State> {
); );
} }
componentDidUpdate(prevProps: Props, prevState: State, prevContext: *): * {
console.log('coucou');
}
render() { render() {
// console.log("rendering PlanningScreen"); // console.log("rendering PlanningScreen");
return ( return (

View file

@ -36,6 +36,7 @@ export default class URLHandler {
}; };
static getUrlData({path, queryParams}: Object) { static getUrlData({path, queryParams}: Object) {
console.log(path);
let data = null; let data = null;
if (path !== null) { if (path !== null) {
if (URLHandler.isClubInformationLink(path)) if (URLHandler.isClubInformationLink(path))