From 6bcd005bb5bbf4a63e13c67a0ac88f1460399d85 Mon Sep 17 00:00:00 2001 From: rlacko <rlacko@sch.bme.hu> Date: Sun, 2 Feb 2020 01:15:00 +0100 Subject: [PATCH] fix and cleanup --- src/components/pages/Events.js | 2 +- src/components/pages/LeaderBoard.js | 15 +++++++++------ src/components/pages/Presence.js | 15 ++++++++++----- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/components/pages/Events.js b/src/components/pages/Events.js index 306ef77..bc920fb 100644 --- a/src/components/pages/Events.js +++ b/src/components/pages/Events.js @@ -14,7 +14,7 @@ class Events extends Component { renderEvents() { return this.props.events.map((event) => { return ( - <Table.Row > + <Table.Row key={event.id}> <Table.Cell textAlign='center'> <Link to={`events/${event.id}`}> {event.name} diff --git a/src/components/pages/LeaderBoard.js b/src/components/pages/LeaderBoard.js index 18fef5c..dbbf927 100644 --- a/src/components/pages/LeaderBoard.js +++ b/src/components/pages/LeaderBoard.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Container, Table, Icon } from 'semantic-ui-react'; +import { Container, Table } from 'semantic-ui-react'; import { connect } from 'react-redux'; import { getTrainees } from '../../actions/statistics'; @@ -15,11 +15,11 @@ class LeaderBoard extends Component { - (Number(a.homework_bits) + a.events_visited) }).map((trainee) => { return ( - <Table.Row> + <Table.Row key={trainee.nick}> <Table.Cell textAlign='center'> - {trainee.full_name} + {trainee.full_name} </Table.Cell> - <Table.Cell textAlign='center'> + <Table.Cell textAlign='center' > {trainee.events_visited} </Table.Cell> <Table.Cell textAlign='center'> @@ -54,11 +54,14 @@ class LeaderBoard extends Component { </Table.Row> </Table.Header> <Table.Body> - {this.props.trainees ? this.renderTraineeBits() : - 'Nincsenek kĂŠpzĹdĹk' + <Table.Row> + <Table.Cell> + Nincsenek kĂŠpzĹdĹk + </Table.Cell> + </Table.Row> } </Table.Body> </Table> diff --git a/src/components/pages/Presence.js b/src/components/pages/Presence.js index 224cc5f..7c343c2 100644 --- a/src/components/pages/Presence.js +++ b/src/components/pages/Presence.js @@ -14,13 +14,13 @@ class Presence extends Component { return (this.props.events.map((event) => { if (event.visitors.includes(trainee.id)) { return ( - <Table.Cell textAlign='center'> + <Table.Cell textAlign='center' key={Math.random()}> <Icon color='green' name='checkmark' /> </Table.Cell> ); } return ( - <Table.Cell textAlign='center'> + <Table.Cell textAlign='center' key={Math.random()}> <Icon color='red' name='cancel' /> </Table.Cell> ); @@ -31,7 +31,7 @@ class Presence extends Component { renderTraineesWithEvents() { return this.props.trainees.map((trainee) => { return ( - <Table.Row> + <Table.Row key={Math.random()}> <Table.Cell textAlign='center'> {trainee.full_name} </Table.Cell> @@ -44,7 +44,8 @@ class Presence extends Component { // Column for each event renderTableHeaderEvents() { return (this.props.events.map(event => { - return (<Table.HeaderCell textAlign='center'> + return ( + <Table.HeaderCell textAlign='center' key={event.id}> {event.name} </Table.HeaderCell> ) @@ -68,7 +69,11 @@ class Presence extends Component { {this.props.trainees ? this.renderTraineesWithEvents() : - 'Nincsenek kĂŠpzĹdĹk' + <Table.Row> + <Table.Cell> + Nincsenek kĂŠpzĹdĹk + </Table.Cell> + </Table.Row> } </Table.Body> </Table> -- GitLab