From 65ed8df87fcb0816f7386d49547a0609da70c017 Mon Sep 17 00:00:00 2001 From: Malaber Date: Sun, 16 Mar 2025 14:03:48 +0100 Subject: [PATCH] Fix eslint errors --- js/components/LinkButton.js | 12 ++++----- js/components/Match.js | 6 ++++- js/components/MatchTable.js | 11 ++++++--- js/components/ScrollToTopButton.js | 2 +- js/redux/tournamentApi.js | 8 +++++- pages/create.js | 4 +-- pages/index.js | 6 ++--- pages/private.js | 10 ++++---- pages/tournament-fullscreen-groups.js | 35 +++++++++++---------------- pages/tournament-fullscreen.js | 2 +- 10 files changed, 51 insertions(+), 45 deletions(-) diff --git a/js/components/LinkButton.js b/js/components/LinkButton.js index 36a5ba6..c1fb806 100644 --- a/js/components/LinkButton.js +++ b/js/components/LinkButton.js @@ -3,11 +3,6 @@ import {useRouter} from 'next/router'; import React from 'react'; class LinkButtonComponent extends React.Component { - static defaultProps = { - outline: true, - color: 'secondary' - }; - handleClick(e) { e.preventDefault(); this.props.router.push(this.props.href); @@ -22,7 +17,12 @@ class LinkButtonComponent extends React.Component { } } +LinkButtonComponent.defaultProps = { + outline: true, + color: 'secondary' +}; + export function LinkButton(props) { const router = useRouter(); return (); -} \ No newline at end of file +} diff --git a/js/components/Match.js b/js/components/Match.js index fcdeaee..55e6df8 100644 --- a/js/components/Match.js +++ b/js/components/Match.js @@ -127,7 +127,11 @@ export class Match extends React.Component {
- + {groupInformation} diff --git a/js/components/MatchTable.js b/js/components/MatchTable.js index 4b4a9a0..c8adf57 100644 --- a/js/components/MatchTable.js +++ b/js/components/MatchTable.js @@ -41,9 +41,14 @@ export function MatchTable(props) { ); } else { - const team1Id = props.stageLevel !== undefined ? `favorite-team-level-${props.stageLevel}-${props.match.team1.id}` : undefined; - const team2Id = props.stageLevel !== undefined ? `favorite-team-level-${props.stageLevel}-${props.match.team2.id}` : undefined; - + let team1Id; let team2Id; + if (props.stageLevel !== undefined) { + team1Id = `favorite-team-level-${props.stageLevel}-${props.match.team1.id}`; + team2Id = `favorite-team-level-${props.stageLevel}-${props.match.team2.id}`; + } else { + team1Id = undefined; + team2Id = undefined; + } return ( diff --git a/js/components/ScrollToTopButton.js b/js/components/ScrollToTopButton.js index c2277a2..8e16f7a 100644 --- a/js/components/ScrollToTopButton.js +++ b/js/components/ScrollToTopButton.js @@ -43,4 +43,4 @@ export function ScrollToTopButton() { ); -} \ No newline at end of file +} diff --git a/js/redux/tournamentApi.js b/js/redux/tournamentApi.js index 2bca5cb..e1972a3 100644 --- a/js/redux/tournamentApi.js +++ b/js/redux/tournamentApi.js @@ -41,7 +41,13 @@ export function getTournamentMatches(tournamentId, successCallback, errorCallbac } getRequest(getState(), '/tournaments/' + tournamentId + '/matches' + matchFilter) .then(response => { - successCallback(response.status, response.data.sort((a, b) => a.position > b.position).map(match => convertMatch(match))); + successCallback( + response.status, response.data.sort( + (a, b) => a.position > b.position + ).map( + match => convertMatch(match) + ) + ); }) .catch(errorCallback); } diff --git a/pages/create.js b/pages/create.js index bace474..1adb14f 100644 --- a/pages/create.js +++ b/pages/create.js @@ -141,8 +141,8 @@ class CreateTournamentForm extends React.Component { diff --git a/pages/index.js b/pages/index.js index 3a7f6f2..9b0e3c0 100644 --- a/pages/index.js +++ b/pages/index.js @@ -9,8 +9,6 @@ import {TurniereNavigation} from '../js/components/Navigation'; import {BigImage} from '../js/components/BigImage'; import {Footer} from '../js/components/Footer'; -config.autoAddCss = false; - function Main() { return (
@@ -73,8 +71,8 @@ function MainBottomSummary() {

Ich habe einen Turniercode bekommen. Was nun?

- Der Turniercode führt dich direkt zu einem Turnier. Gebe dafür den Code oben ein, + Der Turniercode führt dich direkt zu einem Turnier. Gebe dafür den Code + oben ein, dann wirst du sofort weitergeleitet.

diff --git a/pages/private.js b/pages/private.js index b019592..4f76721 100644 --- a/pages/private.js +++ b/pages/private.js @@ -9,11 +9,11 @@ import {Footer} from '../js/components/Footer'; import TournamentList from '../js/components/TournamentList'; import RequireLogin from '../js/components/RequireLogin'; -import { LinkButton } from '../js/components/LinkButton'; +import {LinkButton} from '../js/components/LinkButton'; class PrivateTournamentsPage extends React.Component { render() { - return ( + return (
Private Turniere: turnie.re @@ -42,10 +42,10 @@ function PrivateTournamentsPageContent(props) { - zu den öffentlichen Turnieren + zu den öffentlichen Turnieren { props.isSignedIn && - neues Turnier erstellen + neues Turnier erstellen } @@ -57,7 +57,7 @@ class PrivateTournamentsCard extends React.Component { return (

Private Turniere

- + ); } diff --git a/pages/tournament-fullscreen-groups.js b/pages/tournament-fullscreen-groups.js index 4799756..808b939 100644 --- a/pages/tournament-fullscreen-groups.js +++ b/pages/tournament-fullscreen-groups.js @@ -4,7 +4,7 @@ import {ErrorPageComponent} from '../js/components/ErrorComponents'; import {getTournament} from '../js/redux/tournamentApi'; import { Col, - Container, Navbar, NavbarBrand, NavItem, Row, Spinner + Container, Row, Spinner } from 'reactstrap'; import {QRCodeSVG} from 'qrcode.react'; import {Group} from '../js/components/GroupStage'; @@ -14,22 +14,22 @@ function FullscreenPage(props) { let logo; if (props.showLogo) { logo =
-
- -
- ; +
+ +
+ ; } else { - logo =
; + logo =
; } return (
- - - {props.groups.map(group =>
)} + + + {props.groups.map(group => )}
@@ -40,13 +40,6 @@ function FullscreenPage(props) { ); } -function FullscreenPageHeader(props) { - return ( - {props.title} - {props.page}/{props.maxPage} - ); -} - class Main extends React.Component { static async getInitialProps({query}) { @@ -121,9 +114,9 @@ class Main extends React.Component { Vollbild-Ansicht: turnie.re - - - lade Vollbild-Ansicht + + + lade Vollbild-Ansicht ); } diff --git a/pages/tournament-fullscreen.js b/pages/tournament-fullscreen.js index 5819389..2f69473 100644 --- a/pages/tournament-fullscreen.js +++ b/pages/tournament-fullscreen.js @@ -3,7 +3,7 @@ import React from 'react'; import {ErrorPageComponent} from '../js/components/ErrorComponents'; import {getTournamentMatches, getTournamentMeta} from '../js/redux/tournamentApi'; import { - Col, Container, DropdownItem, DropdownMenu, DropdownToggle, Navbar, NavbarBrand, NavItem, Row, UncontrolledDropdown, + Col, Container, DropdownItem, DropdownMenu, DropdownToggle, Navbar, NavbarBrand, Row, UncontrolledDropdown, Spinner } from 'reactstrap'; import {Match} from '../js/components/Match';