diff --git a/.env.example b/.env.example index 4c584201d..e490a6ef4 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -VITE_APPWRITE_ENDPOINT= +VITE_APPWRITE_ENDPOINT=http://localhost/v1 VITE_APPWRITE_GROWTH_ENDPOINT= VITE_GA_PROJECT= VITE_CONSOLE_MODE=self-hosted \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a723620ce..607bb07f6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,12 +40,17 @@ git clone https://github.com/appwrite/console.git appwrite-console ``` ### 2. Install dependencies with npm - +Navigate to the Appwrite Console repository and install dependencies. ```bash -npm install +cd appwrite-console && npm install ``` -### 3. Setup environment variables +### 3. Install and run Appwrite locally +When you run the Appwrite Console locally, it needs to point to a backend as well. The easiest way to do this is to run an Appwrite instance locally. + +Follow the [install instructions](https://appwrite.io/docs/installation) in the Appwrite docs. + +### 4. Setup environment variables Add a `.env` file by copying the `.env.example` file as a template in the project's root directory. diff --git a/src/lib/components/empty.svelte b/src/lib/components/empty.svelte index ab7d091a4..2c01f69fa 100644 --- a/src/lib/components/empty.svelte +++ b/src/lib/components/empty.svelte @@ -42,7 +42,7 @@
Create your first {target} to get started.

- Need a hand? Check out our documentation. + Need a hand? Learn more in our documentation.

