move language selector into navbar

jillesvangurp · Jun 15, 2024 · ff0a987 · ff0a987
1 parent b7b80a1
commit ff0a987
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/jsMain/kotlin/routing/routing.kt b/src/jsMain/kotlin/routing/routing.kt
@@ -1,6 +1,7 @@
 package routing
 
 import com.tryformation.localization.Translatable
+import components.flexRow
 import dev.fritz2.core.RenderContext
 import dev.fritz2.routing.MapRouter
 import dev.fritz2.routing.routerOf
@@ -9,6 +10,7 @@ import files.fileManager
 import fluenteditor.fluentBrowser
 import kotlinx.coroutines.flow.map
 import localization.TL
+import localization.languageSelector
 import localization.translate
 import org.koin.dsl.module
 import settings.settingsScreen
@@ -48,11 +50,11 @@ fun RenderContext.mainScreen() {
                         }
                     } ?: Page.default) to pp
                 }.render { (page, params) ->
-                    div("flex flex-row w-full gap-2 bg-white place-items-center") {
+                    div("flex flex-row w-full gap-2 bg-white place-items-center justify-between") {
                         h1("text-blueBright-500 font-bold my-0 pl-5") {
                             translate(TL.Common.AppName)
                         }
-                        div("flex flex-row gap-5 bg-white py-2 border-b border-gray-300") {
+                        div("flex flex-row gap-2 bg-white py-2 border-b border-gray-300") {
                             Page.entries.forEach { p ->
                                 if (page == p) {
                                     a("px-4 py-2 text-gray-600 hover:text-gray-800 border-b-2 border-blueBright-500 text-blueBright-500") {
@@ -69,6 +71,9 @@ fun RenderContext.mainScreen() {
                                 }
                             }
                         }
+                        flexRow {
+                            languageSelector()
+                        }
                     }
 
                     when (page) {

diff --git a/src/jsMain/kotlin/settings/settings.kt b/src/jsMain/kotlin/settings/settings.kt
@@ -10,11 +10,9 @@ import components.selectComponent
 import components.twInputField
 import dev.fritz2.core.RenderContext
 import dev.fritz2.core.disabled
-import dev.fritz2.core.href
 import dev.fritz2.core.selected
 import dev.fritz2.core.storeOf
 import dev.fritz2.core.value
-import dev.fritz2.headless.components.radioGroup
 import icons.SvgIconSource
 import kotlinx.coroutines.flow.map
 import kotlinx.serialization.Serializable
@@ -55,7 +53,6 @@ fun RenderContext.settingsScreen() {
 
     div("grow m-5 bg-white flex flex-col gap-2 p-5") {
         fadeInFadeoutTransition()
-        languageSelector()
 
         openAiKeyEditor()
         modelPicker()