feat(model-server): added menu bar to existing pages

Author: mhuster23

model-server/src/main/kotlin/org/modelix/model/server/Main.kt

@@ -27,14 +27,7 @@ import io.ktor.server.plugins.forwardedheaders.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
-import kotlinx.html.a
-import kotlinx.html.body
-import kotlinx.html.br
-import kotlinx.html.div
-import kotlinx.html.head
-import kotlinx.html.li
-import kotlinx.html.style
-import kotlinx.html.ul
+import kotlinx.html.*
 import org.apache.commons.io.FileUtils
 import org.apache.ignite.Ignition
 import org.modelix.authorization.KeycloakUtils
@@ -44,6 +37,7 @@ import org.modelix.model.server.store.IStoreClient
 import org.modelix.model.server.store.IgniteStoreClient
 import org.modelix.model.server.store.InMemoryStoreClient
 import org.modelix.model.server.store.LocalModelClient
+import org.modelix.model.server.templates.PageWithMenuBar
 import org.slf4j.LoggerFactory
 import java.io.File
 import java.io.FileReader
@@ -157,9 +151,11 @@ object Main {
                 modelReplicationServer.init(this)
                 routing {
                     get("/") {
-                        call.respondHtml {
-                            head {
+                        call.respondHtmlTemplate(PageWithMenuBar("root", ".")) {
+                            headContent {
                                 style { +"""
+                                    body {
+                                        font-family: sans-serif;
                                     table {
                                         border-collapse: collapse;
                                     }
@@ -169,9 +165,8 @@ object Main {
                                     }
                                 """.trimIndent() }
                             }
-                            body {
-                                div { +"Model Server" }
-                                br {}
+                            bodyContent {
+                                h1 { +"Model Server" }
                                 ul {
                                     li {
                                         a("history/") { +"Model History" }

model-server/src/main/kotlin/org/modelix/model/server/handlers/ContentExplorer.kt

@@ -49,7 +49,7 @@ class ContentExplorer(private val client: IModelClient, private val repoManager:
             get("/content/") {
                 call.respondHtmlTemplate(PageWithMenuBar("content/", "..")) {
                     headContent {contentOverviewHead()}
-                    content {contentOverviewBody()}
+                    bodyContent {contentOverviewBody()}
                 }
             }
             get("/content/{versionHash}/") {
@@ -62,7 +62,7 @@ class ContentExplorer(private val client: IModelClient, private val repoManager:
                 val rootNode = PNodeAdapter(ITree.ROOT_ID, TreePointer(tree))
                 call.respondHtmlTemplate(PageWithMenuBar("content/", "../..")) {
                     headContent {contentPageHead()}
-                    content {contentPageBody(rootNode)}
+                    bodyContent {contentPageBody(rootNode)}
                 }
             }
             get("/content/{versionHash}/{nodeId}/") {

model-server/src/main/kotlin/org/modelix/model/server/handlers/DeprecatedLightModelServer.kt

@@ -24,10 +24,7 @@ import io.ktor.websocket.*
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.html.body
-import kotlinx.html.table
-import kotlinx.html.td
-import kotlinx.html.tr
+import kotlinx.html.*
 import org.json.JSONArray
 import org.json.JSONObject
 import org.modelix.authorization.KeycloakScope
@@ -42,10 +39,10 @@ import org.modelix.model.lazy.CLTree
 import org.modelix.model.lazy.CLVersion
 import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.operations.OTBranch
-import org.modelix.model.persistent.CPTree
 import org.modelix.model.persistent.CPVersion
 import org.modelix.model.server.store.LocalModelClient
 import org.modelix.model.server.store.pollEntry
+import org.modelix.model.server.templates.PageWithMenuBar
 import java.util.*
 
 class DeprecatedLightModelServer(val client: LocalModelClient) {
@@ -71,8 +68,20 @@ class DeprecatedLightModelServer(val client: LocalModelClient) {
 
     private fun Route.initRouting() {
         get("/") {
-            call.respondHtml(HttpStatusCode.OK) {
-                body {
+            call.respondHtmlTemplate(PageWithMenuBar("json/", ".."), status=HttpStatusCode.OK) {
+                headContent {
+                    title("JSON API")
+                    style {
+                        unsafe {
+                            +"""
+                            body {
+                                font-family: sans-serif;    
+                            }""".trimMargin()
+                        }
+                    }
+                }
+                bodyContent {
+                    h1 { +"JSON API" }
                     table {
                         tr {
                             td { +"GET /{repositoryId}/" }