fix

fun-stack · Feb 13, 2024 · b88ff89 · b88ff89
1 parent 45f83c4
commit b88ff89
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/webapp/src/main/scala/example/webapp/App.scala b/webapp/src/main/scala/example/webapp/App.scala
@@ -2,7 +2,7 @@ package example.webapp
 
 import outwatch._
 import outwatch.dsl._
-import funstack.web.Fun
+import funstack.client.web.Fun
 
 object App {
 

diff --git a/webapp/src/main/scala/example/webapp/Components.scala b/webapp/src/main/scala/example/webapp/Components.scala
@@ -4,7 +4,7 @@ import colibri.Subject
 import example.api
 import outwatch._
 import outwatch.dsl._
-import funstack.web.tapir
+import funstack.client.web.Fun
 
 object Components {
   import example.api.HttpApi
@@ -16,7 +16,7 @@ object Components {
       b("My books: "),
       span(
         cls := "tapir-result",
-        tapir.Fun.http
+        Fun.httpApi
           .client(HttpApi.booksListing)((HttpApi.BooksFromYear("drama", 2011), 10))
           .map(_.toString),
       ),

diff --git a/webapp/src/main/scala/example/webapp/Main.scala b/webapp/src/main/scala/example/webapp/Main.scala
@@ -3,11 +3,11 @@ package example.webapp
 import cats.effect.{IO, IOApp}
 import outwatch.Outwatch
 
-import funstack.web.Fun
+import funstack.client.web.Fun
 
 object Main extends IOApp.Simple {
   LoadCss()
 
   override def run =
-    Fun.ws.start &> Outwatch.renderInto[IO]("#app", App.layout)
+    Fun.wsRpc.start &> Outwatch.renderInto[IO]("#app", App.layout)
 }
diff --git a/webapp/src/main/scala/example/webapp/RpcApiClient.scala b/webapp/src/main/scala/example/webapp/RpcApiClient.scala
@@ -4,19 +4,19 @@ import cats.effect.IO
 import example.api.{EventApi, RpcApi}
 import colibri.Observable
 import sloth.Client
-import funstack.web.Fun
+import funstack.client.web.Fun
 
 import chameleon.ext.circe._
 
 object WsRpcClient {
-  val client          = Client(Fun.ws.transport[String])
+  val client          = Client(Fun.wsRpc.transport[String])
   val api: RpcApi[IO] = client.wire[RpcApi[IO]]
 
-  val eventClient                    = Client(Fun.ws.streamsTransport[String])
+  val eventClient                    = Client(Fun.wsRpc.streamsTransport[String])
   val eventApi: EventApi[Observable] = eventClient.wire[EventApi[Observable]]
 }
 
 object HttpRpcClient {
-  val client          = Client(Fun.http.transport[String])
+  val client          = Client(Fun.httpRpc.transport[String])
   val api: RpcApi[IO] = client.wire[RpcApi[IO]]
 }