Merge branch 'add-books' into 'master'

Add more books

See merge request !1

5 files changed, 530 insertions, 7 deletions

diff --git a/src/main/scala/reading/Books.scala b/src/main/scala/reading/Books.scala
index 3b77cb3..ebcb562 100644
--- a/src/main/scala/reading/Books.scala
+++ b/src/main/scala/reading/Books.scala
@@ -425,6 +425,513 @@ object Books {
       themes   = Seq(Malediction, Enquete),
       programs = Seq(),
       level    = Moyen
+    ),
+
+
+
+
+    Book(
+      title    = "EverWorld",
+      author   = "K.A APPLEGATE",
+      year     = "2000-2002",
+      parts    = 4,
+      period   = None,
+      genres   = Seq(Fantasy, SF),
+      themes   = Seq(Amitie, Amour, Aventure),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "La Quête d’Ewilan",
+      author   = "Pierre BOTTERO",
+      year     = "2005-2016",
+      parts    = 4,
+      period   = None,
+      genres   = Seq(Fantasy),
+      themes   = Seq(Amitie, Aventure),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Les Mondes d’Ewilan",
+      author   = "Pierre BOTTERO et Jean-Louis THOUARD",
+      year     = "2005-2006",
+      parts    = 3,
+      period   = None,
+      genres   = Seq(Fantasy),
+      themes   = Seq(Aventure),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Ellana",
+      author   = "Pierre BOTTERO",
+      year     = "2006-2010",
+      parts    = 3,
+      period   = None,
+      genres   = Seq(Policier, Fantasy),
+      themes   = Seq(Aventure),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "The Mortal instruments",
+      author   = "Cassandra CLARE",
+      year     = "2013-2015",
+      parts    = 6,
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(Aventure, Famille),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Le Monde de Narnia",
+      author   = "C.S LEWIS",
+      year     = "2002-2008",
+      period   = None,
+      genres   = Seq(),
+      themes   = Seq(Aventure, Famille),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Eragon",
+      author   = "Christopher PAOLINI",
+      year     = "2003-2006",
+      period   = None,
+      genres   = Seq(Fantasy),
+      themes   = Seq(Amitie, Aventure, Dragon),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Harry POTTER",
+      author   = "J.K ROWLING",
+      year     = "1999-2007",
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(Amitie, Ecole, Aventure, Magie),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Les Royaumes de feu",
+      author   = "T.T SUTHERLAND",
+      year     = "2012-2016",
+      parts    = 5,
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(Aventure, Dragon),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Le Hobbit",
+      author   = "J.R.R TOLKIEN",
+      year     = "1937",
+      period   = None,
+      genres   = Seq(Fantasy),
+      themes   = Seq(Aventure),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Le Seigneur des anneaux",
+      author   = "J.R.R TOLKIEN",
+      year     = "1954-1955",
+      period   = None,
+      genres   = Seq(Fantasy),
+      themes   = Seq(Aventure, Combat),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Le Silmarillion",
+      author   = "J.R.R TOLKIEN",
+      year     = "1977",
+      period   = None,
+      genres   = Seq(Fantasy),
+      themes   = Seq(Aventure, Combat),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "A la Croisée des mondes",
+      author   = "Philip PULLMAN",
+      year     = "1998-2001",
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(Aventure, Amitie, Enquete, Nature),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Uglies",
+      author   = "Scott WESTERFELD",
+      year     = "2007-2008",
+      period   = None,
+      genres   = Seq(SF, Dystopie),
+      themes   = Seq(Beaute, Laideur, Americain),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Percy JACKSON",
+      author   = "Rick RIORDAN",
+      year     = "2005-2010",
+      parts    = 5,
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(Mythologie, Aventure),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Les Héros de l’Olympe",
+      author   = "Rick RIORDAN",
+      year     = "2010-2014",
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(Amitie, Aventure, Mythologie),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "La Rivière à l’envers",
+      author   = "J-C MOURLEVAT",
+      year     = "2000-2002",
+      parts    = 2,
+      period   = None,
+      genres   = Seq(RomanAventure, Merveilleux),
+      themes   = Seq(Amitie),
+      programs = Seq(),
+      level    = Facile
+    ),
+
+    Book(
+      title    = "La Guerre des clans",
+      author   = "Erin HUNTER",
+      year     = "2007-2016",
+      parts    = 5,
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(Animaux, Nature),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Journal d’un noob",
+      author   = "Cube Kid",
+      year     = "2016-2017",
+      parts    = 4,
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(JeuVideo),
+      programs = Seq(),
+      level    = Facile
+    ),
+
+    Book(
+      title    = "Journal d’un dégonflé",
+      author   = "Jeff KINNEY",
+      year     = "2009-2016",
+      parts    = 10,
+      period   = Some(Contemporain),
+      genres   = Seq(JournalIntime),
+      themes   = Seq(Humour, Amitie, Famille, Adolescence),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Frankenstein",
+      author   = "Mary SHELLEY",
+      year     = "1818",
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(Peur),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Frigiel et Fluffy",
+      author   = "FRIGIEL et Nicolas DIGARD",
+      year     = "2016",
+      period   = None,
+      genres   = Seq(),
+      themes   = Seq(Amitie, Magie, Famille, Aventure),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Cherub",
+      author   = "Robert MUCHAMORE",
+      year     = "2009-2016",
+      period   = None,
+      genres   = Seq(),
+      themes   = Seq(Adolescence, Espionnage, Americain),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "DIMILY",
+      author   = "Estelle MASKAME",
+      year     = "2016",
+      period   = Some(Contemporain),
+      genres   = Seq(),
+      themes   = Seq(Amour, Famille, Adolescence),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Les Héritiers d’Enkidiev",
+      author   = "Anne ROBILLARD",
+      year     = "2011-2016",
+      period   = None,
+      genres   = Seq(Fantasy),
+      themes   = Seq(Combat),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "La Sélection",
+      author   = "Kiera CASS",
+      year     = "2011-2016",
+      parts    = 5,
+      period   = None,
+      genres   = Seq(SF),
+      themes   = Seq(Famille, Amour),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Hunger Games",
+      author   = "Suzanne COLLINS",
+      year     = "2009-2011",
+      period   = None,
+      genres   = Seq(Dystopie, Fantastique),
+      themes   = Seq(Combat),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Le Passeur",
+      author   = "Lois LOWRY",
+      year     = "1996",
+      period   = None,
+      genres   = Seq(Dystopie),
+      themes   = Seq(Initiation),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Cinder",
+      author   = "Marissa MEYER",
+      year     = "2013-2016",
+      period   = None,
+      genres   = Seq(SF),
+      themes   = Seq(Robot, Famille, Aventure),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Les Âmes vagabondes",
+      author   = "Stephenie MEYER",
+      year     = "2010",
+      period   = None,
+      genres   = Seq(Fantasy, SF),
+      themes   = Seq(Adolescence, Aventure),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Divergente",
+      author   = "Veronica ROTH",
+      year     = "2011-2014",
+      parts    = 3,
+      period   = None,
+      genres   = Seq(Fantasy, SF),
+      themes   = Seq(Adolescence, Aventure),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "L’Etrange cas du Dr JEKYLL et M. HYDE",
+      author   = "R.L STEVENSON",
+      year     = "1886",
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(Folie),
+      programs = Seq(Monstre),
+      level    = Facile
+    ),
+
+    Book(
+      title    = "Persépolis",
+      author   = "Marjane SATRAPI",
+      year     = "2007",
+      period   = Some(Siecle20),
+      genres   = Seq(BD),
+      themes   = Seq(Famille, Amitie),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Le Petit Nicolas",
+      author   = "GOSCINNY et SEMPE",
+      year     = "1973",
+      period   = Some(Siecle20),
+      genres   = Seq(),
+      themes   = Seq(Amitie, Ecole, Famille),
+      programs = Seq(),
+      level    = Facile
+    ),
+
+    Book(
+      title    = "Les Sisters",
+      author   = "William CAZENOVE",
+      year     = "2008-2016",
+      period   = Some(Contemporain),
+      genres   = Seq(BD),
+      themes   = Seq(Fratrie, College),
+      programs = Seq(),
+      level    = Facile
+    ),
+
+    Book(
+      title    = "Le Journal d’Aurélie Laflamme",
+      author   = "India DESJARDINS",
+      year     = "2013-2015",
+      period   = Some(Contemporain),
+      genres   = Seq(JournalIntime),
+      themes   = Seq(Famille, Amitie, Amour, Ecole),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "L’Ordre Terne",
+      author   = "I.M NANCY",
+      year     = "2015-2016",
+      parts   = 2,
+      period   = None,
+      genres   = Seq(Fantasy),
+      themes   = Seq(Magie),
+      programs = Seq(),
+      level    = Moyen
+    ),
+
+    Book(
+      title    = "Tobie Lolness",
+      author   = "Timothée DE FOMBELLE",
+      year     = "2010",
+      parts   = 2,
+      period   = None,
+      genres   = Seq(),
+      themes   = Seq(Famille, Nature, Aventure, Amour),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Question de temps",
+      author   = "E.R LINK",
+      year     = "2016",
+      period   = None,
+      genres   = Seq(),
+      themes   = Seq(Aventure, Pirate, Amour, Amitie),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Maliki",
+      author   = "MALIKI",
+      year     = "2007-2015",
+      parts   = 7,
+      period   = None,
+      genres   = Seq(BD),
+      themes   = Seq(Enfants, Humour, Animaux),
+      programs = Seq(),
+      level    = Facile
+    ),
+
+    Book(
+      title    = "Gardiens des cites perdues",
+      author   = "Shannon MESSENGER",
+      year     = "2014-2016",
+      parts   = 4,
+      period   = None,
+      genres   = Seq(Fantasy),
+      themes   = Seq(Ecole),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Le Maître des clés",
+      author   = "Benoît GRELAUD",
+      year     = "2012-2014",
+      parts   = 5,
+      period   = None,
+      genres   = Seq(),
+      themes   = Seq(Famille, Nature, Aventure, Poetique),
+      programs = Seq(RecitAventure),
+      level    = Facile
+    ),
+
+    Book(
+      title    = "Le Passe-miroir",
+      author   = "Christelle DABOS",
+      year     = "2013-2015",
+      parts   = 2,
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(Complot, Cour, Enquete),
+      programs = Seq(),
+      level    = Difficile
+    ),
+
+    Book(
+      title    = "Oniria",
+      author   = "P.F PARRY",
+      year     = "2012-2016",
+      parts   = 4,
+      period   = None,
+      genres   = Seq(Fantastique),
+      themes   = Seq(Famille, Amitie, Aventure),
+      programs = Seq(),
+      level    = Moyen
     )
   )
 }
