diff --git a/.gitignore b/.gitignore index b2300d2..c60be72 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,4 @@ src-tauri/flamegraph.svg src-tauri/perf* /*.AppImage -/squashfs-root - -/target/ +/squashfs-root \ No newline at end of file diff --git a/README.md b/README.md index 662712b..f66cea8 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,29 @@ -# Drop Desktop Client +# Drop App -The Drop Desktop Client is the companion app for [Drop](https://github.com/Drop-OSS/drop). It is the official & intended way to download and play games on your Drop server. +Drop app is the companion app for [Drop](https://github.com/Drop-OSS/drop). It uses a Tauri base with Nuxt 3 + TailwindCSS on top of it, so we can re-use components from the web UI. -## Internals +## Running +Before setting up the drop app, be sure that you have a server set up. +The instructions for this can be found on the [Drop Docs](https://docs.droposs.org/docs/guides/quickstart) -It uses a Tauri base with Nuxt 3 + TailwindCSS on top of it, so we can re-use components from the web UI. +## Current features +Currently supported are the following features: +- Signin (with custom server) +- Database registering & recovery +- Dynamic library fetching from server +- Installing & uninstalling games +- Download progress monitoring +- Launching / playing games ## Development -Before setting up a development environemnt, be sure that you have a server set up. The instructions for this can be found on the [Drop Docs](https://docs.droposs.org/docs/guides/quickstart). -Then, install dependencies with `yarn`. This'll install the custom builder's dependencies. Then, check everything works properly with `yarn tauri build`. +Install dependencies with `yarn` -Run the app in development with `yarn tauri dev`. NVIDIA users on Linux, use shell script `./nvidia-prop-dev.sh` +Run the app in development with `yarn tauri dev`. NVIDIA users on Linux, use shell script `./nvidia-prop-dev.sh` To manually specify the logging level, add the environment variable `RUST_LOG=[debug, info, warn, error]` to `yarn tauri dev`: e.g. `RUST_LOG=debug yarn tauri dev` ## Contributing -Check out the contributing guide on our Developer Docs: [Drop Developer Docs - Contributing](https://developer.droposs.org/contributing). +Check the original [Drop repo](https://github.com/Drop-OSS/drop/blob/main/CONTRIBUTING.md) for contributing guidelines. \ No newline at end of file diff --git a/build.mjs b/build.mjs index 051b850..c4846f1 100644 --- a/build.mjs +++ b/build.mjs @@ -21,13 +21,6 @@ async function spawn(exec, opts) { }); } -const expectedLibs = ["drop-base/package.json"]; - -for (const lib of expectedLibs) { - const path = `./libs/${lib}`; - if (!fs.existsSync(path)) throw `Missing "${expectedLibs}". Run "git submodule update --init --recursive"`; -} - const views = fs.readdirSync(".").filter((view) => { const expectedPath = `./${view}/package.json`; return fs.existsSync(expectedPath); diff --git a/main/app.vue b/main/app.vue index 1594dd6..7d4165f 100644 --- a/main/app.vue +++ b/main/app.vue @@ -1,5 +1,5 @@ diff --git a/main/composables/downloads.ts b/main/composables/downloads.ts index f9ab1cd..d75c46f 100644 --- a/main/composables/downloads.ts +++ b/main/composables/downloads.ts @@ -32,5 +32,3 @@ listen("update_stats", (event) => { const stats = useStatsState(); stats.value = event.payload as StatsState; }); - -export const useDownloadHistory = () => useState>('history', () => []); \ No newline at end of file diff --git a/main/pages/queue.vue b/main/pages/queue.vue index 30eb886..8d5c4ef 100644 --- a/main/pages/queue.vue +++ b/main/pages/queue.vue @@ -4,18 +4,18 @@ class="h-16 overflow-hidden relative rounded-xl flex flex-row border border-zinc-900" >
- {{ formatKilobytes(stats.speed) }}B/s - {{ formatKilobytes(stats.speed) }}/s + {{ formatTime(stats.time) }} left
-
+
@@ -62,9 +62,9 @@ class="mt-2 inline-flex items-center gap-x-1 text-zinc-400 text-sm font-display" >{{ formatKilobytes(element.current / 1000) - }}B + }} / - {{ formatKilobytes(element.max / 1000) }}B{{ formatKilobytes(element.max / 1000) }}
@@ -91,7 +91,7 @@