diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index fd94e4f12..423005bc6 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -44,23 +44,28 @@ }); -{#if $prefs?.preferredView === 'list'} - - - - {#each $columns as column} - - {/each} - - +{#if $columns?.length} + {#if $prefs?.preferredView === 'list'} + + + + {#each $columns as column} + + {/each} + + + {/if} {/if} {#if showToggle} diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte index 4adb73a8e..226ac2d71 100644 --- a/src/routes/console/+layout.svelte +++ b/src/routes/console/+layout.svelte @@ -19,14 +19,12 @@ onMount(async () => { loading.set(false); - if (!$prefs) { - await prefs.load(); - if (!$prefs?.preferredView) { - prefs.updatePrefs({ - preferredView: 'grid', - pageLimit: 6 - }); - } + await prefs.load(); + if (!$prefs?.preferredView) { + prefs.updatePrefs({ + preferredView: 'grid', + pageLimit: 6 + }); } setInterval(() => { diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts index 1e7d2c1c9..bddb8fa33 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -25,7 +25,6 @@ export const load: PageLoad = async ({ params, parent, depends, url }) => { Query.offset(offset), Query.orderDesc('$createdAt') ]); - console.log('test'); await redirectOnOffsetOverflow( offset, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte index e399f77d7..a7f59dfe0 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte @@ -23,6 +23,7 @@ import { columns } from './store'; import { onMount } from 'svelte'; import RelationshipsModal from './relationshipsModal.svelte'; + import CreateAttributeDropdown from '../attributes/createAttributeDropdown.svelte'; export let data: PageData; const projectId = $page.params.project; @@ -30,6 +31,8 @@ let showCreateAttribute = false; let showRelationships = false; let selectedRelationship: string[] = null; + let showCreateDropdown = false; + let selectedAttribute: string = null; function openWizard() { wizard.start(Create); @@ -178,13 +181,37 @@ on:click={openWizard} /> {/if} {:else} - (showCreateAttribute = true)} /> + (showCreateDropdown = true)}> +
+ Create your first attribute to get started. +

+ Need a hand? Check out our documentation. +

+
+
+ + + + +
+
{/if} - + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/relationshipsModal.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/relationshipsModal.svelte index e0143cba7..77f311993 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/relationshipsModal.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/relationshipsModal.svelte @@ -4,6 +4,8 @@ export let showCreate = false; export let selectedRelationship: string = null; + const limit = 10; + let offset = 0; $: if (!showCreate) { selectedRelationship = null; @@ -14,11 +16,15 @@ {selectedRelationship} + {#each selectedRelationship as relationship} + {relationship.data} {relationship.id} + {/each} - - + + 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 eada00db2..c73c33df2 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 @@ -15,9 +15,9 @@ import Create from '../createAttribute.svelte'; import CreateIndex from '../indexes/createIndex.svelte'; import { attributes, type Attributes } from '../store'; + import CreateAttributeDropdown from './createAttributeDropdown.svelte'; import Delete from './deleteAttribute.svelte'; import Edit from './edit.svelte'; - import { options } from './store'; let showCreateDropdown = false; let showDropdown = []; @@ -33,27 +33,7 @@
Attributes - - - - {#each options as attribute} - { - selectedOption = attribute.name; - showCreateDropdown = false; - showCreate = true; - }}> - {attribute.name} - - {/each} - - +
{#if $attributes.length} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte new file mode 100644 index 000000000..a10850716 --- /dev/null +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte @@ -0,0 +1,34 @@ + + + + + + + + {#each options as attribute} + { + selectedOption = attribute.name; + showCreateDropdown = false; + showCreate = true; + }}> + {attribute.name} + + {/each} + + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte index a84552c6b..247e3b3b9 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte @@ -64,11 +64,15 @@ - {selectedOption} {#if selectedOption === 'Relationship'} -
- Beta -
+ + {selectedOption} +
+ Beta +
+
+ {:else} + {selectedOption} {/if}
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 734fa8fcc..d502d00ff 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 @@ -20,6 +20,7 @@ import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; + import CreateAttributeDropdown from '../attributes/createAttributeDropdown.svelte'; let showDropdown = []; let selectedIndex: Models.Index = null; @@ -27,6 +28,8 @@ let showOverview = false; let showDelete = false; let showCreateAttribute = false; + let showCreateDropdown = false; + let selectedAttribute: string = null; const handleDelete = async () => { invalidate(Dependencies.COLLECTION); @@ -124,11 +127,35 @@ on:click={() => (showCreateIndex = true)} /> {/if} {:else} - (showCreateAttribute = true)} /> + (showCreateDropdown = true)}> +
+ Create your first attribute to get started. +

+ Need a hand? Check out our documentation. +

+
+
+ + + + +
+
{/if} @@ -139,4 +166,4 @@ {/if} - +