MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ux fixes

This commit is contained in:
Peter Clement 2021-09-24 11:28:56 +01:00
parent 61c9ec45ed
commit ee367a42a6
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { ModalContent, Modal, Body, Layout, Label } from "@budibase/bbui" import { ModalContent, Modal, Body, Layout, Detail } from "@budibase/bbui"
import { onMount } from "svelte" import { onMount } from "svelte"
import ICONS from "../icons" import ICONS from "../icons"
import api from "builderStore/api" import api from "builderStore/api"
@ -66,7 +66,7 @@
<Modal bind:this={modal}> <Modal bind:this={modal}>
<ModalContent <ModalContent
disabled={!Object.keys(integration).length} disabled={!Object.keys(integration).length}
title="Add Data" title="Data"
confirmText="Continue" confirmText="Continue"
cancelText="Start from scratch" cancelText="Start from scratch"
size="M" size="M"
@ -74,12 +74,11 @@
chooseNextModal() chooseNextModal()
}} }}
> >
<Body size="XS"
>All apps need data. You can connect to a data source below, or add data
to your app using Budibase's built-in database - it's simple!
</Body>
<Layout noPadding> <Layout noPadding>
<Body size="XS"
>All apps need data. You can connect to a data source below, or add data
to your app using Budibase's built-in database.
</Body>
<div <div
class:selected={integration.type === INTERNAL} class:selected={integration.type === INTERNAL}
on:click={() => selectIntegration(INTERNAL)} on:click={() => selectIntegration(INTERNAL)}
@ -92,8 +91,12 @@
> >
</div> </div>
</div> </div>
<Label size="S">Connect to data source</Label> </Layout>
<Layout gap="XS" noPadding>
<div class="title-spacing">
<Detail size="S">Connect to data source</Detail>
</div>
<div class="item-list"> <div class="item-list">
{#each Object.entries(integrations).filter(([key]) => key !== INTERNAL) as [integrationType, schema]} {#each Object.entries(integrations).filter(([key]) => key !== INTERNAL) as [integrationType, schema]}
<div <div

10
packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte
View File

@ -1,6 +1,6 @@
<script> <script>
import { goto } from "@roxi/routify" import { goto } from "@roxi/routify"
import { ModalContent, notifications } from "@budibase/bbui" import { ModalContent, notifications, Body, Layout } from "@budibase/bbui"
import analytics, { Events } from "analytics" import analytics, { Events } from "analytics"
import IntegrationConfigForm from "components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte" import IntegrationConfigForm from "components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte"
import { datasources, tables } from "stores/backend" import { datasources, tables } from "stores/backend"
@ -57,7 +57,7 @@
</script> </script>
<ModalContent <ModalContent
title="Add Data" title={`Connect to ${IntegrationNames[integration.type]}`}
onConfirm={() => saveDatasource()} onConfirm={() => saveDatasource()}
confirmText={integration.plus confirmText={integration.plus
? "Fetch tables from database" ? "Fetch tables from database"
@ -65,6 +65,12 @@
cancelText="Back" cancelText="Back"
size="M" size="M"
> >
<Layout noPadding>
<Body size="XS"
>Connect your database to Budibase using the config below.
</Body>
</Layout>
<IntegrationConfigForm <IntegrationConfigForm
schema={integration.schema} schema={integration.schema}
bind:integration={integration.config} bind:integration={integration.config}