From 4666d7871a9e064a3b3033c7c1daa9c3c4972d98 Mon Sep 17 00:00:00 2001 From: Logan Hunt Date: Thu, 19 Jan 2023 14:04:10 -0700 Subject: Web Client (#11) * Github Oauth * A simple frontend * Add middleware proxy on dev * Forward proxy and rewrite path, add oauth to frontend, increase jwt expiry time to 12 hours * Some simple style changes * Add keys as user * Checkpoint - auth is broken * Fix auth and use player model, unrelated to this pr: flip board if dark * Close player session when password or key deleted or put * Add build script - this branch is quickly becoming cringe * Docker v2 - add migration and scripts, fix local storage and index that caused build issues * Ignore keys, proxy api correctly nginx * Finally nginx is resolved jesus christ * Remove max screen dimension limits cuz cringe * Cursor highlight * Add password form, some minor frontend changes as well * Remove cringe on home page * Move to 127.0.0.1 loopback in env * Add github id in player structs for tests --- lib/chessh/ssh/client/client.ex | 13 ++++--------- lib/chessh/ssh/client/game/game.ex | 37 ++++++++++++++++++++++++------------- lib/chessh/ssh/client/menu.ex | 10 ++++++++-- 3 files changed, 36 insertions(+), 24 deletions(-) (limited to 'lib/chessh/ssh/client') diff --git a/lib/chessh/ssh/client/client.ex b/lib/chessh/ssh/client/client.ex index 72bbb66..3aaed07 100644 --- a/lib/chessh/ssh/client/client.ex +++ b/lib/chessh/ssh/client/client.ex @@ -11,8 +11,6 @@ defmodule Chessh.SSH.Client do @min_terminal_width 64 @min_terminal_height 38 - @max_terminal_width 220 - @max_terminal_height 100 defmodule State do defstruct tui_pid: nil, @@ -163,13 +161,10 @@ defmodule Chessh.SSH.Client do end defp get_terminal_dim_msg(width, height) do - case {height > @max_terminal_height, height < @min_terminal_height, - width > @max_terminal_width, width < @min_terminal_width} do - {true, _, _, _} -> {true, @clear_codes ++ ["The terminal height is too large."]} - {_, true, _, _} -> {true, @clear_codes ++ ["The terminal height is too small."]} - {_, _, true, _} -> {true, @clear_codes ++ ["The terminal width is too large"]} - {_, _, _, true} -> {true, @clear_codes ++ ["The terminal width is too small."]} - {false, false, false, false} -> {false, nil} + case {height < @min_terminal_height, width < @min_terminal_width} do + {true, _} -> {true, @clear_codes ++ ["The terminal height is too small."]} + {_, true} -> {true, @clear_codes ++ ["The terminal width is too small."]} + {false, false} -> {false, nil} end end diff --git a/lib/chessh/ssh/client/game/game.ex b/lib/chessh/ssh/client/game/game.ex index 2ee6dca..65b9d10 100644 --- a/lib/chessh/ssh/client/game/game.ex +++ b/lib/chessh/ssh/client/game/game.ex @@ -35,16 +35,23 @@ defmodule Chessh.SSH.Client.Game do def init([ %State{ color: color, - game: %Game{dark_player_id: dark_player_id, light_player_id: light_player_id} + game: %Game{dark_player_id: dark_player_id, light_player_id: light_player_id}, + player_session: %{player_id: player_id} } = state | tail ]) when is_nil(color) do + {is_dark, is_light} = {player_id == dark_player_id, player_id == light_player_id} + new_state = - case {is_nil(dark_player_id), is_nil(light_player_id)} do - {true, false} -> %State{state | color: :dark} - {false, true} -> %State{state | color: :light} - {_, _} -> %State{state | color: Enum.random([:light, :dark])} + if is_dark || is_light do + %State{state | color: if(is_light, do: :light, else: :dark)} + else + case {is_nil(dark_player_id), is_nil(light_player_id)} do + {true, false} -> %State{state | color: :dark} + {false, true} -> %State{state | color: :light} + {_, _} -> %State{state | color: :light} + end end init([new_state | tail]) @@ -89,18 +96,22 @@ defmodule Chessh.SSH.Client.Game do end binbo_pid = initialize_game(game_id, fen) - send(client_pid, {:send_to_ssh, Utils.clear_codes()}) new_game = Repo.get(Game, game_id) |> Repo.preload([:light_player, :dark_player]) - new_state = %State{ - state - | binbo_pid: binbo_pid, - color: if(new_game.light_player_id == player_session.player_id, do: :light, else: :dark), - game: new_game - } + player_color = + if(new_game.light_player_id == player_session.player_id, do: :light, else: :dark) - {:ok, new_state} + send(client_pid, {:send_to_ssh, Utils.clear_codes()}) + + {:ok, + %State{ + state + | binbo_pid: binbo_pid, + color: player_color, + game: new_game, + flipped: player_color == :dark + }} end def init([ diff --git a/lib/chessh/ssh/client/menu.ex b/lib/chessh/ssh/client/menu.ex index 6c96cc2..b69340c 100644 --- a/lib/chessh/ssh/client/menu.ex +++ b/lib/chessh/ssh/client/menu.ex @@ -63,7 +63,6 @@ defmodule Chessh.SSH.Client.Menu do %Chessh.SSH.Client.Game.State{player_session: player_session, game: game}}} end) ++ [ - {"Settings", {}}, {"Help", {}} ] end @@ -130,7 +129,14 @@ defmodule Chessh.SSH.Client.Menu do fn {i, {option, _}} -> [ ANSI.cursor(y + length(logo_lines) + i + 1, x), - if(i == selected, do: ANSI.format([:bright, :light_cyan, "+ #{option}"]), else: option) + if(i == selected, + do: + ANSI.format_fragment( + [:light_cyan, :bright, "> #{option} <", :reset], + true + ), + else: option + ) ] end ) ++ [ANSI.home()] -- cgit v1.2.3-70-g09d2