2 Commits

Author SHA1 Message Date
Matthieu
d354622e39 [ISSUE-8] Redesign life counter page with responsive layout and card backgrounds
Changements détaillés:
- Suppression du formulaire de configuration initiale, démarrage direct avec 2 joueurs
- Implémentation d'une grille responsive (2-8 joueurs, 1-4 colonnes selon l'écran)
- Ajout de la configuration dynamique du nombre de joueurs avec mise à jour instantanée
- Création de fonds personnalisables utilisant les illustrations de cartes Scryfall
- Intégration d'une modale de recherche de cartes par nom

Détails techniques:
- Nouveaux composants: PlayerLifeCounter (87 lignes), CardSearchModal (118 lignes)
- Réécriture complète de LifeCounter (209 lignes)
- Design mobile-first avec breakpoints Tailwind (sm, md, lg)
- TypeScript avec typage complet
- Intégration avec le service Scryfall API existant
- Fonctionnalités: édition des noms, vie de départ (20/30/40), reset global

Tests: Build réussi, pas d'erreurs de linting

Resolves: #8
2025-10-27 11:43:18 +01:00
96ba4c2809 Merge pull request 'Add some css animation to make the project prettier' (#7) from feature/issue-6-add-some-css-animation-to-make-the-project-prettie into master
Reviewed-on: #7
2025-10-23 16:43:09 +02:00
3 changed files with 407 additions and 145 deletions

View File

@@ -0,0 +1,136 @@
import React, { useState } from 'react';
import { X, Search } from 'lucide-react';
import { searchCards } from '../services/api';
import { Card } from '../types';
interface CardSearchModalProps {
isOpen: boolean;
onClose: () => void;
onSelectCard: (card: Card) => void;
}
export default function CardSearchModal({ isOpen, onClose, onSelectCard }: CardSearchModalProps) {
const [searchQuery, setSearchQuery] = useState('');
const [searchResults, setSearchResults] = useState<Card[]>([]);
const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
const handleSearch = async (e: React.FormEvent) => {
e.preventDefault();
if (!searchQuery.trim()) return;
setLoading(true);
setError(null);
try {
const cards = await searchCards(`name:${searchQuery}`);
setSearchResults(cards || []);
} catch (err) {
setError('Failed to fetch cards. Please try again.');
console.error('Error fetching cards:', err);
} finally {
setLoading(false);
}
};
const handleSelectCard = (card: Card) => {
onSelectCard(card);
onClose();
setSearchQuery('');
setSearchResults([]);
};
if (!isOpen) return null;
return (
<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center p-4 z-50">
<div className="bg-gray-800 rounded-lg max-w-4xl w-full max-h-[90vh] flex flex-col">
{/* Header */}
<div className="flex items-center justify-between p-4 border-b border-gray-700">
<h2 className="text-xl font-bold text-white">Search Card for Background</h2>
<button
onClick={onClose}
className="text-gray-400 hover:text-white transition-colors"
>
<X size={24} />
</button>
</div>
{/* Search Form */}
<div className="p-4 border-b border-gray-700">
<form onSubmit={handleSearch} className="flex gap-2">
<input
type="text"
value={searchQuery}
onChange={(e) => setSearchQuery(e.target.value)}
className="flex-1 px-4 py-2 bg-gray-900 border border-gray-700 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent text-white"
placeholder="Search for a card by name..."
autoFocus
/>
<button
type="submit"
className="px-6 py-2 bg-blue-600 hover:bg-blue-700 rounded-lg text-white flex items-center gap-2 transition-colors"
>
<Search size={20} />
Search
</button>
</form>
</div>
{/* Results */}
<div className="flex-1 overflow-y-auto p-4">
{loading && (
<div className="flex items-center justify-center h-32">
<div className="animate-spin rounded-full h-16 w-16 border-t-2 border-b-2 border-blue-500"></div>
</div>
)}
{error && (
<div className="bg-red-500/10 border border-red-500 rounded-lg p-4 text-red-400">
{error}
</div>
)}
{!loading && !error && searchResults.length === 0 && searchQuery && (
<div className="text-center text-gray-400 py-8">
No cards found. Try a different search term.
</div>
)}
{!loading && !error && searchResults.length === 0 && !searchQuery && (
<div className="text-center text-gray-400 py-8">
Search for a card to use as background
</div>
)}
{searchResults.length > 0 && (
<div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-4">
{searchResults.map((card) => (
<button
key={card.id}
onClick={() => handleSelectCard(card)}
className="bg-gray-700 rounded-lg overflow-hidden hover:ring-2 hover:ring-blue-500 transition-all transform hover:scale-105"
>
{card.image_uris?.art_crop ? (
<img
src={card.image_uris.art_crop}
alt={card.name}
className="w-full h-32 object-cover"
/>
) : (
<div className="w-full h-32 bg-gray-600 flex items-center justify-center">
<span className="text-gray-400 text-xs text-center px-2">No Image</span>
</div>
)}
<div className="p-2">
<p className="text-white text-sm font-medium truncate">{card.name}</p>
</div>
</button>
))}
</div>
)}
</div>
</div>
</div>
);
}

View File

@@ -1,167 +1,208 @@
import React, { useState, useEffect } from 'react'; import React, { useState } from 'react';
import { Plus, Minus } from 'lucide-react'; import { Users, RotateCcw, Settings } from 'lucide-react';
import PlayerLifeCounter from './PlayerLifeCounter';
import CardSearchModal from './CardSearchModal';
import { Card } from '../types';
interface Player { interface Player {
id: number; id: number;
name: string; name: string;
life: number; life: number;
color: string; backgroundImage?: string;
} }
const COLORS = ['white', 'blue', 'black', 'red', 'green']; const DEFAULT_STARTING_LIFE = 20;
export default function LifeCounter() { export default function LifeCounter() {
const [numPlayers, setNumPlayers] = useState<number | null>(null); const [players, setPlayers] = useState<Player[]>([
const [playerNames, setPlayerNames] = useState<string[]>([]); { id: 1, name: 'Player 1', life: DEFAULT_STARTING_LIFE },
const [players, setPlayers] = useState<Player[]>([]); { id: 2, name: 'Player 2', life: DEFAULT_STARTING_LIFE },
const [setupComplete, setSetupComplete] = useState(false); ]);
const [isCardSearchOpen, setIsCardSearchOpen] = useState(false);
useEffect(() => { const [selectedPlayerId, setSelectedPlayerId] = useState<number | null>(null);
if (numPlayers !== null) { const [showSettings, setShowSettings] = useState(false);
setPlayers( const [startingLife, setStartingLife] = useState(DEFAULT_STARTING_LIFE);
Array.from({ length: numPlayers }, (_, i) => ({
id: i + 1,
name: playerNames[i] || `Player ${i + 1}`,
life: 20,
color: COLORS[i % COLORS.length],
}))
);
}
}, [numPlayers, playerNames]);
const handleNumPlayersChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
const newNumPlayers = parseInt(e.target.value, 10);
setNumPlayers(newNumPlayers);
setPlayerNames(Array(newNumPlayers).fill(''));
};
const handleNameChange = (index: number, newName: string) => {
const updatedNames = [...playerNames];
updatedNames[index] = newName;
setPlayerNames(updatedNames);
};
const updateLife = (playerId: number, change: number) => { const updateLife = (playerId: number, change: number) => {
setPlayers((prevPlayers) => setPlayers((prevPlayers) =>
prevPlayers.map((player) => prevPlayers.map((player) =>
player.id === playerId ? { ...player, life: player.life + change } : player player.id === playerId ? { ...player, life: Math.max(0, player.life + change) } : player
) )
); );
}; };
const handleSubmit = (e: React.FormEvent) => { const changePlayerName = (playerId: number) => {
e.preventDefault(); const player = players.find((p) => p.id === playerId);
setSetupComplete(true); if (!player) return;
const newName = prompt('Enter new player name:', player.name);
if (newName && newName.trim()) {
setPlayers((prevPlayers) =>
prevPlayers.map((p) => (p.id === playerId ? { ...p, name: newName.trim() } : p))
);
}
}; };
const renderSetupForm = () => ( const openBackgroundSelector = (playerId: number) => {
<div className="max-w-md mx-auto"> setSelectedPlayerId(playerId);
<h2 className="text-2xl font-bold mb-6">Setup Players</h2> setIsCardSearchOpen(true);
<form onSubmit={handleSubmit} className="space-y-4"> };
const handleCardSelect = (card: Card) => {
if (selectedPlayerId !== null && card.image_uris?.art_crop) {
setPlayers((prevPlayers) =>
prevPlayers.map((p) =>
p.id === selectedPlayerId ? { ...p, backgroundImage: card.image_uris!.art_crop } : p
)
);
}
setSelectedPlayerId(null);
};
const changePlayerCount = (count: number) => {
const currentCount = players.length;
if (count > currentCount) {
// Add players
const newPlayers = Array.from({ length: count - currentCount }, (_, i) => ({
id: currentCount + i + 1,
name: `Player ${currentCount + i + 1}`,
life: startingLife,
}));
setPlayers([...players, ...newPlayers]);
} else if (count < currentCount) {
// Remove players
setPlayers(players.slice(0, count));
}
};
const resetAllLife = () => {
if (confirm(`Reset all players to ${startingLife} life?`)) {
setPlayers((prevPlayers) =>
prevPlayers.map((p) => ({ ...p, life: startingLife }))
);
}
};
const getGridClass = () => {
const count = players.length;
if (count === 1) return 'grid-cols-1';
if (count === 2) return 'grid-cols-1 md:grid-cols-2';
if (count === 3) return 'grid-cols-1 sm:grid-cols-2 lg:grid-cols-3';
if (count === 4) return 'grid-cols-2 lg:grid-cols-2';
if (count === 5) return 'grid-cols-2 lg:grid-cols-3';
if (count === 6) return 'grid-cols-2 lg:grid-cols-3';
if (count === 7 || count === 8) return 'grid-cols-2 lg:grid-cols-4';
return 'grid-cols-2 lg:grid-cols-4';
};
return (
<div className="min-h-screen bg-gray-900 text-white flex flex-col">
{/* Header */}
<div className="bg-gray-800 border-b border-gray-700 px-4 py-3 flex items-center justify-between">
<h1 className="text-xl md:text-2xl font-bold">Life Counter</h1>
<div className="flex items-center gap-2">
<button
onClick={resetAllLife}
className="bg-gray-700 hover:bg-gray-600 text-white rounded-lg px-3 py-2 text-sm flex items-center gap-2 transition-colors"
>
<RotateCcw size={18} />
<span className="hidden sm:inline">Reset</span>
</button>
<button
onClick={() => setShowSettings(!showSettings)}
className="bg-blue-600 hover:bg-blue-700 text-white rounded-lg px-3 py-2 text-sm flex items-center gap-2 transition-colors"
>
<Settings size={18} />
<span className="hidden sm:inline">Settings</span>
</button>
</div>
</div>
{/* Settings Panel */}
{showSettings && (
<div className="bg-gray-800 border-b border-gray-700 px-4 py-4 animate-fade-in">
<div className="max-w-4xl mx-auto grid grid-cols-1 md:grid-cols-2 gap-4">
{/* Player Count */}
<div> <div>
<label className="block text-sm font-medium text-gray-300 mb-2"> <label className="block text-sm font-medium text-gray-300 mb-2">
<Users size={16} className="inline mr-2" />
Number of Players Number of Players
</label> </label>
<select <div className="grid grid-cols-4 gap-2">
value={numPlayers || ''} {[2, 3, 4, 5, 6, 7, 8].map((count) => (
onChange={handleNumPlayersChange} <button
className="w-full px-4 py-2 bg-gray-800 border border-gray-700 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent text-white" key={count}
required onClick={() => changePlayerCount(count)}
className={`py-2 rounded-lg font-medium transition-colors ${
players.length === count
? 'bg-blue-600 text-white'
: 'bg-gray-700 text-gray-300 hover:bg-gray-600'
}`}
> >
<option value="" disabled>Select Number of Players</option> {count}
{[2, 3, 4, 5, 6].map((num) => ( </button>
<option key={num} value={num}>
{num}
</option>
))} ))}
</select> </div>
</div> </div>
{numPlayers !== null && {/* Starting Life */}
Array.from({ length: numPlayers }, (_, i) => ( <div>
<div key={i}>
<label className="block text-sm font-medium text-gray-300 mb-2"> <label className="block text-sm font-medium text-gray-300 mb-2">
Player {i + 1} Name Starting Life Total
</label> </label>
<input <div className="grid grid-cols-4 gap-2">
type="text" {[20, 30, 40].map((life) => (
value={playerNames[i] || ''} <button
onChange={(e) => handleNameChange(i, e.target.value)} key={life}
className="w-full px-4 py-2 bg-gray-800 border border-gray-700 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent text-white" onClick={() => {
placeholder={`Player ${i + 1} Name`} setStartingLife(life);
/> if (confirm(`Change starting life to ${life}? This will reset all players.`)) {
</div> setPlayers((prevPlayers) =>
prevPlayers.map((p) => ({ ...p, life }))
);
}
}}
className={`py-2 rounded-lg font-medium transition-colors ${
startingLife === life
? 'bg-green-600 text-white'
: 'bg-gray-700 text-gray-300 hover:bg-gray-600'
}`}
>
{life}
</button>
))} ))}
</div>
{numPlayers !== null && ( </div>
<button </div>
type="submit" </div>
className="w-full px-4 py-2 bg-blue-600 hover:bg-blue-700 rounded-lg"
>
Start Game
</button>
)} )}
</form>
</div>
);
const renderLifeCounters = () => ( {/* Life Counter Grid */}
<div className="flex flex-col items-center justify-center min-h-screen"> <div className={`flex-1 grid ${getGridClass()} gap-2 md:gap-4 p-2 md:p-4`}>
<div className="relative w-full h-full"> {players.map((player) => (
{players.map((player, index) => { <PlayerLifeCounter
const angle = (index / players.length) * 360;
const rotation = 360 - angle;
const x = 50 + 40 * Math.cos((angle - 90) * Math.PI / 180);
const y = 50 + 40 * Math.sin((angle - 90) * Math.PI / 180);
return (
<div
key={player.id} key={player.id}
className="absolute transform -translate-x-1/2 -translate-y-1/2" id={player.id}
style={{ name={player.name}
top: `${y}%`, life={player.life}
left: `${x}%`, backgroundImage={player.backgroundImage}
transform: `translate(-50%, -50%) rotate(${rotation}deg)`, onLifeChange={(change) => updateLife(player.id, change)}
}} onChangeName={() => changePlayerName(player.id)}
> onChangeBackground={() => openBackgroundSelector(player.id)}
<div />
className="rounded-lg p-4 flex flex-col items-center" ))}
style={{
backgroundColor: `var(--color-${player.color}-primary)`,
color: 'white',
transform: `rotate(${-rotation}deg)`,
}}
>
<h2 className="text-xl font-bold mb-4">{player.name}</h2>
<div className="text-4xl font-bold mb-4">{player.life}</div>
<div className="flex gap-4">
<button
onClick={() => updateLife(player.id, 1)}
className="bg-green-600 hover:bg-green-700 rounded-full p-2"
>
<Plus size={24} />
</button>
<button
onClick={() => updateLife(player.id, -1)}
className="bg-red-600 hover:bg-red-700 rounded-full p-2"
>
<Minus size={24} />
</button>
</div> </div>
</div>
</div>
);
})}
</div>
</div>
);
return ( {/* Card Search Modal */}
<div className="min-h-screen bg-gray-900 text-white p-6"> <CardSearchModal
<div className="max-w-7xl mx-auto"> isOpen={isCardSearchOpen}
<h1 className="text-3xl font-bold mb-6">Life Counter</h1> onClose={() => {
{!setupComplete ? renderSetupForm() : renderLifeCounters()} setIsCardSearchOpen(false);
</div> setSelectedPlayerId(null);
}}
onSelectCard={handleCardSelect}
/>
</div> </div>
); );
} }

