efim
/
planning-poker-gwargh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix: disallow joining room without nickname 

and also creating a room without a name
maybe maybe spectatorship sometimes later
This commit is contained in:
efim 2023-04-30 09:39:41 +04:00
parent bbabeb6c14
commit 346069ae96
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.sbt
View File

@ -34,7 +34,8 @@ lazy val frontend = project
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.4.0",
libraryDependencies += "com.raquo" %%% "laminar" % "15.0.1",
libraryDependencies += "io.laminext" %%% "websocket-circe" % "0.15.0",
libraryDependencies += "io.laminext" %%% "fetch-circe" % "0.15.0"
libraryDependencies += "io.laminext" %%% "fetch-circe" % "0.15.0",
libraryDependencies += "io.laminext" %%% "validation-cats" % "0.15.0"
)
.dependsOn(common.js)

36
frontend/src/main/scala/industries/sunshine/planningpoker/JoinRoomComponent.scala
View File

@ -6,6 +6,9 @@ import com.raquo.laminar.api.L.{*, given}
import io.laminext.fetch.Fetch
import io.laminext.fetch.circe._
import io.laminext.syntax.core._
import io.laminext.syntax.validation._
import scala.util.Failure
import scala.util.Success
@ -29,7 +32,8 @@ object JoinRoomComponent {
value <-- data.signal,
onInput.mapToValue --> data.writer
)
)
).validated(V.nonBlank("name must not be blank"))
def passInput(data: Var[String], placeholderText: String) = input(
tpe := "password",
className := "border-2 m-1 rounded",
@ -104,16 +108,36 @@ object JoinRoomComponent {
} --> responseReceived
)
val roomNameInput = nameInput(roomNameVar, "Enter room name:")
val roomPassInput = passInput(roomPassVar, "room password")
val nickNameInput = nameInput(nicknameVar, "Enter your nickname:")
val nickPassInput = passInput(nicknamePass, "nickname pass")
div(
className := "bg-green-50 w-full h-full flex justify-center",
div(
className := "w-60 flex flex-col justify-center",
"Logging in:",
nameInput(roomNameVar, "Enter room name:"),
passInput(roomPassVar, "room password"),
label("Alert: no https, please don't use good passwords"),
nameInput(nicknameVar, "Enter your nickname:"),
passInput(nicknamePass, "nickname pass:"),
roomNameInput,
div(
child.maybe <-- roomNameInput.validationError.optionMap(errors =>
span(
cls := "text-red-700 text-sm",
errors.map(error => div(error))
)
)
),
roomPassInput,
label("Alert: no https, please use throwaway passwords"),
nickNameInput,
div(
child.maybe <-- nickNameInput.validationError.optionMap(errors =>
span(
cls := "text-red-700 text-sm",
errors.map(error => div(error))
)
)
),
nickPassInput,
submitButton,
newRoomButton,
div(