Darkmode beta

src/main/java/eric/Roullette/App.java

@@ -23,12 +23,13 @@ public class App {
         if (cfg.spotifyClientId == null || cfg.spotifyClientSecret == null || cfg.spotifyRedirectUri == null) {
             throw new IllegalStateException("Spotify-Konfiguration fehlt: Bitte stelle sicher, dass ClientId, ClientSecret und RedirectUri gesetzt sind.");
         }
-        GameService gs = new GameService();
+
         SpotifyAuthService sas = new SpotifyAuthService(
                 cfg.spotifyClientId,
                 cfg.spotifyClientSecret,
                 cfg.spotifyRedirectUri
         );
+        GameService gs = new GameService(sas);
 
         Javalin app = Javalin.create(config -> {
             config.showJavalinBanner = false;

src/main/java/eric/Roullette/service/GameService.java

@@ -1,24 +1,28 @@
 package eric.Roullette.service;
 
-import eric.Roullette.dto.PlayersMessage;
+    import eric.Roullette.dto.PlayersMessage;
-import eric.Roullette.util.JsonUtil;
+    import eric.Roullette.util.JsonUtil;
-import io.javalin.websocket.WsContext;
+    import io.javalin.websocket.WsContext;
-import org.slf4j.Logger;
+    import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+    import org.slf4j.LoggerFactory;
-import java.util.*;
+    import java.util.*;
-import java.util.concurrent.*;
+    import java.util.concurrent.*;
 
-public class GameService {
+    public class GameService {
         private static final Logger log = LoggerFactory.getLogger(GameService.class);
+        private final SpotifyAuthService authService;
         private final Map<String, Set<WsContext>> sessions = new ConcurrentHashMap<>();
         private final Map<String, Game> games        = new ConcurrentHashMap<>();
 
-    public record Game(String id, List<String> players, Map<String,Integer> scores,String currentOwner,
+        public GameService(SpotifyAuthService authService) { // <-- Konstruktor
-                       String currentSong,List<String> allTracks) {
+            this.authService = authService;
-        public static Game create(String id) {
-            return new Game(id, new CopyOnWriteArrayList<>(), new ConcurrentHashMap<>(), null, null, new ArrayList<>());
         }
 
+        public record Game(String id, List<String> players, Map<String,Integer> scores, String currentOwner,
+                           String currentSong, List<String> allTracks, Map<String, List<String>> playerTracks) {
+            public static Game create(String id) {
+                return new Game(id, new CopyOnWriteArrayList<>(), new ConcurrentHashMap<>(), null, null, new ArrayList<>(), new ConcurrentHashMap<>());
+            }
         }
 
         public Game getOrCreateGame(String gameId) {
@@ -30,6 +34,9 @@ public class GameService {
             if (user != null && !g.players().contains(user)) {
                 g.players().add(user);
                 g.scores().putIfAbsent(user, 0);
+                // Songs einmalig laden und speichern
+                List<String> tracks = authService.getRecentTracks(user);
+                g.playerTracks().put(user, tracks);
             }
         }
 
@@ -54,25 +61,25 @@ public class GameService {
         }
 
         public void createGame(String gameId) {
-        Game game = new Game(gameId, new CopyOnWriteArrayList<>(), new ConcurrentHashMap<>(), null, null, new ArrayList<>());
+            Game game = new Game(gameId, new CopyOnWriteArrayList<>(), new ConcurrentHashMap<>(), null, null, new ArrayList<>(), new ConcurrentHashMap<>());
             games.put(gameId, game);
         }
 
         public boolean gameExists(String gameId) {
             return games.containsKey(gameId);
         }
+
         public Game startRound(String gameId, List<String> uris) {
             Game g = getOrCreateGame(gameId);
             if (g.players().isEmpty()) throw new IllegalStateException("No players");
             String owner = g.players().get(ThreadLocalRandom.current().nextInt(g.players().size()));
             String song  = uris.get(ThreadLocalRandom.current().nextInt(uris.size()));
-        Game updated = new Game(gameId, g.players(), g.scores(), owner, song, uris);
+            Game updated = new Game(gameId, g.players(), g.scores(), owner, song, uris, g.playerTracks());
             games.put(gameId, updated);
             return updated;
         }
-    // In GameService.java
+
         public Set<WsContext> getSessions(String gameId) {
             return sessions.getOrDefault(gameId, Collections.emptySet());
         }
-
+    }
-}

src/main/java/eric/Roullette/websocket/GameWebSocketHandler.java

@@ -78,7 +78,7 @@ public class GameWebSocketHandler {
                     // Songs von allen Spielern sammeln
                     List<String> allTracks = new ArrayList<>();
                     for (String player : game.players()) {
-                        allTracks.addAll(authService.getRecentTracks(player));
+                        allTracks.addAll(game.playerTracks().getOrDefault(player, List.of()));
                     }
                     if (allTracks.isEmpty()) {
                         // TODO: Fehler an Client senden, dass keine Songs da sind
@@ -90,6 +90,17 @@ public class GameWebSocketHandler {
                     // Jetzt Broadcast mit den aktuellen Daten
                     broadcastRoundStart(gameId);
                 }
+                case "next-round" -> {
+                    var currentGame = service.getOrCreateGame(gameId);
+                    List<String> allTracks = new ArrayList<>();
+                    for (String player : currentGame.players()) {
+                        allTracks.addAll(authService.getRecentTracks(player));
+                    }
+                    if (!allTracks.isEmpty()) {
+                        service.startRound(gameId, allTracks);
+                    }
+                    broadcastRoundStart(gameId);
+                }
             }
         });
     }

src/main/resources/public/game.html

@@ -7,12 +7,13 @@
     <style>
         :root {
             --primary-color: #1DB954;
-            --bg-light: #f2f2f2;
+            --bg-light: #121212;      /* vorher: #f2f2f2 */
-            --bg-dark: #121212;
+            --bg-dark: #000000;       /* vorher: #121212 */
-            --text-light: #ffffff;
+            --text-light: #eaeaea;    /* vorher: #ffffff */
-            --text-dark: #333333;
+            --text-dark: #eaeaea;     /* vorher: #333333 */
             --accent: #191414;
-            --option-circle-size: 250px;
+            --option-circle-size: 80%;
+            --option-max-size: 400px;
             --option-radius: 120px;
         }
         * { box-sizing: border-box; margin: 0; padding: 0; }
@@ -79,7 +80,8 @@
         /* Rundenbereich */
         #roundArea {
             margin-top: 1rem;
-            background: var(--text-light);
+            background: var(--bg-dark);
+            color: var(--text-light);
             padding: 0.7rem 1rem;
             border-radius: 6px;
             box-shadow: 0 2px 8px rgba(0,0,0,0.1);
@@ -139,6 +141,7 @@
             <!-- Buttons zu Auswahl verteilen: JS erzeugt <button class="player-option">Name</button> -->
         </div>
         <div id="result"></div>
+        <button id="nextRound" hidden>Weiter</button>
     </section>
     <section>
         <div class="section-title">Scoreboard</div>

src/main/resources/public/js/game.js

@@ -188,12 +188,18 @@ function handleRoundResult({ scores, guesses, owner }) {
         resultP.appendChild(p);
     });
 
-    setTimeout(() => {
+    const nextBtn = document.getElementById("nextRound");
+    nextBtn.hidden = false;
+    nextBtn.disabled = false;
+    nextBtn.onclick = () => {
+        socket.send(JSON.stringify({ type: "next-round" }));
+        nextBtn.hidden = true;
+        nextBtn.disabled = true;
         resultP.textContent = "";
         startBtn.hidden = true;
         startBtn.disabled = true;
         roundArea.hidden = true;
-    }, 3000);
+    };
 }
 
 function handleGameEnd({winner}) {

src/test/java/eric/Roullette/service/GameServiceTest.java

@@ -1,4 +1,4 @@
-// src/test/java/eric/roulette/service/GameServiceTest.java
+// src/test/java/eric/Roullette/service/GameServiceTest.java
 package eric.Roullette.service;
 
 import org.junit.jupiter.api.Test;
@@ -9,7 +9,9 @@ class GameServiceTest {
 
     @Test
     void testGetOrCreateGame() {
-        GameService service = new GameService();
+        // Dummy-Parameter für SpotifyAuthService
+        SpotifyAuthService sas = new SpotifyAuthService("dummy", "dummy", "http://localhost");
+        GameService service = new GameService(sas);
         // Erstes Mal anlegen
         GameService.Game g1 = service.getOrCreateGame("g1");
         assertNotNull(g1);
@@ -18,18 +20,4 @@ class GameServiceTest {
         GameService.Game g2 = service.getOrCreateGame("g1");
         assertSame(g1, g2);
     }
-
-//    @Test
-//    void testAddPlayerAndScores() {
-//        GameService service = new GameService();
-//        service.getOrCreateGame("g2");               // Spiel anlegen
-//        service.addPlayer("g2", "Alice");            // Spieler hinzufügen
-//        GameService.Game game = service.getOrCreateGame("g2");
-//        // Spieler-Liste korrekt
-//        assertTrue(game.players().contains("Alice"));
-//        assertEquals(1, game.players().size());
-//        // Score für neuen Spieler initial 0
-//        assertEquals(0, game.scores().get("Alice").intValue());
-//        // Duplikate vermeiden
-//        }
 }