Fix pimpcloud jquery

malliina · Sep 17, 2023 · 1f372a4 · 1f372a4
1 parent 1696be4
commit 1f372a4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -132,6 +132,9 @@ val musicpimp = project
 
 val pimpcloudFrontend = scalajsProject("pimpcloud-frontend", file("pimpcloud") / "frontend")
   .dependsOn(crossJs)
+  .settings(
+    Compile / npmDependencies ++= Seq("jquery" -> "3.3.1")
+  )
 val pimpcloud = project
   .in(file("pimpcloud"))
   .enablePlugins(

diff --git a/pimpcloud/app/controllers/pimpcloud/auths.scala b/pimpcloud/app/controllers/pimpcloud/auths.scala
@@ -82,7 +82,6 @@ class AdminOAuth(val actions: ActionBuilder[Request, AnyContent], creds: GoogleO
     val lastId = req.cookies.get(handler.lastIdKey).map(_.value)
     val described = lastId.fold("without login hint")(h => s"with login hint '$h'")
     log.info(s"Starting OAuth flow $described.")
-    val redirUrl = FullUrls(oauthConf.redirCall, req)
     validator
       .start(req, lastId.map(id => Map(LoginHint -> id)).getOrElse(Map.empty))
       .unsafeToFuture()

diff --git a/pimpcloud/frontend/src/main/scala/com/malliina/pimpcloud/js/Frontend.scala b/pimpcloud/frontend/src/main/scala/com/malliina/pimpcloud/js/Frontend.scala
@@ -1,12 +1,13 @@
 package com.malliina.pimpcloud.js
 
+import org.musicpimp.js.ScriptHelpers
 import org.scalajs.dom
 import org.scalajs.jquery.JQueryStatic
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
-object Frontend {
+object Frontend extends ScriptHelpers {
   var app: Option[SocketJS] = None
   private val jq = MyJQuery
   private val jqui = MyJQueryUI