Merge branch 'master' into broadcast-top-ongoing

.ignore

@@ -6,3 +6,6 @@ public/sound
 public/piece
 public/piece-css
 public/flair
+public/images
+public/cursors
+*.png

COPYING.md

@@ -59,6 +59,7 @@ public/piece/disguised | danegraphics | [CC BY-NC-SA 4.0](https://creativecommon
 public/piece/kiwen-suwi | [neverRare](https://github.com/neverRare) | [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/)
 public/piece/mpchess | [Maxime Chupin](https://github.com/chupinmaxime) | [GPL3v3+](https://www.gnu.org/licenses/quick-guide-gplv3.en.html)
 public/piece/cooke | [fejfar](https://github.com/fejfar) | [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/)
+public/piece/monarchy | [slither77](https://github.com/slither77) | [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 public/sounds/futuristic | [Enigmahack](https://github.com/Enigmahack) | AGPLv3+
 public/sounds/nes | [Enigmahack](https://github.com/Enigmahack) | AGPLv3+
 public/sounds/piano | [Enigmahack](https://github.com/Enigmahack) | AGPLv3+

app/views/user/show/header.scala

@@ -89,63 +89,66 @@ object header:
  (ctx.isAuth && ctx.isnt(u))
  .option(a(cls := "nm-item note-zone-toggle")(splitNumber(s"${social.notes.size} Notes")))
  ),
- div(cls := "user-actions dropdown")(
- a(cls := "text", dataIcon := Icon.Hamburger),
- div(cls := "dropdown-window")(
- ctx
- .is(u)
- .option(
- frag(
- a(
- cls := "text",
- href := routes.Account.profile,
- dataIcon := Icon.Gear
- )(trans.site.editProfile.txt()),
- a(
- cls := "text",
- href := routes.Relation.blocks(),
- dataIcon := Icon.NotAllowed
- )(trans.site.listBlockedPlayers.txt())
- )
- ),
- isGranted(_.UserModView).option(
- a(
- cls := "text mod-zone-toggle",
- href := routes.User.mod(u.username),
- dataIcon := Icon.Agent
- )("Mod zone (Hotkey: m)")
- ),
- a(
- cls := "text",
- href := routes.User.tv(u.username),
- dataIcon := Icon.AnalogTv
- )(trans.site.watchGames.txt()),
- ctx
- .isnt(u)
- .option(
- views.relation.actions(
- u.light,
- relation = social.relation,
- followable = social.followable,
- blocked = social.blocked
- )
- ),
- a(
- cls := "text",
- href := s"${routes.UserAnalysis.index}#explorer/${u.username}",
- dataIcon := Icon.Book
- )(trans.site.openingExplorer.txt()),
+ div(cls := "user-actions")(
+ isGranted(_.UserModView).option(
  a(
- cls := "text",
- href := routes.User.download(u.username),
- dataIcon := Icon.Download
- )(trans.site.exportGames.txt()),
- (ctx.isAuth && ctx.kid.no && ctx.isnt(u)).option(
+ cls := "mod-zone-toggle",
+ href := routes.User.mod(u.username),
+ dataIcon := Icon.Agent,
+ title := "Mod zone (Hotkey: m)"
+ )
+ ),
+ div(cls := "dropdown")(
+ a(dataIcon := Icon.Hamburger),
+ div(cls := "dropdown-window")(
+ ctx
+ .is(u)
+ .option(
+ frag(
+ a(
+ cls := "text",
+ href := routes.Account.profile,
+ dataIcon := Icon.Gear
+ )(trans.site.editProfile.txt()),
+ a(
+ cls := "text",
+ href := routes.Relation.blocks(),
+ dataIcon := Icon.NotAllowed
+ )(trans.site.listBlockedPlayers.txt())
+ )
+ ),
  a(
  cls := "text",
- href := s"${routes.Report.form}?username=${u.username}",
- dataIcon := Icon.CautionTriangle
- )(trans.site.reportXToModerators.txt(u.username))
+ href := routes.User.tv(u.username),
+ dataIcon := Icon.AnalogTv
+ )(trans.site.watchGames.txt()),
+ ctx
+ .isnt(u)
+ .option(
+ views.relation.actions(
+ u.light,
+ relation = social.relation,
+ followable = social.followable,
+ blocked = social.blocked
+ )
+ ),
+ a(
+ cls := "text",
+ href := s"${routes.UserAnalysis.index}#explorer/${u.username}",
+ dataIcon := Icon.Book
+ )(trans.site.openingExplorer.txt()),
+ a(
+ cls := "text",
+ href := routes.User.download(u.username),
+ dataIcon := Icon.Download
+ )(trans.site.exportGames.txt()),
+ (ctx.isAuth && ctx.kid.no && ctx.isnt(u)).option(
+ a(
+ cls := "text",
+ href := s"${routes.Report.form}?username=${u.username}",
+ dataIcon := Icon.CautionTriangle
+ )(trans.site.reportXToModerators.txt(u.username))
+ )
  )
  )
  )

bin/gen/piece-sprite

@@ -44,6 +44,7 @@ themes = [
  ['kiwen-suwi', 'svg'],
  ['mpchess','svg'],
  ['cooke','svg'],
+ ['monarchy', 'svg'],
 ]
 types = {
  'svg' => 'svg+xml;base64,',

build.sbt

@@ -136,12 +136,12 @@ lazy val rating = module("rating",
 ).dependsOn(common % "test->test")
 
 lazy val cms = module("cms",
- Seq(memo, coreI18n, ui),
+ Seq(memo, ui),
  Seq()
 )
 
 lazy val puzzle = module("puzzle",
- Seq(coreI18n, tree, memo, rating, ui),
+ Seq(tree, memo, rating),
  tests.bundle
 )
 
@@ -161,7 +161,7 @@ lazy val video = module("video",
 )
 
 lazy val coach = module("coach",
- Seq(memo, rating, ui),
+ Seq(memo, rating),
  Seq()
 )
 
@@ -181,7 +181,7 @@ lazy val feed = module("feed",
 )
 
 lazy val ublog = module("ublog",
- Seq(coreI18n, memo, ui),
+ Seq(memo, ui),
  Seq(bloomFilter)
 )
 
@@ -191,7 +191,7 @@ lazy val evaluation = module("evaluation",
 )
 
 lazy val perfStat = module("perfStat",
- Seq(ui, memo, rating),
+ Seq(memo, rating),
  Seq()
 )
 
@@ -221,7 +221,7 @@ lazy val timeline = module("timeline",
 )
 
 lazy val event = module("event",
- Seq(memo, coreI18n, ui),
+ Seq(memo, ui),
  Seq()
 )
 
@@ -241,7 +241,7 @@ lazy val game = module("game",
 )
 
 lazy val gameSearch = module("gameSearch",
- Seq(coreI18n, search, ui),
+ Seq(search, ui),
  tests.bundle
 )
 
@@ -257,7 +257,7 @@ lazy val bot = module("bot",
 )
 
 lazy val analyse = module("analyse",
- Seq(coreI18n, tree, memo, ui),
+ Seq(tree, memo, ui),
  tests.bundle
 )
 
@@ -267,7 +267,7 @@ lazy val round = module("round",
 )
 
 lazy val pool = module("pool",
- Seq(coreI18n, db, rating),
+ Seq(db, rating),
  Seq()
 )
 
@@ -282,7 +282,7 @@ lazy val lobby = module("lobby",
 )
 
 lazy val setup = module("setup",
- Seq(lobby, ui),
+ Seq(lobby),
  Seq()
 )
 
@@ -292,12 +292,12 @@ lazy val insight = module("insight",
 )
 
 lazy val tutor = module("tutor",
- Seq(insight, ui),
+ Seq(insight),
  tests.bundle
 )
 
 lazy val opening = module("opening",
- Seq(coreI18n, memo, ui),
+ Seq(memo, ui),
  tests.bundle
 )
 
@@ -307,7 +307,7 @@ lazy val gathering = module("gathering",
 )
 
 lazy val tournament = module("tournament",
- Seq(gathering, room, memo, ui),
+ Seq(gathering, room, memo),
  Seq(lettuce) ++ tests.bundle
 )
 
@@ -332,7 +332,7 @@ lazy val irwin = module("irwin",
 )
 
 lazy val oauth = module("oauth",
- Seq(memo, coreI18n, ui),
+ Seq(memo, ui),
  Seq()
 )
 
@@ -362,7 +362,7 @@ lazy val title = module("title",
 )
 
 lazy val study = module("study",
- Seq(coreI18n, tree, memo, room, ui),
+ Seq(tree, memo, room, ui),
  Seq(lettuce) ++ tests.bundle ++ Seq(scalacheck, munitCheck, chess.testKit)
 ).dependsOn(common % "test->test")
 
@@ -412,7 +412,7 @@ lazy val mailer = module("mailer",
 )
 
 lazy val plan = module("plan",
- Seq(coreI18n, memo, ui),
+ Seq(memo, ui),
  tests.bundle
 )
 
@@ -422,7 +422,7 @@ lazy val relation = module("relation",
 )
 
 lazy val pref = module("pref",
- Seq(coreI18n, memo, ui),
+ Seq(memo, ui),
  Seq()
 )
 

modules/pref/src/main/PieceSet.scala

@@ -47,6 +47,7 @@ object PieceSet extends PieceSetObject:
  PieceSet("tatiana"),
  PieceSet("staunty"),
  PieceSet("cooke"),
+ PieceSet("monarchy"),
  PieceSet("governor"),
  PieceSet("dubrovny"),
  PieceSet("icpieces"),

modules/relation/src/main/ui/RelationUi.scala

@@ -126,7 +126,7 @@ final class RelationUi(helpers: Helpers):
  trans.site.friends()
  )
  ),
- pagTable(pag, routes.Relation.following(u.username))
+ pagTable(pag, routes.Relation.following(u.username), withActions = true)
  )
 
  def blocks(u: User, pag: Paginator[Related[UserWithPerfs]])(using Context) =
@@ -136,7 +136,7 @@ final class RelationUi(helpers: Helpers):
  h1(userLink(u, withOnline = false)),
  div(cls := "actions")(trans.site.blocks.pluralSame(pag.nbResults))
  ),
- pagTable(pag, routes.Relation.blocks())
+ pagTable(pag, routes.Relation.blocks(), withActions = false)
  )
 
  def opponents(u: User, sugs: List[Related[UserWithPerfs]])(using ctx: Context) =
@@ -177,7 +177,9 @@ final class RelationUi(helpers: Helpers):
  .wrap: body =>
  main(cls := "box page-small")(body)
 
- private def pagTable(pager: Paginator[Related[UserWithPerfs]], call: Call)(using ctx: Context) =
+ private def pagTable(pager: Paginator[Related[UserWithPerfs]], call: Call, withActions: Boolean)(using
+ ctx: Context
+ ) =
  table(cls := "slist slist-pad")(
  if pager.nbResults > 0
  then
@@ -189,7 +191,8 @@ final class RelationUi(helpers: Helpers):
  td(trans.site.nbGames.plural(r.user.count.game, r.user.count.game.localize)),
  td(r.user.seenAt.map: seen =>
  trans.site.lastSeenActive(momentFromNow(seen))),
- td(actions(r.user.light, relation = r.relation, followable = r.followable, blocked = false))
+ withActions.option:
+ td(actions(r.user.light, relation = r.relation, followable = r.followable, blocked = false))
  ),
  pagerNextTable(pager, np => addQueryParam(call.url, "page", np.toString))
  )

public/piece-css/monarchy.external.css

@@ -0,0 +1,12 @@
+.is2d .pawn.white {background-image:url('/assets/piece/monarchy/wP.svg')}
+.is2d .knight.white {background-image:url('/assets/piece/monarchy/wN.svg')}
+.is2d .bishop.white {background-image:url('/assets/piece/monarchy/wB.svg')}
+.is2d .rook.white {background-image:url('/assets/piece/monarchy/wR.svg')}
+.is2d .queen.white {background-image:url('/assets/piece/monarchy/wQ.svg')}
+.is2d .king.white {background-image:url('/assets/piece/monarchy/wK.svg')}
+.is2d .pawn.black {background-image:url('/assets/piece/monarchy/bP.svg')}
+.is2d .knight.black {background-image:url('/assets/piece/monarchy/bN.svg')}
+.is2d .bishop.black {background-image:url('/assets/piece/monarchy/bB.svg')}
+.is2d .rook.black {background-image:url('/assets/piece/monarchy/bR.svg')}
+.is2d .queen.black {background-image:url('/assets/piece/monarchy/bQ.svg')}
+.is2d .king.black {background-image:url('/assets/piece/monarchy/bK.svg')}