From f827e8d9aab6dfea667ecefa87276612b4ae372c Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Thu, 2 Apr 2020 15:16:46 +0200 Subject: [PATCH 01/46] wip: add back root routify index page --- packages/builder/src/App.svelte | 62 ++----------------- packages/builder/src/builderStore/index.js | 14 +---- .../builder/src/builderStore/store/index.js | 5 +- .../src/components/start/AppList.svelte | 52 ++++++++++++++++ .../_layout.svelte | 4 +- .../backend/_layout.svelte | 14 ++--- .../backend/actions/index.svelte | 0 .../backend/database/index.svelte | 0 .../backend/index.svelte | 0 .../frontend/_layout.svelte | 0 .../frontend/index.svelte | 0 .../index.svelte | 2 +- .../settings/_layout.svelte | 0 .../settings/index.svelte | 0 packages/builder/src/pages/index.svelte | 9 +-- 15 files changed, 72 insertions(+), 90 deletions(-) create mode 100644 packages/builder/src/components/start/AppList.svelte rename packages/builder/src/pages/{_[application] => [application]}/_layout.svelte (95%) rename packages/builder/src/pages/{_[application] => [application]}/backend/_layout.svelte (57%) rename packages/builder/src/pages/{_[application] => [application]}/backend/actions/index.svelte (100%) rename packages/builder/src/pages/{_[application] => [application]}/backend/database/index.svelte (100%) rename packages/builder/src/pages/{_[application] => [application]}/backend/index.svelte (100%) rename packages/builder/src/pages/{_[application] => [application]}/frontend/_layout.svelte (100%) rename packages/builder/src/pages/{_[application] => [application]}/frontend/index.svelte (100%) rename packages/builder/src/pages/{_[application] => [application]}/index.svelte (80%) rename packages/builder/src/pages/{_[application] => [application]}/settings/_layout.svelte (100%) rename packages/builder/src/pages/{_[application] => [application]}/settings/index.svelte (100%) diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte index 424c7b9a1e..7f2279fbd8 100644 --- a/packages/builder/src/App.svelte +++ b/packages/builder/src/App.svelte @@ -1,11 +1,8 @@ -
- - {#await init} - - {:then result} + - {#if $store.hasAppPackage} - - {:else} - - {/if} - - {:catch err} -

{err}

- {/await} - - -
- - + diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js index 801ecb6464..b3556cff93 100644 --- a/packages/builder/src/builderStore/index.js +++ b/packages/builder/src/builderStore/index.js @@ -10,20 +10,8 @@ export const initialise = async () => { if (process.env.NODE_ENV === "production") { LogRocket.init("knlald/budibase") } - setupRouter(store) await store.initialise() } catch (err) { console.log(err) } -} - -const setupRouter = writable => { - const pushState = history.pushState - history.pushState = () => { - pushState.apply(history, [writable]) - writable.initialise() - } - window.addEventListener("hashchange", () => { - writable.initialise() - }) -} +} \ No newline at end of file diff --git a/packages/builder/src/builderStore/store/index.js b/packages/builder/src/builderStore/store/index.js index 76cdc5a7c3..dcd13aab3b 100644 --- a/packages/builder/src/builderStore/store/index.js +++ b/packages/builder/src/builderStore/store/index.js @@ -1,3 +1,4 @@ +// import { filter, cloneDeep, last, concat, isEmpty, values } from "lodash/fp" import { pipe, getNode, constructHierarchy } from "components/common/core" import * as backendStoreActions from "./backend" @@ -101,10 +102,6 @@ export const getStore = () => { export default getStore const initialise = (store, initial) => async () => { - appname = window.location.hash - ? last(window.location.hash.substr(1).split("/")) - : "" - if (!appname) { initial.apps = await api.get(`/_builder/api/apps`).then(r => r.json()) initial.hasAppPackage = false diff --git a/packages/builder/src/components/start/AppList.svelte b/packages/builder/src/components/start/AppList.svelte new file mode 100644 index 0000000000..0a499b80eb --- /dev/null +++ b/packages/builder/src/components/start/AppList.svelte @@ -0,0 +1,52 @@ + + +
+
+ +
+
+

