From 85f87f19b6220e1f3a3a18a53e38b84bfdcd07a9 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Sun, 28 Dec 2014 18:50:30 +0100 Subject: [PATCH] more work on mithril lobby --- app/controllers/Lobby.scala | 2 +- app/views/lobby/jsI18n.scala.html | 9 +- app/views/setup/filterCheckbox.scala.html | 4 +- app/views/setup/filterCheckboxes.scala.html | 2 +- modules/api/src/main/LobbyApi.scala | 3 + modules/lobby/src/main/Seek.scala | 2 +- modules/setup/src/main/FilterConfig.scala | 2 +- public/javascripts/big.js | 344 +----------------- public/stylesheets/dark.css | 8 +- public/stylesheets/home.css | 102 ++---- ui/lobby/src/ctrl.js | 35 +- ui/lobby/src/filter.js | 21 ++ ui/lobby/src/hookRepo.js | 15 +- ui/lobby/src/main.js | 6 +- ui/lobby/src/seekRepo.js | 26 ++ ui/lobby/src/socket.js | 4 +- ui/lobby/src/view/correspondence.js | 54 +++ ui/lobby/src/view/main.js | 16 +- .../{realTimeChart.js => realTime/chart.js} | 32 +- ui/lobby/src/view/realTime/filter.js | 81 +++++ ui/lobby/src/view/realTime/list.js | 77 ++++ ui/lobby/src/view/realTime/main.js | 32 ++ ui/lobby/src/view/realTimeList.js | 76 ---- ui/lobby/src/view/util.js | 12 + ui/lobby/src/xhr.js | 16 +- 25 files changed, 440 insertions(+), 541 deletions(-) create mode 100644 ui/lobby/src/filter.js create mode 100644 ui/lobby/src/seekRepo.js create mode 100644 ui/lobby/src/view/correspondence.js rename ui/lobby/src/view/{realTimeChart.js => realTime/chart.js} (86%) create mode 100644 ui/lobby/src/view/realTime/filter.js create mode 100644 ui/lobby/src/view/realTime/list.js create mode 100644 ui/lobby/src/view/realTime/main.js delete mode 100644 ui/lobby/src/view/realTimeList.js create mode 100644 ui/lobby/src/view/util.js diff --git a/app/controllers/Lobby.scala b/app/controllers/Lobby.scala index aaeed7f177..9d13b87daf 100644 --- a/app/controllers/Lobby.scala +++ b/app/controllers/Lobby.scala @@ -53,7 +53,7 @@ object Lobby extends LilaController { negotiate( html = if (HTTPRequest isSynchronousHttp ctx.req) fuccess(Redirect(routes.Lobby.home)) else fuccess(html.lobby.seeks(seeks)), - api = _ => fuccess(Ok(Json.obj("seeks" -> JsArray(seeks.map(_.render))))) + api = _ => fuccess(Ok(JsArray(seeks.map(_.render)))) ) } } diff --git a/app/views/lobby/jsI18n.scala.html b/app/views/lobby/jsI18n.scala.html index c2fd4395e9..5c95241a4f 100644 --- a/app/views/lobby/jsI18n.scala.html +++ b/app/views/lobby/jsI18n.scala.html @@ -9,5 +9,12 @@ trans.joinTheGame, trans.cancel, trans.casual, trans.rated, -trans.variant +trans.variant, +trans.mode, +trans.list, +trans.graph, +trans.filterGames, +trans.youNeedAnAccountToDoThat, +trans.oneDay, +trans.nbDays ))) diff --git a/app/views/setup/filterCheckbox.scala.html b/app/views/setup/filterCheckbox.scala.html index 03623dcde6..5791f2256c 100644 --- a/app/views/setup/filterCheckbox.scala.html +++ b/app/views/setup/filterCheckbox.scala.html @@ -1,8 +1,6 @@ @(form: Form[_], key: String, index: Int, value: String, checks: List[String], text: Html, hint: Option[String]) -