Removed faulty test

App should now start in fullscreen instead of windowed.

.github/workflows/dispatcher.yml

@@ -16,6 +16,7 @@ jobs:
       server: ${{ steps.check.outputs.server }}
       ui: ${{ steps.check.outputs.ui }}
     steps:
+      - uses: actions/checkout@v4
       - name: Determine which tests to run
         id: check
         run: |
@@ -26,13 +27,13 @@ jobs:
           SERVER=false
           UI=false
 
-          if [[ "$BRANCH" == *"Engine"* ]]; then
+          if [[ "$BRANCH" == *"Engine"* ]] ; then
             ENGINE=true
           fi
-          if [[ "$BRANCH" == *"Server"* ]]; then
+          if [[ "$BRANCH" == *"Server"* ]] ; then
             SERVER=true
           fi
-          if [[ "$BRANCH" == *"UI"* ]]; then
+          if [[ "$BRANCH" == *"UI"* ]] ; then
             UI=true
           fi
 
@@ -90,6 +91,3 @@ jobs:
           cd "$GITHUB_WORKSPACE"
           git clean -fdx
           git reset --hard
-
-
-

.github/workflows/engine_test.yml

@@ -1,7 +1,6 @@
 name: Engine Tests
 
 on:
-  pull_request:
   workflow_dispatch:
   workflow_call:
 
@@ -10,8 +9,6 @@ jobs:
     runs-on: self-hosted
 
     steps:
-      - uses: actions/checkout@v4
-
       - name: Run Engine tests
         run: |
           bash .github/workflows/test.sh engine/

.github/workflows/release.yml

@@ -1,7 +1,6 @@
 name: Release build
 
 on:
-  pull_request:
   workflow_dispatch:
   workflow_call:
 
@@ -102,5 +101,3 @@ jobs:
             release/windows.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-

.github/workflows/server_test.yml

@@ -1,7 +1,6 @@
 name: Server Tests
 
 on:
-  pull_request:
   workflow_dispatch:
   workflow_call:
 
@@ -10,8 +9,6 @@ jobs:
     runs-on: self-hosted
 
     steps:
-      - uses: actions/checkout@v4
-
       - name: Run Server tests
         run: |
           bash .github/workflows/test.sh server/

.github/workflows/test.sh

@@ -30,8 +30,13 @@ echo "$PROJECT_NAME" > "$LOG_FILE"
 awk '/^running [0-9]+ test[s]?$/,/^$/' full_test_output.log >> "$LOG_FILE"
 
 # --- APPEND TO GLOBAL LOG (in repo root) ---
+if [[ $(git rev-parse --abbrev-ref HEAD) == "master" ]]; then 
+  echo "master" >> $FINAL_LOG
+fi
 cat "$LOG_FILE" >> "$FINAL_LOG"
 
 # --- SUMMARY ---
 echo ">>> Test output extracted to $PROJECT_PATH/$LOG_FILE"
 echo ">>> Appended to $FINAL_LOG"
+
+cat $(git rev-parse --show-toplevel)/test_data.log

.github/workflows/ui_test.yml

@@ -1,7 +1,6 @@
 name: UI Tests
 
 on:
-  pull_request:
   workflow_dispatch:
   workflow_call:
 
@@ -10,8 +9,6 @@ jobs:
     runs-on: self-hosted
 
     steps:
-      - uses: actions/checkout@v4
-
       - name: Run UI tests
         run: |
           bash .github/workflows/test.sh ui/

.github/workflows/upload_data.yml

@@ -20,33 +20,77 @@ jobs:
           echo "$GOOGLE_SERVICE_ACCOUNT_JSON" > service_account.json
           
           python <<'PYCODE'
-          import gspread, json, time, subprocess
+          import gspread, json, subprocess
 
-          # credentials
           creds = json.load(open("service_account.json"))
           gc = gspread.service_account_from_dict(creds)
           sh = gc.open_by_key("${{ secrets.SPREADSHEET_ID }}")
           v = subprocess.run(['git','rev-parse','--show-toplevel'], capture_output=True).stdout.decode().strip()
           print(f"{v}/test_data.log")
 
