From 11a6eebf7245d5b4c62b57a9978dfb9aa43778bb Mon Sep 17 00:00:00 2001
From: Jonni Liljamo <jonni@liljamo.com>
Date: Mon, 8 May 2023 12:34:39 +0300
Subject: [PATCH] feat(client): game ui plugin, ui -> details_ui

---
 api/docker-compose.yaml           |  1 +
 client/src/plugins/game/mod.rs    |  4 ++--
 client/src/plugins/game/ui/mod.rs | 15 +++++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/api/docker-compose.yaml b/api/docker-compose.yaml
index 6a3ad4f..c379597 100644
--- a/api/docker-compose.yaml
+++ b/api/docker-compose.yaml
@@ -33,6 +33,7 @@ services:
       - internal
     ports:
       - "8080:3000"
+      - "3000:3000"
     environment:
       GIN_MODE: "release" # or "debug" for debug logs
       LAURELINAPI_JWT_SECRET: "XpNYdG7vgvgPPuezrtZqt4CJIUuxNP7c"
diff --git a/client/src/plugins/game/mod.rs b/client/src/plugins/game/mod.rs
index aab4d6e..7eaf7d4 100644
--- a/client/src/plugins/game/mod.rs
+++ b/client/src/plugins/game/mod.rs
@@ -19,8 +19,8 @@ pub struct GamePlugin;
 impl Plugin for GamePlugin {
     fn build(&self, app: &mut App) {
         app.insert_resource(GameData::default())
-            .add_system(game_setup.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(ui::ui.run_if(in_state(AppState::InGame)));
+            .add_plugin(ui::GameUIPlugin)
+            .add_system(game_setup.in_schedule(OnEnter(AppState::InGame)));
     }
 }
 
diff --git a/client/src/plugins/game/ui/mod.rs b/client/src/plugins/game/ui/mod.rs
index fee80e4..d41e86d 100644
--- a/client/src/plugins/game/ui/mod.rs
+++ b/client/src/plugins/game/ui/mod.rs
@@ -9,15 +9,22 @@
 use bevy::prelude::*;
 use bevy_egui::{egui, EguiContexts};
 
-use crate::{plugins::{GameDetailsCallEvent, GameActionCreateCallEvent}, Global, api::game::{Action, Command, Game}, game_status::{Card, PlayerState}};
+use crate::{plugins::{GameDetailsCallEvent, GameActionCreateCallEvent}, Global, api::game::{Action, Command, Game}, game_status::{Card, PlayerState}, AppState};
 
 use super::GameData;
 
-pub fn ui(
-    mut commands: Commands,
+pub struct GameUIPlugin;
+
+impl Plugin for GameUIPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_system(details_ui.run_if(in_state(AppState::InGame)));
+    }
+}
+
+pub fn details_ui(
     mut contexts: EguiContexts,
     global: Res<Global>,
-    mut game_data: ResMut<GameData>,
+    game_data: Res<GameData>,
     mut details_ev_w: EventWriter<GameDetailsCallEvent>,
     mut create_action_ev_w: EventWriter<GameActionCreateCallEvent>,
 ) {
-- 
2.44.1