diff options
Diffstat (limited to 'server/app')
-rw-r--r-- | server/app/controllers/HomeController.scala | 4 | ||||
-rw-r--r-- | server/app/controllers/actors.scala | 2 | ||||
-rw-r--r-- | server/app/views/chat.scala.html | 11 | ||||
-rw-r--r-- | server/app/views/index.scala.html | 8 |
4 files changed, 17 insertions, 8 deletions
diff --git a/server/app/controllers/HomeController.scala b/server/app/controllers/HomeController.scala index 4d48c98..7f5e596 100644 --- a/server/app/controllers/HomeController.scala +++ b/server/app/controllers/HomeController.scala @@ -31,6 +31,10 @@ class HomeController @Inject() ( Ok(views.html.index()) } + def chat(uid: String) = Action { implicit request => + Ok(views.html.chat(uid)) + } + def socket(uid: String) = WebSocket.accept[Command, Event] { request => ActorFlow.actorRef(out => Props(classOf[ClientActor], uid, room, out)) } diff --git a/server/app/controllers/actors.scala b/server/app/controllers/actors.scala index f10f925..138a13f 100644 --- a/server/app/controllers/actors.scala +++ b/server/app/controllers/actors.scala @@ -41,10 +41,10 @@ class RoomActor extends Actor { } case Terminated(client) => - clients -= client for ( (cl, _) <- clients ) { cl ! Left(clients(client)) } + clients -= client case Broadcast(content) => val origin = clients(sender) diff --git a/server/app/views/chat.scala.html b/server/app/views/chat.scala.html new file mode 100644 index 0000000..3a1fa30 --- /dev/null +++ b/server/app/views/chat.scala.html @@ -0,0 +1,11 @@ +@(uid: String) + +@main("Welcome to Chat") { + <main id="root"> + Loading + </main> + <script src="@routes.Assets.versioned("client-fastopt.js")" type="text/javascript"></script> + <script type="text/javascript"> + chat.Main().main("@uid") + </script> +} diff --git a/server/app/views/index.scala.html b/server/app/views/index.scala.html index 4b71c59..05dbc0d 100644 --- a/server/app/views/index.scala.html +++ b/server/app/views/index.scala.html @@ -1,11 +1,5 @@ @() @main("Welcome to Chat") { - <main id="root"> - hello - </main> - <script src="@routes.Assets.versioned("client-fastopt.js")" type="text/javascript"></script> - <script type="text/javascript"> - chat.Main().main() - </script> + } |