From 1f5351eeaf7ed3c618baac4f71038cfa0aa7c463 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Thu, 24 Dec 2020 02:08:03 +0330 Subject: [PATCH] remove TachiWeb-React from root --- .gitmodules | 3 --- TachiWeb-React | 1 - app/build.gradle.kts | 3 +++ .../main/kotlin/ir/armor/tachidesk/Main.kt | 20 +++++++++++-------- settings.gradle.kts | 4 +++- webUI/build.gradle.kts | 8 ++++++++ 6 files changed, 26 insertions(+), 13 deletions(-) delete mode 100644 .gitmodules delete mode 160000 TachiWeb-React create mode 100644 webUI/build.gradle.kts diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 6a8162b5..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "TachiWeb-React"] - path = TachiWeb-React - url = git@github.com:AriaMoradi/TachiWeb-React.git diff --git a/TachiWeb-React b/TachiWeb-React deleted file mode 160000 index ae54272a..00000000 --- a/TachiWeb-React +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ae54272a53671345d71d13b969ba92812a96d2ab diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7389b663..554f7345 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -63,6 +63,9 @@ dependencies { // dex2jar implementation(fileTree("lib/dex2jar/")) + // api + implementation("io.javalin:javalin:3.12.0") + testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("org.jetbrains.kotlin:kotlin-test-junit") diff --git a/app/src/main/kotlin/ir/armor/tachidesk/Main.kt b/app/src/main/kotlin/ir/armor/tachidesk/Main.kt index 6d9e3a1e..ed329aa2 100644 --- a/app/src/main/kotlin/ir/armor/tachidesk/Main.kt +++ b/app/src/main/kotlin/ir/armor/tachidesk/Main.kt @@ -1,22 +1,20 @@ package ir.armor.tachidesk -import com.googlecode.d2j.dex.Dex2jar -import com.googlecode.d2j.reader.DexFileReader import com.googlecode.dex2jar.tools.Dex2jarCmd import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi import eu.kanade.tachiyomi.network.NetworkHelper -import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.online.HttpSource +import io.javalin.Javalin +import io.javalin.http.Context import kotlinx.coroutines.runBlocking import okhttp3.Request -import okio.BufferedSink import okio.buffer import okio.sink import java.io.File import java.net.URL import java.net.URLClassLoader -import kotlin.system.exitProcess + class Main { companion object { @@ -33,9 +31,8 @@ class Main { sink.close() } - @JvmStatic - fun main(args: Array) { + fun testExtensionExecution(){ File(contentRoot).mkdirs() var sourcePkg = "" @@ -72,7 +69,14 @@ class Main { mangasPage.mangas.forEach { println(it.title) } - exitProcess(0) +// exitProcess(0) + } + + + @JvmStatic + fun main(args: Array) { + val app = Javalin.create().start(7000) + app["/", { ctx: Context -> ctx.result("Hello World") }] } } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 7c81f89b..5f80a9ee 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,5 @@ rootProject.name = "Tachidesk" -include("app") \ No newline at end of file +include("app") + +include("webUI") \ No newline at end of file diff --git a/webUI/build.gradle.kts b/webUI/build.gradle.kts new file mode 100644 index 00000000..3443d065 --- /dev/null +++ b/webUI/build.gradle.kts @@ -0,0 +1,8 @@ +plugins { + id("com.moowork.node") version "1.3.1" +} + +node { + workDir = file("${project.projectDir}/webUI/TachiWeb-React") + nodeModulesDir = file("${project.projectDir}/webUI/TachiWeb-React/node_modules") +} \ No newline at end of file