From 5ddfa2514271e11d8921d6bfb53c24d2b8f6ec77 Mon Sep 17 00:00:00 2001 From: Aditya Oberai Date: Thu, 26 Sep 2024 14:28:25 +0530 Subject: [PATCH 01/15] Fix typo in Hacktoberfest campaign --- src/lib/stores/campaigns.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/stores/campaigns.ts b/src/lib/stores/campaigns.ts index 09ec639d6..a9e524742 100644 --- a/src/lib/stores/campaigns.ts +++ b/src/lib/stores/campaigns.ts @@ -152,7 +152,7 @@ campaigns }) .set('Hacktoberfest2024', { template: 'card', - title: 'Claim your $60 Hacktobefest credits.', + title: 'Claim your $60 Hacktoberfest credits.', description: 'Get $60 in Cloud credits when you upgrade or create an organization with a Pro plan' }) From f436a2e6329a7b7c00091fd28ca508c8d5a8ae08 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 26 Sep 2024 15:43:39 +0545 Subject: [PATCH 02/15] Fix: scope checks in more places --- src/routes/(console)/project-[project]/auth/+page.svelte | 2 +- src/routes/(console)/project-[project]/auth/teams/+page.svelte | 2 +- src/routes/(console)/project-[project]/databases/+page.svelte | 2 +- .../databases/database-[database]/+page.svelte | 3 ++- .../database-[database]/collection-[collection]/+page.svelte | 2 +- .../collection-[collection]/attributes/+page.svelte | 2 +- .../(console)/project-[project]/overview/keys/+page.svelte | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/routes/(console)/project-[project]/auth/+page.svelte b/src/routes/(console)/project-[project]/auth/+page.svelte index 786ab63c2..c2171156f 100644 --- a/src/routes/(console)/project-[project]/auth/+page.svelte +++ b/src/routes/(console)/project-[project]/auth/+page.svelte @@ -156,7 +156,7 @@ href="https://appwrite.io/docs/references/cloud/server-nodejs/users" target="user" allowCreate={$canWriteUsers} - on:click={() => showCreateUser.set(true)} /> + on:click={() => showCreateUser.set($canWriteUsers)} /> {/if} diff --git a/src/routes/(console)/project-[project]/auth/teams/+page.svelte b/src/routes/(console)/project-[project]/auth/teams/+page.svelte index d73d42584..aa88347a8 100644 --- a/src/routes/(console)/project-[project]/auth/teams/+page.svelte +++ b/src/routes/(console)/project-[project]/auth/teams/+page.svelte @@ -113,7 +113,7 @@ ($showCreateTeam = true)} + on:click={() => ($showCreateTeam = $canWriteTeams)} href="https://appwrite.io/docs/references/cloud/client-web/teams" target="team" /> {/if} diff --git a/src/routes/(console)/project-[project]/databases/+page.svelte b/src/routes/(console)/project-[project]/databases/+page.svelte index 9f8faa535..6e7bb1dd8 100644 --- a/src/routes/(console)/project-[project]/databases/+page.svelte +++ b/src/routes/(console)/project-[project]/databases/+page.svelte @@ -93,7 +93,7 @@ href="https://appwrite.io/docs/products/databases/databases" target="database" allowCreate={$canWriteDatabases} - on:click={() => (showCreate = true)} /> + on:click={() => (showCreate = $canWriteDatabases)} /> {/if} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte index 2a964e126..35a32b672 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte @@ -41,8 +41,9 @@ {:else} ($showCreate = true)} /> + on:click={() => ($showCreate = $canWriteCollections)} /> {/if} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte index 5a7a96e4b..351d62e95 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte @@ -126,7 +126,7 @@ allowCreate={$canWriteCollections} single target="attribute" - on:click={() => (showCreateDropdown = true)}> + on:click={() => (showCreateDropdown = $canWriteCollections)}>
Create an attribute to get started.

diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte index 5a827c7fc..c3b7c2835 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte @@ -201,7 +201,7 @@ allowCreate={$canWriteCollections} single target="attribute" - on:click={() => (showEmptyCreateDropdown = true)}> + on:click={() => (showEmptyCreateDropdown = $canWriteCollections)}>

Create your first attribute to get started.

diff --git a/src/routes/(console)/project-[project]/overview/keys/+page.svelte b/src/routes/(console)/project-[project]/overview/keys/+page.svelte index aed17e5a1..7a54cf018 100644 --- a/src/routes/(console)/project-[project]/overview/keys/+page.svelte +++ b/src/routes/(console)/project-[project]/overview/keys/+page.svelte @@ -73,5 +73,5 @@ allowCreate={$canWriteKeys} href="https://appwrite.io/docs/advanced/platform/api-keys" target="API key" - on:click={$canWriteKeys ? createApiKey : null} /> + on:click={createApiKey} /> {/if} From bca5cafca4c1206089c766621d6e3439c0b247fc Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 26 Sep 2024 16:08:44 +0545 Subject: [PATCH 03/15] refactor empty clicks --- src/lib/components/empty.svelte | 16 +++++++++++----- .../project-[project]/auth/+page.svelte | 2 +- .../project-[project]/auth/teams/+page.svelte | 2 +- .../project-[project]/databases/+page.svelte | 2 +- .../databases/database-[database]/+page.svelte | 2 +- .../collection-[collection]/+page.svelte | 2 +- .../attributes/+page.svelte | 2 +- .../collection-[collection]/indexes/+page.svelte | 5 +++-- 8 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/lib/components/empty.svelte b/src/lib/components/empty.svelte index 6fc29d45f..9e26580f6 100644 --- a/src/lib/components/empty.svelte +++ b/src/lib/components/empty.svelte @@ -5,6 +5,7 @@ import EmptyDark from '$lib/images/empty-dark.svg'; import { Heading } from '.'; import { trackEvent } from '$lib/actions/analytics'; + import { createEventDispatcher } from 'svelte'; export let single = false; export let noMedia = false; @@ -13,6 +14,15 @@ export let marginTop = false; export let allowCreate = true; + const dispatch = createEventDispatcher(); + + function onClick() { + if (!allowCreate) { + return; + } + dispatch('click'); + } + function track() { if (target) { trackEvent(`click_create_${target}`, { @@ -27,11 +37,7 @@

{#if !noMedia} -
-
-

Domains

- - - -
+ {#if $proxyRuleList?.rules?.length} +
+

Domains

+ + + +
+ {/if}

Updated