From 2e93076d798778b55bb4d3264f8a3f7a712efe4c Mon Sep 17 00:00:00 2001 From: JP1998 Date: Thu, 11 Apr 2019 15:49:45 +0200 Subject: [PATCH] Fix a bug where you are logged out after reloading the /create page --- pages/_app.js | 17 +++++++++++------ pages/create.js | 9 +-------- pages/faq.js | 5 ----- pages/imprint.js | 5 ----- pages/index.js | 7 ------- pages/list.js | 7 +------ pages/login.js | 5 ----- pages/privacy.js | 5 ----- pages/register.js | 5 ----- pages/tournament-edit.js | 6 +----- pages/tournament-fullscreen.js | 8 -------- pages/tournament.js | 5 +---- 12 files changed, 15 insertions(+), 69 deletions(-) diff --git a/pages/_app.js b/pages/_app.js index 1b508c4..e0e8f7c 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -1,13 +1,18 @@ -import App, { Container } from 'next/app'; -import React from 'react'; -import { Provider } from 'react-redux'; -import Notifications from 'react-notify-toast'; -import Favicon from 'react-favicon'; +import App, { Container } from 'next/app'; +import React from 'react'; +import { Provider } from 'react-redux'; +import Notifications from 'react-notify-toast'; +import Favicon from 'react-favicon'; -import withReduxStore from '../js/redux/reduxStoreBinder'; +import withReduxStore from '../js/redux/reduxStoreBinder'; +import { verifyCredentials } from '../js/api.js'; class TurniereApp extends App { + componentDidMount() { + verifyCredentials(); + } + render () { const {Component, pageProps, reduxStore} = this.props; return ( diff --git a/pages/create.js b/pages/create.js index 0beb477..2565c7c 100644 --- a/pages/create.js +++ b/pages/create.js @@ -21,19 +21,12 @@ import { Footer } from '../js/components/Footer'; import { UserRestrictor, Option } from '../js/components/UserRestrictor'; import { Login } from '../js/components/Login'; import EditableStringList from '../js/components/EditableStringList'; -import { - verifyCredentials, - createTournament -} from '../js/api'; +import { createTournament } from '../js/api'; import '../static/everypage.css'; class PrivateCreatePage extends React.Component { - componentDidMount() { - verifyCredentials(); - } - render() { const { isSignedIn } = this.props; diff --git a/pages/faq.js b/pages/faq.js index c861b13..a635842 100644 --- a/pages/faq.js +++ b/pages/faq.js @@ -5,7 +5,6 @@ import { Col, Container, Row } from 'reactstrap'; import { TurniereNavigation } from '../js/components/Navigation'; import { BigImage } from '../js/components/BigImage'; import { Footer } from '../js/components/Footer'; -import { verifyCredentials } from '../js/api'; import 'bootstrap/dist/css/bootstrap.min.css'; @@ -224,10 +223,6 @@ function TournamentFaq() { export default class FaqPage extends React.Component { - componentDidMount() { - verifyCredentials(); - } - render() { return (
diff --git a/pages/imprint.js b/pages/imprint.js index 40d58a9..4ade366 100644 --- a/pages/imprint.js +++ b/pages/imprint.js @@ -5,7 +5,6 @@ import { Container } from 'reactstrap'; import { TurniereNavigation } from '../js/components/Navigation'; import { BigImage } from '../js/components/BigImage'; import { Footer } from '../js/components/Footer'; -import { verifyCredentials } from '../js/api'; import 'bootstrap/dist/css/bootstrap.min.css'; import '../static/everypage.css'; @@ -76,10 +75,6 @@ function ImprintText(){ export default class ImprintPage extends React.Component { - componentDidMount() { - verifyCredentials(); - } - render() { return (
diff --git a/pages/index.js b/pages/index.js index 77c93eb..f81153d 100644 --- a/pages/index.js +++ b/pages/index.js @@ -11,9 +11,6 @@ import { import { TurniereNavigation } from '../js/components/Navigation'; import { BigImage } from '../js/components/BigImage'; import { Footer } from '../js/components/Footer'; -import { - verifyCredentials -} from '../js/api'; import 'bootstrap/dist/css/bootstrap.min.css'; @@ -174,10 +171,6 @@ function PromotedLinkCreateTournament() { class Index extends React.Component { - componentDidMount() { - verifyCredentials(); - } - render () { return (
diff --git a/pages/list.js b/pages/list.js index 7e9f018..768b105 100644 --- a/pages/list.js +++ b/pages/list.js @@ -10,17 +10,12 @@ import { TurniereNavigation } from '../js/components/Navigation'; import { Footer } from '../js/components/Footer'; import { getRequest, - getState, - verifyCredentials + getState } from '../js/api'; import '../static/everypage.css'; export default class ListPage extends React.Component { - - componentDidMount() { - verifyCredentials(); - } render() { return ( diff --git a/pages/login.js b/pages/login.js index 4bed1e0..73e7279 100644 --- a/pages/login.js +++ b/pages/login.js @@ -4,16 +4,11 @@ import React from 'react'; import { TurniereNavigation } from '../js/components/Navigation'; import { Footer } from '../js/components/Footer'; import { Login } from '../js/components/Login'; -import { verifyCredentials } from '../js/api'; import '../static/everypage.css'; export default class LoginPage extends React.Component { - componentDidMount() { - verifyCredentials(); - } - render() { return (
diff --git a/pages/privacy.js b/pages/privacy.js index 42dca7f..219ef4c 100644 --- a/pages/privacy.js +++ b/pages/privacy.js @@ -5,7 +5,6 @@ import { Container } from 'reactstrap'; import { TurniereNavigation } from '../js/components/Navigation'; import { BigImage } from '../js/components/BigImage'; import { Footer } from '../js/components/Footer'; -import { verifyCredentials } from '../js/api'; import 'bootstrap/dist/css/bootstrap.min.css'; @@ -496,10 +495,6 @@ function PrivacyText(){ export default class PrivacyPage extends React.Component { - componentDidMount() { - verifyCredentials(); - } - render() { return (
diff --git a/pages/register.js b/pages/register.js index 91ebc81..75e1c2a 100644 --- a/pages/register.js +++ b/pages/register.js @@ -16,16 +16,11 @@ import { import { TurniereNavigation } from '../js/components/Navigation'; import { Footer } from '../js/components/Footer'; import { register } from '../js/api'; -import { verifyCredentials } from '../js/api'; import '../static/everypage.css'; export default class RegisterPage extends React.Component { - componentDidMount() { - verifyCredentials(); - } - render() { return (
diff --git a/pages/tournament-edit.js b/pages/tournament-edit.js index 8b0dfae..e0b0fcd 100644 --- a/pages/tournament-edit.js +++ b/pages/tournament-edit.js @@ -17,10 +17,7 @@ import { UserRestrictor, Option } from '../js/components/UserRestrictor'; import { Footer } from '../js/components/Footer'; import { Login } from '../js/components/Login'; import { ErrorPageComponent } from '../js/components/ErrorComponents'; -import { - verifyCredentials, - updateTeamName -} from '../js/api'; +import { updateTeamName } from '../js/api'; import 'bootstrap/dist/css/bootstrap.min.css'; @@ -42,7 +39,6 @@ class EditTournamentPage extends React.Component { } componentDidMount() { - verifyCredentials(); requestTournament(this.props.query.code, () => { this.setState({ validCode: true }); diff --git a/pages/tournament-fullscreen.js b/pages/tournament-fullscreen.js index a7b79d3..037e696 100644 --- a/pages/tournament-fullscreen.js +++ b/pages/tournament-fullscreen.js @@ -1,19 +1,11 @@ import Head from 'next/head'; import React from 'react'; -import { - verifyCredentials -} from '../js/api'; - class FullscreenTournamentPage extends React.Component { static async getInitialProps({query}) { return {query}; } - - componentDidMount() { - verifyCredentials(); - } render() { return ( diff --git a/pages/tournament.js b/pages/tournament.js index d37c5f8..547fcf8 100644 --- a/pages/tournament.js +++ b/pages/tournament.js @@ -26,8 +26,7 @@ import { TurniereNavigation } from '../js/components/Navigation'; import { BigImage } from '../js/components/BigImage'; import { getRequest, - getState, - verifyCredentials + getState } from '../js/api'; import 'bootstrap/dist/css/bootstrap.min.css'; @@ -387,8 +386,6 @@ class Main extends React.Component { } componentDidMount() { - verifyCredentials(); - const code = this.props.query.code; getRequest(getState(), '/tournaments/' + code)