View File

@@ -0,0 +1,85 @@
import React from 'react';
import { Plus, Minus, Image as ImageIcon } from 'lucide-react';
interface PlayerLifeCounterProps {
id: number;
name: string;
life: number;
backgroundImage?: string;
onLifeChange: (change: number) => void;
onChangeName: () => void;
onChangeBackground: () => void;
}
export default function PlayerLifeCounter({
name,
life,
backgroundImage,
onLifeChange,
onChangeName,
onChangeBackground,
}: PlayerLifeCounterProps) {
return (
<div className="relative h-full rounded-lg overflow-hidden shadow-lg">
{/* Background Image */}
{backgroundImage ? (
<div
className="absolute inset-0 bg-cover bg-center"
style={{ backgroundImage: `url(${backgroundImage})` }}
>
<div className="absolute inset-0 bg-gradient-to-b from-black/60 via-black/50 to-black/70"></div>
</div>
) : (
<div className="absolute inset-0 bg-gradient-to-br from-gray-700 via-gray-800 to-gray-900"></div>
)}
{/* Content */}
<div className="relative h-full flex flex-col items-center justify-between p-4 md:p-6">
{/* Player Name */}
<button
onClick={onChangeName}
className="text-white font-bold text-lg md:text-xl hover:text-blue-300 transition-colors px-4 py-2 rounded-lg hover:bg-white/10"
>
{name}
</button>
{/* Life Total */}
<div className="flex flex-col items-center justify-center flex-1">
<div className="text-6xl sm:text-7xl md:text-8xl lg:text-9xl font-bold text-white drop-shadow-2xl">
{life}
</div>
</div>
{/* Controls */}
<div className="flex flex-col gap-3 w-full">
{/* Life Buttons */}
<div className="flex gap-3 w-full">
<button
onClick={() => onLifeChange(-1)}
className="flex-1 bg-red-600 hover:bg-red-700 text-white rounded-lg py-3 md:py-4 px-4 font-bold text-xl transition-colors active:scale-95 flex items-center justify-center gap-2"
>
<Minus size={24} />
<span className="hidden sm:inline">-1</span>
</button>
<button
onClick={() => onLifeChange(1)}
className="flex-1 bg-green-600 hover:bg-green-700 text-white rounded-lg py-3 md:py-4 px-4 font-bold text-xl transition-colors active:scale-95 flex items-center justify-center gap-2"
>
<Plus size={24} />
<span className="hidden sm:inline">+1</span>
</button>
</div>
{/* Background Button */}
<button
onClick={onChangeBackground}
className="w-full bg-blue-600 hover:bg-blue-700 text-white rounded-lg py-2 px-4 text-sm transition-colors flex items-center justify-center gap-2"
>
<ImageIcon size={16} />
Change Background
</button>
</div>
</div>
</div>
);
}