X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Fpages%2FTournament.js;h=d148059fef2cda83250afa2a5e290dbdaaa0e07a;hb=8e274ddec45800cd727bb7138683b81cf2f7dcb1;hp=64c890609333608f1701941676849ec8308d28f7;hpb=d748feb96453d74aeffec648d6f5f68d9ef3b520;p=alttp.git

diff --git a/resources/js/components/pages/Tournament.js b/resources/js/components/pages/Tournament.js
index 64c8906..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 } from '../../helpers/Tournament';
+import {
+	patchApplication,
+	patchParticipant,
+	patchResult,
+	patchRound,
+	patchUser,
+	removeApplication,
+	sortParticipants,
+} from '../../helpers/Tournament';
 
 const Tournament = () => {
 	const params = useParams();
@@ -18,25 +28,49 @@ 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);
-				setTournament(response.data);
+				setTournament(sortParticipants(response.data));
 			})
 			.catch(error => {
 				setError(error);
 				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,15 +79,39 @@ const Tournament = () => {
 				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 />;
 	}
@@ -71,6 +129,10 @@ const Tournament = () => {
 	};
 
 	return <ErrorBoundary>
+		<Helmet>
+			<title>{tournament.title}</title>
+		</Helmet>
+		<CanonicalLinks base={`/tournaments/${tournament.id}`} />
 		<Detail addRound={addRound} tournament={tournament} />
 	</ErrorBoundary>;
 };