From fccad2f710b5672fae732350744ab8c214e337f6 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 11 Aug 2020 17:58:01 +0100 Subject: [PATCH] bugfixes after team usage --- .../ModelDataTable/ModelDataTable.svelte | 2 +- .../modals/CreateEditColumn.svelte | 10 +++++++-- .../modals/RecordFieldControl.svelte | 12 +++++++++++ .../nav/ModelNavigator/ModelNavigator.svelte | 21 +++++-------------- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte b/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte index c7efd29253..fa36018ae8 100644 --- a/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte +++ b/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte @@ -99,7 +99,7 @@ {#each headers as header} - + {#if schema[header].type === 'link'} {:else}{row[header] || ''}{/if} diff --git a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditColumn.svelte index 77a6db9d39..3c125260ea 100644 --- a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditColumn.svelte @@ -124,8 +124,14 @@ } .field { - margin-top: var(--spacing-xl); - margin-bottom: var(--spacing-xl); + display: grid; + grid-template-columns: auto 20px 1fr; + align-items: center; + grid-gap: 5px; + font-size: 14px; + font-weight: 500; + margin-bottom: var(--spacing-l); + font-family: var(--font-normal); } .button-margin-3 { diff --git a/packages/builder/src/components/database/ModelDataTable/modals/RecordFieldControl.svelte b/packages/builder/src/components/database/ModelDataTable/modals/RecordFieldControl.svelte index 02d6616f87..ecc79b2ba0 100644 --- a/packages/builder/src/components/database/ModelDataTable/modals/RecordFieldControl.svelte +++ b/packages/builder/src/components/database/ModelDataTable/modals/RecordFieldControl.svelte @@ -31,6 +31,9 @@ {/each} {:else} + {#if type === 'checkbox'} + + {/if} {/if} + + diff --git a/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte b/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte index 4b912de5b8..2bd81b2c54 100644 --- a/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte +++ b/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte @@ -11,21 +11,6 @@ const { open, close } = getContext("simple-modal") - let HEADINGS = [ - { - title: "Tables", - key: "TABLES", - }, - { - title: "Tables", - key: "NAVIGATE", - }, - { - title: "Add", - key: "ADD", - }, - ] - $: selectedTab = $backendUiStore.tabs.NAVIGATION_PANEL function selectModel(model, fieldId) { @@ -44,7 +29,7 @@ {#if $backendUiStore.selectedDatabase && $backendUiStore.selectedDatabase._id}
-

Tables

+

Tables

{#each $backendUiStore.models as model} @@ -63,6 +48,10 @@