show tournament participation in profile

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index c0ab73d9b442a30ff340375e97d4747b0e5e9a5f..8c451fc1328c3260ff6a9ed0c984b353536d917a 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -41,6 +41,8 @@ class UserController extends Controller
        public function single(Request $request, $id) {
                $user = User::findOrFail($id);
                $this->authorize('view', $user);
        public function single(Request $request, $id) {
                $user = User::findOrFail($id);
                $this->authorize('view', $user);

+               $user->load('participation');
+               $user->load('participation.tournament');

                return $user->toJson();
        }
 
                return $user->toJson();
        }
 

diff --git a/app/Models/User.php b/app/Models/User.php
index 7f03b4acdf6a24ea4dc2bcec5145cb66a2b31ea9..535af2e07e828232ba2e9e2843ad507d1222d481 100644 (file)
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -21,6 +21,10 @@ class User extends Authenticatable
                return false;
        }
 
                return false;
        }
 

+       public function participation() {
+               return $this->hasMany(Participant::class);
+       }
+

        /**
         * The attributes that are mass assignable.
         *
        /**
         * The attributes that are mass assignable.
         *

diff --git a/resources/js/components/users/Participation.js b/resources/js/components/users/Participation.js
new file mode 100644 (file)
index 0000000..e45fcf6
--- /dev/null
+++ b/resources/js/components/users/Participation.js
@@ -0,0 +1,37 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { Alert, Button } from 'react-bootstrap';
+import { withTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+
+import i18n from '../../i18n';
+
+const Participation = ({ user }) => {
+       const navigate = useNavigate();
+
+       if (!user || !user.participation || !user.participation.length) {
+               return <Alert variant="info">
+                       {i18n.t('users.participationEmpty')}
+               </Alert>;
+       }
+       return <div className="participation">
+               {user.participation.map(p => <div key={p.id}>
+                       <Button
+                               onClick={() => navigate(`/tournaments/${p.tournament_id}`)}
+                               variant="link"
+                       >
+                               {p.tournament.title}
+                       </Button>
+               </div>)}
+       </div>;
+};
+
+Participation.propTypes = {
+       user: PropTypes.shape({
+               participation: PropTypes.arrayOf(PropTypes.shape({
+                       id: PropTypes.number,
+               })),
+       }),
+};
+
+export default withTranslation()(Participation);

diff --git a/resources/js/components/users/Profile.js b/resources/js/components/users/Profile.js
index f38ba2f3d8830b8447a3ecbf5b9bfe8802f9446e..10c70dbf92bb4037a8ae2dbc96ab2fae22829c6d 100644 (file)
--- a/resources/js/components/users/Profile.js
+++ b/resources/js/components/users/Profile.js
@@ -5,6 +5,7 @@ import { withTranslation } from 'react-i18next';
 
 import Box from './Box';
 import EditStreamLinkButton from './EditStreamLinkButton';
 
 import Box from './Box';
 import EditStreamLinkButton from './EditStreamLinkButton';

+import Participation from './Participation';

 import Icon from '../common/Icon';
 import i18n from '../../i18n';
 
 import Icon from '../common/Icon';
 import i18n from '../../i18n';
 


@@ -35,11 +36,17 @@ const Profile = ({ user }) => <Container>
                                <EditStreamLinkButton user={user} />
                        </p>
                </Col>
                                <EditStreamLinkButton user={user} />
                        </p>
                </Col>

+               <Col md={12}>
+                       <h2>{i18n.t('users.tournaments')}</h2>
+                       <Participation user={user} />
+               </Col>

        </Row>
 </Container>;
 
 Profile.propTypes = {
        user: PropTypes.shape({
        </Row>
 </Container>;
 
 Profile.propTypes = {
        user: PropTypes.shape({

+               participation: PropTypes.arrayOf(PropTypes.shape({
+               })),

                stream_link: PropTypes.string,
                username: PropTypes.string,
        }),
                stream_link: PropTypes.string,
                username: PropTypes.string,
        }),

diff --git a/resources/js/i18n/de.js b/resources/js/i18n/de.js
index 6feeb64d35dd951c65bb6ce7f595751d7e6d3d0e..ee1f9c3e77d4cc881edb63037cd8844eef1ba5ba 100644 (file)
--- a/resources/js/i18n/de.js
+++ b/resources/js/i18n/de.js
@@ -146,10 +146,12 @@ export default {
                        discordTag: 'Discord Tag',
                        editStreamLink: 'Stream Link bearbeiten',
                        noStream: 'Kein Stream gesetzt',
                        discordTag: 'Discord Tag',
                        editStreamLink: 'Stream Link bearbeiten',
                        noStream: 'Kein Stream gesetzt',

+                       participationEmpty: 'Hat noch an keinen Turnieren teilgenommen.',

                        setStreamLinkError: 'Konnte Stream Link nicht speichern',
                        setStreamLinkSuccess: 'Stream Link gespeichert',
                        stream: 'Stream',
                        streamLink: 'Stream Link',
                        setStreamLinkError: 'Konnte Stream Link nicht speichern',
                        setStreamLinkSuccess: 'Stream Link gespeichert',
                        stream: 'Stream',
                        streamLink: 'Stream Link',

+                       tournaments: 'Turniere',

                },
                validation: {
                        error: {
                },
                validation: {
                        error: {

diff --git a/resources/js/i18n/en.js b/resources/js/i18n/en.js
index 3f01805f73cb986e7843bd5e263dee9d8459af1f..bd7fb372535c825d296d5554e3f49e64692b65d2 100644 (file)
--- a/resources/js/i18n/en.js
+++ b/resources/js/i18n/en.js
@@ -146,10 +146,12 @@ export default {
                        discordTag: 'Discord tag',
                        editStreamLink: 'Edit stream link',
                        noStream: 'No stream set',
                        discordTag: 'Discord tag',
                        editStreamLink: 'Edit stream link',
                        noStream: 'No stream set',

+                       participationEmpty: 'Has not participated in any tourneys yet.',

                        setStreamLinkError: 'Could not save stream link',
                        setStreamLinkSuccess: 'Stream link saved',
                        stream: 'Stream',
                        streamLink: 'Stream link',
                        setStreamLinkError: 'Could not save stream link',
                        setStreamLinkSuccess: 'Stream link saved',
                        stream: 'Stream',
                        streamLink: 'Stream link',

+                       tournaments: 'Tournaments',

                },
                validation: {
                        error: {
                },
                validation: {
                        error: {