X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=resources%2Fjs%2Fcomponents%2Fpages%2FTournament.js;h=6e32227ab2d04d330b8025dc16744fdbbee5d606;hb=2b3d5b3d98705cda41a7218d7133234b227e87b6;hp=1f2a354c4cfaf39b1b1e2d2729ce733f84f8455e;hpb=4388278823ac8a791641ac1d65fc675e9543b8e8;p=alttp.git

diff --git a/resources/js/components/pages/Tournament.js b/resources/js/components/pages/Tournament.js
index 1f2a354..6e32227 100644
--- a/resources/js/components/pages/Tournament.js
+++ b/resources/js/components/pages/Tournament.js
@@ -7,6 +7,7 @@ import ErrorMessage from '../common/ErrorMessage';
 import Loading from '../common/Loading';
 import NotFound from '../pages/NotFound';
 import Detail from '../tournament/Detail';
+import { patchResult, patchRound, patchUser, sortParticipants } from '../../helpers/Tournament';
 
 const Tournament = () => {
 	const params = useParams();
@@ -23,7 +24,7 @@ const Tournament = () => {
 			.then(response => {
 				setError(null);
 				setLoading(false);
-				setTournament(response.data);
+				setTournament(sortParticipants(response.data));
 			})
 			.catch(error => {
 				setError(error);
@@ -33,21 +34,49 @@ const Tournament = () => {
 	}, [id]);
 
 	useEffect(() => {
-		window.Echo.private(`Tournament.${id}`)
+		window.Echo.channel(`Tournament.${id}`)
+			.listen('ResultReported', e => {
+				if (e.result) {
+					setTournament(tournament => patchResult(tournament, e.result));
+				}
+			})
 			.listen('RoundAdded', e => {
-				console.log(e);
 				if (e.round) {
 					setTournament(tournament => ({
 						...tournament,
-						rounds: [...tournament.rounds, e.round],
+						rounds: [e.round, ...tournament.rounds],
 					}));
 				}
+			})
+			.listen('RoundChanged', e => {
+				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 <Loading />;
 	}