Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 2023-ujoncdelutan
  • 2023-update
  • master
  • 1.0
  • 1.0.1
  • 1.0.10
  • 1.0.12
  • 1.0.13
  • 1.0.14
  • 1.0.15
  • 1.0.16
  • 1.0.17
  • 1.0.18
  • 1.0.19
  • 1.0.2
  • 1.0.3
  • 1.0.4
  • 1.0.5
  • 1.0.6
  • 1.0.7
  • 1.0.8
  • 1.0.9
  • 1.1.0
  • 1.1.1
  • 1.1.2
  • 1.1.3
  • 1.1.4
  • 1.1.5
  • 1.2.0
  • 1.3.0
  • 1.3.1
  • 1.3.10
  • 1.3.11
  • 1.3.12
  • 1.3.13
  • 1.3.14
  • 1.3.15
  • 1.3.16
  • 1.3.17
  • 1.3.18
  • 1.3.19
  • 1.3.2
  • 1.3.3
  • 1.3.4
  • 1.3.5
  • 1.3.6
  • 1.3.7
  • 1.3.8
  • 1.3.9
  • 1.4.0
  • 1.4.1
  • 1.4.2
  • 1.4.3
  • 1.4.4
  • 1.4.5
  • 1.4.6
  • 1.4.7
57 results

Target

Select target project
  • kszk/devteam/kszkepzes/old/kszkepzes-frontend
  • kbgergely/kszkepzes-frontend
2 results
Select Git revision
  • master
  • 1.0
  • 1.0.1
  • 1.0.10
  • 1.0.12
  • 1.0.13
  • 1.0.14
  • 1.0.15
  • 1.0.16
  • 1.0.17
  • 1.0.18
  • 1.0.19
  • 1.0.2
  • 1.0.3
  • 1.0.4
  • 1.0.5
  • 1.0.6
  • 1.0.7
  • 1.0.8
  • 1.0.9
  • 1.1.0
  • 1.1.1
  • 1.1.2
  • 1.1.3
  • 1.1.4
  • 1.1.5
  • 1.2.0
  • 1.3.0
  • 1.3.1
