diff --git a/14-rock-paper-scissors/src/main/resources/public/images/favicon-32x32.png b/14-rock-paper-scissors/src/main/resources/public/images/favicon-32x32.png
new file mode 100644
index 0000000..1e2df7f
Binary files /dev/null and b/14-rock-paper-scissors/src/main/resources/public/images/favicon-32x32.png differ
diff --git a/14-rock-paper-scissors/src/main/resources/templates/index.html b/14-rock-paper-scissors/src/main/resources/templates/index.html
index 7f00571..73afa30 100644
--- a/14-rock-paper-scissors/src/main/resources/templates/index.html
+++ b/14-rock-paper-scissors/src/main/resources/templates/index.html
@@ -1,30 +1,33 @@
-
+
-
-
-
- Initial flie
-
-
+
+
+
+ Initial flie
+
+
+
-
-
-
-
-
-
-
- Hello!
-
- with static text
-
-
-
-
+
+
+
+
+
+
+ Hello!
+ with static text
+
+
diff --git a/14-rock-paper-scissors/src/main/scala/rockpaperscissors/Main.scala b/14-rock-paper-scissors/src/main/scala/rockpaperscissors/Main.scala
index 6538b3a..9174501 100644
--- a/14-rock-paper-scissors/src/main/scala/rockpaperscissors/Main.scala
+++ b/14-rock-paper-scissors/src/main/scala/rockpaperscissors/Main.scala
@@ -26,8 +26,7 @@ object Main {
server.main(Array.empty)
}
- def main(args: Array[String]): Unit =
- {
+ def main(args: Array[String]): Unit = {
println(s"got args : $args")
ParserForMethods(this).runOrExit(args)
}
@@ -43,11 +42,12 @@ object Main {
templateEngine.setTemplateResolver(templateResolver)
@cask.get("/")
- def index() = {
+ def index(req: cask.Request) = {
val context = new Context()
+ println(s"getting request for ${req.remainingPathSegments}")
context.setVariable(
"myVar",
- "Hello, from Scala world"
+ "Hello, from Scala world!"
)
val result = templateEngine.process("index", context)
cask.Response(
@@ -56,11 +56,11 @@ object Main {
)
}
- @cask.staticFiles("/dist")
- def distFiles() = "dist"
- @cask.staticFiles("/public")
- def publicFiles() = "public"
-
+ @cask.staticResources("/public")
+ def publicFiles(req: cask.Request) = {
+ println(s"getting request for ${req.remainingPathSegments}")
+ "public"
+ }
initialize()
}