diff --git a/src/main/scala/reading/component/index/FiltersMenu.scala b/src/main/scala/reading/component/index/FiltersMenu.scala
index fcc8550..febc52c 100644
--- a/src/main/scala/reading/component/index/FiltersMenu.scala
+++ b/src/main/scala/reading/component/index/FiltersMenu.scala
@@ -56,7 +56,7 @@ object FiltersMenu {
             button(
               FiltersMenuStyle.filter,
               RxAttr(onclick, Rx(() => filters() = filter +: filters())),
-              span(s"${filter.name} ($count)")
+              span(s"${filter.name.capitalize} ($count)")
             )
           }
         )
diff --git a/src/main/scala/reading/models/Genre.scala b/src/main/scala/reading/models/Genre.scala
index 44f96cd..3fa13bc 100644
--- a/src/main/scala/reading/models/Genre.scala
+++ b/src/main/scala/reading/models/Genre.scala
@@ -20,6 +20,7 @@ sealed trait Genre extends EnumEntry with Ordered[Genre] {
     case BD => "BD"
     case RomanAventure => "roman d'aventure"
     case Comique => "comique"
+    case Dystopie => "dystopie"
   }
 }
 
@@ -36,4 +37,5 @@ object Genre extends Enum[Genre] {
   case object BD extends Genre
   case object RomanAventure extends Genre
   case object Comique extends Genre
+  case object Dystopie extends Genre
 }