29 results
Show changes
Showing
with 941 additions and 836 deletions
import React, { Component } from 'react';
import { Container, Header, Segment } from 'semantic-ui-react';
import './Groups.css'; import './Groups.css';
import { connect } from 'react-redux';
import GroupCard from '../extra/GroupCard';
import { getGroups } from '../../actions/groups'; import { Container, Header, Segment } from 'semantic-ui-react';
import React, { Component } from 'react';
import GroupCard from '../extra/GroupCard';
import { connect } from 'react-redux';
import { getGroups } from '../../actions/groups';
class Groups extends Component { class Groups extends Component {
UNSAFE_componentWillMount() { UNSAFE_componentWillMount() {
...@@ -15,11 +15,11 @@ class Groups extends Component { ...@@ -15,11 +15,11 @@ class Groups extends Component {
render() { render() {
return ( return (
<div> <div>
<Segment inverted textAlign='center' vertical> <Segment inverted textAlign="center" vertical>
<Container> <Container>
<Header <Header
as='h1' as="h1"
content='Köreink' content="Köreink"
inverted inverted
style={{ style={{
fontSize: '3em', fontSize: '3em',
...@@ -36,7 +36,13 @@ class Groups extends Component { ...@@ -36,7 +36,13 @@ class Groups extends Component {
{this.props.groups {this.props.groups
// eslint-disable-next-line arrow-body-style // eslint-disable-next-line arrow-body-style
.map((item) => { .map((item) => {
return <GroupCard key={item.id} label={item.name} value={item.description} />; return (
<GroupCard
key={item.id}
label={item.name}
value={item.description}
/>
);
})} })}
</Container> </Container>
</Segment> </Segment>
......
...@@ -10,4 +10,28 @@ ...@@ -10,4 +10,28 @@
-webkit-text-fill-color: white; -webkit-text-fill-color: white;
} }
.quote {
position: relative;
margin-bottom: 0.5rem;
}
.quote:before {
content: '“';
position: absolute;
left: -0.45em;
}
.quote::after {
content: '”';
margin-right: -1rem;
}
.quote--container {
margin: 2rem auto 0;
padding-bottom: 0.7rem;
}
.quote--author {
text-align: right;
font-weight: 300;
}
This diff is collapsed.
This diff is collapsed.
import React, { Component } from 'react';
import { Container, Table } from 'semantic-ui-react'; import { Container, Table } from 'semantic-ui-react';
import React, { Component } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { getTrainees } from '../../actions/statistics'; import { getTrainees } from '../../actions/statistics';
...@@ -10,57 +11,46 @@ class LeaderBoard extends Component { ...@@ -10,57 +11,46 @@ class LeaderBoard extends Component {
// Every event rendered // Every event rendered
renderTraineeBits() { renderTraineeBits() {
return this.props.trainees.sort((a, b) => (Number(b.homework_bits) + b.events_visited) return this.props.trainees
- (Number(a.homework_bits) + a.events_visited)).map((trainee) => ( .sort(
trainee.role === 'Student' (a, b) =>
? ( (Number(b.homework_bits) + Number(b.events_visited) + Number(b.extra_bits)) -
(Number(a.homework_bits) + Number(a.events_visited) + Number(a.extra_bits))
)
.map((trainee) =>
trainee.role === 'Student' ? (
<Table.Row key={trainee.nick}> <Table.Row key={trainee.nick}>
<Table.Cell textAlign='center'> <Table.Cell textAlign="center">{trainee.full_name}</Table.Cell>
{trainee.full_name} <Table.Cell textAlign="center">{trainee.events_visited}</Table.Cell>
</Table.Cell> <Table.Cell textAlign="center">
<Table.Cell textAlign='center'> {Number(trainee.homework_bits) + Number(trainee.extra_bits)}
{trainee.events_visited}
</Table.Cell> </Table.Cell>
<Table.Cell textAlign='center'> <Table.Cell textAlign="center">
{Number(trainee.homework_bits)} {Number(trainee.homework_bits) + trainee.events_visited + Number(trainee.extra_bits)}
</Table.Cell>
<Table.Cell textAlign='center'>
{Number(trainee.homework_bits) + trainee.events_visited}
</Table.Cell> </Table.Cell>
</Table.Row> </Table.Row>
) ) : null
: null );
));
} }
render() { render() {
return ( return (
<Container textAlign='center' style={{ overflowX: 'scroll' }}> <Container textAlign="center" style={{ overflowX: 'scroll' }}>
<Table color='blue' unstackable celled selectable compact> <Table color="blue" unstackable celled selectable compact>
<Table.Header> <Table.Header>
<Table.Row> <Table.Row>
<Table.HeaderCell textAlign='center'> <Table.HeaderCell textAlign="center">Képződők</Table.HeaderCell>
Képződők <Table.HeaderCell textAlign="center">Jelenlét</Table.HeaderCell>
</Table.HeaderCell> <Table.HeaderCell textAlign="center">Bitek</Table.HeaderCell>
<Table.HeaderCell textAlign='center'> <Table.HeaderCell textAlign="center">Szumma</Table.HeaderCell>
Jelenlét
</Table.HeaderCell>
<Table.HeaderCell textAlign='center'>
Bitek
</Table.HeaderCell>
<Table.HeaderCell textAlign='center'>
Szumma
</Table.HeaderCell>
</Table.Row> </Table.Row>
</Table.Header> </Table.Header>
<Table.Body> <Table.Body>
{this.props.trainees {this.props.trainees ? (
? this.renderTraineeBits() this.renderTraineeBits()
: ( ) : (
<Table.Row> <Table.Row>
<Table.Cell> <Table.Cell>Nincsenek képződők</Table.Cell>
Nincsenek képződők
</Table.Cell>
</Table.Row> </Table.Row>
)} )}
</Table.Body> </Table.Body>
...@@ -70,6 +60,9 @@ class LeaderBoard extends Component { ...@@ -70,6 +60,9 @@ class LeaderBoard extends Component {
} }
} }
const mapStateToProps = ({ trainees: { trainees }, user }) => ({ trainees, user }); const mapStateToProps = ({ trainees: { trainees }, user }) => ({
trainees,
user,
});
export default connect(mapStateToProps, { getTrainees })(LeaderBoard); export default connect(mapStateToProps, { getTrainees })(LeaderBoard);
This diff is collapsed.
This diff is collapsed.
import { Button, Container, Header, Icon, Segment } from 'semantic-ui-react';
import React, { Component } from 'react'; import React, { Component } from 'react';
import {
Button, Container, Header, Icon, Segment,
} from 'semantic-ui-react';
export default class NotFound extends Component { export default class NotFound extends Component {
render() { render() {
return ( return (
<div> <div>
<Segment inverted textAlign='center' vertical> <Segment inverted textAlign="center" vertical>
<Container> <Container>
<Header <Header
as='h1' as="h1"
content='404 - A keresett oldal nem található!' content="404 - A keresett oldal nem található!"
inverted inverted
style={{ style={{
fontSize: '3em', fontSize: '3em',
...@@ -21,9 +19,9 @@ export default class NotFound extends Component { ...@@ -21,9 +19,9 @@ export default class NotFound extends Component {
}} }}
/> />
<Button <Button
href='/' href="/"
primary primary
size='huge' size="huge"
style={{ style={{
fontSize: '2em', fontSize: '2em',
marginTop: '1em', marginTop: '1em',
...@@ -31,7 +29,7 @@ export default class NotFound extends Component { ...@@ -31,7 +29,7 @@ export default class NotFound extends Component {
}} }}
> >
Vissza a Főoldalra Vissza a Főoldalra
<Icon name='right arrow' /> <Icon name="right arrow" />
</Button> </Button>
</Container> </Container>
</Segment> </Segment>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.