From df001586359c99c2dea3f0ae1e034271e897a28a Mon Sep 17 00:00:00 2001 From: Joris Date: Tue, 31 Jan 2017 22:36:18 +0100 Subject: Add covers --- public/cover/Chroniques des vampires.jpg | Bin 0 -> 41981 bytes public/cover/De la Part du diable.jpg | Bin 0 -> 29457 bytes public/cover/Dragon Ball Z.jpg | Bin 0 -> 51859 bytes public/cover/Dragon Ball.jpg | Bin 0 -> 46070 bytes "public/cover/D\303\251lit de fuite.jpg" | Bin 0 -> 43434 bytes public/cover/Espions de famille.jpg | Bin 0 -> 29806 bytes public/cover/Fairy Tail.jpg | Bin 0 -> 62995 bytes public/cover/Freak City.jpg | Bin 0 -> 45326 bytes ...0s son chien qui courait apr\303\250s sa balle.jpg" | Bin 0 -> 40761 bytes public/cover/Invisible.jpg | Bin 0 -> 18207 bytes public/cover/Kodhja.jpg | Bin 0 -> 62396 bytes "public/cover/La D\303\251ferlante.jpg" | Bin 0 -> 34747 bytes public/cover/La Folle rencontre de Flora et Max.jpg | Bin 0 -> 19400 bytes "public/cover/Le Combat d\342\200\231hiver.jpg" | Bin 0 -> 44673 bytes public/cover/Le Guide junior.jpg | Bin 0 -> 96804 bytes ... l\342\200\231\305\223uvre de G. de Maupassant.jpg" | Bin 0 -> 30518 bytes ...3\271 j\342\200\231ai rencontr\303\251 un ange.jpg" | Bin 0 -> 111516 bytes ...e Journal malgr\303\251 lui de Henry K. LARSEN.jpg" | Bin 0 -> 30740 bytes public/cover/Les Enfants de la baleine.jpg | Bin 0 -> 108289 bytes "public/cover/Les Larmes de l\342\200\231assassin.jpg" | Bin 0 -> 30115 bytes .../L\342\200\231Insigne d\342\200\231argent.jpg" | Bin 0 -> 105528 bytes src/main/scala/reading/Books.scala | 7 +++++-- src/main/scala/reading/component/index/Menu.scala | 4 ++-- src/main/scala/reading/models/Genre.scala | 2 +- src/main/scala/reading/models/Period.scala | 6 +++--- src/main/scala/reading/models/Theme.scala | 2 +- 26 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 public/cover/Chroniques des vampires.jpg create mode 100644 public/cover/De la Part du diable.jpg create mode 100644 public/cover/Dragon Ball Z.jpg create mode 100644 public/cover/Dragon Ball.jpg create mode 100644 "public/cover/D\303\251lit de fuite.jpg" create mode 100644 public/cover/Espions de famille.jpg create mode 100644 public/cover/Fairy Tail.jpg create mode 100644 public/cover/Freak City.jpg create mode 100644 "public/cover/Histoire du gar\303\247on qui courait apr\303\250s son chien qui courait apr\303\250s sa balle.jpg" create mode 100644 public/cover/Invisible.jpg create mode 100644 public/cover/Kodhja.jpg create mode 100644 "public/cover/La D\303\251ferlante.jpg" create mode 100644 public/cover/La Folle rencontre de Flora et Max.jpg create mode 100644 "public/cover/Le Combat d\342\200\231hiver.jpg" create mode 100644 public/cover/Le Guide junior.jpg create mode 100644 "public/cover/Le Horla, d\342\200\231apr\303\250s l\342\200\231\305\223uvre de G. de Maupassant.jpg" create mode 100644 "public/cover/Le Jour o\303\271 j\342\200\231ai rencontr\303\251 un ange.jpg" create mode 100644 "public/cover/Le Journal malgr\303\251 lui de Henry K. LARSEN.jpg" create mode 100644 public/cover/Les Enfants de la baleine.jpg create mode 100644 "public/cover/Les Larmes de l\342\200\231assassin.jpg" create mode 100644 "public/cover/L\342\200\231Insigne d\342\200\231argent.jpg" diff --git a/public/cover/Chroniques des vampires.jpg b/public/cover/Chroniques des vampires.jpg new file mode 100644 index 0000000..c6b28ba Binary files /dev/null and b/public/cover/Chroniques des vampires.jpg differ diff --git a/public/cover/De la Part du diable.jpg b/public/cover/De la Part du diable.jpg new file mode 100644 index 0000000..ea26080 Binary files /dev/null and b/public/cover/De la Part du diable.jpg differ diff --git a/public/cover/Dragon Ball Z.jpg b/public/cover/Dragon Ball Z.jpg new file mode 100644 index 0000000..df064ef Binary files /dev/null and b/public/cover/Dragon Ball Z.jpg differ diff --git a/public/cover/Dragon Ball.jpg b/public/cover/Dragon Ball.jpg new file mode 100644 index 0000000..c987328 Binary files /dev/null and b/public/cover/Dragon Ball.jpg differ diff --git "a/public/cover/D\303\251lit de fuite.jpg" "b/public/cover/D\303\251lit de fuite.jpg" new file mode 100644 index 0000000..1f26734 Binary files /dev/null and "b/public/cover/D\303\251lit de fuite.jpg" differ diff --git a/public/cover/Espions de famille.jpg b/public/cover/Espions de famille.jpg new file mode 100644 index 0000000..5c4f69b Binary files /dev/null and b/public/cover/Espions de famille.jpg differ diff --git a/public/cover/Fairy Tail.jpg b/public/cover/Fairy Tail.jpg new file mode 100644 index 0000000..2bdc9a2 Binary files /dev/null and b/public/cover/Fairy Tail.jpg differ diff --git a/public/cover/Freak City.jpg b/public/cover/Freak City.jpg new file mode 100644 index 0000000..685fbce Binary files /dev/null and b/public/cover/Freak City.jpg differ diff --git "a/public/cover/Histoire du gar\303\247on qui courait apr\303\250s son chien qui courait apr\303\250s sa balle.jpg" "b/public/cover/Histoire du gar\303\247on qui courait apr\303\250s son chien qui courait apr\303\250s sa balle.jpg" new file mode 100644 index 0000000..ee7615b Binary files /dev/null and "b/public/cover/Histoire du gar\303\247on qui courait apr\303\250s son chien qui courait apr\303\250s sa balle.jpg" differ diff --git a/public/cover/Invisible.jpg b/public/cover/Invisible.jpg new file mode 100644 index 0000000..15d5e68 Binary files /dev/null and b/public/cover/Invisible.jpg differ diff --git a/public/cover/Kodhja.jpg b/public/cover/Kodhja.jpg new file mode 100644 index 0000000..d893a60 Binary files /dev/null and b/public/cover/Kodhja.jpg differ diff --git "a/public/cover/La D\303\251ferlante.jpg" "b/public/cover/La D\303\251ferlante.jpg" new file mode 100644 index 0000000..7be8d42 Binary files /dev/null and "b/public/cover/La D\303\251ferlante.jpg" differ diff --git a/public/cover/La Folle rencontre de Flora et Max.jpg b/public/cover/La Folle rencontre de Flora et Max.jpg new file mode 100644 index 0000000..721118d Binary files /dev/null and b/public/cover/La Folle rencontre de Flora et Max.jpg differ diff --git "a/public/cover/Le Combat d\342\200\231hiver.jpg" "b/public/cover/Le Combat d\342\200\231hiver.jpg" new file mode 100644 index 0000000..d59f586 Binary files /dev/null and "b/public/cover/Le Combat d\342\200\231hiver.jpg" differ diff --git a/public/cover/Le Guide junior.jpg b/public/cover/Le Guide junior.jpg new file mode 100644 index 0000000..5d569f8 Binary files /dev/null and b/public/cover/Le Guide junior.jpg differ diff --git "a/public/cover/Le Horla, d\342\200\231apr\303\250s l\342\200\231\305\223uvre de G. de Maupassant.jpg" "b/public/cover/Le Horla, d\342\200\231apr\303\250s l\342\200\231\305\223uvre de G. de Maupassant.jpg" new file mode 100644 index 0000000..4e3d4bb Binary files /dev/null and "b/public/cover/Le Horla, d\342\200\231apr\303\250s l\342\200\231\305\223uvre de G. de Maupassant.jpg" differ diff --git "a/public/cover/Le Jour o\303\271 j\342\200\231ai rencontr\303\251 un ange.jpg" "b/public/cover/Le Jour o\303\271 j\342\200\231ai rencontr\303\251 un ange.jpg" new file mode 100644 index 0000000..ebbfdce Binary files /dev/null and "b/public/cover/Le Jour o\303\271 j\342\200\231ai rencontr\303\251 un ange.jpg" differ diff --git "a/public/cover/Le Journal malgr\303\251 lui de Henry K. LARSEN.jpg" "b/public/cover/Le Journal malgr\303\251 lui de Henry K. LARSEN.jpg" new file mode 100644 index 0000000..14b40ee Binary files /dev/null and "b/public/cover/Le Journal malgr\303\251 lui de Henry K. LARSEN.jpg" differ diff --git a/public/cover/Les Enfants de la baleine.jpg b/public/cover/Les Enfants de la baleine.jpg new file mode 100644 index 0000000..a444d4b Binary files /dev/null and b/public/cover/Les Enfants de la baleine.jpg differ diff --git "a/public/cover/Les Larmes de l\342\200\231assassin.jpg" "b/public/cover/Les Larmes de l\342\200\231assassin.jpg" new file mode 100644 index 0000000..651a6fb Binary files /dev/null and "b/public/cover/Les Larmes de l\342\200\231assassin.jpg" differ diff --git "a/public/cover/L\342\200\231Insigne d\342\200\231argent.jpg" "b/public/cover/L\342\200\231Insigne d\342\200\231argent.jpg" new file mode 100644 index 0000000..5a9ebc9 Binary files /dev/null and "b/public/cover/L\342\200\231Insigne d\342\200\231argent.jpg" differ diff --git a/src/main/scala/reading/Books.scala b/src/main/scala/reading/Books.scala index 4049720..b86a008 100644 --- a/src/main/scala/reading/Books.scala +++ b/src/main/scala/reading/Books.scala @@ -1332,6 +1332,7 @@ object Books { programs = Seq(Autrui), level = Facile ), + Book( title = "Ma mère, le crabe et moi", author = "Anne PERCIN", @@ -1353,6 +1354,7 @@ object Books { programs = Seq(Autrui), level = Moyen ), + Book( title = "Le Jour où j’ai rencontré un ange", author = "Brigitte MINNE", @@ -1594,6 +1596,7 @@ object Books { programs = Seq(Valeurs), level = Facile ), + Book( title = "Mots rumeurs, mots cutter", author = "Charlotte BOUSQUET, Stéphanie RUBINI", @@ -1943,7 +1946,7 @@ object Books { ), Book( - title = "Le Combat d'hiver", + title = "Le Combat d’hiver", author = "JC MOURLEVAT", year = "2006", period = None, @@ -1954,7 +1957,7 @@ object Books { ), Book( - title = "Les Larmes de l'assassin", + title = "Les Larmes de l’assassin", author = "Anne-Laure BONDOUX", year = "2003", period = None, diff --git a/src/main/scala/reading/component/index/Menu.scala b/src/main/scala/reading/component/index/Menu.scala index 6a9bcef..9645f5a 100644 --- a/src/main/scala/reading/component/index/Menu.scala +++ b/src/main/scala/reading/component/index/Menu.scala @@ -28,8 +28,8 @@ object Menu { case None => group(books, filters, "Classe", Grade.values.map(Filter.apply(_))) case Some(grade) => group(books, filters, grade.name, Program.values.map(Filter.apply(_)), Some(grade)) }, - group(books, filters, "Theme", Theme.values.map(Filter.apply(_))), - group(books, filters, "Genre", Genre.values.map(Filter.apply(_))), + group(books, filters, "Theme", Theme.values.sorted.map(Filter.apply(_))), + group(books, filters, "Genre", Genre.values.sorted.map(Filter.apply(_))), group(books, filters, "Niveau", Level.values.map(Filter.apply(_))), group(books, filters, "Période", Period.values.map(Filter.apply(_))) ), diff --git a/src/main/scala/reading/models/Genre.scala b/src/main/scala/reading/models/Genre.scala index 4006815..83233ae 100644 --- a/src/main/scala/reading/models/Genre.scala +++ b/src/main/scala/reading/models/Genre.scala @@ -28,7 +28,7 @@ sealed trait Genre extends EnumEntry with Ordered[Genre] { } object Genre extends Enum[Genre] { - val values = findValues.sorted + val values = findValues case object JournalIntime extends Genre case object RomanHistorique extends Genre diff --git a/src/main/scala/reading/models/Period.scala b/src/main/scala/reading/models/Period.scala index a962217..00e9427 100644 --- a/src/main/scala/reading/models/Period.scala +++ b/src/main/scala/reading/models/Period.scala @@ -5,8 +5,8 @@ import enumeratum._ sealed trait Period extends EnumEntry with Ordered[Period] { import Period._ - def compare(that: Period) = - Compare.format(this.prettyPrint).compare(Compare.format(that.prettyPrint)) + def compare(that: Period): Int = + values.indexOf(that) - values.indexOf(this) def prettyPrint(): String = this match { case Antiquite => "Antiquité" @@ -24,7 +24,7 @@ sealed trait Period extends EnumEntry with Ordered[Period] { } object Period extends Enum[Period] { - val values = findValues.sorted + val values = findValues case object Antiquite extends Period case object MA extends Period diff --git a/src/main/scala/reading/models/Theme.scala b/src/main/scala/reading/models/Theme.scala index 61186a9..2544525 100644 --- a/src/main/scala/reading/models/Theme.scala +++ b/src/main/scala/reading/models/Theme.scala @@ -89,7 +89,7 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] { } object Theme extends Enum[Theme] { - val values = findValues.sorted + val values = findValues case object Adolescence extends Theme case object Americain extends Theme -- cgit v1.2.3