Various fixes

diff --git a/src/jvmMain/kotlin/info/mechyrdia/data/views_files.kt b/src/jvmMain/kotlin/info/mechyrdia/data/views_files.kt
index bca19017b104bc2b0c639fd3d475f9d5bc7a3826..a8801cb7d1edef3cb5498b03cc0735a686738c77 100644 (file)
--- a/src/jvmMain/kotlin/info/mechyrdia/data/views_files.kt
+++ b/src/jvmMain/kotlin/info/mechyrdia/data/views_files.kt
@@ -200,7 +200,7 @@ private val textExtensions = listOf(
        "",
        "groovy",
        "html",
-       "js.map",
+       "map",
        "mtl",
        "obj",
        "old",
@@ -212,7 +212,7 @@ suspend fun ApplicationCall.adminPreviewFile(path: StoragePath) {
        attributes.put(PageDoNotCacheAttributeKey, true)
        val stat = FileStorage.instance.statFile(path) ?: return respond(HttpStatusCode.NotFound)
        
-       val extension = path.elements.last().substringAfter('.', "")
+       val extension = path.elements.last().substringAfterLast('.', "")
        val type = if (extension in textExtensions) ContentType.Text.Plain else ContentType.defaultForFileExtension(extension)
        val result = FileStorage.instance.readFile(path) { producer ->
                respondBytesWriter(contentType = type, contentLength = stat.size, producer = producer)

diff --git a/src/jvmMain/kotlin/info/mechyrdia/lore/views_error.kt b/src/jvmMain/kotlin/info/mechyrdia/lore/views_error.kt
index cb7a837673c4f217420cc64fc3b81d6af0574195..3d4bded19fb1cf47f316655704ed244d4e55f8a0 100644 (file)
--- a/src/jvmMain/kotlin/info/mechyrdia/lore/views_error.kt
+++ b/src/jvmMain/kotlin/info/mechyrdia/lore/views_error.kt
@@ -1,5 +1,7 @@
 package info.mechyrdia.lore
 
+import info.mechyrdia.OwnerNationId
+import info.mechyrdia.data.currentNation
 import info.mechyrdia.route.CsrfProtectedResourcePayload
 import info.mechyrdia.route.Root
 import info.mechyrdia.route.href
@@ -14,7 +16,7 @@ suspend fun ApplicationCall.errorPage(title: String, body: FlowContent.() -> Uni
                        h1 { +title }
                        body()
                }
-       else if (request.uri.startsWith("/admin/vfs"))
+       else if (request.uri.startsWith("/admin/vfs") && currentNation()?.id == OwnerNationId)
                adminPage(title) {
                        div(classes = "message") {
                                h1 { +title }

diff --git a/src/jvmMain/resources/static/admin.css b/src/jvmMain/resources/static/admin.css
index 842cae4ce41103c72250e0d1a2967c71e3c3c9be..e821bc89cd21d8290828e800de6ce29b3e935e91 100644 (file)
--- a/src/jvmMain/resources/static/admin.css
+++ b/src/jvmMain/resources/static/admin.css
@@ -37,6 +37,7 @@ html {
        padding: 0;
 
        font-family: 'JetBrains Mono', monospace;
+       font-size: 125%;
 }
 
 body {