From 775b7fcd1eb8d8913fecd24002e2e422e8de3bc1 Mon Sep 17 00:00:00 2001 From: Zack Spear Date: Wed, 19 Jul 2023 18:15:34 -0700 Subject: [PATCH] refactor: apollo client creation + WIP subscriptions --- _data/serverState.ts | 2 +- components/UserProfile.ce.vue | 8 +- .../UserProfile/DropdownConnectStatus.vue | 9 +- components/UserProfile/DropdownItem.vue | 3 +- composables/gql/gql.ts | 45 ++++++++ composables/gql/graphql.ts | 68 ++++++++++- composables/services/apollo.ts | 64 ----------- package-lock.json | 7 ++ package.json | 1 + store/server.fragment.ts | 104 +++++++++++++++++ store/server.ts | 99 +++++++++++++++- store/unraidApi.ts | 107 ++++++++++++++++-- 12 files changed, 422 insertions(+), 95 deletions(-) delete mode 100644 composables/services/apollo.ts create mode 100644 store/server.fragment.ts diff --git a/_data/serverState.ts b/_data/serverState.ts index f5591684e..543dd8855 100644 --- a/_data/serverState.ts +++ b/_data/serverState.ts @@ -37,7 +37,7 @@ if (state === 'TRIAL') expireTime = Date.now() + 60 * 60 * 1000; // in 1 hour if (state === 'EEXPIRED') expireTime = uptime; // 1 hour ago const serverState = { - "apiKey": "XXXunupc_12312313123", + "apiKey": "unupc_fab6ff6ffe51040595c6d9ffb63a353ba16cc2ad7d93f813a2e80a5810", "avatar": "https://source.unsplash.com/300x300/?portrait", "config": { // error: 'INVALID', diff --git a/components/UserProfile.ce.vue b/components/UserProfile.ce.vue index 92ce97de4..215f38d61 100644 --- a/components/UserProfile.ce.vue +++ b/components/UserProfile.ce.vue @@ -66,12 +66,8 @@ onBeforeMount(() => { if (typeof props.server === 'object') { // Handles the testing dev Vue component serverStore.setServer(props.server); } else if (typeof props.server === 'string') { // Handle web component - try { - const parsedServerProp = JSON.parse(props.server); - serverStore.setServer(parsedServerProp); - } catch (e) { - console.error(e); - } + const parsedServerProp = JSON.parse(props.server); + serverStore.setServer(parsedServerProp); } /** * Listen for callbacks, if we receive one that needs to be acted upon the store will display diff --git a/components/UserProfile/DropdownConnectStatus.vue b/components/UserProfile/DropdownConnectStatus.vue index 0520433eb..5aaf63416 100644 --- a/components/UserProfile/DropdownConnectStatus.vue +++ b/components/UserProfile/DropdownConnectStatus.vue @@ -1,5 +1,10 @@