diff --git a/web/src/main/kotlin/com/wbrawner/twigs/web/WebRoutes.kt b/web/src/main/kotlin/com/wbrawner/twigs/web/WebRoutes.kt index 566d39a..15e3ba1 100644 --- a/web/src/main/kotlin/com/wbrawner/twigs/web/WebRoutes.kt +++ b/web/src/main/kotlin/com/wbrawner/twigs/web/WebRoutes.kt @@ -9,12 +9,12 @@ import io.ktor.server.routing.* fun Application.webRoutes() { routing { static { - resources("web") + resources() default("index.html") } intercept(ApplicationCallPipeline.Setup) { if (!call.request.path().startsWith("/api") && !call.request.path().matches(Regex(".*\\.\\w+$"))) { - call.resolveResource("web/index.html")?.let { + call.resolveResource("index.html")?.let { call.respond(it) return@intercept finish() } diff --git a/web/src/main/resources/web/style.css b/web/src/main/resources/css/style.css similarity index 100% rename from web/src/main/resources/web/style.css rename to web/src/main/resources/css/style.css diff --git a/web/src/main/resources/img/logo-color.svg b/web/src/main/resources/img/logo-color.svg new file mode 100644 index 0000000..b9d0643 --- /dev/null +++ b/web/src/main/resources/img/logo-color.svg @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/web/src/main/resources/img/logo-white.svg b/web/src/main/resources/img/logo-white.svg new file mode 100644 index 0000000..aa71436 --- /dev/null +++ b/web/src/main/resources/img/logo-white.svg @@ -0,0 +1,67 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/web/src/main/resources/web/js/index.js b/web/src/main/resources/js/index.js similarity index 100% rename from web/src/main/resources/web/js/index.js rename to web/src/main/resources/js/index.js diff --git a/web/src/main/resources/web/img/logo-color.svg b/web/src/main/resources/web/img/logo-color.svg deleted file mode 100644 index 81119ac..0000000 --- a/web/src/main/resources/web/img/logo-color.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/main/resources/web/img/logo-white.svg b/web/src/main/resources/web/img/logo-white.svg deleted file mode 100644 index 7c78cd1..0000000 --- a/web/src/main/resources/web/img/logo-white.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/web/src/main/resources/web/index.html b/web/src/main/resources/web/index.html deleted file mode 100644 index d3bd36c..0000000 --- a/web/src/main/resources/web/index.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - Twigs - - - -
-
- - -
-
- - - \ No newline at end of file