reanimate Switches

app/AppContext.tsx

@@ -2,7 +2,6 @@
 
 import { createContext, useContext, useEffect, useState } from 'react';
 import useSocket from '@/hooks/useSocket';
-import { reduceTilts } from '@/tools';
 
 import { GAME_START, LOCAL_DEFAULTS } from '@/constants';
 import type { Dispatch, ReactNode, SetStateAction } from 'react';
@@ -16,7 +15,7 @@ export interface AppContext {
 	noGame: boolean;
 	selectCardIndex: number;
 	settings: Settings;
-	tilts: Tilt[];
+	tilt: Tilt[];
 	emitFlip: (cardIndex: number) => void;
 	emitSettings: (gameData: GameUpdate) => void;
 	emitRedraw: (cardIndex: number) => void;
@@ -24,7 +23,7 @@ export interface AppContext {
 	setGameID: (gameID: string) => void;
 	setLocalSettings: Dispatch<SetStateAction<LocalSettings>>;
 	setSelectCardIndex: (cardIndex: number) => void;
-	setLocalTilt: (tilt: Tilt[]) => void;
+	setTilt: (tilt: Tilt[]) => void;
 }
 
 export function AppProvider({ children }: { children: ReactNode }) {
@@ -33,7 +32,7 @@ export function AppProvider({ children }: { children: ReactNode }) {
 	const [gameID, setGameID] = useState('');
 	const [noGame, setNoGame] = useState(false);
 	const [selectCardIndex, setSelectCardIndex] = useState(-1);
-	const [localTilt, setLocalTilt] = useState<Tilt[]>([]);
+	const [tilt, setTilt] = useState<Tilt[]>([]);
 
 	const { emitFlip, emitRedraw, emitSelect, emitSettings, emitTilt } = useSocket({
 		gameID,
@@ -43,17 +42,17 @@ export function AppProvider({ children }: { children: ReactNode }) {
 
 	useEffect(() => {
 		if (localSettings.remoteTilt) {
-			const cardIndex = localTilt.findIndex((tilt) => !!tilt);
+			const cardIndex = tilt.findIndex((tilt) => !!tilt);
 
-			if (localTilt[cardIndex]) {
+			if (tilt[cardIndex]) {
-				emitTilt(cardIndex, localTilt[cardIndex]);
+				emitTilt(cardIndex, tilt[cardIndex]);
 			} else {
 				// cardIndex does not matter
 				// all tilts for this user will be cleared
-				emitTilt(0, { percentX: -1, percentY: -1, rotateX: 0, rotateY: 0 });
+				emitTilt(0, { rotateX: 0, rotateY: 0 });
 			}
 		}
-	}, [localTilt, localSettings]);
+	}, [tilt, localSettings]);
 
 	const handleSelect = (cardID: string) => {
 		setSelectCardIndex(-1);
@@ -70,7 +69,7 @@ export function AppProvider({ children }: { children: ReactNode }) {
 		noGame,
 		selectCardIndex,
 		settings: { ...gameData.settings, ...localSettings },
-		tilts: reduceTilts(gameData, localTilt),
+		tilt,
 		emitFlip,
 		emitSettings,
 		emitRedraw,
@@ -78,7 +77,7 @@ export function AppProvider({ children }: { children: ReactNode }) {
 		setGameID,
 		setLocalSettings,
 		setSelectCardIndex,
-		setLocalTilt,
+		setTilt,
 	};
 
 	return <AppContext.Provider value={appInterface}>{children}</AppContext.Provider>;

components/Card.tsx

@@ -5,8 +5,8 @@ import { useAppContext } from '@/app/AppContext';
 import TiltCard from '@/components/TiltCard';
 import ToolTip from '@/components/ToolTip';
 import StackTheDeck from '@/components/StackTheDeck';
-import Sheen from '@/components/Sheen';
+import getCardInfo from '@/tools/getCardInfo';
-import { getCardInfo, getURL } from '@/tools';
+import getURL from '@/tools/getURL';
 
 import tarokkaCards from '@/constants/tarokkaCards';
 import { layout } from '@/constants/tarokka';
@@ -84,7 +84,6 @@ export default function Card({ card, cardIndex }: CardProps) {
 								onHover={setTooltip}
 							/>
 						)}
-						<Sheen cardIndex={cardIndex} />
 					</div>
 					<div className="absolute inset-0 backface-hidden rotate-y-180">
 						<img
@@ -92,7 +91,6 @@ export default function Card({ card, cardIndex }: CardProps) {
 							alt={aria}
 							className="rounded-lg border border-yellow-500/25 hover:drop-shadow-[0_0_3px_#ffd700/50]"
 						/>
-						<Sheen cardIndex={cardIndex} />
 					</div>
 				</div>
 			</TiltCard>

components/CardSelect.tsx

@@ -3,7 +3,7 @@
 import { CircleX } from 'lucide-react';
 import { useAppContext } from '@/app/AppContext';
 import TarokkaDeck from '@/lib/TarokkaDeck';
-import { getURL } from '@/tools';
+import getURL from '@/tools/getURL';
 
 import { Deck } from '@/types';
 

components/Notes.tsx

@@ -1,12 +1,12 @@
 'use client';
 
 import { useMemo, useState } from 'react';
-import { CircleX, ScrollText } from 'lucide-react';
+import { ScrollText } from 'lucide-react';
 
 import { useAppContext } from '@/app/AppContext';
 import CopyButton from '@/components/CopyButton';
 import Scrim from '@/components/Scrim';
-import { getCardInfo } from '@/tools';
+import getCardInfo from '@/tools/getCardInfo';
 import { cardMap, layout } from '@/constants/tarokka';
 
 export default function Notes() {
@@ -51,24 +51,13 @@ export default function Notes() {
 				className={`transition-all duration-250 ${showNotes ? 'pointer-events-auto opacity-100' : 'pointer-events-none opacity-0'}`}
 			>
 				<div
-					className={`
+					className={`fixed bottom-4 right-4 transition-all duration-250 bg-slate-800 border border-yellow-400 rounded-lg space-y-2 ${showNotes ? 'sm:w-[33vw] sm:h-[67vh] w-[80vw] h-[80vh]' : 'w-0 h-0'}`}
-						fixed bottom-4 right-4
-						transition-all duration-250
-						bg-slate-800
-						border border-yellow-400 rounded-lg
-						${showNotes ? 'sm:w-[50vw] sm:h-[67vh] w-[80vw] h-[80vh]' : 'w-0 h-0'}
-					`}
 				>
 					<CopyButton
 						copy={notes.map((note) => note!.join('\n')).join('\n\n')}
-						className={`
+						className="text-yellow-400 hover:drop-shadow-[0_0_1px_#ffd700] absolute top-2 right-2 p-2 transition-all duration-250 bg-black/20 hover:bg-black/40 rounded-full cursor-pointer"
-							absolute top-2 right-2
-							cursor-pointer p-2
-							transition-all duration-250
-							text-yellow-400 hover:text-yellow-300 hover:drop-shadow-[0_0_3px_#ffd700]
-						`}
 					/>
-					<div className="text-yellow-400 h-full overflow-scroll p-8 transition-all delay-200 duration-50 ${showNotes ? 'opacity-100' : 'opacity-0'}">
+					<div className="text-yellow-400 h-full overflow-scroll p-6 transition-all delay-200 duration-50 ${showNotes ? 'opacity-100' : 'opacity-0'}">
 						{notes.map((note, index) => (
 							<div key={index}>
 								<div className="flex flex-col gap-2">
@@ -81,17 +70,6 @@ export default function Notes() {
 						))}
 					</div>
 				</div>
-				<button
-					className={`
-						fixed bottom-4 right-4
-						cursor-pointer p-2
-						transition-all duration-250
-						text-yellow-400 hover:text-yellow-300 hover:drop-shadow-[0_0_3px_#ffd700]
-					`}
-					onClick={() => setOpen((prev) => !prev)}
-				>
-					<CircleX className="w-5 h-5" />
-				</button>
 			</Scrim>
 		</div>
 	);

components/Settings/CardStyle.tsx

@@ -5,7 +5,7 @@ import type { CardStyle } from '@/types';
 
 const cardStyleOptions: CardStyle[] = ['standard', 'color', 'grayscale'];
 
-export default function CardStyle({ className }: { className?: string }) {
+export default function CardStyle() {
 	const { gameData, isDM, settings, emitSettings } = useAppContext();
 
 	const tuneRadio = (cardStyle: CardStyle) => {
@@ -19,18 +19,18 @@ export default function CardStyle({ className }: { className?: string }) {
 	};
 
 	return isDM ? (
-		<fieldset className={`flex flex-col w-full ${className}`}>
+		<fieldset className="flex flex-col w-full">
-			<div className="text-xs ml-1 mb-1">Card style:</div>
+			<div className="text-xs my-1">Card style:</div>
 			<div className="inline-flex overflow-hidden rounded-md w-full">
 				{cardStyleOptions.map((option, index) => (
 					<label
 						key={option}
 						className={`
-							flex justify-center
 							cursor-pointer
-							w-full px-3 py-2
+							w-full px-4 py-2
-							text-xs font-medium
+							text-sm font-medium
 							border border-yellow-500
+							flex justify-center items-center
 							transition hover:text-yellow-300 hover:drop-shadow-[0_0_3px_#ffd700]
 							${settings.cardStyle === option ? 'bg-slate-700 text-yellow-300 font-extrabold' : 'bg-slate-800 hover:bg-slate-700'}
 							${index === 0 ? 'rounded-l-md' : ''}

components/Settings/ExternalLinks.tsx

@@ -1,11 +1,14 @@
 'use client';
 
+import { useAppContext } from '@/app/AppContext';
 import BuyMeACoffee from '@/components/BuyMeACoffee';
 import GitHubButton from '@/components/GitHubButton';
 
-export default function CardStyle({ className }: { className?: string }) {
+export default function CardStyle() {
+	const { isDM } = useAppContext();
+
 	return (
-		<span className={`w-full flex flex-row justify-between ${className}`}>
+		<span className={`w-full flex flex-row ${isDM ? 'justify-evenly' : 'justify-between'}`}>
 			<GitHubButton className="h-[35px] w-[125px]" />
 			<BuyMeACoffee className="h-[35px] w-[125px]" />
 		</span>

components/Settings/GameLinks.tsx

@@ -3,11 +3,11 @@
 import { useAppContext } from '@/app/AppContext';
 import CopyButton from '@/components/CopyButton';
 
-export default function Links({ className }: { className?: string }) {
+export default function Links() {
 	const { gameData, isDM } = useAppContext();
 
 	return (
-		<div className={`w-full flex flex-col justify-between gap-2 ${className}`}>
+		<>
 			{isDM && (
 				<CopyButton
 					title="Copy DM link"
@@ -22,6 +22,6 @@ export default function Links({ className }: { className?: string }) {
 				tooltip={`${location.origin}/${gameData.spectatorID}`}
 				className="flex flex-row content-between w-full py-1 px-2 transition-all duration-250 bg-slate-700 hover:bg-slate-600 hover:text-yellow-300 rounded-lg shadow"
 			/>
-		</div>
+		</>
 	);
 }

components/Settings/index.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useState } from 'react';
-import { CircleX, Settings as Gear } from 'lucide-react';
+import { Settings as Gear } from 'lucide-react';
 import { Cinzel_Decorative } from 'next/font/google';
 
 import { useAppContext } from '@/app/AppContext';
@@ -31,12 +31,12 @@ export default function Settings() {
 				<div
 					className={`
 						fixed top-4 right-4
-						flex flex-col items-center justify-between
+						flex flex-col items-center justify-evenly
 						bg-slate-800 text-yellow-400
 						rounded-lg border border-yellow-400
-						h-full p-8
+						h-full py-3 px-4
 						transition-all duration-250
-						${open ? `opacity-100 ${isDM ? 'w-[350px] max-h-[425px]' : 'w-[325px] max-h-[200px]'}` : 'opacity-0 w-0 max-h-0'}
+						${open ? `opacity-100 ${isDM ? 'w-[350px] max-h-[375px]' : 'w-[300px] max-h-[175px]'}` : 'opacity-0 w-0 max-h-0'}
 					`}
 				>
 					<GameLinks />
@@ -44,15 +44,9 @@ export default function Settings() {
 					<CardStyle />
 					<ExternalLinks />
 				</div>
-				<button
-					className={`fixed top-4 right-4 p-2 transition-all duration-250 text-yellow-400 hover:text-yellow-300 hover:drop-shadow-[0_0_3px_#ffd700] cursor-pointer`}
-					onClick={() => setOpen((prev) => !prev)}
-				>
-					<CircleX className="w-5 h-5" />
-				</button>
 			</Scrim>
 			<button
-				className={`p-2 transition-all duration-250 text-yellow-400 hover:text-yellow-300 hover:drop-shadow-[0_0_3px_#ffd700] cursor-pointer`}
+				className={`p-2 transition-all duration-250 text-yellow-400 hover:text-yellow-300 hover:drop-shadow-[0_0_3px_#ffd700] cursor-pointer ${open ? 'pointer-events-none opacity-0' : 'pointer-events-auto opacity-100'}`}
 				onClick={() => setOpen((prev) => !prev)}
 			>
 				<Gear className="w-5 h-5" />

components/Sheen.tsx

@@ -1,59 +0,0 @@
-import { useEffect, useRef, useState } from 'react';
-import { useAppContext } from '@/app/AppContext';
-import { validTilt } from '@/tools';
-
-const tiltSheen = (sheen: HTMLDivElement, x: number, y: number) => {
-	const rect = sheen.getBoundingClientRect();
-	const sheenX = rect.width - x * rect.width;
-	const sheenY = rect.height - y * rect.height;
-
-	sheen.style.opacity = '1';
-	sheen.style.backgroundImage = `
-			radial-gradient(
-				circle at
-				${sheenX}px ${sheenY}px,
-				#ffffff44,
-				#0000000f
-			)
-		`;
-};
-
-export default function Sheen({ cardIndex, className }: { cardIndex: number; className?: string }) {
-	const sheenRef = useRef<HTMLDivElement>(null);
-	const [untilt, setUntilt] = useState(false);
-	const { tilts } = useAppContext();
-
-	useEffect(() => {
-		const sheen = sheenRef.current;
-		if (!sheen) return;
-
-		const tilt = tilts[cardIndex];
-
-		if (validTilt(tilt)) {
-			setUntilt(false);
-			tiltSheen(sheen, tilt.percentX, tilt.percentY);
-		} else {
-			setUntilt(true);
-		}
-	}, [tilts]);
-
-	useEffect(() => {
-		const sheen = sheenRef.current;
-		if (!sheen || !untilt) return;
-
-		sheen.style.opacity = '0';
-	}, [untilt]);
-
-	return (
-		<div
-			ref={sheenRef}
-			className={`
-				absolute inset-0
-				rounded-lg pointer-events-none
-				transition-opacity duration-500
-				bg-gradient-to-tr from-transparent via-white/20 to-transparent mix-blend-screen opacity-0
-				${className}
-			`}
-		/>
-	);
-}

components/Switch.tsx

@@ -4,16 +4,13 @@ export interface SwitchProps {
 	label: string;
 	value: boolean;
 	toggleAction: ChangeEventHandler<HTMLInputElement>;
-	className?: string;
 }
 
 const nonInitialCaps = /(?!^)([A-Z])/g;
 
-export default function Switch({ label, value, toggleAction, className }: SwitchProps) {
+export default function Switch({ label, value, toggleAction }: SwitchProps) {
 	return (
-		<label
+		<label className="flex items-center justify-between w-full gap-2 cursor-pointer text-yellow-400 hover:text-yellow-300">
-			className={`flex items-center justify-between gap-2 w-full cursor-pointer text-yellow-400 hover:text-yellow-300 ${className}`}
-		>
 			<span className="text-sm capitalize">{label.replace(nonInitialCaps, ' $1')}</span>
 
 			<div className="relative inline-block w-8 h-4 align-middle select-none transition duration-200 ease-in">

components/TiltCard.tsx

@@ -1,12 +1,30 @@
 import { useEffect, useRef, useState } from 'react';
 import { useAppContext } from '@/app/AppContext';
-import { throttle, validTilt } from '@/tools';
+import throttle from '@/tools/throttle';
 
 import { thirtyFPS } from '@/constants/time';
 import type { Tilt } from '@/types';
 
 const ZERO_ROTATION = 'rotateX(0deg) rotateY(0deg)';
 
+const tiltSheen = (sheen: HTMLDivElement, tiltX: number, tiltY: number) => {
+	const rect = sheen.getBoundingClientRect();
+	const centerX = rect.width / 2;
+	const centerY = rect.height / 2;
+	const sheenX = centerX + (tiltY / -20) * centerX;
+	const sheenY = centerY + (tiltX / 20) * centerY;
+
+	sheen.style.opacity = '1';
+	sheen.style.backgroundImage = `
+			radial-gradient(
+				circle at
+				${sheenX}px ${sheenY}px,
+				#ffffff44,
+				#0000000f
+			)
+		`;
+};
+
 export default function TiltCard({
 	children,
 	cardIndex,
@@ -17,28 +35,62 @@ export default function TiltCard({
 	className?: string;
 }) {
 	const cardRef = useRef<HTMLDivElement>(null);
+	const sheenRef = useRef<HTMLDivElement>(null);
 	const [untilt, setUntilt] = useState(false);
-	const { settings, tilts, setLocalTilt } = useAppContext();
+	const {
+		gameData,
+		settings: { tilt, remoteTilt },
+		setTilt,
+		tilt: localTilts,
+	} = useAppContext();
 
 	useEffect(() => {
 		const card = cardRef.current;
-		if (!card) return;
+		const sheen = sheenRef.current;
+		if (!card || !sheen) return;
 
-		const tilt = tilts[cardIndex];
+		if (tilt) {
+			const rotateX = localTilts[cardIndex]?.rotateX || 0;
+			const rotateY = localTilts[cardIndex]?.rotateY || 0;
 
-		if (validTilt(tilt)) {
+			const tilts = remoteTilt
+				? [...gameData.tilts[cardIndex], { rotateX, rotateY }]
+				: [{ rotateX, rotateY }];
+
+			const { totalX, totalY, count } = tilts
+				.filter(({ rotateX, rotateY }) => !!rotateX && !!rotateY)
+				.reduce(
+					({ totalX, totalY, count }, { rotateX, rotateY }) => ({
+						totalX: totalX + rotateX,
+						totalY: totalY + rotateY,
+						count: ++count,
+					}),
+					{ totalX: 0, totalY: 0, count: 0 },
+				);
+
+			if (count && (totalX || totalY)) {
 				setUntilt(false);
-			card.style.transform = `rotateX(${tilt.rotateX}deg) rotateY(${tilt.rotateY}deg)`;
+
+				const x = totalX / count;
+				const y = totalY / count;
+
+				card.style.transform = `rotateX(${x}deg) rotateY(${y}deg)`;
+				tiltSheen(sheen, x, y);
 			} else {
 				setUntilt(true);
 			}
-	}, [tilts]);
+		} else if (card.style.transform !== ZERO_ROTATION) {
+			setUntilt(true);
+		}
+	}, [tilt, localTilts, gameData]);
 
 	useEffect(() => {
 		const card = cardRef.current;
-		if (!card || !untilt) return;
+		const sheen = sheenRef.current;
+		if (!card || !sheen || !untilt) return;
 
 		card.style.transform = ZERO_ROTATION;
+		sheen.style.opacity = '0';
 	}, [untilt]);
 
 	const handleMouseMove = throttle((e: React.MouseEvent) => {
@@ -53,28 +105,21 @@ export default function TiltCard({
 
 		const rotateX = ((y - centerY) / centerY) * -20;
 		const rotateY = ((x - centerX) / centerX) * 20;
-		const percentX = x / rect.width;
-		const percentY = y / rect.height;
 
 		const newTilt: Tilt[] = [];
-		newTilt[cardIndex] = {
+		newTilt[cardIndex] = { rotateX, rotateY };
-			percentX,
-			percentY,
-			rotateX,
-			rotateY,
-		};
 
-		setLocalTilt(newTilt);
+		setTilt(newTilt);
 	}, thirtyFPS);
 
 	const handleMouseLeave = () => {
-		setLocalTilt([]);
+		setTilt([]);
 	};
 
 	return (
 		<div
 			className={`group ${className}`}
-			onMouseMove={settings.tilt ? handleMouseMove : undefined}
+			onMouseMove={tilt ? handleMouseMove : undefined}
 			onMouseLeave={handleMouseLeave}
 		>
 			<div
@@ -83,6 +128,10 @@ export default function TiltCard({
 				className={`h-full w-full transition-transform ${untilt ? 'duration-500' : 'duration-0'}`}
 			>
 				{children}
+				<div
+					ref={sheenRef}
+					className="pointer-events-none absolute inset-0 rounded-lg bg-gradient-to-tr from-transparent via-white/20 to-transparent mix-blend-screen opacity-0 transition-opacity duration-500"
+				/>
 			</div>
 		</div>
 	);

constants/index.ts

@@ -7,12 +7,12 @@ import type { GameUpdate, LocalSettings, Settings } from '@/types';
 
 export const SETTINGS: Settings = {
 	cardStyle: 'color',
-	notes: true,
+	notes: false,
-	positionBack: true,
+	positionBack: false,
-	positionFront: true,
+	positionFront: false,
-	prophecy: true,
+	prophecy: false,
 	tilt: true,
-	remoteTilt: true,
+	remoteTilt: false,
 };
 
 export const GAME_START: GameUpdate = {

lib/GameStore.ts

@@ -1,5 +1,6 @@
 import Deck from '@/lib/TarokkaDeck';
-import { generateID, parseMilliseconds } from '@/tools';
+import generateID from '@/tools/simpleID';
+import parseMilliseconds from '@/tools/parseMilliseconds';
 
 import { HOUR, DAY, SETTINGS } from '@/constants';
 import { GameState, GameUpdate, Settings, Tilt } from '@/types';
@@ -156,7 +157,7 @@ export default class GameStore {
 		return this.gameUpdate(game);
 	}
 
-	tilt(playerID: string, cardIndex: number, tilt: Tilt) {
+	tilt(playerID: string, cardIndex: number, { rotateX, rotateY }: Tilt) {
 		const game = this.getGameByPlayerID(playerID);
 		const cardTilts = game.tilts[cardIndex];
 
@@ -164,8 +165,8 @@ export default class GameStore {
 
 		this._clearTilts(game, playerID);
 
-		if (tilt.rotateX && tilt.rotateY) {
+		if (rotateX && rotateY) {
-			game.tilts[cardIndex] = [...game.tilts[cardIndex], { ...tilt, playerID }];
+			game.tilts[cardIndex] = [...game.tilts[cardIndex], { playerID, rotateX, rotateY }];
 			game.lastUpdated = Date.now();
 		}
 

lib/StandardDeck.ts

@@ -1,4 +1,4 @@
-import { getRandomItems } from '@/tools';
+import getRandomItems from '@/tools/getRandomItems';
 import cards from '@/constants/standardCards';
 import type { StandardCard } from '@/types';
 

lib/TarokkaDeck.ts

@@ -1,4 +1,4 @@
-import { getRandomItems } from '@/tools';
+import getRandomItems from '@/tools/getRandomItems';
 import cards from '@/constants/tarokkaCards';
 import type { TarokkaCard, TarokkaGameCard } from '@/types';
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "tarokka",
-	"version": "1.1.1",
+	"version": "0.1.0",
 	"private": true,
 	"scripts": {
 		"dev": "nodemon",

server.ts

@@ -3,7 +3,7 @@ import { createServer } from 'http';
 import { Server as SocketIOServer, type Socket } from 'socket.io';
 
 import GameStore from '@/lib/GameStore';
-import { omit } from '@/tools';
+import omit from '@/tools/omit';
 
 import { thirtyFPS } from '@/constants/time';
 import type { ClientUpdate, GameUpdate, Tilt } from '@/types';

tools/getCardInfo.ts

@@ -1,12 +1,12 @@
-import { isHighCard, isLowCard } from '@/tools';
+import { isHighCard, isLowCard } from '@/tools/cardTypes';
 import { Layout, Settings, TarokkaGameCard } from '@/types';
 
-export const getCardInfo = (
+export default function getTooltip(
 	card: TarokkaGameCard,
 	position: Layout,
 	dm: boolean,
 	settings: Settings,
-) => {
+) {
 	const { card: cardName, description, flipped } = card;
 
 	let text: string[] = [];
@@ -39,4 +39,4 @@ export const getCardInfo = (
 	}
 
 	return text;
-};
+}

tools/getRandomItems.ts

@@ -1,4 +1,4 @@
-export const getRandomItems = <T>(items: T[], count: number): T[] => {
+export default function getRandomItems<T>(items: T[], count: number): T[] {
 	const shuffled = [...items];
 
 	// Fisher-Yates shuffle
@@ -8,4 +8,4 @@ export const getRandomItems = <T>(items: T[], count: number): T[] => {
 	}
 
 	return count > shuffled.length ? shuffled : shuffled.slice(0, count);
-};
+}

tools/getURL.ts

@@ -1,8 +1,8 @@
 import { cardStyles, standardMap } from '@/constants/tarokka';
 import { Settings, TarokkaCard, TarokkaGameCard } from '@/types';
 
-export const getURL = (card: TarokkaCard | TarokkaGameCard, settings: Settings) => {
+export default function getURL(card: TarokkaCard | TarokkaGameCard, settings: Settings) {
 	const styleConfig = cardStyles[settings.cardStyle];
 	const fileBase = settings.cardStyle === 'standard' ? standardMap[card.id] : card.id;
 	return `${styleConfig.baseURL}${fileBase}${card.extension || styleConfig.extension}`;
-};
+}

tools/index.ts

@@ -1,11 +0,0 @@
-export * from '@/tools/cardTypes';
-export * from '@/tools/getCardInfo';
-export * from '@/tools/getRandomItems';
-export * from '@/tools/getURL';
-export * from '@/tools/log';
-export * from '@/tools/omit';
-export * from '@/tools/parseMilliseconds';
-export * from '@/tools/reduceTilts';
-export * from '@/tools/simpleID';
-export * from '@/tools/throttle';
-export * from '@/tools/validTilt';

tools/log.tsx

@@ -1,19 +0,0 @@
-/**
- * A logging utility designed to be inserted into functional chains.
- * Logs all parameters with an optional prefix, then returns the first argument unchanged.
- *
- * @param {string} [prefix=''] - A label or message to prepend to the logged output.
- * @returns {(value: any, ...rest: any[]) => any} - A function that logs its arguments and returns the first one.
- *
- * @example
- * const result = [1, 2, 3]
- *   .map((n) => n * 2)
- *   .map(log('doubled:'))
- *   .filter((n) => n > 2);
- */
-export const log =
-	(prefix: string = ''): ((value: any, ...rest: any[]) => any) =>
-	(...args: any[]) => {
-		console.log(prefix, ...args);
-		return args[0];
-	};

tools/omit.ts

@@ -1,7 +1,7 @@
-export const omit = <T extends Record<string, any>>(
+export default function omit<T extends Record<string, any>>(
 	obj: T,
 	propToRemove: keyof T,
-): Omit<T, typeof propToRemove> => {
+): Omit<T, typeof propToRemove> {
 	const { [propToRemove]: _, ...rest } = obj;
 	return rest;
-};
+}

tools/parseMilliseconds.ts

@@ -7,7 +7,7 @@ export interface ParsedMilliseconds {
 	seconds: number;
 }
 
-export const parseMilliseconds = (timestamp: number): ParsedMilliseconds => {
+export default function parseMilliseconds(timestamp: number): ParsedMilliseconds {
 	const days = Math.floor(timestamp / DAY);
 	timestamp %= DAY;
 
@@ -21,4 +21,4 @@ export const parseMilliseconds = (timestamp: number): ParsedMilliseconds => {
 	timestamp %= SECOND;
 
 	return { days, hours, minutes, seconds };
-};
+}

tools/reduceTilts.ts

@@ -1,34 +0,0 @@
-import { log, validTilt } from '@/tools';
-import { GameUpdate, Tilt } from '@/types';
-
-const combineTilts = (tilts: Tilt[]) =>
-	tilts.reduce(
-		({ pX, pY, rX, rY, count }, { percentX, percentY, rotateX, rotateY }) => ({
-			pX: pX + percentX,
-			pY: pY + percentY,
-			rX: rX + rotateX,
-			rY: rY + rotateY,
-			count: count + 1,
-		}),
-		{ pX: 0, pY: 0, rX: 0, rY: 0, count: 0 },
-	);
-
-export function reduceTilts(gameData: GameUpdate, localTilt: Tilt[]): Tilt[] {
-	const remoteTilts = gameData.tilts;
-	const tiltEnabled = gameData.settings.tilt;
-	const remoteTiltEnabled = gameData.settings.remoteTilt;
-
-	if (!tiltEnabled) return [];
-	if (!remoteTiltEnabled) return Array.from({ length: 5 }, (_, i) => localTilt[i]);
-
-	return Array.from({ length: 5 }, (_, i) => (localTilt[i] ? [localTilt[i]] : []))
-		.map((cardTilts, cardIndex) => [...remoteTilts[cardIndex], ...cardTilts])
-		.map((cardTilts) => cardTilts.filter(validTilt))
-		.map(combineTilts)
-		.map(({ pX, pY, rX, rY, count }) => ({
-			percentX: count ? pX / count : -1,
-			percentY: count ? pY / count : -1,
-			rotateX: count ? rX / count : 0,
-			rotateY: count ? rY / count : 0,
-		}));
-}

tools/simpleID.ts

@@ -1,7 +1,9 @@
-import { getRandomItems } from '@/tools';
+import getRandomItems from '@/tools/getRandomItems';
 
 const alphabet = '0123456789abcdefghijklmnopqrstuvwxyz';
 
-export const generateID = (length: number = 6) => {
+const generateID = (length: number = 6) => {
 	return getRandomItems(alphabet.split(''), length).join('');
 };
+
+export default generateID;

tools/throttle.ts

@@ -1,4 +1,4 @@
-export function throttle(func: Function, threshold: number) {
+export default function throttle(func: Function, threshold: number) {
 	let lastCall = 0;
 
 	return (...args: any[]) => {

tools/validTilt.ts

@@ -1,4 +0,0 @@
-import { Tilt } from '@/types';
-
-export const validTilt = ({ percentX, percentY, rotateX, rotateY }: Tilt) =>
-	percentX >= 0 && percentY >= 0 && !!rotateX && !!rotateY;

types/index.ts

@@ -115,8 +115,6 @@ export interface Layout {
 
 export interface Tilt {
 	playerID?: string;
-	percentX: number;
-	percentY: number;
 	rotateX: number;
 	rotateY: number;
 }