Refactor tnoodle-ui package bindings

thewca · Aug 16, 2022 · 955c89c · 955c89c
1 parent 0c3c25c
commit 955c89c
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 9 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,7 +6,7 @@
 version: 2
 updates:
   - package-ecosystem: "npm"
-    directory: "/tnoodle-ui"
+    directory: "/ui"
     schedule:
       interval: "monthly"
   - package-ecosystem: "github-actions"

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -43,5 +43,5 @@ jobs:
       uses: coverallsapp/github-action@master
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        path-to-lcov: 'tnoodle-ui/coverage/lcov.info'
-        base-path: 'tnoodle-ui'
+        path-to-lcov: 'ui/coverage/lcov.info'
+        base-path: 'ui'
diff --git a/build-tools/src/main/kotlin/org/worldcubeassociation/tnoodle/core/util/FrontendUtil.kt b/build-tools/src/main/kotlin/org/worldcubeassociation/tnoodle/core/util/FrontendUtil.kt
@@ -0,0 +1,5 @@
+package org.worldcubeassociation.tnoodle.core.util
+
+object FrontendUtil {
+    const val FRONTEND_BINDING_PACKAGE = "wca/tnoodle-ui"
+}
diff --git a/buildSrc/src/main/kotlin/org/worldcubeassociation/tnoodle/build/FrontendBindings.kt b/buildSrc/src/main/kotlin/org/worldcubeassociation/tnoodle/build/FrontendBindings.kt
@@ -0,0 +1,7 @@
+package org.worldcubeassociation.tnoodle.build
+
+import org.worldcubeassociation.tnoodle.core.util.FrontendUtil
+
+object FrontendBindings {
+    const val PACKAGE_ROOT = FrontendUtil.FRONTEND_BINDING_PACKAGE
+}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -22,6 +22,7 @@ dependencies {
     api(libs.tnoodle.scrambles)
 
     implementation(project(":build-tools"))
+
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.ktor.server.content.negotiation)
     implementation(libs.ktor.serialization.kotlinx.json)

diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -38,6 +38,7 @@ configurations {
 
 dependencies {
     implementation(project(":core"))
+    implementation(project(":build-tools"))
 
     implementation(libs.zip4j)
     implementation(libs.markdownj.core)

diff --git a/...n/kotlin/org/worldcubeassociation/tnoodle/server/routing/statics/StaticResourceHandler.kt b/...n/kotlin/org/worldcubeassociation/tnoodle/server/routing/statics/StaticResourceHandler.kt
@@ -3,27 +3,28 @@ package org.worldcubeassociation.tnoodle.server.routing.statics
 import io.ktor.server.http.content.*
 import io.ktor.server.routing.*
 import org.worldcubeassociation.tnoodle.core.RouteHandler
+import org.worldcubeassociation.tnoodle.core.util.FrontendUtil.FRONTEND_BINDING_PACKAGE
 
 object StaticResourceHandler : RouteHandler {
     override fun install(router: Route) {
         router.static {
-            resource("robots.txt", "wca/tnoodle-ui/robots.txt")
+            resource("robots.txt", "$FRONTEND_BINDING_PACKAGE/robots.txt")
         }
 
         router.static("css") {
             resources("css")
         }
 
         router.static("scramble") {
-            resources("wca/tnoodle-ui")
-            defaultResource("wca/tnoodle-ui/index.html")
+            resources(FRONTEND_BINDING_PACKAGE)
+            defaultResource("$FRONTEND_BINDING_PACKAGE/index.html")
 
             static("static") {
-                resources("wca/tnoodle-ui/static")
+                resources("$FRONTEND_BINDING_PACKAGE/static")
             }
 
             static("oauth") {
-                resource("*", "wca/tnoodle-ui/index.html")
+                resource("*", "$FRONTEND_BINDING_PACKAGE/index.html")
             }
         }
 

diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
@@ -1,5 +1,7 @@
 import com.github.gradle.node.NodeExtension
 
+import org.worldcubeassociation.tnoodle.build.FrontendBindings.PACKAGE_ROOT
+
 description = "A web ui for TNoodle that uses modern technology"
 
 plugins {
@@ -60,7 +62,7 @@ tasks.create<Zip>("packageReactFrontend") {
         include("robots.txt")
         include("manifest.json")
 
-        into("wca/tnoodle-ui")
+        into(PACKAGE_ROOT)
     }
 }