style cleanup

packages/client/src/app.tsx

@@ -6,19 +6,15 @@ import { render } from "solid-js/web";
 import Root from "./routes/index";
 import "virtual:uno.css";
 
-const Version = () => (
-	<>
-		<span class="fixed br m-2 font-mono text-xs">v{pkg.version}</span>
-		<div class="i-solar-user-circle-bold fixed s-10 top-0 right-0 m-2 cursor-pointer" />
-	</>
-);
-
 const App = () => (
 	<Router
 		root={(props) => (
 			<>
 				<Suspense>{props.children}</Suspense>
-				<Version />
+				<span class="fixed br m-2 font-mono text-xs">
+					{"v" + pkg.version}
+				</span>
+				<div class="i-solar-user-circle-bold fixed s-10 top-0 right-0 m-2 cursor-pointer" />
 			</>
 		)}
 	>

packages/client/src/components/Card.tsx

@@ -24,10 +24,7 @@ export default ((props) => {
 				onClick={props.onClick}
 				draggable={false}
 				class={props.class}
-				style={{
+				style={props.style}
-					"border-radius": "5px",
-					...props.style,
-				}}
 				width="100px"
 				src={
 					props.face == "down"

packages/client/src/components/Game.tsx

@@ -30,19 +30,13 @@ export default (props: { instanceId: string }) => {
 	return (
 		<GameContext.Provider value={{ view, submitAction }}>
 			<Show when={view.latest != undefined}>
-				<div
+				<Pile
-					class="full column center"
+					count={view.latest!.deckCount}
-					style={{ "row-gap": "20px", "font-size": "32px" }}
+					class="cursor-pointer fixed center"
-				>
+					onClick={() => submitAction({ type: "draw" })}
-					<div class="full center">
+				/>
-						<Pile
+
-							count={view.latest!.deckCount}
+				<Hand class="fixed bc" hand={view.latest!.myHand} />
-							style={{ cursor: "pointer" }}
-							onClick={() => submitAction({ type: "draw" })}
-						/>
-					</div>
-					<Hand hand={view.latest!.myHand} />
-				</div>
 			</Show>
 		</GameContext.Provider>
 	);

packages/client/src/components/Hand.tsx

@@ -3,29 +3,13 @@ import Card from "./Card";
 import { Hand } from "../../../shared/cards";
 import { GameContext } from "./Game";
 import { produce } from "solid-js/store";
+import { Stylable } from "./toolbox";
 
 export default ((props) => {
 	const { submitAction, view } = useContext(GameContext)!;
 
 	return (
-		<div
+		<div class={"hand " + props.class} style={props.style}>
-			class="hand"
-			style={{
-				"min-width": "100px",
-				width: "fit-content",
-				"max-width": "80%",
-				border: "2px dashed white",
-				"border-radius": "12px",
-				margin: "10px",
-				"margin-bottom": "25px",
-				padding: "10px",
-				height: "180px",
-				overflow: "scroll",
-				"scrollbar-width": "none",
-				display: "flex",
-				gap: "5px",
-			}}
-		>
 			<For each={props.hand}>
 				{(card) => (
 					<Card
@@ -39,4 +23,4 @@ export default ((props) => {
 			</For>
 		</div>
 	);
-}) satisfies Component<{ hand: Hand }>;
+}) satisfies Component<{ hand: Hand } & Stylable>;

packages/client/src/components/Pile.tsx

@@ -5,20 +5,14 @@ import { Clickable, Stylable } from "./toolbox";
 
 export default ((props) => {
 	return (
-		<div
+		<Show when={props.count > 0}>
-			{...props}
+			<Card
-			class={`center ${props.class ?? ""}}`.trim()}
+				onClick={props.onClick}
-			style={{
+				style={props.style}
-				width: "200px",
+				class={props.class + " shadow-lg shadow-black"}
-				height: "400px",
+				face="down"
-				...(props.style as JSX.CSSProperties),
+			/>
-			}}
+		</Show>
-			onClick={props.onClick}
-		>
-			<Show when={props.count > 0}>
-				<Card face="down" />
-			</Show>
-		</div>
 	);
 }) satisfies Component<
 	{

packages/client/src/routes/[game]/[instance].tsx

@@ -8,20 +8,7 @@ export default () => {
 	return (
 		<>
 			<Game instanceId={params.instance} />
-			<A
+			<A href={`/${params.game}`} class="fixed tl m-4 px-2 py-1.5 button">
-				href={`/${params.game}`}
-				// style={{
-				// 	position: "absolute",
-				// 	padding: "10px",
-				// 	top: "0",
-				// 	left: "0",
-				// 	margin: "20px",
-				// 	"background-color": "white",
-				// 	"border-radius": "8px",
-				// 	border: "2px solid black",
-				// }}
-				class="fixed tl m-4 px-2 py-1.5 button"
-			>
 				Back
 			</A>
 		</>

packages/client/src/style.css

@@ -44,41 +44,19 @@ a:visited {
 }
 
 .hand {
+	height: 160px;
 	background: radial-gradient(rgb(24, 70, 82), rgb(1, 42, 41));
-}
+	min-width: 100px;
+	width: fit-content;
+	max-width: 90%;
+	border: 2px dashed white;
+	border-radius: 12px;
 
-.full {
+	margin-bottom: 50px;
-	height: 100%;
+	padding: 10px;
-	width: 100%;
-}
 
-.w-full {
+	overflow: scroll;
-	width: 100%;
+	scrollbar-width: none;
-}
-
-.center {
 	display: flex;
-	justify-content: center;
+	gap: 5px;
-	align-items: center;
-}
-
-.column {
-	display: flex;
-	flex-direction: column;
-}
-
-.free {
-	position: absolute;
-	top: 0;
-	left: 0;
-}
-
-.fixed-br {
-	position: fixed;
-	bottom: 0;
-	right: 0;
-}
-
-.clear {
-	pointer-events: none;
 }

packages/client/uno.config.ts

@@ -21,5 +21,20 @@ export default defineConfig({
 		["tr", { top: 0, right: 0 }],
 		["bl", { bottom: 0, left: 0 }],
 		["br", { bottom: 0, right: 0 }],
+		[
+			"bc",
+			{
+				bottom: 0,
+				left: 0,
+				right: 0,
+				"margin-left": "auto",
+				"margin-right": "auto",
+			},
+		],
+
+		[
+			"center",
+			{ top: "50%", left: "50%", transform: "translate(-50%, -50%)" },
+		],
 	],
 });