diff --git a/package-lock.json b/package-lock.json index 058515466..8154711ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.1", "dependencies": { "@aw-labs/appwrite-console": "^6.0.0", - "@aw-labs/icons": "0.0.0-57", - "@aw-labs/ui": "0.0.0-57", + "@aw-labs/icons": "0.0.0-58", + "@aw-labs/ui": "0.0.0-58", "echarts": "^5.4.0", "tippy.js": "^6.3.7", "web-vitals": "^2.1.4" @@ -77,14 +77,14 @@ } }, "node_modules/@aw-labs/icons": { - "version": "0.0.0-57", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-57.tgz", - "integrity": "sha512-HmXSTSP3GEBi5awFk0APTTNdM10DDIBCTnxi3BJGlsXo+SXnpVikoMk6RZltNLH7MRfPQNx+VfJ2bOC+hlW8ZQ==" + "version": "0.0.0-58", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-58.tgz", + "integrity": "sha512-xUD5DQcYVNiKhDSpxMO24G/4l7txgAdwochK01tJA6wXhuPAcp5Yjuofjm2bGkMzCuze4Vs+SVvhsBxzVXRPrA==" }, "node_modules/@aw-labs/ui": { - "version": "0.0.0-57", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-57.tgz", - "integrity": "sha512-a/nKqu9nHysTF7bIOLo+ZN1zKpCHfv+jHGixU0SGXchTNAmj2OXClZNk3XfMmwnPD6CiF4cG6YRdbmpx+TTXgA==", + "version": "0.0.0-58", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-58.tgz", + "integrity": "sha512-W3bTvAPX4ig5qLBvGn/VpNaDk62RqO4oDa0poube2WuElkVvaGwFAR0wCwmisdi2NeXyGJqt20g3Y/Mz4K2yMA==", "dependencies": { "@aw-labs/icons": "*" } @@ -8134,14 +8134,14 @@ } }, "@aw-labs/icons": { - "version": "0.0.0-57", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-57.tgz", - "integrity": "sha512-HmXSTSP3GEBi5awFk0APTTNdM10DDIBCTnxi3BJGlsXo+SXnpVikoMk6RZltNLH7MRfPQNx+VfJ2bOC+hlW8ZQ==" + "version": "0.0.0-58", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-58.tgz", + "integrity": "sha512-xUD5DQcYVNiKhDSpxMO24G/4l7txgAdwochK01tJA6wXhuPAcp5Yjuofjm2bGkMzCuze4Vs+SVvhsBxzVXRPrA==" }, "@aw-labs/ui": { - "version": "0.0.0-57", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-57.tgz", - "integrity": "sha512-a/nKqu9nHysTF7bIOLo+ZN1zKpCHfv+jHGixU0SGXchTNAmj2OXClZNk3XfMmwnPD6CiF4cG6YRdbmpx+TTXgA==", + "version": "0.0.0-58", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-58.tgz", + "integrity": "sha512-W3bTvAPX4ig5qLBvGn/VpNaDk62RqO4oDa0poube2WuElkVvaGwFAR0wCwmisdi2NeXyGJqt20g3Y/Mz4K2yMA==", "requires": { "@aw-labs/icons": "*" } diff --git a/package.json b/package.json index 9ae2f78f9..d7c3234f5 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ }, "dependencies": { "@aw-labs/appwrite-console": "^6.0.0", - "@aw-labs/icons": "0.0.0-57", - "@aw-labs/ui": "0.0.0-57", + "@aw-labs/icons": "0.0.0-58", + "@aw-labs/ui": "0.0.0-58", "echarts": "^5.4.0", "tippy.js": "^6.3.7", "web-vitals": "^2.1.4" diff --git a/src/lib/components/collapsible.svelte b/src/lib/components/collapsible.svelte index 3647c2ec8..245eec781 100644 --- a/src/lib/components/collapsible.svelte +++ b/src/lib/components/collapsible.svelte @@ -1,21 +1,3 @@ diff --git a/src/lib/components/collapsibleItem.svelte b/src/lib/components/collapsibleItem.svelte new file mode 100644 index 000000000..5caa6caf3 --- /dev/null +++ b/src/lib/components/collapsibleItem.svelte @@ -0,0 +1,14 @@ +
  • +
    + + + +
    +
    +
    +
    + +
    +
    +
  • diff --git a/src/lib/components/customId.svelte b/src/lib/components/customId.svelte new file mode 100644 index 000000000..91164f4e9 --- /dev/null +++ b/src/lib/components/customId.svelte @@ -0,0 +1,43 @@ + + + + {name} ID + + Enter a custom {name} ID. Leave blank for a randomly generated one. + + +
    + + +
    +
    +
    +
    +
    diff --git a/src/lib/components/gridItem1.svelte b/src/lib/components/gridItem1.svelte index a826e5663..8220f6429 100644 --- a/src/lib/components/gridItem1.svelte +++ b/src/lib/components/gridItem1.svelte @@ -24,3 +24,10 @@ + + diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index e307e658a..948ea203f 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -16,6 +16,7 @@ export { default as DropList } from './dropList.svelte'; export { default as DropListItem } from './dropListItem.svelte'; export { default as DropListLink } from './dropListLink.svelte'; export { default as Collapsible } from './collapsible.svelte'; +export { default as CollapsibleItem } from './collapsibleItem.svelte'; export { default as DropTabs } from './dropTabs.svelte'; export { default as DropTabsItem } from './dropTabsItem.svelte'; export { default as Avatar } from './avatar.svelte'; @@ -26,4 +27,6 @@ export { default as Search } from './search.svelte'; export { default as GridItem1 } from './gridItem1.svelte'; export { default as Steps } from './steps.svelte'; export { default as Step } from './step.svelte'; +export { default as CustomId } from './customId.svelte'; +export { default as Secret } from './secret.svelte'; export { default as EventModal } from './eventModal.svelte'; diff --git a/src/lib/components/secret.svelte b/src/lib/components/secret.svelte new file mode 100644 index 000000000..e44499b89 --- /dev/null +++ b/src/lib/components/secret.svelte @@ -0,0 +1,28 @@ + + +
    + {#if show} + {value} + {:else} + •••••••••••• + {/if} +
    + + + + +
    +
    diff --git a/src/lib/constants.ts b/src/lib/constants.ts index aeaa77c21..08fad97b4 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -1,80 +1,130 @@ export const scopes = [ - 'users.read', - 'users.write', - 'teams.read', - 'teams.write', - 'collections.read', - 'collections.write', - 'attributes.read', - 'attributes.write', - 'indexes.read', - 'indexes.write', - 'documents.read', - 'documents.write', - 'files.read', - 'files.write', - 'buckets.read', - 'buckets.write', - 'functions.read', - 'functions.write', - 'execution.read', - 'execution.write', - 'locale.read', - 'avatars.read', - 'health.read' -]; - -export const events = [ - 'account.create', - 'account.update.email', - 'account.update.name', - 'account.update.password', - 'users.update.email', - 'users.update.name', - 'users.update.password', - 'account.update.prefs', - 'account.recovery.create', - 'account.recovery.update', - 'account.verification.create', - 'account.verification.update', - 'account.delete', - 'account.sessions.create', - 'account.sessions.delete', - 'account.sessions.update', - 'database.collections.create', - 'database.collections.update', - 'database.collections.delete', - 'database.attributes.create', - 'database.attributes.delete', - 'database.indexes.create', - 'database.indexes.delete', - 'database.documents.create', - 'database.documents.update', - 'database.documents.delete', - 'functions.create', - 'functions.update', - 'functions.delete', - 'functions.deployments.create', - 'functions.deployments.update', - 'functions.deployments.delete', - 'functions.executions.create', - 'functions.executions.update', - 'storage.files.create', - 'storage.files.update', - 'storage.files.delete', - 'storage.buckets.create', - 'storage.buckets.update', - 'storage.buckets.delete', - 'users.create', - 'users.update.prefs', - 'users.update.status', - 'users.delete', - 'users.sessions.delete', - 'teams.create', - 'teams.update', - 'teams.delete', - 'teams.memberships.create', - 'teams.memberships.update', - 'teams.memberships.update.status', - 'teams.memberships.delete' + { + scope: 'users.read', + description: "Access to read your project's users", + category: 'Authentication' + }, + { + scope: 'users.write', + description: "Access to create, update, and delete your project's users", + category: 'Authentication' + }, + { + scope: 'teams.read', + description: "Access to read your project's teams", + category: 'Authentication' + }, + { + scope: 'teams.write', + description: "Access to create, update, and delete your project's teams", + category: 'Authentication' + }, + { + scope: 'databases.read', + description: "Access to read your project's databases", + category: 'Database' + }, + { + scope: 'databases.write', + description: "Access to create, update, and delete your project's databases", + category: 'Database' + }, + { + scope: 'collections.read', + description: "Access to read your project's database collections", + category: 'Database' + }, + { + scope: 'collections.write', + description: "Access to create, update, and delete your project's database collections", + category: 'Database' + }, + { + scope: 'attributes.read', + description: "Access to read your project's database collection's attributes", + category: 'Database' + }, + { + scope: 'attributes.write', + description: + "Access to create, update, and delete your project's database collection's attributes", + category: 'Database' + }, + { + scope: 'indexes.read', + description: "Access to read your project's database collection's indexes", + category: 'Database' + }, + { + scope: 'indexes.write', + description: + "Access to create, update, and delete your project's database collection's indexes", + category: 'Database' + }, + { + scope: 'documents.read', + description: "Access to read your project's database documents", + category: 'Database' + }, + { + scope: 'documents.write', + description: "Access to create, update, and delete your project's database documents", + category: 'Database' + }, + { + scope: 'files.read', + description: "Access to read your project's storage files and preview images", + category: 'Storage' + }, + { + scope: 'files.write', + description: "Access to create, update, and delete your project's storage files", + category: 'Storage' + }, + { + scope: 'buckets.read', + description: "Access to read your project's storage buckets", + category: 'Storage' + }, + { + scope: 'buckets.write', + description: "Access to create, update, and delete your project's storage buckets", + category: 'Storage' + }, + { + scope: 'functions.read', + description: "Access to read your project's functions and code deployments", + category: 'Functions' + }, + { + scope: 'functions.write', + description: + "Access to create, update, and delete your project's functions and code deployments", + category: 'Functions' + }, + { + scope: 'execution.read', + description: "Access to read your project's execution logs", + category: 'Functions' + }, + { + scope: 'execution.write', + description: "Access to execute your project's functions", + category: 'Functions' + }, + { + scope: 'locale.read', + description: "Access to access your project's Locale service", + category: 'Other' + }, + { + scope: 'avatars.read', + description: "Access to access your project's Avatars service", + category: 'Other' + }, + { + scope: 'health.read', + description: "Access to read your project's health status", + category: 'Other' + } ]; diff --git a/src/lib/elements/forms/index.ts b/src/lib/elements/forms/index.ts index 966eaecaf..253517a73 100644 --- a/src/lib/elements/forms/index.ts +++ b/src/lib/elements/forms/index.ts @@ -10,6 +10,7 @@ export { default as InputNumber } from './inputNumber.svelte'; export { default as InputSwitch } from './inputSwitch.svelte'; export { default as InputTags } from './inputTags.svelte'; export { default as InputFile } from './inputFile.svelte'; +export { default as InputDateTime } from './inputDateTime.svelte'; export { default as InputSearch } from './inputSearch.svelte'; export { default as InputRadio } from './inputRadio.svelte'; export { default as InputSelect } from './inputSelect.svelte'; diff --git a/src/lib/elements/forms/inputDateTime.svelte b/src/lib/elements/forms/inputDateTime.svelte new file mode 100644 index 000000000..3869f498b --- /dev/null +++ b/src/lib/elements/forms/inputDateTime.svelte @@ -0,0 +1,58 @@ + + + + +
    + +
    + {#if error} + {error} + {/if} +
    diff --git a/src/lib/images/empty-dark.svg b/src/lib/images/empty-dark.svg index 9babf164b..2d68c7adc 100644 --- a/src/lib/images/empty-dark.svg +++ b/src/lib/images/empty-dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/lib/images/search-dark.svg b/src/lib/images/search-dark.svg new file mode 100644 index 000000000..50e36cb7c --- /dev/null +++ b/src/lib/images/search-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/lib/images/search-light.svg b/src/lib/images/search-light.svg new file mode 100644 index 000000000..b24dc18ce --- /dev/null +++ b/src/lib/images/search-light.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 181e3aade..7eb4e1f36 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -180,7 +180,7 @@ {:else}

    - {$title} + {$title ? $title : '-'}

    {/if} {#if $page.url.pathname.includes('/console/account')} diff --git a/src/lib/stores/layout.ts b/src/lib/stores/layout.ts index 04c054867..87cb2c946 100644 --- a/src/lib/stores/layout.ts +++ b/src/lib/stores/layout.ts @@ -75,3 +75,4 @@ export function updateLayout(args: updateLayoutArguments) { } export const pageLimit = readable(12); // default page limit +export const cardLimit = readable(6); // default page limit diff --git a/src/routes/console/_createOrganization.svelte b/src/routes/console/_createOrganization.svelte index 878779547..8024dff5b 100644 --- a/src/routes/console/_createOrganization.svelte +++ b/src/routes/console/_createOrganization.svelte @@ -1,5 +1,5 @@ @@ -52,7 +52,7 @@ };`}> {#each $organizationList.teams as organization, index} {@const avatarList = getMemberships(organization.$id)} - {#if index >= offset && index < limit + offset} + {#if index >= offset && index < $cardLimit + offset} {organization?.total ? organization?.total : 'No'} projects @@ -67,7 +67,7 @@ {/if} {/each} - {#if $organizationList?.total < limit + offset && ($organizationList?.total % 2 !== 0 || $organizationList?.total % 4 === 0)} + {#if $organizationList?.total < $cardLimit + offset && ($organizationList?.total % 2 !== 0 || $organizationList?.total % 4 === 0)} (addOrganization = true)}>

    Create a new organization

    @@ -76,7 +76,7 @@

    Total results: {$organizationList?.total}

    - +
    {:else} (addOrganization = true)}> @@ -84,7 +84,7 @@

    Total results: {$organizationList?.total}

    - +
    {/if}
    diff --git a/src/routes/console/organization-[organization]/+layout.svelte b/src/routes/console/organization-[organization]/+layout.svelte index a28482ca6..b3e21afb1 100644 --- a/src/routes/console/organization-[organization]/+layout.svelte +++ b/src/routes/console/organization-[organization]/+layout.svelte @@ -1,5 +1,5 @@ @@ -56,8 +59,8 @@ Name - Email - Status + Identifier + Status ID Joined @@ -67,16 +70,40 @@ href={`${base}/console/project-${project}/authentication/user/${user.$id}`}>
    - - {user.name ? user.name : 'n/a'} + {#if user.email || user.phone} + {#if user.name} + + {user.name} + {:else} +
    +
    + {/if} + {:else} +
    +
    + {user.name} + {/if}
    - {user.email} + + {user.email && user.phone + ? [user.email, user.phone].join(',') + : user.email || user.phone} + {#if user.status} - {user.emailVerification || user.phoneVerification + {user.emailVerification && user.phoneVerification ? 'verified' + : user.emailVerification + ? 'verified email' + : user.phoneVerification + ? 'verified phone' : 'unverified'} {:else} @@ -102,7 +129,7 @@ {:else if search} - +
    Sorry, we couldn’t find ‘{search}’
    @@ -128,7 +155,14 @@ type: 'user' } }}> -

    Add Your First User To Get Started

    +
    +

    Create your first User to get started.

    +

    Need a hand? Check out our documentation.

    +
    +
    + + +
    {/if} diff --git a/src/routes/console/project-[project]/authentication/_createTeam.svelte b/src/routes/console/project-[project]/authentication/_createTeam.svelte index 109e91f92..88004bd2a 100644 --- a/src/routes/console/project-[project]/authentication/_createTeam.svelte +++ b/src/routes/console/project-[project]/authentication/_createTeam.svelte @@ -1,5 +1,5 @@ @@ -48,39 +45,15 @@ placeholder="Enter name" autofocus={true} bind:value={name} /> - {#if !showDropdown} + {#if !showCustomId}
    - (showDropdown = !showDropdown)} + (showCustomId = !showCustomId)} >
    {:else} - - Team ID - - Enter a custom team ID. Leave blank for a randomly generated one. - - -
    - -
    -
    -
    -
    -
    + {/if} diff --git a/src/routes/console/project-[project]/authentication/_createUser.svelte b/src/routes/console/project-[project]/authentication/_createUser.svelte index 8f33df69f..f4c6858f4 100644 --- a/src/routes/console/project-[project]/authentication/_createUser.svelte +++ b/src/routes/console/project-[project]/authentication/_createUser.svelte @@ -1,11 +1,12 @@ @@ -78,10 +81,10 @@

    Total results: {$teamsList.total}

    - +
    {:else if search} - +
    Sorry, we couldn’t find ‘{search}’
    @@ -94,7 +97,7 @@

    Total results: {$teamsList.total}

    - +
    {:else} (showCreate = true)}> @@ -107,7 +110,14 @@ type: 'team' } }}> -

    Create your first team to get started

    +
    +

    Create your first Team to get started.

    +

    Need a hand? Check out our documentation.

    +
    +
    + + +
    {/if} diff --git a/src/routes/console/project-[project]/authentication/user/[user]/+page.svelte b/src/routes/console/project-[project]/authentication/user/[user]/+page.svelte index acdb6da79..6e2af9e5f 100644 --- a/src/routes/console/project-[project]/authentication/user/[user]/+page.svelte +++ b/src/routes/console/project-[project]/authentication/user/[user]/+page.svelte @@ -1,4 +1,5 @@
    diff --git a/src/routes/console/project-[project]/authentication/user/[user]/_deleteMembership.svelte b/src/routes/console/project-[project]/authentication/user/[user]/_deleteMembership.svelte index 8bf5f78f2..154f9c869 100644 --- a/src/routes/console/project-[project]/authentication/user/[user]/_deleteMembership.svelte +++ b/src/routes/console/project-[project]/authentication/user/[user]/_deleteMembership.svelte @@ -22,6 +22,10 @@ ); showDelete = false; dispatch('deleted'); + addNotification({ + type: 'success', + message: `Membership has been deleted` + }); await goto( `${base}/console/project-${$page.params.project}/authentication/user/${selectedMembership.userId}/memberships` ); diff --git a/src/routes/console/project-[project]/authentication/user/[user]/_deleteUser.svelte b/src/routes/console/project-[project]/authentication/user/[user]/_deleteUser.svelte index 6704ae17e..45825cac0 100644 --- a/src/routes/console/project-[project]/authentication/user/[user]/_deleteUser.svelte +++ b/src/routes/console/project-[project]/authentication/user/[user]/_deleteUser.svelte @@ -17,7 +17,7 @@ showDelete = false; addNotification({ type: 'success', - message: `${$user.name} has been deleted` + message: `${$user.name ? $user.name : 'User'} has been deleted` }); await goto(`${base}/console/project-${$page.params.project}/authentication`); } catch (error) { diff --git a/src/routes/console/project-[project]/authentication/user/[user]/memberships/+page.svelte b/src/routes/console/project-[project]/authentication/user/[user]/memberships/+page.svelte index 52de8964c..0072d3e91 100644 --- a/src/routes/console/project-[project]/authentication/user/[user]/memberships/+page.svelte +++ b/src/routes/console/project-[project]/authentication/user/[user]/memberships/+page.svelte @@ -17,6 +17,7 @@ import DeleteMembership from '../_deleteMembership.svelte'; import DeleteAllMemberships from '../_deleteAllMemberships.svelte'; import type { Models } from '@aw-labs/appwrite-console'; + import { pageLimit } from '$lib/stores/layout'; const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 32, 32).toString(); const deleted = () => (request = sdkForProject.users.listMemberships($page.params.user)); @@ -27,8 +28,6 @@ let showDelete = false; let showDeleteAll = false; - const limit = 25; - $: request = sdkForProject.users.listMemberships($page.params.user); @@ -97,7 +96,7 @@ class="u-flex u-margin-block-start-32 u-main-space-between">

    Total results: {response.total}

    - + {/await} diff --git a/src/routes/console/project-[project]/databases/+page.svelte b/src/routes/console/project-[project]/databases/+page.svelte index 98e51b371..940a2fcce 100644 --- a/src/routes/console/project-[project]/databases/+page.svelte +++ b/src/routes/console/project-[project]/databases/+page.svelte @@ -9,19 +9,19 @@ import { Container } from '$lib/layout'; import { base } from '$app/paths'; import { databaseList } from './store'; + import { cardLimit } from '$lib/stores/layout'; let showCreate = false; let search = ''; let offset = 0; - const limit = 6; const project = $page.params.project; const handleCreate = async (event: CustomEvent) => { showCreate = false; await goto(`${base}/console/project-${project}/databases/database/${event.detail.$id}`); }; - $: databaseList.load([Query.limit(limit), Query.offset(offset)], search); + $: databaseList.load([Query.limit($cardLimit), Query.offset(offset)], search); @@ -48,7 +48,7 @@ {/each} - {#if ($databaseList.total % 2 !== 0 || $databaseList.total % 4 === 0) && $databaseList.total - offset <= limit} + {#if ($databaseList.total % 2 !== 0 || $databaseList.total % 4 === 0) && $databaseList.total - offset <= $cardLimit} (showCreate = true)}>

    Create a new database

    @@ -57,7 +57,7 @@

    Total results: {$databaseList.total}

    - +
    {:else} (showCreate = true)}> diff --git a/src/routes/console/project-[project]/databases/_create.svelte b/src/routes/console/project-[project]/databases/_create.svelte index cbbb66367..864baecc4 100644 --- a/src/routes/console/project-[project]/databases/_create.svelte +++ b/src/routes/console/project-[project]/databases/_create.svelte @@ -1,5 +1,5 @@ @@ -62,7 +62,7 @@ {/each} - {#if ($collections.total % 2 !== 0 || $collections.total % 4 === 0) && $collections.total - offset <= limit} + {#if ($collections.total % 2 !== 0 || $collections.total % 4 === 0) && $collections.total - offset <= $cardLimit} (showCreate = true)}>

    Create a new collection

    @@ -71,7 +71,7 @@

    Total results: {$collections.total}

    - +
    {:else if search} @@ -87,7 +87,7 @@

    Total results: {$collections?.total}

    - +
    {:else} (showCreate = true)}> diff --git a/src/routes/console/project-[project]/databases/database/[database]/_create.svelte b/src/routes/console/project-[project]/databases/database/[database]/_create.svelte index 0c03874f3..ba64b40fb 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/_create.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/_create.svelte @@ -1,7 +1,7 @@ - - diff --git a/src/routes/console/project-[project]/keys/+page.svelte b/src/routes/console/project-[project]/keys/+page.svelte deleted file mode 100644 index 05f59eee2..000000000 --- a/src/routes/console/project-[project]/keys/+page.svelte +++ /dev/null @@ -1,62 +0,0 @@ - - - - Appwrite - API Keys - - - {#if $project} - {#if $project.keys} - - - Name - Scopes - - - {#each $project.keys as key} - - - {key.name} - - {key.scopes.length} - - {/each} - -
    - {:else} - -
    -
    No API Keys Found
    -
    - You haven't created any API keys for your project yet. -
    -
    -
    - {/if} - - {/if} -
    - diff --git a/src/routes/console/project-[project]/keys/_create.svelte b/src/routes/console/project-[project]/keys/_create.svelte deleted file mode 100644 index 055b5349c..000000000 --- a/src/routes/console/project-[project]/keys/_create.svelte +++ /dev/null @@ -1,69 +0,0 @@ - - - - - Add API Key -

    - Select AllUnselect All -

    - - {#each scopes as scope} - - {/each} - - - - -
    - diff --git a/src/routes/console/project-[project]/keys/key/[key]/+page.svelte b/src/routes/console/project-[project]/keys/key/[key]/+page.svelte deleted file mode 100644 index 691763677..000000000 --- a/src/routes/console/project-[project]/keys/key/[key]/+page.svelte +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {#await request} - loading - {:then response} -

    {response.name}

    - - {/await} -
    -
    diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index df20f7baf..2d9a9c83c 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -276,7 +276,7 @@
    -
    10
    +
    XX
    Realtime Connections
    diff --git a/src/routes/console/project-[project]/overview/keys/+page.svelte b/src/routes/console/project-[project]/overview/keys/+page.svelte index ebe4a4379..5f611048c 100644 --- a/src/routes/console/project-[project]/overview/keys/+page.svelte +++ b/src/routes/console/project-[project]/overview/keys/+page.svelte @@ -39,7 +39,7 @@ {key.name} - {toLocaleDateTime(key.$createdAt)} + {key.accessedAt ? toLocaleDateTime(key.accessedAt) : 'never'} {toLocaleDateTime(key.$updatedAt)} 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 a36510ad3..e84332823 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 @@ -2,16 +2,10 @@ import { afterNavigate } from '$app/navigation'; import { base } from '$app/paths'; import { page } from '$app/stores'; - import { CardGrid } from '$lib/components'; - import { scopes } from '$lib/constants'; - import { - Button, - Form, - FormList, - InputCheckbox, - InputPassword, - InputText - } from '$lib/elements/forms'; + import { CardGrid, Secret } from '$lib/components'; + import { Button, Form, FormList, InputText } from '$lib/elements/forms'; + import InputDateTime from '$lib/elements/forms/inputDateTime.svelte'; + import { difference } from '$lib/helpers/array'; import { toLocaleDateTime } from '$lib/helpers/date'; import { Container } from '$lib/layout'; import { updateLayout } from '$lib/stores/layout'; @@ -19,38 +13,30 @@ import { sdkForConsole } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; + import Scopes from '../scopes.svelte'; import Delete from './delete.svelte'; import { key } from './store'; const projectId = $page.params.project; const keyId = $page.params.key; - const activeScopes = scopes.reduce((prev, next) => { - prev[next] = false; - - return prev; - }, {}); let loaded = false; let showDelete = false; let name: string = null; let secret: string = null; let expire: string = null; + let scopes: string[] = null; onMount(handle); afterNavigate(handle); async function handle(event = null) { - if ($key?.$id !== keyId) { - await key.load(projectId, keyId); - } + await key.load(projectId, keyId); name ??= $key.name; secret ??= $key.secret; expire ??= $key.expire; - unselectAll(); - $key.scopes.forEach((scope) => { - activeScopes[scope] = true; - }); + scopes ??= $key.scopes; updateLayout({ navigate: event, @@ -117,12 +103,8 @@ async function updateScopes() { try { - await sdkForConsole.projects.updateKey( - $project.$id, - $key.$id, - $key.name, - scopes.filter((scope) => activeScopes[scope]) - ); + await sdkForConsole.projects.updateKey($project.$id, $key.$id, $key.name, scopes); + $key.scopes = scopes; addNotification({ type: 'success', message: 'API Key scopes has been updated' @@ -134,12 +116,6 @@ }); } } - - function unselectAll() { - for (const scope in activeScopes) { - activeScopes[scope] = false; - } - } @@ -148,13 +124,14 @@ {#if loaded} + {@const accessedAt = $key.accessedAt ? toLocaleDateTime($key.accessedAt) : 'never'}
    {$key.name}

    - Last accessed: {toLocaleDateTime($key.$updatedAt)}
    + Last accessed: {accessedAt}
    Scopes granted: {$key.scopes.length}

    @@ -164,18 +141,9 @@
    API Key Secret
    - + - - - -
    @@ -206,18 +174,16 @@ practice to allow only the permissions you need to meet your project goals.

    - - {#each scopes as scope} - - {/each} - + - +
    @@ -227,11 +193,7 @@

    Choose any name that will help you distinguish between API keys.

    - + @@ -250,7 +212,7 @@
    {$key.name}
    -

    Last accessed: {toLocaleDateTime($key.$updatedAt)}

    +

    Last accessed: {accessedAt}

    diff --git a/src/routes/console/project-[project]/overview/keys/create.svelte b/src/routes/console/project-[project]/overview/keys/create.svelte index 80765d20c..043cae7cb 100644 --- a/src/routes/console/project-[project]/overview/keys/create.svelte +++ b/src/routes/console/project-[project]/overview/keys/create.svelte @@ -1,32 +1,21 @@
    - + Create API Key - {#each scopes as scope} - - {/each} + diff --git a/src/routes/console/project-[project]/overview/keys/scopes.svelte b/src/routes/console/project-[project]/overview/keys/scopes.svelte new file mode 100644 index 000000000..d60f14730 --- /dev/null +++ b/src/routes/console/project-[project]/overview/keys/scopes.svelte @@ -0,0 +1,72 @@ + + +
    + + +
    + + {#each ['Authentication', 'Database', 'Functions', 'Storage', 'Other'] as category} + + {category} + + {#each allScopes.filter((s) => s.category === category) as scope} + + {scope.description} + + {/each} + + + {/each} + diff --git a/src/routes/console/project-[project]/overview/platforms/+page.svelte b/src/routes/console/project-[project]/overview/platforms/+page.svelte index b679ee92e..34eafdce0 100644 --- a/src/routes/console/project-[project]/overview/platforms/+page.svelte +++ b/src/routes/console/project-[project]/overview/platforms/+page.svelte @@ -21,7 +21,7 @@ -
    +
    {#each $project.platforms as platform} {platform.name} diff --git a/src/routes/console/project-[project]/storage/+page.svelte b/src/routes/console/project-[project]/storage/+page.svelte index 9de1c4927..a5a4a4a90 100644 --- a/src/routes/console/project-[project]/storage/+page.svelte +++ b/src/routes/console/project-[project]/storage/+page.svelte @@ -10,7 +10,7 @@ import { base } from '$app/paths'; import { bucketList } from './store'; import { tooltip } from '$lib/actions/tooltip'; - import { pageLimit } from '$lib/stores/layout'; + import { cardLimit } from '$lib/stores/layout'; let showCreate = false; let search = ''; @@ -22,7 +22,7 @@ await goto(`${base}/console/project-${project}/storage/bucket/${event.detail.$id}`); }; - $: bucketList.load([Query.limit($pageLimit), Query.offset(offset)], search); + $: bucketList.load([Query.limit($cardLimit), Query.offset(offset)], search); $: if (search) offset = 0; @@ -38,7 +38,7 @@ {#if $bucketList?.total}
      3 ? '22rem' : '25rem' };`}> {#each $bucketList.buckets as bucket} @@ -81,7 +81,7 @@ {/each} - {#if $bucketList.total % 2 !== 0} + {#if $bucketList?.total < $cardLimit + offset && ($bucketList?.total % 2 !== 0 || $bucketList?.total % 4 === 0)} (showCreate = true)}>

      Add a new bucket

      @@ -90,7 +90,7 @@

      Total results: {$bucketList.total}

      - +
      {:else if search} @@ -106,7 +106,7 @@

      Total results: {$bucketList?.total}

      - +
      {:else} (showCreate = true)}> diff --git a/src/routes/console/project-[project]/storage/_create.svelte b/src/routes/console/project-[project]/storage/_create.svelte index f935edb9f..8ec10ab1c 100644 --- a/src/routes/console/project-[project]/storage/_create.svelte +++ b/src/routes/console/project-[project]/storage/_create.svelte @@ -1,5 +1,5 @@ @@ -46,41 +46,15 @@ autofocus required /> - {#if !showDropdown} + {#if !showCustomId}
      - (showDropdown = !showDropdown)}> + (showCustomId = !showCustomId)}>
      {:else} - - Bucket ID - - Enter a custom bucket ID. Leave blank for a randomly generated one. - - -
      - - -
      -
      -
      -
      -
      + {/if} diff --git a/src/routes/console/project-[project]/storage/bucket/[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket/[bucket]/+page.svelte index d2789fbb1..88faf3648 100644 --- a/src/routes/console/project-[project]/storage/bucket/[bucket]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket/[bucket]/+page.svelte @@ -85,9 +85,9 @@ Filename - Type - Size - Date Created + Type + Size + Date Created @@ -95,11 +95,13 @@ {#if file.chunksTotal / file.chunksUploaded !== 1} -
      -
      +
      + {file.name} - Pending +
      + Pending +
      {file.mimeType} diff --git a/src/routes/console/project-[project]/storage/bucket/[bucket]/_create.svelte b/src/routes/console/project-[project]/storage/bucket/[bucket]/_create.svelte index 232e7e798..2a5b9b0aa 100644 --- a/src/routes/console/project-[project]/storage/bucket/[bucket]/_create.svelte +++ b/src/routes/console/project-[project]/storage/bucket/[bucket]/_create.svelte @@ -1,7 +1,7 @@ @@ -112,41 +108,16 @@

      Max file size: {calculateSize($bucket.maximumFileSize)}

      - {#if !showDropdown} + {#if !showCustomId}
      - (showDropdown = !showDropdown)}> + (showCustomId = !showCustomId)}>
      {:else} - - File ID - - Enter a custom file ID. Leave blank for a randomly generated one. - - -
      - - -
      -
      -
      -
      -
      + {/if}

      Permissions

      diff --git a/tests/unit/components/secret.test.ts b/tests/unit/components/secret.test.ts new file mode 100644 index 000000000..7225ede9a --- /dev/null +++ b/tests/unit/components/secret.test.ts @@ -0,0 +1,48 @@ +import '@testing-library/jest-dom'; +import { vi } from 'vitest'; +import { render, fireEvent } from '@testing-library/svelte'; +import { Secret } from '../../../src/lib/components'; + +const value = 'This is a secret'; + +test('shows Secret component', () => { + const { container } = render(Secret, { value }); + const secret = container.querySelector('span.text'); + const toggle = container.querySelector('[aria-label="show hidden text"]'); + const copy = container.querySelector('[aria-label="copy text"]'); + + expect(secret).toBeInTheDocument(); + expect(toggle).toBeInTheDocument(); + expect(copy).toBeInTheDocument(); +}); + +test('toggle secret', async () => { + const { container } = render(Secret, { value }); + const toggle = container.querySelector('[aria-label="show hidden text"]'); + + let secret = container.querySelector('span.text'); + expect(secret).not.toContainEqual(value); + await fireEvent.click(toggle); + + secret = container.querySelector('span.text'); + expect(secret.textContent).toEqual(value); + await fireEvent.click(toggle); + + secret = container.querySelector('span.text'); + expect(secret.textContent).not.toEqual(value); +}); + +test('copy to clipboard on click', async () => { + const { container } = render(Secret, { value }); + const copy = container.querySelector('[aria-label="copy text"]'); + + Object.assign(window.navigator, { + clipboard: { + writeText: vi.fn().mockImplementation(() => Promise.resolve()) + } + }); + + await fireEvent.click(copy); + + expect(window.navigator.clipboard.writeText).toHaveBeenCalledWith(value); +});