Choose an Application

+ {#each apps as app} + {app} + {/each} +
+
+
+
+ + diff --git a/packages/builder/src/pages/_[application]/_layout.svelte b/packages/builder/src/pages/[application]/_layout.svelte similarity index 95% rename from packages/builder/src/pages/_[application]/_layout.svelte rename to packages/builder/src/pages/[application]/_layout.svelte index a6df5958ed..11f65a8c85 100644 --- a/packages/builder/src/pages/_[application]/_layout.svelte +++ b/packages/builder/src/pages/[application]/_layout.svelte @@ -2,8 +2,8 @@ import { fade } from "svelte/transition" import { isActive, goto, url, context } from "@sveltech/routify" - import { SettingsIcon, PreviewIcon } from "../../common/Icons/" - import IconButton from "../../common/IconButton.svelte" + import { SettingsIcon, PreviewIcon } from "components/common/Icons/" + import IconButton from "components/common/IconButton.svelte" $: ({ component } = $context) $: list = component.parent.children.filter(child => child.isIndexable) diff --git a/packages/builder/src/pages/_[application]/backend/_layout.svelte b/packages/builder/src/pages/[application]/backend/_layout.svelte similarity index 57% rename from packages/builder/src/pages/_[application]/backend/_layout.svelte rename to packages/builder/src/pages/[application]/backend/_layout.svelte index 58452ee636..2e44ab88f1 100644 --- a/packages/builder/src/pages/_[application]/backend/_layout.svelte +++ b/packages/builder/src/pages/[application]/backend/_layout.svelte @@ -1,11 +1,11 @@
diff --git a/packages/builder/src/pages/_[application]/backend/actions/index.svelte b/packages/builder/src/pages/[application]/backend/actions/index.svelte similarity index 100% rename from packages/builder/src/pages/_[application]/backend/actions/index.svelte rename to packages/builder/src/pages/[application]/backend/actions/index.svelte diff --git a/packages/builder/src/pages/_[application]/backend/database/index.svelte b/packages/builder/src/pages/[application]/backend/database/index.svelte similarity index 100% rename from packages/builder/src/pages/_[application]/backend/database/index.svelte rename to packages/builder/src/pages/[application]/backend/database/index.svelte diff --git a/packages/builder/src/pages/_[application]/backend/index.svelte b/packages/builder/src/pages/[application]/backend/index.svelte similarity index 100% rename from packages/builder/src/pages/_[application]/backend/index.svelte rename to packages/builder/src/pages/[application]/backend/index.svelte diff --git a/packages/builder/src/pages/_[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte similarity index 100% rename from packages/builder/src/pages/_[application]/frontend/_layout.svelte rename to packages/builder/src/pages/[application]/frontend/_layout.svelte diff --git a/packages/builder/src/pages/_[application]/frontend/index.svelte b/packages/builder/src/pages/[application]/frontend/index.svelte similarity index 100% rename from packages/builder/src/pages/_[application]/frontend/index.svelte rename to packages/builder/src/pages/[application]/frontend/index.svelte diff --git a/packages/builder/src/pages/_[application]/index.svelte b/packages/builder/src/pages/[application]/index.svelte similarity index 80% rename from packages/builder/src/pages/_[application]/index.svelte rename to packages/builder/src/pages/[application]/index.svelte index 25636f83f1..db9f091c2d 100644 --- a/packages/builder/src/pages/_[application]/index.svelte +++ b/packages/builder/src/pages/[application]/index.svelte @@ -1,6 +1,6 @@ diff --git a/packages/builder/src/pages/_[application]/settings/_layout.svelte b/packages/builder/src/pages/[application]/settings/_layout.svelte similarity index 100% rename from packages/builder/src/pages/_[application]/settings/_layout.svelte rename to packages/builder/src/pages/[application]/settings/_layout.svelte diff --git a/packages/builder/src/pages/_[application]/settings/index.svelte b/packages/builder/src/pages/[application]/settings/index.svelte similarity index 100% rename from packages/builder/src/pages/_[application]/settings/index.svelte rename to packages/builder/src/pages/[application]/settings/index.svelte diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte index 004280071b..2b401321a2 100644 --- a/packages/builder/src/pages/index.svelte +++ b/packages/builder/src/pages/index.svelte @@ -1,10 +1,8 @@
- {#await promise}
- + {#await promise} + should probably load this in a nicer way + {:then} + + {/await} From 451ea31fa6d91c11d3ee987bd857935b7118a363 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Thu, 2 Apr 2020 16:29:09 +0200 Subject: [PATCH 03/46] wip: database and user access level pages to work with new routing --- .../components/database/DatabaseRoot.svelte | 99 --------------- .../[application]/backend/_layout.svelte | 14 +-- .../backend/accesslevels/index.svelte | 116 ++++++++++++++++++ .../backend/database/index.svelte | 25 ++-- .../src/pages/[application]/index.svelte | 2 +- 5 files changed, 133 insertions(+), 123 deletions(-) delete mode 100644 packages/builder/src/components/database/DatabaseRoot.svelte create mode 100644 packages/builder/src/pages/[application]/backend/accesslevels/index.svelte diff --git a/packages/builder/src/components/database/DatabaseRoot.svelte b/packages/builder/src/components/database/DatabaseRoot.svelte deleted file mode 100644 index 3489acb032..0000000000 --- a/packages/builder/src/components/database/DatabaseRoot.svelte +++ /dev/null @@ -1,99 +0,0 @@ - - - - {#if recordOpen} - - {/if} - {#if modelOpen} - - {/if} - {#if viewOpen} - - {/if} - {#if databaseOpen} - - {/if} - {#if deleteRecordOpen} - - {/if} - {#if userOpen} - - {/if} - - -
-
-
-
{breadcrumbs}
- {#if $backendUiStore.selectedDatabase.id} - { - selectedRecord = null - backendUiStore.actions.modals.show('RECORD') - }}> - Create new record - - {/if} -
- {#if $backendUiStore.selectedDatabase.id} - - {:else}Please select a database{/if} -
-
- - diff --git a/packages/builder/src/pages/[application]/backend/_layout.svelte b/packages/builder/src/pages/[application]/backend/_layout.svelte index 2e44ab88f1..61bbf80201 100644 --- a/packages/builder/src/pages/[application]/backend/_layout.svelte +++ b/packages/builder/src/pages/[application]/backend/_layout.svelte @@ -1,10 +1,9 @@ @@ -13,17 +12,10 @@
-
- +
diff --git a/packages/builder/src/pages/[application]/backend/accesslevels/index.svelte b/packages/builder/src/pages/[application]/backend/accesslevels/index.svelte new file mode 100644 index 0000000000..68d708ab09 --- /dev/null +++ b/packages/builder/src/pages/[application]/backend/accesslevels/index.svelte @@ -0,0 +1,116 @@ + + +
+ + + Create New Access Level + + + + {#if $store.accessLevels} + + + + + + + + + {#each $store.accessLevels.levels as level} + + + + + + {/each} + +
NamePermissions +
{level.name}{getPermissionsString(level.permissions)} + onLevelEdit(level)}> + {@html getIcon('edit')} + + onLevelDelete(level)}> + {@html getIcon('trash')} + +
+ {:else}(no actions added){/if} + + + + + +
+ + diff --git a/packages/builder/src/pages/[application]/backend/database/index.svelte b/packages/builder/src/pages/[application]/backend/database/index.svelte index 2724e8045a..3578c503ed 100644 --- a/packages/builder/src/pages/[application]/backend/database/index.svelte +++ b/packages/builder/src/pages/[application]/backend/database/index.svelte @@ -1,13 +1,11 @@ From 1982c3f21fddfb2525d6bdafc851f523b140fed4 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Thu, 2 Apr 2020 16:40:14 +0200 Subject: [PATCH 04/46] update loading state to empty div, might need a loading state --- packages/builder/src/pages/[application]/_layout.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/[application]/_layout.svelte b/packages/builder/src/pages/[application]/_layout.svelte index bb119f1082..c18e28c222 100644 --- a/packages/builder/src/pages/[application]/_layout.svelte +++ b/packages/builder/src/pages/[application]/_layout.svelte @@ -66,7 +66,8 @@ {#await promise} - should probably load this in a nicer way + +
{:then} {/await} From 1349082fc65cec0558da98cdc2c940883fa6c3cc Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Thu, 2 Apr 2020 17:01:19 +0200 Subject: [PATCH 05/46] use local param instead of global params on application page --- packages/builder/src/pages/[application]/_layout.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/[application]/_layout.svelte b/packages/builder/src/pages/[application]/_layout.svelte index c18e28c222..3aed040ec0 100644 --- a/packages/builder/src/pages/[application]/_layout.svelte +++ b/packages/builder/src/pages/[application]/_layout.svelte @@ -2,17 +2,18 @@ import { store } from "builderStore" import { fade } from "svelte/transition" - import { isActive, goto, url, context, params } from "@sveltech/routify" + import { isActive, goto, url, context } from "@sveltech/routify" import { SettingsIcon, PreviewIcon } from "components/common/Icons/" import IconButton from "components/common/IconButton.svelte" // Get Package and set store + export let application let promise = getPackage() async function getPackage() { - const res = await fetch(`/_builder/api/${$params.application}/appPackage`) + const res = await fetch(`/_builder/api/${application}/appPackage`) const pkg = await res.json() if (res.ok) { From b5333770678b7279595d2fa2a72f6633d2cf333b Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Thu, 2 Apr 2020 18:10:08 +0200 Subject: [PATCH 06/46] update routify --- packages/builder/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/package.json b/packages/builder/package.json index 8d9c07c204..d266c0e952 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -58,7 +58,7 @@ "@babel/preset-env": "^7.5.5", "@babel/runtime": "^7.5.5", "@rollup/plugin-alias": "^3.0.1", - "@sveltech/routify": "1.5.0-beta.16", + "@sveltech/routify": "1.5.0-beta.26", "babel-jest": "^24.8.0", "browser-sync": "^2.26.7", "http-proxy-middleware": "^0.19.1", From 1b520777389d0ccf3b067970ebbb891878702ff0 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Thu, 2 Apr 2020 18:18:31 +0200 Subject: [PATCH 07/46] update routify index options --- packages/builder/src/pages/[application]/backend/index.svelte | 2 +- packages/builder/src/pages/[application]/index.svelte | 2 +- .../builder/src/pages/[application]/settings/_layout.svelte | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/[application]/backend/index.svelte b/packages/builder/src/pages/[application]/backend/index.svelte index 09345bc127..82c0f9e069 100644 --- a/packages/builder/src/pages/[application]/backend/index.svelte +++ b/packages/builder/src/pages/[application]/backend/index.svelte @@ -3,4 +3,4 @@ $goto("../database") - + diff --git a/packages/builder/src/pages/[application]/index.svelte b/packages/builder/src/pages/[application]/index.svelte index 25636f83f1..4b5dbb6a3e 100644 --- a/packages/builder/src/pages/[application]/index.svelte +++ b/packages/builder/src/pages/[application]/index.svelte @@ -3,4 +3,4 @@ $goto("../backend") - + diff --git a/packages/builder/src/pages/[application]/settings/_layout.svelte b/packages/builder/src/pages/[application]/settings/_layout.svelte index 43a188a476..eff7c155d3 100644 --- a/packages/builder/src/pages/[application]/settings/_layout.svelte +++ b/packages/builder/src/pages/[application]/settings/_layout.svelte @@ -1,2 +1,2 @@ - + From 8ba86adbc9a96c64be0ecd9fa30d1731059c03fd Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Thu, 2 Apr 2020 18:23:05 +0200 Subject: [PATCH 08/46] update backendNav to use routify --- packages/builder/src/components/nav/BackendNav.svelte | 5 ++++- packages/builder/src/components/nav/NavItem.svelte | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/nav/BackendNav.svelte b/packages/builder/src/components/nav/BackendNav.svelte index 6454d48fac..813ac7f29c 100644 --- a/packages/builder/src/components/nav/BackendNav.svelte +++ b/packages/builder/src/components/nav/BackendNav.svelte @@ -41,7 +41,10 @@
{/if} - + From d3a707956f7a05ba1b9a4d64cb0057ebea31c829 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Thu, 2 Apr 2020 18:23:53 +0200 Subject: [PATCH 09/46] removes unused code in NavItem component --- packages/builder/src/components/nav/NavItem.svelte | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/builder/src/components/nav/NavItem.svelte b/packages/builder/src/components/nav/NavItem.svelte index 5930e813ea..5c9e6ed725 100644 --- a/packages/builder/src/components/nav/NavItem.svelte +++ b/packages/builder/src/components/nav/NavItem.svelte @@ -1,17 +1,8 @@
Date: Fri, 3 Apr 2020 11:21:11 +0200 Subject: [PATCH 10/46] use params to select DB rather than store --- .../src/components/nav/DatabasesList.svelte | 5 +- .../database/[selectedDatabase]/index.svelte | 43 ++++++++ .../backend/database/_layout.svelte | 76 ++++++++++++++ .../backend/database/index.svelte | 98 +------------------ 4 files changed, 124 insertions(+), 98 deletions(-) create mode 100644 packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte create mode 100644 packages/builder/src/pages/[application]/backend/database/_layout.svelte diff --git a/packages/builder/src/components/nav/DatabasesList.svelte b/packages/builder/src/components/nav/DatabasesList.svelte index a9b8800dad..6eab1914a3 100644 --- a/packages/builder/src/components/nav/DatabasesList.svelte +++ b/packages/builder/src/components/nav/DatabasesList.svelte @@ -1,5 +1,6 @@ + +
+
{breadcrumbs}
+ {#if $backendUiStore.selectedDatabase.id} + { + selectedRecord = null + backendUiStore.actions.modals.show('RECORD') + }}> + Create new record + + {/if} +
+{#if $backendUiStore.selectedDatabase.id} + +{:else}Please select a database{/if} + + diff --git a/packages/builder/src/pages/[application]/backend/database/_layout.svelte b/packages/builder/src/pages/[application]/backend/database/_layout.svelte new file mode 100644 index 0000000000..2c800c18c3 --- /dev/null +++ b/packages/builder/src/pages/[application]/backend/database/_layout.svelte @@ -0,0 +1,76 @@ + + + + {#if recordOpen} + + {/if} + {#if modelOpen} + + {/if} + {#if viewOpen} + + {/if} + {#if databaseOpen} + + {/if} + {#if deleteRecordOpen} + + {/if} + {#if userOpen} + + {/if} + + +
+
+ +
+
+ + diff --git a/packages/builder/src/pages/[application]/backend/database/index.svelte b/packages/builder/src/pages/[application]/backend/database/index.svelte index 3578c503ed..46977a97c3 100644 --- a/packages/builder/src/pages/[application]/backend/database/index.svelte +++ b/packages/builder/src/pages/[application]/backend/database/index.svelte @@ -1,97 +1 @@ - - - - {#if recordOpen} - - {/if} - {#if modelOpen} - - {/if} - {#if viewOpen} - - {/if} - {#if databaseOpen} - - {/if} - {#if deleteRecordOpen} - - {/if} - {#if userOpen} - - {/if} - - -
-
-
-
{breadcrumbs}
- {#if $backendUiStore.selectedDatabase.id} - { - selectedRecord = null - backendUiStore.actions.modals.show('RECORD') - }}> - Create new record - - {/if} -
- {#if $backendUiStore.selectedDatabase.id} - - {:else}Please select a database{/if} -
-
- - +Please select a database From a78056f6b50354ecc3b690081a150cb2bd40beb6 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Fri, 3 Apr 2020 11:27:35 +0200 Subject: [PATCH 11/46] fix autoselecting to sync with url --- packages/builder/src/components/nav/DatabasesList.svelte | 2 +- .../src/pages/[application]/backend/database/index.svelte | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/builder/src/components/nav/DatabasesList.svelte b/packages/builder/src/components/nav/DatabasesList.svelte index 6eab1914a3..d5b3a95296 100644 --- a/packages/builder/src/components/nav/DatabasesList.svelte +++ b/packages/builder/src/components/nav/DatabasesList.svelte @@ -3,7 +3,6 @@ import { goto } from "@sveltech/routify" import { store, backendUiStore } from "builderStore" import api from "builderStore/api" - import getIcon from "../common/icon" import { CheckIcon } from "../common/Icons" $: instances = $store.appInstances @@ -30,6 +29,7 @@ onMount(() => { if ($store.appInstances.length > 0) { selectDatabase($store.appInstances[0]) + $goto(`./database/${$backendUiStore.selectedDatabase.id}`) } }) diff --git a/packages/builder/src/pages/[application]/backend/database/index.svelte b/packages/builder/src/pages/[application]/backend/database/index.svelte index 46977a97c3..e69de29bb2 100644 --- a/packages/builder/src/pages/[application]/backend/database/index.svelte +++ b/packages/builder/src/pages/[application]/backend/database/index.svelte @@ -1 +0,0 @@ -Please select a database From b061c2a335ad7973ebc330d9f7ff0c474a43df0b Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Fri, 3 Apr 2020 11:36:16 +0200 Subject: [PATCH 12/46] adds back no db selected view --- .../src/pages/[application]/backend/database/index.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/builder/src/pages/[application]/backend/database/index.svelte b/packages/builder/src/pages/[application]/backend/database/index.svelte index e69de29bb2..46977a97c3 100644 --- a/packages/builder/src/pages/[application]/backend/database/index.svelte +++ b/packages/builder/src/pages/[application]/backend/database/index.svelte @@ -0,0 +1 @@ +Please select a database From 675c106d8bd9de4947a780a875d97c965c190254 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Fri, 3 Apr 2020 11:36:35 +0200 Subject: [PATCH 13/46] wip: adds frontend view --- .../builder/src/pages/[application]/frontend/index.svelte | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/builder/src/pages/[application]/frontend/index.svelte b/packages/builder/src/pages/[application]/frontend/index.svelte index e69de29bb2..89b0a83720 100644 --- a/packages/builder/src/pages/[application]/frontend/index.svelte +++ b/packages/builder/src/pages/[application]/frontend/index.svelte @@ -0,0 +1,5 @@ + + + From 2245867befd2d1a2b939e28fdb6148b510033783 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Mon, 6 Apr 2020 08:15:29 +0200 Subject: [PATCH 14/46] move modal view to backend page layout --- .../[application]/backend/_layout.svelte | 55 +++++++++++++++- .../backend/database/_layout.svelte | 62 +------------------ 2 files changed, 53 insertions(+), 64 deletions(-) diff --git a/packages/builder/src/pages/[application]/backend/_layout.svelte b/packages/builder/src/pages/[application]/backend/_layout.svelte index 61bbf80201..d95379f8ad 100644 --- a/packages/builder/src/pages/[application]/backend/_layout.svelte +++ b/packages/builder/src/pages/[application]/backend/_layout.svelte @@ -1,12 +1,61 @@ + + {#if recordOpen} + + {/if} + {#if modelOpen} + + {/if} + {#if viewOpen} + + {/if} + {#if databaseOpen} + + {/if} + {#if deleteRecordOpen} + + {/if} + {#if userOpen} + + {/if} + +
diff --git a/packages/builder/src/pages/[application]/backend/database/_layout.svelte b/packages/builder/src/pages/[application]/backend/database/_layout.svelte index bc9e7e65ac..48ef39a90c 100644 --- a/packages/builder/src/pages/[application]/backend/database/_layout.svelte +++ b/packages/builder/src/pages/[application]/backend/database/_layout.svelte @@ -1,65 +1,6 @@ - - - - {#if recordOpen} - - {/if} - {#if modelOpen} - - {/if} - {#if viewOpen} - - {/if} - {#if databaseOpen} - - {/if} - {#if deleteRecordOpen} - - {/if} - {#if userOpen} - - {/if} - -
- +
@@ -73,5 +14,4 @@ overflow-y: auto; flex: 1 1 auto; } - From 9708e37ac97428d9cfbe3298bb6f81ca7e73332b Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Mon, 6 Apr 2020 09:07:53 +0200 Subject: [PATCH 15/46] style fix that was not merged correctly --- .../builder/src/pages/[application]/backend/_layout.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/[application]/backend/_layout.svelte b/packages/builder/src/pages/[application]/backend/_layout.svelte index d95379f8ad..16067adcd6 100644 --- a/packages/builder/src/pages/[application]/backend/_layout.svelte +++ b/packages/builder/src/pages/[application]/backend/_layout.svelte @@ -77,13 +77,13 @@ .content { flex: 1 1 auto; - margin: 80px 60px; + margin: 20px 40px; } .nav { overflow: auto; flex: 0 1 auto; - width: 300px; + width: 275px; height: 100%; } From 600c3e61b3f9473b43787baaf881904480db42a2 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Mon, 6 Apr 2020 10:02:54 +0200 Subject: [PATCH 16/46] remove unused files in the src/root directory that have been converted to route pages --- packages/builder/src/BackendRoot.svelte | 49 ------- packages/builder/src/NoPackage.svelte | 55 -------- packages/builder/src/PackageRoot.svelte | 172 ------------------------ 3 files changed, 276 deletions(-) delete mode 100644 packages/builder/src/BackendRoot.svelte delete mode 100644 packages/builder/src/NoPackage.svelte delete mode 100644 packages/builder/src/PackageRoot.svelte diff --git a/packages/builder/src/BackendRoot.svelte b/packages/builder/src/BackendRoot.svelte deleted file mode 100644 index f127c803cb..0000000000 --- a/packages/builder/src/BackendRoot.svelte +++ /dev/null @@ -1,49 +0,0 @@ - - -
-
- -
-
- {#if $backendUiStore.leftNavItem === 'DATABASE'} - - {:else if $backendUiStore.leftNavItem === 'ACTIONS'} - - {:else if $backendUiStore.leftNavItem === 'ACCESS_LEVELS'} - - {/if} -
-
- -
-
- - diff --git a/packages/builder/src/NoPackage.svelte b/packages/builder/src/NoPackage.svelte deleted file mode 100644 index c15df26036..0000000000 --- a/packages/builder/src/NoPackage.svelte +++ /dev/null @@ -1,55 +0,0 @@ - - -
-
- -
- -
-

Choose an Application

- {#each $store.apps as app} - {app} - {/each} -
-
-
-
- - diff --git a/packages/builder/src/PackageRoot.svelte b/packages/builder/src/PackageRoot.svelte deleted file mode 100644 index 71660ec2e8..0000000000 --- a/packages/builder/src/PackageRoot.svelte +++ /dev/null @@ -1,172 +0,0 @@ - - -
- -
-
- - - (selectedTab = TABS.BACKEND)}> - Backend - - (selectedTab = TABS.FRONTEND)}> - Frontend - -
- -
- selectedTab === TABS.FRONTEND}> - - - selectedTab === TABS.FRONTEND}> - - -
-
- -
- {#if selectedTab === TABS.BACKEND} -
- -
- {:else} -
- -
- {/if} -
- -
- - From 0bc485cf809f2d1ef92f2d6681517f8e2d5220e1 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Mon, 6 Apr 2020 10:06:02 +0200 Subject: [PATCH 17/46] remove AccessLevelsRoot, moved to Route page component --- .../accessLevels/AccessLevelsRoot.svelte | 116 ------------------ 1 file changed, 116 deletions(-) delete mode 100644 packages/builder/src/components/accessLevels/AccessLevelsRoot.svelte diff --git a/packages/builder/src/components/accessLevels/AccessLevelsRoot.svelte b/packages/builder/src/components/accessLevels/AccessLevelsRoot.svelte deleted file mode 100644 index f53afae5f6..0000000000 --- a/packages/builder/src/components/accessLevels/AccessLevelsRoot.svelte +++ /dev/null @@ -1,116 +0,0 @@ - - -
- - - Create New Access Level - - - - {#if $store.accessLevels} - - - - - - - - - {#each $store.accessLevels.levels as level} - - - - - - {/each} - -
NamePermissions -
{level.name}{getPermissionsString(level.permissions)} - onLevelEdit(level)}> - {@html getIcon('edit')} - - onLevelDelete(level)}> - {@html getIcon('trash')} - -
- {:else}(no actions added){/if} - - - - - -
- - From 2d004e9c0bfc9f76c14d0aebc34478701a4b5610 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Mon, 6 Apr 2020 11:04:36 +0200 Subject: [PATCH 18/46] remove unused imports --- .../database/ModelDataTable/modals/CreateDatabase.svelte | 1 - .../database/ModelDataTable/modals/CreateEditModel.svelte | 1 - .../database/ModelDataTable/modals/CreateEditRecord.svelte | 1 - .../database/ModelDataTable/modals/DeleteRecord.svelte | 1 - packages/builder/src/components/database/ModelView.svelte | 1 - .../components/userInterface/EventsEditor/EventsEditor.svelte | 1 - .../src/components/userInterface/UserInterfaceRoot.svelte | 1 - 7 files changed, 7 deletions(-) diff --git a/packages/builder/src/components/database/ModelDataTable/modals/CreateDatabase.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateDatabase.svelte index f07c67baaf..2b269761be 100644 --- a/packages/builder/src/components/database/ModelDataTable/modals/CreateDatabase.svelte +++ b/packages/builder/src/components/database/ModelDataTable/modals/CreateDatabase.svelte @@ -1,5 +1,4 @@ -
- Database Name - +
+
+ Database Name + +
Cancel Save
-
+
diff --git a/packages/builder/src/components/nav/BackendNav.svelte b/packages/builder/src/components/nav/BackendNav.svelte index a50ef29641..edd0586d94 100644 --- a/packages/builder/src/components/nav/BackendNav.svelte +++ b/packages/builder/src/components/nav/BackendNav.svelte @@ -6,6 +6,18 @@ import UsersList from "./UsersList.svelte" import NavItem from "./NavItem.svelte" import getIcon from "components/common/icon" + import { CreateDatabaseModal } from "components/database/ModelDataTable/modals" + const { open, close } = getContext("simple-modal") + + const openDatabaseCreator = () => { + open( + CreateDatabaseModal, + { + onClosed: close, + }, + { styleContent: { padding: "0" } } + ) + }
@@ -13,9 +25,7 @@
Databases
- backendUiStore.actions.modals.show('DATABASE')} /> +
diff --git a/packages/builder/src/pages/[application]/backend/_layout.svelte b/packages/builder/src/pages/[application]/backend/_layout.svelte index 16067adcd6..ce0cc9323e 100644 --- a/packages/builder/src/pages/[application]/backend/_layout.svelte +++ b/packages/builder/src/pages/[application]/backend/_layout.svelte @@ -1,4 +1,5 @@ - +
diff --git a/packages/builder/src/pages/[application]/backend/accesslevels/index.svelte b/packages/builder/src/pages/[application]/backend/accesslevels/index.svelte index 68d708ab09..3a0337cbfb 100644 --- a/packages/builder/src/pages/[application]/backend/accesslevels/index.svelte +++ b/packages/builder/src/pages/[application]/backend/accesslevels/index.svelte @@ -1,4 +1,7 @@
- - - - - - +
+ + + + + + +