@@ -101,6 +126,10 @@ import { invoke } from "@tauri-apps/api/core";
const loading = ref(false);
const error = ref();
+const offerManual = ref(false);
+const manualToken = ref("");
+const manualLoading = ref(false);
+
async function auth() {
await invoke("auth_initiate");
}
@@ -111,5 +140,23 @@ function authWrapper_wrapper() {
loading.value = false;
error.value = e;
});
+ setTimeout(() => {
+ offerManual.value = true;
+ }, 10000);
+}
+
+async function continueManual() {
+ await invoke("manual_recieve_handshake", { token: manualToken.value });
+}
+
+function continueManual_wrapper() {
+ loading.value = true;
+ continueManual()
+ .catch((e) => {
+ error.value = e;
+ })
+ .finally(() => {
+ loading.value = false;
+ });
}
diff --git a/components/PageWidget.vue b/components/PageWidget.vue
new file mode 100644
index 0000000..ad9428b
--- /dev/null
+++ b/components/PageWidget.vue
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/composables/downloads.ts b/composables/downloads.ts
new file mode 100644
index 0000000..55de7fb
--- /dev/null
+++ b/composables/downloads.ts
@@ -0,0 +1,28 @@
+import { listen } from "@tauri-apps/api/event";
+import type { DownloadableMetadata } from "~/types";
+
+export type QueueState = {
+ queue: Array<{ meta: DownloadableMetadata; status: string; progress: number | null }>;
+ status: string;
+};
+
+export type StatsState = {
+ speed: number; // Bytes per second
+ time: number; // Seconds,
+};
+
+export const useQueueState = () =>
+ useState("queue", () => ({ queue: [], status: "Unknown" }));
+
+export const useStatsState = () =>
+ useState("stats", () => ({ speed: 0, time: 0 }));
+
+listen("update_queue", (event) => {
+ const queue = useQueueState();
+ queue.value = event.payload as QueueState;
+});
+
+listen("update_stats", (event) => {
+ const stats = useStatsState();
+ stats.value = event.payload as StatsState;
+});
\ No newline at end of file
diff --git a/composables/game.ts b/composables/game.ts
index 7f28435..0335a7a 100644
--- a/composables/game.ts
+++ b/composables/game.ts
@@ -12,7 +12,8 @@ export type SerializedGameStatus = [
OptionGameStatus | null
];
-const parseStatus = (status: SerializedGameStatus): GameStatus => {
+export const parseStatus = (status: SerializedGameStatus): GameStatus => {
+ console.log(status);
if (status[0]) {
return {
type: status[0].type,
@@ -28,28 +29,29 @@ const parseStatus = (status: SerializedGameStatus): GameStatus => {
}
};
-export const useGame = async (id: string) => {
- if (!gameRegistry[id]) {
+export const useGame = async (gameId: string) => {
+ if (!gameRegistry[gameId]) {
const data: { game: Game; status: SerializedGameStatus } = await invoke(
"fetch_game",
{
- id,
+ gameId,
}
);
- gameRegistry[id] = data.game;
- if (!gameStatusRegistry[id]) {
- gameStatusRegistry[id] = ref(parseStatus(data.status));
+ gameRegistry[gameId] = data.game;
+ if (!gameStatusRegistry[gameId]) {
+ gameStatusRegistry[gameId] = ref(parseStatus(data.status));
- listen(`update_game/${id}`, (event) => {
+ listen(`update_game/${gameId}`, (event) => {
const payload: {
status: SerializedGameStatus;
} = event.payload as any;
- gameStatusRegistry[id].value = parseStatus(payload.status);
+ console.log(payload.status);
+ gameStatusRegistry[gameId].value = parseStatus(payload.status);
});
}
}
- const game = gameRegistry[id];
- const status = gameStatusRegistry[id];
+ const game = gameRegistry[gameId];
+ const status = gameStatusRegistry[gameId];
return { game, status };
-};
+};
\ No newline at end of file
diff --git a/composables/generateGameMeta.ts b/composables/generateGameMeta.ts
new file mode 100644
index 0000000..fdfc4b7
--- /dev/null
+++ b/composables/generateGameMeta.ts
@@ -0,0 +1,9 @@
+import { type DownloadableMetadata, DownloadableType } from '~/types'
+
+export default function generateGameMeta(gameId: string, version: string): DownloadableMetadata {
+ return {
+ id: gameId,
+ version,
+ downloadType: DownloadableType.Game
+ }
+}
\ No newline at end of file
diff --git a/composables/queue.ts b/composables/queue.ts
deleted file mode 100644
index 0487260..0000000
--- a/composables/queue.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { listen } from "@tauri-apps/api/event";
-
-export type QueueState = {
- queue: Array<{ id: string; status: string, progress: number | null }>;
-};
-
-export const useQueueState = () =>
- useState("queue", () => ({ queue: [] }));
-
-listen("update_queue", (event) => {
- const queue = useQueueState();
- queue.value = event.payload as QueueState;
-});
diff --git a/composables/state-navigation.ts b/composables/state-navigation.ts
index 790d258..f7a9b4b 100644
--- a/composables/state-navigation.ts
+++ b/composables/state-navigation.ts
@@ -1,4 +1,5 @@
import { listen } from "@tauri-apps/api/event";
+import { data } from "autoprefixer";
import { AppStatus, type AppState } from "~/types";
export function setupHooks() {
@@ -18,6 +19,20 @@ export function setupHooks() {
router.push("/store");
});
+ listen("download_error", (event) => {
+ createModal(
+ ModalType.Notification,
+ {
+ title: "Drop encountered an error while downloading",
+ description: `Drop encountered an error while downloading your game: "${(
+ event.payload as unknown as string
+ ).toString()}"`,
+ buttonText: "Close"
+ },
+ (e, c) => c()
+ );
+ });
+
/*
document.addEventListener("contextmenu", (event) => {
diff --git a/package.json b/package.json
index 7226f0f..c3f715d 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,9 @@
"@tauri-apps/api": ">=2.0.0",
"@tauri-apps/plugin-deep-link": "~2",
"@tauri-apps/plugin-dialog": "^2.0.1",
+ "@tauri-apps/plugin-os": "~2",
"@tauri-apps/plugin-shell": ">=2.0.0",
"markdown-it": "^14.1.0",
- "moment": "^2.30.1",
"nuxt": "^3.13.0",
"scss": "^0.2.4",
"vue": "latest",
diff --git a/pages/account.vue b/pages/account.vue
new file mode 100644
index 0000000..6a072de
--- /dev/null
+++ b/pages/account.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
diff --git a/pages/library.vue b/pages/library.vue
index 8acd519..925addb 100644
--- a/pages/library.vue
+++ b/pages/library.vue
@@ -1,34 +1,31 @@
+
+
+ + Account +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sign out
++ Sign out of your Drop account on this device +
+
+
+
+
+
+
+
+
+
+ + {{ error }} +
+
-
+
- +
-
-@@ -30,31 +35,20 @@
+
-
+ - {{ games[element.id].game.mName }} + {{ games[element.meta.id].game.mName }} - {{ games[element.id].game.mShortDescription }} + {{ games[element.meta.id].game.mShortDescription }}
{{ element.status }}
-- +-+
+
![]()
-
@@ -41,16 +38,26 @@
diff --git a/pages/queue.vue b/pages/queue.vue
index 6572203..d78967c 100644
--- a/pages/queue.vue
+++ b/pages/queue.vue
@@ -1,27 +1,32 @@
-
-
+ - {{ nav.label }} -
-+ {{ nav.label }} +
+
+
+
-
+
+ {{ formatKilobytes(stats.speed) }}
+ {{ formatTime(stats.time) }} left
+
+
+
+
+
+ Loading...
-
+
@@ -63,23 +57,68 @@
diff --git a/pages/settings.vue b/pages/settings.vue
index 1e92a0f..3c39c65 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -9,25 +9,18 @@
No items in the queue
+
+ Download Settings +
++ Configure how Drop downloads games and other content. +
+ +
+
+
+
+
+
+
+ + The maximum number of concurrent download threads. Higher values may download faster but use more system resources. Default is 4. +
+
+
+
+