diff options
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | .mill-version | 1 | ||||
-rw-r--r-- | build.sbt | 113 | ||||
-rw-r--r-- | build.sc | 71 | ||||
-rw-r--r-- | client/src/Main.scala (renamed from client/src/main/scala/Main.scala) | 0 | ||||
-rw-r--r-- | client/src/http/ArrayUtils.scala (renamed from common/native/src/main/scala/http/ArrayUtils.scala) | 0 | ||||
-rw-r--r-- | client/src/http/CurlBackend.scala (renamed from common/native/src/main/scala/http/CurlBackend.scala) | 0 | ||||
-rw-r--r-- | client/src/http/curl.scala (renamed from common/native/src/main/scala/http/curl.scala) | 0 | ||||
-rw-r--r-- | client/src/http/package.scala (renamed from common/native/src/main/scala/http/package.scala) | 0 | ||||
-rwxr-xr-x | mill | 37 | ||||
-rw-r--r-- | project/Js.scala | 20 | ||||
-rw-r--r-- | project/build.properties | 1 | ||||
-rw-r--r-- | project/plugins.sbt | 7 | ||||
-rw-r--r-- | server/resources/assets/lib/.gitattributes (renamed from server/src/main/resources/assets/lib/.gitattributes) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css.map (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css.map) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css.map (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css.map) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css.map (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css.map) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css.map (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css.map) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css.map (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css.map) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css.map (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css.map) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js.map (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js.map) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js.map (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js.map) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js.map (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js.map) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js) | 0 | ||||
-rw-r--r-- | server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js.map (renamed from server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js.map) | 0 | ||||
-rw-r--r-- | server/resources/assets/main.css (renamed from server/src/main/resources/assets/main.css) | 0 | ||||
-rw-r--r-- | server/src/LiveMessages.scala (renamed from server/src/main/scala/LiveMessages.scala) | 0 | ||||
-rw-r--r-- | server/src/Main.scala (renamed from server/src/main/scala/Main.scala) | 0 | ||||
-rw-r--r-- | server/src/Repository.scala (renamed from server/src/main/scala/Repository.scala) | 0 | ||||
-rw-r--r-- | server/src/Routes.scala (renamed from server/src/main/scala/Routes.scala) | 2 | ||||
-rw-r--r-- | shared/ApiProtocol.scala (renamed from common/shared/src/main/scala/ApiProtocol.scala) | 0 | ||||
-rw-r--r-- | shared/Message.scala (renamed from common/shared/src/main/scala/Message.scala) | 0 | ||||
-rw-r--r-- | shared/Templates.scala (renamed from common/shared/src/main/scala/Templates.scala) | 0 | ||||
-rw-r--r-- | shared/TextTemplates.scala (renamed from common/shared/src/main/scala/TextTemplates.scala) | 2 | ||||
-rw-r--r-- | shared/http/Backend.scala (renamed from common/shared/src/main/scala/http/Backend.scala) | 0 | ||||
-rw-r--r-- | shared/http/Request.scala (renamed from common/shared/src/main/scala/http/Request.scala) | 0 | ||||
-rw-r--r-- | shared/http/Response.scala (renamed from common/shared/src/main/scala/http/Response.scala) | 0 | ||||
-rw-r--r-- | ui/src/JsTemplates.scala (renamed from common/js/src/main/scala/JsTemplates.scala) | 0 | ||||
-rw-r--r-- | ui/src/Main.scala (renamed from ui/src/main/scala/Main.scala) | 0 | ||||
-rw-r--r-- | ui/src/http/XhrBackend.scala (renamed from common/js/src/main/scala/http/XhrBackend.scala) | 0 | ||||
-rw-r--r-- | ui/src/http/package.scala (renamed from common/js/src/main/scala/http/package.scala) | 0 |
50 files changed, 114 insertions, 144 deletions
@@ -1,2 +1,2 @@ -target/ -database.sqlite
\ No newline at end of file +out/ +database.sqlite diff --git a/.mill-version b/.mill-version new file mode 100644 index 0000000..4b9fcbe --- /dev/null +++ b/.mill-version @@ -0,0 +1 @@ +0.5.1 diff --git a/build.sbt b/build.sbt deleted file mode 100644 index fb199b5..0000000 --- a/build.sbt +++ /dev/null @@ -1,113 +0,0 @@ -// shadow sbt-scalajs' crossProject and CrossType until Scala.js 1.0.0 is released - -import sbtcrossproject.{crossProject, CrossType} -import scalajscrossproject.ScalaJSCrossPlugin.autoImport.{ - toScalaJSGroupID => _, - _ -} - -scalaVersion in ThisBuild := "2.12.6" -version in ThisBuild := { - import sys.process._ - ("git describe --always --dirty=-SNAPSHOT --match v[0-9].*" !!).tail.trim -} -scalacOptions in ThisBuild ++= Seq( - "-feature", - "-language:_", - "-unchecked", - "-deprecation", - "-Xlint", - "-encoding", - "utf8" -) - -lazy val common = crossProject(JVMPlatform, JSPlatform, NativePlatform) - .crossType(CrossType.Full) - .settings( - testFrameworks += new TestFramework("utest.runner.Framework"), - libraryDependencies ++= Seq( - "xyz.driver" %%% "spray-json-derivation" % "0.4.3", - "com.lihaoyi" %%% "scalatags" % "0.6.7", - "com.lihaoyi" %%% "utest" % "0.6.3" % "test" - ), - sourceGenerators in Compile += Def.task { - val file = (sourceManaged in Compile).value / "scala" / "BuildInfo.scala" - val content = - s"""package triad - |object BuildInfo { - | final val Version: String = "${version.value}" - |} - |""".stripMargin - IO.write(file, content) - Seq(file) - } - ) - .jsSettings( - libraryDependencies ++= Seq( - "org.scala-js" %%% "scalajs-dom" % "0.9.2", - "org.scala-js" %%% "scalajs-java-time" % "0.2.4" - ) - ) - .nativeSettings( - scalaVersion := "2.11.12", - nativeLinkStubs := true, - libraryDependencies ++= Seq( - "io.crashbox" %%% "commando" % "0.1.2" - ), - sourceGenerators in Compile += Def.task { - import sys.process._ - val file = (sourceManaged in Compile).value / "scala" / "NativeBuildInfo.scala" - val content = - s"""package triad - |object NativeBuildInfo { - | final val Platform: String = - | "${("uname -s" !!).trim}/${("uname -m" !!).trim}" - | final val NativeVersion: String = "${nativeVersion}" - |} - |""".stripMargin - IO.write(file, content) - Seq(file) - } - ) - -lazy val commonJS = common.js -lazy val commonJVM = common.jvm -lazy val commonNative = common.native - -lazy val server = project - .settings( - libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-stream" % "2.5.11", - "com.typesafe.akka" %% "akka-http" % "10.1.0", - "com.typesafe.akka" %% "akka-http-spray-json" % "10.1.0", - "com.typesafe.slick" %% "slick" % "3.2.3", - "org.slf4j" % "slf4j-nop" % "1.6.4", - "org.xerial" % "sqlite-jdbc" % "3.21.0.1" - ) - ) - .dependsOn(commonJVM) - .settings(Js.dependsOnJs(ui)) - -lazy val ui = project - .enablePlugins(ScalaJSPlugin) - .disablePlugins(RevolverPlugin) - .dependsOn(commonJS) - -lazy val client = project - .enablePlugins(ScalaNativePlugin) - .settings( - scalaVersion := "2.11.12", - nativeMode := "debug", - name := "triad" - ) - .dependsOn(commonNative) - -lazy val root = (project in file(".")) - .aggregate(commonJS, commonJVM, commonNative, client, ui, server) - .settings( - publish := {}, - publishLocal := {} - ) - -addCommandAlias("start", "reStart") -addCommandAlias("stop", "reStop") diff --git a/build.sc b/build.sc new file mode 100644 index 0000000..7b2b875 --- /dev/null +++ b/build.sc @@ -0,0 +1,71 @@ +import mill._, scalalib._, scalajslib._, scalanativelib._, scalafmt._ + +trait Shared extends ScalaModule with ScalafmtModule{ + + def sharedSources = T.sources(build.millSourcePath / "shared") + + def sources = T.sources( + super.sources() ++ sharedSources() + ) + + def ivyDeps = Agg( + ivy"xyz.driver::spray-json-derivation::0.4.3", + ivy"com.lihaoyi::scalatags::0.6.7" + ) + +} + +object server extends ScalaModule with Shared { + def scalaVersion = "2.12.9" + + def ivyDeps = T { + super.ivyDeps() ++ Agg( + ivy"com.typesafe.akka::akka-stream:2.5.11", + ivy"com.typesafe.akka::akka-http:10.1.0", + ivy"com.typesafe.akka::akka-http-spray-json:10.1.0", + ivy"com.typesafe.slick::slick:3.2.3", + ivy"org.slf4j:slf4j-nop:1.6.4", + ivy"org.xerial:sqlite-jdbc:3.21.0.1" + ) + } + + // This includes the resulting javascript file so that it can be served + // as a classpath resource and is packaged in the final jar. + def localClasspath = T{ + super.localClasspath() :+ PathRef(ui.fastOpt().path / os.up) + } + +} + +object ui extends ScalaJSModule with Shared { + def scalaVersion = "2.12.10" + def scalaJSVersion = "0.6.29" + + def ivyDeps = T { + super.ivyDeps() ++ Agg( + ivy"org.scala-js::scalajs-dom::0.9.5", + ivy"org.scala-js::scalajs-java-time::0.2.5" + ) + } + +} + +object client extends ScalaNativeModule with Shared { + import scalanativelib.api.ReleaseMode + + def scalaVersion = "2.11.12" + def scalaNativeVersion = "0.3.8" + + def releaseMode = ReleaseMode.Debug + + def ivyDeps = T { + super.ivyDeps() ++ Agg( + ivy"io.crashbox::commando::0.1.2" + ) + } +} + +def dist = T { + server.assembly() + client.nativeLink() +} diff --git a/client/src/main/scala/Main.scala b/client/src/Main.scala index 4b11fe0..4b11fe0 100644 --- a/client/src/main/scala/Main.scala +++ b/client/src/Main.scala diff --git a/common/native/src/main/scala/http/ArrayUtils.scala b/client/src/http/ArrayUtils.scala index 00c1067..00c1067 100644 --- a/common/native/src/main/scala/http/ArrayUtils.scala +++ b/client/src/http/ArrayUtils.scala diff --git a/common/native/src/main/scala/http/CurlBackend.scala b/client/src/http/CurlBackend.scala index 4dc8577..4dc8577 100644 --- a/common/native/src/main/scala/http/CurlBackend.scala +++ b/client/src/http/CurlBackend.scala diff --git a/common/native/src/main/scala/http/curl.scala b/client/src/http/curl.scala index 1eda584..1eda584 100644 --- a/common/native/src/main/scala/http/curl.scala +++ b/client/src/http/curl.scala diff --git a/common/native/src/main/scala/http/package.scala b/client/src/http/package.scala index 63b5405..63b5405 100644 --- a/common/native/src/main/scala/http/package.scala +++ b/client/src/http/package.scala @@ -0,0 +1,37 @@ +#!/usr/bin/env sh + +# This is a wrapper script, that automatically download mill from GitHub release pages +# You can give the required mill version with MILL_VERSION env variable +# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION +DEFAULT_MILL_VERSION=0.5.1 + +set -e + +if [ -z "$MILL_VERSION" ] ; then + if [ -f ".mill-version" ] ; then + MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)" + elif [ -f "mill" ] && [ "$BASH_SOURCE" != "mill" ] ; then + MILL_VERSION=$(grep -F "DEFAULT_MILL_VERSION=" "mill" | head -n 1 | cut -d= -f2) + else + MILL_VERSION=$DEFAULT_MILL_VERSION + fi +fi + +MILL_DOWNLOAD_PATH="$HOME/.mill/download" +MILL_EXEC_PATH="${MILL_DOWNLOAD_PATH}/$MILL_VERSION" + +if [ ! -x "$MILL_EXEC_PATH" ] ; then + mkdir -p $MILL_DOWNLOAD_PATH + DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download + MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION-assembly" + curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL" + chmod +x "$DOWNLOAD_FILE" + mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH" + unset DOWNLOAD_FILE + unset MILL_DOWNLOAD_URL +fi + +unset MILL_DOWNLOAD_PATH +unset MILL_VERSION + +exec $MILL_EXEC_PATH "$@" diff --git a/project/Js.scala b/project/Js.scala deleted file mode 100644 index 9afb064..0000000 --- a/project/Js.scala +++ /dev/null @@ -1,20 +0,0 @@ -import sbt._ -import sbt.Keys._ -import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ - -object Js { - - def dependsOnJs(proj: Project): Seq[Setting[_]] = Seq( - resourceGenerators in Compile += Def.task { - val js: File = (fastOptJS in (proj, Compile)).value.data - val map = js.getParentFile / (js.name + ".map") - val out = (resourceManaged in Compile).value / "assets" / "ui" / "js" - val toCopy = Seq( - js -> out / js.name, - map -> out / map.name - ) - IO.copy(toCopy).toSeq - }.taskValue - ) - -} diff --git a/project/build.properties b/project/build.properties deleted file mode 100644 index 2305049..0000000 --- a/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.1.4
\ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt deleted file mode 100644 index a884d99..0000000 --- a/project/plugins.sbt +++ /dev/null @@ -1,7 +0,0 @@ -addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1") -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1") - -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.4.0") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.4.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.7") diff --git a/server/src/main/resources/assets/lib/.gitattributes b/server/resources/assets/lib/.gitattributes index 36fe3a5..36fe3a5 100644 --- a/server/src/main/resources/assets/lib/.gitattributes +++ b/server/resources/assets/lib/.gitattributes diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css index 6798f23..6798f23 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css.map b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css.map index 8922d4c..8922d4c 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css.map +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.css.map diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css index 79c746d..79c746d 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css.map b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css.map index 62f971a..62f971a 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css.map +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-grid.min.css.map diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css index 9f0f40f..9f0f40f 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css.map b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css.map index ee4c739..ee4c739 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css.map +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.css.map diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css index eb965cc..eb965cc 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css.map b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css.map index e5a961a..e5a961a 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css.map +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap-reboot.min.css.map diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css index 7220f3c..7220f3c 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css.map b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css.map index e75d56a..e75d56a 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css.map +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.css.map diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css index e490fd0..e490fd0 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css.map b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css.map index 2d5a149..2d5a149 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css.map +++ b/server/resources/assets/lib/bootstrap-4.1.0/css/bootstrap.min.css.map diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js index 9bea2ea..9bea2ea 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js +++ b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js.map b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js.map index ca9fca3..ca9fca3 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js.map +++ b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.js.map diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js index e0608e8..e0608e8 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js +++ b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js.map b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js.map index 130a708..130a708 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js.map +++ b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.bundle.min.js.map diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js index 546a94f..546a94f 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js +++ b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js.map b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js.map index 7b50f7d..7b50f7d 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js.map +++ b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.js.map diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js index eac9842..eac9842 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js +++ b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js diff --git a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js.map b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js.map index 2cbfeac..2cbfeac 100644 --- a/server/src/main/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js.map +++ b/server/resources/assets/lib/bootstrap-4.1.0/js/bootstrap.min.js.map diff --git a/server/src/main/resources/assets/main.css b/server/resources/assets/main.css index fb491d9..fb491d9 100644 --- a/server/src/main/resources/assets/main.css +++ b/server/resources/assets/main.css diff --git a/server/src/main/scala/LiveMessages.scala b/server/src/LiveMessages.scala index 9729353..9729353 100644 --- a/server/src/main/scala/LiveMessages.scala +++ b/server/src/LiveMessages.scala diff --git a/server/src/main/scala/Main.scala b/server/src/Main.scala index 51e4f28..51e4f28 100644 --- a/server/src/main/scala/Main.scala +++ b/server/src/Main.scala diff --git a/server/src/main/scala/Repository.scala b/server/src/Repository.scala index 003ac92..003ac92 100644 --- a/server/src/main/scala/Repository.scala +++ b/server/src/Repository.scala diff --git a/server/src/main/scala/Routes.scala b/server/src/Routes.scala index d39fa18..0b08a11 100644 --- a/server/src/main/scala/Routes.scala +++ b/server/src/Routes.scala @@ -73,6 +73,8 @@ class Routes(repository: Repository, liveMessages: LiveMessages) { val assets = pathPrefix("assets") { getFromResourceDirectory("assets") + } ~ path("out.js") { + getFromResource("out.js") } def all = messages ~ ui ~ live ~ assets diff --git a/common/shared/src/main/scala/ApiProtocol.scala b/shared/ApiProtocol.scala index 5d0e00a..5d0e00a 100644 --- a/common/shared/src/main/scala/ApiProtocol.scala +++ b/shared/ApiProtocol.scala diff --git a/common/shared/src/main/scala/Message.scala b/shared/Message.scala index 84c733e..84c733e 100644 --- a/common/shared/src/main/scala/Message.scala +++ b/shared/Message.scala diff --git a/common/shared/src/main/scala/Templates.scala b/shared/Templates.scala index 10ee116..10ee116 100644 --- a/common/shared/src/main/scala/Templates.scala +++ b/shared/Templates.scala diff --git a/common/shared/src/main/scala/TextTemplates.scala b/shared/TextTemplates.scala index e7e364a..0dd45c5 100644 --- a/common/shared/src/main/scala/TextTemplates.scala +++ b/shared/TextTemplates.scala @@ -10,7 +10,7 @@ object TextTemplates extends Templates(scalatags.Text) { "ScalaJS raised an exception. See the log for more information." ), script(`type` := "text/javascript", - src := "/assets/ui/js/ui-fastopt.js"), + src := "/out.js"), script(`type` := "text/javascript")( raw( """|document.addEventListener("DOMContentLoaded", function(event) { diff --git a/common/shared/src/main/scala/http/Backend.scala b/shared/http/Backend.scala index f3ce5f8..f3ce5f8 100644 --- a/common/shared/src/main/scala/http/Backend.scala +++ b/shared/http/Backend.scala diff --git a/common/shared/src/main/scala/http/Request.scala b/shared/http/Request.scala index ec7d28d..ec7d28d 100644 --- a/common/shared/src/main/scala/http/Request.scala +++ b/shared/http/Request.scala diff --git a/common/shared/src/main/scala/http/Response.scala b/shared/http/Response.scala index 4ba2342..4ba2342 100644 --- a/common/shared/src/main/scala/http/Response.scala +++ b/shared/http/Response.scala diff --git a/common/js/src/main/scala/JsTemplates.scala b/ui/src/JsTemplates.scala index bbb29c5..bbb29c5 100644 --- a/common/js/src/main/scala/JsTemplates.scala +++ b/ui/src/JsTemplates.scala diff --git a/ui/src/main/scala/Main.scala b/ui/src/Main.scala index 3621b4a..3621b4a 100644 --- a/ui/src/main/scala/Main.scala +++ b/ui/src/Main.scala diff --git a/common/js/src/main/scala/http/XhrBackend.scala b/ui/src/http/XhrBackend.scala index 3a791c1..3a791c1 100644 --- a/common/js/src/main/scala/http/XhrBackend.scala +++ b/ui/src/http/XhrBackend.scala diff --git a/common/js/src/main/scala/http/package.scala b/ui/src/http/package.scala index 7b680eb..7b680eb 100644 --- a/common/js/src/main/scala/http/package.scala +++ b/ui/src/http/package.scala |