From 62080c0ed27627d7dd0b92deef1c673ac3be4149 Mon Sep 17 00:00:00 2001 From: Vincent Prins Date: Fri, 28 Jun 2024 09:20:31 +0200 Subject: [PATCH] Fix z-index for vue-slider --- .../src/views/annotate/subviews/JobsView.vue | 3 +- server/build.gradle.kts | 153 +++++++++--------- .../ivdnt/galahad/data/document/Documents.kt | 1 - .../port/folia/export/FoliaTextMerger.kt | 2 - 4 files changed, 78 insertions(+), 81 deletions(-) diff --git a/client/src/views/annotate/subviews/JobsView.vue b/client/src/views/annotate/subviews/JobsView.vue index a93110e..3e2de96 100644 --- a/client/src/views/annotate/subviews/JobsView.vue +++ b/client/src/views/annotate/subviews/JobsView.vue @@ -48,7 +48,7 @@ – {{ d.item.tagger.eraTo }}{{ d.item.tagger.eraTo - }} + }} @@ -296,6 +296,7 @@ table button { :deep(.vue-slider) .vue-slider-dot { width: 25px !important; height: 25px !important; + z-index: 1; } :deep(.vue-slider) .vue-slider-dot-handle { diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 7b63c76..daff5f1 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -1,78 +1,77 @@ -import org.jetbrains.dokka.DokkaConfiguration.Visibility -import org.jetbrains.dokka.gradle.DokkaTask -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -plugins { - id("org.springframework.boot") version "3.2.3" - id("io.spring.dependency-management") version "1.1.4" - id("org.jetbrains.dokka") version "1.9.10" - kotlin("jvm") version "1.9.22" - kotlin("plugin.spring") version "1.9.22" - kotlin("plugin.serialization") version "1.9.22" -} - -group = "org.ivdnt" -version = "0.0.2-ALPHA-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_17 -java.targetCompatibility = JavaVersion.VERSION_17 - -repositories { - mavenCentral() - gradlePluginPortal() -} - -dependencies { - // Spring - implementation("org.springframework.boot:spring-boot-starter-web:3.2.4") - // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-devtools - implementation("org.springframework.boot:spring-boot-devtools:3.2.3") - - // kotlin - implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.22") - // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib - implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") // JVM dependency - - // swagger - implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0") - - - implementation("com.beust:klaxon:5.6") - implementation("org.apache.logging.log4j:log4j-api-kotlin:1.2.0") - - // yaml - // https://mvnrepository.com/artifact/org.yaml/snakeyaml - implementation("org.yaml:snakeyaml:2.2") - - // Tests - testImplementation ("org.springframework.boot:spring-boot-starter-test:3.2.3") -} - -tasks.test { - environment(mapOf("profile" to "dev")) - useJUnitPlatform() -} - -tasks.withType { - useJUnitPlatform() - // https://stackoverflow.com/questions/52733942/increase-heap-memory-for-gradle-test -// minHeapSize = "4096m" -// maxHeapSize = "4096m" -// jvmArgs = listOf("-XX:MaxPermSize=1024m") // fails on some IDEs -} - -tasks.withType { - kotlinOptions { - freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "17" - } -} - -tasks.withType().configureEach { - dokkaSourceSets { - configureEach { - documentedVisibilities.set(setOf(Visibility.PUBLIC, Visibility.PROTECTED, Visibility.PRIVATE, Visibility.INTERNAL)) - } - } +import org.jetbrains.dokka.DokkaConfiguration.Visibility +import org.jetbrains.dokka.gradle.DokkaTask +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + id("org.springframework.boot") version "3.2.3" + id("io.spring.dependency-management") version "1.1.4" + id("org.jetbrains.dokka") version "1.9.10" + kotlin("jvm") version "1.9.22" + kotlin("plugin.spring") version "1.9.22" + kotlin("plugin.serialization") version "1.9.22" +} + +group = "org.ivdnt" +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 + +repositories { + mavenCentral() + gradlePluginPortal() +} + +dependencies { + // Spring + implementation("org.springframework.boot:spring-boot-starter-web:3.2.4") + // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-devtools + implementation("org.springframework.boot:spring-boot-devtools:3.2.3") + + // kotlin + implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.22") + // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") // JVM dependency + + // swagger + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0") + + + implementation("com.beust:klaxon:5.6") + implementation("org.apache.logging.log4j:log4j-api-kotlin:1.2.0") + + // yaml + // https://mvnrepository.com/artifact/org.yaml/snakeyaml + implementation("org.yaml:snakeyaml:2.2") + + // Tests + testImplementation ("org.springframework.boot:spring-boot-starter-test:3.2.3") +} + +tasks.test { + environment(mapOf("profile" to "dev")) + useJUnitPlatform() +} + +tasks.withType { + useJUnitPlatform() + // https://stackoverflow.com/questions/52733942/increase-heap-memory-for-gradle-test +// minHeapSize = "4096m" +// maxHeapSize = "4096m" +// jvmArgs = listOf("-XX:MaxPermSize=1024m") // fails on some IDEs +} + +tasks.withType { + kotlinOptions { + freeCompilerArgs = listOf("-Xjsr305=strict") + jvmTarget = "17" + } +} + +tasks.withType().configureEach { + dokkaSourceSets { + configureEach { + documentedVisibilities.set(setOf(Visibility.PUBLIC, Visibility.PROTECTED, Visibility.PRIVATE, Visibility.INTERNAL)) + } + } } \ No newline at end of file diff --git a/server/src/main/kotlin/org/ivdnt/galahad/data/document/Documents.kt b/server/src/main/kotlin/org/ivdnt/galahad/data/document/Documents.kt index bccfe58..22f43fb 100644 --- a/server/src/main/kotlin/org/ivdnt/galahad/data/document/Documents.kt +++ b/server/src/main/kotlin/org/ivdnt/galahad/data/document/Documents.kt @@ -28,7 +28,6 @@ class Documents( override fun delete(key: String): Document? { val fullyDeleted: Boolean = workDirectory.resolve(key).deleteRecursively() if (!fullyDeleted) println("Partial deletion of $key") - // TODO remember we also need to delete in associated jobs return readOrNull(key) } diff --git a/server/src/main/kotlin/org/ivdnt/galahad/port/folia/export/FoliaTextMerger.kt b/server/src/main/kotlin/org/ivdnt/galahad/port/folia/export/FoliaTextMerger.kt index 9125da0..025896e 100644 --- a/server/src/main/kotlin/org/ivdnt/galahad/port/folia/export/FoliaTextMerger.kt +++ b/server/src/main/kotlin/org/ivdnt/galahad/port/folia/export/FoliaTextMerger.kt @@ -41,8 +41,6 @@ class FoliaTextMerger( if (node.nodeType == Node.TEXT_NODE) { child.textContent = text } - // TODO reparseText overwrites embedded t-styles - // never set the offset of more than one space. if (endsWithSpace && text.startsWith(" ")) { offset -= 1