prepare for integration with Equinox

.github/workflows/build_pull_request.yml

@@ -55,7 +55,7 @@ jobs:
         with:
           path: |
             **/react/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/webUI/yarn.lock') }}
 
       - name: Build and copy webUI, Build Jar
         uses: eskatos/gradle-command-action@v1

.github/workflows/build_push.yml

@@ -57,7 +57,7 @@ jobs:
         with:
           path: |
             **/react/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/webUI/yarn.lock') }}
 
       - name: Build and copy webUI, Build Jar
         uses: eskatos/gradle-command-action@v1

.github/workflows/publish.yml

@@ -56,7 +56,7 @@ jobs:
         with:
           path: |
             **/react/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/react/webUI.lock') }}
 
       - name: Build and copy webUI, Build Jar
         uses: eskatos/gradle-command-action@v1

.gitignore

@@ -6,7 +6,7 @@ gradle.properties
 # Ignore Gradle build output directory
 build
 
-server/src/main/resources/react
+server/src/main/resources/webUI
 server/tmp/
 server/tachiserver-data/
 

server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt

@@ -35,12 +35,12 @@ object JavalinSetup {
         val app = Javalin.create { config ->
             try {
                 // if the bellow line throws an exception then webUI is not bundled
-                this::class.java.getResource("/react/index.html")
+                this::class.java.getResource("/webUI/index.html")
 
                 // no exception so we can tell javalin to serve webUI
                 hasWebUiBundled = true
-                config.addStaticFiles("/react")
-                config.addSinglePageRoot("/", "/react/index.html")
+                config.addStaticFiles("/webUI")
+                config.addSinglePageRoot("/", "/webUI/index.html")
             } catch (e: RuntimeException) {
                 logger.warn("react build files are missing.")
                 hasWebUiBundled = false

webUI/build.gradle.kts

@@ -2,15 +2,15 @@ plugins {
     id("com.github.node-gradle.node") version "3.0.1"
 }
 
-val nodeRoot = "${project.projectDir}/react"
+val nodeRoot = "${project.projectDir}/src"
 node {
     nodeProjectDir.set(file(nodeRoot))
 }
 
 tasks {
     register<Copy>("copyBuild") {
         from(file("$nodeRoot/build"))
-        into(file("$rootDir/server/src/main/resources/react"))
+        into(file("$rootDir/server/src/main/resources/webUI"))
 
         dependsOn("yarn_build")
     }