From 2c5ac1b733739689bb1874ff4a9b8d8533c9a790 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Wed, 20 Jan 2021 03:17:43 +0330 Subject: [PATCH 1/9] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0990918..051e1dc 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,11 @@ This project has two components: Download [android.jar](https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar) and put it under `AndroidCompat/lib`. #### Building from source(needs `bash`, `curl`, `base64`, `zip` to work) run `scripts/getAndroid.sh` from project's root directory to download and rebuild the jar file from Google's repository. +### building the jar +run `./gradlew :server:fatJar` the resulting jar file will be `server/build/server-1.0-all.jar`. Simply double click on it or run `java -jar server-1.0-all.jar`. The server will be running on `http://localhost:4567` open this url in your browser. +## running for development purposes ### The Server -run `./gradlew :server:run` to run the server +run `./gradlew :server:run -x :webUI:yarn_build --stacktrace` to run the server ### the webUI how to do it is described in `webUI/react/README.md` but for short, first cd into `webUI/react` then run `yarn` to install the node modules(do this only once) From 76469c550f7c016f1f78d6edfa2a10d191efad5c Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Wed, 20 Jan 2021 03:19:45 +0330 Subject: [PATCH 2/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 051e1dc..aecf0a9 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ how to do it is described in `webUI/react/README.md` but for short, then `yarn start` to start the client if a new browser window doesn't start automatically, then open `http://127.0.0.1:3000` in a modern browser. -## Can I use this application? +## Is the application usable? Should I test it? Checkout [the state of project](https://github.com/AriaMoradi/Tachidesk/issues/2) to see what's implemented. ## License From ef3532357ff08f99589660fe6b515b9402a0b720 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Wed, 20 Jan 2021 03:41:22 +0330 Subject: [PATCH 3/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aecf0a9..5b3097f 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ run `scripts/getAndroid.sh` from project's root directory to download and rebuil run `./gradlew :server:fatJar` the resulting jar file will be `server/build/server-1.0-all.jar`. Simply double click on it or run `java -jar server-1.0-all.jar`. The server will be running on `http://localhost:4567` open this url in your browser. ## running for development purposes ### The Server -run `./gradlew :server:run -x :webUI:yarn_build --stacktrace` to run the server +run `./gradlew :server:run -x :webUI:copyBuild --stacktrace` to run the server ### the webUI how to do it is described in `webUI/react/README.md` but for short, first cd into `webUI/react` then run `yarn` to install the node modules(do this only once) From f297e3790cc46a419129d698d8810bd0e93c870f Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Wed, 20 Jan 2021 03:42:01 +0330 Subject: [PATCH 4/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b3097f..1da2e8f 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Checkout [the state of project](https://github.com/AriaMoradi/Tachidesk/issues/2 ## License - Copyright (C) 2020 Aria Moradi + Copyright (C) 2020-2021 Aria Moradi This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this From 5f3ddbd1b2539d4bc56c307e92734bf1330f13fe Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Wed, 20 Jan 2021 12:24:47 +0330 Subject: [PATCH 5/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1da2e8f..6d1c391 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Download [android.jar](https://raw.githubusercontent.com/AriaMoradi/Tachidesk/an #### Building from source(needs `bash`, `curl`, `base64`, `zip` to work) run `scripts/getAndroid.sh` from project's root directory to download and rebuild the jar file from Google's repository. ### building the jar -run `./gradlew :server:fatJar` the resulting jar file will be `server/build/server-1.0-all.jar`. Simply double click on it or run `java -jar server-1.0-all.jar`. The server will be running on `http://localhost:4567` open this url in your browser. +run `./gradlew :server:shadowJar` the resulting jar file will be `server/build/server-1.0-all.jar`. Simply double click on it or run `java -jar server-1.0-all.jar`. The server will be running on `http://localhost:4567` open this url in your browser. ## running for development purposes ### The Server run `./gradlew :server:run -x :webUI:copyBuild --stacktrace` to run the server From 7dc7f4d905682da278712ca722a131d93500c566 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Thu, 21 Jan 2021 13:41:03 +0330 Subject: [PATCH 6/9] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6d1c391..1f7912a 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,10 @@ how to do it is described in `webUI/react/README.md` but for short, ## Is the application usable? Should I test it? Checkout [the state of project](https://github.com/AriaMoradi/Tachidesk/issues/2) to see what's implemented. +## Credit +The `AndroidCompat` and `scripts/getAndroid.sh` module is originally developed by [@null-dev](https://github.com/null-dev) for [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server) and is licensed under `Apache License Version 2.0`. +Also parts of [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into this codebase, also licensed under `Apache License Version 2.0`. + ## License Copyright (C) 2020-2021 Aria Moradi From 9e43645a67e605e532d838bb5bad31452378e05e Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Thu, 21 Jan 2021 13:42:17 +0330 Subject: [PATCH 7/9] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f7912a..b8161fd 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,8 @@ Checkout [the state of project](https://github.com/AriaMoradi/Tachidesk/issues/2 ## Credit The `AndroidCompat` and `scripts/getAndroid.sh` module is originally developed by [@null-dev](https://github.com/null-dev) for [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server) and is licensed under `Apache License Version 2.0`. -Also parts of [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into this codebase, also licensed under `Apache License Version 2.0`. + +Parts of [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into this codebase, also licensed under `Apache License Version 2.0`. ## License From 39850c71b03420f78e060466130175846d20ebd0 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Thu, 21 Jan 2021 13:58:15 +0330 Subject: [PATCH 8/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b8161fd..8190069 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Parts of [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into ## License - Copyright (C) 2020-2021 Aria Moradi + Copyright (C) 2020-2021 Aria Moradi and contributors This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this From 12765a771f85e5ee9ac9e3105152859b9b1d81bc Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Thu, 21 Jan 2021 13:58:49 +0330 Subject: [PATCH 9/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8190069..3af37fb 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ how to do it is described in `webUI/react/README.md` but for short, Checkout [the state of project](https://github.com/AriaMoradi/Tachidesk/issues/2) to see what's implemented. ## Credit -The `AndroidCompat` and `scripts/getAndroid.sh` module is originally developed by [@null-dev](https://github.com/null-dev) for [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server) and is licensed under `Apache License Version 2.0`. +The `AndroidCompat` module and `scripts/getAndroid.sh` was originally developed by [@null-dev](https://github.com/null-dev) for [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server) and is licensed under `Apache License Version 2.0`. Parts of [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into this codebase, also licensed under `Apache License Version 2.0`.