Add genres and themes, sort books by removing « Les » and « Le »

3 files changed, 19 insertions, 6 deletions

diff --git a/src/main/scala/reading/component/Index.scala b/src/main/scala/reading/component/Index.scala
index 28d9081..ef8ae51 100644
--- a/src/main/scala/reading/component/Index.scala
+++ b/src/main/scala/reading/component/Index.scala
@@ -7,8 +7,9 @@ import scalatags.JsDom.all._
 import scalacss.Defaults._
 import scalacss.ScalatagsCss._
 
+import reading.Books
 import reading.component.style.{Index => IndexStyle}
-import reading.component.index.{FiltersMenu, Filters, Books}
+import reading.component.index.{FiltersMenu, Filters, Books => BooksComponent}
 import reading.models.{Book, Filter}
 import reading.utils.RxAttr
 
@@ -16,7 +17,7 @@ object Index {
   def apply(): Frag = {
     val filters: Var[Seq[Filter]] = Var(Nil)
     val books: Rx[Seq[Book]] = Rx {
-      if(filters().isEmpty) Book.all else Book.filter(Book.all, filters())
+      if(filters().isEmpty) Books() else Book.filter(Books(), filters())
     }
 
     div(
@@ -34,7 +35,7 @@ object Index {
         div(
           IndexStyle.main,
           Filters(filters),
-          Books(books)
+          BooksComponent(books)
         )
       )
     )
diff --git a/src/main/scala/reading/component/index/Books.scala b/src/main/scala/reading/component/index/Books.scala
index 6ce1b2b..ef0f413 100644
--- a/src/main/scala/reading/component/index/Books.scala
+++ b/src/main/scala/reading/component/index/Books.scala
@@ -18,13 +18,19 @@ object Books {
 
       RxTag { implicit context =>
         div(
-          books().sortBy(_.title).map { book =>
+          books().sorted.map { book =>
             div(
               BooksStyle.book,
               div(BooksStyle.title, book.title),
               div(BooksStyle.author, book.author),
-              div(BooksStyle.genres, book.genres.mkString(", ")),
-              div(BooksStyle.themes, book.themes.mkString(", "))
+              div(
+                BooksStyle.genres,
+                span(s"genre: ${book.genres.mkString(", ")}")
+              ),
+              div(
+                BooksStyle.themes,
+                span(s"thème: ${book.themes.mkString(", ")}")
+              )
             )
           }
         )
diff --git a/src/main/scala/reading/component/index/style/Books.scala b/src/main/scala/reading/component/index/style/Books.scala
index 2c0dfc0..fa97849 100644
--- a/src/main/scala/reading/component/index/style/Books.scala
+++ b/src/main/scala/reading/component/index/style/Books.scala
@@ -15,17 +15,23 @@ object Books extends StyleSheet.Inline {
   )
 
   val title = style(
+    display.inlineBlock,
     fontWeight.bold,
     marginBottom(10.px),
+    marginRight(10.px),
     color(Col.congoBrown)
   )
 
   val author = style(
+    display.inlineBlock
   )
 
   val genres = style(
+    marginLeft(20.px),
+    marginBottom(10.px)
   )
 
   val themes = style(
+    marginLeft(20.px)
   )
 }