17 changed files with 449 additions and 559 deletions
--- a/lib/api/game_info.dart
+++ b/lib/api/game_info.dart
@ -1,65 +0,0 @@
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:uuid/uuid.dart';
-
-class GameInfo {
-  final UuidValue? playerID;
-  final String? passphrase;
-
-  const GameInfo({
-    required this.playerID,
-    required this.passphrase,
-  });
-
-  factory GameInfo.empty() {
-    return const GameInfo(playerID: null, passphrase: null);
-  }
-
-  factory GameInfo.fromJson(Map<String, dynamic> json) {
-    final playerid = UuidValue.fromString(json['playerID']);
-    final passphrase = json['passphrase'];
-
-    return GameInfo(playerID: playerid, passphrase: passphrase);
-  }
-
-  Map<String, dynamic> toJson() {
-    String? pid;
-
-    if (playerID != null) {
-      pid = playerID.toString();
-    }
-
-    return {
-      'playerID': pid,
-      'passphrase': passphrase,
-    };
-  }
-
-  void store() async {
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-
-    await prefs.setString(passphrase!, playerID.toString());
-  }
-
-  static Future<GameInfo?> get(String phrase) async {
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-    var playerID = prefs.getString(phrase);
-
-    if (playerID == null) return null;
-
-    return GameInfo(
-        playerID: UuidValue.fromString(playerID), passphrase: phrase);
-  }
-}
-
-class WebsocketMessageIdentifyPlayer {
-  final String playerID;
-  final String? passphrase;
-
-  const WebsocketMessageIdentifyPlayer({
-    required this.playerID,
-    required this.passphrase,
-  });
-
-  Map<String, dynamic> toJson() =>
-      {'playerID': playerID, 'passphrase': passphrase};
-}
--- a/lib/api/register.dart
+++ b/lib/api/register.dart
@ -0,0 +1,80 @@
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:uuid/uuid.dart';
+
+class PlayerInfo {
+  final UuidValue? playerID;
+  final UuidValue? lobbyID;
+  final String? passphrase;
+
+  const PlayerInfo({
+    required this.playerID,
+    required this.lobbyID,
+    required this.passphrase,
+  });
+
+  factory PlayerInfo.fromJson(Map<String, dynamic> json) {
+    final playerid = UuidValue.fromString(json['playerID']);
+    final lobbyid = UuidValue.fromString(json['lobbyID']);
+    final passphrase = json['passphrase'];
+
+    return PlayerInfo(
+        playerID: playerid, lobbyID: lobbyid, passphrase: passphrase);
+  }
+
+  Map<String, dynamic> toJson() => {
+        'playerID': playerID,
+        'lobbyID': lobbyID,
+        'passphrase': passphrase,
+      };
+
+  void store() async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+
+    await prefs.setBool("contains", true);
+    await prefs.setString("playerID", playerID.toString());
+    await prefs.setString("lobbyID", lobbyID.toString());
+    await prefs.setString("passphrase", passphrase.toString());
+  }
+
+  void delete() async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+
+    await prefs.setBool("contains", false);
+  }
+
+  Future<PlayerInfo?> get() async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    var contains = prefs.getBool("contains");
+    var playerID = prefs.getString("playerID");
+    var lobbyID = prefs.getString("lobbyID");
+    var passphrase = prefs.getString("passphrase");
+
+    if (contains == null ||
+        !contains ||
+        playerID == null ||
+        lobbyID == null ||
+        passphrase == null) {
+      return null;
+    }
+
+    return PlayerInfo(
+        playerID: UuidValue.fromString(playerID),
+        lobbyID: UuidValue.fromString(lobbyID),
+        passphrase: passphrase);
+  }
+}
+
+class WebsocketMessageIdentifyPlayer {
+  final String playerID;
+  final String lobbyID;
+  final String? passphrase;
+
+  const WebsocketMessageIdentifyPlayer({
+    required this.playerID,
+    required this.lobbyID,
+    required this.passphrase,
+  });
+
+  Map<String, dynamic> toJson() =>
+      {'lobbyID': lobbyID, 'playerID': playerID, 'passphrase': passphrase};
+}
--- a/lib/chess/chess_app.dart
+++ b/lib/chess/chess_app.dart
@ -31,7 +31,7 @@ class ChessApp extends StatelessWidget {
          useMaterial3: true,
        ),
        routerConfig: ChessAppRouter.getInstance().router,
-        title: 'mChess 1.0.8',
+        title: 'mChess 1.0.5',
      ),
    );
  }
