From 2b8d4d9181d5607bdc5252241aa6347cc2584aab Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 17 Oct 2022 15:52:58 +0200 Subject: [PATCH 001/161] draft: onboarding --- src/lib/components/card.svelte | 13 +- src/lib/layout/shell.svelte | 12 +- src/lib/layout/wizard.svelte | 7 +- .../project-[project]/overview/+layout.svelte | 392 +++++++++--------- .../project-[project]/overview/onboard.svelte | 109 +++++ .../overview/platforms/+page.svelte | 29 +- src/routes/console/project-[project]/store.ts | 4 + 7 files changed, 355 insertions(+), 211 deletions(-) create mode 100644 src/routes/console/project-[project]/overview/onboard.svelte diff --git a/src/lib/components/card.svelte b/src/lib/components/card.svelte index a9d12f9bc..a1c5c3e90 100644 --- a/src/lib/components/card.svelte +++ b/src/lib/components/card.svelte @@ -1,7 +1,16 @@ -
+ -
+ diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 79d720472..77357fa62 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -22,7 +22,7 @@ import { sdkForConsole } from '$lib/stores/sdk'; import { base } from '$app/paths'; import { user } from '$lib/stores/user'; - import { goto } from '$app/navigation'; + import { beforeNavigate, goto } from '$app/navigation'; import { browser } from '$app/environment'; import { wizard } from '$lib/stores/wizard'; @@ -67,6 +67,16 @@ } } }; + + beforeNavigate((n) => { + /** + * Hide wizard when navigation is triggered by popstate. + */ + if (n.type === 'popstate' && $wizard.show) { + wizard.hide(); + n.cancel(); + } + }); diff --git a/src/lib/layout/wizard.svelte b/src/lib/layout/wizard.svelte index ee46327de..97de61a1d 100644 --- a/src/lib/layout/wizard.svelte +++ b/src/lib/layout/wizard.svelte @@ -114,11 +114,12 @@
{#if !isLastStep && sortedSteps[currentStep - 1][1].optional} - + {/if} {#if currentStep === 1} - + {:else if isLastStep} diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index 00972707c..41c6fce06 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -12,6 +12,7 @@ import { DropList, DropListItem } from '$lib/components'; import { BarChart, LineChart } from '$lib/charts'; import { humanFileSize } from '$lib/helpers/sizeConvertion'; + import Onboard from './onboard.svelte'; $: projectId = $page.params.project; $: path = `/console/project-${projectId}/overview`; @@ -91,235 +92,242 @@ {#if $project} - {#if $usage} - {@const bandwith = humanFileSize(total($usage.network))} - {@const storage = humanFileSize(last($usage.storage).value)} -
-
-
-
-
-
- {bandwith.value} - {bandwith.unit} + {#if $project.platforms.length === 0 || $project.keys.length === 0} + + {:else} + {#if $usage} + {@const bandwith = humanFileSize(total($usage.network))} + {@const storage = humanFileSize(last($usage.storage).value)} +
+
+
+
+
+
+ {bandwith.value} + {bandwith.unit} +
+
Bandwidth
-
Bandwidth
+ + + + changePeriod('24h')}> + 24h + + changePeriod('30d')}> + 30d + + changePeriod('90d')}> + 90d + + +
- - - - changePeriod('24h')}> - 24h - - changePeriod('30d')}> - 30d - - changePeriod('90d')}> - 90d - - - + {#if network.length} + [e.date, e.value])] + } + ]} /> + {/if}
- {#if network.length} - [e.date, e.value])] - } - ]} /> - {/if} -
-
-
-
-
- {format(total($usage.requests))} +
+
+
+
+ {format(total($usage.requests))} +
+
Requests
-
Requests
+ + + + changePeriod('24h')}> + 24h + + changePeriod('30d')}> + 30d + + changePeriod('90d')}> + 90d + + +
- - - - changePeriod('24h')}> - 24h - - changePeriod('30d')}> - 30d - - changePeriod('90d')}> - 90d - - - + {#if network.length} + [e.date, e.value])] + } + ]} /> + {/if}
- {#if network.length} - [e.date, e.value])] - } - ]} /> - {/if} -
-
-
-
-
-
+ {/if} + +
+

Integrations

+
+ + + +
+ +
+
{/if} - -
-

Integrations

-
- - - -
- -
- -
-
{/if} diff --git a/src/routes/console/project-[project]/overview/onboard.svelte b/src/routes/console/project-[project]/overview/onboard.svelte new file mode 100644 index 000000000..10ba7d2fe --- /dev/null +++ b/src/routes/console/project-[project]/overview/onboard.svelte @@ -0,0 +1,109 @@ + + + +
Add a Platform to Get Started
+

Our SDK's make it possible to easily add any platform that you want to use.

+ +
+ addPlatform(Platform.Web)}> +
+ + + + Web App + +
+ + addPlatform(Platform.Flutter)}> +
+ + + + Flutter App + +
+ + addPlatform(Platform.Apple)}> +
+ + + + Apple App + +
+ + addPlatform(Platform.Android)}> +
+ + + + Android App + +
+ +
+ + + +
Integrate With Your Server
+

Our SDK's make it possible to easily add any platform that you want to use.

+ +
+ addPlatform(Platform.Android)}> +
+ + + + API Key + +
+ + +
+ + + + Webhook + +
+ +
+ + + +
+
+ +
+
+
+
+ Add a Platform to View Data About Your Project +
+
+ Get insights on bandwidth usage, requests, realtime connections and more after + making your first API call +
+
+
+
diff --git a/src/routes/console/project-[project]/overview/platforms/+page.svelte b/src/routes/console/project-[project]/overview/platforms/+page.svelte index 33c12edca..a44702af7 100644 --- a/src/routes/console/project-[project]/overview/platforms/+page.svelte +++ b/src/routes/console/project-[project]/overview/platforms/+page.svelte @@ -1,39 +1,42 @@ - + +

