aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala')
-rw-r--r--src/main/scala/reading/Books.scala42
-rw-r--r--src/main/scala/reading/component/index/style/Filters.scala2
-rw-r--r--src/main/scala/reading/component/widget/Popup.scala2
-rw-r--r--src/main/scala/reading/models/Book.scala9
4 files changed, 29 insertions, 26 deletions
diff --git a/src/main/scala/reading/Books.scala b/src/main/scala/reading/Books.scala
index 42a1c26..8d8cb8a 100644
--- a/src/main/scala/reading/Books.scala
+++ b/src/main/scala/reading/Books.scala
@@ -21,7 +21,7 @@ object Books {
),
Book(
- title = "Le Carnet d'Allie",
+ title = "Le Carnet d’Allie",
author = "Meg CABOT",
year = "2012-2016",
parts = 7,
@@ -79,7 +79,7 @@ object Books {
),
Book(
- title = "Nos Etoiles contraires",
+ title = "Nos Étoiles contraires",
author = "John GREEN",
year = "2013",
period = Some(Contemporain),
@@ -148,7 +148,7 @@ object Books {
),
Book(
- title = "L'Enfant Océan",
+ title = "L’Enfant Océan",
author = "J-C MOURLEVAT et Vincent DUTRAIT",
year = "2010",
period = None,
@@ -159,7 +159,7 @@ object Books {
),
Book(
- title = "L'oeil du loup",
+ title = "L’œil du loup",
author = "Daniel PENNAC",
year = "1984",
period = None,
@@ -170,7 +170,7 @@ object Books {
),
Book(
- title = "Les aventures de Tom Sawyer",
+ title = "Les Aventures de Tom Sawyer",
author = "Mark TWAIN",
year = "1876",
period = Some(Siecle19),
@@ -217,7 +217,7 @@ object Books {
),
Book(
- title = "Journal d'une grosse nouille",
+ title = "Journal d’une grosse nouille",
author = "RR RUSSELL",
year = "2012-2016",
parts = 10,
@@ -240,7 +240,7 @@ object Books {
),
Book(
- title = "À la poursuite d'Olympe",
+ title = "À la Poursuite d’Olympe",
author = "Annie JAY",
year = "1995",
period = Some(Louis14),
@@ -284,7 +284,7 @@ object Books {
),
Book(
- title = "L'Espionne du Roi-Soleil",
+ title = "L’Espionne du Roi-Soleil",
author = "Annie PIETRI",
year = "2002",
period = Some(Louis14),
@@ -295,7 +295,7 @@ object Books {
),
Book(
- title = "L'Omelette au sucre",
+ title = "L’Omelette au sucre",
author = "JP ARROU-VIGNOD",
year = "1999",
period = Some(Contemporain),
@@ -373,7 +373,7 @@ object Books {
),
Book(
- title = "Le Crime de l'Orient-Express",
+ title = "Le Crime de l’Orient-Express",
author = "Agatha CHRISTIE",
year = "1934",
period = Some(Siecle20),
@@ -440,7 +440,7 @@ object Books {
),
Book(
- title = "La Quête d'Ewilan",
+ title = "La Quête d’Ewilan",
author = "Pierre BOTTERO",
year = "2005-2016",
parts = 4,
@@ -452,7 +452,7 @@ object Books {
),
Book(
- title = "Les Mondes d'Ewilan",
+ title = "Les Mondes d’Ewilan",
author = "Pierre BOTTERO et Jean-Louis THOUARD",
year = "2005-2006",
parts = 3,
@@ -510,7 +510,7 @@ object Books {
),
Book(
- title = "Harry Potter",
+ title = "Harry POTTER",
author = "J.K ROWLING",
year = "1999-2007",
period = None,
@@ -600,7 +600,7 @@ object Books {
),
Book(
- title = "Les Héros de l'Olympe",
+ title = "Les Héros de l’Olympe",
author = "Rick RIORDAN",
year = "2010-2014",
period = None,
@@ -611,7 +611,7 @@ object Books {
),
Book(
- title = "La rivière à l'envers",
+ title = "La Rivière à l’envers",
author = "J-C MOURLEVAT",
year = "2000-2002",
parts = 2,
@@ -635,7 +635,7 @@ object Books {
),
Book(
- title = "Journal d'un noob",
+ title = "Journal d’un noob",
author = "Cube Kid",
year = "2016-2017",
parts = 4,
@@ -647,7 +647,7 @@ object Books {
),
Book(
- title = "Journal d'un dégonflé",
+ title = "Journal d’un dégonflé",
author = "Jeff KINNEY",
year = "2009-2016",
parts = 10,
@@ -703,7 +703,7 @@ object Books {
),
Book(
- title = "Les Héritiers d'Enkidiev",
+ title = "Les Héritiers d’Enkidiev",
author = "Anne ROBILLARD",
year = "2011-2016",
period = None,
@@ -782,7 +782,7 @@ object Books {
),
Book(
- title = "L'Étrange cas du Dr Jekyll et de M. Hyde",
+ title = "L’Étrange cas du Dr Jekyll et de M. Hyde",
author = "R.L STEVENSON",
year = "1886",
period = None,
@@ -826,7 +826,7 @@ object Books {
),
Book(
- title = "Le journal d'Aurélie Laflamme",
+ title = "Le Journal d’Aurélie Laflamme",
author = "India DESJARDINS",
year = "2013-2015",
period = Some(Contemporain),
@@ -837,7 +837,7 @@ object Books {
),
Book(
- title = "L'Ordre Terne",
+ title = "L’Ordre Terne",
author = "I.M NANCY",
year = "2015-2016",
parts = 2,
diff --git a/src/main/scala/reading/component/index/style/Filters.scala b/src/main/scala/reading/component/index/style/Filters.scala
index cb1ceb4..c324965 100644
--- a/src/main/scala/reading/component/index/style/Filters.scala
+++ b/src/main/scala/reading/component/index/style/Filters.scala
@@ -8,7 +8,7 @@ object Filters extends StyleSheet.Inline {
import dsl._
val filters = style(
- marginBottom(30.px),
+ marginBottom(50.px),
display.flex
)
diff --git a/src/main/scala/reading/component/widget/Popup.scala b/src/main/scala/reading/component/widget/Popup.scala
index 8e40d36..67e6a4c 100644
--- a/src/main/scala/reading/component/widget/Popup.scala
+++ b/src/main/scala/reading/component/widget/Popup.scala
@@ -29,7 +29,7 @@ object Popup {
div(
PopupStyle.content,
content,
- div(
+ button(
PopupStyle.cross,
RxAttr(onclick, Rx(() => close(onClose))),
Cross(20.px, Col.stiletto)
diff --git a/src/main/scala/reading/models/Book.scala b/src/main/scala/reading/models/Book.scala
index 836fa19..34af272 100644
--- a/src/main/scala/reading/models/Book.scala
+++ b/src/main/scala/reading/models/Book.scala
@@ -17,9 +17,12 @@ case class Book(
.toLowerCase
.replaceAll("^les ", "")
.replaceAll("^le ", "")
- .replaceAll("^l'", "")
- .replaceAll("^é", "e")
- .replaceAll("^è", "e")
+ .replaceAll("^l’", "")
+ .replaceAll("^à la ", "")
+ .replaceAll("^au ", "")
+ .replaceAll("^aux ", "")
+ .replaceAll("é", "e")
+ .replaceAll("è", "e")
formatTitle(this.title).compare(formatTitle(that.title))
}
}