diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 000000000..3c1848749 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,9 @@ +# This configuration file was automatically generated by Gitpod. +# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml) +# and commit this file to your remote git repository to share the goodness with others. + +# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart + +tasks: + - init: npm install && npm run build + command: npm run dev diff --git a/package-lock.json b/package-lock.json index 46a843438..1532ae5d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,8 +7,9 @@ "name": "@appwrite/console", "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/console": "0.1.0", - "@appwrite.io/pink": "^0.0.6-rc.10", + "@analytics/google-tag-manager": "^0.5.3", + "@appwrite.io/console": "0.2.0", + "@appwrite.io/pink": "^0.0.6-rc.14", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.44.2", "@sentry/tracing": "^7.44.2", @@ -18,6 +19,7 @@ "logrocket": "^3.0.1", "pretty-bytes": "^6.1.0", "prismjs": "^1.29.0", + "svelte-confetti": "^1.2.2", "tippy.js": "^6.3.7", "web-vitals": "^3.1.1" }, @@ -113,6 +115,11 @@ "resolved": "https://registry.npmjs.org/@analytics/google-analytics/-/google-analytics-1.0.5.tgz", "integrity": "sha512-I/yfiCVQo8AeT72KPa6z571LJKDbLdm4ntDqOHiE2Xehw9UjKcXQWiKTHL1/nfOOiekfpLf/6rFS5P6dQ0vImw==" }, + "node_modules/@analytics/google-tag-manager": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@analytics/google-tag-manager/-/google-tag-manager-0.5.5.tgz", + "integrity": "sha512-bYTzseT3DRwMhkWr0+zJH6BHdk5FDZv1TqU5dHseh60zf/sl3LlWUbb8Lgl41LAOmA2Qy1frJXr3mIO1Tak8Yg==" + }, "node_modules/@analytics/localstorage-utils": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/@analytics/localstorage-utils/-/localstorage-utils-0.1.8.tgz", @@ -147,18 +154,18 @@ "integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g==" }, "node_modules/@appwrite.io/console": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.1.0.tgz", - "integrity": "sha512-GzCRUmaXAVgpGwxBNI3PrtCLHz7CM+epBHDDTHw8B2u61KbijGBO3GrwreXy91fy00RJiEzGlMSRzDgwsF3Tsg==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.2.0.tgz", + "integrity": "sha512-jgFYoskSCWaesF8zfsgYoTEKfyn6Kq3R9c5sM4AH2H+B/hmT8jwu9c3UU+LHBZ3BLdB9Zm3xOMa4bPyiQwzSeQ==", "dependencies": { "cross-fetch": "3.1.5", "isomorphic-form-data": "2.0.0" } }, "node_modules/@appwrite.io/pink": { - "version": "0.0.6-rc.10", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.6-rc.10.tgz", - "integrity": "sha512-mhpgjQVfQvghItgcCzsHN0Ynn4U9JNg8HlSJ+HVDUi/bNHxmlm7XdNJE6s65LMJ6LfepROn6zZMHquANvGfNDg==", + "version": "0.0.6-rc.14", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.6-rc.14.tgz", + "integrity": "sha512-KSfuW/MIc9aXaSjHmOB0TSyd2G/nTX8Yj49LOqOw41v649tVNfPGutvI6eTULCKve24HTYSspnHLil5Eb4Kk2Q==", "dependencies": { "@appwrite.io/pink-icons": "*", "normalize.css": "^8.0.1", @@ -8030,6 +8037,11 @@ "node": ">=4.2.0" } }, + "node_modules/svelte-confetti": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/svelte-confetti/-/svelte-confetti-1.2.4.tgz", + "integrity": "sha512-2ut7fEjfHIQ5foXuBaVwalUdl7JlyhgEkFbepGYpOx2dOGC2vjj4kkepcYr/Fl3+CyqfnVmXre1owM+3rpfJEg==" + }, "node_modules/svelte-hmr": { "version": "0.15.1", "resolved": "https://registry.npmjs.org/svelte-hmr/-/svelte-hmr-0.15.1.tgz", diff --git a/package.json b/package.json index 0e7ec8d6e..46a7648a4 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,9 @@ }, "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/console": "0.1.0", - "@appwrite.io/pink": "^0.0.6-rc.10", + "@appwrite.io/pink": "^0.0.6-rc.14", + "@appwrite.io/console": "0.2.0", + "@analytics/google-tag-manager": "^0.5.3", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.44.2", "@sentry/tracing": "^7.44.2", @@ -30,6 +31,7 @@ "logrocket": "^3.0.1", "pretty-bytes": "^6.1.0", "prismjs": "^1.29.0", + "svelte-confetti": "^1.2.2", "tippy.js": "^6.3.7", "web-vitals": "^3.1.1" }, diff --git a/src/app.html b/src/app.html index 994a0b038..3a25d1151 100644 --- a/src/app.html +++ b/src/app.html @@ -43,6 +43,8 @@ + + %sveltekit.head% diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 84c178cc4..e68e166c2 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -1,8 +1,9 @@ import { page } from '$app/stores'; import { user } from '$lib/stores/user'; -import { ENV, MODE, VARS } from '$lib/system'; +import { ENV, MODE, VARS, isCloud } from '$lib/system'; import googleAnalytics from '@analytics/google-analytics'; import { AppwriteException } from '@appwrite.io/console'; +import googleTagManager from '@analytics/google-tag-manager'; import Analytics from 'analytics'; import { get } from 'svelte/store'; @@ -11,7 +12,14 @@ const analytics = Analytics({ plugins: [ googleAnalytics({ measurementIds: [VARS.GOOGLE_ANALYTICS || 'G-R4YJ9JN8L4'] - }) + }), + ...(isCloud + ? [ + googleTagManager({ + containerId: [VARS.GOOGLE_TAG || 'GTM-P3T9TBV'] + }) + ] + : []) ] }); @@ -118,6 +126,7 @@ export enum Submit { UserCreate = 'submit_user_create', UserDelete = 'submit_user_delete', UserUpdateEmail = 'submit_user_update_email', + UserUpdateLabels = 'submit_user_update_labels', UserUpdateName = 'submit_user_update_name', UserUpdatePassword = 'submit_user_update_password', UserUpdatePhone = 'submit_user_update_phone', @@ -131,6 +140,7 @@ export enum Submit { ProjectCreate = 'submit_project_create', ProjectDelete = 'submit_project_delete', ProjectUpdateName = 'submit_project_update_name', + ProjectUpdateTeam = 'submit_project_update_team', ProjectService = 'submit_project_service', MemberCreate = 'submit_member_create', MemberDelete = 'submit_member_delete', diff --git a/src/lib/components/cardGrid.svelte b/src/lib/components/cardGrid.svelte index 2215cc6dc..748900081 100644 --- a/src/lib/components/cardGrid.svelte +++ b/src/lib/components/cardGrid.svelte @@ -19,3 +19,10 @@ {/if} + + diff --git a/src/lib/components/clickableListItem.svelte b/src/lib/components/clickableListItem.svelte index 00308d47a..78a4dbe08 100644 --- a/src/lib/components/clickableListItem.svelte +++ b/src/lib/components/clickableListItem.svelte @@ -4,11 +4,15 @@
  • -
    - -
    -
    -

    -
    + {#if $$slots.default} +
    + +
    + {/if} + {#if $$slots.desc} +
    +

    +
    + {/if}
  • diff --git a/src/lib/components/code.svelte b/src/lib/components/code.svelte index 3cb59ab48..239e6e9e7 100644 --- a/src/lib/components/code.svelte +++ b/src/lib/components/code.svelte @@ -100,7 +100,7 @@ :not(pre) > code[class*='language-'], pre[class*='language-'] { background: hsl(var(--p-box-background-color)); - padding: 0; + padding-block-start: 4%; margin: 0; } .prism-token { diff --git a/src/lib/components/drop.svelte b/src/lib/components/drop.svelte index 600700a36..1396714c4 100644 --- a/src/lib/components/drop.svelte +++ b/src/lib/components/drop.svelte @@ -14,7 +14,9 @@ export let fullWidth = false; export let fixed = false; - const dispatch = createEventDispatcher(); + const dispatch = createEventDispatcher<{ + blur: undefined; + }>(); let element: HTMLDivElement; let tooltip: HTMLDivElement; diff --git a/src/lib/components/evaluation.svelte b/src/lib/components/feedback/evaluation.svelte similarity index 100% rename from src/lib/components/evaluation.svelte rename to src/lib/components/feedback/evaluation.svelte diff --git a/src/lib/components/feedbackGeneral.svelte b/src/lib/components/feedback/feedback.svelte similarity index 54% rename from src/lib/components/feedbackGeneral.svelte rename to src/lib/components/feedback/feedback.svelte index 7cef18c38..98cb759bd 100644 --- a/src/lib/components/feedbackGeneral.svelte +++ b/src/lib/components/feedback/feedback.svelte @@ -1,40 +1,41 @@
    -

    How can we improve?

    +

    {$selectedFeedback.title}

    - Your feedback is important to us. Please be honest and tell us what you think. + {$selectedFeedback.desc}
    -
    - - - - - - + +
    diff --git a/src/lib/components/feedback/feedbackGeneral.svelte b/src/lib/components/feedback/feedbackGeneral.svelte new file mode 100644 index 000000000..183921a56 --- /dev/null +++ b/src/lib/components/feedback/feedbackGeneral.svelte @@ -0,0 +1,19 @@ + + + + + + + diff --git a/src/lib/components/feedback/feedbackNPS.svelte b/src/lib/components/feedback/feedbackNPS.svelte new file mode 100644 index 000000000..613e10514 --- /dev/null +++ b/src/lib/components/feedback/feedbackNPS.svelte @@ -0,0 +1,30 @@ + + + + How likely are you to recommend Appwrite to a friend or colleague? + +{#if $feedbackData.value} + + + + + +{/if} diff --git a/src/lib/components/feedback/index.ts b/src/lib/components/feedback/index.ts new file mode 100644 index 000000000..15d522683 --- /dev/null +++ b/src/lib/components/feedback/index.ts @@ -0,0 +1,3 @@ +export { default as Feedback } from './feedback.svelte'; +export { default as FeedbackGeneral } from './feedbackGeneral.svelte'; +export { default as FeedbackNPS } from './feedbackNPS.svelte'; diff --git a/src/lib/components/feedbackNPS.svelte b/src/lib/components/feedbackNPS.svelte deleted file mode 100644 index a9276b4a7..000000000 --- a/src/lib/components/feedbackNPS.svelte +++ /dev/null @@ -1,78 +0,0 @@ - - -
    -
    -

    How are we doing?

    - -
    -
    - At Appwrite, we value the feedback of our users. That means you! We'd love to hear what you - think. -
    - - - - How likely are you to recommend Appwrite to a friend or colleague? - - {#if value} - - - - - - {/if} -
    - - -
    - -
    diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index f891b8255..f2cf6e0ee 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -31,9 +31,6 @@ export { default as Box } from './box.svelte'; export { default as Search } from './search.svelte'; export { default as SearchQuery } from './searchQuery.svelte'; export { default as GridItem1 } from './gridItem1.svelte'; -export { default as FeedbackGeneral } from './feedbackGeneral.svelte'; -export { default as FeedbackNPS } from './feedbackNPS.svelte'; -export { default as Evaluation } from './evaluation.svelte'; export { default as Steps } from './steps.svelte'; export { default as Step } from './step.svelte'; export { default as Code } from './code.svelte'; diff --git a/src/lib/components/permissions/actions.svelte b/src/lib/components/permissions/actions.svelte index e85deb2fd..d3c7e91cc 100644 --- a/src/lib/components/permissions/actions.svelte +++ b/src/lib/components/permissions/actions.svelte @@ -20,7 +20,7 @@ } - + dispatch('create', ['any'])}> diff --git a/src/lib/components/permissions/permissions.svelte b/src/lib/components/permissions/permissions.svelte index e50feb9a6..9b9a4dbb8 100644 --- a/src/lib/components/permissions/permissions.svelte +++ b/src/lib/components/permissions/permissions.svelte @@ -12,7 +12,6 @@ {#if [...$groups]?.length} - - - Role - {#if withCreate} - Create - {/if} - Read - Update - Delete - - - - {#each [...$groups].sort(sortRoles) as [role, permission] (role)} - - - - +
    +
    + + Role + {#if withCreate} + Create + {/if} + Read + Update + Delete + + + + {#each [...$groups].sort(sortRoles) as [role, permission] (role)} + + + + - {#if withCreate} - + {#if withCreate} + + togglePermission(role, 'create')} /> + + {/if} + togglePermission(role, 'create')} /> + aria-label="Read" + checked={permission.read} + on:change={() => togglePermission(role, 'read')} /> + + + togglePermission(role, 'update')} /> + + + togglePermission(role, 'delete')} /> - {/if} - - togglePermission(role, 'read')} /> - - - togglePermission(role, 'update')} /> - - - togglePermission(role, 'delete')} /> - - -
    - -
    -
    -
    - {/each} -
    -
    + +
    + +
    +
    + + {/each} + + +
    + import { goto } from '$app/navigation'; import { trackEvent } from '$lib/actions/analytics'; + import { last } from '$lib/helpers/array'; + import { getElementDir } from '$lib/helpers/style'; + import { waitUntil } from '$lib/helpers/waitUntil'; export let selected = false; export let href: string = null; export let event: string = null; - function track() { - if (!event) return; - trackEvent(`click_select_tab_${event}`); + async function handleClick(e: Event) { + if (event) { + trackEvent(`click_select_tab_${event}`); + } + + if (href) { + let el = e.target as HTMLElement; + if (el.tagName !== 'A') { + el = el.closest('a'); + } + + await goto(href); + await waitUntil(() => { + console.log('tickUntil', el); + return el.classList.contains('is-selected'); + }, 1000); + el.focus(); + } + } + + const keysMap = { + ltr: { + next: 'ArrowRight', + prev: 'ArrowLeft' + }, + rtl: { + next: 'ArrowLeft', + prev: 'ArrowRight' + } + }; + + function handleKeyDown(e: KeyboardEvent) { + const tabBtn = e.target as HTMLElement; + const tabItem = tabBtn.closest('.tabs-item') as HTMLElement; + const tabsList = tabItem.closest('.tabs') as HTMLElement; + const tabItems = Array.from(tabsList.querySelectorAll('.tabs-item')); + const currentIdx = tabItems.indexOf(tabItem); + + const dir = getElementDir(tabsList); + + switch (e.key) { + case 'Home': { + e.preventDefault(); + const firstTabBtn = tabItems[0].querySelector('.tabs-button') as HTMLElement; + firstTabBtn.focus(); + break; + } + case 'End': { + e.preventDefault(); + const lastTabBtn = last(tabItems).querySelector('.tabs-button') as HTMLElement; + lastTabBtn.focus(); + break; + } + case keysMap[dir].next: { + e.preventDefault(); + const nextIdx = currentIdx === tabItems.length - 1 ? 0 : currentIdx + 1; + const nextTabBtn = tabItems[nextIdx].querySelector('.tabs-button') as HTMLElement; + nextTabBtn.focus(); + break; + } + case keysMap[dir].prev: { + e.preventDefault(); + const prevIdx = currentIdx === 0 ? tabItems.length - 1 : currentIdx - 1; + const prevTabBtn = tabItems[prevIdx].querySelector('.tabs-button') as HTMLElement; + prevTabBtn.focus(); + break; + } + } }
  • {#if href} - + {:else} @@ -22,7 +98,10 @@ class="tabs-button" class:is-selected={selected} on:click|preventDefault - on:click={track}> + on:click={handleClick} + tabindex={selected ? 0 : -1} + on:keydown={handleKeyDown} + role="tab"> {/if} diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index 82d7d499b..7ac403079 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -84,7 +84,7 @@ class="icon-view-boards u-opacity-50" aria-hidden="true" aria-label="columns" /> - Columns + Columns {selectedColumnsNumber} diff --git a/src/lib/elements/forms/button.svelte b/src/lib/elements/forms/button.svelte index 8ac92c1d8..e23f584e4 100644 --- a/src/lib/elements/forms/button.svelte +++ b/src/lib/elements/forms/button.svelte @@ -6,6 +6,7 @@ export let submit = false; export let secondary = false; + export let github = false; export let text = false; export let danger = false; export let disabled = false; @@ -44,6 +45,7 @@ class:is-disabled={disabled} class:is-only-icon={round} class:is-secondary={secondary} + class:is-github={github} class:is-text={text} class:is-danger={danger} class:is-full-width={fullWidth} @@ -59,6 +61,7 @@ class="button" class:is-only-icon={round} class:is-secondary={secondary} + class:is-github={github} class:is-danger={danger} class:is-text={text} class:is-full-width={fullWidth} @@ -68,3 +71,17 @@ {/if} + + diff --git a/src/lib/elements/forms/formItem.svelte b/src/lib/elements/forms/formItem.svelte index d1301d5d6..3e08ea271 100644 --- a/src/lib/elements/forms/formItem.svelte +++ b/src/lib/elements/forms/formItem.svelte @@ -1,3 +1,7 @@ -
  • + + +
  • diff --git a/src/lib/elements/forms/inputFile.svelte b/src/lib/elements/forms/inputFile.svelte index 0c73f3dc2..e85d755e2 100644 --- a/src/lib/elements/forms/inputFile.svelte +++ b/src/lib/elements/forms/inputFile.svelte @@ -1,11 +1,12 @@ `.${n}`).join(',')} type="file" @@ -123,7 +152,7 @@ {fileSize.value + fileSize.unit} - {#if $feedback.type === 'nps'} - - {:else} - - {/if} + + transition:slideFade={{ duration: 150 }}> {#if $organizationList?.total}
      @@ -139,7 +141,7 @@ (showDropdown = false)}> - Your Account + Your account - Sign Out + Sign out
    @@ -200,9 +202,81 @@
    + {#if isCloud} +
    + + Claim your Cloud card + +
    + {/if} {/if} {/if} + + diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index fcaabd80f..7b27b8b3d 100644 --- a/src/lib/layout/logs.svelte +++ b/src/lib/layout/logs.svelte @@ -17,7 +17,7 @@ function isDeployment(data: Models.Deployment | Models.Execution): data is Models.Deployment { if ('buildId' in data) { selectedTab = 'logs'; - rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/deployment/${$log.data.$id}?mode=admin&project=${$page.params.project}`; + rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/deployments/${$log.data.$id}?mode=admin&project=${$page.params.project}`; return true; } } @@ -25,7 +25,7 @@ function isExecution(data: Models.Deployment | Models.Execution): data is Models.Execution { if ('trigger' in data) { selectedTab = 'response'; - rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/execution/${$log.data.$id}?mode=admin&project=${$page.params.project}`; + rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/executions/${$log.data.$id}?mode=admin&project=${$page.params.project}`; return true; } } diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index 15790203b..96892c26b 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -1,10 +1,15 @@ @@ -122,6 +136,24 @@ Storage +
  • + trackEvent('click_menu_settings')} + class:is-selected={$page.url.pathname.startsWith( + `${projectPath}/settings` + )} + title="Settings" + use:tooltip={{ + content: 'Settings', + placement: 'right', + disabled: !narrow + }}> + +
  • @@ -129,7 +161,7 @@
    trackEvent('click_menu_settings')} class:is-selected={$page.url.pathname.startsWith(`${projectPath}/settings`)} @@ -142,6 +174,13 @@ +
      +
    • + +
    • +
    {/if} diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte index e2470d309..3f4ebff5f 100644 --- a/src/lib/layout/unauthenticated.svelte +++ b/src/lib/layout/unauthenticated.svelte @@ -1,10 +1,17 @@ -
    -
    - -
    +
    +

    Cloud is Live

    + + +
    -
    -
    - {#if $app.themeInUse === 'dark'} - - {:else} - - {/if} -
    +

    Now in public beta

    -
    +
    + +
    +

    Integrate with your favourite technologies

    +
      + {#each technologies as tech} +
    • + +
    • + {/each} +
    +
    +
    +
    + {:else} +
    +
    + + Appwrite + +
    -
    -
    -

    Integrate with your favourite technologies

    -
      - {#each technologies as tech} -
    • - -
    • - {/each} -
    -
    -
    -
    -
    -
    +
    +
    + {#if $app.themeInUse === 'dark'} + + {:else} + + {/if} +
    + +
    + +
    +
    +

    Integrate with your favourite technologies

    +
      + {#each technologies as tech} +
    • + +
    • + {/each} +
    +
    +
    +
    + {/if} +
    +
    + {#if isCloud} + + +
    +
    Public beta
    +
    + {/if} +
    -

    -
    +

    + {#if isCloud} + + + {/if} + +

    +
    @@ -83,12 +178,181 @@
    - -
    -

    - -

    -
    + + diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte index f4240c357..3e2b5c872 100644 --- a/src/lib/layout/usage.svelte +++ b/src/lib/layout/usage.svelte @@ -13,9 +13,8 @@ @@ -72,76 +62,6 @@ {/if} - - - {#if created} - {total(created)} -

    {createdMetadata.title}

    -
    -
    - [e.date, e.value])], - color: Colors.Secondary - } - ]} /> -
    - {/if} - - - {#if read} - {total(read)} -

    {readMetadata.title}

    -
    -
    - [e.date, e.value])], - color: Colors.Tertiary - } - ]} /> -
    - {/if} - - - {#if updated} - {total(updated)} -

    {updatedMetadata.title}

    -
    -
    - [e.date, e.value])], - color: Colors.Quaternary - } - ]} /> -
    - {/if} - - - {#if deleted} - {total(deleted)} -

    {deletedMetadata.title}

    -
    -
    - [e.date, e.value])], - color: Colors.Quinary - } - ]} /> -
    - {/if} - - diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index de3611aee..6273f45a4 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -31,7 +31,9 @@ export const load: LayoutLoad = async ({ depends, url }) => { '/invite', '/auth/magic-url', '/auth/oauth2/success', - '/auth/oauth2/failure' + '/auth/oauth2/failure', + '/card', + '/hackathon' ]; if (!acceptedRoutes.some((n) => url.pathname.startsWith(n))) { diff --git a/src/routes/auth/oauth2/failure/+page.svelte b/src/routes/auth/oauth2/failure/+page.svelte index 359c6ffdc..928ad82c4 100644 --- a/src/routes/auth/oauth2/failure/+page.svelte +++ b/src/routes/auth/oauth2/failure/+page.svelte @@ -2,20 +2,56 @@ import { goto } from '$app/navigation'; import { page } from '$app/stores'; import { Heading } from '$lib/components'; - import { onMount } from 'svelte'; - onMount(async () => { - const project = $page.url.searchParams.get('project'); - if (project) { - await goto(`appwrite-callback-${project}://${$page.url.search}`); + const project = $page.url.searchParams.get('project'); + const link = `appwrite-callback-${project}://${$page.url.search}`; + + const redirect = new Promise((resolve, reject) => { + if (!project) { + reject('no-project'); } + // this timeout is needed because goto does not + // throw an exception if the redirect does not work + setTimeout(() => reject('timeout'), 500); + // goto will resolve on successful redirect + goto(link).then(resolve); }); -Missing Redirect URL -

    - Your OAuth login flow is missing a proper redirect URL. Please check the - OAuth docs - and send request for new session with a valid callback URL. -

    +{#await redirect then} +
    +
    + Login failed +

    You will be automatically redirected back to your app shortly.

    +

    + If you are not redirected, please click on the following + link. +

    +
    +
    +{:catch} +
    +
    + Missing Redirect URL +

    + Your OAuth login flow is missing a proper redirect URL. Please check the + OAuth docs + and send request for new session with a valid callback URL. +

    +
    +
    +{/await} + + diff --git a/src/routes/auth/oauth2/success/+page.svelte b/src/routes/auth/oauth2/success/+page.svelte index 359c6ffdc..b67ad0ce6 100644 --- a/src/routes/auth/oauth2/success/+page.svelte +++ b/src/routes/auth/oauth2/success/+page.svelte @@ -2,20 +2,56 @@ import { goto } from '$app/navigation'; import { page } from '$app/stores'; import { Heading } from '$lib/components'; - import { onMount } from 'svelte'; - onMount(async () => { - const project = $page.url.searchParams.get('project'); - if (project) { - await goto(`appwrite-callback-${project}://${$page.url.search}`); + const project = $page.url.searchParams.get('project'); + const link = `appwrite-callback-${project}://${$page.url.search}`; + + const redirect = new Promise((resolve, reject) => { + if (!project) { + reject('no-project'); } + // this timeout is needed because goto does not + // throw an exception if the redirect does not work + setTimeout(() => reject('timeout'), 500); + // goto will resolve on successful redirect + goto(link).then(resolve); }); -Missing Redirect URL -

    - Your OAuth login flow is missing a proper redirect URL. Please check the - OAuth docs - and send request for new session with a valid callback URL. -

    +{#await redirect then} +
    +
    + You're now logged in +

    You will be automatically redirected back to your app shortly.

    +

    + If you are not redirected, please click on the following + link. +

    +
    +
    +{:catch} +
    +
    + Missing Redirect URL +

    + Your OAuth login flow is missing a proper redirect URL. Please check the + OAuth docs + and send request for new session with a valid callback URL. +

    +
    +
    +{/await} + + diff --git a/src/routes/card/+layout.svelte b/src/routes/card/+layout.svelte new file mode 100644 index 000000000..9a0263a42 --- /dev/null +++ b/src/routes/card/+layout.svelte @@ -0,0 +1,13 @@ + + + + + +
    + diff --git a/src/routes/card/+page.ts b/src/routes/card/+page.ts new file mode 100644 index 000000000..209eeb5aa --- /dev/null +++ b/src/routes/card/+page.ts @@ -0,0 +1,10 @@ +import { isCloud } from '$lib/system'; +import { redirect } from '@sveltejs/kit'; + +export async function load({ parent }) { + if (!isCloud) throw redirect(303, '/'); + const { account } = await parent(); + if (!account) throw redirect(303, '/login'); + + throw redirect(303, `/card/${account.$id}`); +} diff --git a/src/routes/card/Card.svelte b/src/routes/card/Card.svelte new file mode 100644 index 000000000..d89854f82 --- /dev/null +++ b/src/routes/card/Card.svelte @@ -0,0 +1,458 @@ + + + + + + +
    +
    + +
    +
    + + diff --git a/src/routes/card/[uid]/+page.svelte b/src/routes/card/[uid]/+page.svelte new file mode 100644 index 000000000..dc6332a5c --- /dev/null +++ b/src/routes/card/[uid]/+page.svelte @@ -0,0 +1,430 @@ + + + + + {seo.title} + + + +
    +
    +

    + {title} + +

    + +
    +
    + {#if variant === 'owner'} +

    Share your card

    + {:else if variant === 'external'} +

    Share card

    + {/if} + {#if variant === 'external'} + Claim your card + {/if} +
    +
    + The front of the card +
      +
    • + + +
    • + {#if variant === 'owner'} +
    • + +
    • + {/if} +
    • + +
    • +
    + +
    +
    + {#if !cardActive} +
    + +
    + {/if} + {#if browser} + + {/if} +
    + {#if cardActive} +
    (cardActive = false)} + on:keydown={() => { + /* no-op */ + }} + transition:fade|local /> + {/if} +
    + +
    +
    + + + Get Embed Code +
    + +
    + + + +
    + + diff --git a/src/routes/card/[uid]/+page.ts b/src/routes/card/[uid]/+page.ts new file mode 100644 index 000000000..83535bd2e --- /dev/null +++ b/src/routes/card/[uid]/+page.ts @@ -0,0 +1,58 @@ +import { VARS } from '$lib/system.js'; +import { redirect } from '@sveltejs/kit'; + +function getCardImgUrls(userId: string, endpoint: string) { + const resolved = endpoint; + + const frontImg = `${resolved}/cards/cloud?userId=${userId}`; + const backImg = `${resolved}/cards/cloud-back?userId=${userId}`; + const ogImg = `${resolved}/cards/cloud-og?userId=${userId}`; + + return { frontImg, backImg, ogImg }; +} + +async function urlContentToDataUri(url: string): Promise { + const res = await fetch(url); + const blob = await res.blob(); + + return await new Promise((callback) => { + const reader = new FileReader(); + reader.onload = function () { + if (typeof this.result !== 'string') return ''; + callback(this.result); + }; + reader.readAsDataURL(blob); + }); +} + +export async function load({ params, url, parent }) { + const { account } = await parent(); + + const userId = params.uid; + const endpoint = VARS.APPWRITE_ENDPOINT ?? `${url.origin}/v1`; + const { frontImg, backImg } = getCardImgUrls(userId, endpoint); + + try { + const res = await fetch(frontImg); + + if (!res.ok) { + throw redirect(303, '/'); + } + + return { + userId: params.uid, + base64: { + front: await urlContentToDataUri(frontImg), + back: await urlContentToDataUri(backImg) + }, + isOwner: account && account.$id === userId, + imgUrls: { + frontImg, + backImg + } + }; + } catch (e) { + console.error(e); + throw redirect(303, '/'); + } +} diff --git a/src/routes/card/helpers.ts b/src/routes/card/helpers.ts new file mode 100644 index 000000000..e59c305f9 --- /dev/null +++ b/src/routes/card/helpers.ts @@ -0,0 +1,9 @@ +export function getCardImgUrls(userId: string, endpoint: string) { + const resolved = endpoint; + + const frontImg = `${resolved}/cards/cloud?userId=${userId}`; + const backImg = `${resolved}/cards/cloud-back?userId=${userId}`; + const ogImg = `${resolved}/cards/cloud-og?userId=${userId}`; + + return { frontImg, backImg, ogImg }; +} diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte index 870794b40..dd12b92c7 100644 --- a/src/routes/console/+layout.svelte +++ b/src/routes/console/+layout.svelte @@ -7,7 +7,7 @@ import Header from '$lib/layout/header.svelte'; import SideNavigation from '$lib/layout/navigation.svelte'; import Shell from '$lib/layout/shell.svelte'; - import { feedback } from '$lib/stores/app'; + import { feedback } from '$lib/stores/feedback'; import { log } from '$lib/stores/logs'; import { newOrgModal } from '$lib/stores/organization'; import { wizard } from '$lib/stores/wizard'; @@ -15,6 +15,8 @@ import { loading } from '../store'; import Create from './createOrganization.svelte'; + let isOpen = false; + onMount(() => { loading.set(false); @@ -47,12 +49,14 @@
    - +
    diff --git a/src/routes/console/+layout.ts b/src/routes/console/+layout.ts index 65de11ecd..184409719 100644 --- a/src/routes/console/+layout.ts +++ b/src/routes/console/+layout.ts @@ -2,7 +2,12 @@ import { sdk } from '$lib/stores/sdk'; import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async () => { - const response = await fetch(`${sdk.forConsole.client.config.endpoint}/health/version`); + const { endpoint, project } = sdk.forConsole.client.config; + const response = await fetch(`${endpoint}/health/version`, { + headers: { + 'X-Appwrite-Project': project + } + }); const data = await response.json(); return { diff --git a/src/routes/console/account/organizations/+page.ts b/src/routes/console/account/organizations/+page.ts index f3cef11bb..0b89b1d30 100644 --- a/src/routes/console/account/organizations/+page.ts +++ b/src/routes/console/account/organizations/+page.ts @@ -15,7 +15,7 @@ export const load: PageLoad = async ({ url, route }) => { organizations: await sdk.forConsole.teams.list([ Query.offset(offset), Query.limit(limit), - Query.orderDesc('$createdAt') + Query.orderDesc('') ]) }; }; diff --git a/src/routes/console/feedbackWizard.svelte b/src/routes/console/feedbackWizard.svelte new file mode 100644 index 000000000..fd55199c3 --- /dev/null +++ b/src/routes/console/feedbackWizard.svelte @@ -0,0 +1,25 @@ + + + diff --git a/src/routes/console/organization-[organization]/+page.svelte b/src/routes/console/organization-[organization]/+page.svelte index d039ac7d3..2b5d3759b 100644 --- a/src/routes/console/organization-[organization]/+page.svelte +++ b/src/routes/console/organization-[organization]/+page.svelte @@ -8,6 +8,8 @@ import CreateOrganization from '../createOrganization.svelte'; import type { PageData } from './$types'; import { page } from '$app/stores'; + import { services } from '$lib/stores/project-services'; + import type { Models } from '@appwrite.io/console'; export let data: PageData; @@ -38,6 +40,17 @@ return { name, icon }; }; + function allServiceDisabled(project: Models.Project): boolean { + let disabled = true; + services.load(project); + $services.list.forEach((service) => { + if (service.value) { + disabled = false; + } + }); + return disabled; + } + function filterPlatforms(platforms: { name: string; icon: string }[]) { return platforms.filter( (value, index, self) => index === self.findIndex((t) => t.name === value.name) @@ -67,6 +80,11 @@ {project.name} + {#if allServiceDisabled(project)} +

    +

    + {/if} {@const platforms = filterPlatforms( project.platforms.map((platform) => getPlatformInfo(platform.type)) )} diff --git a/src/routes/console/organization-[organization]/+page.ts b/src/routes/console/organization-[organization]/+page.ts index 279a55084..fab93a7b4 100644 --- a/src/routes/console/organization-[organization]/+page.ts +++ b/src/routes/console/organization-[organization]/+page.ts @@ -14,9 +14,9 @@ export const load: PageLoad = async ({ params, url, route }) => { limit, projects: await sdk.forConsole.projects.list([ Query.offset(offset), - Query.limit(limit), Query.equal('teamId', params.organization), - Query.orderDesc('$createdAt') + Query.limit(CARD_LIMIT), + Query.orderDesc('') ]) }; }; diff --git a/src/routes/console/project-[project]/auth/+page.svelte b/src/routes/console/project-[project]/auth/+page.svelte index 0063f7ea1..2dee0dbfb 100644 --- a/src/routes/console/project-[project]/auth/+page.svelte +++ b/src/routes/console/project-[project]/auth/+page.svelte @@ -19,7 +19,7 @@ TableRowLink } from '$lib/elements/table'; import { Pill } from '$lib/elements'; - import { toLocaleDateTime } from '$lib/helpers/date'; + import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date'; import { Container } from '$lib/layout'; import { base } from '$app/paths'; import { goto } from '$app/navigation'; @@ -29,6 +29,13 @@ export let data: PageData; + // TODO: Remove this when the console SDK is updated + const users = data.users.users.map((user) => { + const labels: string[] = []; + const accessedAt = ''; + return { accessedAt, labels, ...user }; + }); + let showCreate = false; const projectId = $page.params.project; async function userCreated(event: CustomEvent>>) { @@ -49,10 +56,12 @@ Identifiers Status ID + Labels Joined + Last Activity - {#each data.users.users as user} + {#each users as user} @@ -102,9 +111,15 @@ + + {user.labels.join(', ')} + {toLocaleDateTime(user.registration)} + + {user.accessedAt ? toLocaleDate(user.accessedAt) : 'never'} + {/each} diff --git a/src/routes/console/project-[project]/auth/+page.ts b/src/routes/console/project-[project]/auth/+page.ts index 97b6ad3d3..11d793706 100644 --- a/src/routes/console/project-[project]/auth/+page.ts +++ b/src/routes/console/project-[project]/auth/+page.ts @@ -16,7 +16,7 @@ export const load: PageLoad = async ({ url, route }) => { search, page, users: await sdk.forProject.users.list( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')], + [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search ) }; diff --git a/src/routes/console/project-[project]/auth/appleOAuth.svelte b/src/routes/console/project-[project]/auth/appleOAuth.svelte index 88b48040c..850ae6721 100644 --- a/src/routes/console/project-[project]/auth/appleOAuth.svelte +++ b/src/routes/console/project-[project]/auth/appleOAuth.svelte @@ -63,9 +63,7 @@

    URI

    + value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
    diff --git a/src/routes/console/project-[project]/auth/auth0OAuth.svelte b/src/routes/console/project-[project]/auth/auth0OAuth.svelte index b8e0fa35c..52e46a680 100644 --- a/src/routes/console/project-[project]/auth/auth0OAuth.svelte +++ b/src/routes/console/project-[project]/auth/auth0OAuth.svelte @@ -72,9 +72,7 @@

    URI

    + value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
    diff --git a/src/routes/console/project-[project]/auth/authentikOAuth.svelte b/src/routes/console/project-[project]/auth/authentikOAuth.svelte index 350fac230..e204be4e0 100644 --- a/src/routes/console/project-[project]/auth/authentikOAuth.svelte +++ b/src/routes/console/project-[project]/auth/authentikOAuth.svelte @@ -72,9 +72,7 @@

    URI

    + value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
    diff --git a/src/routes/console/project-[project]/auth/gitlabOAuth.svelte b/src/routes/console/project-[project]/auth/gitlabOAuth.svelte index 934d73801..510e4a5c6 100644 --- a/src/routes/console/project-[project]/auth/gitlabOAuth.svelte +++ b/src/routes/console/project-[project]/auth/gitlabOAuth.svelte @@ -70,9 +70,7 @@

    URI

    + value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
    diff --git a/src/routes/console/project-[project]/auth/mainOAuth.svelte b/src/routes/console/project-[project]/auth/mainOAuth.svelte index 684e8ff81..36d0aa89f 100644 --- a/src/routes/console/project-[project]/auth/mainOAuth.svelte +++ b/src/routes/console/project-[project]/auth/mainOAuth.svelte @@ -63,9 +63,7 @@

    URI

    + value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
    diff --git a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte index e404fec84..10925962a 100644 --- a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte +++ b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte @@ -72,9 +72,7 @@

    URI

    + value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
    diff --git a/src/routes/console/project-[project]/auth/oidcOAuth.svelte b/src/routes/console/project-[project]/auth/oidcOAuth.svelte new file mode 100644 index 000000000..6fade4f7f --- /dev/null +++ b/src/routes/console/project-[project]/auth/oidcOAuth.svelte @@ -0,0 +1,125 @@ + + + + {provider.name} OAuth2 Settings + +

    + To use {provider.name} authentication in your application, first fill in this form. For more + info you can + visit the docs. +

    + + + + + + + + + + To complete set up, add this OAuth2 redirect URI to your {provider.name} app configuration. + +
    +

    URI

    + +
    +
    + + + + +
    diff --git a/src/routes/console/project-[project]/auth/oktaOAuth.svelte b/src/routes/console/project-[project]/auth/oktaOAuth.svelte index 98f607df1..548a99576 100644 --- a/src/routes/console/project-[project]/auth/oktaOAuth.svelte +++ b/src/routes/console/project-[project]/auth/oktaOAuth.svelte @@ -82,9 +82,7 @@

    URI

    + value={`${sdk.forConsole.client.config.endpoint}/account/sessions/oauth2/callback/${provider.key}/${projectId}`} />
    diff --git a/src/routes/console/project-[project]/auth/settings/+page.svelte b/src/routes/console/project-[project]/auth/settings/+page.svelte index 42f640d07..afacc54eb 100644 --- a/src/routes/console/project-[project]/auth/settings/+page.svelte +++ b/src/routes/console/project-[project]/auth/settings/+page.svelte @@ -75,7 +75,7 @@ on:click={() => { selectedProvider = provider; trackEvent(`click_select_provider`, { - provider: provider.name.toLowerCase() + provider: provider.key.toLowerCase() }); }}>
    diff --git a/src/routes/console/project-[project]/auth/teams/+page.ts b/src/routes/console/project-[project]/auth/teams/+page.ts index e54ff32e6..869168532 100644 --- a/src/routes/console/project-[project]/auth/teams/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/+page.ts @@ -16,7 +16,7 @@ export const load: PageLoad = async ({ url, route }) => { search, page, teams: await sdk.forProject.teams.list( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')], + [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search ) }; diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts index 2350d7f61..dede7fe00 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts @@ -18,7 +18,7 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { limit, memberships: await sdk.forProject.teams.listMemberships( teamId, - [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')], + [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search ) }; diff --git a/src/routes/console/project-[project]/auth/updateOAuth.ts b/src/routes/console/project-[project]/auth/updateOAuth.ts index 8e7f3272e..f148c41a3 100644 --- a/src/routes/console/project-[project]/auth/updateOAuth.ts +++ b/src/routes/console/project-[project]/auth/updateOAuth.ts @@ -28,7 +28,7 @@ export async function updateOAuth({ try { await sdk.forConsole.projects.updateOAuth2( projectId, - provider.name.toLowerCase(), + provider.key, appId || undefined, secret || undefined, enabled diff --git a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte index 879419d72..33ef1bac0 100644 --- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte @@ -5,38 +5,14 @@ export let data: PageData; - $: count = data.count; - $: created = data.created; - $: read = data.read; - $: updated = data.updated; - $: deleted = data.deleted; + $: count = data.usersTotal; diff --git a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts index 6ba6fec31..b4a930690 100644 --- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts @@ -8,11 +8,7 @@ export const load: PageLoad = async ({ params }) => { try { const response = await sdk.forProject.users.getUsage(period ?? '30d'); return { - count: response.usersCount as unknown as Models.Metric[], - created: response.usersCreate as unknown as Models.Metric[], - read: response.usersRead as unknown as Models.Metric[], - updated: response.usersUpdate as unknown as Models.Metric[], - deleted: response.usersDelete as unknown as Models.Metric[] + usersTotal: response.usersTotal as unknown as Models.Metric[] }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/auth/user-[user]/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/+page.svelte index b48becb71..04ef2f14a 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/+page.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/+page.svelte @@ -2,6 +2,7 @@ import { Container } from '$lib/layout'; import DangerZone from './dangerZone.svelte'; import UpdateEmail from './updateEmail.svelte'; + import UpdateLabels from './updateLabels.svelte'; import UpdateName from './updateName.svelte'; import UpdatePassword from './updatePassword.svelte'; import UpdatePhone from './updatePhone.svelte'; @@ -15,6 +16,7 @@ + diff --git a/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte b/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte index 8fa2ff05d..a04d1cfc0 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte @@ -1,10 +1,14 @@ @@ -42,6 +46,7 @@ ? [$user.email, $user.phone].join(',') : $user.email || $user.phone}

    +

    Last activity: {accessedAt ? toLocaleDate(accessedAt) : 'never'}

    diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte index 62ff255f8..8a18491e3 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte @@ -36,6 +36,11 @@
    Email +

    + Update user's email. An Email should be formatted as: name@example.com. +

      + import { onMount } from 'svelte'; + import { invalidate } from '$app/navigation'; + import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; + import { CardGrid, Heading } from '$lib/components'; + import { Dependencies } from '$lib/constants'; + import { Button, Form, Helper, InputTags } from '$lib/elements/forms'; + import { symmetricDifference } from '$lib/helpers/array'; + import { addNotification } from '$lib/stores/notifications'; + import { sdk } from '$lib/stores/sdk'; + import { user } from './store'; + import { Pill } from '$lib/elements'; + + const alphaNumericRegExp = /^[a-zA-Z0-9]+$/; + let suggestedLabels = ['admin', 'premium', 'mvp']; + let labels: string[] = []; + let error = ''; + + onMount(async () => { + // TODO: Remove type cast when console SDK is updated + labels = [...($user as unknown as { labels: string[] }).labels]; + }); + + async function updateLabels() { + try { + // TODO: Use SDK method when console SDK is updated + // await sdk.forProject.users.updateLabels($user.$id, labels); + const path = `/users/${$user.$id}/labels`; + await sdk.forProject.client.call( + 'PUT', + new URL(sdk.forConsole.client.config.endpoint + path), + { + 'content-type': 'application/json' + }, + { + labels: labels + } + ); + await invalidate(Dependencies.USER); + isDisabled = true; + + addNotification({ + message: 'User labels have been updated', + type: 'success' + }); + trackEvent(Submit.UserUpdateLabels); + } catch (error) { + addNotification({ + message: error.message, + type: 'error' + }); + trackError(error, Submit.UserUpdateLabels); + } + } + + // TODO: Remove type cast when console SDK is updated + $: isDisabled = + !!error || + !symmetricDifference(labels, ($user as unknown as { labels: string[] }).labels).length; + $: if (labels) { + const invalidLabels = []; + + labels.forEach((label) => { + if (!alphaNumericRegExp.test(label)) { + invalidLabels.push(label); + } + }); + + if (invalidLabels.length) { + error = `Invalid labels: ${invalidLabels.join(', ')}`; + } else { + error = ''; + } + } + + + + + Labels +

      + Categorize and manage your users based on specific criteria by assigning them + customizable labels. New label-based roles will be assigned. +

      + +
        + +
      • + {error ? error : 'Only alphanumeric characters are allowed'} +
      • +
      • + {#each suggestedLabels as suggestedLabel} + { + if (!labels.includes(suggestedLabel)) { + labels = [...labels, suggestedLabel]; + } else { + labels = labels.filter((e) => e !== suggestedLabel); + } + }}> + + {/each} +
      • +
      +
      + + + + +
      + diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte index 044408912..0045cb093 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte @@ -33,9 +33,7 @@ Password
    -

    - Enter a new password. A password must contain at least 8 characters. -

    +

    Enter a new password. A password must contain at least 8 characters.

      Phone +

      + Update user's phone. A phone number must contain leading '+' and maximum of 15 digits. +

        - User Preferences -

        - You can update your user preferences by storing information on the user's objects so - they can easily be shared across devices and sessions. -

        + Preferences +

        Add custom user preferences to share them across devices and sessions.

          diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte index 60a2189d1..80fe968c8 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Pill } from '$lib/elements'; import { Button } from '$lib/elements/forms'; - import { toLocaleDateTime } from '$lib/helpers/date'; + import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; import { user } from './store'; @@ -71,6 +71,9 @@ trackError(error, Submit.UserUpdateStatus); } } + + // TODO: Remove this when the console SDK is updated + $: accessedAt = ($user as unknown as { accessedAt: string }).accessedAt; @@ -100,6 +103,7 @@

          {$user.phone}

          {/if}

          Joined: {toLocaleDateTime($user.registration)}

          +

          Last activity: {accessedAt ? toLocaleDate(accessedAt) : 'never'}

    {#if !$user.status} blocked diff --git a/src/routes/console/project-[project]/databases/+page.svelte b/src/routes/console/project-[project]/databases/+page.svelte index 0d0e1e553..490fdb8d1 100644 --- a/src/routes/console/project-[project]/databases/+page.svelte +++ b/src/routes/console/project-[project]/databases/+page.svelte @@ -24,7 +24,12 @@ - +
    - {attribute.key} + {attribute.key}
    {#if attribute.status !== 'available'} { - return ![ - '$id', - '$collection', - '$collectionId', - '$databaseId', - '$createdAt', - '$updatedAt' - ].includes(key); - }) - .reduce((obj, key) => { - obj[key] = $doc[key]; - return obj; - }, {}) as Models.Document - ); + function initWork() { + const prohibitedKeys = [ + '$id', + '$collection', + '$collectionId', + '$databaseId', + '$createdAt', + '$updatedAt' + ]; + + const filteredKeys = Object.keys($doc).filter((key) => { + return !prohibitedKeys.includes(key); + }); + + const result = filteredKeys.reduce((obj, key) => { + obj[key] = $doc[key]; + return obj; + }, {}); + + return writable(deepClone(result as Models.Document)); + } + + const work = initWork(); async function updateData() { try { @@ -52,7 +59,7 @@ invalidate(Dependencies.DOCUMENT); trackEvent(Submit.DocumentUpdate); addNotification({ - message: 'Document was updated!', + message: 'Document has been updated', type: 'success' }); } catch (error) { @@ -77,7 +84,7 @@ const docAttribute = $doc?.[attribute.key]; if (attribute.array) { - return !difference(Array.from(workAttribute), Array.from(docAttribute)).length; + return !symmetricDifference(Array.from(workAttribute), Array.from(docAttribute)).length; } if (isRelationship(attribute)) { diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte index 2a31bffa1..38bf0eb76 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte @@ -3,7 +3,7 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; - import { Alert, Modal } from '$lib/components'; + import { Alert, Modal, Trim } from '$lib/components'; import { Button, InputChoice } from '$lib/elements/forms'; import { TableBody, @@ -68,17 +68,12 @@ headerDivider={false}> Delete Document -

    - Are you sure you want to delete the document from {$collection.name}? -

    - {#if relAttributes?.length} - +

    This document contains the following relationships:

    + - Relation - Setting + Relation + Setting @@ -91,7 +86,7 @@ {:else} {/if} - {attr.key} + {attr.key} @@ -111,7 +106,14 @@ Delete document from {$collection.name}
    + {:else} +

    + Are you sure you want to delete the document from {$collection.name}? +

    {/if} + 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 c2a85e9a5..2c0f7faa7 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 @@ -65,7 +65,7 @@ trackEvent(Submit.DocumentUpdate); disableUpdate = true; addNotification({ - message: 'Document was updated!', + message: 'Document has been updated', type: 'success' }); } catch (error) { diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/header.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/header.svelte index 51f5f0a45..2fe829bef 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/header.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/header.svelte @@ -51,7 +51,9 @@ {$collection?.name} - {$collection?.$id} + {#key $collection?.$id} + {$collection?.$id} + {/key} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte index 3bf7b6776..344598a7a 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte @@ -77,7 +77,7 @@ ); addNotification({ - message: 'Index has been created', + message: 'Creating index', type: 'success' }); trackEvent(Submit.IndexCreate); diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte index f2576dd6a..a0917e087 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte @@ -12,7 +12,10 @@ const databaseId = $page.params.database; const limit = 10; - $: args = preferences.getDisplayNames()?.[selectedRelationship?.relatedCollection] ?? []; + $: args = + preferences + .getDisplayNames() + ?.[selectedRelationship?.relatedCollection]?.filter((p) => p !== '$id') ?? []; $: if (!show) { data = null; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte index 3a5f76957..ae13e4629 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte @@ -37,10 +37,7 @@ $: options = ($attributes as Models.AttributeString[]) .filter( (attr) => - attr.type === 'string' && - attr?.size <= 50 && - !attr?.array && - !names?.some((name) => name === attr.key) + attr.type === 'string' && !attr?.array && !names?.some((name) => name === attr.key) ) .map((attr) => { return { @@ -60,19 +57,28 @@ Display Name

    - Set string attributes with maximum 50 characters to be used as a display name in the - Appwrite console. Maximum 5 names. + Select string attributes as display names for your documents. The selected names will be + used as short forms to identify documents in the Appwrite console, like when creating + database relationships. You can specify up to 5 names.

    -
      - +
        +
      • + +
        + +
        +
      • {#if names?.length} {#each names as name, i}
        diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte index 727be175c..fcc281bd8 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -19,6 +19,7 @@ import { isRelationship, isRelationshipToMany } from './document-[document]/attributes/store'; import RelationshipsModal from './relationshipsModal.svelte'; import { attributes, collection, columns } from './store'; + import { clickOnEnter } from '$lib/helpers/a11y'; export let data: PageData; @@ -111,22 +112,26 @@ {#if !isRelationshipToMany(attr)} {#if document[column.id]} {@const related = document[column.id]} - +
        {:else} n/a {/if} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte index b4f9eb530..fd7382f3e 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte @@ -5,38 +5,14 @@ export let data: PageData; - $: count = data.count; - $: created = data.created; - $: read = data.read; - $: updated = data.updated; - $: deleted = data.deleted; + $: count = data.documentsTotal; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts index b67082b4f..924385aef 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts @@ -10,10 +10,6 @@ export const load: PageLoad = async ({ params }) => { ); return { - count: response.documentsCount as unknown as Models.Metric[], - created: response.documentsCreate as unknown as Models.Metric[], - read: response.documentsRead as unknown as Models.Metric[], - updated: response.documentsUpdate as unknown as Models.Metric[], - deleted: response.documentsDelete as unknown as Models.Metric[] + documentsTotal: response.documentsTotal as unknown as Models.Metric[] }; }; diff --git a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte index 869150446..b376c62b1 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte @@ -5,38 +5,14 @@ export let data: PageData; - $: count = data.count; - $: created = data.created; - $: read = data.read; - $: updated = data.updated; - $: deleted = data.deleted; + $: count = data.collectionsTotal; diff --git a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts index 95b4ff7f2..bffa5e4db 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts @@ -9,10 +9,6 @@ export const load: PageLoad = async ({ params }) => { ); return { - count: response.collectionsCount as unknown as Models.Metric[], - created: response.collectionsCreate as unknown as Models.Metric[], - read: response.collectionsRead as unknown as Models.Metric[], - updated: response.collectionsUpdate as unknown as Models.Metric[], - deleted: response.collectionsDelete as unknown as Models.Metric[] + collectionsTotal: response.collectionsTotal as unknown as Models.Metric[] }; }; diff --git a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte index a4a116618..dce3a94d4 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte @@ -5,38 +5,14 @@ export let data: PageData; - $: count = data.count; - $: created = data.created; - $: read = data.read; - $: updated = data.updated; - $: deleted = data.deleted; + $: count = data.databasesTotal; diff --git a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts index 5ebb5ac9f..44c63496b 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts @@ -8,11 +8,7 @@ export const load: PageLoad = async ({ params }) => { try { const response = await sdk.forProject.databases.getUsage(period ?? '30d'); return { - count: response.databasesCount as unknown as Models.Metric[], - created: response.databasesCreate as unknown as Models.Metric[], - read: response.databasesRead as unknown as Models.Metric[], - updated: response.databasesUpdate as unknown as Models.Metric[], - deleted: response.databasesDelete as unknown as Models.Metric[] + databasesTotal: response.databasesTotal as unknown as Models.Metric[] }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/functions/+page.svelte b/src/routes/console/project-[project]/functions/+page.svelte index 66b23203d..3b38f7ad1 100644 --- a/src/routes/console/project-[project]/functions/+page.svelte +++ b/src/routes/console/project-[project]/functions/+page.svelte @@ -64,14 +64,14 @@
    - {#if func.scheduleNext} + {#if func.schedule}
  • {/if} diff --git a/src/routes/console/project-[project]/functions/+page.ts b/src/routes/console/project-[project]/functions/+page.ts index 21b180c61..e71a4fb87 100644 --- a/src/routes/console/project-[project]/functions/+page.ts +++ b/src/routes/console/project-[project]/functions/+page.ts @@ -16,7 +16,7 @@ export const load: PageLoad = async ({ url, depends, route }) => { functions: await sdk.forProject.functions.list([ Query.limit(limit), Query.offset(offset), - Query.orderDesc('$createdAt') + Query.orderDesc('') ]) }; }; diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte index 119a813a4..3d68e0477 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte @@ -28,7 +28,7 @@ import { log } from '$lib/stores/logs'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; - import type { Models } from '@appwrite.io/console'; + import { Query, type Models } from '@appwrite.io/console'; import type { PageData } from './$types'; import Delete from './delete.svelte'; import Create from './create.svelte'; @@ -36,8 +36,10 @@ import Activate from './activate.svelte'; import { browser } from '$app/environment'; import { sdk } from '$lib/stores/sdk'; + import { page } from '$app/stores'; import { calculateTime } from '$lib/helpers/timeConversion'; import { timer } from '$lib/actions/timer'; + import { onMount } from 'svelte'; export let data: PageData; @@ -48,6 +50,18 @@ let showRebuild = false; let selectedDeployment: Models.Deployment = null; + let activeDeployment: Models.Deployment = null; + + onMount(async () => { + activeDeployment = await getActiveDeployment(); + }); + + async function getActiveDeployment() { + const list = await sdk.forProject.functions.listDeployments($page.params.function, [ + Query.equal('$id', $func?.deployment) + ]); + return list?.deployments?.[0]; + } function handleActivate() { invalidate(Dependencies.DEPLOYMENTS); diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/+page.ts index d603dd349..986de1bf6 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.ts @@ -16,7 +16,7 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { deployments: await sdk.forProject.functions.listDeployments(params.function, [ Query.limit(limit), Query.offset(offset), - Query.orderDesc('$createdAt') + Query.orderDesc('') ]) }; }; diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.ts index 37aa2cafa..86ef6c966 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.ts @@ -16,7 +16,7 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { executions: await sdk.forProject.functions.listExecutions(params.function, [ Query.limit(limit), Query.offset(offset), - Query.orderDesc('$createdAt') + Query.orderDesc('') ]) }; }; diff --git a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte index 3ab991246..ed5901ed8 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte @@ -7,9 +7,7 @@ import type { PageData } from './$types'; export let data: PageData; - - $: count = data.count; - $: errors = data.errors; + $: count = data.executionsTotal; @@ -47,18 +45,4 @@ ]} />
    {/if} - {#if errors} - - {total(errors)} -

    Errors

    -
    - [e.date, e.value])] - } - ]} /> - - {/if} diff --git a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts index ba0a4b097..eabe89bed 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts @@ -11,8 +11,7 @@ export const load: PageLoad = async ({ params }) => { ); return { - count: response.executionsTotal as unknown as Models.Metric[], - errors: response.buildsFailure as unknown as Models.Metric[] + executionsTotal: response.executionsTotal as unknown as Models.Metric[] }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index 31824cffb..6d98801ec 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -44,7 +44,7 @@ afterNavigate(handle); async function handle() { - const promise = usage.load(projectId, period); + const promise = usage.load(period); if ($usage) { await promise; @@ -53,7 +53,7 @@ function changePeriod(newPeriod: UsagePeriods) { period = newPeriod; - usage.load(projectId, period); + usage.load(period); } @@ -67,7 +67,7 @@ {:else} {#if $usage} - {@const storage = humanFileSize(total($usage.storage) ?? 0)} + {@const storage = humanFileSize(total($usage.filesStorage) ?? 0)}
    @@ -91,14 +91,14 @@
    - {format(total($usage.documents) ?? 0)} + {format(total($usage.documentsTotal) ?? 0)}
    Documents
    - Databases: {format(total($usage.databases) ?? 0)} + Databases: {format(total($usage.databasesTotal) ?? 0)}
    @@ -126,7 +126,7 @@
    - Buckets: {format(total($usage.buckets) ?? 0)} + Buckets: {format(total($usage.bucketsTotal) ?? 0)}
    @@ -146,7 +146,7 @@
    - {format(total($usage.users) ?? 0)} + {format(total($usage.usersTotal) ?? 0)}
    Users
    @@ -167,7 +167,7 @@
    - {format(total($usage.executions) ?? 0)} + {format(total($usage.executionsTotal) ?? 0)}
    Executions
    diff --git a/src/routes/console/project-[project]/overview/bandwith.svelte b/src/routes/console/project-[project]/overview/bandwith.svelte index 1a0747d7b..defadb90c 100644 --- a/src/routes/console/project-[project]/overview/bandwith.svelte +++ b/src/routes/console/project-[project]/overview/bandwith.svelte @@ -17,7 +17,7 @@ date: number; value: number; }>; - $: bandwith = humanFileSize(total($usage.network)); + $: bandwith = humanFileSize(total($usage?.network)); $: if (period) { showPeriod = false; diff --git a/src/routes/console/project-[project]/overview/keys/+page.svelte b/src/routes/console/project-[project]/overview/keys/+page.svelte index 714ccea79..92cc16287 100644 --- a/src/routes/console/project-[project]/overview/keys/+page.svelte +++ b/src/routes/console/project-[project]/overview/keys/+page.svelte @@ -9,7 +9,7 @@ TableHeader, TableRowLink } from '$lib/elements/table'; - import { toLocaleDateTime } from '$lib/helpers/date'; + import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date'; import { wizard } from '$lib/stores/wizard'; import type { PageData } from './$types'; import Wizard from './wizard.svelte'; @@ -46,7 +46,7 @@ {key.name} - {key.accessedAt ? toLocaleDateTime(key.accessedAt) : 'never'} + {key.accessedAt ? toLocaleDate(key.accessedAt) : 'never'} {key.expire ? toLocaleDateTime(key.expire) : 'never'} 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 e82edaeb4..62d563158 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 @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { symmetricDifference } from '$lib/helpers/array'; - import { toLocaleDateTime } from '$lib/helpers/date'; + import { toLocaleDate } from '$lib/helpers/date'; import { Container } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; @@ -83,7 +83,7 @@ - {@const accessedAt = $key.accessedAt ? toLocaleDateTime($key.accessedAt) : 'never'} + {@const accessedAt = $key.accessedAt ? toLocaleDate($key.accessedAt) : 'never'}
    {$key.name} diff --git a/src/routes/console/project-[project]/overview/onboard.svelte b/src/routes/console/project-[project]/overview/onboard.svelte index 65b657852..9d16fbabc 100644 --- a/src/routes/console/project-[project]/overview/onboard.svelte +++ b/src/routes/console/project-[project]/overview/onboard.svelte @@ -14,22 +14,22 @@ const platforms = [ { - title: 'Web App', + title: 'Web', icon: 'grayscale/code', platform: Platform.Web }, { - title: 'Flutter App', + title: 'Flutter', icon: 'color/flutter', platform: Platform.Flutter }, { - title: 'Apple App', + title: 'Apple', icon: 'color/apple', platform: Platform.Apple }, { - title: 'Android App', + title: 'Android', icon: 'color/android', platform: Platform.Android } @@ -48,7 +48,9 @@

    Getting Started Guide

    -

    Let's get your project up and running

    +

    + Here are some next steps to start building +

    @@ -58,8 +60,8 @@

    Add a Platform

    -

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

    + Our SDKs make it possible to easily integrate with any platform.

    @@ -96,8 +98,9 @@

    Integrate With Your Server

    -

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

    + Appwrite is designed to adapt to your existing backend. Integrate Appwrite with your + backend code base using Server SDKs or Webhooks.

    @@ -144,15 +147,15 @@
    + style={`background-image: url(${onBoardImage1}); box-shadow: none !important`}>
    - Add a Platform to View Data About Your Project + 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 5c2332b05..d3826e7b6 100644 --- a/src/routes/console/project-[project]/overview/platforms/+page.svelte +++ b/src/routes/console/project-[project]/overview/platforms/+page.svelte @@ -156,7 +156,7 @@ addPlatform(Platform.Web)}> Web App - + Ï addPlatform(Platform.Flutter)}> Flutter App diff --git a/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte index 6cbb9e9d7..949b4cfde 100644 --- a/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte @@ -26,7 +26,7 @@ const stepsComponents: WizardStepsType = new Map(); stepsComponents.set(1, { - label: 'Register your app', + label: 'Register your platform', component: Step1 }); stepsComponents.set(2, { @@ -47,8 +47,8 @@ + finalAction="Go to dashboard" /> diff --git a/src/routes/console/project-[project]/overview/platforms/createApple.svelte b/src/routes/console/project-[project]/overview/platforms/createApple.svelte index 4473938f3..5aca6240a 100644 --- a/src/routes/console/project-[project]/overview/platforms/createApple.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createApple.svelte @@ -26,7 +26,7 @@ const stepsComponents: WizardStepsType = new Map(); stepsComponents.set(1, { - label: 'Register your app', + label: 'Register your platform', component: Step1 }); stepsComponents.set(2, { @@ -47,8 +47,8 @@ + finalAction="Go to dashboard" /> diff --git a/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte index cab3673bb..98059a580 100644 --- a/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte @@ -26,7 +26,7 @@ const stepsComponents: WizardStepsType = new Map(); stepsComponents.set(1, { - label: 'Register your app', + label: 'Register your platform', component: Step1 }); stepsComponents.set(2, { @@ -47,8 +47,8 @@ + finalAction="Go to dashboard" /> diff --git a/src/routes/console/project-[project]/overview/platforms/createWeb.svelte b/src/routes/console/project-[project]/overview/platforms/createWeb.svelte index a7f571b65..5d79790e6 100644 --- a/src/routes/console/project-[project]/overview/platforms/createWeb.svelte +++ b/src/routes/console/project-[project]/overview/platforms/createWeb.svelte @@ -26,7 +26,7 @@ const stepsComponents: WizardStepsType = new Map(); stepsComponents.set(1, { - label: 'Register your app', + label: 'Register your platform', component: Step1 }); stepsComponents.set(2, { @@ -35,7 +35,7 @@ optional: true }); stepsComponents.set(3, { - label: "Let's get coding", + label: 'Initialize SDK', component: Step3, optional: true }); @@ -47,8 +47,8 @@ + finalAction="Go to dashboard" /> diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/android/step2.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/android/step2.svelte index 95839d15c..c195b2822 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/android/step2.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/android/step2.svelte @@ -11,8 +11,8 @@ Get the SDK -

    First, add this to your root level build.gradle file:

    +

    First, add this to your root level build.gradle file.

    -

    And add this to your project's build.gradle file:

    +

    And add this to your project's build.gradle file.

    diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/android/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/android/step3.svelte index b18f0f23a..01c74f02f 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/android/step3.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/android/step3.svelte @@ -1,5 +1,6 @@ - Let's get coding + Initialize SDK -

    Init your SDK

    +

    Initialize your SDK

    - Now that you've downloaded the SDK, it's time to initialze it. Use your project ID, which - can be found in your project settings page. + Initialize your SDK by pointing the client to your Appwrite project using your Project ID.

    - Register your Apple app + Register your bundle ID -

    Choose a platform

    +

    Choose an Apple platform

  • - Select File > Add Packages + + In the menu bar under Select File, select Add Packages +
  • @@ -70,9 +72,9 @@
  • {:else if method === Method.Swift} -

    Add this to your Package.swift file:

    +

    Add this to your Package.swift file.

    -

    Then add the dependency to your target:

    +

    Then add the dependency to your target.

    {/if}
    diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte index fc5b28077..caceae358 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte @@ -3,6 +3,7 @@ import { WizardStep } from '$lib/layout'; import { Mode, MODE } from '$lib/system'; import { sdk } from '$lib/stores/sdk'; + import Id from '$lib/components/id.svelte'; const { endpoint, project } = sdk.forProject.client.config; const code = `import Appwrite @@ -10,30 +11,28 @@ let client = Client() .setEndpoint("${endpoint}") .setProject("${project}") - .setSelfSigned(status: true) // For self signed certificates, only use for development`; + .setSelfSigned(true) // For self signed certificates, only use for development`; let showAlert = true; - Let's get coding + Initialize SDK -

    Init your SDK

    +

    Initialize your SDK

    - Now that you've downloaded the SDK, it's time to initialze it. Use your project ID, which - can be found in your project settings page. + Initialize your SDK by pointing the client to your Appwrite project using your Project ID.

    -

    +

    Before sending any API calls to your new Appwrite project, make sure your device or emulator has network access to your Appwrite project's hostname or IP address.

    - {#if showAlert} + {#if showAlert && MODE === Mode.SELF_HOSTED}
    - (showAlert = false)}> + (showAlert = false)}> For self-hosted solutions When connecting to a locally hosted Appwrite project from an emulator or a mobile device, you should use the private IP of the device running your Appwrite project as the hostname diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte index f8e2936ff..41ccfc31a 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte @@ -106,10 +106,19 @@ $createPlatform.$id = response.$id; $createPlatform.type = platform; } + + $: registee = { + [Platform.Android]: 'package name', + [Platform.Ios]: 'bundle ID', + [Platform.Linux]: 'package name', + [Platform.Macos]: 'bundle ID', + [Platform.Windows]: 'package name', + [Platform.Web]: 'hostname' + }[platform]; - Register your Flutter app + Register your {registee}
    Get the SDK -

    Add Appwrite SDK to your package's pubspec.yaml file. You can view an example here.

    +

    + Add Appwrite SDK to your package's pubspec.yaml file. You can + view an example here. +

    - You can also install the SDK using the Dart package manager from your terminal: + You can also install the SDK using the Dart package manager from your terminal.

    diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte index ec5b9ac48..4321d72b1 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte @@ -3,6 +3,7 @@ import { WizardStep } from '$lib/layout'; import { Mode, MODE } from '$lib/system'; import { sdk } from '$lib/stores/sdk'; + import Id from '$lib/components/id.svelte'; const { endpoint, project } = sdk.forProject.client.config; const code = `import 'package:appwrite/appwrite.dart'; @@ -17,12 +18,12 @@ client - Let's get coding + Initialize SDK -

    Init your SDK

    +

    Initialize your SDK

    - Now that you've downloaded the SDK, it's time to initialze it. Use your project ID, which - can be found in your project settings page. + Initialize your SDK by pointing the client to your Appwrite project using your Project ID

    diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/step4.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/step4.svelte index c6cbb6d17..cc2c48958 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/step4.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/step4.svelte @@ -1,12 +1,19 @@ You're ready to go 🎉

    - Congrats, you've just added your first platform to your Appwrite dashboard! Are you ready to - give it a go? Why not add a database to your project, or start uploading files? The choice - is up to you. + {#if isFirstProject} + Congratulations on adding the first platform to your project! Start exploring by + creating users, adding a database to your project, or uploading files to a bucket. + {:else} + Congratulations on adding another platform to your project! Start building by adding a + database, uploading files to a bucket and more via your dashboard. + {/if}

    diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/store.ts b/src/routes/console/project-[project]/overview/platforms/wizard/store.ts index 8a00d0d35..f8e7b1b88 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/store.ts +++ b/src/routes/console/project-[project]/overview/platforms/wizard/store.ts @@ -56,8 +56,12 @@ export const versions = cachedStore< >('versions', function ({ set }) { return { load: async () => { - const { endpoint } = sdk.forConsole.client.config; - const response = await fetch(`${endpoint}/../versions`); + const { endpoint, project } = sdk.forConsole.client.config; + const response = await fetch(`${endpoint}/../versions`, { + headers: { + 'X-Appwrite-Project': project + } + }); set(await response.json()); } }; diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte index f7149863f..cd5359b66 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte @@ -48,7 +48,7 @@ - Register your Web app + Register your hostname

    - When you're using a bundler (like Rollup), import the Appwrite module when you need it: + >, import Appwrite as a module.

    {:else if method === Method.CDN} -

    - To install with a CDN (content delivery network) add the following scripts to the bottom - of your tag, but before you use any Appwrite services: -

    +

    Add the following script tags to install Appwrite with a CDN.

    {/if}
    diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/web/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/web/step3.svelte index 2e4e6744c..de3a41e49 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/web/step3.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/web/step3.svelte @@ -1,5 +1,6 @@ - Let's get coding + Initialize SDK -

    Init your SDK

    +

    Initialize your SDK

    - Now that you've downloaded the SDK, it's time to initialze it. Use your project ID, which - can be found in your project settings page. + Initialize your SDK by pointing the client to your Appwrite project using your Project ID.

    diff --git a/src/routes/console/project-[project]/overview/requests.svelte b/src/routes/console/project-[project]/overview/requests.svelte index 30e650986..b762f22da 100644 --- a/src/routes/console/project-[project]/overview/requests.svelte +++ b/src/routes/console/project-[project]/overview/requests.svelte @@ -12,7 +12,7 @@ const dispatch = createEventDispatcher(); - $: requests = $usage?.requests as unknown as Array<{ + $: requests = $usage?.requestsTotal as unknown as Array<{ date: number; value: number; }>; @@ -25,7 +25,7 @@
    - {format(total($usage.requests))} + {format(total($usage?.requestsTotal))}
    Requests
    @@ -41,7 +41,7 @@
    -{#if total($usage.requests) !== 0} +{#if total($usage?.requestsTotal) !== 0}
    [e.date, e.value])] + data: [...(requests?.map((e) => [e.date, e.value]) ?? [])] } ]} />
    diff --git a/src/routes/console/project-[project]/overview/store.ts b/src/routes/console/project-[project]/overview/store.ts index 466a87d0a..f33bff720 100644 --- a/src/routes/console/project-[project]/overview/store.ts +++ b/src/routes/console/project-[project]/overview/store.ts @@ -2,19 +2,16 @@ import { sdk } from '$lib/stores/sdk'; import { cachedStore } from '$lib/helpers/cache'; import type { Models } from '@appwrite.io/console'; import { writable, type Writable } from 'svelte/store'; -import { isCloud } from '$lib/system'; export const usage = cachedStore< Models.UsageProject, { - load: (projectId: string, range: string) => Promise; + load: (range: string) => Promise; } >('projectUsage', function ({ set }) { return { - load: async (projectId, range) => { - const usages = isCloud - ? await sdk.forProject.project.getUsage(range) - : await sdk.forConsole.projects.getUsage(projectId, range); + load: async (range) => { + const usages = await sdk.forProject.project.getUsage(range); set(usages); } }; diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/console/project-[project]/settings/+page.svelte index cf8659329..be38f8bfc 100644 --- a/src/routes/console/project-[project]/settings/+page.svelte +++ b/src/routes/console/project-[project]/settings/+page.svelte @@ -3,10 +3,18 @@ import { onMount } from 'svelte'; import { toLocaleDateTime } from '$lib/helpers/date'; import { addNotification } from '$lib/stores/notifications'; + import { organizationList } from '$lib/stores/organization'; import { project } from '../store'; import { services, type Service } from '$lib/stores/project-services'; import { CardGrid, CopyInput, Box, Heading } from '$lib/components'; - import { Button, Form, FormList, InputText, InputSwitch } from '$lib/elements/forms'; + import { + Button, + Form, + FormList, + InputText, + InputSwitch, + InputSelect + } from '$lib/elements/forms'; import { Container } from '$lib/layout'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; @@ -14,14 +22,22 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; + import EnableAllServices from './enableAllServices.svelte'; + import DisableAllServices from './disableAllServices.svelte'; + import Transfer from './transferProject.svelte'; let name: string = null; + let teamId: string = null; let showDelete = false; + let showTransfer = false; const endpoint = sdk.forConsole.client.config.endpoint; const projectId = $page.params.project; + let showDisableAll = false; + let showEnableAll = false; onMount(async () => { name ??= $project.name; + teamId ??= $project.teamId; }); async function updateName() { @@ -42,6 +58,51 @@ } } + async function toggleAllServices(status: boolean) { + if (status && !showEnableAll) { + showEnableAll = true; + return; + } + if (!status && !showDisableAll) { + showDisableAll = true; + return; + } + + try { + const path = '/projects/' + $project.$id + '/service/all'; + await sdk.forConsole.client.call( + 'PATCH', + new URL(sdk.forConsole.client.config.endpoint + path), + { + 'X-Appwrite-Project': sdk.forConsole.client.config.project, + 'content-type': 'application/json' + }, + { + status: status + } + ); + invalidate(Dependencies.PROJECT); + addNotification({ + type: 'success', + message: + 'All services for ' + + $project.name + + ' has been ' + + (status ? 'enabled.' : 'disabled.') + }); + trackEvent(Submit.ProjectService); + } catch (error) { + addNotification({ + type: 'error', + message: error.message + }); + trackError(error, Submit.ProjectService); + } finally { + showDisableAll = false; + showEnableAll = false; + } + } + async function serviceUpdate(service: Service) { try { await sdk.forConsole.projects.updateServiceStatus( @@ -120,8 +181,18 @@ services are not accessible to client SDKs but remain accessible to server SDKs.

    +
      +
    • + +
    • +
    • + +
    • +
    - +
      {#each $services.list as service} + + Transfer project +

      Transfer your project to another organization that you own.

      + + + ({ + value: team.$id, + label: team.name + }))} /> + + + + + + +
      Delete Project @@ -163,3 +257,11 @@ + toggleAllServices(false)} bind:show={showDisableAll} /> + toggleAllServices(true)} bind:show={showEnableAll} /> +{#if teamId} + t.$id == teamId).name} + bind:show={showTransfer} /> +{/if} diff --git a/src/routes/console/project-[project]/settings/disableAllServices.svelte b/src/routes/console/project-[project]/settings/disableAllServices.svelte new file mode 100644 index 000000000..1cf11235e --- /dev/null +++ b/src/routes/console/project-[project]/settings/disableAllServices.svelte @@ -0,0 +1,19 @@ + + + + Disable all services +

      + Are you sure you want to disable all services? This will disable API requests to your + project. +

      + + + + +
      diff --git a/src/routes/console/project-[project]/settings/enableAllServices.svelte b/src/routes/console/project-[project]/settings/enableAllServices.svelte new file mode 100644 index 000000000..e3189a739 --- /dev/null +++ b/src/routes/console/project-[project]/settings/enableAllServices.svelte @@ -0,0 +1,16 @@ + + + + Enable all services +

      All project services will be enabled.

      + + + + +
      diff --git a/src/routes/console/project-[project]/settings/transferProject.svelte b/src/routes/console/project-[project]/settings/transferProject.svelte new file mode 100644 index 000000000..cba255afd --- /dev/null +++ b/src/routes/console/project-[project]/settings/transferProject.svelte @@ -0,0 +1,60 @@ + + + + Transfer project +

      Are you sure you want to transfer {$project.name} to {teamName}?

      +

      + Members who are not part of the destination organization must be invited to gain access to + this project. +

      + + + + + +
      diff --git a/src/routes/console/project-[project]/storage/+page.ts b/src/routes/console/project-[project]/storage/+page.ts index 08c03c8ec..cb8268b86 100644 --- a/src/routes/console/project-[project]/storage/+page.ts +++ b/src/routes/console/project-[project]/storage/+page.ts @@ -15,7 +15,7 @@ export const load: PageLoad = async ({ url, route }) => { buckets: await sdk.forProject.storage.listBuckets([ Query.limit(limit), Query.offset(offset), - Query.orderDesc('$createdAt') + Query.orderDesc('') ]) }; }; diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts index 219c82b34..203ea2410 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts @@ -17,7 +17,7 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { search, files: await sdk.forProject.storage.listFiles( params.bucket, - [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')], + [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search ) }; diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte index e9111d150..9b18a11df 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte @@ -5,38 +5,14 @@ export let data: PageData; - $: count = data.count; - $: created = data.created; - $: read = data.read; - $: updated = data.updated; - $: deleted = data.deleted; + $: count = data.filesTotal; diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts index 2cb8294fa..d86143717 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts @@ -9,10 +9,6 @@ export const load: PageLoad = async ({ params }) => { ); return { - count: response.filesCount as unknown as Models.Metric[], - created: response.filesCreate as unknown as Models.Metric[], - read: response.filesRead as unknown as Models.Metric[], - updated: response.filesUpdate as unknown as Models.Metric[], - deleted: response.filesDelete as unknown as Models.Metric[] + filesTotal: response.filesTotal as unknown as Models.Metric[] }; }; diff --git a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.svelte index 5ac40adb9..8b5d09759 100644 --- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.svelte +++ b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.svelte @@ -4,39 +4,14 @@ import type { PageData } from './$types'; export let data: PageData; - - $: count = data.count; - $: created = data.created; - $: read = data.read; - $: updated = data.updated; - $: deleted = data.deleted; + $: count = data.bucketsTotal; diff --git a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts index 0cc4a9cca..6f3a947e3 100644 --- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts @@ -8,11 +8,7 @@ export const load: PageLoad = async ({ params }) => { const response = await sdk.forProject.storage.getUsage(params.period ?? '30d'); return { - count: response.bucketsCount as unknown as Models.Metric[], - created: response.bucketsCreate as unknown as Models.Metric[], - read: response.bucketsRead as unknown as Models.Metric[], - updated: response.bucketsUpdate as unknown as Models.Metric[], - deleted: response.bucketsDelete as unknown as Models.Metric[] + bucketsTotal: response.bucketsTotal as unknown as Models.Metric[] }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/wizardFeedback/step1.svelte b/src/routes/console/wizardFeedback/step1.svelte new file mode 100644 index 000000000..c3a665590 --- /dev/null +++ b/src/routes/console/wizardFeedback/step1.svelte @@ -0,0 +1,39 @@ + + + + {$selectedFeedback.title} + {$selectedFeedback.desc} + + + diff --git a/src/routes/console/wizardFeedback/step2.svelte b/src/routes/console/wizardFeedback/step2.svelte new file mode 100644 index 000000000..1e91272cf --- /dev/null +++ b/src/routes/console/wizardFeedback/step2.svelte @@ -0,0 +1,18 @@ + + + + Thanks for the feedback! + +
      + {#if $app.themeInUse === 'dark'} + + {:else} + + {/if} +
      +
      diff --git a/src/routes/hackathon/+layout.svelte b/src/routes/hackathon/+layout.svelte new file mode 100644 index 000000000..9a0263a42 --- /dev/null +++ b/src/routes/hackathon/+layout.svelte @@ -0,0 +1,13 @@ + + + + + +