diff --git a/jvm/src/main/scala/cs214/webapp/server/web/WebServerRoutes.scala b/jvm/src/main/scala/cs214/webapp/server/web/WebServerRoutes.scala index 539250cd70dbaef9569bea75fd38598d03bb0899..ce0c1a47131a755e5863d2506a03f5829bff5f1d 100644 --- a/jvm/src/main/scala/cs214/webapp/server/web/WebServerRoutes.scala +++ b/jvm/src/main/scala/cs214/webapp/server/web/WebServerRoutes.scala @@ -41,14 +41,14 @@ private[server] final case class WebServerRoutes()(using cc: castor.Context, log def getStaticResources() = WEB_SRC_PATH // For all /app subsegments, provide the HTML page - @cask.get(f"/${Endpoints.App}") + @cask.get(f"${Endpoints.App}") def getApp(segments: cask.RemainingPathSegments) = HTML_STATIC_FILE - @cask.getJson(f"/${Endpoints.Api.listApps}") + @cask.getJson(f"${Endpoints.Api.listApps}") def getListApps() = ListAppsResponse.Wire.encode(ListAppsResponse(WebServer.appDirectory.values.map(_.appInfo).toSeq)) - @cask.getJson(f"/${Endpoints.Api.instanceInfo}") + @cask.getJson(f"${Endpoints.Api.instanceInfo}") def getAppInfo(instanceId: InstanceId) = val response: cask.Response[JsonData] = if WebServer.apps.contains(instanceId) then @@ -61,7 +61,7 @@ private[server] final case class WebServerRoutes()(using cc: castor.Context, log cask.Response(f"Unknown instance id $instanceId", 400) response - @cask.post(f"/${Endpoints.Api.createInstance}") + @cask.post(f"${Endpoints.Api.createInstance}") def postInitApp(request: cask.Request) = val response: cask.Response[JsonData] = val req = CreateInstanceRequest.Wire.decode(ujson.read(request.text())) @@ -72,7 +72,7 @@ private[server] final case class WebServerRoutes()(using cc: castor.Context, log CreateInstanceResponse.Wire.encode(CreateInstanceResponse(appId)) response - @cask.websocket(f"/${Endpoints.WebSocket}/:instanceId/:userId") + @cask.websocket(f"${Endpoints.WebSocket}/:instanceId/:userId") def websocket(instanceId: String, userId: String): cask.WebsocketResult = WebServer.webSocketServer.connect(instanceId, userId)