improve tournament notifications

kraktus · Oct 28, 2012 · 1c995a6 · 1c995a6
1 parent 02686fc
commit 1c995a6
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 3 deletions.
diff --git a/app/tournament/Hub.scala b/app/tournament/Hub.scala
@@ -37,6 +37,8 @@ final class Hub(
 
  case Reload ⇒ notifyReload
 
+ case Start ⇒ notifyVersion("start", JsNull)
+
  case ReloadPage ⇒ notifyVersion("reloadPage", JsNull)
 
  case PingVersion(uid, v) ⇒ {

diff --git a/app/tournament/Socket.scala b/app/tournament/Socket.scala
@@ -28,6 +28,10 @@ final class Socket(
  private val timeoutDuration = 1 second
  implicit private val timeout = Timeout(timeoutDuration)
 
+ def start(tournamentId: String) = io {
+ hubMaster ! Forward(tournamentId, Start)
+ }
+
  def reload(tournamentId: String) = io {
  hubMaster ! Forward(tournamentId, Reload)
  }

diff --git a/app/tournament/TournamentApi.scala b/app/tournament/TournamentApi.scala
@@ -44,7 +44,7 @@ private[tournament] final class TournamentApi(
  def start(created: Created): Option[IO[Unit]] = created.start map { started ⇒
  for {
  _ ← repo saveIO started
- _ ← socket reload started.id
+ _ ← socket start started.id
  _ ← reloadSiteSocket
  _ ← lobbyReload
  } yield ()

diff --git a/app/tournament/actorApi.scala b/app/tournament/actorApi.scala
@@ -36,6 +36,7 @@ case class CloseTournament(tournamentId: String)
 case object GetTournamentIds
 case class GetHub(tournamentId: String)
 case class Forward(tournamentId: String, msg: Any)
+case object Start
 case object Reload
 case object ReloadPage
 case object HubTimeout

diff --git a/public/javascripts/big.js b/public/javascripts/big.js
@@ -1768,9 +1768,15 @@ $(function() {
  });
  }
 
+ function start() {
+ alert("Tournament is starting!");
+ reload();
+ }
+
  lichess.socket = new strongSocket(lichess.socketUrl + socketUrl, _ld_.version, $.extend(true, lichess.socketDefaults, {
  events: {
  talk: function(e) { if (chatExists) addToChat(e); },
+ start: start,
  reload: reload,
  reloadPage: function() {
  location.reload();

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
@@ -758,7 +758,7 @@ div.notifications {
 div.notifications > div {
  margin-left: 211px;
  width: 498px;
- border: 1px solid #404040;
+ border: 1px solid #c0c0c0;
  padding: 6px 8px 7px 8px;
  margin-bottom: 8px;
  border-radius: 3px;

diff --git a/public/stylesheets/dark.css b/public/stylesheets/dark.css
@@ -89,7 +89,7 @@ body.dark div.lichess_overboard p.explanations,
 body.dark div.search_status,
 body.dark #tournament table.data,
 body.dark #tournament table.data thead th,
-#tournament table.data 
+body.dark div.notifications > div 
 {
  border-color: #3e3e3e;
 }