From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Wed, 21 May 2025 09:31:39 +0000 (+0200)
Subject: lil ally
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=43d2a0910ba315fa417c400dc46d5a68f68b7fce;p=alttp.git

lil ally
---

diff --git a/resources/js/app/Footer.js b/resources/js/app/Footer.js
index 54af553..91b0973 100644
--- a/resources/js/app/Footer.js
+++ b/resources/js/app/Footer.js
@@ -10,7 +10,7 @@ const Footer = () => {
 
 	const { t } = useTranslation();
 
-	return <footer className="bg-dark mt-5 px-3 py-5">
+	return <div className="bg-dark mt-5 px-3 py-5">
 		<Row>
 			<Col md={4}>
 				<h5>{t('footer.competitions')}</h5>
@@ -136,7 +136,7 @@ const Footer = () => {
 		</Row>
 		<p className="pt-5 text-center text-muted">{t('footer.contact')}</p>
 		<PrivacyDialog onHide={() => { setShowDialog(false); }} show={showDialog} />
-	</footer>;
+	</div>;
 };
 
 export default Footer;
diff --git a/resources/js/app/FullLayout.js b/resources/js/app/FullLayout.js
index 29a7be2..1771a07 100644
--- a/resources/js/app/FullLayout.js
+++ b/resources/js/app/FullLayout.js
@@ -5,9 +5,15 @@ import Footer from './Footer';
 import Header from './Header';
 
 const FullLayout = () => <>
-	<Header />
-	<Outlet />
-	<Footer />
+	<header>
+		<Header />
+	</header>
+	<main>
+		<Outlet />
+	</main>
+	<footer>
+		<Footer />
+	</footer>
 </>;
 
 export default FullLayout;
diff --git a/resources/js/components/rounds/Item.js b/resources/js/components/rounds/Item.js
index 94f8760..9cd095f 100644
--- a/resources/js/components/rounds/Item.js
+++ b/resources/js/components/rounds/Item.js
@@ -82,20 +82,22 @@ const Item = ({
 						/>
 					</p>
 				: null}
-				{tournament.type === 'open-async' && round.results && round.results.length ?
-					<p>{t('rounds.numberOfResults', { count: round.results.length })}</p>
-				: null}
-				<div className="button-bar">
-					<LockButton round={round} tournament={tournament} />
-					{mayEditRound(user, tournament, round) ?
-						<EditButton round={round} tournament={tournament} />
-					: null}
-					{mayViewProtocol(user, tournament, round) ?
-						<RoundProtocol roundId={round.id} tournamentId={tournament.id} />
-					: null}
-					{mayDeleteRound(user, tournament, round) ?
-						<DeleteButton round={round} tournament={tournament} />
+				<div className="bottom-half">
+					{tournament.type === 'open-async' && round.results && round.results.length ?
+						<p>{t('rounds.numberOfResults', { count: round.results.length })}</p>
 					: null}
+					<div className="button-bar">
+						<LockButton round={round} tournament={tournament} />
+						{mayEditRound(user, tournament, round) ?
+							<EditButton round={round} tournament={tournament} />
+						: null}
+						{mayViewProtocol(user, tournament, round) ?
+							<RoundProtocol roundId={round.id} tournamentId={tournament.id} />
+						: null}
+						{mayDeleteRound(user, tournament, round) ?
+							<DeleteButton round={round} tournament={tournament} />
+						: null}
+					</div>
 				</div>
 			</div>
 			<List round={round} tournament={tournament} />
diff --git a/resources/js/components/zootr/MixedPoolsTracker.js b/resources/js/components/zootr/MixedPoolsTracker.js
index 8e3a7e1..3a62bdb 100644
--- a/resources/js/components/zootr/MixedPoolsTracker.js
+++ b/resources/js/components/zootr/MixedPoolsTracker.js
@@ -2651,14 +2651,9 @@ const MixedPoolsTracker = () => {
 		return options;
 	}, []);
 
-	const warpTargets = React.useMemo(() => {
-		const targets = [];
-		return targets;
-	}, []);
-
 	const context = React.useMemo(() => ({
-		connections, entrances, setConnection, warpTargets,
-	}), [connections, entrances, setConnection, warpTargets]);
+		connections, entrances, setConnection,
+	}), [connections, entrances, setConnection]);
 
 	const superGroups = React.useMemo(() => {
 		const sg = [
@@ -2725,8 +2720,11 @@ const MixedPoolsTracker = () => {
 	}, []);
 
 	const connectors = React.useMemo(() => {
-		return [connections, maps];
-	}, []);
+		const cs = [];
+		Object.entries(connections).forEach(([from, to]) => {
+		});
+		return cs;
+	}, [connections, maps]);
 
 	return <CONTEXT.Provider value={context}>
 		<div className="mixed-pools-tracker">
diff --git a/resources/sass/results.scss b/resources/sass/results.scss
index f569bdc..b1ef053 100644
--- a/resources/sass/results.scss
+++ b/resources/sass/results.scss
@@ -29,6 +29,9 @@
 				box-shadow: none;
 				top: 0.5ex;
 			}
+			&:focus {
+				outline: medium dashed $light;
+			}
 
 			.time {
 				min-width: 9ex;
diff --git a/resources/sass/rounds.scss b/resources/sass/rounds.scss
index 907d6e9..2ff6221 100644
--- a/resources/sass/rounds.scss
+++ b/resources/sass/rounds.scss
@@ -16,6 +16,8 @@
 		}
 
 		.info {
+			display: flex;
+			flex-direction: column;
 			padding-right: 1rem;
 			min-width: 13em;
 
@@ -34,6 +36,10 @@
 				}
 			}
 
+			.bottom-half {
+				margin-top: auto;
+			}
+
 			.seed-code, .btn, .rolled-by {
 				margin-bottom: 1ex;
 			}