move user package and dgt, simul, tournament css out of bits

lichess-org · Feb 9, 2025 · 8b9e27b · 8b9e27b
1 parent 2cef20a
commit 8b9e27b
Show file tree

Hide file tree

Showing 49 changed files with 64 additions and 33 deletions.
diff --git a/app/views/user/show/page.scala b/app/views/user/show/page.scala
@@ -34,7 +34,7 @@ object page:
       )
       .js(pageModule(info))
       .js(esModules())
-      .css("bits.user.show")
+      .css("user.show")
       .css(isGranted(_.UserModView).option("mod.user"))
       .flag(_.noRobots, !indexable(u)):
         main(cls := "page-menu", ui.dataUsername := u.username)(
@@ -59,8 +59,8 @@ object page:
     Page(s"${u.username} $filterName$pageName")
       .js(pageModule(info))
       .js(esModules(filters.current.name == "search"))
-      .css("bits.user.show")
-      .css((filters.current.name == "search").option("bits.user.show.search"))
+      .css("user.show")
+      .css((filters.current.name == "search").option("user.show.search"))
       .css(isGranted(_.UserModView).option("mod.user"))
       .flag(_.noRobots, !indexable(u)):
         main(cls := "page-menu", ui.dataUsername := u.username)(
@@ -75,7 +75,7 @@ object page:
 
   private def esModules(withSearch: Boolean = false)(using Context): EsmList =
     infiniteScrollEsmInit
-      ++ esmInit("bits.user")
+      ++ esmInit("user")
       ++ withSearch.so(Esm("bits.gameSearch"))
       ++ isGranted(_.UserModView).so(Esm("mod.user"))
 

diff --git a/modules/perfStat/src/main/PerfStatUi.scala b/modules/perfStat/src/main/PerfStatUi.scala
@@ -22,13 +22,13 @@ final class PerfStatUi(helpers: Helpers)(communityMenu: Context ?=> Frag):
     import stat.perfType
     Page(s"${user.username} - ${trans.perfStat.perfStats.txt(perfType.trans)}")
       .flag(_.noRobots)
-      .js(Esm("bits.user"))
+      .js(Esm("user"))
       .js(ratingChart.map: rc =>
         esmInit(
           "chart.ratingHistory",
           SafeJsonStr(s"{data:$rc,singlePerfName:'${perfType.trans(using transDefault)}'}")
         ))
-      .css("bits.perf-stat"):
+      .css("user.perf.stat"):
         main(cls := s"page-menu")(
           st.aside(cls := "page-menu__menu")(side),
           div(cls := s"page-menu__content box perf-stat ${perfType.key}")(
@@ -372,7 +372,7 @@ final class PerfStatUi(helpers: Helpers)(communityMenu: Context ?=> Frag):
   ) =
     val myVisiblePerfs = me.map(_.perfs).ifTrue(ctx.pref.showRatings)
     Page(trans.site.weeklyPerfTypeRatingDistribution.txt(perfType.trans))
-      .css("bits.user.rating.stats")
+      .css("user.rating.stats")
       .flag(_.fullScreen)
       .js(
         PageModule(

diff --git a/modules/pref/src/main/ui/AccountUi.scala b/modules/pref/src/main/ui/AccountUi.scala
@@ -9,8 +9,8 @@ final class AccountUi(helpers: Helpers):
 
   def AccountPage(title: String, active: String)(using lila.ui.Context) =
     Page(title)
-      .css("bits.account")
-      .js(Esm("bits.account"))
+      .css("user.account")
+      .js(Esm("user.account"))
       .wrap: body =>
         main(cls := "account page-menu")(
           menu(active),

diff --git a/modules/simul/src/main/ui/SimulHome.scala b/modules/simul/src/main/ui/SimulHome.scala
@@ -149,7 +149,7 @@ final class SimulHome(helpers: Helpers, ui: SimulUi):
 
   def hosted(user: User, pager: Paginator[Simul])(using Context) =
     Page(s"${user.username} hosted simuls")
-      .css("bits.user-simul")
+      .css("simul.user.list")
       .js(infiniteScrollEsmInit):
         main(cls := "page-small box simul-list")(
           if pager.nbResults == 0 then

diff --git a/modules/tournament/src/main/ui/UserTournament.scala b/modules/tournament/src/main/ui/UserTournament.scala
@@ -164,7 +164,7 @@ final class UserTournament(helpers: Helpers, ui: TournamentUi):
 
   private def page(u: User, title: String, path: String)(using ctx: Context) =
     Page(title)
-      .css("bits.user-tournament")
+      .css("tournament.user")
       .wrap: body =>
         main(cls := "page-menu")(
           lila.ui.bits.pageMenuSubnav(

diff --git a/modules/user/src/main/ui/UserGamesDownload.scala b/modules/user/src/main/ui/UserGamesDownload.scala
@@ -11,7 +11,7 @@ final class UserGamesDownload(helpers: Helpers):
   def apply(user: User)(using ctx: Context) =
     Page(s"${user.username} • ${trans.site.exportGames.txt()}")
       .css("bits.search")
-      .js(Esm("bits.userGamesDownload")):
+      .js(Esm("user.gamesDownload")):
         main(cls := "box page-small search")(
           boxTop(h1(userLink(user), s" • ${trans.site.exportGames.txt()}")),
           form(

diff --git a/modules/user/src/main/ui/UserList.scala b/modules/user/src/main/ui/UserList.scala
@@ -18,7 +18,7 @@ final class UserList(helpers: Helpers, bits: UserBits):
       tournamentWinners: Frag
   )(using ctx: Context) =
     Page(trans.site.players.txt())
-      .css("bits.user.list")
+      .css("user.list")
       .flag(_.fullScreen)
       .graph(
         title = "Chess players and leaderboards",
@@ -120,7 +120,7 @@ final class UserList(helpers: Helpers, bits: UserBits):
     val title = s"${users.size} Online bots"
     Page(title)
       .css("bits.slist")
-      .css("bits.bot.list")
+      .css("user.bot.list")
       .flag(_.fullScreen):
         main(cls := "page-menu bots")(
           bits.communityMenu("bots"),

diff --git a/modules/web/src/main/ui/DgtUi.scala b/modules/web/src/main/ui/DgtUi.scala
@@ -203,7 +203,7 @@ final class DgtUi(helpers: Helpers):
 
   private def layout(path: String, token: Option[String] = None)(using Context) =
     Page(trd.playWithDgtBoard.txt())
-      .css("bits.dgt")
+      .css("dgt")
       .js(token.fold(esmInit("dgt"))(esmInit("dgt", _)))
       .csp(_.withAnyWs)
       .wrap: body =>

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/ui/bits/css/build/bits.clas.scss b/ui/bits/css/build/bits.clas.scss
@@ -4,5 +4,5 @@
 @import '../../../common/css/component/tablesort';
 @import '../../../common/css/component/color-icon';
 @import '../../../common/css/component/markdown';
-@import '../user/activity';
+@import '../../../user/css/activity';
 @import '../clas';
diff --git a/ui/bits/css/build/bits.coach.scss b/ui/bits/css/build/bits.coach.scss
@@ -1,5 +1,5 @@
 @import '../../../common/css/plugin';
 @import '../../../common/css/component/mselect';
+@import '../../../common/css/component/ublog-card';
 @import '../../../analyse/css/study/list-widget';
-@import '../ublog/card';
 @import '../coach/coach';
diff --git a/ui/bits/css/build/bits.streamer.show.scss b/ui/bits/css/build/bits.streamer.show.scss
@@ -1,5 +1,5 @@
 @import '../../../common/css/plugin';
 @import '../../../common/css/form/cmn-toggle';
 @import '../../../common/css/component/flash';
-@import '../user/activity';
+@import '../../../user/css/activity';
 @import '../streamer/show';
diff --git a/ui/bits/css/ublog/_ublog.scss b/ui/bits/css/ublog/_ublog.scss
@@ -1,4 +1,4 @@
-@import 'card';
+@import '../../../common/css/component/ublog-card';
 @import 'markup';
 @import 'topic';
 @import 'post';

diff --git a/ui/bits/css/ublog/_card.scss → ui/common/css/component/_ublog-card.scss b/ui/bits/css/ublog/_card.scss → ui/common/css/component/_ublog-card.scss
diff --git a/ui/bits/css/_dgt.scss → ui/dgt/css/_dgt.scss b/ui/bits/css/_dgt.scss → ui/dgt/css/_dgt.scss
@@ -1,5 +1,3 @@
-@import './account';
-
 .dgt {
   h1 {
     color: $c-accent;

diff --git a/ui/bits/css/build/bits.dgt.scss → ui/dgt/css/build/dgt.scss b/ui/bits/css/build/bits.dgt.scss → ui/dgt/css/build/dgt.scss
@@ -1,4 +1,5 @@
 @import '../../../common/css/plugin';
 @import '../../../common/css/form/form3';
 @import '../../../common/css/form/radio';
+@import '../../../user/css/account';
 @import '../dgt';
diff --git a/ui/lobby/css/build/lobby.scss b/ui/lobby/css/build/lobby.scss
@@ -5,5 +5,5 @@
 @import '../../../common/css/component/glowing';
 @import '../../../common/css/component/tabs-horiz';
 @import '../../../common/css/component/markdown';
-@import '../../../bits/css/ublog/card';
+@import '../../../common/css/component/ublog-card';
 @import '../lobby';
diff --git a/ui/bits/css/_user-simul.scss → ui/simul/css/_user-list.scss b/ui/bits/css/_user-simul.scss → ui/simul/css/_user-list.scss
diff --git a/ui/bits/css/build/bits.user-simul.scss → ui/simul/css/build/simul.user.list.scss b/ui/bits/css/build/bits.user-simul.scss → ui/simul/css/build/simul.user.list.scss
@@ -1,4 +1,4 @@
 @import '../../../common/css/plugin';
 @import '../../../common/css/component/slist';
 @import '../../../common/css/component/color-icon';
-@import '../user-simul';
+@import '../user-list';
diff --git a/ui/bits/css/_user-tournament.scss → ui/tournament/css/_user.scss b/ui/bits/css/_user-tournament.scss → ui/tournament/css/_user.scss
diff --git a/ui/bits/css/build/bits.user-tournament.scss → ui/tournament/css/build/tournament.user.scss b/ui/bits/css/build/bits.user-tournament.scss → ui/tournament/css/build/tournament.user.scss
@@ -1,3 +1,3 @@
 @import '../../../common/css/plugin';
 @import '../../../common/css/component/slist';
-@import '../user-tournament';
+@import '../user';
diff --git a/ui/bits/css/_account.scss → ui/user/css/_account.scss b/ui/bits/css/_account.scss → ui/user/css/_account.scss
diff --git a/ui/bits/css/user/_activity.scss → ui/user/css/_activity.scss b/ui/bits/css/user/_activity.scss → ui/user/css/_activity.scss
diff --git a/ui/bits/css/user/_games.scss → ui/user/css/_games.scss b/ui/bits/css/user/_games.scss → ui/user/css/_games.scss
diff --git a/ui/bits/css/user/_header.scss → ui/user/css/_header.scss b/ui/bits/css/user/_header.scss → ui/user/css/_header.scss
diff --git a/ui/bits/css/user/_list-bot.scss → ui/user/css/_list-bot.scss b/ui/bits/css/user/_list-bot.scss → ui/user/css/_list-bot.scss
diff --git a/ui/bits/css/user/_list.scss → ui/user/css/_list.scss b/ui/bits/css/user/_list.scss → ui/user/css/_list.scss
diff --git a/ui/bits/css/user/_note-zone.scss → ui/user/css/_note-zone.scss b/ui/bits/css/user/_note-zone.scss → ui/user/css/_note-zone.scss
diff --git a/ui/bits/css/user/_number-menu.scss → ui/user/css/_number-menu.scss b/ui/bits/css/user/_number-menu.scss → ui/user/css/_number-menu.scss
diff --git a/ui/bits/css/_perf-stat.scss → ui/user/css/_perf-stat.scss b/ui/bits/css/_perf-stat.scss → ui/user/css/_perf-stat.scss
diff --git a/ui/bits/css/user/_profile.scss → ui/user/css/_profile.scss b/ui/bits/css/user/_profile.scss → ui/user/css/_profile.scss
@@ -21,7 +21,7 @@
     margin: 10px 0;
   }
 
-  @import '../../../common/css/component/chart';
+  @import '../../common/css/component/chart';
 
   .profile-side {
     @extend %flex-column;

diff --git a/ui/bits/css/user/_rating.stats.scss → ui/user/css/_rating.stats.scss b/ui/bits/css/user/_rating.stats.scss → ui/user/css/_rating.stats.scss
diff --git a/ui/bits/css/user/_search.scss → ui/user/css/_search.scss b/ui/bits/css/user/_search.scss → ui/user/css/_search.scss
diff --git a/ui/bits/css/user/_show.scss → ui/user/css/_show.scss b/ui/bits/css/user/_show.scss → ui/user/css/_show.scss
diff --git a/ui/bits/css/user/_sub-rating.scss → ui/user/css/_sub-rating.scss b/ui/bits/css/user/_sub-rating.scss → ui/user/css/_sub-rating.scss
diff --git a/ui/bits/css/user/_trophy.scss → ui/user/css/_trophy.scss b/ui/bits/css/user/_trophy.scss → ui/user/css/_trophy.scss
diff --git a/ui/bits/css/build/bits.account.scss → ui/user/css/build/user.account.scss b/ui/bits/css/build/bits.account.scss → ui/user/css/build/user.account.scss
diff --git a/ui/bits/css/build/bits.user.list.scss → ui/user/css/build/user.activity.scss b/ui/bits/css/build/bits.user.list.scss → ui/user/css/build/user.activity.scss
@@ -1,2 +1,2 @@
 @import '../../../common/css/plugin';
-@import '../user/list';
+@import '../activity';
diff --git a/ui/bits/css/build/bits.bot.list.scss → ui/user/css/build/user.bot.list.scss b/ui/bits/css/build/bits.bot.list.scss → ui/user/css/build/user.bot.list.scss
@@ -1,2 +1,2 @@
 @import '../../../common/css/plugin';
-@import '../user/list-bot';
+@import '../list-bot';
diff --git a/ui/user/css/build/user.list.scss b/ui/user/css/build/user.list.scss
@@ -0,0 +1,2 @@
+@import '../../../common/css/plugin';
+@import '../list';
diff --git a/ui/bits/css/build/bits.perf-stat.scss → ui/user/css/build/user.perf.stat.scss b/ui/bits/css/build/bits.perf-stat.scss → ui/user/css/build/user.perf.stat.scss
@@ -1,4 +1,4 @@
 @import '../../../common/css/plugin';
-@import '../user/sub-rating';
+@import '../sub-rating';
 @import '../../../common/css/component/chart';
 @import '../perf-stat';
diff --git a/...its/css/build/bits.user.rating.stats.scss → ui/user/css/build/user.rating.stats.scss b/...its/css/build/bits.user.rating.stats.scss → ui/user/css/build/user.rating.stats.scss
@@ -1,3 +1,3 @@
 @import '../../../common/css/plugin';
 @import '../../../common/css/component/mselect';
-@import '../user/rating.stats';
+@import '../rating.stats';
diff --git a/ui/bits/css/build/bits.user.show.scss → ui/user/css/build/user.show.scss b/ui/bits/css/build/bits.user.show.scss → ui/user/css/build/user.show.scss
@@ -4,7 +4,7 @@
 @import '../../../common/css/component/hover-text';
 @import '../../../common/css/component/crosstable';
 @import '../../../common/css/component/flash';
+@import '../../../common/css/component/ublog-card';
 @import '../../../common/css/form/cmn-toggle';
 @import '../../../game/css/row';
-@import '../ublog/card';
-@import '../user/show';
+@import '../show';
diff --git a/ui/bits/css/build/bits.user.show.search.scss → ui/user/css/build/user.show.search.scss b/ui/bits/css/build/bits.user.show.search.scss → ui/user/css/build/user.show.search.scss
@@ -1,3 +1,3 @@
 @import '../../../common/css/plugin';
 @import '../../../common/css/form/cmn-toggle';
-@import '../user/search';
+@import '../search';
diff --git a/ui/user/package.json b/ui/user/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "user",
+  "version": "2.0.0",
+  "private": true,
+  "description": "account & profile ui",
+  "author": "Thibault Duplessis",
+  "license": "AGPL-3.0-or-later",
+  "dependencies": {
+    "bits": "workspace:*",
+    "common": "workspace:*"
+  },
+  "build": {
+    "bundle": "src/user.*ts"
+  }
+}
diff --git a/ui/bits/src/bits.account.ts → ui/user/src/user.account.ts b/ui/bits/src/bits.account.ts → ui/user/src/user.account.ts
@@ -2,7 +2,7 @@ import * as licon from 'common/licon';
 import * as xhr from 'common/xhr';
 import { storage } from 'common/storage';
 import { addPasswordVisibilityToggleListener } from 'common/password';
-import flairPickerLoader from './flairPicker';
+import flairPickerLoader from 'bits/flairPicker';
 import { confirm } from 'common/dialog';
 import { $as } from 'common';
 
@@ -68,6 +68,7 @@ site.load.then(() => {
       confirm(this.title, i18n.site.ok, i18n.site.cancel).then(yes => {
         if (yes) $as<HTMLFormElement>(form).submit();
       });
+      return false;
     });
   });
 

diff --git a/ui/bits/src/bits.userGamesDownload.ts → ui/user/src/user.gamesDownload.ts b/ui/bits/src/bits.userGamesDownload.ts → ui/user/src/user.gamesDownload.ts
diff --git a/ui/bits/src/bits.user.ts → ui/user/src/user.ts b/ui/bits/src/bits.user.ts → ui/user/src/user.ts
diff --git a/ui/user/tsconfig.json b/ui/user/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": { "noEmit": true, "isolatedDeclarations": false },
+  "references": [{ "path": "../bits/tsconfig.json" }, { "path": "../common/tsconfig.json" }]
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@import '../../../common/css/plugin';
		@import '../list';