From 7d070b5a10c28a600be72b97855352c84cd79f30 Mon Sep 17 00:00:00 2001 From: Faton Ramadani Date: Thu, 22 Sep 2022 13:25:17 +0200 Subject: [PATCH] feature(frontend): Button component (#616) * feature(frontend): Button component * feature(frontend): Ajust style --- frontend/src/lib/components/EditorBar.svelte | 64 +++++---------- .../src/lib/components/FlowBuilder.svelte | 2 +- .../src/lib/components/ScriptEditor.svelte | 32 ++++---- .../components/common/button/Button.svelte | 79 +++++++++++++++++++ .../flows/header/FlowImportExportMenu.svelte | 10 +-- .../flows/header/FlowPreviewButtons.svelte | 18 +++-- frontend/src/lib/utils.ts | 2 +- 7 files changed, 130 insertions(+), 77 deletions(-) create mode 100644 frontend/src/lib/components/common/button/Button.svelte diff --git a/frontend/src/lib/components/EditorBar.svelte b/frontend/src/lib/components/EditorBar.svelte index 5cbd1cf716..5a72a355c2 100644 --- a/frontend/src/lib/components/EditorBar.svelte +++ b/frontend/src/lib/components/EditorBar.svelte @@ -13,6 +13,7 @@ import Modal from './Modal.svelte' import ResourceEditor from './ResourceEditor.svelte' import VariableEditor from './VariableEditor.svelte' + import Button from './common/button/Button.svelte' export let lang: 'python3' | 'deno' | 'go' export let editor: Editor @@ -171,65 +172,40 @@ -
+
- +
- +
- +
- +
- +
diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte index 1d2c313456..c014254d3a 100644 --- a/frontend/src/lib/components/FlowBuilder.svelte +++ b/frontend/src/lib/components/FlowBuilder.svelte @@ -16,7 +16,7 @@ import CenteredPage from './CenteredPage.svelte' import { OFFSET } from './CronInput.svelte' import FlowEditor from './flows/FlowEditor.svelte' - import { flowStateStore, type FlowState } from './flows/flowState' + import { flowStateStore } from './flows/flowState' import { flowStore } from './flows/flowStore' import FlowImportExportMenu from './flows/header/FlowImportExportMenu.svelte' import { loadFlowSchedule, type Schedule } from './flows/scheduleUtils' diff --git a/frontend/src/lib/components/ScriptEditor.svelte b/frontend/src/lib/components/ScriptEditor.svelte index 796cf11ada..6dc76a6ad3 100644 --- a/frontend/src/lib/components/ScriptEditor.svelte +++ b/frontend/src/lib/components/ScriptEditor.svelte @@ -22,6 +22,7 @@ import { HSplitPane, VSplitPane } from 'svelte-split-pane' import { faGithub } from '@fortawesome/free-brands-svg-icons' import EditorBar from './EditorBar.svelte' + import Button from './common/button/Button.svelte' // Exported export let schema: Schema = emptySchema() @@ -196,30 +197,33 @@
- +
diff --git a/frontend/src/lib/components/common/button/Button.svelte b/frontend/src/lib/components/common/button/Button.svelte new file mode 100644 index 0000000000..4e42589525 --- /dev/null +++ b/frontend/src/lib/components/common/button/Button.svelte @@ -0,0 +1,79 @@ + + +{#if href} + + {#if startIcon} + + {/if} + + {#if endIcon} + + {/if} + +{:else} + +{/if} diff --git a/frontend/src/lib/components/flows/header/FlowImportExportMenu.svelte b/frontend/src/lib/components/flows/header/FlowImportExportMenu.svelte index fec69e0b82..fe628bc6e1 100644 --- a/frontend/src/lib/components/flows/header/FlowImportExportMenu.svelte +++ b/frontend/src/lib/components/flows/header/FlowImportExportMenu.svelte @@ -7,15 +7,7 @@ import FlowViewer from '$lib/components/FlowViewer.svelte' import SimpleEditor from '$lib/components/SimpleEditor.svelte' import { sendUserToast } from '$lib/utils' - import { faCloudscale } from '@fortawesome/free-brands-svg-icons' - import { - faCloud, - faCloudUpload, - faFileExport, - faFileImport, - faGlobe, - faUpload - } from '@fortawesome/free-solid-svg-icons' + import { faFileExport, faFileImport, faGlobe } from '@fortawesome/free-solid-svg-icons' import Icon from 'svelte-awesome' import { flowStore, initFlow } from '../flowStore' import { cleanInputs } from '../utils' diff --git a/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte b/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte index d4e42466ed..bf99b0aaaa 100644 --- a/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte +++ b/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte @@ -1,4 +1,6 @@ - + - + diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts index a97e3147a6..34f9b923b3 100644 --- a/frontend/src/lib/utils.ts +++ b/frontend/src/lib/utils.ts @@ -558,7 +558,7 @@ export function scriptToHubUrl( return url } -export function classNames(...classes: string[]): string { +export function classNames(...classes: Array): string { return classes.filter(Boolean).join(' ') }