+
+          def writeRowsToSpreadsheet(data_list, worksheet):
+              existing_rows = len(worksheet.get_all_values())
+              start_row = existing_rows + 3
+              rows_to_append = [row.split() for row in data_list]
+              print("rows to append")
+              print(f"{rows_to_append}")
+
+              for i, row in enumerate(rows_to_append):
+                  worksheet.insert_row(row, start_row + i)
+
+
           with open(f"{v}/test_data.log", "r") as f:
               lines = [line.strip() for line in f if line.strip()]
 
+          isMaster = False
           project = lines[0].lower()
-          worksheet = sh.worksheet(project)
+          if project == "master":
+              isMaster = True
+          
+          engine_data = []
+          server_data = []
+          ui_data = []
+          master_data = []
 
-          # project name
-          data = lines[1:]
+          for entry in lines:
+              if not isMaster and entry == "engine":
+                  project = "engine"
+              elif not isMaster and entry == "server":
+                  project = "server"
+              elif not isMaster and entry == "ui":
+                  project = "ui"
 
-          #blank rows
-          existing_rows = len(worksheet.get_all_values())
-          start_row = existing_rows + 3
+              if project == "engine" and entry != "engine":
+                  engine_data.append(entry)
+              elif project == "server" and entry != "server":
+                  server_data.append(entry)
+              elif project == "ui" and entry != "ui":
+                  ui_data.append(entry)
+              elif project == "master" and entry != "master":
+                  master_data.append(entry)
 
-          # Split data into columns (by spaces)
-          rows_to_append = [row.split() for row in data]
+          print("PRINTING FILTERED DATA\n\n")
+          print(f"engine\n{engine_data}")
+          print(f"server\n{server_data}")
+          print(f"ui\n{ui_data}")
+          print(f"master\n{master_data}")
+          print("\n\n\n")
 
-          for i, row in enumerate(rows_to_append):
-              worksheet.insert_row(row, start_row + i)
+          if isMaster and len(master_data) != 0:
+              print("uploading to master tab")
+              worksheet = sh.worksheet("master")
+              writeRowsToSpreadsheet(master_data, worksheet)
+              exit(0)
+
+          if len(engine_data) != 0:
+              print("uploading to engine tab")
+              writeRowsToSpreadsheet(engine_data, sh.worksheet("engine"))
+          if len(server_data) != 0:
+              print("uploading to server tab")
+              writeRowsToSpreadsheet(server_data, sh.worksheet("server"))
+          if len(ui_data) != 0:
+              print("uploading to ui tab")
+              writeRowsToSpreadsheet(ui_data, sh.worksheet("ui"))
 
-          print(f"Uploaded {len(rows_to_append)} rows to '{project}' tab.")
           PYCODE

engine/Cargo.toml

@@ -4,3 +4,4 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+once_cell = "1.19"

engine/src/bitboard.rs

@@ -0,0 +1 @@
+mod attackmaps;

engine/src/bitboard/attackmaps.rs

