diff --git a/src/app.html b/src/app.html index 7ca4eefe8..60897f08b 100644 --- a/src/app.html +++ b/src/app.html @@ -13,6 +13,12 @@ - + + + diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte index 6166968c1..5d43e6ed7 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte @@ -4,14 +4,22 @@ - + + + diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/view.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/view.svelte index 9003e4de3..0469531a7 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/teams/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/teams/view.svelte @@ -1,6 +1,5 @@ - - + @@ -49,7 +53,7 @@ Created {#each teams.teams as team} - {@const href = getTeamUrl(team)} + {@const href = createTeamUrl(team)} {#if href} @@ -99,6 +103,5 @@ href="https://appwrite.io/docs/references/cloud/client-web/teams" target="team" /> {/if} - diff --git a/src/routes/(console)/project-[region]-[project]/auth/view.svelte b/src/routes/(console)/project-[region]-[project]/auth/view.svelte index 272335085..f0b9ae425 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/view.svelte @@ -1,6 +1,5 @@ - - + @@ -65,7 +69,7 @@ {#each users.users as user} - {@const href = getUserUrl(user)} + {@const href = createUserUrl(user)} {#if href} {#each $columns as { id } (id)} @@ -213,6 +217,5 @@ allowCreate={true} on:click={() => (showCreateUser = true)} /> {/if} - diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte index ee0c6729f..c33dc3608 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte @@ -1,18 +1,27 @@ - + + + diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte index 745a4134a..085336941 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte @@ -1,6 +1,23 @@ - + + + diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/view.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/view.svelte index 312c467be..6ab369590 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/view.svelte @@ -1,26 +1,36 @@ - - + @@ -41,7 +51,7 @@ {#if view === 'grid'} ($showCreate = true)}> {#each tables.tables as table} - + {table.name} {table.$id} @@ -55,7 +65,7 @@ {/each} {#each tables.tables as table (table.$id)} - + {#each $tableViewColumns as column} {#if column.id === '$id'} @@ -77,7 +87,7 @@ {:else if search} - + {:else} @@ -92,4 +102,3 @@ {/if} - diff --git a/src/routes/(console)/project-[region]-[project]/databases/view.svelte b/src/routes/(console)/project-[region]-[project]/databases/view.svelte index e516dcdf8..ea27965d0 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/view.svelte @@ -1,39 +1,48 @@ - + + + diff --git a/src/routes/(console)/project-[region]-[project]/messaging/view.svelte b/src/routes/(console)/project-[region]-[project]/messaging/view.svelte index 61ee79894..e76f4b1a5 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/view.svelte @@ -1,12 +1,11 @@ - - - {#if $canWriteMessages} - - {/if} - + + {#if $canWriteMessages} + + {/if} + {#if messages.total} @@ -99,7 +100,7 @@ {/each} {#each messages.messages as message (message.$id)} - + {#each $columns as column (column.id)} {#if column.id === '$id'} @@ -156,7 +157,7 @@
- +
{:else} @@ -171,7 +172,6 @@ {/if} - diff --git a/src/routes/(console)/project-[region]-[project]/storage/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/+page.svelte index 18ee8115e..c99cd6107 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/+page.svelte @@ -3,15 +3,26 @@ - + + + diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte index fc096f174..a66b3d50d 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte @@ -1,6 +1,22 @@ - + + + diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/view.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/view.svelte index 8ad36bcf3..d7d3ada30 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/view.svelte @@ -1,6 +1,5 @@ - - - - - - - - + + + + + + + - {#if files.total} - - - Filename - Type - Size - Created - - - {#each files.files as file (file.$id)} - {#if $uploader.files.find(({ $id }) => $id === file.$id)} - - - - - {file.name} -
- - - {file.mimeType} - {calculateSize(file.sizeOriginal)} - - -
- -
- - - {:else} - {@const href = `${base}/project-${page.params.region}-${page.params.project}/storage/bucket-${bucketId}/file-${file.$id}`} +{#if files.total} + + + Name + Type + Size + Created + Updated + + + {#each files.files as file} + {#if uploader.uploading && file.$id === uploader.file?.$id} + + +
+ + {file.name} +
+ + + {file.mimeType} + + + {calculateSize(file.sizeOriginal)} + + + + + + + + + + + + {:else} + {@const href = createFileUrl ? createFileUrl(file) : null} + {#if href}
- + {file.name}
- {file.mimeType} - {calculateSize(file.sizeOriginal)} - - - - - - Update - { e.stopPropagation(); e.preventDefault(); selectedFile = file; showDelete = true; }}>Delete - + + + { close(); goto(href); }}> + Edit + + { close(); selectedFile = file; showDelete = true; }}> + Delete + + + + {:else} + + +
+ + {file.name} +
+ + + {file.mimeType} + + + {calculateSize(file.sizeOriginal)} + + + + + + + + + + + + + { close(); selectedFile = file; showDelete = true; }}> + Delete + + + + + + {/if} - {/each} - + {/if} + {/each} + - - {:else if search} - -
- Sorry, we couldn't find '{search}' -