--- a/lib/chess_bloc/chess_bloc.dart
+++ b/lib/chess_bloc/chess_bloc.dart
@ -51,12 +51,10 @@ class ChessBloc extends Bloc<ChessEvent, ChessBoardState> {

  void flipBoard(ColorDetermined event, Emitter<ChessBoardState> emit) {
    log("My Color is $myColor");
-
-    myColor = event.playerColor;
-
+    myColor = event.myColor;
    emit(
      ChessBoardState(
-        event.playerColor,
+        event.myColor,
        state.newTurnColor,
        state.position,
        ChessMove.none(),
@ -76,13 +74,12 @@ class ChessBloc extends Bloc<ChessEvent, ChessBoardState> {
          .recordMove(event.startSquare, event.endSquare, event.position);
    }

-    myColor = event.playerColor;
    turnColor = event.turnColor;

    emit(
      ChessBoardState(
-        myColor,
-        event.turnColor,
+        state.bottomColor,
+        turnColor,
        event.position,
        move,
        true,
--- a/lib/chess_bloc/chess_events.dart
+++ b/lib/chess_bloc/chess_events.dart
@ -9,7 +9,6 @@ class ReceivedBoardState extends ChessEvent {
  final ChessPosition position;
  final ChessCoordinate squareInCheck;
  final ChessColor turnColor;
-  final ChessColor playerColor;

  ReceivedBoardState({
    required this.startSquare,
@ -17,7 +16,6 @@ class ReceivedBoardState extends ChessEvent {
    required this.position,
    required this.squareInCheck,
    required this.turnColor,
-    required this.playerColor,
  });
 }

@ -40,9 +38,9 @@ class InitBoard extends ChessEvent {
 }

 class ColorDetermined extends ChessEvent {
-  final ChessColor playerColor;
+  final ChessColor myColor;

-  ColorDetermined({required this.playerColor});
+  ColorDetermined({required this.myColor});
 }

 class InvalidMovePlayed extends ChessEvent {
--- a/lib/connection/ws_connection.dart
+++ b/lib/connection/ws_connection.dart
@ -6,7 +6,7 @@ import 'package:mchess/api/move.dart';
 import 'package:mchess/api/websocket_message.dart';
 import 'package:mchess/chess_bloc/chess_bloc.dart';
 import 'package:mchess/chess_bloc/chess_events.dart';
-import 'package:mchess/api/game_info.dart';
+import 'package:mchess/api/register.dart';
 import 'package:mchess/chess_bloc/chess_position.dart';
 import 'package:mchess/connection_cubit/connection_cubit.dart';
 import 'package:mchess/utils/chess_router.dart';
@ -16,6 +16,7 @@ import 'package:web_socket_channel/web_socket_channel.dart';

 class ServerConnection {
  WebSocketChannel? channel;
+  late bool wasConnected = false;
  Stream broadcast = const Stream.empty();

  static final ServerConnection _instance = ServerConnection._internal();
@ -40,36 +41,27 @@ class ServerConnection {
    channel!.sink.add(message);
  }

-  Future? connect(String playerID, String? passphrase) {
-    if (channel != null) return null;
-
+  void connect(String playerID, lobbyID, String? passphrase) {
    channel = WebSocketChannel.connect(Uri.parse(config.getWebsocketURL()));

-    channel!.ready.then((val) {
-      send(
-        jsonEncode(
-          WebsocketMessageIdentifyPlayer(
-            playerID: (playerID),
-            passphrase: (passphrase),
-          ),
+    send(
+      jsonEncode(
+        WebsocketMessageIdentifyPlayer(
+          playerID: (playerID),
+          lobbyID: (lobbyID),
+          passphrase: (passphrase),
        ),
-      );
+      ),
+    );

-      log(channel!.closeCode.toString());
-      broadcast = channel!.stream.asBroadcastStream();
-      broadcast.listen(handleIncomingData);
-    });
-
-    return channel!.ready;
+    log(channel!.closeCode.toString());
+    broadcast = channel!.stream.asBroadcastStream();
+    broadcast.listen(handleIncomingData);
  }

-  Future disconnectExistingConnection() async {
+  void disconnectExistingConnection() {
    if (channel == null) return;
-
-    await channel!.sink.close();
-
-    channel = null;
-    broadcast = const Stream.empty();
+    channel!.sink.close();
  }

  void handleIncomingData(dynamic data) {
@ -106,15 +98,14 @@ class ServerConnection {
    if (apiMessage.position != null) {
      ChessBloc.getInstance().add(
        ReceivedBoardState(
-          startSquare: move?.from,
-          endSquare: move?.to,
-          position: ChessPositionManager.getInstance()
-              .fromPGNString(apiMessage.position!),
-          squareInCheck: ChessCoordinate.fromApiCoordinate(
-              apiMessage.squareInCheck ?? const ApiCoordinate(col: 0, row: 0)),
-          turnColor: ChessColor.fromApiColor(apiMessage.turnColor!),
-          playerColor: ChessColor.fromApiColor(apiMessage.playerColor!),
-        ),
+            startSquare: move?.from,
+            endSquare: move?.to,
+            position: ChessPositionManager.getInstance()
+                .fromPGNString(apiMessage.position!),
+            squareInCheck: ChessCoordinate.fromApiCoordinate(
+                apiMessage.squareInCheck ??
+                    const ApiCoordinate(col: 0, row: 0)),
+            turnColor: ChessColor.fromApiColor(apiMessage.turnColor!)),
      );
    } else {
      log('Error: no position received');
@ -125,7 +116,7 @@ class ServerConnection {
    ConnectionCubit.getInstance().opponentConnected();
    ChessBloc.getInstance().add(InitBoard());
    ChessBloc.getInstance().add(ColorDetermined(
-        playerColor: ChessColor.fromApiColor(apiMessage.playerColor!)));
+        myColor: ChessColor.fromApiColor(apiMessage.playerColor!)));
  }

  void handleInvalidMoveMessage(ApiWebsocketMessage apiMessage) {
--- a/lib/connection_cubit/connection_cubit.dart
+++ b/lib/connection_cubit/connection_cubit.dart
@ -15,64 +15,21 @@ class ConnectionCubit extends Cubit<ConnectionCubitState> {
    return _instance;
  }

-  void connect(String playerID, String? passphrase) {
-    var connectedFuture =
-        ServerConnection.getInstance().connect(playerID, passphrase);
-
-    connectedFuture?.then((val) {
-      emit(ConnectionCubitState(
-          iAmConnected: true,
-          connectedToPhrase: passphrase,
-          opponentConnected: false));
-    });
-  }
-
-  void connectIfNotConnected(String playerID, String? passphrase) {
-    if (state.iAmConnected && state.connectedToPhrase == passphrase) {
-      return;
-    }
-    if (state.iAmConnected && state.connectedToPhrase != passphrase) {
-      disonnect().then((val) {
-        connect(playerID, passphrase);
-      });
-    }
-
-    connect(playerID, passphrase);
-  }
-
-  Future disonnect() async {
-    var disconnectFuture =
-        ServerConnection.getInstance().disconnectExistingConnection();
-
-    disconnectFuture.then(
-      (val) {
-        emit(ConnectionCubitState.init());
-      },
-    );
-
-    return disconnectFuture;
+  void connect(String playerID, lobbyID, String? passphrase) {
+    ServerConnection.getInstance().connect(playerID, lobbyID, passphrase);
  }

  void opponentConnected() {
-    emit(ConnectionCubitState(
-        iAmConnected: state.iAmConnected,
-        connectedToPhrase: state.connectedToPhrase,
-        opponentConnected: true));
+    emit(ConnectionCubitState(true));
  }
 }

 class ConnectionCubitState {
-  final bool iAmConnected;
-  final String? connectedToPhrase;
  final bool opponentConnected;

-  ConnectionCubitState(
-      {required this.iAmConnected,
-      required this.connectedToPhrase,
-      required this.opponentConnected});
+  ConnectionCubitState(this.opponentConnected);

  factory ConnectionCubitState.init() {
-    return ConnectionCubitState(
-        iAmConnected: false, connectedToPhrase: null, opponentConnected: false);
+    return ConnectionCubitState(false);
  }
 }
--- a/lib/pages/chess_game.dart
+++ b/lib/pages/chess_game.dart
@ -12,7 +12,14 @@ import 'package:universal_platform/universal_platform.dart';
 import 'package:uuid/uuid.dart';

 class ChessGame extends StatefulWidget {
-  const ChessGame({super.key});
+  final UuidValue playerID;
+  final UuidValue lobbyID;
+  final String? passphrase;
+  const ChessGame(
+      {required this.playerID,
+      required this.lobbyID,
+      required this.passphrase,
+      super.key});

  @override
  State<ChessGame> createState() => _ChessGameState();
--- a/lib/pages/create_game_widget.dart
+++ b/lib/pages/create_game_widget.dart
@ -1,161 +0,0 @@
-import 'dart:developer';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-import 'package:http/http.dart';
-import 'package:mchess/api/game_info.dart';
-import 'package:mchess/connection_cubit/connection_cubit.dart';
-import 'package:http/http.dart' as http;
-import 'dart:convert';
-
-import 'package:mchess/pages/chess_game.dart';
-import 'package:mchess/utils/config.dart' as config;
-import 'package:mchess/utils/passphrase.dart';
-import 'package:universal_platform/universal_platform.dart';
-
-class CreateGameWidget extends StatefulWidget {
-  const CreateGameWidget({super.key});
-
-  @override
-  State<CreateGameWidget> createState() => _CreateGameWidgetState();
-}
-
-class _CreateGameWidgetState extends State<CreateGameWidget> {
-  late Future<GameInfo?> registerResponse;
-  late Future disconnectFuture;
-  late ChessGameArguments chessGameArgs;
-
-  @override
-  void initState() {
-    super.initState();
-    disconnectFuture = ConnectionCubit().disonnect();
-    disconnectFuture.then((val) {
-      registerResponse = createPrivateGame();
-      registerResponse.then((val) {
-        ConnectionCubit().connectIfNotConnected(
-          val!.playerID.toString(),
-          val.passphrase,
-        );
-      });
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    FloatingActionButton? fltnBtn;
-    if (UniversalPlatform.isLinux ||
-        UniversalPlatform.isMacOS ||
-        UniversalPlatform.isWindows) {
-      fltnBtn = FloatingActionButton(
-        child: const Icon(Icons.cancel),
-        onPressed: () {
-          context.pop();
-        },
-      );
-    }
-
-    return Scaffold(
-      floatingActionButton: fltnBtn,
-      body: Center(
-        child: FutureBuilder(
-            future: disconnectFuture,
-            builder: (context, snapshot) {
-              if (snapshot.connectionState != ConnectionState.done) {
-                return Container();
-              } else {
-                return FutureBuilder<GameInfo?>(
-                  future: registerResponse,
-                  builder: (context, snapshot) {
-                    if (snapshot.connectionState != ConnectionState.done) {
-                      return const SizedBox(
-                        height: 100,
-                        width: 100,
-                        child: CircularProgressIndicator(),
-                      );
-                    } else {
-                      var passphrase =
-                          snapshot.data?.passphrase ?? "no passphrase";
-                      return BlocListener<ConnectionCubit,
-                          ConnectionCubitState>(
-                        listener: (context, state) {
-                          // We wait for our opponent to connect
-                          if (state.opponentConnected) {
-                            //TODO: is goNamed the correct way to navigate?
-                            context.goNamed('game', pathParameters: {
-                              'phrase': passphrase.toURL(),
-                            });
-                          }
-                        },
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            Text(
-                              'Give this phrase to your friend and sit tight:',
-                              style: TextStyle(
-                                  color: Theme.of(context).colorScheme.primary),
-                            ),
-                            const SizedBox(height: 25),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              children: [
-                                SelectableText(
-                                  passphrase,
-                                  style: const TextStyle(
-                                      fontWeight: FontWeight.bold),
-                                ),
-                                IconButton(
-                                  icon: const Icon(Icons.copy),
-                                  onPressed: () async {
-                                    await Clipboard.setData(
-                                        ClipboardData(text: passphrase));
-                                  },
-                                )
-                              ],
-                            ),
-                            const SizedBox(height: 25),
-                            const CircularProgressIndicator()
-                          ],
-                        ),
-                      );
-                    }
-                  },
-                );
-              }
-            }),
-      ),
-    );
-  }
-
-  Future<GameInfo?> createPrivateGame() async {
-    Response response;
-
-    try {
-      response = await http.get(Uri.parse(config.getCreateGameURL()),
-          headers: {"Accept": "application/json"});
-    } catch (e) {
-      log('Exception: ${e.toString()}');
-
-      const snackBar = SnackBar(
-        backgroundColor: Colors.amberAccent,
-        content: Text("mChess server is not responding. Try again or give up"),
-      );
-      Future.delayed(const Duration(seconds: 1), () {
-        if (!mounted) return null;
-
-        ScaffoldMessenger.of(context).clearSnackBars();
-        ScaffoldMessenger.of(context).showSnackBar(snackBar);
-        context.goNamed('lobbySelector'); // We go back to the lobby selector
-      });
-      return null;
-    }
-
-    if (response.statusCode == 200) {
-      var info = GameInfo.fromJson(jsonDecode(response.body));
-      info.store();
-      return info;
-    }
-    return null;
-  }
-}
--- a/lib/pages/host_game.dart
+++ b/lib/pages/host_game.dart
@ -0,0 +1,142 @@
+import 'dart:developer';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+import 'package:http/http.dart';
+import 'package:mchess/api/register.dart';
+import 'package:mchess/connection_cubit/connection_cubit.dart';
+import 'package:http/http.dart' as http;
+import 'dart:convert';
+
+import 'package:mchess/pages/chess_game.dart';
+import 'package:mchess/utils/config.dart' as config;
+
+class HostGameWidget extends StatefulWidget {
+  const HostGameWidget({super.key});
+
+  @override
+  State<HostGameWidget> createState() => _HostGameWidgetState();
+}
+
+class _HostGameWidgetState extends State<HostGameWidget> {
+  late Future<PlayerInfo?> registerResponse;
+  late ChessGameArguments chessGameArgs;
+
+  @override
+  void initState() {
+    registerResponse = hostPrivateGame();
+    registerResponse.then((value) {
+      value?.store();
+    });
+    connectToWebsocket(registerResponse);
+    super.initState();
+  }
+
+  void connectToWebsocket(Future<PlayerInfo?> resp) {
+    resp.then((value) {
+      if (value == null) return;
+
+      chessGameArgs = ChessGameArguments(
+          lobbyID: value.lobbyID!,
+          playerID: value.playerID!,
+          passphrase: value.passphrase);
+
+      ConnectionCubit.getInstance().connect(
+        value.playerID!.uuid,
+        value.lobbyID!.uuid,
+        value.passphrase,
+      );
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: FutureBuilder<PlayerInfo?>(
+          future: registerResponse,
+          builder: (context, snapshot) {
+            if (snapshot.connectionState != ConnectionState.done) {
+              return const SizedBox(
+                height: 100,
+                width: 100,
+                child: CircularProgressIndicator(),
+              );
+            } else {
+              String passphrase = snapshot.data?.passphrase ?? "no passphrase";
+              return BlocListener<ConnectionCubit, ConnectionCubitState>(
+                listener: (context, state) {
+                  // We wait for our opponent to connect
+                  if (state.opponentConnected) {
+                    context.pushReplacement('/game', extra: chessGameArgs);
+                  }
+                },
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(
+                      'Give this phrase to your friend and sit tight:',
+                      style: TextStyle(
+                          color: Theme.of(context).colorScheme.primary),
+                    ),
+                    const SizedBox(height: 25),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        SelectableText(
+                          passphrase,
+                          style: const TextStyle(fontWeight: FontWeight.bold),
+                        ),
+                        IconButton(
+                          icon: const Icon(Icons.copy),
+                          onPressed: () async {
+                            await Clipboard.setData(
+                                ClipboardData(text: passphrase));
+                          },
+                        )
+                      ],
+                    ),
+                    const SizedBox(height: 25),
+                    const CircularProgressIndicator()
+                  ],
+                ),
+              );
+            }
+          },
+        ),
+      ),
+    );
+  }
+
+  Future<PlayerInfo?> hostPrivateGame() async {
+    Response response;
+
+    try {
+      response = await http.get(Uri.parse(config.getHostURL()),
+          headers: {"Accept": "application/json"});
+    } catch (e) {
+      log(e.toString());
+
+      if (!context.mounted) return null;
+
+      const snackBar = SnackBar(
+        backgroundColor: Colors.amberAccent,
+        content: Text("mChess server is not responding. Try again or give up"),
+      );
+      Future.delayed(const Duration(seconds: 2), () {
+        ScaffoldMessenger.of(context).clearSnackBars();
+        ScaffoldMessenger.of(context).showSnackBar(snackBar);
+        context.goNamed('lobbySelector'); // We go back to the lobby selector
+      });
+      return null;
+    }
+
+    if (response.statusCode == 200) {
+      log(response.body);
+      return PlayerInfo.fromJson(jsonDecode(response.body));
+    }
+    return null;
+  }
+}
--- a/lib/pages/join_game_handle_widget.dart
+++ b/lib/pages/join_game_handle_widget.dart
@ -1,146 +0,0 @@
-import 'dart:convert';
-import 'dart:developer';
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-import 'package:http/http.dart' as http;
-import 'package:mchess/api/game_info.dart';
-import 'package:mchess/connection_cubit/connection_cubit.dart';
-import 'package:mchess/pages/chess_game.dart';
-import 'package:mchess/utils/config.dart' as config;
-import 'package:universal_platform/universal_platform.dart';
-
-class JoinGameHandleWidget extends StatefulWidget {
-  final String passphrase;
-  const JoinGameHandleWidget({required this.passphrase, super.key});
-
-  @override
-  State<JoinGameHandleWidget> createState() => _JoinGameHandleWidgetState();
-}
-
-class _JoinGameHandleWidgetState extends State<JoinGameHandleWidget> {
-  late Future<GameInfo?> joinGameFuture;
-
-  @override
-  void initState() {
-    super.initState();
-    joinGameFuture = joinPrivateGame(widget.passphrase);
-    joinGameFuture.then((val) {
-      if (val == null) return;
-
-      ConnectionCubit.getInstance().connectIfNotConnected(
-        val.playerID!.uuid,
-        val.passphrase,
-      );
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    FloatingActionButton? fltnBtn;
-    if (UniversalPlatform.isLinux ||
-        UniversalPlatform.isMacOS ||
-        UniversalPlatform.isWindows) {
-      fltnBtn = FloatingActionButton(
-        child: const Icon(Icons.cancel),
-        onPressed: () {
-          context.pop();
-        },
-      );
-    }
-
-    var loadingIndicator = const SizedBox(
-      height: 100,
-      width: 100,
-      child: CircularProgressIndicator(),
-    );
-
-    return Scaffold(
-      floatingActionButton: fltnBtn,
-      body: Center(
-        child: FutureBuilder(
-            future: joinGameFuture,
-            builder: (context, snapshot) {
-              if (snapshot.connectionState != ConnectionState.done) {
-                return loadingIndicator;
-              } else {
-                return BlocBuilder<ConnectionCubit, ConnectionCubitState>(
-                    builder: (context, state) {
-                  if (state.iAmConnected) {
-                    return const ChessGame();
-                  } else {
-                    return loadingIndicator;
-                  }
-                });
-              }
-            }),
-      ),
-    );
-  }
-
-  Future<GameInfo?> joinPrivateGame(String phrase) async {
-    http.Response response;
-
-    var existingInfo = await GameInfo.get(phrase);
-    log('playerID: ${existingInfo?.playerID} and passphrase: "${existingInfo?.passphrase}"');
-
-    GameInfo info;
-    if (existingInfo?.passphrase == phrase) {
-      // We have player info for this exact passphrase
-      info = GameInfo(playerID: existingInfo?.playerID, passphrase: phrase);
-    } else {
-      info = GameInfo(playerID: null, passphrase: phrase);
-    }
-
-    try {
-      response = await http.post(Uri.parse(config.getJoinGameURL()),
-          body: jsonEncode(info), headers: {"Accept": "application/json"});
-    } catch (e) {
-      log(e.toString());
-
-      if (!context.mounted) return null;
-
-      const snackBar = SnackBar(
-        backgroundColor: Colors.amberAccent,
-        content: Text("mChess server is not responding. Try again or give up"),
-      );
-
-      Future.delayed(const Duration(seconds: 1), () {
-        if (!mounted) return null;
-        ScaffoldMessenger.of(context).clearSnackBars();
-        ScaffoldMessenger.of(context).showSnackBar(snackBar);
-        context.goNamed('lobbySelector'); // We go back to the lobby selector
-      });
-      return null;
-    }
-
-    if (response.statusCode == HttpStatus.notFound) {
-      const snackBar = SnackBar(
-        backgroundColor: Colors.amberAccent,
-        content: Text("Passphrase could not be found."),
-      );
-
-      if (!mounted) return null;
-
-      ScaffoldMessenger.of(context).clearSnackBars();
-      ScaffoldMessenger.of(context).showSnackBar(snackBar);
-      context.goNamed('lobbySelector');
-
-      return null;
-    }
-
-    if (response.statusCode == HttpStatus.ok) {
-      var info = GameInfo.fromJson(jsonDecode(response.body));
-      info.store();
-      log('Player info received from server: ');
-      log('playerID: ${info.playerID}');
-      log('passphrase: ${info.passphrase}');
-
-      return info;
-    }
-
-    return null;
-  }
-}
--- a/lib/pages/lobby_selector.dart
+++ b/lib/pages/lobby_selector.dart
@ -1,6 +1,15 @@
+import 'dart:convert';
+import 'dart:developer';
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mchess/utils/passphrase.dart';
+import 'package:http/http.dart' as http;
+import 'package:mchess/api/register.dart';
+import 'package:mchess/connection_cubit/connection_cubit.dart';
+import 'package:mchess/pages/chess_game.dart';
+import 'package:mchess/utils/config.dart' as config;
+import 'package:shared_preferences/shared_preferences.dart';

 class LobbySelector extends StatefulWidget {
  const LobbySelector({super.key});
@ -10,19 +19,26 @@ class LobbySelector extends StatefulWidget {
 }

 class _LobbySelectorState extends State<LobbySelector> {
+  final buttonStyle = const ButtonStyle();
  final phraseController = TextEditingController();
+  late Future<PlayerInfo?> joinGameFuture;

  @override
  Widget build(BuildContext context) {
+    SharedPreferences.getInstance().then((prefs) {
+      final playerID = prefs.getString("playerID");
+      final lobbyID = prefs.getString("lobbyID");
+      final passphrase = prefs.getString("passphrase");
+      log("lobbyID: $lobbyID and playerID: $playerID and passphrase: $passphrase");
+    });
+
    return Scaffold(
      body: Center(
        child: Column(
          mainAxisAlignment: MainAxisAlignment.center,
          children: [
            ElevatedButton(
-              onPressed: () {
-                context.goNamed('createGame');
-              },
+              onPressed: () => buildJoinOrHostDialog(context),
              child: const Row(
                mainAxisSize: MainAxisSize.min,
                children: [
@ -30,23 +46,7 @@ class _LobbySelectorState extends State<LobbySelector> {
                  SizedBox(
                    width: 10,
                  ),
-                  Text('Create private game')
-                ],
-              ),
-            ),
-            const SizedBox(height: 20),
-            ElevatedButton(
-              onPressed: () {
-                buildEnterPassphraseDialog(context);
-              },
-              child: const Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Icon(Icons.mail),
-                  SizedBox(
-                    width: 10,
-                  ),
-                  Text('Join private game')
+                  Text('Private game')
                ],
              ),
            ),
@ -56,6 +56,39 @@ class _LobbySelectorState extends State<LobbySelector> {
    );
  }

+  Future<void> buildJoinOrHostDialog(BuildContext context) {
+    return showDialog<void>(
+      context: context,
+      builder: (BuildContext context) {
+        return Scaffold(
+          backgroundColor: Colors.transparent,
+          body: AlertDialog(
+            title: const Text('Host or join?'),
+            actions: <Widget>[
+              TextButton(
+                child: const Text('Cancel'),
+                onPressed: () => context.pop(),
+              ),
+              TextButton(
+                  child: const Text('Host'),
+                  onPressed: () {
+                    context.pop(); //close dialog before going to host
+                    context.goNamed('host');
+                  }),
+              TextButton(
+                child: const Text('Join'),
+                onPressed: () {
+                  context.pop(); //close dialog before going to next dialog
+                  buildEnterPassphraseDialog(context);
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
  Future<void> buildEnterPassphraseDialog(BuildContext context) {
    return showDialog<void>(
      context: context,
@ -68,11 +101,15 @@ class _LobbySelectorState extends State<LobbySelector> {
                title: const Text('Enter the passphrase here:'),
                content: TextField(
                  controller: phraseController,
-                  onSubmitted: (val) => submitAction(val),
+                  onSubmitted: (val) {
+                    submitPassphrase(builderContext);
+                  },
                  decoration: InputDecoration(
                      hintText: 'Enter passphrase here',
                      suffixIcon: IconButton(
-                        onPressed: () => submitAction(phraseController.text),
+                        onPressed: () {
+                          submitPassphrase(builderContext);
+                        },
                        icon: const Icon(Icons.check),
                      )),
                ),
@ -92,9 +129,91 @@ class _LobbySelectorState extends State<LobbySelector> {
    );
  }

-  void submitAction(String phrase) {
-    context.pop();
-    context.goNamed('game', pathParameters: {'phrase': phrase.toURL()});
-    phraseController.clear();
+  void submitPassphrase(BuildContext ctx) {
+    joinGameFuture = joinPrivateGame(ctx);
+    joinGameFuture.then((value) {
+      if (value != null) {
+        phraseController.clear();
+        ctx.pop();
+        switchToGame(value);
+      }
+    });
+  }
+
+  void switchToGame(PlayerInfo info) {
+    var chessGameArgs = ChessGameArguments(
+        lobbyID: info.lobbyID!,
+        playerID: info.playerID!,
+        passphrase: info.passphrase);
+
+    ConnectionCubit.getInstance().connect(
+      info.playerID!.uuid,
+      info.lobbyID!.uuid,
+      info.passphrase,
+    );
+
+    if (!chessGameArgs.isValid()) {
+      context.goNamed('lobbySelector');
+      const snackBar = SnackBar(
+        backgroundColor: Colors.amberAccent,
+        content: Text("Game information is corrupted"),
+      );
+      ScaffoldMessenger.of(context).clearSnackBars();
+      ScaffoldMessenger.of(context).showSnackBar(snackBar);
+
+      return;
+    }
+
+    context.goNamed('game', extra: chessGameArgs);
+  }
+
+  Future<PlayerInfo?> joinPrivateGame(BuildContext context) async {
+    http.Response response;
+
+    // server expects us to send the passphrase
+    var info = PlayerInfo(
+        playerID: null, lobbyID: null, passphrase: phraseController.text);
+
+    try {
+      response = await http.post(Uri.parse(config.getJoinURL()),
+          body: jsonEncode(info), headers: {"Accept": "application/json"});
+    } catch (e) {
+      log(e.toString());
+
+      if (!context.mounted) return null;
+
+      const snackBar = SnackBar(
+        backgroundColor: Colors.amberAccent,
+        content: Text("mChess server is not responding. Try again or give up"),
+      );
+      ScaffoldMessenger.of(context).clearSnackBars();
+      ScaffoldMessenger.of(context).showSnackBar(snackBar);
+      return null;
+    }
+
+    if (response.statusCode == HttpStatus.notFound) {
+      const snackBar = SnackBar(
+        backgroundColor: Colors.amberAccent,
+        content: Text("Passphrase could not be found."),
+      );
+
+      if (!context.mounted) return null;
+
+      ScaffoldMessenger.of(context).clearSnackBars();
+      ScaffoldMessenger.of(context).showSnackBar(snackBar);
+      return null;
+    }
+
+    if (response.statusCode == HttpStatus.ok) {
+      var info = PlayerInfo.fromJson(jsonDecode(response.body));
+      log('Player info received from server: ');
+      log('lobbyID: ${info.lobbyID}');
+      log('playerID: ${info.playerID}');
+      log('passphrase: ${info.passphrase}');
+
+      return info;
+    }
+
+    return null;
  }
 }
--- a/lib/utils/chess_router.dart
+++ b/lib/utils/chess_router.dart
@ -1,11 +1,8 @@
-import 'dart:developer';
-
 import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mchess/pages/join_game_handle_widget.dart';
+import 'package:mchess/pages/chess_game.dart';
 import 'package:mchess/pages/lobby_selector.dart';
-import 'package:mchess/pages/create_game_widget.dart';
-import 'package:mchess/utils/passphrase.dart';
+import 'package:mchess/pages/host_game.dart';

 final navigatorKey = GlobalKey<NavigatorState>();

@ -30,23 +27,22 @@ class ChessAppRouter {
        },
        routes: [
          GoRoute(
-              path: 'createGame',
-              name: 'createGame',
+              path: 'host',
+              name: 'host',
              builder: (context, state) {
-                return const CreateGameWidget();
+                return const HostGameWidget();
              }),
          GoRoute(
-            path: 'game/:phrase',
+            path: 'game',
            name: 'game',
            builder: (context, state) {
-              var urlPhrase = state.pathParameters['phrase'];
-              if (urlPhrase == null) {
-                log('in /game route builder: url phrase null');
-                return const LobbySelector();
-              }
+              var args = state.extra as ChessGameArguments;

-              return JoinGameHandleWidget(
-                  passphrase: urlPhrase.toPhraseWithSpaces());
+              return ChessGame(
+                lobbyID: args.lobbyID,
+                playerID: args.playerID,
+                passphrase: args.passphrase,
+              );
            },
          )
        ],
--- a/lib/utils/config.dart
+++ b/lib/utils/config.dart
@ -3,7 +3,7 @@ const debugURL = 'localhost:8080';

 const useDbgUrl = false;

-String getCreateGameURL() {
+String getHostURL() {
  var prot = 'https';
  var domain = prodURL;
  if (useDbgUrl) {
@ -13,7 +13,7 @@ String getCreateGameURL() {
  return '$prot://$domain/api/hostPrivate';
 }

-String getJoinGameURL() {
+String getJoinURL() {
  var prot = 'https';
  var domain = prodURL;
  if (useDbgUrl) {
--- a/lib/utils/passphrase.dart
+++ b/lib/utils/passphrase.dart
@ -1,30 +0,0 @@
-extension PassphaseURL on String {
-  String capitalize() {
-    return "${this[0].toUpperCase()}${substring(1).toLowerCase()}";
-  }
-
-  String toURL() {
-    var words = split(' ');
-
-    for (var i = 0; i < words.length; i++) {
-      words[i] = words[i].capitalize();
-    }
-
-    return words.join();
-  }
-
-  String toPhraseWithSpaces() {
-    var phrase = '';
-
-    for (var i = 0; i < length; i++) {
-      if (this[i] == this[i].toUpperCase()) {
-        phrase += ' ';
-      }
-      phrase += this[i].toLowerCase();
-    }
-
-    phrase = phrase.trim();
-
-    return phrase.toLowerCase();
-  }
-}
--- a/pubspec.lock
+++ b/pubspec.lock
@ -114,10 +114,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_bloc
-      sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
+      sha256: f0ecf6e6eb955193ca60af2d5ca39565a86b8a142452c5b24d96fb477428f4d2
      url: "https://pub.dev"
    source: hosted
-    version: "8.1.6"
+    version: "8.1.5"
  flutter_lints:
    dependency: "direct dev"
    description:
@ -148,10 +148,10 @@ packages:
    dependency: "direct main"
    description:
      name: go_router
-      sha256: cdae1b9c8bd7efadcef6112e81c903662ef2ce105cbd220a04bbb7c3425b5554
+      sha256: "9e0f7d1a3e7dc5010903e330fbc5497872c4c3cf6626381d69083cc1d5113c1e"
      url: "https://pub.dev"
    source: hosted
-    version: "14.2.0"
+    version: "14.0.2"
  http:
    dependency: "direct main"
    description:
@ -292,10 +292,10 @@ packages:
    dependency: transitive
    description:
      name: platform
-      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.5"
+    version: "3.1.4"
  plugin_platform_interface:
    dependency: transitive
    description:
@ -332,10 +332,10 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
+      sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.3"
+    version: "2.2.2"
  shared_preferences_foundation:
    dependency: transitive
    description:
@ -449,10 +449,10 @@ packages:
    dependency: "direct main"
    description:
      name: universal_platform
-      sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec"
+      sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.0"
+    version: "1.0.0+1"
  uuid:
    dependency: "direct main"
    description:
@ -513,10 +513,10 @@ packages:
    dependency: transitive
    description:
      name: web_socket
-      sha256: "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078"
+      sha256: bfe704c186c6e32a46f6607f94d079cd0b747b9a489fceeecc93cd3adb98edd5
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.5"
+    version: "0.1.3"
  web_socket_channel:
    dependency: "direct main"
    description:
@ -529,10 +529,10 @@ packages:
    dependency: transitive
    description:
      name: win32
-      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
      url: "https://pub.dev"
    source: hosted
-    version: "5.5.1"
+    version: "5.5.0"
  xdg_directories:
    dependency: transitive
    description:
@ -550,5 +550,5 @@ packages:
    source: hosted
    version: "6.5.0"
 sdks:
-  dart: ">=3.4.0 <4.0.0"
-  flutter: ">=3.22.0"
+  dart: ">=3.3.0 <4.0.0"
+  flutter: ">=3.19.0"
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@ -8,11 +8,16 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mchess/pages/chess_game.dart';
+import 'package:uuid/uuid.dart';

 void main() {
  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
    // Build our app and trigger a frame.
-    await tester.pumpWidget(const ChessGame());
+    await tester.pumpWidget(ChessGame(
+      playerID: UuidValue.fromString("test"),
+      lobbyID: UuidValue.fromString("testLobbyId"),
+      passphrase: 'test',
+    ));

    // Verify that our counter starts at 0.
    expect(find.text('0'), findsOneWidget);