turniere
/
turniere-frontend
mirror of https://github.com/turniere/turniere-frontend.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into ticket/TURNIERE-206

This commit is contained in:
Daniel Schädler 2022-07-01 22:12:54 +02:00
parent 57c9e895ad 7af8ad66b3
commit 407cc5a596
Signed by: Malaber
GPG Key ID: 4BB175A9617E4B11
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/components/DominanceShower.js
View File

@ -22,8 +22,8 @@ export class DominanceShower extends React.Component {
<td className="h4 text-danger text-right pb-0">{this.props.stats.points_received}</td> <td className="h4 text-danger text-right pb-0">{this.props.stats.points_received}</td>
</tr> </tr>
<tr> <tr>
<td className="smaller pt-0">Punkte erzielt</td> <td className="smaller pt-0">Becher geworfen</td>
<td className="text-right smaller pt-0">Punkte kassiert</td> <td className="text-right smaller pt-0">Becher kassiert</td>
</tr> </tr>
</tbody> </tbody>
</Table> </Table>

4
js/components/GroupStage.js
View File

@ -79,8 +79,8 @@ function GroupScoresTable(props) {
<tr> <tr>
<th>Team</th> <th>Team</th>
<th>Punkte</th> <th>Punkte</th>
<th>erzielt</th> <th>Becher geworfen</th>
<th>kassiert</th> <th>Becher kassiert</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

2
js/components/Navigation.js
View File

@ -74,8 +74,6 @@ class InvisibleLoginLogoutButtons extends React.Component {
return (<ButtonGroup className="nav-item"> return (<ButtonGroup className="nav-item">
<Button outline color="success" href="/login" <Button outline color="success" href="/login"
className="navbar-btn my-2 my-sm-0 px-5">Login</Button> className="navbar-btn my-2 my-sm-0 px-5">Login</Button>
<Button outline color="success" href="/register"
className="navbar-btn my-2 my-sm-0 px-5">Registrieren</Button>
</ButtonGroup>); </ButtonGroup>);
} }
} }

4
pages/register.js
View File

@ -34,7 +34,7 @@ class Register extends React.Component {
return (<Container className="py-5"> return (<Container className="py-5">
<Card className="shadow"> <Card className="shadow">
<CardBody> <CardBody>
<h1 className="custom-font">Account anlegen</h1> <h1 className="custom-font">Registrierung aktuell nicht möglich!</h1>
<RegisterForm/> <RegisterForm/>
<div className="mt-3"> <div className="mt-3">
<a href="/login" className="mr-3">Ich habe bereits einen Account!</a> <a href="/login" className="mr-3">Ich habe bereits einen Account!</a>
@ -100,7 +100,7 @@ class RegisterForm extends React.Component {
Du akzeptierst die <a href="/privacy">Datenschutzbestimmungen</a>, wenn du auf Registrieren klickst. Du akzeptierst die <a href="/privacy">Datenschutzbestimmungen</a>, wenn du auf Registrieren klickst.
</FormText> </FormText>
<Button onClick={() => this.registerUser()} <Button onClick={() => this.registerUser()}
color="success" size="lg" className="w-100 shadow-sm">Registrieren</Button> color="success" size="lg" className="w-100 shadow-sm disabled">Registrieren</Button>
<VisibleRegisterErrorList/> <VisibleRegisterErrorList/>
</Form>); </Form>);
} }