Platforms

diff --git a/src/routes/console/project-[project]/store.ts b/src/routes/console/project-[project]/store.ts index 45c291faf..e4bc4dcb0 100644 --- a/src/routes/console/project-[project]/store.ts +++ b/src/routes/console/project-[project]/store.ts @@ -11,6 +11,10 @@ export const project = cachedStore< return { load: async (projectId: string) => { const project = await sdkForConsole.projects.get(projectId); + /** + * Reset all cache when project changed. + */ + globalThis?.sessionStorage?.clear(); set(project); } }; From 29d91895be0c6d069966734bc3da4202ecd8ae8a Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 19 Oct 2022 17:39:20 +0200 Subject: [PATCH 002/161] feat: new layout state management --- src/lib/layout/breadcrumbs.svelte | 55 ++----- src/lib/layout/header.svelte | 8 +- src/lib/layout/shell.svelte | 136 +----------------- src/lib/stores/layout.ts | 68 ++------- src/routes/console/+layout.svelte | 17 +-- src/routes/console/_createOrganization.svelte | 2 - .../+layout.svelte | 31 +--- .../breadcrumbs.svelte | 13 ++ .../organization-[organization]/header.svelte | 104 ++++++++++++++ .../settings/+page.svelte | 5 - .../console/project-[project]/+layout.svelte | 20 +-- .../authentication/+layout.svelte | 45 +----- .../authentication/breadcrumbs.svelte | 22 +++ .../authentication/header.svelte | 46 ++++++ .../teams/[team]/+layout.svelte | 34 +---- .../authentication/teams/[team]/+page.svelte | 7 +- .../teams/[team]/breadcrumbs.svelte | 27 ++++ .../authentication/teams/[team]/header.svelte | 53 +++++++ .../authentication/user/[user]/+layout.svelte | 38 +---- .../authentication/user/[user]/+page.svelte | 5 - .../user/[user]/breadcrumbs.svelte | 27 ++++ .../authentication/user/[user]/header.svelte | 57 ++++++++ .../databases/+layout.svelte | 26 +--- .../databases/breadcrumbs.svelte | 22 +++ .../database/[database]/+layout.svelte | 38 +---- .../database/[database]/breadcrumbs.svelte | 27 ++++ .../collection/[collection]/+layout.svelte | 52 ++----- .../[collection]/breadcrumbs.svelte | 26 ++++ .../document/[document]/+layout.svelte | 27 +--- .../document/[document]/breadcrumbs.svelte | 27 ++++ .../document/[document]/header.svelte | 51 +++++++ .../collection/[collection]/header.svelte | 62 ++++++++ .../database/[database]/header.svelte | 53 +++++++ .../project-[project]/databases/header.svelte | 34 +++++ .../project-[project]/overview/+layout.svelte | 15 +- .../overview/breadcrumbs.svelte | 18 +++ .../project-[project]/overview/header.svelte | 20 +++ .../keys/[key]/+page@project-[project].svelte | 27 +--- .../overview/keys/[key]/breadcrumbs.svelte | 27 ++++ .../overview/keys/[key]/header.svelte | 29 ++++ .../[platform]/+page@project-[project].svelte | 23 +-- .../platforms/[platform]/breadcrumbs.svelte | 27 ++++ .../platforms/[platform]/header.svelte | 21 +++ .../project-[project]/settings/+layout.svelte | 25 +--- .../settings/breadcrumbs.svelte | 22 +++ .../project-[project]/settings/header.svelte | 38 +++++ .../project-[project]/storage/+layout.svelte | 25 +--- .../storage/breadcrumbs.svelte | 22 +++ .../storage/bucket/[bucket]/+layout.svelte | 37 +---- .../bucket/[bucket]/breadcrumbs.svelte | 27 ++++ .../[bucket]/file/[file]/+layout.svelte | 20 +-- .../[bucket]/file/[file]/breadcrumbs.svelte | 26 ++++ .../bucket/[bucket]/file/[file]/header.svelte | 30 ++++ .../storage/bucket/[bucket]/header.svelte | 53 +++++++ .../project-[project]/storage/header.svelte | 34 +++++ 55 files changed, 1165 insertions(+), 666 deletions(-) create mode 100644 src/routes/console/organization-[organization]/breadcrumbs.svelte create mode 100644 src/routes/console/organization-[organization]/header.svelte create mode 100644 src/routes/console/project-[project]/authentication/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/authentication/header.svelte create mode 100644 src/routes/console/project-[project]/authentication/teams/[team]/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/authentication/teams/[team]/header.svelte create mode 100644 src/routes/console/project-[project]/authentication/user/[user]/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/authentication/user/[user]/header.svelte create mode 100644 src/routes/console/project-[project]/databases/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/databases/database/[database]/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/header.svelte create mode 100644 src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/header.svelte create mode 100644 src/routes/console/project-[project]/databases/database/[database]/header.svelte create mode 100644 src/routes/console/project-[project]/databases/header.svelte create mode 100644 src/routes/console/project-[project]/overview/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/overview/header.svelte create mode 100644 src/routes/console/project-[project]/overview/keys/[key]/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/overview/keys/[key]/header.svelte create mode 100644 src/routes/console/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/overview/platforms/[platform]/header.svelte create mode 100644 src/routes/console/project-[project]/settings/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/settings/header.svelte create mode 100644 src/routes/console/project-[project]/storage/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/storage/bucket/[bucket]/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/storage/bucket/[bucket]/file/[file]/breadcrumbs.svelte create mode 100644 src/routes/console/project-[project]/storage/bucket/[bucket]/file/[file]/header.svelte create mode 100644 src/routes/console/project-[project]/storage/bucket/[bucket]/header.svelte create mode 100644 src/routes/console/project-[project]/storage/header.svelte diff --git a/src/lib/layout/breadcrumbs.svelte b/src/lib/layout/breadcrumbs.svelte index b1845a831..63b6c801b 100644 --- a/src/lib/layout/breadcrumbs.svelte +++ b/src/lib/layout/breadcrumbs.svelte @@ -1,53 +1,24 @@ + + {:else}
diff --git a/src/lib/constants.ts b/src/lib/constants.ts index db195e23c..f2f483edc 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -32,7 +32,11 @@ export enum Dependencies { WEBHOOKS = 'webhooks' } -export const scopes = [ +export const scopes: { + scope: string; + description: string; + category: string; +}[] = [ { scope: 'users.read', description: "Access to read your project's users", diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts index e897255ed..64b254b00 100644 --- a/src/lib/stores/oauth-providers.ts +++ b/src/lib/stores/oauth-providers.ts @@ -26,7 +26,6 @@ const setProviders = (project: Models.Project): Provider[] => { switch (n.name.toLowerCase()) { case 'amazon': - console.log(n); docs = 'https://developer.amazon.com/apps-and-games/services-and-apis'; break; case 'apple': diff --git a/src/routes/console/project-[project]/functions/createFunction.svelte b/src/routes/console/project-[project]/functions/createFunction.svelte index e2402afb3..10d04101b 100644 --- a/src/routes/console/project-[project]/functions/createFunction.svelte +++ b/src/routes/console/project-[project]/functions/createFunction.svelte @@ -15,11 +15,9 @@ import { Dependencies } from '$lib/constants'; async function onFinish() { - console.log(2); await invalidate(Dependencies.FUNCTIONS); } async function create() { - console.log(1); try { const response = await sdkForProject.functions.create( $createFunction.id ?? 'unique()', diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index c76947b11..92681887a 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -12,7 +12,6 @@ $: projectId = $page.params.project; $: path = `/console/project-${projectId}/overview`; - $: console.log($stats.get(projectId)); let period: UsagePeriods = '30d'; let showPeriodBandwidth = false; let showPeriodRequests = false; diff --git a/src/routes/console/project-[project]/overview/keys/+page.svelte b/src/routes/console/project-[project]/overview/keys/+page.svelte index c75cc7ec9..cba2e3ed9 100644 --- a/src/routes/console/project-[project]/overview/keys/+page.svelte +++ b/src/routes/console/project-[project]/overview/keys/+page.svelte @@ -10,16 +10,21 @@ TableRowLink } from '$lib/elements/table'; import { toLocaleDateTime } from '$lib/helpers/date'; + import { wizard } from '$lib/stores/wizard'; import type { PageData } from './$types'; - import Create from './create.svelte'; + import Wizard from './wizard.svelte'; + export let data: PageData; - let show = false; + + function create() { + wizard.start(Wizard); + }
API Keys - @@ -32,7 +37,7 @@ Name last accessed expiration date - clients + scopes {#each data.keys.keys as key} @@ -44,15 +49,17 @@ {key.accessedAt ? toLocaleDateTime(key.accessedAt) : 'never'} - {toLocaleDateTime(key.$updatedAt)} + {key.expire ? toLocaleDateTime(key.expire) : 'never'} + + + {key.scopes.length} Scopes - {/each} {:else} - (show = true)}> +

Create your first API Key to get started

Need a hand? Check out our documentation.

@@ -63,5 +70,3 @@
{/if} - - diff --git a/src/routes/console/project-[project]/overview/keys/create.svelte b/src/routes/console/project-[project]/overview/keys/create.svelte deleted file mode 100644 index dea215fe2..000000000 --- a/src/routes/console/project-[project]/overview/keys/create.svelte +++ /dev/null @@ -1,42 +0,0 @@ - - - - Create API Key - - - - - - - - - diff --git a/src/routes/console/project-[project]/overview/keys/scopes.svelte b/src/routes/console/project-[project]/overview/keys/scopes.svelte index d60f14730..da649acfb 100644 --- a/src/routes/console/project-[project]/overview/keys/scopes.svelte +++ b/src/routes/console/project-[project]/overview/keys/scopes.svelte @@ -7,6 +7,14 @@ export let scopes: string[]; + enum Category { + Authentication = 'Authentication', + Database = 'Database', + Functions = 'Functions', + Storage = 'Storage', + Other = 'Other' + } + let mounted = false; onMount(() => { @@ -28,6 +36,29 @@ } } + function categoryState(category: string, s: string[]): boolean | null { + const scopesByCategory = allScopes.filter((n) => n.category === category); + const filtered = scopesByCategory.filter((n) => s.includes(n.scope)); + if (filtered.length === 0) { + return false; + } else if (filtered.length === scopesByCategory.length) { + return true; + } else { + return null; + } + } + + function onCategoryChange( + event: Event & { currentTarget: EventTarget & HTMLInputElement }, + category: Category + ) { + allScopes.forEach((s) => { + if (s.category === category) { + activeScopes[s.scope] = event.currentTarget.checked; + } + }); + } + const activeScopes = allScopes.reduce((prev, next) => { prev[next.scope] = false; @@ -54,9 +85,21 @@
- {#each ['Authentication', 'Database', 'Functions', 'Storage', 'Other'] as category} - - {category} + {#each [Category.Authentication, Category.Database, Category.Functions, Category.Storage, Category.Other] as category} + + + {@const checked = categoryState(category, scopes)} + onCategoryChange(e, category)} /> + {category} + + + ({allScopes.filter((n) => n.category === category && scopes.includes(n.scope)) + .length} Scopes) + {#each allScopes.filter((s) => s.category === category) as scope} + import { Wizard } from '$lib/layout'; + import { beforeNavigate, goto } from '$app/navigation'; + import { wizard } from '$lib/stores/wizard'; + import type { WizardStepsType } from '$lib/layout/wizard.svelte'; + import Step1 from './wizard/step1.svelte'; + import Step2 from './wizard/step2.svelte'; + import { key } from './wizard/store'; + import { sdkForConsole } from '$lib/stores/sdk'; + import { page } from '$app/stores'; + import { addNotification } from '$lib/stores/notifications'; + + async function onFinish() { + try { + const { $id } = await sdkForConsole.projects.createKey( + $page.params.project, + $key.name, + $key.scopes, + $key.expire ?? undefined + ); + key.reset(); + goto(`/console/project-${$page.params.project}/overview/keys/${$id}`); + } catch (error) { + addNotification({ + type: 'error', + message: error.message + }); + } + } + + beforeNavigate(() => { + wizard.hide(); + }); + + const stepsComponents: WizardStepsType = new Map(); + stepsComponents.set(1, { + label: 'Details', + component: Step1 + }); + stepsComponents.set(2, { + label: 'Scopes', + component: Step2 + }); + + + diff --git a/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte b/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte new file mode 100644 index 000000000..3637cd145 --- /dev/null +++ b/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte @@ -0,0 +1,19 @@ + + + + Create an API Key + Let's create an API Key. + + + + + diff --git a/src/routes/console/project-[project]/overview/keys/wizard/step2.svelte b/src/routes/console/project-[project]/overview/keys/wizard/step2.svelte new file mode 100644 index 000000000..56638e8a0 --- /dev/null +++ b/src/routes/console/project-[project]/overview/keys/wizard/step2.svelte @@ -0,0 +1,17 @@ + + + + Add Scopes + + Choose which permission scopes to grant your application. It is best practice to allow only + the permissions you need to meet your project goals. + + + + + diff --git a/src/routes/console/project-[project]/overview/keys/wizard/store.ts b/src/routes/console/project-[project]/overview/keys/wizard/store.ts new file mode 100644 index 000000000..148e58193 --- /dev/null +++ b/src/routes/console/project-[project]/overview/keys/wizard/store.ts @@ -0,0 +1,25 @@ +import { writable } from 'svelte/store'; +import type { Models } from '@aw-labs/appwrite-console'; + +function createKeyStore() { + const { subscribe, update, set } = writable>({ + name: null, + expire: null, + scopes: [] + }); + + return { + subscribe, + update, + set, + reset() { + set({ + name: null, + expire: null, + scopes: [] + }); + } + }; +} + +export const key = createKeyStore(); From faf7fd585db8cef1894a82d6027224a5f84de88a Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 3 Nov 2022 14:20:39 +0100 Subject: [PATCH 077/161] fix: state dependencies --- src/lib/constants.ts | 59 ++++++++++--------- .../organization-[organization]/+layout.ts | 4 +- .../settings/+page.svelte | 2 +- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index db195e23c..14f4ad826 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -1,35 +1,36 @@ export const PAGE_LIMIT = 12; // default page limit export const CARD_LIMIT = 6; // default card limit export enum Dependencies { - PROJECT = 'project', - PROJECTS = 'projects', - ACCOUNT = 'account', - ACCOUNT_SESSIONS = 'account_sessions', - USER = 'user', - USERS = 'users', - SESSIONS = 'sessions', - TEAM = 'team', - TEAMS = 'teams', - MEMBERSHIPS = 'memberships', - DATABASE = 'database', - COLLECTION = 'collection', - DOCUMENT = 'document', - DOCUMENTS = 'documents', - BUCKET = 'bucket', - FILE = 'file', - FILES = 'files', - FUNCTION = 'function', - FUNCTIONS = 'functions', - VARIABLES = 'variables', - DEPLOYMENTS = 'deployments', - EXECUTIONS = 'executions', - PLATFORM = 'platform', - PLATFORMS = 'platforms', - KEY = 'key', - KEYS = 'keys', - DOMAINS = 'domains', - WEBHOOK = 'webhook', - WEBHOOKS = 'webhooks' + ORGANIZATION = 'dependency:organization', + PROJECT = 'dependency:project', + PROJECTS = 'dependency:projects', + ACCOUNT = 'dependency:account', + ACCOUNT_SESSIONS = 'dependency:account_sessions', + USER = 'dependency:user', + USERS = 'dependency:users', + SESSIONS = 'dependency:sessions', + TEAM = 'dependency:team', + TEAMS = 'dependency:teams', + MEMBERSHIPS = 'dependency:memberships', + DATABASE = 'dependency:database', + COLLECTION = 'dependency:collection', + DOCUMENT = 'dependency:document', + DOCUMENTS = 'dependency:documents', + BUCKET = 'dependency:bucket', + FILE = 'dependency:file', + FILES = 'dependency:files', + FUNCTION = 'dependency:function', + FUNCTIONS = 'dependency:functions', + VARIABLES = 'dependency:variables', + DEPLOYMENTS = 'dependency:deployments', + EXECUTIONS = 'dependency:executions', + PLATFORM = 'dependency:platform', + PLATFORMS = 'dependency:platforms', + KEY = 'dependency:key', + KEYS = 'dependency:keys', + DOMAINS = 'dependency:domains', + WEBHOOK = 'dependency:webhook', + WEBHOOKS = 'dependency:webhooks' } export const scopes = [ diff --git a/src/routes/console/organization-[organization]/+layout.ts b/src/routes/console/organization-[organization]/+layout.ts index c110b411a..73e344c0c 100644 --- a/src/routes/console/organization-[organization]/+layout.ts +++ b/src/routes/console/organization-[organization]/+layout.ts @@ -3,9 +3,11 @@ import Breadcrumbs from './breadcrumbs.svelte'; import { sdkForConsole } from '$lib/stores/sdk'; import type { LayoutLoad } from './$types'; import { error } from '@sveltejs/kit'; +import { Dependencies } from '$lib/constants'; -export const load: LayoutLoad = async ({ params, parent }) => { +export const load: LayoutLoad = async ({ params, parent, depends }) => { await parent(); + depends(Dependencies.ORGANIZATION); try { return { diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte index 7c8eb3f63..3e367cb4c 100644 --- a/src/routes/console/organization-[organization]/settings/+page.svelte +++ b/src/routes/console/organization-[organization]/settings/+page.svelte @@ -20,7 +20,7 @@ async function updateName() { try { await sdkForConsole.teams.update($organization.$id, name); - await invalidate(Dependencies.ACCOUNT); + await invalidate(Dependencies.ORGANIZATION); addNotification({ message: 'Name has been updated', type: 'success' From b46c48f366c586e42ee19473053ac6dbfacb42f3 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 3 Nov 2022 14:45:12 +0100 Subject: [PATCH 078/161] fix: apple platform creation --- .../overview/platforms/wizard/apple/step1.svelte | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte index 7478cd44f..a98f7eaae 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte @@ -1,6 +1,5 @@ - Register your Flutter app - - Note: If you are building your Flutter application for multiple devices, you will have to - follow this process for each different device. - + Register your Apple app From fc62797cbb0e8131617ba6fa46122049846538b7 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 3 Nov 2022 14:58:25 +0100 Subject: [PATCH 079/161] feat: add sorting to enabled providers --- .../project-[project]/authentication/settings/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/authentication/settings/+page.svelte b/src/routes/console/project-[project]/authentication/settings/+page.svelte index ef4010fd9..df821ecb6 100644 --- a/src/routes/console/project-[project]/authentication/settings/+page.svelte +++ b/src/routes/console/project-[project]/authentication/settings/+page.svelte @@ -63,7 +63,7 @@

OAuth2 Providers

    - {#each $OAuthProviders.providers as provider} + {#each $OAuthProviders.providers.sort( (a, b) => (a.enabled === b.enabled ? 0 : a.enabled ? -1 : 1) ) as provider}
{#each [Category.Authentication, Category.Database, Category.Functions, Category.Storage, Category.Other] as category} + {@const checked = categoryState(category, scopes)} - - {@const checked = categoryState(category, scopes)} + onCategoryChange(e, category)} /> + + {category} ({allScopes.filter((n) => n.category === category && scopes.includes(n.scope)) .length} Scopes) - - {#each allScopes.filter((s) => s.category === category) as scope} - - {scope.description} - - {/each} - +
+ + {#each allScopes.filter((s) => s.category === category) as scope} + + {scope.description} + + {/each} + +
{/each} From 3f3ba74531dcbe8ec67c7996ff8c5743575cd705 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 3 Nov 2022 15:41:18 +0100 Subject: [PATCH 083/161] fix: api scopes --- .../overview/keys/[key]/+page@project-[project].svelte | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 1163b4902..572911642 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 @@ -18,7 +18,7 @@ let name: string = null; let secret: string = null; let expire: string = null; - let scopes: string[] = []; + let scopes: string[] = null; onMount(() => { name ??= $key.name; @@ -135,15 +135,17 @@ practice to allow only the permissions you need to meet your project goals.

- + {#if scopes !== null} + + {/if} From 6aa0fac8786db514975081983d0dd2962c41f54c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 3 Nov 2022 15:43:30 +0100 Subject: [PATCH 084/161] fix: condition --- .../overview/keys/[key]/+page@project-[project].svelte | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 572911642..ad2e0cf3f 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 @@ -143,10 +143,12 @@ + disabled={scopes && + $key?.scopes && + !( + difference(scopes, $key.scopes).length !== 0 || + difference($key.scopes, scopes).length !== 0 + )}>Update From 2f6a6a1f805749667812cce03de7998d78213f8c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 3 Nov 2022 15:51:49 +0100 Subject: [PATCH 085/161] fix: api key wizard --- .../console/project-[project]/overview/keys/wizard.svelte | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/routes/console/project-[project]/overview/keys/wizard.svelte b/src/routes/console/project-[project]/overview/keys/wizard.svelte index 5acc79141..e1efc9ebb 100644 --- a/src/routes/console/project-[project]/overview/keys/wizard.svelte +++ b/src/routes/console/project-[project]/overview/keys/wizard.svelte @@ -9,6 +9,7 @@ import { sdkForConsole } from '$lib/stores/sdk'; import { page } from '$app/stores'; import { addNotification } from '$lib/stores/notifications'; + import { onDestroy } from 'svelte'; async function onFinish() { try { @@ -18,7 +19,6 @@ $key.scopes, $key.expire ?? undefined ); - key.reset(); goto(`/console/project-${$page.params.project}/overview/keys/${$id}`); } catch (error) { addNotification({ @@ -28,6 +28,10 @@ } } + onDestroy(() => { + key.reset(); + }); + beforeNavigate(() => { wizard.hide(); }); @@ -43,4 +47,4 @@ }); - + From 0bd706bf0948673266158f4c657d135f5c88abc0 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 3 Nov 2022 17:06:51 +0100 Subject: [PATCH 086/161] fix: collapbsible vertical align --- src/lib/components/collapsibleItem.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/components/collapsibleItem.svelte b/src/lib/components/collapsibleItem.svelte index 2415512b0..ed93c1f49 100644 --- a/src/lib/components/collapsibleItem.svelte +++ b/src/lib/components/collapsibleItem.svelte @@ -6,8 +6,10 @@
- - +
+ + +
From 80f0040faeb0b8a9cc6e239fff7cb985461d010f Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 3 Nov 2022 17:52:00 +0100 Subject: [PATCH 087/161] feat: datetime attribute --- src/lib/elements/forms/inputDateTime.svelte | 5 +- .../attributes/boolean.svelte | 13 ++-- .../attributes/createAttribute.svelte | 7 +- .../attributes/datetime.svelte | 69 +++++++++++++++++++ .../attributes/email.svelte | 11 +-- .../attributes/enum.svelte | 6 +- .../attributes/float.svelte | 10 +-- .../attributes/integer.svelte | 10 +-- .../attributes/ip.svelte | 8 +-- .../attributes/store.ts | 8 ++- .../attributes/string.svelte | 9 +-- .../attributes/url.svelte | 8 +-- .../document-[document]/+layout.ts | 29 ++++++-- .../document-[document]/attribute.svelte | 7 +- .../attributes/_datetime.svelte | 11 +++ .../document-[document]/document.svelte | 2 +- 16 files changed, 161 insertions(+), 52 deletions(-) create mode 100644 src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte create mode 100644 src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/_datetime.svelte diff --git a/src/lib/elements/forms/inputDateTime.svelte b/src/lib/elements/forms/inputDateTime.svelte index 3869f498b..b15eac42d 100644 --- a/src/lib/elements/forms/inputDateTime.svelte +++ b/src/lib/elements/forms/inputDateTime.svelte @@ -21,7 +21,7 @@ } }); - const handleInvalid = (event: Event) => { + function handleInvalid(event: Event) { event.preventDefault(); if (element.validity.valueMissing) { @@ -30,7 +30,7 @@ } error = element.validationMessage; - }; + } $: if (value) { error = null; @@ -45,6 +45,7 @@ {disabled} {readonly} {required} + step=".001" autocomplete={autocomplete ? 'on' : 'off'} type="datetime-local" class="input-text" diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte index edc4e9473..c913f4c06 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte @@ -16,7 +16,7 @@ const dispatch = createEventDispatcher(); - let xdefault: boolean, + let xdefault: boolean | null, required = false, array = false; @@ -28,7 +28,7 @@ $collection.$id, key, required, - xdefault ? xdefault : undefined, + xdefault ?? undefined, array ); dispatch('created', attribute); @@ -49,7 +49,7 @@ xdefault = selectedAttribute.default; } - $: if (required) { + $: if (required || array) { xdefault = null; } @@ -61,12 +61,13 @@ label="Default value" placeholder="Select a value" options={[ + { label: 'Select a value', value: null }, { label: 'True', value: true }, { label: 'False', value: false } ]} bind:value={xdefault} - disabled={overview} /> - + disabled={overview || array || required} /> + Indicate whether this is a required attribute - + Indicate whether this attribute should act as an array diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte index c0e261897..5c6145c7c 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte @@ -4,7 +4,6 @@ import { Button, InputText, FormList, InputSelect } from '$lib/elements/forms'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; - import { addNotification } from '$lib/stores/notifications'; export let showCreate = false; @@ -15,10 +14,6 @@ const created = async () => { invalidate(Dependencies.COLLECTION); showCreate = false; - addNotification({ - type: 'success', - message: `Attribute has been created` - }); }; $: if (selectedOption) { @@ -72,6 +67,6 @@ - + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte new file mode 100644 index 000000000..50698fefd --- /dev/null +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte @@ -0,0 +1,69 @@ + + + + + Indicate whether this is a required attribute + + Indicate whether this attribute should act as an array diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte index 1db971cfc..4c3392997 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte @@ -1,11 +1,12 @@ - - + Indicate whether this is a required attribute - + Indicate whether this attribute should act as an array diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte index 3a33b38d8..47624e2ce 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte @@ -58,7 +58,7 @@ ({ required, array, elements } = selectedAttribute); xdefault = selectedAttribute.default; } - $: if (required) { + $: if (required || array) { xdefault = null; } @@ -75,7 +75,7 @@ bind:options bind:value={xdefault} disabled={overview || required} /> - + Indicate whether this is a required attribute - + Indicate whether this attribute should act as an array diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte index 389dec445..b9a37d60d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte @@ -56,7 +56,7 @@ xdefault = selectedAttribute.default; } - $: if (required) { + $: if (required || array) { xdefault = null; } @@ -67,11 +67,13 @@ - + Indicate whether this is a required attribute - + Indicate whether this attribute should act as an array diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte index 41429ac93..14c52af02 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte @@ -55,7 +55,7 @@ ({ required, array, min, max } = selectedAttribute); xdefault = selectedAttribute.default; } - $: if (required) { + $: if (required || array) { xdefault = null; } @@ -66,10 +66,12 @@ - + Indicate whether this is a required attribute - + Indicate whether this attribute should act as an array diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte index f40f1d8fa..ed7250ab9 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte @@ -51,7 +51,7 @@ ({ required, array } = selectedAttribute); xdefault = selectedAttribute.default; } - $: if (required) { + $: if (required || array) { xdefault = null; } @@ -60,9 +60,9 @@ id="default" label="Default value" bind:value={xdefault} - disabled={required} + disabled={required || array} readonly={overview} /> - + Indicate whether this is a required attribute - + Indicate whether this attribute should act as an array diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts index ca2b439e5..5f3e1da7c 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts @@ -8,11 +8,12 @@ import Integer from './integer.svelte'; import Ip from './ip.svelte'; import String from './string.svelte'; import Url from './url.svelte'; +import Datetime from './datetime.svelte'; export type Option = { name: string; component: typeof SvelteComponent; - type: 'string' | 'integer' | 'double' | 'boolean'; + type: 'string' | 'integer' | 'double' | 'boolean' | 'datetime'; format?: 'email' | 'ip' | 'url' | 'enum'; }; @@ -37,6 +38,11 @@ export const options: Option[] = [ component: Boolean, type: 'boolean' }, + { + name: 'Datetime', + component: Datetime, + type: 'datetime' + }, { name: 'Email', component: Email, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte index b69dc22b9..27764415c 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte @@ -53,7 +53,7 @@ ({ required, array, size } = selectedAttribute); xdefault = selectedAttribute.default; } - $: if (required) { + $: if (required || array) { xdefault = null; } @@ -63,9 +63,10 @@ id="default" label="Default value" bind:value={xdefault} - disabled={required} + maxlength={size} + disabled={required || array} readonly={overview} /> - + Indicate whether this is a required attribute - + Indicate whether this attribute should act as an array diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte index 23e57028b..f30452f55 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte @@ -51,7 +51,7 @@ ({ required, array } = selectedAttribute); xdefault = selectedAttribute.default; } - $: if (required) { + $: if (required || array) { xdefault = null; } @@ -60,9 +60,9 @@ id="default" label="Default value" bind:value={xdefault} - disabled={required} + disabled={required || array} readonly={overview} /> - + Indicate whether this is a required attribute - + Indicate whether this attribute should act as an array diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts index c7761a8d2..2aaef7461 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts @@ -4,20 +4,37 @@ import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import { error } from '@sveltejs/kit'; +import type { Attributes } from '../store'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.DOCUMENT); + const { collection } = await parent(); + const document = await sdkForProject.databases.getDocument( + params.database, + params.collection, + params.document + ); + /** + * Sanitize DateTime to remove UTC Timezone section. + */ + collection.attributes.forEach((attribute) => { + const { type, key, array } = attribute as unknown as Attributes; + if (type === 'datetime') { + if (array) { + document[key] = document[key].map((n: string) => { + return new Date(n).toISOString().slice(0, 23); + }); + } else { + document[key] = new Date(document[key]).toISOString().slice(0, 23); + } + } + }); try { return { header: Header, breadcrumbs: Breadcrumbs, - document: await sdkForProject.databases.getDocument( - params.database, - params.collection, - params.document - ) + document }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte index a21f61c07..afb09fa9a 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte @@ -1,6 +1,7 @@ {#if attribute.type in attributesTypeMap} - {#if 'format' in attribute} + {#if 'format' in attribute && attribute.format} + import { InputDateTime } from '$lib/elements/forms'; + import type { Models } from '@aw-labs/appwrite-console'; + + export let id: string; + export let label: string; + export let value: string; + export let attribute: Models.AttributeDatetime; + + + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte index 3f93af8f3..8468405ea 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte @@ -8,10 +8,10 @@ import { sdkForProject } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { writable } from 'svelte/store'; - import Attribute from './attribute.svelte'; import type { Models } from '@aw-labs/appwrite-console'; import { Dependencies } from '$lib/constants'; import { invalidate } from '$app/navigation'; + import Attribute from './attribute.svelte'; let disableUpdate = true; let currentDoc: string; From 7a930147dbce77152722f4c09982663bf4b67651 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 4 Nov 2022 10:48:31 +0100 Subject: [PATCH 088/161] fix: permission disabled button --- .../collection-[collection]/document-[document]/+page.svelte | 5 ++++- .../storage/bucket-[bucket]/file-[file]/+page.svelte | 5 ++++- .../storage/bucket-[bucket]/settings/+page.svelte | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte index 2b52ed462..afb7b82db 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte @@ -41,7 +41,10 @@ } $: if (permissions) { - if (difference(permissions, $doc.$permissions).length) { + if ( + difference(permissions, $doc.$permissions).length || + difference($doc.$permissions, permissions).length + ) { arePermsDisabled = false; } else arePermsDisabled = true; } diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index b30a47db2..ab2bbc8cf 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -30,7 +30,10 @@ sdkForProject.storage.getFileView($file.bucketId, fileId).toString() + '&mode=admin'; $: if (filePermissions) { - if (difference(filePermissions, $file.$permissions).length) { + if ( + difference(filePermissions, $file.$permissions).length || + difference($file.$permissions, filePermissions).length + ) { arePermsDisabled = false; } else arePermsDisabled = true; } diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte index 498eb674b..2eb438dff 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte @@ -58,7 +58,10 @@ if (bucketFileSecurity !== $bucket.fileSecurity) { arePermsDisabled = false; } else if (bucketPermissions) { - if (difference(bucketPermissions, $bucket.$permissions).length) { + if ( + difference(bucketPermissions, $bucket.$permissions).length || + difference($bucket.$permissions, bucketPermissions).length + ) { arePermsDisabled = false; } else arePermsDisabled = true; } From 110b84717fedd904aa7b886f146e75b6b9225cdf Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 4 Nov 2022 10:51:54 +0100 Subject: [PATCH 089/161] chore: update css --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1eb26ab2d..c34874549 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.1", "dependencies": { "@aw-labs/appwrite-console": "^10.0.0", - "@aw-labs/icons": "0.0.0-68", - "@aw-labs/ui": "0.0.0-68", + "@aw-labs/icons": "0.0.0-69", + "@aw-labs/ui": "0.0.0-69", "@popperjs/core": "^2.11.6", "echarts": "^5.4.0", "prismjs": "^1.29.0", @@ -80,14 +80,14 @@ } }, "node_modules/@aw-labs/icons": { - "version": "0.0.0-68", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-68.tgz", - "integrity": "sha512-sLaaDCjVUysdfatBtis/p8ggphEi1GlhJHnYAzERBJ9iX6lyvT61UXDADOk27GxL8h9fJJ+J1Q8BEF0QfTHooQ==" + "version": "0.0.0-69", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-69.tgz", + "integrity": "sha512-gJvWRgRLM2auSgWs6aP1r46ClVeSm0sfS/Zi9ouu4LAmpcjqlJigK5H3x7/G9gPctKFYZo46ZMEDzKWpn8vwEw==" }, "node_modules/@aw-labs/ui": { - "version": "0.0.0-68", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-68.tgz", - "integrity": "sha512-1MdyKxo/8tETxp5CKCI56IhadAUxGBTT6bGxr/IfMORWQkDdGLF+y2xwjLq8md+tEBxQv7akkXu1jCzpl6Wf/Q==", + "version": "0.0.0-69", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-69.tgz", + "integrity": "sha512-LDf6hcYDd8YJpp9rRYHv1mFm8LEryWxFAV3AI8NPx7Z1lRlNs1XKlD0jqn1Q9x4NhT7ehwiTETYdCK1k9exdCg==", "dependencies": { "@aw-labs/icons": "*", "normalize.css": "^8.0.1", @@ -7455,14 +7455,14 @@ } }, "@aw-labs/icons": { - "version": "0.0.0-68", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-68.tgz", - "integrity": "sha512-sLaaDCjVUysdfatBtis/p8ggphEi1GlhJHnYAzERBJ9iX6lyvT61UXDADOk27GxL8h9fJJ+J1Q8BEF0QfTHooQ==" + "version": "0.0.0-69", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-69.tgz", + "integrity": "sha512-gJvWRgRLM2auSgWs6aP1r46ClVeSm0sfS/Zi9ouu4LAmpcjqlJigK5H3x7/G9gPctKFYZo46ZMEDzKWpn8vwEw==" }, "@aw-labs/ui": { - "version": "0.0.0-68", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-68.tgz", - "integrity": "sha512-1MdyKxo/8tETxp5CKCI56IhadAUxGBTT6bGxr/IfMORWQkDdGLF+y2xwjLq8md+tEBxQv7akkXu1jCzpl6Wf/Q==", + "version": "0.0.0-69", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-69.tgz", + "integrity": "sha512-LDf6hcYDd8YJpp9rRYHv1mFm8LEryWxFAV3AI8NPx7Z1lRlNs1XKlD0jqn1Q9x4NhT7ehwiTETYdCK1k9exdCg==", "requires": { "@aw-labs/icons": "*", "normalize.css": "^8.0.1", diff --git a/package.json b/package.json index 1c2a77635..c332b80f2 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ }, "dependencies": { "@aw-labs/appwrite-console": "^10.0.0", - "@aw-labs/icons": "0.0.0-68", - "@aw-labs/ui": "0.0.0-68", + "@aw-labs/icons": "0.0.0-69", + "@aw-labs/ui": "0.0.0-69", "@popperjs/core": "^2.11.6", "echarts": "^5.4.0", "prismjs": "^1.29.0", From c96e51c5b90b2d57d00257710ce753ade7f9b451 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 4 Nov 2022 11:05:13 +0100 Subject: [PATCH 090/161] feat: add page title for onboarding --- src/routes/console/onboarding/+layout.svelte | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/routes/console/onboarding/+layout.svelte b/src/routes/console/onboarding/+layout.svelte index 4fa864ce7..3fad2e9ed 100644 --- a/src/routes/console/onboarding/+layout.svelte +++ b/src/routes/console/onboarding/+layout.svelte @@ -1 +1,5 @@ + + Onboarding - Appwrite + + From 673096e005340070382f52d4242c41ed7cd5a8bd Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 4 Nov 2022 11:12:36 +0100 Subject: [PATCH 091/161] fix: remove session number --- src/routes/console/project-[project]/overview/+layout.svelte | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index 6e9ded3b4..2443f8e87 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -230,10 +230,6 @@
Users
- -
-
Sessions: XX
-
Date: Fri, 4 Nov 2022 12:16:38 +0100 Subject: [PATCH 092/161] fix: create document --- .../createDocument.svelte | 13 ++--- .../document-[document]/document.svelte | 31 ++++++++-- .../wizard/step1.svelte | 57 +++++++++---------- 3 files changed, 56 insertions(+), 45 deletions(-) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte index 617e3c5c1..259f157b5 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte @@ -16,11 +16,9 @@ const databaseId = $page.params.database; const collectionId = $page.params.collection; - onMount(async () => { - initializeDocument(); - }); + onMount(initializeDocument); - const initializeDocument = () => { + function initializeDocument() { $createDocument.attributes = $attributes.filter((a) => a.status === 'available'); $attributes.forEach((attr) => { if (attr.array) { @@ -29,9 +27,9 @@ $createDocument.document[attr.key] = null; } }); - }; + } - const create = async () => { + async function create() { try { await sdkForProject.databases.createDocument( databaseId, @@ -52,10 +50,9 @@ type: 'error' }); } - }; + } onDestroy(() => { - initializeDocument(); $createDocument.permissions = []; }); diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte index 8468405ea..21d3c6c26 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte @@ -49,7 +49,7 @@ } } - const updateData = async () => { + async function updateData() { try { await sdkForProject.databases.updateDocument( databaseId, @@ -72,7 +72,26 @@ type: 'error' }); } - }; + } + + function addArrayItem(key: string) { + work.update((n) => { + if (!Array.isArray(n[key])) { + n[key] = []; + } + n[key].push(null); + + return n; + }); + } + + function removeArrayItem(key: string, index: number) { + work.update((n) => { + n[key].splice(index, 1); + + return n; + }); + } @@ -83,7 +102,7 @@ {#each $collection.attributes.filter((a) => a.status === 'available') as attribute} {#if attribute.array}