From 9b6f54fc14795f1c4f677fb780b3744bf8fee434 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 22 Sep 2022 18:07:50 +0200 Subject: [PATCH 01/12] feat: dashboard screen --- src/lib/layout/container.svelte | 9 +- .../console/project-[project]/+layout.svelte | 2 +- .../console/project-[project]/+page.svelte | 80 ------- src/routes/console/project-[project]/+page.ts | 7 + .../project-[project]/overview/+layout.svelte | 222 ++++++++++++++++++ .../project-[project]/overview/+page.ts | 7 + .../overview/keys/+page.svelte | 57 +++++ .../keys/[key]/+page@project-[project].svelte | 50 ++++ .../overview/keys/[key]/store.ts | 17 ++ .../overview/platforms/+page.svelte | 51 ++++ .../[platform]/+page@project-[project].svelte | 50 ++++ .../overview/platforms/[platform]/store.ts | 17 ++ .../platforms/create.svelte} | 2 +- 13 files changed, 488 insertions(+), 83 deletions(-) delete mode 100644 src/routes/console/project-[project]/+page.svelte create mode 100644 src/routes/console/project-[project]/+page.ts create mode 100644 src/routes/console/project-[project]/overview/+layout.svelte create mode 100644 src/routes/console/project-[project]/overview/+page.ts create mode 100644 src/routes/console/project-[project]/overview/keys/+page.svelte create mode 100644 src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte create mode 100644 src/routes/console/project-[project]/overview/keys/[key]/store.ts create mode 100644 src/routes/console/project-[project]/overview/platforms/+page.svelte create mode 100644 src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte create mode 100644 src/routes/console/project-[project]/overview/platforms/[platform]/store.ts rename src/routes/console/project-[project]/{_createPlatform.svelte => overview/platforms/create.svelte} (96%) diff --git a/src/lib/layout/container.svelte b/src/lib/layout/container.svelte index f09a95b8f..53b395d12 100644 --- a/src/lib/layout/container.svelte +++ b/src/lib/layout/container.svelte @@ -1,3 +1,10 @@ -
+ + +
diff --git a/src/routes/console/project-[project]/+layout.svelte b/src/routes/console/project-[project]/+layout.svelte index 6630b35e1..1fc2d60d8 100644 --- a/src/routes/console/project-[project]/+layout.svelte +++ b/src/routes/console/project-[project]/+layout.svelte @@ -70,7 +70,7 @@ level: 0 }, { - href: `project-${$project.$id}`, + href: `project-${$project.$id}/overview`, title: $project.name } ] diff --git a/src/routes/console/project-[project]/+page.svelte b/src/routes/console/project-[project]/+page.svelte deleted file mode 100644 index 2a2413d70..000000000 --- a/src/routes/console/project-[project]/+page.svelte +++ /dev/null @@ -1,80 +0,0 @@ - - - - Appwrite - Console - - -{#if $project} - - - - -

Platforms

- - {#each $project.platforms as platform} - - -

- - {platform.name} - -

-
- - {platform.hostname} - - - - -
- {:else} - - No Platforms Added to Your Project -

Add your first platform and build your new application.

-
- {/each} - - -
-
-{/if} diff --git a/src/routes/console/project-[project]/+page.ts b/src/routes/console/project-[project]/+page.ts new file mode 100644 index 000000000..05525234d --- /dev/null +++ b/src/routes/console/project-[project]/+page.ts @@ -0,0 +1,7 @@ +import { redirect } from '@sveltejs/kit'; +import { base } from '$app/paths'; +import type { PageLoad } from './$types'; + +export const load: PageLoad = async ({ params }) => { + throw redirect(302, `${base}/console/project-${params.project}/overview`); +}; diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte new file mode 100644 index 000000000..00e1078ef --- /dev/null +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -0,0 +1,222 @@ + + + + Appwrite - Console + + +{#if $project} + + {#await usage then response} +
+
+
+
+
+
+ {total(response.network)} + KB +
+
Bandwidth
+
+
+ +
+
+
+
+
+
+
+ {format(total(response.requests))} +
+
Requests
+
+
+ +
+
+
+
+
+
+
+
+
+ +
+ +
+
XX
+
Databases
+
+ +
+
Documents: {last(response.documents).value}
+
+
+
+
+
+
+
+
+
+ +
+ +
+
+ 8.0 MB +
+
Users
+
+ +
+
Buckets: XX
+
+
+
+
+
+
+
+
+
+ +
+ +
+
+ {format(last(response.users).value)} +
+
Users
+
+ +
+
Sessions: XX
+
+
+
+
+
+
+
+
+
+ +
+ +
+
+ {format(last(response.functions).value)} +
+
Executions
+
+ +
+
+
+
+
+
+
10
+
Realtime Connections
+
+
+
+ {/await} + +
+

Integrations

+
+ + + +
+ +
+ +
+
+
+{/if} + + diff --git a/src/routes/console/project-[project]/overview/+page.ts b/src/routes/console/project-[project]/overview/+page.ts new file mode 100644 index 000000000..2213c6d74 --- /dev/null +++ b/src/routes/console/project-[project]/overview/+page.ts @@ -0,0 +1,7 @@ +import { base } from '$app/paths'; +import { redirect } from '@sveltejs/kit'; +import type { PageLoad } from './$types'; + +export const load: PageLoad = async ({ params }) => { + throw redirect(302, `${base}/console/project-${params.project}/overview/platforms`); +}; diff --git a/src/routes/console/project-[project]/overview/keys/+page.svelte b/src/routes/console/project-[project]/overview/keys/+page.svelte new file mode 100644 index 000000000..5dfb63b21 --- /dev/null +++ b/src/routes/console/project-[project]/overview/keys/+page.svelte @@ -0,0 +1,57 @@ + + +

API Keys

+ + + + Name + last accessed + expiration date + clients + + + {#each $project.keys as key} + + + {key.name} + + + {toLocaleDateTime(key.$createdAt)} + + + {toLocaleDateTime(key.$updatedAt)} + + + + {/each} + +
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte new file mode 100644 index 000000000..687d4e379 --- /dev/null +++ b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte @@ -0,0 +1,50 @@ + + + + Appwrite - API Key + + +{#if loaded} + +{/if} diff --git a/src/routes/console/project-[project]/overview/keys/[key]/store.ts b/src/routes/console/project-[project]/overview/keys/[key]/store.ts new file mode 100644 index 000000000..8b29e0e74 --- /dev/null +++ b/src/routes/console/project-[project]/overview/keys/[key]/store.ts @@ -0,0 +1,17 @@ +import { sdkForConsole } from '$lib/stores/sdk'; +import type { Models } from '@aw-labs/appwrite-console'; +import { cachedStore } from '$lib/helpers/cache'; + +export const key = cachedStore< + Models.Key, + { + load: (projectId: string, keyId: string) => Promise; + } +>('key', function ({ set }) { + return { + load: async (projectId, keyId) => { + const key = await sdkForConsole.projects.getKey(projectId, keyId); + set(key); + } + }; +}); diff --git a/src/routes/console/project-[project]/overview/platforms/+page.svelte b/src/routes/console/project-[project]/overview/platforms/+page.svelte new file mode 100644 index 000000000..d5cb7c93a --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/+page.svelte @@ -0,0 +1,51 @@ + + +

+ Platforms + +

+ + diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte new file mode 100644 index 000000000..cc57f5300 --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte @@ -0,0 +1,50 @@ + + + + Appwrite - Platform + + +{#if loaded} + +{/if} diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/store.ts b/src/routes/console/project-[project]/overview/platforms/[platform]/store.ts new file mode 100644 index 000000000..cd0ea032e --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/store.ts @@ -0,0 +1,17 @@ +import { sdkForConsole } from '$lib/stores/sdk'; +import type { Models } from '@aw-labs/appwrite-console'; +import { cachedStore } from '$lib/helpers/cache'; + +export const platform = cachedStore< + Models.Platform, + { + load: (projectId: string, platformId: string) => Promise; + } +>('platform', function ({ set }) { + return { + load: async (projectId, platformId) => { + const platform = await sdkForConsole.projects.getPlatform(projectId, platformId); + set(platform); + } + }; +}); diff --git a/src/routes/console/project-[project]/_createPlatform.svelte b/src/routes/console/project-[project]/overview/platforms/create.svelte similarity index 96% rename from src/routes/console/project-[project]/_createPlatform.svelte rename to src/routes/console/project-[project]/overview/platforms/create.svelte index 4da749b3a..f0a2b5068 100644 --- a/src/routes/console/project-[project]/_createPlatform.svelte +++ b/src/routes/console/project-[project]/overview/platforms/create.svelte @@ -3,7 +3,7 @@ import { InputText, Button, Form } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; - import { project } from './store'; + import { project } from '../../.../../store'; export let show = false; From 971a99c92834d185a05700e7552e3c51060196d0 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 22 Sep 2022 18:09:53 +0200 Subject: [PATCH 02/12] fix: is-selected on nav for overview --- src/lib/layout/navigation.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index 52b33aaa5..056017792 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -14,7 +14,7 @@
  • +
  • + diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte index cc57f5300..26e0b151e 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte @@ -2,14 +2,46 @@ import { afterNavigate } from '$app/navigation'; import { base } from '$app/paths'; import { page } from '$app/stores'; + import { CardGrid } from '$lib/components'; + import { Button, Form, FormList, InputText } from '$lib/elements/forms'; + import { Container } from '$lib/layout'; import { updateLayout } from '$lib/stores/layout'; - import { onMount } from 'svelte'; + import { addNotification } from '$lib/stores/notifications'; + import { sdkForConsole } from '$lib/stores/sdk'; + import { onMount, SvelteComponent } from 'svelte'; + import { project } from '../../../store'; import { platform } from './store'; + import Delete from './delete.svelte'; + import Web from './web.svelte'; + import FlutterIos from './flutterIOS.svelte'; + import FlutterAndroid from './flutterAndroid.svelte'; + import FlutterLinux from './flutterLinux.svelte'; + import FlutterMacOs from './flutterMacOS.svelte'; + import FlutterWindows from './flutterWindows.svelte'; + import AppleiOs from './appleIOS.svelte'; + import AppleMacOs from './appleMacOS.svelte'; + import AppleWatchOs from './appleWatchOS.svelte'; + import AppleTvos from './appleTvOS.svelte'; const projectId = $page.params.project; const platformId = $page.params.platform; + const types: Record = { + web: Web, + android: Web, + 'apple-ios': AppleiOs, + 'apple-macos': AppleMacOs, + 'apple-watchos': AppleWatchOs, + 'apple-tvos': AppleTvos, + 'flutter-ios': FlutterIos, + 'flutter-android': FlutterAndroid, + 'flutter-linux': FlutterLinux, + 'flutter-macos': FlutterMacOs, + 'flutter-windows': FlutterWindows + }; let loaded = false; + let showDelete = false; + let name: string = null; onMount(handle); afterNavigate(handle); @@ -19,9 +51,11 @@ await platform.load(projectId, platformId); } + name ??= $platform.name; + updateLayout({ navigate: event, - back: `${base}/console/project-${$page.params.project}/overview/platforms`, + back: `${base}/console/project-${projectId}/overview/platforms`, title: $platform.name, level: 4, breadcrumbs: [ @@ -39,12 +73,73 @@ }); loaded = true; } + + const updateName = async () => { + try { + await sdkForConsole.projects.updatePlatform($project.$id, $platform.$id, name); + project.load($project.$id); + addNotification({ + type: 'success', + message: 'Platform name has been updated' + }); + } catch (error) { + addNotification({ + type: 'error', + message: error.message + }); + } + }; - - Appwrite - Platform - + + {#if loaded} +
    + +
    Update Name
    +

    + Choose any name that will help you distinguish between platforms. +

    + + + + + -{#if loaded} - -{/if} + + + +
    +
    + + + + +
    +
    Delete Platform
    +
    +

    The Platform will be permanently deleted. This action is irreversible.

    + +
    +
    + +
    +
    {$platform.name}
    +

    {$platform.hostname}

    +
    +
    +
    +
    + + + + +
    + {/if} +
    + + diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte new file mode 100644 index 000000000..14d34096b --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte @@ -0,0 +1,60 @@ + + +
    + +
    Update Bundle ID
    +

    + You can find your Bundle Identifier in the General tab for your app's primary target in + Xcode. +

    + + + + + + + + + +
    +
    diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte new file mode 100644 index 000000000..14d34096b --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte @@ -0,0 +1,60 @@ + + +
    + +
    Update Bundle ID
    +

    + You can find your Bundle Identifier in the General tab for your app's primary target in + Xcode. +

    + + + + + + + + + +
    +
    diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte new file mode 100644 index 000000000..14d34096b --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte @@ -0,0 +1,60 @@ + + +
    + +
    Update Bundle ID
    +

    + You can find your Bundle Identifier in the General tab for your app's primary target in + Xcode. +

    + + + + + + + + + +
    +
    diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte new file mode 100644 index 000000000..14d34096b --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte @@ -0,0 +1,60 @@ + + +
    + +
    Update Bundle ID
    +

    + You can find your Bundle Identifier in the General tab for your app's primary target in + Xcode. +

    + + + + + + + + + +
    +
    diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte new file mode 100644 index 000000000..1c1d4b637 --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte @@ -0,0 +1,42 @@ + + +
    + + Delete Platform +

    The Platform will be permanently deleted. This action is irreversible.

    + + + + + +
    +
    diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte new file mode 100644 index 000000000..f29907097 --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte @@ -0,0 +1,59 @@ + + +
    + +
    Update Package Name
    +

    + Your package name is generally the applicationId in your app-level build.gradle file. +

    + + + + + + + + + +
    +
    diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte new file mode 100644 index 000000000..14d34096b --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte @@ -0,0 +1,60 @@ + + +
    + +
    Update Bundle ID
    +

    + You can find your Bundle Identifier in the General tab for your app's primary target in + Xcode. +

    + + + + + + + + + +
    +
    diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte new file mode 100644 index 000000000..8323a7d6d --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte @@ -0,0 +1,57 @@ + + +
    + +
    Update Package Name
    +

    Your application name.

    + + + + + + + + + +
    +
    diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte new file mode 100644 index 000000000..14d34096b --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte @@ -0,0 +1,60 @@ + + +
    + +
    Update Bundle ID
    +

    + You can find your Bundle Identifier in the General tab for your app's primary target in + Xcode. +

    + + + + + + + + + +
    +
    diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte new file mode 100644 index 000000000..8323a7d6d --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte @@ -0,0 +1,57 @@ + + +
    + +
    Update Package Name
    +

    Your application name.

    + + + + + + + + + +
    +
    diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte new file mode 100644 index 000000000..2d1a7efd4 --- /dev/null +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte @@ -0,0 +1,59 @@ + + +
    + +
    Update Hostname
    +

    You can use * to allow wildcard hostnames or subdomains.

    + + + + + + + + + +
    +
    diff --git a/src/routes/console/project-[project]/overview/platforms/create.svelte b/src/routes/console/project-[project]/overview/platforms/create.svelte index f0a2b5068..11c0597f8 100644 --- a/src/routes/console/project-[project]/overview/platforms/create.svelte +++ b/src/routes/console/project-[project]/overview/platforms/create.svelte @@ -1,6 +1,6 @@
    Add Platform - - + + + + From a0d868e338e01921136e09fc8fd133f2091ca279 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 26 Sep 2022 12:56:12 +0200 Subject: [PATCH 05/12] fix: title --- .../console/project-[project]/overview/keys/+page.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/routes/console/project-[project]/overview/keys/+page.svelte b/src/routes/console/project-[project]/overview/keys/+page.svelte index e79b4733c..3bc3d726d 100644 --- a/src/routes/console/project-[project]/overview/keys/+page.svelte +++ b/src/routes/console/project-[project]/overview/keys/+page.svelte @@ -33,9 +33,8 @@ } -

    API Keys

    -

    Platforms

    +

    API Keys

    -
    + + changePeriod('24h')}> + 24h + + changePeriod('30d')}> + 30d + + changePeriod('90d')}> + 90d + + +
    - {format(total(response.requests))} + {format(total($usage.requests))}
    Requests
    @@ -106,7 +148,7 @@
    -
    Documents: {last(response.documents).value}
    +
    Documents: {last($usage.documents).value}
    @@ -146,7 +188,7 @@
    - {format(last(response.users).value)} + {format(last($usage.users).value)}
    Users
    @@ -169,7 +211,7 @@
    - {format(last(response.functions).value)} + {format(last($usage.functions).value)}
    Executions
    @@ -186,7 +228,7 @@ - {/await} + {/if}

    Integrations

    diff --git a/src/routes/console/project-[project]/overview/keys/+page.svelte b/src/routes/console/project-[project]/overview/keys/+page.svelte index 3bc3d726d..ebe4a4379 100644 --- a/src/routes/console/project-[project]/overview/keys/+page.svelte +++ b/src/routes/console/project-[project]/overview/keys/+page.svelte @@ -1,5 +1,4 @@
    diff --git a/src/routes/console/project-[project]/overview/platforms/+page.svelte b/src/routes/console/project-[project]/overview/platforms/+page.svelte index d9c32cc40..b679ee92e 100644 --- a/src/routes/console/project-[project]/overview/platforms/+page.svelte +++ b/src/routes/console/project-[project]/overview/platforms/+page.svelte @@ -1,32 +1,14 @@
    diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte index 26e0b151e..d90fa15e4 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte @@ -77,7 +77,7 @@ const updateName = async () => { try { await sdkForConsole.projects.updatePlatform($project.$id, $platform.$id, name); - project.load($project.$id); + $platform.name = name; addNotification({ type: 'success', message: 'Platform name has been updated' diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte index 14d34096b..7e59c89a6 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte @@ -21,7 +21,7 @@ $platform.name, key ); - project.load($project.$id); + $platform.key = key; addNotification({ type: 'success', message: 'Platform Bundle ID has been updated' diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte index 14d34096b..7e59c89a6 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte @@ -21,7 +21,7 @@ $platform.name, key ); - project.load($project.$id); + $platform.key = key; addNotification({ type: 'success', message: 'Platform Bundle ID has been updated' diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte index 14d34096b..7e59c89a6 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte @@ -21,7 +21,7 @@ $platform.name, key ); - project.load($project.$id); + $platform.key = key; addNotification({ type: 'success', message: 'Platform Bundle ID has been updated' diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte index 14d34096b..7e59c89a6 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte @@ -21,7 +21,7 @@ $platform.name, key ); - project.load($project.$id); + $platform.key = key; addNotification({ type: 'success', message: 'Platform Bundle ID has been updated' diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte index 1c1d4b637..d1bb5d3b4 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte @@ -19,6 +19,7 @@ message: `${$platform.name} has been deleted` }); project.load($project.$id); + platform.set(null); await goto(`${base}/console/project-${$project.$id}/overview/platforms`); } catch (error) { addNotification({ diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte index f29907097..a20b3d033 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte @@ -21,7 +21,7 @@ $platform.name, key ); - project.load($project.$id); + $platform.key = key; addNotification({ type: 'success', message: 'Platform Package Name has been updated' diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte index 14d34096b..7e59c89a6 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte @@ -21,7 +21,7 @@ $platform.name, key ); - project.load($project.$id); + $platform.key = key; addNotification({ type: 'success', message: 'Platform Bundle ID has been updated' diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte index 8323a7d6d..9a6ae1536 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte @@ -21,7 +21,7 @@ $platform.name, key ); - project.load($project.$id); + $platform.key = key; addNotification({ type: 'success', message: 'Platform Package Name has been updated' diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte index 14d34096b..7e59c89a6 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte @@ -21,7 +21,7 @@ $platform.name, key ); - project.load($project.$id); + $platform.key = key; addNotification({ type: 'success', message: 'Platform Bundle ID has been updated' diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte index 8323a7d6d..9a6ae1536 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte @@ -21,7 +21,7 @@ $platform.name, key ); - project.load($project.$id); + $platform.key = key; addNotification({ type: 'success', message: 'Platform Package Name has been updated' diff --git a/src/routes/console/project-[project]/overview/store.ts b/src/routes/console/project-[project]/overview/store.ts new file mode 100644 index 000000000..013b18a08 --- /dev/null +++ b/src/routes/console/project-[project]/overview/store.ts @@ -0,0 +1,18 @@ +import { sdkForConsole } from '$lib/stores/sdk'; +import { cachedStore } from '$lib/helpers/cache'; +import type { Models } from '@aw-labs/appwrite-console'; + +export type UsagePeriods = '24h' | '30d' | '90d'; +export const usage = cachedStore< + Models.UsageProject, + { + load: (projectId: string, range: UsagePeriods) => Promise; + } +>('projectUsage', function ({ set }) { + return { + load: async (projectId, range) => { + const usages = await sdkForConsole.projects.getUsage(projectId, range); + set(usages); + } + }; +}); From dba45982eb88d556088e349dc30595c5b3b68ace Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 26 Sep 2022 14:46:51 +0200 Subject: [PATCH 07/12] add droplist to requests usage --- .../project-[project]/overview/+layout.svelte | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index c7d468a87..49e8947a9 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -123,12 +123,30 @@
    Requests
    -
    - -
    + + changePeriod('24h')}> + 24h + + changePeriod('30d')}> + 30d + + changePeriod('90d')}> + 90d + + +
    From d748dc7405b33f2e0fc5b7cfed369b96b5276061 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 26 Sep 2022 14:51:55 +0200 Subject: [PATCH 08/12] fix: dashboard dropdown --- .../console/project-[project]/overview/+layout.svelte | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index 49e8947a9..e7918d0c8 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -15,7 +15,8 @@ $: path = `/console/project-${projectId}/overview`; let period: UsagePeriods = '30d'; - let showPeriod = false; + let showPeriodBandwith = false; + let showPerioRequests = false; onMount(handle); afterNavigate(handle); @@ -90,14 +91,14 @@
    Bandwidth
    @@ -124,14 +125,14 @@
    Requests
    From 42646312519fc2554420d12bedbd1c85ebe00638 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 26 Sep 2022 14:54:40 +0200 Subject: [PATCH 09/12] fix: dropdown reset --- src/routes/console/project-[project]/overview/+layout.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index e7918d0c8..7a36c381e 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -59,7 +59,8 @@ function changePeriod(newPeriod: UsagePeriods) { period = newPeriod; usage.load(projectId, period); - showPeriod = false; + showPeriodBandwith = false; + showPerioRequests = false; } if (browser) { From 0100db0c42ba867a8f69bd8cd9e3807c17a406c4 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 26 Sep 2022 14:55:34 +0200 Subject: [PATCH 10/12] fix: typo --- .../console/project-[project]/overview/+layout.svelte | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index 7a36c381e..10f60f441 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -16,7 +16,7 @@ let period: UsagePeriods = '30d'; let showPeriodBandwith = false; - let showPerioRequests = false; + let showPeriodRequests = false; onMount(handle); afterNavigate(handle); @@ -60,7 +60,7 @@ period = newPeriod; usage.load(projectId, period); showPeriodBandwith = false; - showPerioRequests = false; + showPeriodRequests = false; } if (browser) { @@ -126,14 +126,14 @@
    Requests
    From 491d6c8665c4834d8becf1e7d0d94033379dae42 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 26 Sep 2022 15:03:19 +0200 Subject: [PATCH 11/12] feat: add copy button for project and key --- src/routes/console/project-[project]/overview/+layout.svelte | 4 ++-- .../overview/keys/[key]/+page@project-[project].svelte | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index 10f60f441..665d9f6b7 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -33,8 +33,8 @@ backButton.set(''); copyData.set({ - text: '', - value: '' + text: 'Project ID', + value: $project.$id }); } diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte index 7fa472404..28a7b7c77 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte +++ b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte @@ -58,6 +58,10 @@ back: `${base}/console/project-${$page.params.project}/overview/keys`, title: $key.name, level: 4, + copy: { + text: 'API Key Secret', + value: $key.secret + }, breadcrumbs: [ { level: 3, From 27e98a80f9255d295020ec51fa6a6dcdf6c43daa Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 26 Sep 2022 15:06:40 +0200 Subject: [PATCH 12/12] fix: input for api keys --- .../overview/keys/[key]/+page@project-[project].svelte | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte index 28a7b7c77..f310dd54e 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte +++ b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte @@ -81,7 +81,7 @@ async function updateName() { try { await sdkForConsole.projects.updateKey($project.$id, $key.$id, name, $key.scopes); - project.load($project.$id); + $key.name = name; addNotification({ type: 'success', message: 'API Key name has been updated' @@ -103,7 +103,7 @@ $key.scopes, expire ); - project.load($project.$id); + $key.expire = expire; addNotification({ type: 'success', message: 'API Key expiration has been updated' @@ -125,7 +125,6 @@ $key.name, scopes.filter((scope) => activeScopes[scope]) ); - project.load($project.$id); addNotification({ type: 'success', message: 'API Key scopes has been updated'