diff options
author | Joris | 2017-01-31 10:18:33 +0100 |
---|---|---|
committer | Joris | 2017-01-31 10:18:33 +0100 |
commit | 5b5c04315c4923ba4ea871db0c5be6f071442b9d (patch) | |
tree | e0f26bec755a5e71a8fa2cf700f93285bbf700d2 | |
parent | b5f2ced2c742a7df3c077bf0013f88c1607beef9 (diff) |
Use public instead of src/resources
-rw-r--r-- | .gitlab-ci.yml | 7 | ||||
-rw-r--r-- | .tmuxinator.yml | 2 | ||||
-rw-r--r-- | public/cover/Ajin.jpg | bin | 0 -> 55110 bytes | |||
-rw-r--r-- | public/cover/Après la vague.jpg | bin | 0 -> 2084612 bytes | |||
-rw-r--r-- | public/cover/Ariol.jpg | bin | 0 -> 27340 bytes | |||
-rw-r--r-- | public/cover/Avant l’ouragan.jpg | bin | 0 -> 82989 bytes | |||
-rw-r--r-- | public/cover/Bichon.jpg (renamed from src/main/resources/cover/Bichon.jpg) | bin | 40189 -> 40189 bytes | |||
-rw-r--r-- | public/cover/Bilbo Le Hobbit.jpg (renamed from src/main/resources/cover/Bilbo Le Hobbit.jpg) | bin | 54733 -> 54733 bytes | |||
-rw-r--r-- | public/cover/Bjorn le Morphir.jpg (renamed from src/main/resources/cover/Bjorn le Morphir.jpg) | bin | 809031 -> 809031 bytes | |||
-rw-r--r-- | public/cover/Blanche Neige et Grise Pluie.jpg (renamed from src/main/resources/cover/Blanche Neige et Grise Pluie.jpg) | bin | 98328 -> 98328 bytes | |||
-rw-r--r-- | public/cover/Boys don’t cry.jpg | bin | 0 -> 28410 bytes | |||
-rw-r--r-- | public/cover/Brise glace.jpg | bin | 0 -> 50325 bytes | |||
-rw-r--r-- | public/cover/Cabot Caboche.jpg (renamed from src/main/resources/cover/Cabot Caboche.jpg) | bin | 34548 -> 34548 bytes | |||
-rw-r--r-- | public/cover/Caïus.jpg (renamed from src/main/resources/cover/Caïus.jpg) | bin | 44121 -> 44121 bytes | |||
-rw-r--r-- | public/cover/Cherub.jpg (renamed from src/main/resources/cover/Cherub.jpg) | bin | 29906 -> 29906 bytes | |||
-rw-r--r-- | public/cover/Cheval de guerre.jpg (renamed from src/main/resources/cover/Cheval de guerre.jpg) | bin | 60271 -> 60271 bytes | |||
-rw-r--r-- | public/cover/Cinder.jpg (renamed from src/main/resources/cover/Cinder.jpg) | bin | 82045 -> 82045 bytes | |||
-rw-r--r-- | public/cover/Cinq histoires d’amour et de chevalerie.jpg (renamed from src/main/resources/cover/Cinq histoires d’amour et de chevalerie.jpg) | bin | 28384 -> 28384 bytes | |||
-rw-r--r-- | public/cover/Cinq petits cochons.jpg (renamed from src/main/resources/cover/Cinq petits cochons.jpg) | bin | 39487 -> 39487 bytes | |||
-rw-r--r-- | public/cover/Cédric.jpg (renamed from src/main/resources/cover/Cédric.jpg) | bin | 59755 -> 59755 bytes | |||
-rw-r--r-- | public/cover/Céleste, ma planète.jpg (renamed from src/main/resources/cover/Céleste, ma planète.jpg) | bin | 44299 -> 44299 bytes | |||
-rw-r--r-- | public/cover/C’était mon oncle !.jpg (renamed from src/main/resources/cover/C’était mon oncle !.jpg) | bin | 34229 -> 34229 bytes | |||
-rw-r--r-- | public/cover/DIMILY.jpg (renamed from src/main/resources/cover/DIMILY.jpg) | bin | 40655 -> 40655 bytes | |||
-rw-r--r-- | public/cover/Divergente.jpg (renamed from src/main/resources/cover/Divergente.jpg) | bin | 50208 -> 50208 bytes | |||
-rw-r--r-- | public/cover/Décollage immédiat.jpg (renamed from src/main/resources/cover/Décollage immédiat.jpg) | bin | 36602 -> 36602 bytes | |||
-rw-r--r-- | public/cover/Ellana.jpg (renamed from src/main/resources/cover/Ellana.jpg) | bin | 40459 -> 40459 bytes | |||
-rw-r--r-- | public/cover/Eragon.jpg (renamed from src/main/resources/cover/Eragon.jpg) | bin | 59790 -> 59790 bytes | |||
-rw-r--r-- | public/cover/EverWorld.gif (renamed from src/main/resources/cover/EverWorld.gif) | bin | 229690 -> 229690 bytes | |||
-rw-r--r-- | public/cover/EverWorld.jpg (renamed from src/main/resources/cover/EverWorld.jpg) | bin | 88383 -> 88383 bytes | |||
-rw-r--r-- | public/cover/Fantastique Maître Renard.jpg (renamed from src/main/resources/cover/Fantastique Maître Renard.jpg) | bin | 109249 -> 109249 bytes | |||
-rw-r--r-- | public/cover/Frankenstein.jpg (renamed from src/main/resources/cover/Frankenstein.jpg) | bin | 20160 -> 20160 bytes | |||
-rw-r--r-- | public/cover/Frigiel et Fluffy.jpg (renamed from src/main/resources/cover/Frigiel et Fluffy.jpg) | bin | 31563 -> 31563 bytes | |||
-rw-r--r-- | public/cover/Gardiens des cités perdues.jpg (renamed from src/main/resources/cover/Gardiens des cités perdues.jpg) | bin | 128293 -> 128293 bytes | |||
-rw-r--r-- | public/cover/Harry POTTER.jpg (renamed from src/main/resources/cover/Harry POTTER.jpg) | bin | 107884 -> 107884 bytes | |||
-rw-r--r-- | public/cover/Histoire du chien qui avait une ombre d’enfant.jpg (renamed from src/main/resources/cover/Histoire du chien qui avait une ombre d’enfant.jpg) | bin | 68113 -> 68113 bytes | |||
-rw-r--r-- | public/cover/Hunger Games.jpg (renamed from src/main/resources/cover/Hunger Games.jpg) | bin | 40522 -> 40522 bytes | |||
-rw-r--r-- | public/cover/Isis, 13 ans, 1,60 m, 82 kilos.jpg (renamed from src/main/resources/cover/Isis, 13 ans, 1,60 m, 82 kilos.jpg) | bin | 32985 -> 32985 bytes | |||
-rw-r--r-- | public/cover/Je veux vivre.jpg (renamed from src/main/resources/cover/Je veux vivre.jpg) | bin | 152230 -> 152230 bytes | |||
-rw-r--r-- | public/cover/Journal d’un dégonflé.jpg (renamed from src/main/resources/cover/Journal d’un dégonflé.jpg) | bin | 32444 -> 32444 bytes | |||
-rw-r--r-- | public/cover/Journal d’un noob.jpg (renamed from src/main/resources/cover/Journal d’un noob.jpg) | bin | 46790 -> 46790 bytes | |||
-rw-r--r-- | public/cover/Journal d’un vampire en pyjama.jpg (renamed from src/main/resources/cover/Journal d’un vampire en pyjama.jpg) | bin | 35785 -> 35785 bytes | |||
-rw-r--r-- | public/cover/Journal d’une grosse nouille.jpg (renamed from src/main/resources/cover/Journal d’une grosse nouille.jpg) | bin | 59222 -> 59222 bytes | |||
-rw-r--r-- | public/cover/Kiss.jpg (renamed from src/main/resources/cover/Kiss.jpg) | bin | 67597 -> 67597 bytes | |||
-rw-r--r-- | public/cover/La Guerre des clans.jpg (renamed from src/main/resources/cover/La Guerre des clans.jpg) | bin | 40703 -> 40703 bytes | |||
-rw-r--r-- | public/cover/La Mécanique du cœur.jpg (renamed from src/main/resources/cover/La Mécanique du cœur.jpg) | bin | 31623 -> 31623 bytes | |||
-rw-r--r-- | public/cover/La Quête d’Ewilan.jpg (renamed from src/main/resources/cover/La Quête d’Ewilan.jpg) | bin | 46756 -> 46756 bytes | |||
-rw-r--r-- | public/cover/La Rentrée du Petit Nicolas : les histoires inédites du Petit Nicolas 3.jpg (renamed from src/main/resources/cover/La Rentrée du Petit Nicolas : les histoires inédites du Petit Nicolas 3.jpg) | bin | 18340 -> 18340 bytes | |||
-rw-r--r-- | public/cover/La Rivière à l’envers.jpg (renamed from src/main/resources/cover/La Rivière à l’envers.jpg) | bin | 40325 -> 40325 bytes | |||
-rw-r--r-- | public/cover/La Sélection.jpg (renamed from src/main/resources/cover/La Sélection.jpg) | bin | 55218 -> 55218 bytes | |||
-rw-r--r-- | public/cover/La Tour des vents.jpg (renamed from src/main/resources/cover/La Tour des vents.jpg) | bin | 185516 -> 185516 bytes | |||
-rw-r--r-- | public/cover/La Trilogie de Bartiméus.jpg (renamed from src/main/resources/cover/La Trilogie de Bartiméus.jpg) | bin | 121372 -> 121372 bytes | |||
-rw-r--r-- | public/cover/La Vie compliquée de Léa OLIVIER.jpg (renamed from src/main/resources/cover/La Vie compliquée de Léa OLIVIER.jpg) | bin | 23110 -> 23110 bytes | |||
-rw-r--r-- | public/cover/Lady Grace.jpg (renamed from src/main/resources/cover/Lady Grace.jpg) | bin | 108849 -> 108849 bytes | |||
-rw-r--r-- | public/cover/Le Bazar des mauvais rêves : nouvelles.jpg | bin | 0 -> 37409 bytes | |||
-rw-r--r-- | public/cover/Le Bon Gros Géant.jpg (renamed from src/main/resources/cover/Le Bon Gros Géant.jpg) | bin | 66935 -> 66935 bytes | |||
-rw-r--r-- | public/cover/Le Carnet d’Allie.jpg (renamed from src/main/resources/cover/Le Carnet d’Allie.jpg) | bin | 96649 -> 96649 bytes | |||
-rw-r--r-- | public/cover/Le Crime de l’Orient-Express.jpg (renamed from src/main/resources/cover/Le Crime de l’Orient-Express.jpg) | bin | 110880 -> 110880 bytes | |||
-rw-r--r-- | public/cover/Le Donjon de NAHEULBEUK.jpg (renamed from src/main/resources/cover/Le Donjon de NAHEULBEUK.jpg) | bin | 54399 -> 54399 bytes | |||
-rw-r--r-- | public/cover/Le Journal d’Aurélie Laflamme.jpg (renamed from src/main/resources/cover/Le Journal d’Aurélie Laflamme.jpg) | bin | 31276 -> 31276 bytes | |||
-rw-r--r-- | public/cover/Le Maître des clés.jpg (renamed from src/main/resources/cover/Le Maître des clés.jpg) | bin | 170041 -> 170041 bytes | |||
-rw-r--r-- | public/cover/Le Meurtre de Roger Ackroyd.jpg (renamed from src/main/resources/cover/Le Meurtre de Roger Ackroyd.jpg) | bin | 33616 -> 33616 bytes | |||
-rw-r--r-- | public/cover/Le Monde de Charlie.jpg (renamed from src/main/resources/cover/Le Monde de Charlie.jpg) | bin | 57206 -> 57206 bytes | |||
-rw-r--r-- | public/cover/Le Monde de Narnia.jpg (renamed from src/main/resources/cover/Le Monde de Narnia.jpg) | bin | 25982 -> 25982 bytes | |||
-rw-r--r-- | public/cover/Le Passe-miroir.jpg (renamed from src/main/resources/cover/Le Passe-miroir.jpg) | bin | 78231 -> 78231 bytes | |||
-rw-r--r-- | public/cover/Le Passeur.jpg (renamed from src/main/resources/cover/Le Passeur.jpg) | bin | 20878 -> 20878 bytes | |||
-rw-r--r-- | public/cover/Le Petit Nicolas.jpg (renamed from src/main/resources/cover/Le Petit Nicolas.jpg) | bin | 18941 -> 18941 bytes | |||
-rw-r--r-- | public/cover/Le Petit Prince.jpg (renamed from src/main/resources/cover/Le Petit Prince.jpg) | bin | 164020 -> 164020 bytes | |||
-rw-r--r-- | public/cover/Le Plus petit baiser jamais recensé.jpg (renamed from src/main/resources/cover/Le Plus petit baiser jamais recensé.jpg) | bin | 25713 -> 25713 bytes | |||
-rw-r--r-- | public/cover/Le Renard de Morlange.jpg (renamed from src/main/resources/cover/Le Renard de Morlange.jpg) | bin | 26731 -> 26731 bytes | |||
-rw-r--r-- | public/cover/Le Royaume de Kensuké.jpg (renamed from src/main/resources/cover/Le Royaume de Kensuké.jpg) | bin | 88795 -> 88795 bytes | |||
-rw-r--r-- | public/cover/Le Seigneur des anneaux.jpg (renamed from src/main/resources/cover/Le Seigneur des anneaux.jpg) | bin | 65022 -> 65022 bytes | |||
-rw-r--r-- | public/cover/Le Silmarillion.jpg (renamed from src/main/resources/cover/Le Silmarillion.jpg) | bin | 137608 -> 137608 bytes | |||
-rw-r--r-- | public/cover/Le chien des Baskerville.jpg (renamed from src/main/resources/cover/Le chien des Baskerville.jpg) | bin | 55382 -> 55382 bytes | |||
-rw-r--r-- | public/cover/Le journal intime de Georgia Nicolson.jpg (renamed from src/main/resources/cover/Le journal intime de Georgia Nicolson.jpg) | bin | 60259 -> 60259 bytes | |||
-rw-r--r-- | public/cover/Les Ailes de la Sylphide.jpg | bin | 0 -> 38521 bytes | |||
-rw-r--r-- | public/cover/Les Aventures de Tom Sawyer.jpg (renamed from src/main/resources/cover/Les Aventures de Tom Sawyer.jpg) | bin | 18302 -> 18302 bytes | |||
-rw-r--r-- | public/cover/Les Colombes du Roi Soleil.jpg (renamed from src/main/resources/cover/Les Colombes du Roi Soleil.jpg) | bin | 53133 -> 53133 bytes | |||
-rw-r--r-- | public/cover/Les Dix petits nègres.jpg (renamed from src/main/resources/cover/Les Dix petits nègres.jpg) | bin | 47023 -> 47023 bytes | |||
-rw-r--r-- | public/cover/Les Héritiers d’Enkidiev.jpg (renamed from src/main/resources/cover/Les Héritiers d’Enkidiev.jpg) | bin | 32915 -> 32915 bytes | |||
-rw-r--r-- | public/cover/Les Héros de l’Olympe.jpg (renamed from src/main/resources/cover/Les Héros de l’Olympe.jpg) | bin | 228583 -> 228583 bytes | |||
-rw-r--r-- | public/cover/Les Inséparables.jpg (renamed from src/main/resources/cover/Les Inséparables.jpg) | bin | 12828 -> 12828 bytes | |||
-rw-r--r-- | public/cover/Les Mauvaises notes.jpg (renamed from src/main/resources/cover/Les Mauvaises notes.jpg) | bin | 115131 -> 115131 bytes | |||
-rw-r--r-- | public/cover/Les Mondes d’Ewilan.jpg (renamed from src/main/resources/cover/Les Mondes d’Ewilan.jpg) | bin | 43424 -> 43424 bytes | |||
-rw-r--r-- | public/cover/Les Orangers de Versailles.jpg (renamed from src/main/resources/cover/Les Orangers de Versailles.jpg) | bin | 307316 -> 307316 bytes | |||
-rw-r--r-- | public/cover/Les Plus belles histoires du Prince de Motordu.jpg (renamed from src/main/resources/cover/Les Plus belles histoires du Prince de Motordu.jpg) | bin | 1915667 -> 1915667 bytes | |||
-rw-r--r-- | public/cover/Les Royaumes de feu.jpg (renamed from src/main/resources/cover/Les Royaumes de feu.jpg) | bin | 34344 -> 34344 bytes | |||
-rw-r--r-- | public/cover/Les Sisters.jpg (renamed from src/main/resources/cover/Les Sisters.jpg) | bin | 77163 -> 77163 bytes | |||
-rw-r--r-- | public/cover/Les Sisters.png (renamed from src/main/resources/cover/Les Sisters.png) | bin | 325265 -> 325265 bytes | |||
-rw-r--r-- | public/cover/Les carnets de Cerise.jpg (renamed from src/main/resources/cover/Les carnets de Cerise.jpg) | bin | 90201 -> 90201 bytes | |||
-rw-r--r-- | public/cover/Les filles au chocolat.jpg (renamed from src/main/resources/cover/Les filles au chocolat.jpg) | bin | 60153 -> 60153 bytes | |||
-rw-r--r-- | public/cover/Les Âmes vagabondes.jpg (renamed from src/main/resources/cover/Les Âmes vagabondes.jpg) | bin | 60992 -> 60992 bytes | |||
-rw-r--r-- | public/cover/Lou !.jpg (renamed from src/main/resources/cover/Lou !.jpg) | bin | 28249 -> 28249 bytes | |||
-rw-r--r-- | public/cover/Louisette la taupe – L’heure du Grimm.jpg (renamed from src/main/resources/cover/Louisette la taupe – L’heure du Grimm.jpg) | bin | 38104 -> 38104 bytes | |||
-rw-r--r-- | public/cover/L’Apprenti d’Araluen.jpg (renamed from src/main/resources/cover/L’Apprenti d’Araluen.jpg) | bin | 109912 -> 109912 bytes | |||
-rw-r--r-- | public/cover/L’Enfant Océan.jpg (renamed from src/main/resources/cover/L’Enfant Océan.jpg) | bin | 32861 -> 32861 bytes | |||
-rw-r--r-- | public/cover/L’Espionne du Roi-Soleil.jpg (renamed from src/main/resources/cover/L’Espionne du Roi-Soleil.jpg) | bin | 42350 -> 42350 bytes | |||
-rw-r--r-- | public/cover/L’Homme à l’oreille coupée.jpg (renamed from src/main/resources/cover/L’Homme à l’oreille coupée.jpg) | bin | 23082 -> 23082 bytes | |||
-rw-r--r-- | public/cover/L’Omelette au sucre.jpg (renamed from src/main/resources/cover/L’Omelette au sucre.jpg) | bin | 248406 -> 248406 bytes | |||
-rw-r--r-- | public/cover/L’Ordre Terne.jpg (renamed from src/main/resources/cover/L’Ordre Terne.jpg) | bin | 175315 -> 175315 bytes | |||
-rw-r--r-- | public/cover/L’Étrange cas du Dr Jekyll et de M. Hyde.jpg (renamed from src/main/resources/cover/L’Étrange cas du Dr Jekyll et de M. Hyde.jpg) | bin | 25715 -> 25715 bytes | |||
-rw-r--r-- | public/cover/L’œil du loup.jpg (renamed from src/main/resources/cover/L’œil du loup.jpg) | bin | 46440 -> 46440 bytes | |||
-rw-r--r-- | public/cover/Ma mère, le crabe et moi.jpg (renamed from src/main/resources/cover/Ma mère, le crabe et moi.jpg) | bin | 35546 -> 35546 bytes | |||
-rw-r--r-- | public/cover/Maliki.jpg (renamed from src/main/resources/cover/Maliki.jpg) | bin | 54259 -> 54259 bytes | |||
-rw-r--r-- | public/cover/Mathias MALZIEU.jpg (renamed from src/main/resources/cover/Mathias MALZIEU.jpg) | bin | 20019 -> 20019 bytes | |||
-rw-r--r-- | public/cover/Matilda.jpg (renamed from src/main/resources/cover/Matilda.jpg) | bin | 52599 -> 52599 bytes | |||
-rw-r--r-- | public/cover/Mortelle Adèle.jpg (renamed from src/main/resources/cover/Mortelle Adèle.jpg) | bin | 19460 -> 19460 bytes | |||
-rw-r--r-- | public/cover/Nos Étoiles contraires.jpg (renamed from src/main/resources/cover/Nos Étoiles contraires.jpg) | bin | 31778 -> 31778 bytes | |||
-rw-r--r-- | public/cover/Oniria.jpg (renamed from src/main/resources/cover/Oniria.jpg) | bin | 41158 -> 41158 bytes | |||
-rw-r--r-- | public/cover/Percy JACKSON.jpg (renamed from src/main/resources/cover/Percy JACKSON.jpg) | bin | 28584 -> 28584 bytes | |||
-rw-r--r-- | public/cover/Persépolis.jpg (renamed from src/main/resources/cover/Persépolis.jpg) | bin | 33861 -> 33861 bytes | |||
-rw-r--r-- | public/cover/Quand la nuit voit le jour.jpg (renamed from src/main/resources/cover/Quand la nuit voit le jour.jpg) | bin | 27817 -> 27817 bytes | |||
-rw-r--r-- | public/cover/Question de temps.jpg (renamed from src/main/resources/cover/Question de temps.jpg) | bin | 139265 -> 139265 bytes | |||
-rw-r--r-- | public/cover/Risk.jpg (renamed from src/main/resources/cover/Risk.jpg) | bin | 123402 -> 123402 bytes | |||
-rw-r--r-- | public/cover/Seuls.jpg (renamed from src/main/resources/cover/Seuls.jpg) | bin | 27728 -> 27728 bytes | |||
-rw-r--r-- | public/cover/Simple.jpg (renamed from src/main/resources/cover/Simple.jpg) | bin | 28099 -> 28099 bytes | |||
-rw-r--r-- | public/cover/Soldat Peaceful.jpg (renamed from src/main/resources/cover/Soldat Peaceful.jpg) | bin | 80805 -> 80805 bytes | |||
-rw-r--r-- | public/cover/Sweet Sixteen.jpg (renamed from src/main/resources/cover/Sweet Sixteen.jpg) | bin | 31149 -> 31149 bytes | |||
-rw-r--r-- | public/cover/The Mortal instruments.jpg (renamed from src/main/resources/cover/The Mortal instruments.jpg) | bin | 68453 -> 68453 bytes | |||
-rw-r--r-- | public/cover/Tild : mage à louer.jpg (renamed from src/main/resources/cover/Tild : mage à louer.jpg) | bin | 188939 -> 188939 bytes | |||
-rw-r--r-- | public/cover/Tintin.jpg (renamed from src/main/resources/cover/Tintin.jpg) | bin | 30692 -> 30692 bytes | |||
-rw-r--r-- | public/cover/Titeuf.jpg (renamed from src/main/resources/cover/Titeuf.jpg) | bin | 66949 -> 66949 bytes | |||
-rw-r--r-- | public/cover/Tobie Lolness.jpg (renamed from src/main/resources/cover/Tobie Lolness.jpg) | bin | 118516 -> 118516 bytes | |||
-rw-r--r-- | public/cover/Trois filles et….jpg (renamed from src/main/resources/cover/Trois filles et….jpg) | bin | 153554 -> 153554 bytes | |||
-rw-r--r-- | public/cover/Uglies.jpg (renamed from src/main/resources/cover/Uglies.jpg) | bin | 54442 -> 54442 bytes | |||
-rw-r--r-- | public/cover/Uglies.png (renamed from src/main/resources/cover/Uglies.png) | bin | 251935 -> 251935 bytes | |||
-rw-r--r-- | public/cover/Un Cadavre dans la bibliothèque.jpg (renamed from src/main/resources/cover/Un Cadavre dans la bibliothèque.jpg) | bin | 50082 -> 50082 bytes | |||
-rw-r--r-- | public/cover/Un Drôle d’ange gardien.jpg (renamed from src/main/resources/cover/Un Drôle d’ange gardien.jpg) | bin | 79459 -> 79459 bytes | |||
-rw-r--r-- | public/cover/Un Monde sauvage.jpg (renamed from src/main/resources/cover/Un Monde sauvage.jpg) | bin | 154653 -> 154653 bytes | |||
-rw-r--r-- | public/cover/Un Ours dans la bergerie.jpg (renamed from src/main/resources/cover/Un Ours dans la bergerie.jpg) | bin | 75893 -> 75893 bytes | |||
-rw-r--r-- | public/cover/Un Ours dans la bergerie.png (renamed from src/main/resources/cover/Un Ours dans la bergerie.png) | bin | 1084431 -> 1084431 bytes | |||
-rw-r--r-- | public/cover/Une (irrésistible) envie de….jpg (renamed from src/main/resources/cover/Une (irrésistible) envie de….jpg) | bin | 45597 -> 45597 bytes | |||
-rw-r--r-- | public/cover/À Copier 100 fois.jpg | bin | 0 -> 28624 bytes | |||
-rw-r--r-- | public/cover/À la Croisée des mondes.jpg (renamed from src/main/resources/cover/À la Croisée des mondes.jpg) | bin | 38486 -> 38486 bytes | |||
-rw-r--r-- | public/cover/À la Poursuite d’Olympe.jpg (renamed from src/main/resources/cover/À la Poursuite d’Olympe.jpg) | bin | 35795 -> 35795 bytes | |||
-rw-r--r-- | public/cover/Étincelles.jpg (renamed from src/main/resources/cover/Étincelles.jpg) | bin | 40790 -> 40790 bytes | |||
-rw-r--r-- | public/icon.png (renamed from src/main/resources/icon.png) | bin | 553 -> 553 bytes | |||
-rw-r--r-- | public/index.html (renamed from src/main/resources/index-dev.html) | 2 | ||||
l--------- | public/main.js | 1 | ||||
-rw-r--r-- | public/reset.css (renamed from src/main/resources/reset.css) | 0 | ||||
-rw-r--r-- | src/main/resources/index-prod.html | 14 | ||||
-rw-r--r-- | src/main/scala/reading/Books.scala | 8 | ||||
-rw-r--r-- | src/main/scala/reading/component/index/BookDetail.scala | 2 | ||||
-rw-r--r-- | src/main/scala/reading/component/index/Books.scala | 2 | ||||
-rw-r--r-- | src/main/scala/reading/models/Book.scala | 16 | ||||
-rw-r--r-- | src/main/scala/reading/models/Compare.scala | 17 | ||||
-rw-r--r-- | src/main/scala/reading/models/Genre.scala | 7 | ||||
-rw-r--r-- | src/main/scala/reading/models/Period.scala | 7 | ||||
-rw-r--r-- | src/main/scala/reading/models/Theme.scala | 7 |
148 files changed, 40 insertions, 52 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11a45d0..75fbd96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,13 +14,8 @@ pages: stage: deploy script: - sbt clean fullOptJS - - mkdir -p public - - cp target/scala-2.12/classes/index-prod.html public/index.html - - cp target/scala-2.12/classes/reset.css public/reset.css - - cp -r target/scala-2.12/classes/cover public/cover - - cp target/scala-2.12/classes/icon.png public/icon.png + - rm public/main.js - cp target/scala-2.12/reading-opt.js public/main.js - - sed 's/src="[^"]*"/src="main.js"/' -i public/index.html artifacts: paths: - public diff --git a/.tmuxinator.yml b/.tmuxinator.yml index ec56e7d..95fc426 100644 --- a/.tmuxinator.yml +++ b/.tmuxinator.yml @@ -9,4 +9,4 @@ windows: - sbt - ~fastOptJS - server: - - (cd target/scala-2.12; python -m http.server 9000) + - (cd public; python -m http.server 9000) diff --git a/public/cover/Ajin.jpg b/public/cover/Ajin.jpg Binary files differnew file mode 100644 index 0000000..da6ab54 --- /dev/null +++ b/public/cover/Ajin.jpg diff --git a/public/cover/Après la vague.jpg b/public/cover/Après la vague.jpg Binary files differnew file mode 100644 index 0000000..48e67de --- /dev/null +++ b/public/cover/Après la vague.jpg diff --git a/public/cover/Ariol.jpg b/public/cover/Ariol.jpg Binary files differnew file mode 100644 index 0000000..4a95c79 --- /dev/null +++ b/public/cover/Ariol.jpg diff --git a/public/cover/Avant l’ouragan.jpg b/public/cover/Avant l’ouragan.jpg Binary files differnew file mode 100644 index 0000000..6d96733 --- /dev/null +++ b/public/cover/Avant l’ouragan.jpg diff --git a/src/main/resources/cover/Bichon.jpg b/public/cover/Bichon.jpg Binary files differindex e771516..e771516 100644 --- a/src/main/resources/cover/Bichon.jpg +++ b/public/cover/Bichon.jpg diff --git a/src/main/resources/cover/Bilbo Le Hobbit.jpg b/public/cover/Bilbo Le Hobbit.jpg Binary files differindex 2720c16..2720c16 100644 --- a/src/main/resources/cover/Bilbo Le Hobbit.jpg +++ b/public/cover/Bilbo Le Hobbit.jpg diff --git a/src/main/resources/cover/Bjorn le Morphir.jpg b/public/cover/Bjorn le Morphir.jpg Binary files differindex b572d48..b572d48 100644 --- a/src/main/resources/cover/Bjorn le Morphir.jpg +++ b/public/cover/Bjorn le Morphir.jpg diff --git a/src/main/resources/cover/Blanche Neige et Grise Pluie.jpg b/public/cover/Blanche Neige et Grise Pluie.jpg Binary files differindex 7c7b4ee..7c7b4ee 100644 --- a/src/main/resources/cover/Blanche Neige et Grise Pluie.jpg +++ b/public/cover/Blanche Neige et Grise Pluie.jpg diff --git a/public/cover/Boys don’t cry.jpg b/public/cover/Boys don’t cry.jpg Binary files differnew file mode 100644 index 0000000..8209272 --- /dev/null +++ b/public/cover/Boys don’t cry.jpg diff --git a/public/cover/Brise glace.jpg b/public/cover/Brise glace.jpg Binary files differnew file mode 100644 index 0000000..291d807 --- /dev/null +++ b/public/cover/Brise glace.jpg diff --git a/src/main/resources/cover/Cabot Caboche.jpg b/public/cover/Cabot Caboche.jpg Binary files differindex 41a5cc4..41a5cc4 100644 --- a/src/main/resources/cover/Cabot Caboche.jpg +++ b/public/cover/Cabot Caboche.jpg diff --git a/src/main/resources/cover/Caïus.jpg b/public/cover/Caïus.jpg Binary files differindex 3a64ab1..3a64ab1 100644 --- a/src/main/resources/cover/Caïus.jpg +++ b/public/cover/Caïus.jpg diff --git a/src/main/resources/cover/Cherub.jpg b/public/cover/Cherub.jpg Binary files differindex a513517..a513517 100644 --- a/src/main/resources/cover/Cherub.jpg +++ b/public/cover/Cherub.jpg diff --git a/src/main/resources/cover/Cheval de guerre.jpg b/public/cover/Cheval de guerre.jpg Binary files differindex 2b044c4..2b044c4 100644 --- a/src/main/resources/cover/Cheval de guerre.jpg +++ b/public/cover/Cheval de guerre.jpg diff --git a/src/main/resources/cover/Cinder.jpg b/public/cover/Cinder.jpg Binary files differindex 0ff5d37..0ff5d37 100644 --- a/src/main/resources/cover/Cinder.jpg +++ b/public/cover/Cinder.jpg diff --git a/src/main/resources/cover/Cinq histoires d’amour et de chevalerie.jpg b/public/cover/Cinq histoires d’amour et de chevalerie.jpg Binary files differindex 73ac9d7..73ac9d7 100644 --- a/src/main/resources/cover/Cinq histoires d’amour et de chevalerie.jpg +++ b/public/cover/Cinq histoires d’amour et de chevalerie.jpg diff --git a/src/main/resources/cover/Cinq petits cochons.jpg b/public/cover/Cinq petits cochons.jpg Binary files differindex 9d118f2..9d118f2 100644 --- a/src/main/resources/cover/Cinq petits cochons.jpg +++ b/public/cover/Cinq petits cochons.jpg diff --git a/src/main/resources/cover/Cédric.jpg b/public/cover/Cédric.jpg Binary files differindex e23e476..e23e476 100644 --- a/src/main/resources/cover/Cédric.jpg +++ b/public/cover/Cédric.jpg diff --git a/src/main/resources/cover/Céleste, ma planète.jpg b/public/cover/Céleste, ma planète.jpg Binary files differindex a5f4119..a5f4119 100644 --- a/src/main/resources/cover/Céleste, ma planète.jpg +++ b/public/cover/Céleste, ma planète.jpg diff --git a/src/main/resources/cover/C’était mon oncle !.jpg b/public/cover/C’était mon oncle !.jpg Binary files differindex b02c7c9..b02c7c9 100644 --- a/src/main/resources/cover/C’était mon oncle !.jpg +++ b/public/cover/C’était mon oncle !.jpg diff --git a/src/main/resources/cover/DIMILY.jpg b/public/cover/DIMILY.jpg Binary files differindex 6376a34..6376a34 100644 --- a/src/main/resources/cover/DIMILY.jpg +++ b/public/cover/DIMILY.jpg diff --git a/src/main/resources/cover/Divergente.jpg b/public/cover/Divergente.jpg Binary files differindex 34f8b6f..34f8b6f 100644 --- a/src/main/resources/cover/Divergente.jpg +++ b/public/cover/Divergente.jpg diff --git a/src/main/resources/cover/Décollage immédiat.jpg b/public/cover/Décollage immédiat.jpg Binary files differindex 8b1c49d..8b1c49d 100644 --- a/src/main/resources/cover/Décollage immédiat.jpg +++ b/public/cover/Décollage immédiat.jpg diff --git a/src/main/resources/cover/Ellana.jpg b/public/cover/Ellana.jpg Binary files differindex 3c8c299..3c8c299 100644 --- a/src/main/resources/cover/Ellana.jpg +++ b/public/cover/Ellana.jpg diff --git a/src/main/resources/cover/Eragon.jpg b/public/cover/Eragon.jpg Binary files differindex 0f2ff43..0f2ff43 100644 --- a/src/main/resources/cover/Eragon.jpg +++ b/public/cover/Eragon.jpg diff --git a/src/main/resources/cover/EverWorld.gif b/public/cover/EverWorld.gif Binary files differindex b17001a..b17001a 100644 --- a/src/main/resources/cover/EverWorld.gif +++ b/public/cover/EverWorld.gif diff --git a/src/main/resources/cover/EverWorld.jpg b/public/cover/EverWorld.jpg Binary files differindex 8f40da6..8f40da6 100644 --- a/src/main/resources/cover/EverWorld.jpg +++ b/public/cover/EverWorld.jpg diff --git a/src/main/resources/cover/Fantastique Maître Renard.jpg b/public/cover/Fantastique Maître Renard.jpg Binary files differindex 57f5dd3..57f5dd3 100644 --- a/src/main/resources/cover/Fantastique Maître Renard.jpg +++ b/public/cover/Fantastique Maître Renard.jpg diff --git a/src/main/resources/cover/Frankenstein.jpg b/public/cover/Frankenstein.jpg Binary files differindex a578a84..a578a84 100644 --- a/src/main/resources/cover/Frankenstein.jpg +++ b/public/cover/Frankenstein.jpg diff --git a/src/main/resources/cover/Frigiel et Fluffy.jpg b/public/cover/Frigiel et Fluffy.jpg Binary files differindex ac41b62..ac41b62 100644 --- a/src/main/resources/cover/Frigiel et Fluffy.jpg +++ b/public/cover/Frigiel et Fluffy.jpg diff --git a/src/main/resources/cover/Gardiens des cités perdues.jpg b/public/cover/Gardiens des cités perdues.jpg Binary files differindex 7c94b0b..7c94b0b 100644 --- a/src/main/resources/cover/Gardiens des cités perdues.jpg +++ b/public/cover/Gardiens des cités perdues.jpg diff --git a/src/main/resources/cover/Harry POTTER.jpg b/public/cover/Harry POTTER.jpg Binary files differindex d15a4eb..d15a4eb 100644 --- a/src/main/resources/cover/Harry POTTER.jpg +++ b/public/cover/Harry POTTER.jpg diff --git a/src/main/resources/cover/Histoire du chien qui avait une ombre d’enfant.jpg b/public/cover/Histoire du chien qui avait une ombre d’enfant.jpg Binary files differindex dc2db60..dc2db60 100644 --- a/src/main/resources/cover/Histoire du chien qui avait une ombre d’enfant.jpg +++ b/public/cover/Histoire du chien qui avait une ombre d’enfant.jpg diff --git a/src/main/resources/cover/Hunger Games.jpg b/public/cover/Hunger Games.jpg Binary files differindex 7a5c9b9..7a5c9b9 100644 --- a/src/main/resources/cover/Hunger Games.jpg +++ b/public/cover/Hunger Games.jpg diff --git a/src/main/resources/cover/Isis, 13 ans, 1,60 m, 82 kilos.jpg b/public/cover/Isis, 13 ans, 1,60 m, 82 kilos.jpg Binary files differindex dfe4c48..dfe4c48 100644 --- a/src/main/resources/cover/Isis, 13 ans, 1,60 m, 82 kilos.jpg +++ b/public/cover/Isis, 13 ans, 1,60 m, 82 kilos.jpg diff --git a/src/main/resources/cover/Je veux vivre.jpg b/public/cover/Je veux vivre.jpg Binary files differindex 0d176b6..0d176b6 100644 --- a/src/main/resources/cover/Je veux vivre.jpg +++ b/public/cover/Je veux vivre.jpg diff --git a/src/main/resources/cover/Journal d’un dégonflé.jpg b/public/cover/Journal d’un dégonflé.jpg Binary files differindex faada5f..faada5f 100644 --- a/src/main/resources/cover/Journal d’un dégonflé.jpg +++ b/public/cover/Journal d’un dégonflé.jpg diff --git a/src/main/resources/cover/Journal d’un noob.jpg b/public/cover/Journal d’un noob.jpg Binary files differindex 20f7b0a..20f7b0a 100644 --- a/src/main/resources/cover/Journal d’un noob.jpg +++ b/public/cover/Journal d’un noob.jpg diff --git a/src/main/resources/cover/Journal d’un vampire en pyjama.jpg b/public/cover/Journal d’un vampire en pyjama.jpg Binary files differindex 902ed12..902ed12 100644 --- a/src/main/resources/cover/Journal d’un vampire en pyjama.jpg +++ b/public/cover/Journal d’un vampire en pyjama.jpg diff --git a/src/main/resources/cover/Journal d’une grosse nouille.jpg b/public/cover/Journal d’une grosse nouille.jpg Binary files differindex 4736744..4736744 100644 --- a/src/main/resources/cover/Journal d’une grosse nouille.jpg +++ b/public/cover/Journal d’une grosse nouille.jpg diff --git a/src/main/resources/cover/Kiss.jpg b/public/cover/Kiss.jpg Binary files differindex af95c73..af95c73 100644 --- a/src/main/resources/cover/Kiss.jpg +++ b/public/cover/Kiss.jpg diff --git a/src/main/resources/cover/La Guerre des clans.jpg b/public/cover/La Guerre des clans.jpg Binary files differindex 9870269..9870269 100644 --- a/src/main/resources/cover/La Guerre des clans.jpg +++ b/public/cover/La Guerre des clans.jpg diff --git a/src/main/resources/cover/La Mécanique du cœur.jpg b/public/cover/La Mécanique du cœur.jpg Binary files differindex 984400f..984400f 100644 --- a/src/main/resources/cover/La Mécanique du cœur.jpg +++ b/public/cover/La Mécanique du cœur.jpg diff --git a/src/main/resources/cover/La Quête d’Ewilan.jpg b/public/cover/La Quête d’Ewilan.jpg Binary files differindex 6e9d25d..6e9d25d 100644 --- a/src/main/resources/cover/La Quête d’Ewilan.jpg +++ b/public/cover/La Quête d’Ewilan.jpg diff --git a/src/main/resources/cover/La Rentrée du Petit Nicolas : les histoires inédites du Petit Nicolas 3.jpg b/public/cover/La Rentrée du Petit Nicolas : les histoires inédites du Petit Nicolas 3.jpg Binary files differindex 71090de..71090de 100644 --- a/src/main/resources/cover/La Rentrée du Petit Nicolas : les histoires inédites du Petit Nicolas 3.jpg +++ b/public/cover/La Rentrée du Petit Nicolas : les histoires inédites du Petit Nicolas 3.jpg diff --git a/src/main/resources/cover/La Rivière à l’envers.jpg b/public/cover/La Rivière à l’envers.jpg Binary files differindex 1ac0041..1ac0041 100644 --- a/src/main/resources/cover/La Rivière à l’envers.jpg +++ b/public/cover/La Rivière à l’envers.jpg diff --git a/src/main/resources/cover/La Sélection.jpg b/public/cover/La Sélection.jpg Binary files differindex 4c8cc67..4c8cc67 100644 --- a/src/main/resources/cover/La Sélection.jpg +++ b/public/cover/La Sélection.jpg diff --git a/src/main/resources/cover/La Tour des vents.jpg b/public/cover/La Tour des vents.jpg Binary files differindex 5d95dfc..5d95dfc 100644 --- a/src/main/resources/cover/La Tour des vents.jpg +++ b/public/cover/La Tour des vents.jpg diff --git a/src/main/resources/cover/La Trilogie de Bartiméus.jpg b/public/cover/La Trilogie de Bartiméus.jpg Binary files differindex 9d25265..9d25265 100644 --- a/src/main/resources/cover/La Trilogie de Bartiméus.jpg +++ b/public/cover/La Trilogie de Bartiméus.jpg diff --git a/src/main/resources/cover/La Vie compliquée de Léa OLIVIER.jpg b/public/cover/La Vie compliquée de Léa OLIVIER.jpg Binary files differindex 043e049..043e049 100644 --- a/src/main/resources/cover/La Vie compliquée de Léa OLIVIER.jpg +++ b/public/cover/La Vie compliquée de Léa OLIVIER.jpg diff --git a/src/main/resources/cover/Lady Grace.jpg b/public/cover/Lady Grace.jpg Binary files differindex 2b69f58..2b69f58 100644 --- a/src/main/resources/cover/Lady Grace.jpg +++ b/public/cover/Lady Grace.jpg diff --git a/public/cover/Le Bazar des mauvais rêves : nouvelles.jpg b/public/cover/Le Bazar des mauvais rêves : nouvelles.jpg Binary files differnew file mode 100644 index 0000000..c37169e --- /dev/null +++ b/public/cover/Le Bazar des mauvais rêves : nouvelles.jpg diff --git a/src/main/resources/cover/Le Bon Gros Géant.jpg b/public/cover/Le Bon Gros Géant.jpg Binary files differindex 8ffad30..8ffad30 100644 --- a/src/main/resources/cover/Le Bon Gros Géant.jpg +++ b/public/cover/Le Bon Gros Géant.jpg diff --git a/src/main/resources/cover/Le Carnet d’Allie.jpg b/public/cover/Le Carnet d’Allie.jpg Binary files differindex f30850a..f30850a 100644 --- a/src/main/resources/cover/Le Carnet d’Allie.jpg +++ b/public/cover/Le Carnet d’Allie.jpg diff --git a/src/main/resources/cover/Le Crime de l’Orient-Express.jpg b/public/cover/Le Crime de l’Orient-Express.jpg Binary files differindex 0c8ddb3..0c8ddb3 100644 --- a/src/main/resources/cover/Le Crime de l’Orient-Express.jpg +++ b/public/cover/Le Crime de l’Orient-Express.jpg diff --git a/src/main/resources/cover/Le Donjon de NAHEULBEUK.jpg b/public/cover/Le Donjon de NAHEULBEUK.jpg Binary files differindex d59f8df..d59f8df 100644 --- a/src/main/resources/cover/Le Donjon de NAHEULBEUK.jpg +++ b/public/cover/Le Donjon de NAHEULBEUK.jpg diff --git a/src/main/resources/cover/Le Journal d’Aurélie Laflamme.jpg b/public/cover/Le Journal d’Aurélie Laflamme.jpg Binary files differindex f1c8b4a..f1c8b4a 100644 --- a/src/main/resources/cover/Le Journal d’Aurélie Laflamme.jpg +++ b/public/cover/Le Journal d’Aurélie Laflamme.jpg diff --git a/src/main/resources/cover/Le Maître des clés.jpg b/public/cover/Le Maître des clés.jpg Binary files differindex ce61c30..ce61c30 100644 --- a/src/main/resources/cover/Le Maître des clés.jpg +++ b/public/cover/Le Maître des clés.jpg diff --git a/src/main/resources/cover/Le Meurtre de Roger Ackroyd.jpg b/public/cover/Le Meurtre de Roger Ackroyd.jpg Binary files differindex 5e65b8f..5e65b8f 100644 --- a/src/main/resources/cover/Le Meurtre de Roger Ackroyd.jpg +++ b/public/cover/Le Meurtre de Roger Ackroyd.jpg diff --git a/src/main/resources/cover/Le Monde de Charlie.jpg b/public/cover/Le Monde de Charlie.jpg Binary files differindex d69a426..d69a426 100644 --- a/src/main/resources/cover/Le Monde de Charlie.jpg +++ b/public/cover/Le Monde de Charlie.jpg diff --git a/src/main/resources/cover/Le Monde de Narnia.jpg b/public/cover/Le Monde de Narnia.jpg Binary files differindex 0623480..0623480 100644 --- a/src/main/resources/cover/Le Monde de Narnia.jpg +++ b/public/cover/Le Monde de Narnia.jpg diff --git a/src/main/resources/cover/Le Passe-miroir.jpg b/public/cover/Le Passe-miroir.jpg Binary files differindex 6cf34f4..6cf34f4 100644 --- a/src/main/resources/cover/Le Passe-miroir.jpg +++ b/public/cover/Le Passe-miroir.jpg diff --git a/src/main/resources/cover/Le Passeur.jpg b/public/cover/Le Passeur.jpg Binary files differindex 4461b82..4461b82 100644 --- a/src/main/resources/cover/Le Passeur.jpg +++ b/public/cover/Le Passeur.jpg diff --git a/src/main/resources/cover/Le Petit Nicolas.jpg b/public/cover/Le Petit Nicolas.jpg Binary files differindex f78f055..f78f055 100644 --- a/src/main/resources/cover/Le Petit Nicolas.jpg +++ b/public/cover/Le Petit Nicolas.jpg diff --git a/src/main/resources/cover/Le Petit Prince.jpg b/public/cover/Le Petit Prince.jpg Binary files differindex ffe69e0..ffe69e0 100644 --- a/src/main/resources/cover/Le Petit Prince.jpg +++ b/public/cover/Le Petit Prince.jpg diff --git a/src/main/resources/cover/Le Plus petit baiser jamais recensé.jpg b/public/cover/Le Plus petit baiser jamais recensé.jpg Binary files differindex 94e21ba..94e21ba 100644 --- a/src/main/resources/cover/Le Plus petit baiser jamais recensé.jpg +++ b/public/cover/Le Plus petit baiser jamais recensé.jpg diff --git a/src/main/resources/cover/Le Renard de Morlange.jpg b/public/cover/Le Renard de Morlange.jpg Binary files differindex a85237d..a85237d 100644 --- a/src/main/resources/cover/Le Renard de Morlange.jpg +++ b/public/cover/Le Renard de Morlange.jpg diff --git a/src/main/resources/cover/Le Royaume de Kensuké.jpg b/public/cover/Le Royaume de Kensuké.jpg Binary files differindex 342c8b4..342c8b4 100644 --- a/src/main/resources/cover/Le Royaume de Kensuké.jpg +++ b/public/cover/Le Royaume de Kensuké.jpg diff --git a/src/main/resources/cover/Le Seigneur des anneaux.jpg b/public/cover/Le Seigneur des anneaux.jpg Binary files differindex 64e8c3e..64e8c3e 100644 --- a/src/main/resources/cover/Le Seigneur des anneaux.jpg +++ b/public/cover/Le Seigneur des anneaux.jpg diff --git a/src/main/resources/cover/Le Silmarillion.jpg b/public/cover/Le Silmarillion.jpg Binary files differindex 226cc65..226cc65 100644 --- a/src/main/resources/cover/Le Silmarillion.jpg +++ b/public/cover/Le Silmarillion.jpg diff --git a/src/main/resources/cover/Le chien des Baskerville.jpg b/public/cover/Le chien des Baskerville.jpg Binary files differindex 95b56ea..95b56ea 100644 --- a/src/main/resources/cover/Le chien des Baskerville.jpg +++ b/public/cover/Le chien des Baskerville.jpg diff --git a/src/main/resources/cover/Le journal intime de Georgia Nicolson.jpg b/public/cover/Le journal intime de Georgia Nicolson.jpg Binary files differindex 5a9f952..5a9f952 100644 --- a/src/main/resources/cover/Le journal intime de Georgia Nicolson.jpg +++ b/public/cover/Le journal intime de Georgia Nicolson.jpg diff --git a/public/cover/Les Ailes de la Sylphide.jpg b/public/cover/Les Ailes de la Sylphide.jpg Binary files differnew file mode 100644 index 0000000..5e92405 --- /dev/null +++ b/public/cover/Les Ailes de la Sylphide.jpg diff --git a/src/main/resources/cover/Les Aventures de Tom Sawyer.jpg b/public/cover/Les Aventures de Tom Sawyer.jpg Binary files differindex 9b54b3f..9b54b3f 100644 --- a/src/main/resources/cover/Les Aventures de Tom Sawyer.jpg +++ b/public/cover/Les Aventures de Tom Sawyer.jpg diff --git a/src/main/resources/cover/Les Colombes du Roi Soleil.jpg b/public/cover/Les Colombes du Roi Soleil.jpg Binary files differindex 6f5b4c7..6f5b4c7 100644 --- a/src/main/resources/cover/Les Colombes du Roi Soleil.jpg +++ b/public/cover/Les Colombes du Roi Soleil.jpg diff --git a/src/main/resources/cover/Les Dix petits nègres.jpg b/public/cover/Les Dix petits nègres.jpg Binary files differindex f39a6d9..f39a6d9 100644 --- a/src/main/resources/cover/Les Dix petits nègres.jpg +++ b/public/cover/Les Dix petits nègres.jpg diff --git a/src/main/resources/cover/Les Héritiers d’Enkidiev.jpg b/public/cover/Les Héritiers d’Enkidiev.jpg Binary files differindex f1e751b..f1e751b 100644 --- a/src/main/resources/cover/Les Héritiers d’Enkidiev.jpg +++ b/public/cover/Les Héritiers d’Enkidiev.jpg diff --git a/src/main/resources/cover/Les Héros de l’Olympe.jpg b/public/cover/Les Héros de l’Olympe.jpg Binary files differindex e8f87e9..e8f87e9 100644 --- a/src/main/resources/cover/Les Héros de l’Olympe.jpg +++ b/public/cover/Les Héros de l’Olympe.jpg diff --git a/src/main/resources/cover/Les Inséparables.jpg b/public/cover/Les Inséparables.jpg Binary files differindex fdd5d24..fdd5d24 100644 --- a/src/main/resources/cover/Les Inséparables.jpg +++ b/public/cover/Les Inséparables.jpg diff --git a/src/main/resources/cover/Les Mauvaises notes.jpg b/public/cover/Les Mauvaises notes.jpg Binary files differindex 5a840af..5a840af 100644 --- a/src/main/resources/cover/Les Mauvaises notes.jpg +++ b/public/cover/Les Mauvaises notes.jpg diff --git a/src/main/resources/cover/Les Mondes d’Ewilan.jpg b/public/cover/Les Mondes d’Ewilan.jpg Binary files differindex 69c6fcd..69c6fcd 100644 --- a/src/main/resources/cover/Les Mondes d’Ewilan.jpg +++ b/public/cover/Les Mondes d’Ewilan.jpg diff --git a/src/main/resources/cover/Les Orangers de Versailles.jpg b/public/cover/Les Orangers de Versailles.jpg Binary files differindex cb53018..cb53018 100644 --- a/src/main/resources/cover/Les Orangers de Versailles.jpg +++ b/public/cover/Les Orangers de Versailles.jpg diff --git a/src/main/resources/cover/Les Plus belles histoires du Prince de Motordu.jpg b/public/cover/Les Plus belles histoires du Prince de Motordu.jpg Binary files differindex 9826b6b..9826b6b 100644 --- a/src/main/resources/cover/Les Plus belles histoires du Prince de Motordu.jpg +++ b/public/cover/Les Plus belles histoires du Prince de Motordu.jpg diff --git a/src/main/resources/cover/Les Royaumes de feu.jpg b/public/cover/Les Royaumes de feu.jpg Binary files differindex e2e545b..e2e545b 100644 --- a/src/main/resources/cover/Les Royaumes de feu.jpg +++ b/public/cover/Les Royaumes de feu.jpg diff --git a/src/main/resources/cover/Les Sisters.jpg b/public/cover/Les Sisters.jpg Binary files differindex 545ffd0..545ffd0 100644 --- a/src/main/resources/cover/Les Sisters.jpg +++ b/public/cover/Les Sisters.jpg diff --git a/src/main/resources/cover/Les Sisters.png b/public/cover/Les Sisters.png Binary files differindex 16f942f..16f942f 100644 --- a/src/main/resources/cover/Les Sisters.png +++ b/public/cover/Les Sisters.png diff --git a/src/main/resources/cover/Les carnets de Cerise.jpg b/public/cover/Les carnets de Cerise.jpg Binary files differindex 1667dc8..1667dc8 100644 --- a/src/main/resources/cover/Les carnets de Cerise.jpg +++ b/public/cover/Les carnets de Cerise.jpg diff --git a/src/main/resources/cover/Les filles au chocolat.jpg b/public/cover/Les filles au chocolat.jpg Binary files differindex 2a91d41..2a91d41 100644 --- a/src/main/resources/cover/Les filles au chocolat.jpg +++ b/public/cover/Les filles au chocolat.jpg diff --git a/src/main/resources/cover/Les Âmes vagabondes.jpg b/public/cover/Les Âmes vagabondes.jpg Binary files differindex 787e4c6..787e4c6 100644 --- a/src/main/resources/cover/Les Âmes vagabondes.jpg +++ b/public/cover/Les Âmes vagabondes.jpg diff --git a/src/main/resources/cover/Lou !.jpg b/public/cover/Lou !.jpg Binary files differindex e681d20..e681d20 100644 --- a/src/main/resources/cover/Lou !.jpg +++ b/public/cover/Lou !.jpg diff --git a/src/main/resources/cover/Louisette la taupe – L’heure du Grimm.jpg b/public/cover/Louisette la taupe – L’heure du Grimm.jpg Binary files differindex 4bf0ff6..4bf0ff6 100644 --- a/src/main/resources/cover/Louisette la taupe – L’heure du Grimm.jpg +++ b/public/cover/Louisette la taupe – L’heure du Grimm.jpg diff --git a/src/main/resources/cover/L’Apprenti d’Araluen.jpg b/public/cover/L’Apprenti d’Araluen.jpg Binary files differindex 77752f3..77752f3 100644 --- a/src/main/resources/cover/L’Apprenti d’Araluen.jpg +++ b/public/cover/L’Apprenti d’Araluen.jpg diff --git a/src/main/resources/cover/L’Enfant Océan.jpg b/public/cover/L’Enfant Océan.jpg Binary files differindex 9564287..9564287 100644 --- a/src/main/resources/cover/L’Enfant Océan.jpg +++ b/public/cover/L’Enfant Océan.jpg diff --git a/src/main/resources/cover/L’Espionne du Roi-Soleil.jpg b/public/cover/L’Espionne du Roi-Soleil.jpg Binary files differindex f1455e8..f1455e8 100644 --- a/src/main/resources/cover/L’Espionne du Roi-Soleil.jpg +++ b/public/cover/L’Espionne du Roi-Soleil.jpg diff --git a/src/main/resources/cover/L’Homme à l’oreille coupée.jpg b/public/cover/L’Homme à l’oreille coupée.jpg Binary files differindex e338c07..e338c07 100644 --- a/src/main/resources/cover/L’Homme à l’oreille coupée.jpg +++ b/public/cover/L’Homme à l’oreille coupée.jpg diff --git a/src/main/resources/cover/L’Omelette au sucre.jpg b/public/cover/L’Omelette au sucre.jpg Binary files differindex 189e247..189e247 100644 --- a/src/main/resources/cover/L’Omelette au sucre.jpg +++ b/public/cover/L’Omelette au sucre.jpg diff --git a/src/main/resources/cover/L’Ordre Terne.jpg b/public/cover/L’Ordre Terne.jpg Binary files differindex ef6af2d..ef6af2d 100644 --- a/src/main/resources/cover/L’Ordre Terne.jpg +++ b/public/cover/L’Ordre Terne.jpg diff --git a/src/main/resources/cover/L’Étrange cas du Dr Jekyll et de M. Hyde.jpg b/public/cover/L’Étrange cas du Dr Jekyll et de M. Hyde.jpg Binary files differindex 5ff1cba..5ff1cba 100644 --- a/src/main/resources/cover/L’Étrange cas du Dr Jekyll et de M. Hyde.jpg +++ b/public/cover/L’Étrange cas du Dr Jekyll et de M. Hyde.jpg diff --git a/src/main/resources/cover/L’œil du loup.jpg b/public/cover/L’œil du loup.jpg Binary files differindex 8d5b920..8d5b920 100644 --- a/src/main/resources/cover/L’œil du loup.jpg +++ b/public/cover/L’œil du loup.jpg diff --git a/src/main/resources/cover/Ma mère, le crabe et moi.jpg b/public/cover/Ma mère, le crabe et moi.jpg Binary files differindex 1cf788e..1cf788e 100644 --- a/src/main/resources/cover/Ma mère, le crabe et moi.jpg +++ b/public/cover/Ma mère, le crabe et moi.jpg diff --git a/src/main/resources/cover/Maliki.jpg b/public/cover/Maliki.jpg Binary files differindex 3d821aa..3d821aa 100644 --- a/src/main/resources/cover/Maliki.jpg +++ b/public/cover/Maliki.jpg diff --git a/src/main/resources/cover/Mathias MALZIEU.jpg b/public/cover/Mathias MALZIEU.jpg Binary files differindex 45a647e..45a647e 100644 --- a/src/main/resources/cover/Mathias MALZIEU.jpg +++ b/public/cover/Mathias MALZIEU.jpg diff --git a/src/main/resources/cover/Matilda.jpg b/public/cover/Matilda.jpg Binary files differindex ddc2488..ddc2488 100644 --- a/src/main/resources/cover/Matilda.jpg +++ b/public/cover/Matilda.jpg diff --git a/src/main/resources/cover/Mortelle Adèle.jpg b/public/cover/Mortelle Adèle.jpg Binary files differindex 26bc942..26bc942 100644 --- a/src/main/resources/cover/Mortelle Adèle.jpg +++ b/public/cover/Mortelle Adèle.jpg diff --git a/src/main/resources/cover/Nos Étoiles contraires.jpg b/public/cover/Nos Étoiles contraires.jpg Binary files differindex 60bf81d..60bf81d 100644 --- a/src/main/resources/cover/Nos Étoiles contraires.jpg +++ b/public/cover/Nos Étoiles contraires.jpg diff --git a/src/main/resources/cover/Oniria.jpg b/public/cover/Oniria.jpg Binary files differindex 8ab7f06..8ab7f06 100644 --- a/src/main/resources/cover/Oniria.jpg +++ b/public/cover/Oniria.jpg diff --git a/src/main/resources/cover/Percy JACKSON.jpg b/public/cover/Percy JACKSON.jpg Binary files differindex 56d64f8..56d64f8 100644 --- a/src/main/resources/cover/Percy JACKSON.jpg +++ b/public/cover/Percy JACKSON.jpg diff --git a/src/main/resources/cover/Persépolis.jpg b/public/cover/Persépolis.jpg Binary files differindex a0314fa..a0314fa 100644 --- a/src/main/resources/cover/Persépolis.jpg +++ b/public/cover/Persépolis.jpg diff --git a/src/main/resources/cover/Quand la nuit voit le jour.jpg b/public/cover/Quand la nuit voit le jour.jpg Binary files differindex 94a8864..94a8864 100644 --- a/src/main/resources/cover/Quand la nuit voit le jour.jpg +++ b/public/cover/Quand la nuit voit le jour.jpg diff --git a/src/main/resources/cover/Question de temps.jpg b/public/cover/Question de temps.jpg Binary files differindex 5c9e2d8..5c9e2d8 100644 --- a/src/main/resources/cover/Question de temps.jpg +++ b/public/cover/Question de temps.jpg diff --git a/src/main/resources/cover/Risk.jpg b/public/cover/Risk.jpg Binary files differindex dc0ee4e..dc0ee4e 100644 --- a/src/main/resources/cover/Risk.jpg +++ b/public/cover/Risk.jpg diff --git a/src/main/resources/cover/Seuls.jpg b/public/cover/Seuls.jpg Binary files differindex 2253c41..2253c41 100644 --- a/src/main/resources/cover/Seuls.jpg +++ b/public/cover/Seuls.jpg diff --git a/src/main/resources/cover/Simple.jpg b/public/cover/Simple.jpg Binary files differindex dbb5fc3..dbb5fc3 100644 --- a/src/main/resources/cover/Simple.jpg +++ b/public/cover/Simple.jpg diff --git a/src/main/resources/cover/Soldat Peaceful.jpg b/public/cover/Soldat Peaceful.jpg Binary files differindex 243ae0f..243ae0f 100644 --- a/src/main/resources/cover/Soldat Peaceful.jpg +++ b/public/cover/Soldat Peaceful.jpg diff --git a/src/main/resources/cover/Sweet Sixteen.jpg b/public/cover/Sweet Sixteen.jpg Binary files differindex 983261c..983261c 100644 --- a/src/main/resources/cover/Sweet Sixteen.jpg +++ b/public/cover/Sweet Sixteen.jpg diff --git a/src/main/resources/cover/The Mortal instruments.jpg b/public/cover/The Mortal instruments.jpg Binary files differindex 8904a04..8904a04 100644 --- a/src/main/resources/cover/The Mortal instruments.jpg +++ b/public/cover/The Mortal instruments.jpg diff --git a/src/main/resources/cover/Tild : mage à louer.jpg b/public/cover/Tild : mage à louer.jpg Binary files differindex a4337ef..a4337ef 100644 --- a/src/main/resources/cover/Tild : mage à louer.jpg +++ b/public/cover/Tild : mage à louer.jpg diff --git a/src/main/resources/cover/Tintin.jpg b/public/cover/Tintin.jpg Binary files differindex 43eb699..43eb699 100644 --- a/src/main/resources/cover/Tintin.jpg +++ b/public/cover/Tintin.jpg diff --git a/src/main/resources/cover/Titeuf.jpg b/public/cover/Titeuf.jpg Binary files differindex 9701576..9701576 100644 --- a/src/main/resources/cover/Titeuf.jpg +++ b/public/cover/Titeuf.jpg diff --git a/src/main/resources/cover/Tobie Lolness.jpg b/public/cover/Tobie Lolness.jpg Binary files differindex b5c4185..b5c4185 100644 --- a/src/main/resources/cover/Tobie Lolness.jpg +++ b/public/cover/Tobie Lolness.jpg diff --git a/src/main/resources/cover/Trois filles et….jpg b/public/cover/Trois filles et….jpg Binary files differindex d350183..d350183 100644 --- a/src/main/resources/cover/Trois filles et….jpg +++ b/public/cover/Trois filles et….jpg diff --git a/src/main/resources/cover/Uglies.jpg b/public/cover/Uglies.jpg Binary files differindex b64eb12..b64eb12 100644 --- a/src/main/resources/cover/Uglies.jpg +++ b/public/cover/Uglies.jpg diff --git a/src/main/resources/cover/Uglies.png b/public/cover/Uglies.png Binary files differindex a40ea38..a40ea38 100644 --- a/src/main/resources/cover/Uglies.png +++ b/public/cover/Uglies.png diff --git a/src/main/resources/cover/Un Cadavre dans la bibliothèque.jpg b/public/cover/Un Cadavre dans la bibliothèque.jpg Binary files differindex dd5f872..dd5f872 100644 --- a/src/main/resources/cover/Un Cadavre dans la bibliothèque.jpg +++ b/public/cover/Un Cadavre dans la bibliothèque.jpg diff --git a/src/main/resources/cover/Un Drôle d’ange gardien.jpg b/public/cover/Un Drôle d’ange gardien.jpg Binary files differindex 2eab231..2eab231 100644 --- a/src/main/resources/cover/Un Drôle d’ange gardien.jpg +++ b/public/cover/Un Drôle d’ange gardien.jpg diff --git a/src/main/resources/cover/Un Monde sauvage.jpg b/public/cover/Un Monde sauvage.jpg Binary files differindex b105935..b105935 100644 --- a/src/main/resources/cover/Un Monde sauvage.jpg +++ b/public/cover/Un Monde sauvage.jpg diff --git a/src/main/resources/cover/Un Ours dans la bergerie.jpg b/public/cover/Un Ours dans la bergerie.jpg Binary files differindex 069a1fc..069a1fc 100644 --- a/src/main/resources/cover/Un Ours dans la bergerie.jpg +++ b/public/cover/Un Ours dans la bergerie.jpg diff --git a/src/main/resources/cover/Un Ours dans la bergerie.png b/public/cover/Un Ours dans la bergerie.png Binary files differindex 0274b56..0274b56 100644 --- a/src/main/resources/cover/Un Ours dans la bergerie.png +++ b/public/cover/Un Ours dans la bergerie.png diff --git a/src/main/resources/cover/Une (irrésistible) envie de….jpg b/public/cover/Une (irrésistible) envie de….jpg Binary files differindex 8e7f54a..8e7f54a 100644 --- a/src/main/resources/cover/Une (irrésistible) envie de….jpg +++ b/public/cover/Une (irrésistible) envie de….jpg diff --git a/public/cover/À Copier 100 fois.jpg b/public/cover/À Copier 100 fois.jpg Binary files differnew file mode 100644 index 0000000..280e5e9 --- /dev/null +++ b/public/cover/À Copier 100 fois.jpg diff --git a/src/main/resources/cover/À la Croisée des mondes.jpg b/public/cover/À la Croisée des mondes.jpg Binary files differindex 8c7f9f8..8c7f9f8 100644 --- a/src/main/resources/cover/À la Croisée des mondes.jpg +++ b/public/cover/À la Croisée des mondes.jpg diff --git a/src/main/resources/cover/À la Poursuite d’Olympe.jpg b/public/cover/À la Poursuite d’Olympe.jpg Binary files differindex da25320..da25320 100644 --- a/src/main/resources/cover/À la Poursuite d’Olympe.jpg +++ b/public/cover/À la Poursuite d’Olympe.jpg diff --git a/src/main/resources/cover/Étincelles.jpg b/public/cover/Étincelles.jpg Binary files differindex 6c1327d..6c1327d 100644 --- a/src/main/resources/cover/Étincelles.jpg +++ b/public/cover/Étincelles.jpg diff --git a/src/main/resources/icon.png b/public/icon.png Binary files differindex 0e84e3e..0e84e3e 100644 --- a/src/main/resources/icon.png +++ b/public/icon.png diff --git a/src/main/resources/index-dev.html b/public/index.html index daba6e8..8e2599d 100644 --- a/src/main/resources/index-dev.html +++ b/public/index.html @@ -7,7 +7,7 @@ <title>Conseils de lecture</title> <link rel="stylesheet" href="reset.css"> <link rel="icon" href="icon.png"> - <script src="../reading-fastopt.js"></script> + <script src="main.js"></script> </head> <body onload="reading.Main().main()"> diff --git a/public/main.js b/public/main.js new file mode 120000 index 0000000..510e0cb --- /dev/null +++ b/public/main.js @@ -0,0 +1 @@ +../target/scala-2.12/reading-fastopt.js
\ No newline at end of file diff --git a/src/main/resources/reset.css b/public/reset.css index 636e49f..636e49f 100644 --- a/src/main/resources/reset.css +++ b/public/reset.css diff --git a/src/main/resources/index-prod.html b/src/main/resources/index-prod.html deleted file mode 100644 index e43dc66..0000000 --- a/src/main/resources/index-prod.html +++ /dev/null @@ -1,14 +0,0 @@ -<!DOCTYPE html> - -<html lang="en"> - <head> - <meta charset="UTF-8"> - <title>Conseils de lecture</title> - <link rel="stylesheet" href="reset.css"> - <link rel="icon" href="icon.png"> - <script src="../reading-opt.js"></script> - </head> - - <body onload="reading.Main().main()"> - </body> -</html> diff --git a/src/main/scala/reading/Books.scala b/src/main/scala/reading/Books.scala index 68ca93c..4049720 100644 --- a/src/main/scala/reading/Books.scala +++ b/src/main/scala/reading/Books.scala @@ -1409,7 +1409,7 @@ object Books { ), Book( - title = "A Copier 100 fois", + title = "À Copier 100 fois", author = "Antoine DOLE", year = "xxx", period = Some(Contemporain), @@ -1661,7 +1661,7 @@ object Books { ), Book( - title = "Les ailes de la sylphide", + title = "Les Ailes de la Sylphide", author = "Pascale MARET", year = "xxx", period = Some(Contemporain), @@ -1756,7 +1756,7 @@ object Books { ), Book( - title = "Le Bazar des mauvais rêves : nouvelles", + title = "Le Bazar des mauvais rêves : nouvelles", author = "Stephen KING", year = "2016", parts = 42, @@ -2044,7 +2044,7 @@ object Books { ), Book( - title = "Boys don't cry", + title = "Boys don’t cry", author = "Malorie BLACKMAN", year = "2011", period = Some(Contemporain), diff --git a/src/main/scala/reading/component/index/BookDetail.scala b/src/main/scala/reading/component/index/BookDetail.scala index f2d0d5d..7df771b 100644 --- a/src/main/scala/reading/component/index/BookDetail.scala +++ b/src/main/scala/reading/component/index/BookDetail.scala @@ -16,7 +16,7 @@ object BookDetail { img( BookStyle.cover, src := s"cover/${book.title}.jpg", - alt := book.title + alt := s"${book.title}, ${book.author}" ), div( diff --git a/src/main/scala/reading/component/index/Books.scala b/src/main/scala/reading/component/index/Books.scala index b75a5b0..66d4423 100644 --- a/src/main/scala/reading/component/index/Books.scala +++ b/src/main/scala/reading/component/index/Books.scala @@ -30,7 +30,7 @@ object Books { img( BooksStyle.cover, src := s"cover/${book.title}.jpg", - alt := book.title, + alt := s"${book.title}, ${book.author}", RxAttr(onclick, Rx(() => focus() = Some(book))) ) ) diff --git a/src/main/scala/reading/models/Book.scala b/src/main/scala/reading/models/Book.scala index 34af272..7d72f23 100644 --- a/src/main/scala/reading/models/Book.scala +++ b/src/main/scala/reading/models/Book.scala @@ -11,20 +11,8 @@ case class Book( programs: Seq[Program], level: Level ) extends Ordered[Book] { - def compare(that: Book) = { - def formatTitle(title: String) = - title - .toLowerCase - .replaceAll("^les ", "") - .replaceAll("^le ", "") - .replaceAll("^l’", "") - .replaceAll("^à la ", "") - .replaceAll("^au ", "") - .replaceAll("^aux ", "") - .replaceAll("é", "e") - .replaceAll("è", "e") - formatTitle(this.title).compare(formatTitle(that.title)) - } + def compare(that: Book) = + Compare.format(this.title).compare(Compare.format(that.title)) } object Book { diff --git a/src/main/scala/reading/models/Compare.scala b/src/main/scala/reading/models/Compare.scala new file mode 100644 index 0000000..dd763fe --- /dev/null +++ b/src/main/scala/reading/models/Compare.scala @@ -0,0 +1,17 @@ +package reading.models + +object Compare { + def format(str: String): String = + str + .toLowerCase + .replaceAll("^les ", "") + .replaceAll("^le ", "") + .replaceAll("^l’", "") + .replaceAll("^à la ", "") + .replaceAll("^à ", "") + .replaceAll("^au ", "") + .replaceAll("^aux ", "") + .replaceAll("^années ", "") + .replaceAll("é", "e") + .replaceAll("è", "e") +} diff --git a/src/main/scala/reading/models/Genre.scala b/src/main/scala/reading/models/Genre.scala index b5fc6c4..4006815 100644 --- a/src/main/scala/reading/models/Genre.scala +++ b/src/main/scala/reading/models/Genre.scala @@ -5,9 +5,8 @@ import enumeratum._ sealed trait Genre extends EnumEntry with Ordered[Genre] { import Genre._ - def compare(that: Genre): Int = { - values.indexOf(that) - values.indexOf(this) - } + def compare(that: Genre) = + Compare.format(this.prettyPrint).compare(Compare.format(that.prettyPrint)) def prettyPrint(): String = this match { case JournalIntime => "journal intime" @@ -29,7 +28,7 @@ sealed trait Genre extends EnumEntry with Ordered[Genre] { } object Genre extends Enum[Genre] { - val values = findValues + val values = findValues.sorted 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 90d6015..a962217 100644 --- a/src/main/scala/reading/models/Period.scala +++ b/src/main/scala/reading/models/Period.scala @@ -2,9 +2,12 @@ package reading.models import enumeratum._ -sealed trait Period extends EnumEntry { +sealed trait Period extends EnumEntry with Ordered[Period] { import Period._ + def compare(that: Period) = + Compare.format(this.prettyPrint).compare(Compare.format(that.prettyPrint)) + def prettyPrint(): String = this match { case Antiquite => "Antiquité" case MA => "Moyen âge" @@ -21,7 +24,7 @@ sealed trait Period extends EnumEntry { } object Period extends Enum[Period] { - val values = findValues + val values = findValues.sorted 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 116bff8..61186a9 100644 --- a/src/main/scala/reading/models/Theme.scala +++ b/src/main/scala/reading/models/Theme.scala @@ -5,9 +5,8 @@ import enumeratum._ sealed trait Theme extends EnumEntry with Ordered[Theme] { import Theme._ - def compare(that: Theme): Int = { - values.indexOf(that) - values.indexOf(this) - } + def compare(that: Theme) = + Compare.format(this.prettyPrint).compare(Compare.format(that.prettyPrint)) def prettyPrint(): String = this match { case Amitie => "amitié" @@ -90,7 +89,7 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] { } object Theme extends Enum[Theme] { - val values = findValues + val values = findValues.sorted case object Adolescence extends Theme case object Americain extends Theme |