diff --git a/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala b/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala deleted file mode 100644 index aac8faf..0000000 --- a/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala +++ /dev/null @@ -1,7 +0,0 @@ -package works.iterative.ui.components -package laminar - -import com.raquo.laminar.api.L.* -import works.iterative.ui.model.HtmlUIBuilder - -object LaminarUIBuilder extends HtmlUIBuilder[Node, ComponentContext[Any]] diff --git a/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala b/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala deleted file mode 100644 index aac8faf..0000000 --- a/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala +++ /dev/null @@ -1,7 +0,0 @@ -package works.iterative.ui.components -package laminar - -import com.raquo.laminar.api.L.* -import works.iterative.ui.model.HtmlUIBuilder - -object LaminarUIBuilder extends HtmlUIBuilder[Node, ComponentContext[Any]] diff --git a/ui/js/src/main/scala/works/iterative/ui/components/package.scala b/ui/js/src/main/scala/works/iterative/ui/components/package.scala deleted file mode 100644 index c12768f..0000000 --- a/ui/js/src/main/scala/works/iterative/ui/components/package.scala +++ /dev/null @@ -1,4 +0,0 @@ -package works.iterative.ui - -package object components: - export laminar.LaminarUIBuilder.* diff --git a/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala b/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala deleted file mode 100644 index aac8faf..0000000 --- a/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala +++ /dev/null @@ -1,7 +0,0 @@ -package works.iterative.ui.components -package laminar - -import com.raquo.laminar.api.L.* -import works.iterative.ui.model.HtmlUIBuilder - -object LaminarUIBuilder extends HtmlUIBuilder[Node, ComponentContext[Any]] diff --git a/ui/js/src/main/scala/works/iterative/ui/components/package.scala b/ui/js/src/main/scala/works/iterative/ui/components/package.scala deleted file mode 100644 index c12768f..0000000 --- a/ui/js/src/main/scala/works/iterative/ui/components/package.scala +++ /dev/null @@ -1,4 +0,0 @@ -package works.iterative.ui - -package object components: - export laminar.LaminarUIBuilder.* diff --git a/ui/js/src/main/scala/works/iterative/ui/laminar/impl/LaminarUIBuilder.scala b/ui/js/src/main/scala/works/iterative/ui/laminar/impl/LaminarUIBuilder.scala new file mode 100644 index 0000000..e100805 --- /dev/null +++ b/ui/js/src/main/scala/works/iterative/ui/laminar/impl/LaminarUIBuilder.scala @@ -0,0 +1,8 @@ +package works.iterative.ui.laminar.impl + +import com.raquo.laminar.api.L.* +import works.iterative.ui.components.ComponentContext +import works.iterative.ui.model.HtmlUIBuilder + +object LaminarUIBuilder + extends HtmlUIBuilder[HtmlElement, ComponentContext[Any]] diff --git a/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala b/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala deleted file mode 100644 index aac8faf..0000000 --- a/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala +++ /dev/null @@ -1,7 +0,0 @@ -package works.iterative.ui.components -package laminar - -import com.raquo.laminar.api.L.* -import works.iterative.ui.model.HtmlUIBuilder - -object LaminarUIBuilder extends HtmlUIBuilder[Node, ComponentContext[Any]] diff --git a/ui/js/src/main/scala/works/iterative/ui/components/package.scala b/ui/js/src/main/scala/works/iterative/ui/components/package.scala deleted file mode 100644 index c12768f..0000000 --- a/ui/js/src/main/scala/works/iterative/ui/components/package.scala +++ /dev/null @@ -1,4 +0,0 @@ -package works.iterative.ui - -package object components: - export laminar.LaminarUIBuilder.* diff --git a/ui/js/src/main/scala/works/iterative/ui/laminar/impl/LaminarUIBuilder.scala b/ui/js/src/main/scala/works/iterative/ui/laminar/impl/LaminarUIBuilder.scala new file mode 100644 index 0000000..e100805 --- /dev/null +++ b/ui/js/src/main/scala/works/iterative/ui/laminar/impl/LaminarUIBuilder.scala @@ -0,0 +1,8 @@ +package works.iterative.ui.laminar.impl + +import com.raquo.laminar.api.L.* +import works.iterative.ui.components.ComponentContext +import works.iterative.ui.model.HtmlUIBuilder + +object LaminarUIBuilder + extends HtmlUIBuilder[HtmlElement, ComponentContext[Any]] diff --git a/ui/js/src/main/scala/works/iterative/ui/laminar/package.scala b/ui/js/src/main/scala/works/iterative/ui/laminar/package.scala new file mode 100644 index 0000000..2ae27fd --- /dev/null +++ b/ui/js/src/main/scala/works/iterative/ui/laminar/package.scala @@ -0,0 +1,5 @@ +package works.iterative.ui + +package object laminar: + export works.iterative.ui.laminar.impl.LaminarUIBuilder.* + export works.iterative.ui.components.laminar.LaminarExtensions.* diff --git a/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala b/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala deleted file mode 100644 index aac8faf..0000000 --- a/ui/js/src/main/scala/works/iterative/ui/components/laminar/LaminarUIBuilder.scala +++ /dev/null @@ -1,7 +0,0 @@ -package works.iterative.ui.components -package laminar - -import com.raquo.laminar.api.L.* -import works.iterative.ui.model.HtmlUIBuilder - -object LaminarUIBuilder extends HtmlUIBuilder[Node, ComponentContext[Any]] diff --git a/ui/js/src/main/scala/works/iterative/ui/components/package.scala b/ui/js/src/main/scala/works/iterative/ui/components/package.scala deleted file mode 100644 index c12768f..0000000 --- a/ui/js/src/main/scala/works/iterative/ui/components/package.scala +++ /dev/null @@ -1,4 +0,0 @@ -package works.iterative.ui - -package object components: - export laminar.LaminarUIBuilder.* diff --git a/ui/js/src/main/scala/works/iterative/ui/laminar/impl/LaminarUIBuilder.scala b/ui/js/src/main/scala/works/iterative/ui/laminar/impl/LaminarUIBuilder.scala new file mode 100644 index 0000000..e100805 --- /dev/null +++ b/ui/js/src/main/scala/works/iterative/ui/laminar/impl/LaminarUIBuilder.scala @@ -0,0 +1,8 @@ +package works.iterative.ui.laminar.impl + +import com.raquo.laminar.api.L.* +import works.iterative.ui.components.ComponentContext +import works.iterative.ui.model.HtmlUIBuilder + +object LaminarUIBuilder + extends HtmlUIBuilder[HtmlElement, ComponentContext[Any]] diff --git a/ui/js/src/main/scala/works/iterative/ui/laminar/package.scala b/ui/js/src/main/scala/works/iterative/ui/laminar/package.scala new file mode 100644 index 0000000..2ae27fd --- /dev/null +++ b/ui/js/src/main/scala/works/iterative/ui/laminar/package.scala @@ -0,0 +1,5 @@ +package works.iterative.ui + +package object laminar: + export works.iterative.ui.laminar.impl.LaminarUIBuilder.* + export works.iterative.ui.components.laminar.LaminarExtensions.* diff --git a/ui/shared/src/main/scala/works/iterative/ui/model/HtmlUIBuilder.scala b/ui/shared/src/main/scala/works/iterative/ui/model/HtmlUIBuilder.scala index 76a5ec5..7943d9a 100644 --- a/ui/shared/src/main/scala/works/iterative/ui/model/HtmlUIBuilder.scala +++ b/ui/shared/src/main/scala/works/iterative/ui/model/HtmlUIBuilder.scala @@ -10,6 +10,11 @@ sealed trait UIElement + final case class Blocks(items: Vector[Block]) extends UIElement + + object Blocks: + def apply(items: Block*): Blocks = Blocks(items.toVector) + case class Block( id: Block.Id, title: Block.Title, @@ -17,7 +22,7 @@ status: Block.Status, actions: Block.Actions, content: Block.Content, - footer: Block.Footer, + footer: Block.Footer ) extends UIElement object Block: @@ -29,5 +34,5 @@ type Footer = Option[Output] type Status = Vector[Output] - trait Interpreter: + trait UIInterpreter: def render(el: UIElement): Rendered