There are no files that match your search.

-
-
- - -
- - {:else} - goto(`${base}/project-${page.params.region}-${page.params.project}/storage/bucket-${page.params.bucket}/create`)} /> - {/if} - + +{:else if search} + + + +{:else} + goto("create")} /> +{/if} {#if selectedFile} -{/if} +{/if} \ No newline at end of file diff --git a/src/routes/(console)/project-[region]-[project]/storage/view.svelte b/src/routes/(console)/project-[region]-[project]/storage/view.svelte index 624ccbd1f..6360533e1 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/view.svelte @@ -1,6 +1,5 @@ @@ -49,7 +56,7 @@ {#if view === 'grid'} ($showCreateBucket = true)}> {#each buckets.buckets as bucket} - + {bucket.name} {#if !bucket.enabled} @@ -77,7 +84,7 @@ {/each} {#each buckets.buckets as bucket (bucket.$id)} - + {#each $columns as column} {#if column.id === '$id'} diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/+page.svelte index 78d82e29a..40fa990d9 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/+page.svelte @@ -1,15 +1,20 @@ - + + + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/security/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/security/+page.svelte index f91c3911f..9eb5f5ab5 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/security/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/security/+page.svelte @@ -1,5 +1,5 @@ - + @@ -21,5 +21,5 @@ - + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/settings/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/settings/+page.svelte index 867411ebb..a956b30bd 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/settings/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/settings/+page.svelte @@ -1,5 +1,8 @@ - + + + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.svelte index 047104fec..15f334900 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.svelte @@ -1,12 +1,20 @@ - + + + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/templates/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/templates/+page.svelte index cecdd7185..eb797b3c6 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/templates/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/templates/+page.svelte @@ -1,6 +1,9 @@ - + + + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/user-[user]/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/user-[user]/+page.svelte index 4ad4a392a..93c294076 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/user-[user]/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/user-[user]/+page.svelte @@ -1,5 +1,8 @@ - + + + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+layout.ts new file mode 100644 index 000000000..a3a65791a --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+layout.ts @@ -0,0 +1,6 @@ +import type { LayoutLoad } from './$types'; + +export const load: LayoutLoad = async ({ parent }) => { + const { project } = await parent(); + return { project }; +}; \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.svelte new file mode 100644 index 000000000..648e9210f --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.svelte @@ -0,0 +1,27 @@ + + + + + \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.ts new file mode 100644 index 000000000..aaaa087b4 --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.ts @@ -0,0 +1,11 @@ +import type { PageLoad } from './$types'; + +export const load: PageLoad = async ({ parent, url }) => { + const { project } = await parent(); + + // Import the console page loader to reuse the same logic + const consoleLoader = await import('$routes/(console)/project-[region]-[project]/databases/+page.ts'); + + // Call the console loader with the same parameters + return await consoleLoader.load({ parent, url }); +}; \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+layout.ts new file mode 100644 index 000000000..a3a65791a --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+layout.ts @@ -0,0 +1,6 @@ +import type { LayoutLoad } from './$types'; + +export const load: LayoutLoad = async ({ parent }) => { + const { project } = await parent(); + return { project }; +}; \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.svelte new file mode 100644 index 000000000..2e07a5e08 --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.svelte @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.ts new file mode 100644 index 000000000..bcf6bf4e4 --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.ts @@ -0,0 +1,11 @@ +import type { PageLoad } from './$types'; + +export const load: PageLoad = async ({ parent, url, params }) => { + const { project } = await parent(); + + // Import the console page loader to reuse the same logic + const consoleLoader = await import('$routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts'); + + // Call the console loader with the same parameters + return await consoleLoader.load({ parent, url, params }); +}; \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts new file mode 100644 index 000000000..a3a65791a --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts @@ -0,0 +1,6 @@ +import type { LayoutLoad } from './$types'; + +export const load: LayoutLoad = async ({ parent }) => { + const { project } = await parent(); + return { project }; +}; \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte new file mode 100644 index 000000000..39f4e2485 --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts new file mode 100644 index 000000000..0e64964e2 --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts @@ -0,0 +1,11 @@ +import type { PageLoad } from './$types'; + +export const load: PageLoad = async ({ parent, url, params }) => { + const { project } = await parent(); + + // Import the console page loader to reuse the same logic + const consoleLoader = await import('$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts'); + + // Call the console loader with the same parameters + return await consoleLoader.load({ parent, url, params }); +}; \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.svelte index 4c296debd..b14bb7ea9 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.svelte @@ -1,21 +1,20 @@ - + + + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+layout.ts new file mode 100644 index 000000000..a3a65791a --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+layout.ts @@ -0,0 +1,6 @@ +import type { LayoutLoad } from './$types'; + +export const load: LayoutLoad = async ({ parent }) => { + const { project } = await parent(); + return { project }; +}; \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.svelte new file mode 100644 index 000000000..eecaa6eab --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.svelte @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.ts new file mode 100644 index 000000000..92da06ebd --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.ts @@ -0,0 +1,11 @@ +import type { PageLoad } from './$types'; + +export const load: PageLoad = async ({ parent, url, params }) => { + const { project } = await parent(); + + // Import the console page loader to reuse the same logic + const consoleLoader = await import('$routes/(console)/project-[region]-[project]/storage/+page.ts'); + + // Call the console loader with the same parameters + return await consoleLoader.load({ parent, url, params }); +}; \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts new file mode 100644 index 000000000..a3a65791a --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts @@ -0,0 +1,6 @@ +import type { LayoutLoad } from './$types'; + +export const load: LayoutLoad = async ({ parent }) => { + const { project } = await parent(); + return { project }; +}; \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte new file mode 100644 index 000000000..ab51cc747 --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.ts new file mode 100644 index 000000000..e9446295f --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.ts @@ -0,0 +1,11 @@ +import type { PageLoad } from './$types'; + +export const load: PageLoad = async ({ parent, url, params }) => { + const { project } = await parent(); + + // Import the console page loader to reuse the same logic + const consoleLoader = await import('$routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts'); + + // Call the console loader with the same parameters + return await consoleLoader.load({ parent, url, params }); +}; \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts new file mode 100644 index 000000000..a3a65791a --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts @@ -0,0 +1,6 @@ +import type { LayoutLoad } from './$types'; + +export const load: LayoutLoad = async ({ parent }) => { + const { project } = await parent(); + return { project }; +}; \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte new file mode 100644 index 000000000..c94992d6d --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.ts new file mode 100644 index 000000000..c4834e71e --- /dev/null +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.ts @@ -0,0 +1,11 @@ +import type { PageLoad } from './$types'; + +export const load: PageLoad = async ({ parent, url, params }) => { + const { project } = await parent(); + + // Import the console page loader to reuse the same logic + const consoleLoader = await import('$routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.ts'); + + // Call the console loader with the same parameters + return await consoleLoader.load({ parent, url, params }); +}; \ No newline at end of file diff --git a/static/css/loading.css b/static/css/loading.css index f4b292985..4bfffa100 100644 --- a/static/css/loading.css +++ b/static/css/loading.css @@ -4,7 +4,12 @@ body { width: 100%; } -[data-loading='true'] .page-loader { +[data-embed] { + background: none !important; + background-color: none !important; +} + +[data-loading='true']:not([data-embed]) .page-loader { pointer-events: initial; visibility: visible; opacity: 1;