diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 82281df364..1f4ef83968 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Use Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 18 # - name: Audit dependencies diff --git a/src/lib/components/avatarInitials.svelte b/src/lib/components/avatarInitials.svelte index 1ce7ecfc6a..025dd998c8 100644 --- a/src/lib/components/avatarInitials.svelte +++ b/src/lib/components/avatarInitials.svelte @@ -1,11 +1,11 @@ diff --git a/src/lib/components/eventModal.svelte b/src/lib/components/eventModal.svelte index 7d728dcdbb..b7a00370ab 100644 --- a/src/lib/components/eventModal.svelte +++ b/src/lib/components/eventModal.svelte @@ -245,7 +245,7 @@ } - + Create Event
diff --git a/src/lib/components/feedbackGeneral.svelte b/src/lib/components/feedbackGeneral.svelte index fc380d0b10..aa9bdc42fd 100644 --- a/src/lib/components/feedbackGeneral.svelte +++ b/src/lib/components/feedbackGeneral.svelte @@ -51,7 +51,7 @@ Your feedback is important to us. Please be honest and tell us what you think.
-
+ - + How likely are you to recommend Appwrite to a friend or colleague? diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte index 8e38955ab2..7f70c5842a 100644 --- a/src/lib/components/modal.svelte +++ b/src/lib/components/modal.svelte @@ -2,12 +2,16 @@ import { createEventDispatcher, onDestroy, onMount } from 'svelte'; import { Alert } from '$lib/components'; import { trackEvent } from '$lib/actions/analytics'; + import { Form } from '$lib/elements/forms'; export let show = false; export let size: 'small' | 'big' = null; export let warning = false; export let error: string = null; export let closable = true; + export let onSubmit: () => Promise | void = function () { + return; + }; let dialog: HTMLDialogElement; let alert: HTMLElement; @@ -77,8 +81,7 @@ class:is-big={size === 'big'} bind:this={dialog}> {#if show} - - +
{#if warning}
@@ -127,6 +130,6 @@
{/if} - + {/if} diff --git a/src/lib/components/permissions/custom.svelte b/src/lib/components/permissions/custom.svelte index aecd660684..080d9aa933 100644 --- a/src/lib/components/permissions/custom.svelte +++ b/src/lib/components/permissions/custom.svelte @@ -25,7 +25,7 @@ $: disabled = !value || $groups.has(value); - + Custom permission

Custom permissions allow you to grant access to specific users or teams using their ID and @@ -44,6 +44,6 @@ - + diff --git a/src/lib/components/permissions/row.svelte b/src/lib/components/permissions/row.svelte index 1c7bb94a1e..ede23603b2 100644 --- a/src/lib/components/permissions/row.svelte +++ b/src/lib/components/permissions/row.svelte @@ -1,6 +1,6 @@ - + Select teams

Grant access to any member of a specific team. To grant access to team members with specific @@ -144,6 +144,6 @@ {/if} - + diff --git a/src/lib/components/permissions/user.svelte b/src/lib/components/permissions/user.svelte index 28ecba9c5a..03d921fcff 100644 --- a/src/lib/components/permissions/user.svelte +++ b/src/lib/components/permissions/user.svelte @@ -2,7 +2,7 @@ import { Button, InputSearch } from '$lib/elements/forms'; import { createEventDispatcher } from 'svelte'; import { AvatarInitials, EmptySearch, Modal, PaginationInline } from '..'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { Query, type Models } from '@aw-labs/appwrite-console'; import type { Writable } from 'svelte/store'; import type { Permission } from './permissions.svelte'; @@ -31,7 +31,7 @@ async function request() { if (!show) return; - results = await sdkForProject.users.list([Query.limit(5), Query.offset(offset)], search); + results = await sdk.forProject.users.list([Query.limit(5), Query.offset(offset)], search); } function onSelection(event: Event, role: string) { @@ -58,7 +58,7 @@ } - + Select users

Grant access to any authenticated or anonymous user.

- + diff --git a/src/lib/components/uploadBox.svelte b/src/lib/components/uploadBox.svelte index d074bf2e0c..988567eba3 100644 --- a/src/lib/components/uploadBox.svelte +++ b/src/lib/components/uploadBox.svelte @@ -1,7 +1,7 @@ {#if $uploader?.isOpen} diff --git a/src/lib/elements/forms/button.svelte b/src/lib/elements/forms/button.svelte index 7895f7e4a6..c1f38c429d 100644 --- a/src/lib/elements/forms/button.svelte +++ b/src/lib/elements/forms/button.svelte @@ -1,5 +1,8 @@ + - -
+ diff --git a/src/lib/elements/table/tableScroll.svelte b/src/lib/elements/table/tableScroll.svelte index d2dd9c53e1..814fe00e51 100644 --- a/src/lib/elements/table/tableScroll.svelte +++ b/src/lib/elements/table/tableScroll.svelte @@ -1,10 +1,30 @@
-
- +
(isOverflowing = v)}> +
diff --git a/src/lib/helpers/project.ts b/src/lib/helpers/project.ts new file mode 100644 index 0000000000..ff8f887b05 --- /dev/null +++ b/src/lib/helpers/project.ts @@ -0,0 +1,5 @@ +export function getProjectId() { + const pathname = window.location.pathname; + const projectMatch = pathname.match(/\/project-(.*?)\//); + return projectMatch?.[1] || null; +} diff --git a/src/lib/helpers/promises.ts b/src/lib/helpers/promises.ts new file mode 100644 index 0000000000..9f8459dcd0 --- /dev/null +++ b/src/lib/helpers/promises.ts @@ -0,0 +1,3 @@ +export async function sleep(ms: number): Promise { + return new Promise((r) => setTimeout(r, ms)); +} diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte index 1b8e7863ed..3e8b733748 100644 --- a/src/lib/layout/header.svelte +++ b/src/lib/layout/header.svelte @@ -19,7 +19,7 @@ import { goto } from '$app/navigation'; import { page } from '$app/stores'; import { Submit, trackEvent } from '$lib/actions/analytics'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { slide } from 'svelte/transition'; import { isCloud } from '$lib/system'; @@ -36,7 +36,7 @@ } async function logout() { - await sdkForConsole.account.deleteSession('current'); + await sdk.forConsole.account.deleteSession('current'); trackEvent(Submit.AccountLogout); await goto(`${base}/login`); } diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index 4c4049e7b5..7d92332afc 100644 --- a/src/lib/layout/logs.svelte +++ b/src/lib/layout/logs.svelte @@ -6,7 +6,7 @@ import { Button } from '$lib/elements/forms'; import { base } from '$app/paths'; import { app } from '$lib/stores/app'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { page } from '$app/stores'; import { calculateTime } from '$lib/helpers/timeConversion'; import type { Models } from '@aw-labs/appwrite-console'; @@ -17,7 +17,7 @@ function isDeployment(data: Models.Deployment | Models.Execution): data is Models.Deployment { if ('buildId' in data) { selectedTab = 'logs'; - rawData = `${sdkForConsole.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}/deployment/${$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 = `${sdkForConsole.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}/execution/${$log.data.$id}?mode=admin&project=${$page.params.project}`; return true; } } diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index aad0da6e01..a0c5899708 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -81,9 +81,14 @@ .main-side { z-index: 25; } + @media (max-width: 550.99px), (min-width: 551px) and (max-width: 1198.99px) { .main-side { top: 4.5rem; } } + + .main-content { + overflow: hidden; + } diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte index 3f4ebff5f0..b59d1232ca 100644 --- a/src/lib/layout/unauthenticated.svelte +++ b/src/lib/layout/unauthenticated.svelte @@ -13,9 +13,6 @@ import { isCloud } from '$lib/system'; import { onDestroy } from 'svelte'; - export let imgLight = LoginLight; - export let imgDark = LoginDark; - const technologies = [ 'js', 'flutter', @@ -112,9 +109,9 @@ class="container u-margin-block-start-20 is-no-mobile u-flex u-main-center" style="--p-container-max-size: var(--container-size-large);"> {#if $app.themeInUse === 'dark'} - + {:else} - + {/if}
diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte index 2a01f889f4..4c36b617f6 100644 --- a/src/lib/layout/usage.svelte +++ b/src/lib/layout/usage.svelte @@ -13,9 +13,8 @@ - + Exit Process

Are you sure you want to exit from ? All data will be deleted. This action is diff --git a/src/lib/mock/form.test.svelte b/src/lib/mock/form.test.svelte new file mode 100644 index 0000000000..c900d26e16 --- /dev/null +++ b/src/lib/mock/form.test.svelte @@ -0,0 +1,11 @@ + + +

+ + +
diff --git a/src/lib/stores/project.ts b/src/lib/stores/project.ts index 6ec0ab0c98..a08b269d8d 100644 --- a/src/lib/stores/project.ts +++ b/src/lib/stores/project.ts @@ -1,7 +1,7 @@ import type { Client, Models } from '@aw-labs/appwrite-console'; type Payload = { - [key: string]: any; + [key: string]: any /* eslint-disable @typescript-eslint/no-explicit-any */; }; class Service { diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index 0eb424799c..d0939adf75 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -1,3 +1,4 @@ +import { getProjectId } from '$lib/helpers/project'; import { Project } from '$lib/sdk/project'; import { VARS } from '$lib/system'; import { @@ -21,21 +22,6 @@ clientConsole.setEndpoint(endpoint).setProject('console'); const clientProject = new Client(); clientProject.setEndpoint(endpoint).setMode('admin'); - -const setProject = (projectId: string): Client => clientProject.setProject(projectId); - -const sdkForConsole = { - client: clientConsole, - account: new Account(clientConsole), - avatars: new Avatars(clientConsole), - functions: new Functions(clientConsole), - health: new Health(clientConsole), - locale: new Locale(clientConsole), - projects: new Projects(clientConsole), - teams: new Teams(clientConsole), - users: new Users(clientConsole) -}; - const sdkForProject = { client: clientProject, account: new Account(clientProject), @@ -50,4 +36,24 @@ const sdkForProject = { users: new Users(clientProject) }; -export { sdkForConsole, sdkForProject, setProject, endpoint }; +export const sdk = { + forConsole: { + client: clientConsole, + account: new Account(clientConsole), + avatars: new Avatars(clientConsole), + functions: new Functions(clientConsole), + health: new Health(clientConsole), + locale: new Locale(clientConsole), + projects: new Projects(clientConsole), + teams: new Teams(clientConsole), + users: new Users(clientConsole) + }, + get forProject() { + const projectId = getProjectId(); + if (projectId && projectId !== clientProject.config.project) { + clientProject.setProject(projectId); + } + + return sdkForProject; + } +}; diff --git a/src/lib/stores/uploader.ts b/src/lib/stores/uploader.ts index 9538d0b793..ece61c0b7d 100644 --- a/src/lib/stores/uploader.ts +++ b/src/lib/stores/uploader.ts @@ -1,6 +1,6 @@ import type { Models } from '@aw-labs/appwrite-console'; import { writable } from 'svelte/store'; -import { sdkForProject } from './sdk'; +import { sdk } from './sdk'; type UploaderFile = { $id: string; @@ -71,7 +71,7 @@ const createUploader = () => { n.files.unshift(newFile); return n; }); - const uploadedFile = await sdkForProject.storage.createFile( + const uploadedFile = await sdk.forProject.storage.createFile( bucketId, id ?? 'unique()', file, diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 72d08d69e3..6273f45a4d 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -2,7 +2,7 @@ import '@appwrite.io/pink'; import '@appwrite.io/pink-icons'; import 'tippy.js/dist/tippy.css'; import LogRocket from 'logrocket'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { redirect } from '@sveltejs/kit'; import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; @@ -12,7 +12,7 @@ export const ssr = false; export const load: LayoutLoad = async ({ depends, url }) => { depends(Dependencies.ACCOUNT); try { - const account = await sdkForConsole.account.get(); + const account = await sdk.forConsole.account.get(); LogRocket.identify(account.$id, { name: account.name, @@ -21,7 +21,7 @@ export const load: LayoutLoad = async ({ depends, url }) => { return { account, - organizations: sdkForConsole.teams.list() + organizations: sdk.forConsole.teams.list() }; } catch (error) { const acceptedRoutes = [ diff --git a/src/routes/console/+layout.ts b/src/routes/console/+layout.ts index 6e464728e3..65de11ecdd 100644 --- a/src/routes/console/+layout.ts +++ b/src/routes/console/+layout.ts @@ -1,8 +1,8 @@ -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async () => { - const response = await fetch(`${sdkForConsole.client.config.endpoint}/health/version`); + const response = await fetch(`${sdk.forConsole.client.config.endpoint}/health/version`); const data = await response.json(); return { diff --git a/src/routes/console/account/+page.svelte b/src/routes/console/account/+page.svelte index b94dc86cc8..b32240d163 100644 --- a/src/routes/console/account/+page.svelte +++ b/src/routes/console/account/+page.svelte @@ -4,7 +4,7 @@ import { Container } from '$lib/layout'; import { onMount } from 'svelte'; import { user } from '$lib/stores/user'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { base } from '$app/paths'; import Delete from './delete.svelte'; @@ -26,7 +26,7 @@ async function updateName() { try { - await sdkForConsole.account.updateName(name); + await sdk.forConsole.account.updateName(name); invalidate(Dependencies.ACCOUNT); addNotification({ message: 'Name has been updated', @@ -43,7 +43,7 @@ } async function updateEmail() { try { - await sdkForConsole.account.updateEmail(email, emailPassword); + await sdk.forConsole.account.updateEmail(email, emailPassword); invalidate(Dependencies.ACCOUNT); addNotification({ message: 'Email has been updated', @@ -61,7 +61,7 @@ async function updatePassword() { try { - await sdkForConsole.account.updatePassword(newPassword, oldPassword); + await sdk.forConsole.account.updatePassword(newPassword, oldPassword); newPassword = oldPassword = null; addNotification({ message: 'Password has been updated', @@ -79,9 +79,9 @@ -
+ - Update Name + Name