aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris2017-01-21 19:18:25 +0100
committerJoris2017-01-21 19:18:25 +0100
commite8c4affa73f3e556981267ae4236561ece158ca1 (patch)
treea5943972f1338096f87ed0549db9c06d458095ae
parent48d0300b8aaeee1ed58353e2be3864edad2f7401 (diff)
downloadreading-e8c4affa73f3e556981267ae4236561ece158ca1.tar.gz
reading-e8c4affa73f3e556981267ae4236561ece158ca1.tar.bz2
reading-e8c4affa73f3e556981267ae4236561ece158ca1.zip
Fix compilation issues
-rw-r--r--src/main/scala/reading/component/index/BookDetail.scala (renamed from src/main/scala/reading/component/index/Book.scala)8
-rw-r--r--src/main/scala/reading/component/index/Books.scala8
-rw-r--r--src/main/scala/reading/component/index/style/BookDetail.scala (renamed from src/main/scala/reading/component/index/style/Book.scala)2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/main/scala/reading/component/index/Book.scala b/src/main/scala/reading/component/index/BookDetail.scala
index ffa3c6b..6a9d83a 100644
--- a/src/main/scala/reading/component/index/Book.scala
+++ b/src/main/scala/reading/component/index/BookDetail.scala
@@ -4,11 +4,11 @@ import scalatags.JsDom.all._
import scalacss.Defaults._
import scalacss.ScalatagsCss._
-import reading.component.index.style.{ Book => BookStyle }
-import reading.models.{ Program, Book => BookModel }
+import reading.component.index.style.{ BookDetail => BookStyle }
+import reading.models.{ Program, Book }
-object Book {
- def apply(book: BookModel): HtmlTag =
+object BookDetail {
+ def apply(book: Book): HtmlTag =
div(
BookStyle.render,
BookStyle.detail,
diff --git a/src/main/scala/reading/component/index/Books.scala b/src/main/scala/reading/component/index/Books.scala
index 50a05a9..5d7c92e 100644
--- a/src/main/scala/reading/component/index/Books.scala
+++ b/src/main/scala/reading/component/index/Books.scala
@@ -9,12 +9,12 @@ import scalacss.ScalatagsCss._
import reading.component.index.style.{ Books => BooksStyle }
import reading.component.widget.Popup
-import reading.models.{ Book => BookModel }
+import reading.models.{ Book }
import reading.utils.{ RxTag, RxAttr }
object Books {
- def apply(books: Rx[Seq[BookModel]]): Frag = {
- val focus: Var[Option[BookModel]] = Var(None)
+ def apply(books: Rx[Seq[Book]]): Frag = {
+ val focus: Var[Option[Book]] = Var(None)
div(
BooksStyle.render,
@@ -38,7 +38,7 @@ object Books {
RxTag { implicit context =>
focus() match {
- case Some(book) => Popup(onClose = focus() = None)(Book(book))
+ case Some(book) => Popup(onClose = focus() = None)(BookDetail(book))
case None => span("")
}
}
diff --git a/src/main/scala/reading/component/index/style/Book.scala b/src/main/scala/reading/component/index/style/BookDetail.scala
index 9f242eb..e54c964 100644
--- a/src/main/scala/reading/component/index/style/Book.scala
+++ b/src/main/scala/reading/component/index/style/BookDetail.scala
@@ -4,7 +4,7 @@ import scalacss.Defaults._
import reading.component.style.Col
-object Book extends StyleSheet.Inline {
+object BookDetail extends StyleSheet.Inline {
import dsl._
val title = style(