diff --git a/build.gradle b/build.gradle index 34ebcc3..47ddc37 100644 --- a/build.gradle +++ b/build.gradle @@ -126,6 +126,7 @@ tasks.named('deploy2Wildfly', Deploy2WildflyTask) { d2w -> d2w.rpcUsername = 'woggioni' // d2w.rpcUsername = 'admin' d2w.rpcPassword = '123456' + d2w.deploymentName = 'jpacrepo.war' } diff --git a/gradle.properties b/gradle.properties index 27df52b..65f5064 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -jpacrepo.version=2024.02.22 +jpacrepo.version=2024.02.24 -lys.version=2024.02.22 +lys.version=2024.02.24 diff --git a/jpacrepo-frontend/build.gradle b/jpacrepo-frontend/build.gradle index cd47748..bf708cd 100644 --- a/jpacrepo-frontend/build.gradle +++ b/jpacrepo-frontend/build.gradle @@ -1,6 +1,6 @@ plugins { alias(catalog.plugins.kotlin.multiplatform) - id "org.jetbrains.kotlin.plugin.serialization" version "1.9.22" + alias(catalog.plugins.kotlin.serialization) } @@ -19,10 +19,14 @@ kotlin { dependencies { implementation catalog.klevtree implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-serialization-json', version: '1.6.2' -// implementation(npm("bootstrap", "5.3.2")) -// implementation(npm("bootstrap-icons", "1.11.3")) -// implementation(npm("style-loader", "3.3.4")) -// implementation(npm("css-loader", "6.10.0")) + + implementation(npm("bootstrap", "5.3.2")) + implementation(npm("bootstrap-icons", "1.11.3")) + implementation(npm("style-loader", "3.3.4")) + implementation(npm("css-loader", "6.10.0")) + implementation(npm("postcss-loader", "8.1.0")) + implementation(npm("sass", "1.71.1")) + implementation(npm("sass-loader", "14.1.1")) } } } @@ -30,7 +34,10 @@ kotlin { browser { runTask { sourceMaps = true - devServer.port = 8080 + devServer.port = 5080 + cssSupport { + enabled.set(false) + } } webpackTask { sourceMaps = false diff --git a/jpacrepo-frontend/src/jsMain/kotlin/net/woggioni/jpacrepo/Main.kt b/jpacrepo-frontend/src/jsMain/kotlin/net/woggioni/jpacrepo/Main.kt index 49fa716..aeff694 100644 --- a/jpacrepo-frontend/src/jsMain/kotlin/net/woggioni/jpacrepo/Main.kt +++ b/jpacrepo-frontend/src/jsMain/kotlin/net/woggioni/jpacrepo/Main.kt @@ -370,6 +370,7 @@ private fun HtmlBuilder.buildPackageSearchSection(commonElement: Element) { } fun main(vararg args: String) { + js("require ('./scss/styles.scss');") HtmlBuilder.of(document, document.body as HTMLElement) { main { main -> div { diff --git a/jpacrepo-frontend/src/jsMain/resources/index.html b/jpacrepo-frontend/src/jsMain/resources/index.html index e1adc0b..d9dd8b4 100644 --- a/jpacrepo-frontend/src/jsMain/resources/index.html +++ b/jpacrepo-frontend/src/jsMain/resources/index.html @@ -4,15 +4,7 @@ - - - -