diff --git a/src/main/scala/reading/models/Program.scala b/src/main/scala/reading/models/Program.scala
index 4e59364..00e2b3b 100644
--- a/src/main/scala/reading/models/Program.scala
+++ b/src/main/scala/reading/models/Program.scala
@@ -15,15 +15,15 @@ sealed trait Program extends EnumEntry with Ordered[Program] {
     case CreationPoetique  => "Récit de création, création poétique"
     case Resister  => "Résister au plus fort : ruses, mensonges et masques"
 
-    case VoyageEtAventure  => "le voyage et l'aventure. Pourquoi aller vers l'inconnu ?"
-    case Autrui  => "avec autrui : familles, amis, réseaux."
-    case UniversNouveaux  => "imaginer des univers nouveaux."
-    case Heros  => "héros, héroïnes et héroïsmes."
-    case HommeEtNature  => "l'être humain est-il maître de la nature ?"
+    case VoyageEtAventure  => "Le voyage et l'aventure"
+    case Autrui  => "Avec autrui : familles, amis, réseaux"
+    case UniversNouveaux  => "Imaginer des univers nouveaux"
+    case Heros  => "Héros, héroïnes et héroïsmes"
+    case HommeEtNature  => "L'être humain est-il maître de la nature ?"
 
     case DireAmour  => "Dire l'amour"
     case IndividuEtSociete  => "Individu et société : confrontations de valeur ?"
-    case FictionEtReel  => "la fiction pour interroger le réel"
+    case FictionEtReel  => "La fiction pour interroger le réel"
     case Informer  => "Informer, s'informer, déformer ?"
     case Ville  => "La ville, lieu de tous les possibles ?"
 
diff --git a/src/main/scala/reading/models/Theme.scala b/src/main/scala/reading/models/Theme.scala
index 238a29d..be8e5a9 100644
--- a/src/main/scala/reading/models/Theme.scala
+++ b/src/main/scala/reading/models/Theme.scala
@@ -12,13 +12,16 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
   override def toString(): String = this match {
     case Amitie => "amitié"
     case Aventure => "aventure"
+    case Americain => "américain"
     case Amour => "amour"
     case Animal => "animal"
     case Adolescence => "adolescence"
+    case Beaute => "beaute"
     case Ecole => "école"
     case Enquete => "enquête"
     case Enfants => "enfants"
     case Emancipation => "émancipation"
+    case Espionnage => "espionnage"
     case Folie => "folie"
     case Complot => "complot"
     case Combat => "combat"
@@ -31,14 +34,18 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
     case Humour => "humour"
     case Initiation => "initiation"
     case JeuVideo => "jeu vidéo"
+    case Laideur => "laideur"
     case Litterature => "littérature"
     case Malediction => "malédiction"
     case Magie => "magie"
+    case Mythologie => "mythologie"
     case Nature => "nature"
     case Parents => "parents"
     case Peur => "peur"
     case Pirate => "pirate"
+    case Poetique => "poétique"
     case Rivalite => "rivalité"
+    case Robot => "robot"
     case SegregationRaciale => "ségrégation raciale"
     case VieNocturne => "vie nocturne"
     case Voyage => "voyage"
@@ -53,13 +60,16 @@ object Theme extends Enum[Theme] {
 
   case object Amitie extends Theme
   case object Aventure extends Theme
+  case object Americain extends Theme
   case object Amour extends Theme
   case object Animal extends Theme
   case object Adolescence extends Theme
+  case object Beaute extends Theme
   case object Ecole extends Theme
   case object Enquete extends Theme
   case object Enfants extends Theme
   case object Emancipation extends Theme
+  case object Espionnage extends Theme
   case object Folie extends Theme
   case object Complot extends Theme
   case object Combat extends Theme
@@ -72,14 +82,18 @@ object Theme extends Enum[Theme] {
   case object Humour extends Theme
   case object Initiation extends Theme
   case object JeuVideo extends Theme
+  case object Laideur extends Theme
   case object Litterature extends Theme
   case object Malediction extends Theme
   case object Magie extends Theme
+  case object Mythologie extends Theme
   case object Nature extends Theme
   case object Parents extends Theme
   case object Peur extends Theme
   case object Pirate extends Theme
+  case object Poetique extends Theme
   case object Rivalite extends Theme
+  case object Robot extends Theme
   case object SegregationRaciale extends Theme
   case object VieNocturne extends Theme
   case object Voyage extends Theme