Fix multiple routes support

This commit is contained in:
Paul-Henri Froidmont 2025-09-12 17:35:11 +02:00
parent 44ffa55cc6
commit a036e3cbb3
Signed by: phfroidmont
GPG key ID: BE948AFD7E7873BE
6 changed files with 217 additions and 148 deletions

View file

@ -1,27 +1,20 @@
import ExampleLiveView.*
import CounterLiveView.*
import monocle.syntax.all.*
import scalive.*
import zio.*
import zio.json.*
import zio.stream.ZStream
class ExampleLiveView(someParam: String) extends LiveView[Msg, Model]:
class CounterLiveView() extends LiveView[Msg, Model]:
def init = ZIO.succeed(
Model(
isVisible = true,
counter = 0,
elems = List(
NestedModel("a", 10),
NestedModel("b", 15),
NestedModel("c", 20)
)
counter = 0
)
)
def update(model: Model) =
case Msg.IncAge(value) =>
ZIO.succeed(model.focus(_.elems.index(2).age).modify(_ + value))
case Msg.ToggleCounter =>
ZIO.succeed(model.focus(_.isVisible).modify(!_))
case Msg.IncCounter =>
@ -31,38 +24,13 @@ class ExampleLiveView(someParam: String) extends LiveView[Msg, Model]:
def view(model: Dyn[Model]) =
div(
cls := "max-w-2xl mx-auto bg-white shadow rounded-2xl p-6 space-y-6",
h1(
cls := "text-2xl font-semibold tracking-tight text-gray-900",
someParam
),
cls := "max-w-2xl mx-auto bg-white shadow rounded-2xl p-6 space-y-6",
idAttr := "42",
ul(
cls := "divide-y divide-gray-200",
model(_.elems).splitByIndex((_, elem) =>
li(
cls := "py-3 flex flex-wrap items-center justify-between gap-2",
span(
cls := "text-gray-700",
"Nom: ",
span(cls := "font-medium", elem(_.name))
),
span(
cls := "text-sm text-gray-500",
"Age: ",
span(cls := "font-semibold text-gray-700", elem(_.age.toString))
)
)
)
"Counter with auto increment every second"
),
div(
cls := "flex flex-wrap items-center gap-3",
button(
cls := "inline-flex items-center rounded-lg px-3 py-2 text-sm font-medium bg-gray-900 text-white shadow hover:opacity-90 focus:outline-none focus:ring-2 focus:ring-gray-900/30",
phx.click := Msg.IncAge(1),
"Inc age"
),
span(cls := "grow"),
button(
cls := "inline-flex items-center rounded-lg px-3 py-2 text-sm font-medium ring-1 ring-inset ring-gray-300 text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-gray-400/30",
phx.click := Msg.ToggleCounter,
@ -98,18 +66,15 @@ class ExampleLiveView(someParam: String) extends LiveView[Msg, Model]:
def subscriptions(model: Model) =
ZStream.tick(1.second).map(_ => Msg.IncCounter).drop(1)
end ExampleLiveView
end CounterLiveView
object ExampleLiveView:
object CounterLiveView:
enum Msg derives JsonCodec:
case IncAge(value: Int)
case ToggleCounter
case IncCounter
case DecCounter
final case class Model(
isVisible: Boolean,
counter: Int,
elems: List[NestedModel])
final case class NestedModel(name: String, age: Int)
counter: Int)

View file

@ -1,18 +1,39 @@
import scalive.{label as _, *}
import zio.*
import zio.http.*
import scalive.*
import zio.logging.ConsoleLoggerConfig
import zio.logging.LogColor
import zio.logging.LogFilter
import zio.logging.LogFormat.*
import zio.logging.consoleLogger
object Example extends ZIOAppDefault:
private val logFormat =
label("timestamp", timestamp.fixed(32)).color(LogColor.BLUE) |-|
label("level", level.fixed(5)).highlight |-|
label("thread", fiberId).color(LogColor.WHITE) |-|
label("message", quoted(line)).highlight |-|
cause
val logFilter = LogFilter.LogLevelByNameConfig(LogLevel.Debug)
override val bootstrap =
Runtime.removeDefaultLoggers >>> consoleLogger(ConsoleLoggerConfig(logFormat, logFilter))
val liveRouter =
LiveRouter(
RootLayout(_),
List(
LiveRoute(
Root,
Root / "counter",
(_, _) => CounterLiveView()
),
LiveRoute(
Root / "list",
(_, req) =>
val q = req.queryParam("q").map("Param : " ++ _).getOrElse("No param")
ExampleLiveView(q)
ListLiveView(q)
)
)
)
@ -20,3 +41,4 @@ object Example extends ZIOAppDefault:
val routes = liveRouter.routes @@ Middleware.serveResources(Path.empty / "static", "public")
override val run = Server.serve(routes).provide(Server.default)
end Example

View file

@ -0,0 +1,72 @@
import ListLiveView.*
import monocle.syntax.all.*
import scalive.*
import zio.*
import zio.json.*
import zio.stream.ZStream
class ListLiveView(someParam: String) extends LiveView[Msg, Model]:
def init = ZIO.succeed(
Model(
elems = List(
NestedModel("a", 10),
NestedModel("b", 15),
NestedModel("c", 20)
)
)
)
def update(model: Model) =
case Msg.IncAge(value) =>
ZIO.succeed(model.focus(_.elems.index(2).age).modify(_ + value))
def view(model: Dyn[Model]) =
div(
h1(
cls := "text-2xl font-semibold tracking-tight text-gray-900",
someParam
),
cls := "max-w-2xl mx-auto bg-white shadow rounded-2xl p-6 space-y-6",
idAttr := "42",
ul(
cls := "divide-y divide-gray-200",
model(_.elems).splitByIndex((_, elem) =>
li(
cls := "py-3 flex flex-wrap items-center justify-between gap-2",
span(
cls := "text-gray-700",
"Nom: ",
span(cls := "font-medium", elem(_.name))
),
span(
cls := "text-sm text-gray-500",
"Age: ",
span(cls := "font-semibold text-gray-700", elem(_.age.toString))
)
)
)
),
div(
cls := "flex flex-wrap items-center gap-3",
button(
cls := "inline-flex items-center rounded-lg px-3 py-2 text-sm font-medium bg-gray-900 text-white shadow hover:opacity-90 focus:outline-none focus:ring-2 focus:ring-gray-900/30",
phx.click := Msg.IncAge(1),
"Inc age"
),
span(cls := "grow")
)
)
def subscriptions(model: Model) = ZStream.empty
end ListLiveView
object ListLiveView:
enum Msg derives JsonCodec:
case IncAge(value: Int)
final case class Model(
elems: List[NestedModel])
final case class NestedModel(name: String, age: Int)