diff --git a/src/lib/components/id.svelte b/src/lib/components/id.svelte index e73a5b452..c64dcb1f2 100644 --- a/src/lib/components/id.svelte +++ b/src/lib/components/id.svelte @@ -31,7 +31,7 @@ } } } - checkOverflow(); + requestAnimationFrame(checkOverflow); window.addEventListener('resize', checkOverflow); return { diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte index 7b214f534..fdd4c5e9c 100644 --- a/src/lib/components/permissions/team.svelte +++ b/src/lib/components/permissions/team.svelte @@ -134,7 +134,7 @@ You have no teams. Create a team to see them here.

- Need a hand? Check out our diff --git a/src/lib/components/permissions/user.svelte b/src/lib/components/permissions/user.svelte index 4488d8f01..5835023b6 100644 --- a/src/lib/components/permissions/user.svelte +++ b/src/lib/components/permissions/user.svelte @@ -153,7 +153,7 @@ You have no users. Create a user to see them here.

- Need a hand? Check out our diff --git a/src/lib/elements/forms/inputNumber.svelte b/src/lib/elements/forms/inputNumber.svelte index 7c36615e0..5110e4eea 100644 --- a/src/lib/elements/forms/inputNumber.svelte +++ b/src/lib/elements/forms/inputNumber.svelte @@ -84,7 +84,7 @@ bind:value bind:this={element} on:invalid={handleInvalid} - style:--amount-of-buttons={required ? 0 : 1.75} /> + style:--amount-of-buttons={nullable && !required ? 1.75 : 0} />

{#if error} {error} diff --git a/src/lib/elements/forms/inputTextarea.svelte b/src/lib/elements/forms/inputTextarea.svelte index 4fe312a42..d5f1f484d 100644 --- a/src/lib/elements/forms/inputTextarea.svelte +++ b/src/lib/elements/forms/inputTextarea.svelte @@ -51,6 +51,9 @@ value = prevValue; } } + + $: showTextCounter = !!maxlength; + $: showNullCheckbox = nullable && !required; @@ -73,20 +76,22 @@ bind:this={element} on:invalid={handleInvalid} style:--amount-of-buttons={required ? undefined : 0.25} /> - + {#if showTextCounter || showNullCheckbox} + + {/if} {#if error} diff --git a/src/lib/elements/forms/inputURL.svelte b/src/lib/elements/forms/inputURL.svelte index 848bc5532..5c7a1178a 100644 --- a/src/lib/elements/forms/inputURL.svelte +++ b/src/lib/elements/forms/inputURL.svelte @@ -1,6 +1,8 @@ @@ -66,9 +74,21 @@ type="url" autocomplete={autocomplete ? 'on' : 'off'} bind:value - on:input={handleInput} bind:this={element} on:invalid={handleInvalid} /> +
    + {#if maxlength} +
  • + +
  • + {/if} + {#if nullable && !required} +
  • + +
  • + {/if} +
{#if error} {error} diff --git a/src/lib/helpers/copy.ts b/src/lib/helpers/copy.ts index 6399995ea..4c3779ffc 100644 --- a/src/lib/helpers/copy.ts +++ b/src/lib/helpers/copy.ts @@ -11,6 +11,12 @@ async function securedCopy(value: string) { function unsecuredCopy(value: string) { const textArea = document.createElement('textarea'); textArea.value = value; + + // Avoid scrolling to bottom + textArea.style.top = '0'; + textArea.style.left = '0'; + textArea.style.position = 'fixed'; + document.body.appendChild(textArea); textArea.focus(); textArea.select(); diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte index 232e0be6d..d99f0bbf7 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte @@ -75,7 +75,7 @@
Create your first attribute to get started.

- Need a hand? Check out our documentation. + Need a hand? Learn more in our documentation.

diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte index 68b72fb5c..10f82e672 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte @@ -180,7 +180,7 @@
Create your first attribute to get started.

- Need a hand? Check out our documentation. + Need a hand? Learn more in our documentation.

diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte index 7dea3b464..ffa3e61f4 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte @@ -34,8 +34,7 @@ - + placeholder="Select a value" + disabled={data.required || data.array} + options={[ + { label: 'NULL', value: null }, + { label: 'True', value: true }, + { label: 'False', value: false } + ]} + bind:value={data.default} /> Indicate whether this is a required attribute diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte index 4315f1319..21886dc1f 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte @@ -48,7 +48,7 @@ id="default" label="Default value" bind:value={data.default} - disabled={data.required} /> + disabled={data.required || data.array} /> Indicate whether this is a required attribute diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte index 72bb2eaf7..e4ea11990 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte @@ -71,31 +71,19 @@ {#if selectedAttribute?.type !== 'relationship'} -
- - -
-
-
+ {/if} {#if option} (option = null)} /> {/if}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte index 6da9089f5..3222edaf6 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte @@ -50,7 +50,8 @@ label="Default value" placeholder="Enter value" bind:value={data.default} - disabled={data.required} /> + disabled={data.required || data.array} + nullable={!data.required && !data.array} /> Indicate whether this is a required attribute diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte index a8e166a2a..5996689ea 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte @@ -36,8 +36,7 @@ - - Indicate whether this is a required attribute diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte index 9e07b3e87..b641880d0 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte @@ -54,9 +54,20 @@ } - - - + + Indicate whether this is a required attribute diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte index d68ef0976..450fbac14 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte @@ -54,9 +54,18 @@ } - - - + + + disabled={data.required || data.array} + nullable={!data.required && !data.array} /> Indicate whether this is a required attribute diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte index b59473958..3bba15ad6 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte @@ -48,7 +48,8 @@ label="Default value" placeholder="Enter value" bind:value={data.default} - disabled={data.required || data.array} /> + disabled={data.required || data.array} + nullable={!data.required && !data.array} /> Indicate whether this is a required attribute diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte index f847e0ebd..501ee1dc5 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte @@ -98,7 +98,6 @@ }); // Reactive statements - $: getCollections(search).then((res) => (collectionList = res)); $: collections = collectionList?.collections?.filter((n) => n.$id !== $collection.$id) ?? []; @@ -219,7 +218,6 @@ placeholder="Select a relation" options={relationshipType} disabled={editing} /> -
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte index bbf9175bd..a52135d8d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte @@ -34,8 +34,7 @@ + bind:value /> diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte index 7a5103da8..9f88aaa57 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte @@ -7,7 +7,6 @@ export let value: string; export let attribute: Models.AttributeEnum; export let optionalText: string | undefined = undefined; - export let disabled = false; $: options = [ ...attribute.elements.map((element) => { @@ -31,5 +30,4 @@ {optionalText} required={attribute.required} placeholder="Select a value" - showLabel={!!label?.length} - {disabled} /> + showLabel={!!label?.length} /> diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte index d490f0e3d..22360ff6f 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte @@ -17,5 +17,5 @@ required={attribute.required} min={attribute.min} max={attribute.max} - bind:value - step={attribute.type === 'double' ? 'any' : 1} /> + step={attribute.type === 'double' ? 'any' : 1} + bind:value /> diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte index c12654564..f01e54ca5 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte @@ -3,12 +3,12 @@ import { PaginationInline } from '$lib/components'; import { SelectSearchItem } from '$lib/elements'; import { Button, InputSelectSearch, Label } from '$lib/elements/forms'; + import { preferences } from '$lib/stores/preferences'; import { sdk } from '$lib/stores/sdk'; import { Query, type Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { doc } from '../store'; import { isRelationshipToMany } from './store'; - import { preferences } from '$lib/stores/preferences'; export let id: string; export let label: string; @@ -32,7 +32,7 @@ onMount(async () => { if (value) { if (isRelationshipToMany(attribute)) { - relatedList = value as string[]; + relatedList = (value as string[]).slice(); } else { singleRel = value as string; } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte index ecb1c613e..d5c32fa59 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte @@ -7,30 +7,27 @@ export let value: string; export let attribute: Models.AttributeString; export let optionalText: string | undefined = undefined; - export let disabled = false; {#if attribute.size >= 50} {:else} {/if} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte index cbff896fa..b745348d9 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte @@ -15,5 +15,6 @@ {optionalText} placeholder="Enter URL" showLabel={!!label?.length} + nullable={!attribute.required} required={attribute.required} bind:value /> diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte index 605450998..81cc43c89 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte @@ -125,7 +125,7 @@
Create your first attribute to get started.

- Need a hand? Check out our documentation. + Need a hand? Learn more in our documentation.

diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte index fb36561ff..1e783436d 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte @@ -110,7 +110,7 @@

You have no execution logs. Create and activate a deployment to see it here.

-

Need a hand? Check out our documentation

+

Need a hand? Learn more in our documentation