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>;
}
goToLogin = () => {
this.props.navigation.navigate("login",
goToLogin = () => this.props.navigation.navigate("login",
{
screen: 'login',
screen: 'index',
params: {nextScreen: this.props.route.name}
})};
});
getLoginButton() {
return <Button

View file

@ -39,12 +39,12 @@ const AboutStack = createStackNavigator();
function AboutStackComponent() {
return (
<AboutStack.Navigator
initialRouteName="about"
initialRouteName="index"
headerMode="float"
screenOptions={defaultScreenOptions}
>
<AboutStack.Screen
name="about"
name="index"
component={AboutScreen}
options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation);
@ -77,12 +77,12 @@ const SettingsStack = createStackNavigator();
function SettingsStackComponent() {
return (
<SettingsStack.Navigator
initialRouteName="settings"
initialRouteName="index"
headerMode="float"
screenOptions={defaultScreenOptions}
>
<SettingsStack.Screen
name="settings"
name="index"
component={SettingsScreen}
options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation);
@ -101,12 +101,12 @@ const SelfMenuStack = createStackNavigator();
function SelfMenuStackComponent() {
return (
<SelfMenuStack.Navigator
initialRouteName="self-menu"
initialRouteName="index"
headerMode="float"
screenOptions={defaultScreenOptions}
>
<SelfMenuStack.Screen
name="self-menu"
name="index"
component={SelfMenuScreen}
options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation);
@ -125,12 +125,12 @@ const AvailableRoomStack = createStackNavigator();
function AvailableRoomStackComponent() {
return (
<AvailableRoomStack.Navigator
initialRouteName="available-rooms"
initialRouteName="index"
headerMode="float"
screenOptions={defaultScreenOptions}
>
<AvailableRoomStack.Screen
name="available-rooms"
name="index"
component={AvailableRoomScreen}
options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation);
@ -149,12 +149,12 @@ const BibStack = createStackNavigator();
function BibStackComponent() {
return (
<BibStack.Navigator
initialRouteName="bib"
initialRouteName="index"
headerMode="float"
screenOptions={defaultScreenOptions}
>
<BibStack.Screen
name="bib"
name="index"
component={BibScreen}
options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation);
@ -173,12 +173,12 @@ const TetrisStack = createStackNavigator();
function TetrisStackComponent() {
return (
<TetrisStack.Navigator
initialRouteName="tetris"
initialRouteName="index"
headerMode="float"
screenOptions={defaultScreenOptions}
>
<TetrisStack.Screen
name="tetris"
name="index"
component={TetrisScreen}
options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation);
@ -197,12 +197,12 @@ const LoginStack = createStackNavigator();
function LoginStackComponent() {
return (
<LoginStack.Navigator
initialRouteName="login"
initialRouteName="index"
headerMode="float"
screenOptions={defaultScreenOptions}
>
<LoginStack.Screen
name="login"
name="index"
component={LoginScreen}
options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation);
@ -221,12 +221,12 @@ const ProfileStack = createStackNavigator();
function ProfileStackComponent() {
return (
<ProfileStack.Navigator
initialRouteName="profile"
initialRouteName="index"
headerMode="float"
screenOptions={defaultScreenOptions}
>
<ProfileStack.Screen
name="profile"
name="index"
component={ProfileScreen}
options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation);
@ -256,12 +256,12 @@ const VoteStack = createStackNavigator();
function VoteStackComponent() {
return (
<VoteStack.Navigator
initialRouteName="vote"
initialRouteName="index"
headerMode="float"
screenOptions={defaultScreenOptions}
>
<VoteStack.Screen
name="vote"
name="index"
component={VoteScreen}
options={({navigation}) => {
const openDrawer = getDrawerButton.bind(this, navigation);
@ -280,12 +280,12 @@ const ClubStack = createStackNavigator();
function ClubStackComponent() {
return (
<ClubStack.Navigator
initialRouteName={"club-list"}
initialRouteName={"index"}
headerMode="float"
screenOptions={defaultScreenOptions}
>
<ClubStack.Screen
name="club-list"
name="index"
component={ClubListScreen}
options={({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) {
this.displayData = this.props.route.params.data;
console.log(this.displayData);
this.eventId = this.displayData.id;
this.shouldFetchData = false;
this.errorCode = 0;
@ -68,6 +69,7 @@ class PlanningDisplayScreen extends React.Component<Props, State> {
onFetchSuccess = (data: Object) => {
this.displayData = data;
console.log(this.displayData);
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() {
// console.log("rendering PlanningScreen");
return (

View file

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