Add initial Bootstrap style

Signed-off-by: Graham <gpe@openrs2.org>
4 years ago · 554520b285
parent 81e2dedee5
commit 554520b285
4 changed files with 42 additions and 30 deletions
--- a/archive/build.gradle.kts
+++ b/archive/build.gradle.kts
@ -24,11 +24,13 @@ dependencies {
    implementation("io.ktor:ktor-jackson:${Versions.ktor}")
    implementation("io.ktor:ktor-server-netty:${Versions.ktor}")
    implementation("io.ktor:ktor-thymeleaf:${Versions.ktor}")
+    implementation("io.ktor:ktor-webjars:${Versions.ktor}")
    implementation("org.flywaydb:flyway-core:${Versions.flyway}")
    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinCoroutines}")
    implementation("org.postgresql:postgresql:${Versions.postgres}")
    implementation("org.thymeleaf:thymeleaf:${Versions.thymeleaf}")
    implementation("org.thymeleaf.extras:thymeleaf-extras-java8time:${Versions.thymeleafJava8Time}")
+    implementation("org.webjars:bootstrap:${Versions.bootstrap}")
 }

 publishing {
--- a/archive/src/main/kotlin/org/openrs2/archive/web/WebServer.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/web/WebServer.kt
@ -11,6 +11,7 @@ import io.ktor.routing.routing
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.netty.Netty
 import io.ktor.thymeleaf.Thymeleaf
+import io.ktor.webjars.Webjars
 import org.openrs2.json.Json
 import org.thymeleaf.extras.java8time.dialect.Java8TimeDialect
 import org.thymeleaf.templatemode.TemplateMode
@ -38,6 +39,8 @@ public class WebServer @Inject constructor(
                })
            }

+            install(Webjars)
+
            routing {
                get("/caches") { cachesController.index(call) }
                get("/caches/{id}.zip") { cachesController.export(call) }
--- a/archive/src/main/resources/org/openrs2/archive/templates/caches/index.html
+++ b/archive/src/main/resources/org/openrs2/archive/templates/caches/index.html
@ -1,8 +1,13 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="en">
+	<head>
+		<title>OpenRS2 Archive</title>
+		<link rel="stylesheet" href="/webjars/bootstrap/css/bootstrap.min.css" />
+	</head>
 	<body>
-		<table>
-			<thead>
+		<main class="container">
+			<table class="table table-striped table-bordered table-hover">
+				<thead class="thead-dark">
 					<tr>
 						<th>Game</th>
 						<th>Build</th>
@ -25,11 +30,12 @@
 						<td th:text="${cache.groupStats}? ${cache.groupStats.validGroups} + ' / ' + ${cache.groupStats.groups} : 'Calculating...'">Calculating...</td>
 						<td th:text="${cache.groupStats}? ${cache.groupStats.validKeys} + ' / ' + ${cache.groupStats.keys} : 'Calculating...'">Calculating...</td>
 						<td>
-						<a th:href="${'/caches/' + cache.id + '.zip'}">Cache</a>
-						<a th:href="${'/caches/' + cache.id + '.json'}">Keys</a>
+							<a th:href="${'/caches/' + cache.id + '.zip'}" class="btn btn-primary btn-sm">Cache</a>
+							<a th:href="${'/caches/' + cache.id + '.json'}" class="btn btn-primary btn-sm">Keys</a>
 						</td>
 					</tr>
 				</tbody>
 			</table>
+		</main>
 	</body>
 </html>
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@ -1,5 +1,6 @@
 object Versions {
    const val asm = "9.1"
+    const val bootstrap = "4.6.0"
    const val bouncyCastlePkix = "1.68"
    const val bouncyCastleProvider = "1.68"
    const val clikt = "3.1.0"