@@ -0,0 +1,252 @@
+use once_cell::sync::Lazy;
+
+const A_FILE: u64 = 0x0101_0101_0101_0101;
+const H_FILE: u64 = 0x8080_8080_8080_8080;
+const AB_FILE: u64 = 0x0303_0303_0303_0303;
+const GH_FILE: u64 = 0xC0C0_C0C0_C0C0_C0C0;
+
+/*
+ EXPLANATIONS:
+ > square_index: 8 * rank number + file number (a-h = 0-7)
+ > side: white = 0, black = 1
+ > direction_index: 0..8 = [E, NE, N, NW, W, SW, S, SE]
+*/
+
+// KING_ATTACK_MAP[<square_index>]
+pub static KING_ATTACK_MAP: Lazy<[u64; 64]> = Lazy::new(|| {
+  let mut table: [u64; 64] = [0u64; 64];
+
+  for sq in 0..64 {
+    let king: u64 = 1 << sq;
+
+    let left_attacks: u64 = king << 7 | king >> 1 | king >> 9;
+    let right_attacks: u64 = king << 1 | king << 9 | king >> 7;
+
+    table[sq] = (left_attacks & !H_FILE) | (right_attacks & !A_FILE) | king << 8 | king >> 8;
+  }
+  return table;
+});
+
+// PAWN_ATTACK_MAP[<square_index>][<side>]
+pub static PAWN_ATTACK_MAP: Lazy<[[u64; 2]; 64]> = Lazy::new(|| {
+  let mut table: [[u64; 2]; 64] = [[0u64; 2]; 64];
+
+  for sq in 0..64 {
+    let pawn: u64 = 1 << sq;
+    table[sq][0] |= (pawn << 9) & !A_FILE;
+    table[sq][0] |= (pawn << 7) & !H_FILE;
+  }
+  for sq in 0..64 {
+    let pawn: u64 = 1 << sq;
+    table[sq][1] |= (pawn >> 9) & !H_FILE;
+    table[sq][1] |= (pawn >> 7) & !A_FILE;
+  }
+  return table;
+});
+
+// KNIGHT_ATTACK_MAP[<square_index>]
+pub static KNIGHT_ATTACK_MAP: Lazy<[u64; 64]> = Lazy::new(|| {
+  let mut table: [u64; 64] = [0u64; 64];
+
+  for sq in 0..64 {
+    let knight: u64 = 1 << sq;
+
+    let far_left_attacks: u64 = knight << 6 | knight >> 10;
+    let near_left_attacks: u64 = knight << 15 | knight >> 17;
+    let far_right_attacks: u64 = knight << 10 | knight >> 6;
+    let near_right_attacks: u64 = knight << 17 | knight >> 15;
+
+    table[sq] = (far_left_attacks & !GH_FILE) | (far_right_attacks & !AB_FILE) | (near_left_attacks & !H_FILE) | (near_right_attacks & !A_FILE);
+  }
+  return table;
+});
+
+// RAY_TABLE[<square_index>][<direction_index>]
+pub static RAY_TABLE: Lazy<[[u64; 8]; 64]> = Lazy::new(|| {
+  let mut table: [[u64; 8]; 64] = [[0u64; 8]; 64];
+  let dirs: [i8; 8] = [1, 9, 8, 7, -1, -9, -8, -7];
+  for sq in 0..64 {
+    for d in 0..8 {
+      let mut ray: u64 = 0u64;
+      let origin: u64 = 1 << sq;
+      let mut new_target: u64 =  if dirs[d] > 0 {origin << dirs[d]} else {origin >> -dirs[d]};
+      if [0, 1, 7].contains(&d) {
+        new_target &= !A_FILE;
+      }
+      else if [3, 4, 5].contains(&d) {
+        new_target &= !H_FILE;
+      }
+      while new_target != 0 {
+        ray |= new_target;
+
+        new_target =  if dirs[d] > 0 {new_target << dirs[d]} else {new_target >> -dirs[d]};
+        if [0, 1, 7].contains(&d) {
+          new_target &= !A_FILE;
+        }
+        else if [3, 4, 5].contains(&d) {
+          new_target &= !H_FILE;
+        }
+      }
+      table[sq][d] = ray;
+    }
+  }
+
+  return table;
+});
+
+
+
+// <----- TESTS ----->
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+  #[test]
+  fn test_king_attack_map() {
+
+    // test setup for corners [SW, SE, NW, NE]
+    let corner_indexes: [usize; 4] = [0, 7, 56, 63];
+    let corner_attack_maps: [u64; 4] = [
+      (1u64 << 1) | (1u64 << 8) | (1u64 << 9),
+      (1u64 << 6) | (1u64 << 14) | (1u64 << 15),
+      (1u64 << 48) | (1u64 << 49) | (1u64 << 57),
+      (1u64 << 54) | (1u64 << 55) | (1u64 << 62)
+    ];
+
+    // tests for corners
+    for index in 0..4 {
+      assert_eq!(KING_ATTACK_MAP[corner_indexes[index]], corner_attack_maps[index]);
+    }
+
+    // test setup for sides [S, E, W, N]
+    let side_indexes: [usize; 4] = [3, 31, 32, 60];
+    let side_attack_maps: [u64; 4] = [
+      (1 << 2) | (1 << 4) | (1 << 10) | (1 << 11) | (1 << 12),
+      (1 << 22) | (1 << 23) | (1 << 30) | (1 << 38) | (1 << 39),
+      (1 << 24) | (1 << 25) | (1 << 33) | (1 << 40) | (1 << 41),
+      (1 << 51) | (1 << 52) | (1 << 53) | (1 << 59) | (1 << 61)
+    ];
+
+    // tests for sides
+    for index in 0..4 {
+      assert_eq!(KING_ATTACK_MAP[side_indexes[index]], side_attack_maps[index]);
+    }
+
+    // test setup for center
+    let center_index: usize = 27;
+    let center_attack_map: u64 = (1 << 18) | (1 << 19) | (1 << 20) | (1 << 26) | (1 << 28) | (1 << 34) | (1 << 35) | (1 << 36);
+
+    // test for center
+    assert_eq!(KING_ATTACK_MAP[center_index], center_attack_map);
+
+  }
+
+  #[test]
+  fn test_pawn_attack_map() {
+
+    // test setup for white sides
+    let white_side_indexes: [usize; 2] = [24, 31];
+    let white_side_attack_maps: [u64; 2] = [
+      (1 << 33),
+      (1 << 38)
+    ];
+    // tests for white sides
+    for index in 0..2 {
+      assert_eq!(PAWN_ATTACK_MAP[white_side_indexes[index]][0], white_side_attack_maps[index])
+    }
+
+    // test setup for black sides
+    let black_side_indexes: [usize; 2] = [32, 39];
+    let black_side_attack_maps: [u64; 2] = [
+      (1 << 25),
+      (1 << 30)
+    ];
+    // tests for black sides
+    for index in 0..2 {
+      assert_eq!(PAWN_ATTACK_MAP[black_side_indexes[index]][1], black_side_attack_maps[index])
+    }
+
+    // test setup for white center
+    let white_center_indexes: [usize; 2] = [11, 12];
+    let white_center_attack_maps: [u64; 2] = [
+      (1 << 18) | (1 << 20),
+      (1 << 19) | (1 << 21)
+    ];
+    // tests for white center
+    for index in 0..2 {
+      assert_eq!(PAWN_ATTACK_MAP[white_center_indexes[index]][0], white_center_attack_maps[index])
+    }
+
+    // test setup for black center
+    let black_center_indexes: [usize; 2] = [51, 52];
+    let black_center_attack_maps: [u64; 2] = [
+      (1 << 42) | (1 << 44),
+      (1 << 43) | (1 << 45)
+    ];
+    // tests for black center
+    for index in 0..2 {
+      assert_eq!(PAWN_ATTACK_MAP[black_center_indexes[index]][1], black_center_attack_maps[index])
+    }
+  }
+
+  #[test]
+  fn test_knight_attack_map() {
+    // test setup for corners [SW, SE, NW, NE]
+    let corner_indexes: [usize; 4] = [0, 7, 56, 63];
+    let corner_attack_maps: [u64; 4] = [
+      (1 << 17) | (1 << 10),
+      (1 << 13) | (1 << 22),
+      (1 << 41) | (1 << 50),
+      (1 << 46) | (1 << 53)
+    ];
+
+    // tests for corners
+    for index in 0..4 {
+      assert_eq!(KNIGHT_ATTACK_MAP[corner_indexes[index]], corner_attack_maps[index]);
+    }
+
+    // test setup for sides [S, E, W, N]
+    let side_indexes: [usize; 4] = [3, 31, 32, 60];
+    let side_attack_maps: [u64; 4] = [
+      (1 << 9) | (1 << 13) | (1 << 18) | (1 << 20),
+      (1 << 14) | (1 << 21) | (1 << 37) | (1 << 46),
+      (1 << 17) | (1 << 26) | (1 << 42) | (1 << 49),
+      (1 << 43) | (1 << 45) | (1 << 50) | (1 << 54)
+    ];
+
+    // tests for sides
+    for index in 0..4 {
+      assert_eq!(KNIGHT_ATTACK_MAP[side_indexes[index]], side_attack_maps[index]);
+    }
+
+    // test setup for center
+    let center_index: usize = 27;
+    let center_attack_map: u64 = (1 << 10) | (1 << 12) | (1 << 17) | (1 << 21) | (1 << 33) | (1 << 37) | (1 << 42) | (1 << 44);
+
+    // test for center
+    assert_eq!(KNIGHT_ATTACK_MAP[center_index], center_attack_map);
+  }
+
+  #[test]
+  fn test_ray_table() {
+
+    // test setup for all directions from center
+    let starting_square_index: usize = 27;
+    let ray_masks: [u64; 8] = [
+      (1 << 28) | (1 << 29) | (1 << 30) | (1 << 31),
+      (1 << 36) | (1 << 45) | (1 << 54) | (1 << 63),
+      (1 << 35) | (1 << 43) | (1 << 51) | (1 << 59),
+      (1 << 34) | (1 << 41) | (1 << 48),
+      (1 << 26) | (1 << 25) | (1 << 24),
+      (1 << 18) | (1 << 9) | (1 << 0),
+      (1 << 19) | (1 << 11) | (1 << 3),
+      (1 << 20) | (1 << 13) | (1 << 6)
+    ];
+
+    // tests for all directions from starting_square
+    for direction in 0..8 {
+      assert_eq!(RAY_TABLE[starting_square_index][direction], ray_masks[direction]);
+    }
+  }
+}

