X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=resources%2Fjs%2Fcomponents%2Fpages%2FTournament.js;h=d148059fef2cda83250afa2a5e290dbdaaa0e07a;hb=7c1db464de8560af8f72228fc311c34f38c1134d;hp=5a9c8b05c207ce74db4c159559bdef5b5511b106;hpb=a907ef7c6676fef11f42933b2d79bdd496b20122;p=alttp.git
diff --git a/resources/js/components/pages/Tournament.js b/resources/js/components/pages/Tournament.js
index 5a9c8b0..d148059 100644
--- a/resources/js/components/pages/Tournament.js
+++ b/resources/js/components/pages/Tournament.js
@@ -1,13 +1,23 @@
import axios from 'axios';
import React, { useEffect, useState } from 'react';
+import { Helmet } from 'react-helmet';
import { useParams } from 'react-router-dom';
+import CanonicalLinks from '../common/CanonicalLinks';
import ErrorBoundary from '../common/ErrorBoundary';
import ErrorMessage from '../common/ErrorMessage';
import Loading from '../common/Loading';
import NotFound from '../pages/NotFound';
import Detail from '../tournament/Detail';
-import { patchResult, patchRound, sortParticipants } from '../../helpers/Tournament';
+import {
+ patchApplication,
+ patchParticipant,
+ patchResult,
+ patchRound,
+ patchUser,
+ removeApplication,
+ sortParticipants,
+} from '../../helpers/Tournament';
const Tournament = () => {
const params = useParams();
@@ -18,9 +28,10 @@ const Tournament = () => {
const [tournament, setTournament] = useState(null);
useEffect(() => {
+ const ctrl = new AbortController();
setLoading(true);
axios
- .get(`/api/tournaments/${id}`)
+ .get(`/api/tournaments/${id}`, { signal: ctrl.signal })
.then(response => {
setError(null);
setLoading(false);
@@ -31,12 +42,35 @@ const Tournament = () => {
setLoading(false);
setTournament(null);
});
+ return () => {
+ ctrl.abort();
+ };
}, [id]);
useEffect(() => {
- window.Echo.private(`Tournament.${id}`)
- .listen('ResultReported', e => {
+ window.Echo.channel(`Tournament.${id}`)
+ .listen('ApplicationAdded', e => {
+ if (e.application) {
+ setTournament(tournament => patchApplication(tournament, e.application));
+ }
+ })
+ .listen('ApplicationChanged', e => {
+ if (e.application) {
+ setTournament(tournament => patchApplication(tournament, e.application));
+ }
+ })
+ .listen('ApplicationRemoved', e => {
+ if (e.application_id) {
+ setTournament(tournament => removeApplication(tournament, e.application_id));
+ }
+ })
+ .listen('ParticipantChanged', e => {
console.log(e);
+ if (e.participant) {
+ setTournament(tournament => patchParticipant(tournament, e.participant));
+ }
+ })
+ .listen('ResultChanged', e => {
if (e.result) {
setTournament(tournament => patchResult(tournament, e.result));
}
@@ -45,7 +79,7 @@ const Tournament = () => {
if (e.round) {
setTournament(tournament => ({
...tournament,
- rounds: [...tournament.rounds, e.round],
+ rounds: [e.round, ...tournament.rounds],
}));
}
})
@@ -53,12 +87,31 @@ const Tournament = () => {
if (e.round) {
setTournament(tournament => patchRound(tournament, e.round));
}
+ })
+ .listen('TournamentChanged', e => {
+ if (e.tournament) {
+ setTournament(tournament => ({ ...tournament, ...e.tournament }));
+ }
});
return () => {
window.Echo.leave(`Tournament.${id}`);
};
}, [id]);
+ useEffect(() => {
+ const cb = (e) => {
+ if (e.user) {
+ setTournament(tournament => patchUser(tournament, e.user));
+ }
+ };
+ window.Echo.channel('App.Control')
+ .listen('UserChanged', cb);
+ return () => {
+ window.Echo.channel('App.Control')
+ .stopListening('UserChanged', cb);
+ };
+ }, []);
+
if (loading) {
return ;
}
@@ -76,6 +129,10 @@ const Tournament = () => {
};
return
+
+ {tournament.title}
+
+
;
};