engine/src/main.rs

@@ -1,3 +1,5 @@
+mod bitboard;
+
 fn main() {
     println!("Hello, world!");
 }

ui/Cargo.toml

@@ -4,3 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+eframe = "0.33.0"
+egui = "0.33.0"
+tokio-tungstenite = "0.28.0"
+winit = "0.30.12"

ui/src/main.rs

@@ -1,3 +1,430 @@
-fn main() {
-    println!("Hello, world!");
+use eframe::egui;
+
+fn main() -> eframe::Result<()> {
+    let options = eframe::NativeOptions{
+        viewport: egui::ViewportBuilder::default()
+            .with_fullscreen(false)
+            .with_min_inner_size(egui::vec2(800.0, 600.0)) // Minimum width, height
+            .with_inner_size(egui::vec2(7680.0, 4320.0)), // Initial size
+        ..Default::default()
+    };
+    eframe::run_native(
+    "Knightly",
+    options,
+    Box::new(|cc| {
+        let mut fonts = egui::FontDefinitions::default();
+        fonts.font_data.insert(
+            "symbols".to_owned(),
+            egui::FontData::from_static(include_bytes!("../fonts/DejaVuSans.ttf")).into(),
+        );
+        fonts
+            .families
+            .entry(egui::FontFamily::Proportional)
+            .or_default()
+            .insert(0, "symbols".to_owned());
+        cc.egui_ctx.set_fonts(fonts);
+        Ok(Box::new(ChessApp::default()))
+    }),
+)
+}
+
+#[derive(Clone, Copy, PartialEq, Debug)]
+enum Piece {
+    King(char),
+    Queen(char),
+    Rook(char),
+    Bishop(char),
+    Knight(char),
+    Pawn(char),
+    Empty,
+}
+
+impl Piece {
+    fn symbol(&self) -> &'static str {
+        match self {
+            Piece::King('w') => "♔",
+            Piece::Queen('w') => "♕",
+            Piece::Rook('w') => "♖",
+            Piece::Bishop('w') => "♗",
+            Piece::Knight('w') => "♘",
+            Piece::Pawn('w') => "♙",
+            Piece::King('b') => "♚",
+            Piece::Queen('b') => "♛",
+            Piece::Rook('b') => "♜",
+            Piece::Bishop('b') => "♝",
+            Piece::Knight('b') => "♞",
+            Piece::Pawn('b') => "♟︎",
+            Piece::Empty => "",
+            _ => "",
+        }
+    }
+}
+
+#[derive(PartialEq, Debug)]
+enum Turn {
+    White,
+    Black,
+}
+
+enum AppState {
+    MainMenu,
+    InGame,
+    Settings,
+}
+
+struct ChessApp {
+    fullscreen: bool,
+    resolutions: Vec<(u32, u32)>,
+    selected_resolution: usize,
+    state: AppState,
+    board: [[Piece; 8]; 8],
+    selected: Option<(usize, usize)>,
+    turn: Turn,
+    pending_settings: PendingSettings,
+    server_port: String,
+}
+
+#[derive(Default)]
+struct PendingSettings {
+    fullscreen: bool,
+    selected_resolution: usize,
+    server_port: String,
+}
+
+impl Default for ChessApp {
+    fn default() -> Self {
+        Self {
+            fullscreen: true,
+            resolutions: vec![
+                (1280, 720),
+                (1600, 900),
+                (1920, 1080),
+                (2560, 1440),
+                (3840, 2160),
+            ],
+            selected_resolution: 2, // Default to 1920x1080
+            state: AppState::MainMenu,
+            board: Self::starting_board(),
+            selected: None,
+            turn: Turn::White,
+            pending_settings: PendingSettings::default(),
+            server_port: "8080".to_string(), // Default port
+        }
+    }
+}
+
+impl ChessApp {
+    fn starting_board() -> [[Piece; 8]; 8] {
+        use Piece::*;
+        [
+            [
+                Rook('b'),
+                Knight('b'),
+                Bishop('b'),
+                Queen('b'),
+                King('b'),
+                Bishop('b'),
+                Knight('b'),
+                Rook('b'),
+            ],
+            [Pawn('b'); 8],
+            [Empty; 8],
+            [Empty; 8],
+            [Empty; 8],
+            [Empty; 8],
+            [Pawn('w'); 8],
+            [
+                Rook('w'),
+                Knight('w'),
+                Bishop('w'),
+                Queen('w'),
+                King('w'),
+                Bishop('w'),
+                Knight('w'),
+                Rook('w'),
+            ],
+        ]
+    }
+
+    fn handle_click(&mut self, row: usize, col: usize) {
+        if let Some((r, c)) = self.selected {
+            let piece = self.board[r][c];
+            self.board[r][c] = Piece::Empty;
+            self.board[row][col] = piece;
+            self.selected = None;
+            self.turn = if self.turn == Turn::White {
+                Turn::Black
+            } else {
+                Turn::White
+            };
+        } else {
+            if self.board[row][col] != Piece::Empty {
+                self.selected = Some((row, col));
+            }
+        }
+    }
+
+    fn apply_settings(&mut self, ctx: &egui::Context) {
+        self.fullscreen = self.pending_settings.fullscreen;
+        self.selected_resolution = self.pending_settings.selected_resolution;
+        self.server_port = self.pending_settings.server_port.clone();
+        
+        if let Some(resolution) = self.resolutions.get(self.selected_resolution) {
+            ctx.send_viewport_cmd(egui::ViewportCommand::InnerSize(
+                egui::Vec2::new(resolution.0 as f32, resolution.1 as f32)
+            ));
+        }
+        
+        ctx.send_viewport_cmd(egui::ViewportCommand::Fullscreen(self.fullscreen));
+    }
+
+    fn enter_settings(&mut self) {
+        self.pending_settings.fullscreen = self.fullscreen;
+        self.pending_settings.selected_resolution = self.selected_resolution;
+        self.pending_settings.server_port = self.server_port.clone();
+        self.state = AppState::Settings;
+    }
+}
+
+impl eframe::App for ChessApp {
+    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
+        match self.state {
+            AppState::MainMenu => {
+                egui::CentralPanel::default().show(ctx, |ui| {
+                    ui.vertical_centered(|ui| {
+                        ui.heading("♞ Knightly ♞");
+                        ui.add_space(30.0);
+
+                        if ui.add_sized([300.0, 60.0], egui::Button::new("Play")).clicked() {
+                            self.state = AppState::InGame;
+                        }
+                        ui.add_space(8.0);
+                        
+                        if ui.add_sized([300.0, 60.0], egui::Button::new("Settings")).clicked() {
+                            self.enter_settings();
+                        }
+                        ui.add_space(8.0);
+                        
+                        if ui
+                            .add_sized([300.0, 60.0], egui::Button::new("Quit"))
+                            .clicked()
+                        {
+                            std::process::exit(0);
+                        }
+                    });
+                });
+            }
+
+            AppState::Settings => {
+                egui::CentralPanel::default().show(ctx, |ui| {
+                    ui.vertical_centered(|ui| {
+                        ui.heading("Settings");
+                        ui.add_space(30.0);
+
+                        // Fullscreen toggle
+                        ui.horizontal(|ui| {
+                            ui.label("Fullscreen:");
+                            if ui.checkbox(&mut self.pending_settings.fullscreen, "").changed() {
+                                // If enabling fullscreen, we might want to disable resolution selection
+                            }
+                        });
+                        ui.add_space(10.0);
+
+                        // Resolution dropdown
+                        ui.horizontal(|ui| {
+                            ui.label("Resolution:");
+                            egui::ComboBox::new("resolution_combo", "")
+                                .selected_text(format!(
+                                    "{}x{}",
+                                    self.resolutions[self.pending_settings.selected_resolution].0,
+                                    self.resolutions[self.pending_settings.selected_resolution].1
+                                ))
+                                .show_ui(ui, |ui| {
+                                    for (i, &(width, height)) in self.resolutions.iter().enumerate() {
+                                        ui.selectable_value(
+                                            &mut self.pending_settings.selected_resolution,
+                                            i,
+                                            format!("{}x{}", width, height),
+                                        );
+                                    }
+                                });
+                        });
+                        ui.add_space(10.0);
+
+                        // Server port input field
+                        ui.horizontal(|ui| {
+                            ui.label("Local Server Port:");
+                            ui.add(egui::TextEdit::singleline(&mut self.pending_settings.server_port)
+                                .desired_width(100.0)
+                                .hint_text("8080"));
+                        });
+                        ui.add_space(30.0);
+
+                        // Apply and Cancel buttons
+                        ui.horizontal(|ui| {
+                            if ui.add_sized([140.0, 40.0], egui::Button::new("Apply")).clicked() {
+                                self.apply_settings(ctx);
+                                self.state = AppState::MainMenu;
+                            }
+                            
+                            if ui.add_sized([140.0, 40.0], egui::Button::new("Cancel")).clicked() {
+                                self.state = AppState::MainMenu;
+                            }
+                        });
+                    });
+                });
+            }
+
+            AppState::InGame => {
+                egui::TopBottomPanel::top("menu_bar").show(ctx, |ui| {
+                    ui.horizontal(|ui| {
+                        if ui.button("Main Menu").clicked() {
+                            self.state = AppState::MainMenu;
+                        }
+                        if ui.button("Settings").clicked() {
+                            self.enter_settings();
+                        }
+                        if ui.button("New Game").clicked() {
+                            *self = ChessApp::default();
+                            self.state = AppState::InGame;
+                        }
+                        ui.separator();
+                        ui.label(format!("Turn: {:?}", self.turn));
+                    });
+                });
+                
+                egui::CentralPanel::default().show(ctx, |ui| {
+                    ui.vertical_centered(|ui| {
+                        let full_avail = ui.available_rect_before_wrap();
+                        let board_tile = (full_avail.width().min(full_avail.height())) / 8.0;
+                        let board_size = board_tile * 8.0;
+                        
+                        // Create a child UI at the board position
+                        let (response, painter) = ui.allocate_painter(
+                            egui::Vec2::new(board_size, board_size),
+                            egui::Sense::click()
+                        );
+                        
+                        let board_rect = egui::Rect::from_center_size(
+                            full_avail.center(),
+                            egui::vec2(board_size, board_size)
+                        );
+                        
+                        // Draw the chess board
+                        let tile_size = board_size / 8.0;
+                        for row in 0..8 {
+                            for col in 0..8 {
+                                let color = if (row + col) % 2 == 0 {
+                                    egui::Color32::from_rgb(100, 97, 97)
+                                } else {
+                                    egui::Color32::from_rgb(217, 217, 217)
+                                };
+                                
+                                let rect = egui::Rect::from_min_size(
+                                    egui::Pos2::new(
+                                        board_rect.min.x + col as f32 * tile_size,
+                                        board_rect.min.y + row as f32 * tile_size
+                                    ),
+                                    egui::Vec2::new(tile_size, tile_size)
+                                );
+                                
+                                painter.rect_filled(rect, 0.0, color);
+                                
+                                // Draw piece
+                                let piece = self.board[row][col];
+                                if piece != Piece::Empty {
+                                    let symbol = piece.symbol();
+                                    let font_id = egui::FontId::proportional(tile_size * 0.75);
+                                    painter.text(
+                                        rect.center(),
+                                        egui::Align2::CENTER_CENTER,
+                                        symbol,
+                                        font_id,
+                                        if matches!(piece, Piece::King('w') | Piece::Queen('w') | Piece::Rook('w') | Piece::Bishop('w') | Piece::Knight('w') | Piece::Pawn('w')) {
+                                            egui::Color32::WHITE
+                                        } else {
+                                            egui::Color32::BLACK
+                                        }
+                                    );
+                                }
+                                
+                                // Draw selection highlight
+                                if self.selected == Some((row, col)) {
+                                    painter.rect_stroke(
+                                        rect, 
+                                        0.0, 
+                                        egui::Stroke::new(3.0, egui::Color32::RED),
+                                        egui::StrokeKind::Inside
+                                    );
+                                }
+                                
+                                // Handle clicks
+                                if ui.ctx().input(|i| i.pointer.primary_clicked()) {
+                                    let click_pos = ui.ctx().input(|i| i.pointer.interact_pos()).unwrap();
+                                    if rect.contains(click_pos) {
+                                        self.handle_click(row, col);
+                                    }
+                                }
+                            }
+                        }
+                    });
+                });
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn test_initial_board_setup() {
+        let app = ChessApp::default();
+        assert!(matches!(app.board[0][0], Piece::Rook('b')));
+        assert!(matches!(app.board[7][0], Piece::Rook('w')));
+
+        assert!(matches!(app.board[1][0], Piece::Pawn('b')));
+        assert!(matches!(app.board[6][0], Piece::Pawn('w')));
+    }
+    
+    #[test]
+    fn test_piece_symbols() {
+        assert_eq!(Piece::King('w').symbol(), "♔");
+        assert_eq!(Piece::King('b').symbol(), "♚");
+        assert_eq!(Piece::Empty.symbol(), "");
+    }
+    
+    #[test]
+    fn test_piece_selection() {
+        let mut app = ChessApp::default();
+        app.handle_click(6, 0);
+        assert_eq!(app.selected, Some((6, 0)));
+        app.handle_click(6, 0);
+        assert_eq!(app.selected, None);
+    }
+    
+    #[test]
+    fn test_piece_movement() {
+        let mut app = ChessApp::default();
+        // Select and move a piece
+        app.handle_click(6, 0); // Select white pawn
+        app.handle_click(5, 0); // Move to empty square
+        assert_eq!(app.board[6][0], Piece::Empty);
+        assert!(matches!(app.board[5][0], Piece::Pawn('w')));
+    }
+
+    #[test]
+    fn test_turn_switching() {
+        let mut app = ChessApp::default();
+        assert_eq!(app.turn, Turn::White);
+        app.handle_click(6, 0); // White selects
+        app.handle_click(5, 0); // White moves
+        assert_eq!(app.turn, Turn::Black); // Should now be Black's turn
+    }
+    
+    #[test]
+    fn test_server_port_default() {
+        let app = ChessApp::default();
+        assert_eq!(app.server_port, "8080");
+    }
 }