From 1bbe13150a780dba7075b250ed050f598e8bfa31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2020 15:51:21 +0000 Subject: [PATCH 01/18] Bump handlebars from 4.1.2 to 4.7.3 in /packages/core Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.7.3. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.7.3) Signed-off-by: dependabot[bot] --- packages/core/yarn.lock | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/core/yarn.lock b/packages/core/yarn.lock index 043b36cbd7..c5155fb43e 100644 --- a/packages/core/yarn.lock +++ b/packages/core/yarn.lock @@ -1663,11 +1663,16 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@^2.8.1, commander@~2.20.0: +commander@^2.8.1: version "2.20.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== +commander@~2.20.3: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -2431,9 +2436,9 @@ growly@^1.3.0: integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= handlebars@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67" - integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw== + version "4.7.3" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee" + integrity sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg== dependencies: neo-async "^2.6.0" optimist "^0.6.1" @@ -5352,11 +5357,11 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= uglify-js@^3.1.4: - version "3.6.0" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5" - integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg== + version "3.7.7" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.7.tgz#21e52c7dccda80a53bf7cde69628a7e511aec9c9" + integrity sha512-FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA== dependencies: - commander "~2.20.0" + commander "~2.20.3" source-map "~0.6.1" unicode-canonical-property-names-ecmascript@^1.0.4: From 2c3558540690c8c5b6fdac672f0530b9df4c6123 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 14:58:16 +0000 Subject: [PATCH 02/18] Bump acorn from 5.7.3 to 5.7.4 in /packages/server Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4) Signed-off-by: dependabot[bot] --- packages/server/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5475d85d62..7e65f2f2d4 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -451,9 +451,9 @@ acorn-walk@^6.0.1: integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== acorn@^5.5.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== + version "5.7.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" + integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== acorn@^6.0.1: version "6.3.0" From b8559119d2ef9c504d79653b061a8086bcf6e0c1 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Tue, 31 Mar 2020 11:42:21 +0200 Subject: [PATCH 03/18] update gitignore file --- packages/builder/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/.gitignore b/packages/builder/.gitignore index 328f7f0f3c..6e90239f92 100644 --- a/packages/builder/.gitignore +++ b/packages/builder/.gitignore @@ -1,5 +1,5 @@ .DS_Store -node_modules +/node_modules/ node_modules_win package-lock.json yarn.lock From 319b86e0123eb1229f7f755d34f0a7b3fd2de5c5 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Tue, 31 Mar 2020 11:50:13 +0200 Subject: [PATCH 04/18] wip: move components to node_modules folder for easier importing --- .gitignore | 2 +- packages/builder/package.json | 6 +- packages/builder/rollup.config.js | 20 ++- .../{ => node_modules}/builderStore/api.js | 0 .../builderStore/buildCodeForScreens.js | 0 .../builderStore/buildStateOrigins.js | 0 .../builderStore/createPackage.js | 0 .../builderStore/generate_css.js | 0 .../{ => node_modules}/builderStore/index.js | 0 .../builderStore/insertCodeMetadata.js | 0 .../builderStore/loadComponentLibraries.js | 0 .../builderStore/store/backend.js | 0 .../builderStore/store/index.js | 0 .../{ => node_modules}/builderStore/uuid.js | 0 .../accessLevels/AccessLevelView.svelte | 0 .../accessLevels/AccessLevelsRoot.svelte | 0 .../actionsAndTriggers/ActionView.svelte | 0 .../actionsAndTriggers/Actions.svelte | 0 .../ActionsAndTriggersRoot.svelte | 0 .../actionsAndTriggers/TriggerView.svelte | 0 .../actionsAndTriggers/Triggers.svelte | 0 .../components}/common/ActionButton.svelte | 0 .../components}/common/AppNotification.svelte | 0 .../components}/common/Button.svelte | 0 .../components}/common/ButtonGroup.svelte | 0 .../components}/common/Checkbox.svelte | 0 .../components}/common/CodeArea.svelte | 0 .../components}/common/ComingSoon.svelte | 0 .../components}/common/ConfirmDialog.svelte | 0 .../components}/common/DatePicker.svelte | 0 .../components}/common/Dropdown.svelte | 0 .../components}/common/DropdownButton.svelte | 0 .../components}/common/ErrorsBox.svelte | 0 .../components}/common/IconButton.svelte | 0 .../components}/common/Icons/Add.svelte | 0 .../components}/common/Icons/ArrowDown.svelte | 0 .../components}/common/Icons/Check.svelte | 0 .../common/Icons/ChevronDown.svelte | 0 .../components}/common/Icons/ChevronUp.svelte | 0 .../common/Icons/CircleIndicator.svelte | 0 .../components}/common/Icons/Copy.svelte | 0 .../components}/common/Icons/Events.svelte | 0 .../components}/common/Icons/Grid.svelte | 0 .../components}/common/Icons/Image.svelte | 0 .../components}/common/Icons/Input.svelte | 0 .../common/Icons/JavaScript.svelte | 0 .../components}/common/Icons/Layout.svelte | 0 .../components}/common/Icons/Paint.svelte | 0 .../components}/common/Icons/Pencil.svelte | 0 .../components}/common/Icons/Preview.svelte | 0 .../components}/common/Icons/Settings.svelte | 0 .../components}/common/Icons/Shape.svelte | 0 .../components}/common/Icons/Terminal.svelte | 0 .../components}/common/Icons/XCircle.svelte | 0 .../components}/common/Icons/index.js | 0 .../components}/common/Input.svelte | 0 .../common/Inputs/InputGroup.svelte | 0 .../components}/common/Modal.svelte | 0 .../components}/common/NumberBox.svelte | 0 .../components}/common/PlusButton.svelte | 0 .../components}/common/Select.svelte | 0 .../components}/common/Spinner.svelte | 0 .../components}/common/Textbox.svelte | 0 .../components}/common/ValuesList.svelte | 0 .../components}/common/binding.js | 0 .../components}/common/core.js | 0 .../components}/common/eventHandlers.js | 0 .../components}/common/icon.js | 0 .../database/CollectionView.svelte | 0 .../components}/database/DatabaseRoot.svelte | 0 .../components}/database/FieldView.svelte | 0 .../components}/database/IndexView.svelte | 0 .../ModelDataTable/ModelDataTable.svelte | 0 .../ModelDataTable/TablePagination.svelte | 0 .../database/ModelDataTable/api.js | 0 .../database/ModelDataTable/index.js | 0 .../modals/CreateDatabase.svelte | 0 .../modals/CreateEditModel.svelte | 0 .../modals/CreateEditRecord.svelte | 0 .../modals/CreateEditView.svelte | 0 .../ModelDataTable/modals/CreateUser.svelte | 0 .../ModelDataTable/modals/DeleteRecord.svelte | 0 .../modals/RecordFieldControl.svelte | 0 .../database/ModelDataTable/modals/index.js | 0 .../test/ModelDataTable.spec.js | 0 .../components}/database/ModelView.svelte | 0 .../components}/nav/BackendNav.svelte | 0 .../components}/nav/DatabasesList.svelte | 0 .../components}/nav/HierarchyRow.svelte | 0 .../components}/nav/NavItem.svelte | 0 .../nav/SchemaManagementDrawer.svelte | 0 .../components}/nav/UsersList.svelte | 0 .../userInterface/CodeEditor.svelte | 0 .../ComponentPropertiesPanel.svelte | 0 .../userInterface/ComponentSearch.svelte | 0 .../ComponentSelectionList.svelte | 0 .../userInterface/ComponentSelector.svelte | 0 .../userInterface/ComponentsHierarchy.svelte | 0 .../ComponentsHierarchyChildren.svelte | 0 .../ComponentsPaneSwitcher.svelte | 0 .../userInterface/CurrentItemPreview.svelte | 0 .../userInterface/EditComponentProps.svelte | 0 .../EventsEditor/EventEditorModal.svelte | 0 .../EventsEditor/EventsEditor.svelte | 0 .../EventsEditor/HandlerSelector.svelte | 0 .../EventsEditor/StateBindingCascader.svelte | 0 .../userInterface/EventsEditor/index.js | 0 .../userInterface/LayoutEditor.svelte | 0 .../LayoutTemplateControls.svelte | 0 .../userInterface/MasterLayout.svelte | 0 .../userInterface/NewScreen.svelte | 0 .../components}/userInterface/PageView.svelte | 0 .../userInterface/PagesComponents.svelte | 0 .../userInterface/PagesList.svelte | 0 .../userInterface/PropControl.svelte | 0 .../PropertyCascader/PropertyCascader.svelte | 0 .../StateBindingOptions.svelte | 0 .../userInterface/PropertyCascader/index.js | 0 .../userInterface/PropsView.svelte | 0 .../userInterface/SettingsView.svelte | 0 .../userInterface/StateBindingControl.svelte | 0 .../userInterface/UserInterfaceRoot.svelte | 0 .../userInterface/pagesParsing/createProps.js | 0 .../pagesParsing/defaultPagesObject.js | 0 .../pagesParsing/findDependencies.js | 0 .../pagesParsing/getRootComponent.js | 0 .../pagesParsing/renameScreen.js | 0 .../pagesParsing/searchComponents.js | 0 .../pagesParsing/splitRootComponentName.js | 0 .../userInterface/pagesParsing/types.js | 0 .../pagesParsing/validatePages.js | 0 .../src/pages/_[application]/_layout.svelte | 159 ++++++++++++++++++ .../_[application]/backend/_layout.svelte | 48 ++++++ .../backend/actions/index.svelte | 134 +++++++++++++++ .../backend/database/index.svelte | 96 +++++++++++ .../pages/_[application]/backend/index.svelte | 6 + .../_[application]/frontend/_layout.svelte | 1 + .../_[application]/frontend/index.svelte | 0 .../src/pages/_[application]/index.svelte | 6 + .../_[application]/settings/_layout.svelte | 2 + .../_[application]/settings/index.svelte | 1 + packages/builder/src/pages/index.svelte | 68 ++++++++ packages/cli/.gitignore | 3 +- packages/datastores/.gitignore | 1 + packages/server/.gitignore | 1 + 145 files changed, 549 insertions(+), 5 deletions(-) rename packages/builder/src/{ => node_modules}/builderStore/api.js (100%) rename packages/builder/src/{ => node_modules}/builderStore/buildCodeForScreens.js (100%) rename packages/builder/src/{ => node_modules}/builderStore/buildStateOrigins.js (100%) rename packages/builder/src/{ => node_modules}/builderStore/createPackage.js (100%) rename packages/builder/src/{ => node_modules}/builderStore/generate_css.js (100%) rename packages/builder/src/{ => node_modules}/builderStore/index.js (100%) rename packages/builder/src/{ => node_modules}/builderStore/insertCodeMetadata.js (100%) rename packages/builder/src/{ => node_modules}/builderStore/loadComponentLibraries.js (100%) rename packages/builder/src/{ => node_modules}/builderStore/store/backend.js (100%) rename packages/builder/src/{ => node_modules}/builderStore/store/index.js (100%) rename packages/builder/src/{ => node_modules}/builderStore/uuid.js (100%) rename packages/builder/src/{ => node_modules/components}/accessLevels/AccessLevelView.svelte (100%) rename packages/builder/src/{ => node_modules/components}/accessLevels/AccessLevelsRoot.svelte (100%) rename packages/builder/src/{ => node_modules/components}/actionsAndTriggers/ActionView.svelte (100%) rename packages/builder/src/{ => node_modules/components}/actionsAndTriggers/Actions.svelte (100%) rename packages/builder/src/{ => node_modules/components}/actionsAndTriggers/ActionsAndTriggersRoot.svelte (100%) rename packages/builder/src/{ => node_modules/components}/actionsAndTriggers/TriggerView.svelte (100%) rename packages/builder/src/{ => node_modules/components}/actionsAndTriggers/Triggers.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/ActionButton.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/AppNotification.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Button.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/ButtonGroup.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Checkbox.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/CodeArea.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/ComingSoon.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/ConfirmDialog.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/DatePicker.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Dropdown.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/DropdownButton.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/ErrorsBox.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/IconButton.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Add.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/ArrowDown.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Check.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/ChevronDown.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/ChevronUp.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/CircleIndicator.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Copy.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Events.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Grid.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Image.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Input.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/JavaScript.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Layout.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Paint.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Pencil.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Preview.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Settings.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Shape.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/Terminal.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/XCircle.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Icons/index.js (100%) rename packages/builder/src/{ => node_modules/components}/common/Input.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Inputs/InputGroup.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Modal.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/NumberBox.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/PlusButton.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Select.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Spinner.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/Textbox.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/ValuesList.svelte (100%) rename packages/builder/src/{ => node_modules/components}/common/binding.js (100%) rename packages/builder/src/{ => node_modules/components}/common/core.js (100%) rename packages/builder/src/{ => node_modules/components}/common/eventHandlers.js (100%) rename packages/builder/src/{ => node_modules/components}/common/icon.js (100%) rename packages/builder/src/{ => node_modules/components}/database/CollectionView.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/DatabaseRoot.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/FieldView.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/IndexView.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/ModelDataTable.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/TablePagination.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/api.js (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/index.js (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/modals/CreateDatabase.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/modals/CreateEditModel.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/modals/CreateEditRecord.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/modals/CreateEditView.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/modals/CreateUser.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/modals/DeleteRecord.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/modals/RecordFieldControl.svelte (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/modals/index.js (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelDataTable/test/ModelDataTable.spec.js (100%) rename packages/builder/src/{ => node_modules/components}/database/ModelView.svelte (100%) rename packages/builder/src/{ => node_modules/components}/nav/BackendNav.svelte (100%) rename packages/builder/src/{ => node_modules/components}/nav/DatabasesList.svelte (100%) rename packages/builder/src/{ => node_modules/components}/nav/HierarchyRow.svelte (100%) rename packages/builder/src/{ => node_modules/components}/nav/NavItem.svelte (100%) rename packages/builder/src/{ => node_modules/components}/nav/SchemaManagementDrawer.svelte (100%) rename packages/builder/src/{ => node_modules/components}/nav/UsersList.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/CodeEditor.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/ComponentPropertiesPanel.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/ComponentSearch.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/ComponentSelectionList.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/ComponentSelector.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/ComponentsHierarchy.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/ComponentsHierarchyChildren.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/ComponentsPaneSwitcher.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/CurrentItemPreview.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/EditComponentProps.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/EventsEditor/EventEditorModal.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/EventsEditor/EventsEditor.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/EventsEditor/HandlerSelector.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/EventsEditor/StateBindingCascader.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/EventsEditor/index.js (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/LayoutEditor.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/LayoutTemplateControls.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/MasterLayout.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/NewScreen.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/PageView.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/PagesComponents.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/PagesList.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/PropControl.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/PropertyCascader/PropertyCascader.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/PropertyCascader/StateBindingOptions.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/PropertyCascader/index.js (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/PropsView.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/SettingsView.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/StateBindingControl.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/UserInterfaceRoot.svelte (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/pagesParsing/createProps.js (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/pagesParsing/defaultPagesObject.js (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/pagesParsing/findDependencies.js (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/pagesParsing/getRootComponent.js (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/pagesParsing/renameScreen.js (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/pagesParsing/searchComponents.js (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/pagesParsing/splitRootComponentName.js (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/pagesParsing/types.js (100%) rename packages/builder/src/{ => node_modules/components}/userInterface/pagesParsing/validatePages.js (100%) create mode 100644 packages/builder/src/pages/_[application]/_layout.svelte create mode 100644 packages/builder/src/pages/_[application]/backend/_layout.svelte create mode 100644 packages/builder/src/pages/_[application]/backend/actions/index.svelte create mode 100644 packages/builder/src/pages/_[application]/backend/database/index.svelte create mode 100644 packages/builder/src/pages/_[application]/backend/index.svelte create mode 100644 packages/builder/src/pages/_[application]/frontend/_layout.svelte create mode 100644 packages/builder/src/pages/_[application]/frontend/index.svelte create mode 100644 packages/builder/src/pages/_[application]/index.svelte create mode 100644 packages/builder/src/pages/_[application]/settings/_layout.svelte create mode 100644 packages/builder/src/pages/_[application]/settings/index.svelte create mode 100644 packages/builder/src/pages/index.svelte create mode 100644 packages/datastores/.gitignore diff --git a/.gitignore b/.gitignore index dcb1d822f0..24c031d958 100644 --- a/.gitignore +++ b/.gitignore @@ -38,7 +38,7 @@ bower_components build/Release # Dependency directories -node_modules/ +/node_modules/ jspm_packages/ # TypeScript v1 declaration files diff --git a/packages/builder/package.json b/packages/builder/package.json index fa92be46a2..cc2a123639 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -5,10 +5,11 @@ "private": true, "scripts": { "build": "rollup -c", - "start": "rollup -c -w", + "start": "routify -c rollup", "test": "jest", "test:watch": "jest --watchAll", - "dev:builder": "rollup -c -w" + "dev:builder": "routify -c rollup", + "rollup": "rollup -c -w" }, "jest": { "globals": { @@ -54,6 +55,7 @@ "@babel/plugin-transform-runtime": "^7.5.5", "@babel/preset-env": "^7.5.5", "@babel/runtime": "^7.5.5", + "@sveltech/routify": "1.5.0-beta.16", "babel-jest": "^24.8.0", "browser-sync": "^2.26.7", "http-proxy-middleware": "^0.19.1", diff --git a/packages/builder/rollup.config.js b/packages/builder/rollup.config.js index 9986e39fd5..b928418559 100644 --- a/packages/builder/rollup.config.js +++ b/packages/builder/rollup.config.js @@ -153,7 +153,7 @@ export default { plugins: [ copy({ targets: [ - { src: "src/index.html", dest: outputpath }, + { src: "src/index.html", dest: outputpath, rename: "__app.html" }, { src: "src/favicon.png", dest: outputpath }, { src: "src/assets", dest: outputpath }, { @@ -214,6 +214,7 @@ export default { // Watch the `dist` directory and refresh the // browser on changes when not in production + !production && serve(), !production && livereload(outputpath), !production && browsersync({ @@ -229,3 +230,20 @@ export default { clearScreen: false, }, } + +function serve() { + let started = false + + return { + writeBundle() { + if (!started) { + started = true + + require("child_process").spawn("npm", ["run", "start"], { + stdio: ["ignore", "inherit", "inherit"], + shell: true, + }) + } + }, + } +} \ No newline at end of file diff --git a/packages/builder/src/builderStore/api.js b/packages/builder/src/node_modules/builderStore/api.js similarity index 100% rename from packages/builder/src/builderStore/api.js rename to packages/builder/src/node_modules/builderStore/api.js diff --git a/packages/builder/src/builderStore/buildCodeForScreens.js b/packages/builder/src/node_modules/builderStore/buildCodeForScreens.js similarity index 100% rename from packages/builder/src/builderStore/buildCodeForScreens.js rename to packages/builder/src/node_modules/builderStore/buildCodeForScreens.js diff --git a/packages/builder/src/builderStore/buildStateOrigins.js b/packages/builder/src/node_modules/builderStore/buildStateOrigins.js similarity index 100% rename from packages/builder/src/builderStore/buildStateOrigins.js rename to packages/builder/src/node_modules/builderStore/buildStateOrigins.js diff --git a/packages/builder/src/builderStore/createPackage.js b/packages/builder/src/node_modules/builderStore/createPackage.js similarity index 100% rename from packages/builder/src/builderStore/createPackage.js rename to packages/builder/src/node_modules/builderStore/createPackage.js diff --git a/packages/builder/src/builderStore/generate_css.js b/packages/builder/src/node_modules/builderStore/generate_css.js similarity index 100% rename from packages/builder/src/builderStore/generate_css.js rename to packages/builder/src/node_modules/builderStore/generate_css.js diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/node_modules/builderStore/index.js similarity index 100% rename from packages/builder/src/builderStore/index.js rename to packages/builder/src/node_modules/builderStore/index.js diff --git a/packages/builder/src/builderStore/insertCodeMetadata.js b/packages/builder/src/node_modules/builderStore/insertCodeMetadata.js similarity index 100% rename from packages/builder/src/builderStore/insertCodeMetadata.js rename to packages/builder/src/node_modules/builderStore/insertCodeMetadata.js diff --git a/packages/builder/src/builderStore/loadComponentLibraries.js b/packages/builder/src/node_modules/builderStore/loadComponentLibraries.js similarity index 100% rename from packages/builder/src/builderStore/loadComponentLibraries.js rename to packages/builder/src/node_modules/builderStore/loadComponentLibraries.js diff --git a/packages/builder/src/builderStore/store/backend.js b/packages/builder/src/node_modules/builderStore/store/backend.js similarity index 100% rename from packages/builder/src/builderStore/store/backend.js rename to packages/builder/src/node_modules/builderStore/store/backend.js diff --git a/packages/builder/src/builderStore/store/index.js b/packages/builder/src/node_modules/builderStore/store/index.js similarity index 100% rename from packages/builder/src/builderStore/store/index.js rename to packages/builder/src/node_modules/builderStore/store/index.js diff --git a/packages/builder/src/builderStore/uuid.js b/packages/builder/src/node_modules/builderStore/uuid.js similarity index 100% rename from packages/builder/src/builderStore/uuid.js rename to packages/builder/src/node_modules/builderStore/uuid.js diff --git a/packages/builder/src/accessLevels/AccessLevelView.svelte b/packages/builder/src/node_modules/components/accessLevels/AccessLevelView.svelte similarity index 100% rename from packages/builder/src/accessLevels/AccessLevelView.svelte rename to packages/builder/src/node_modules/components/accessLevels/AccessLevelView.svelte diff --git a/packages/builder/src/accessLevels/AccessLevelsRoot.svelte b/packages/builder/src/node_modules/components/accessLevels/AccessLevelsRoot.svelte similarity index 100% rename from packages/builder/src/accessLevels/AccessLevelsRoot.svelte rename to packages/builder/src/node_modules/components/accessLevels/AccessLevelsRoot.svelte diff --git a/packages/builder/src/actionsAndTriggers/ActionView.svelte b/packages/builder/src/node_modules/components/actionsAndTriggers/ActionView.svelte similarity index 100% rename from packages/builder/src/actionsAndTriggers/ActionView.svelte rename to packages/builder/src/node_modules/components/actionsAndTriggers/ActionView.svelte diff --git a/packages/builder/src/actionsAndTriggers/Actions.svelte b/packages/builder/src/node_modules/components/actionsAndTriggers/Actions.svelte similarity index 100% rename from packages/builder/src/actionsAndTriggers/Actions.svelte rename to packages/builder/src/node_modules/components/actionsAndTriggers/Actions.svelte diff --git a/packages/builder/src/actionsAndTriggers/ActionsAndTriggersRoot.svelte b/packages/builder/src/node_modules/components/actionsAndTriggers/ActionsAndTriggersRoot.svelte similarity index 100% rename from packages/builder/src/actionsAndTriggers/ActionsAndTriggersRoot.svelte rename to packages/builder/src/node_modules/components/actionsAndTriggers/ActionsAndTriggersRoot.svelte diff --git a/packages/builder/src/actionsAndTriggers/TriggerView.svelte b/packages/builder/src/node_modules/components/actionsAndTriggers/TriggerView.svelte similarity index 100% rename from packages/builder/src/actionsAndTriggers/TriggerView.svelte rename to packages/builder/src/node_modules/components/actionsAndTriggers/TriggerView.svelte diff --git a/packages/builder/src/actionsAndTriggers/Triggers.svelte b/packages/builder/src/node_modules/components/actionsAndTriggers/Triggers.svelte similarity index 100% rename from packages/builder/src/actionsAndTriggers/Triggers.svelte rename to packages/builder/src/node_modules/components/actionsAndTriggers/Triggers.svelte diff --git a/packages/builder/src/common/ActionButton.svelte b/packages/builder/src/node_modules/components/common/ActionButton.svelte similarity index 100% rename from packages/builder/src/common/ActionButton.svelte rename to packages/builder/src/node_modules/components/common/ActionButton.svelte diff --git a/packages/builder/src/common/AppNotification.svelte b/packages/builder/src/node_modules/components/common/AppNotification.svelte similarity index 100% rename from packages/builder/src/common/AppNotification.svelte rename to packages/builder/src/node_modules/components/common/AppNotification.svelte diff --git a/packages/builder/src/common/Button.svelte b/packages/builder/src/node_modules/components/common/Button.svelte similarity index 100% rename from packages/builder/src/common/Button.svelte rename to packages/builder/src/node_modules/components/common/Button.svelte diff --git a/packages/builder/src/common/ButtonGroup.svelte b/packages/builder/src/node_modules/components/common/ButtonGroup.svelte similarity index 100% rename from packages/builder/src/common/ButtonGroup.svelte rename to packages/builder/src/node_modules/components/common/ButtonGroup.svelte diff --git a/packages/builder/src/common/Checkbox.svelte b/packages/builder/src/node_modules/components/common/Checkbox.svelte similarity index 100% rename from packages/builder/src/common/Checkbox.svelte rename to packages/builder/src/node_modules/components/common/Checkbox.svelte diff --git a/packages/builder/src/common/CodeArea.svelte b/packages/builder/src/node_modules/components/common/CodeArea.svelte similarity index 100% rename from packages/builder/src/common/CodeArea.svelte rename to packages/builder/src/node_modules/components/common/CodeArea.svelte diff --git a/packages/builder/src/common/ComingSoon.svelte b/packages/builder/src/node_modules/components/common/ComingSoon.svelte similarity index 100% rename from packages/builder/src/common/ComingSoon.svelte rename to packages/builder/src/node_modules/components/common/ComingSoon.svelte diff --git a/packages/builder/src/common/ConfirmDialog.svelte b/packages/builder/src/node_modules/components/common/ConfirmDialog.svelte similarity index 100% rename from packages/builder/src/common/ConfirmDialog.svelte rename to packages/builder/src/node_modules/components/common/ConfirmDialog.svelte diff --git a/packages/builder/src/common/DatePicker.svelte b/packages/builder/src/node_modules/components/common/DatePicker.svelte similarity index 100% rename from packages/builder/src/common/DatePicker.svelte rename to packages/builder/src/node_modules/components/common/DatePicker.svelte diff --git a/packages/builder/src/common/Dropdown.svelte b/packages/builder/src/node_modules/components/common/Dropdown.svelte similarity index 100% rename from packages/builder/src/common/Dropdown.svelte rename to packages/builder/src/node_modules/components/common/Dropdown.svelte diff --git a/packages/builder/src/common/DropdownButton.svelte b/packages/builder/src/node_modules/components/common/DropdownButton.svelte similarity index 100% rename from packages/builder/src/common/DropdownButton.svelte rename to packages/builder/src/node_modules/components/common/DropdownButton.svelte diff --git a/packages/builder/src/common/ErrorsBox.svelte b/packages/builder/src/node_modules/components/common/ErrorsBox.svelte similarity index 100% rename from packages/builder/src/common/ErrorsBox.svelte rename to packages/builder/src/node_modules/components/common/ErrorsBox.svelte diff --git a/packages/builder/src/common/IconButton.svelte b/packages/builder/src/node_modules/components/common/IconButton.svelte similarity index 100% rename from packages/builder/src/common/IconButton.svelte rename to packages/builder/src/node_modules/components/common/IconButton.svelte diff --git a/packages/builder/src/common/Icons/Add.svelte b/packages/builder/src/node_modules/components/common/Icons/Add.svelte similarity index 100% rename from packages/builder/src/common/Icons/Add.svelte rename to packages/builder/src/node_modules/components/common/Icons/Add.svelte diff --git a/packages/builder/src/common/Icons/ArrowDown.svelte b/packages/builder/src/node_modules/components/common/Icons/ArrowDown.svelte similarity index 100% rename from packages/builder/src/common/Icons/ArrowDown.svelte rename to packages/builder/src/node_modules/components/common/Icons/ArrowDown.svelte diff --git a/packages/builder/src/common/Icons/Check.svelte b/packages/builder/src/node_modules/components/common/Icons/Check.svelte similarity index 100% rename from packages/builder/src/common/Icons/Check.svelte rename to packages/builder/src/node_modules/components/common/Icons/Check.svelte diff --git a/packages/builder/src/common/Icons/ChevronDown.svelte b/packages/builder/src/node_modules/components/common/Icons/ChevronDown.svelte similarity index 100% rename from packages/builder/src/common/Icons/ChevronDown.svelte rename to packages/builder/src/node_modules/components/common/Icons/ChevronDown.svelte diff --git a/packages/builder/src/common/Icons/ChevronUp.svelte b/packages/builder/src/node_modules/components/common/Icons/ChevronUp.svelte similarity index 100% rename from packages/builder/src/common/Icons/ChevronUp.svelte rename to packages/builder/src/node_modules/components/common/Icons/ChevronUp.svelte diff --git a/packages/builder/src/common/Icons/CircleIndicator.svelte b/packages/builder/src/node_modules/components/common/Icons/CircleIndicator.svelte similarity index 100% rename from packages/builder/src/common/Icons/CircleIndicator.svelte rename to packages/builder/src/node_modules/components/common/Icons/CircleIndicator.svelte diff --git a/packages/builder/src/common/Icons/Copy.svelte b/packages/builder/src/node_modules/components/common/Icons/Copy.svelte similarity index 100% rename from packages/builder/src/common/Icons/Copy.svelte rename to packages/builder/src/node_modules/components/common/Icons/Copy.svelte diff --git a/packages/builder/src/common/Icons/Events.svelte b/packages/builder/src/node_modules/components/common/Icons/Events.svelte similarity index 100% rename from packages/builder/src/common/Icons/Events.svelte rename to packages/builder/src/node_modules/components/common/Icons/Events.svelte diff --git a/packages/builder/src/common/Icons/Grid.svelte b/packages/builder/src/node_modules/components/common/Icons/Grid.svelte similarity index 100% rename from packages/builder/src/common/Icons/Grid.svelte rename to packages/builder/src/node_modules/components/common/Icons/Grid.svelte diff --git a/packages/builder/src/common/Icons/Image.svelte b/packages/builder/src/node_modules/components/common/Icons/Image.svelte similarity index 100% rename from packages/builder/src/common/Icons/Image.svelte rename to packages/builder/src/node_modules/components/common/Icons/Image.svelte diff --git a/packages/builder/src/common/Icons/Input.svelte b/packages/builder/src/node_modules/components/common/Icons/Input.svelte similarity index 100% rename from packages/builder/src/common/Icons/Input.svelte rename to packages/builder/src/node_modules/components/common/Icons/Input.svelte diff --git a/packages/builder/src/common/Icons/JavaScript.svelte b/packages/builder/src/node_modules/components/common/Icons/JavaScript.svelte similarity index 100% rename from packages/builder/src/common/Icons/JavaScript.svelte rename to packages/builder/src/node_modules/components/common/Icons/JavaScript.svelte diff --git a/packages/builder/src/common/Icons/Layout.svelte b/packages/builder/src/node_modules/components/common/Icons/Layout.svelte similarity index 100% rename from packages/builder/src/common/Icons/Layout.svelte rename to packages/builder/src/node_modules/components/common/Icons/Layout.svelte diff --git a/packages/builder/src/common/Icons/Paint.svelte b/packages/builder/src/node_modules/components/common/Icons/Paint.svelte similarity index 100% rename from packages/builder/src/common/Icons/Paint.svelte rename to packages/builder/src/node_modules/components/common/Icons/Paint.svelte diff --git a/packages/builder/src/common/Icons/Pencil.svelte b/packages/builder/src/node_modules/components/common/Icons/Pencil.svelte similarity index 100% rename from packages/builder/src/common/Icons/Pencil.svelte rename to packages/builder/src/node_modules/components/common/Icons/Pencil.svelte diff --git a/packages/builder/src/common/Icons/Preview.svelte b/packages/builder/src/node_modules/components/common/Icons/Preview.svelte similarity index 100% rename from packages/builder/src/common/Icons/Preview.svelte rename to packages/builder/src/node_modules/components/common/Icons/Preview.svelte diff --git a/packages/builder/src/common/Icons/Settings.svelte b/packages/builder/src/node_modules/components/common/Icons/Settings.svelte similarity index 100% rename from packages/builder/src/common/Icons/Settings.svelte rename to packages/builder/src/node_modules/components/common/Icons/Settings.svelte diff --git a/packages/builder/src/common/Icons/Shape.svelte b/packages/builder/src/node_modules/components/common/Icons/Shape.svelte similarity index 100% rename from packages/builder/src/common/Icons/Shape.svelte rename to packages/builder/src/node_modules/components/common/Icons/Shape.svelte diff --git a/packages/builder/src/common/Icons/Terminal.svelte b/packages/builder/src/node_modules/components/common/Icons/Terminal.svelte similarity index 100% rename from packages/builder/src/common/Icons/Terminal.svelte rename to packages/builder/src/node_modules/components/common/Icons/Terminal.svelte diff --git a/packages/builder/src/common/Icons/XCircle.svelte b/packages/builder/src/node_modules/components/common/Icons/XCircle.svelte similarity index 100% rename from packages/builder/src/common/Icons/XCircle.svelte rename to packages/builder/src/node_modules/components/common/Icons/XCircle.svelte diff --git a/packages/builder/src/common/Icons/index.js b/packages/builder/src/node_modules/components/common/Icons/index.js similarity index 100% rename from packages/builder/src/common/Icons/index.js rename to packages/builder/src/node_modules/components/common/Icons/index.js diff --git a/packages/builder/src/common/Input.svelte b/packages/builder/src/node_modules/components/common/Input.svelte similarity index 100% rename from packages/builder/src/common/Input.svelte rename to packages/builder/src/node_modules/components/common/Input.svelte diff --git a/packages/builder/src/common/Inputs/InputGroup.svelte b/packages/builder/src/node_modules/components/common/Inputs/InputGroup.svelte similarity index 100% rename from packages/builder/src/common/Inputs/InputGroup.svelte rename to packages/builder/src/node_modules/components/common/Inputs/InputGroup.svelte diff --git a/packages/builder/src/common/Modal.svelte b/packages/builder/src/node_modules/components/common/Modal.svelte similarity index 100% rename from packages/builder/src/common/Modal.svelte rename to packages/builder/src/node_modules/components/common/Modal.svelte diff --git a/packages/builder/src/common/NumberBox.svelte b/packages/builder/src/node_modules/components/common/NumberBox.svelte similarity index 100% rename from packages/builder/src/common/NumberBox.svelte rename to packages/builder/src/node_modules/components/common/NumberBox.svelte diff --git a/packages/builder/src/common/PlusButton.svelte b/packages/builder/src/node_modules/components/common/PlusButton.svelte similarity index 100% rename from packages/builder/src/common/PlusButton.svelte rename to packages/builder/src/node_modules/components/common/PlusButton.svelte diff --git a/packages/builder/src/common/Select.svelte b/packages/builder/src/node_modules/components/common/Select.svelte similarity index 100% rename from packages/builder/src/common/Select.svelte rename to packages/builder/src/node_modules/components/common/Select.svelte diff --git a/packages/builder/src/common/Spinner.svelte b/packages/builder/src/node_modules/components/common/Spinner.svelte similarity index 100% rename from packages/builder/src/common/Spinner.svelte rename to packages/builder/src/node_modules/components/common/Spinner.svelte diff --git a/packages/builder/src/common/Textbox.svelte b/packages/builder/src/node_modules/components/common/Textbox.svelte similarity index 100% rename from packages/builder/src/common/Textbox.svelte rename to packages/builder/src/node_modules/components/common/Textbox.svelte diff --git a/packages/builder/src/common/ValuesList.svelte b/packages/builder/src/node_modules/components/common/ValuesList.svelte similarity index 100% rename from packages/builder/src/common/ValuesList.svelte rename to packages/builder/src/node_modules/components/common/ValuesList.svelte diff --git a/packages/builder/src/common/binding.js b/packages/builder/src/node_modules/components/common/binding.js similarity index 100% rename from packages/builder/src/common/binding.js rename to packages/builder/src/node_modules/components/common/binding.js diff --git a/packages/builder/src/common/core.js b/packages/builder/src/node_modules/components/common/core.js similarity index 100% rename from packages/builder/src/common/core.js rename to packages/builder/src/node_modules/components/common/core.js diff --git a/packages/builder/src/common/eventHandlers.js b/packages/builder/src/node_modules/components/common/eventHandlers.js similarity index 100% rename from packages/builder/src/common/eventHandlers.js rename to packages/builder/src/node_modules/components/common/eventHandlers.js diff --git a/packages/builder/src/common/icon.js b/packages/builder/src/node_modules/components/common/icon.js similarity index 100% rename from packages/builder/src/common/icon.js rename to packages/builder/src/node_modules/components/common/icon.js diff --git a/packages/builder/src/database/CollectionView.svelte b/packages/builder/src/node_modules/components/database/CollectionView.svelte similarity index 100% rename from packages/builder/src/database/CollectionView.svelte rename to packages/builder/src/node_modules/components/database/CollectionView.svelte diff --git a/packages/builder/src/database/DatabaseRoot.svelte b/packages/builder/src/node_modules/components/database/DatabaseRoot.svelte similarity index 100% rename from packages/builder/src/database/DatabaseRoot.svelte rename to packages/builder/src/node_modules/components/database/DatabaseRoot.svelte diff --git a/packages/builder/src/database/FieldView.svelte b/packages/builder/src/node_modules/components/database/FieldView.svelte similarity index 100% rename from packages/builder/src/database/FieldView.svelte rename to packages/builder/src/node_modules/components/database/FieldView.svelte diff --git a/packages/builder/src/database/IndexView.svelte b/packages/builder/src/node_modules/components/database/IndexView.svelte similarity index 100% rename from packages/builder/src/database/IndexView.svelte rename to packages/builder/src/node_modules/components/database/IndexView.svelte diff --git a/packages/builder/src/database/ModelDataTable/ModelDataTable.svelte b/packages/builder/src/node_modules/components/database/ModelDataTable/ModelDataTable.svelte similarity index 100% rename from packages/builder/src/database/ModelDataTable/ModelDataTable.svelte rename to packages/builder/src/node_modules/components/database/ModelDataTable/ModelDataTable.svelte diff --git a/packages/builder/src/database/ModelDataTable/TablePagination.svelte b/packages/builder/src/node_modules/components/database/ModelDataTable/TablePagination.svelte similarity index 100% rename from packages/builder/src/database/ModelDataTable/TablePagination.svelte rename to packages/builder/src/node_modules/components/database/ModelDataTable/TablePagination.svelte diff --git a/packages/builder/src/database/ModelDataTable/api.js b/packages/builder/src/node_modules/components/database/ModelDataTable/api.js similarity index 100% rename from packages/builder/src/database/ModelDataTable/api.js rename to packages/builder/src/node_modules/components/database/ModelDataTable/api.js diff --git a/packages/builder/src/database/ModelDataTable/index.js b/packages/builder/src/node_modules/components/database/ModelDataTable/index.js similarity index 100% rename from packages/builder/src/database/ModelDataTable/index.js rename to packages/builder/src/node_modules/components/database/ModelDataTable/index.js diff --git a/packages/builder/src/database/ModelDataTable/modals/CreateDatabase.svelte b/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateDatabase.svelte similarity index 100% rename from packages/builder/src/database/ModelDataTable/modals/CreateDatabase.svelte rename to packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateDatabase.svelte diff --git a/packages/builder/src/database/ModelDataTable/modals/CreateEditModel.svelte b/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditModel.svelte similarity index 100% rename from packages/builder/src/database/ModelDataTable/modals/CreateEditModel.svelte rename to packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditModel.svelte diff --git a/packages/builder/src/database/ModelDataTable/modals/CreateEditRecord.svelte b/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditRecord.svelte similarity index 100% rename from packages/builder/src/database/ModelDataTable/modals/CreateEditRecord.svelte rename to packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditRecord.svelte diff --git a/packages/builder/src/database/ModelDataTable/modals/CreateEditView.svelte b/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditView.svelte similarity index 100% rename from packages/builder/src/database/ModelDataTable/modals/CreateEditView.svelte rename to packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditView.svelte diff --git a/packages/builder/src/database/ModelDataTable/modals/CreateUser.svelte b/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateUser.svelte similarity index 100% rename from packages/builder/src/database/ModelDataTable/modals/CreateUser.svelte rename to packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateUser.svelte diff --git a/packages/builder/src/database/ModelDataTable/modals/DeleteRecord.svelte b/packages/builder/src/node_modules/components/database/ModelDataTable/modals/DeleteRecord.svelte similarity index 100% rename from packages/builder/src/database/ModelDataTable/modals/DeleteRecord.svelte rename to packages/builder/src/node_modules/components/database/ModelDataTable/modals/DeleteRecord.svelte diff --git a/packages/builder/src/database/ModelDataTable/modals/RecordFieldControl.svelte b/packages/builder/src/node_modules/components/database/ModelDataTable/modals/RecordFieldControl.svelte similarity index 100% rename from packages/builder/src/database/ModelDataTable/modals/RecordFieldControl.svelte rename to packages/builder/src/node_modules/components/database/ModelDataTable/modals/RecordFieldControl.svelte diff --git a/packages/builder/src/database/ModelDataTable/modals/index.js b/packages/builder/src/node_modules/components/database/ModelDataTable/modals/index.js similarity index 100% rename from packages/builder/src/database/ModelDataTable/modals/index.js rename to packages/builder/src/node_modules/components/database/ModelDataTable/modals/index.js diff --git a/packages/builder/src/database/ModelDataTable/test/ModelDataTable.spec.js b/packages/builder/src/node_modules/components/database/ModelDataTable/test/ModelDataTable.spec.js similarity index 100% rename from packages/builder/src/database/ModelDataTable/test/ModelDataTable.spec.js rename to packages/builder/src/node_modules/components/database/ModelDataTable/test/ModelDataTable.spec.js diff --git a/packages/builder/src/database/ModelView.svelte b/packages/builder/src/node_modules/components/database/ModelView.svelte similarity index 100% rename from packages/builder/src/database/ModelView.svelte rename to packages/builder/src/node_modules/components/database/ModelView.svelte diff --git a/packages/builder/src/nav/BackendNav.svelte b/packages/builder/src/node_modules/components/nav/BackendNav.svelte similarity index 100% rename from packages/builder/src/nav/BackendNav.svelte rename to packages/builder/src/node_modules/components/nav/BackendNav.svelte diff --git a/packages/builder/src/nav/DatabasesList.svelte b/packages/builder/src/node_modules/components/nav/DatabasesList.svelte similarity index 100% rename from packages/builder/src/nav/DatabasesList.svelte rename to packages/builder/src/node_modules/components/nav/DatabasesList.svelte diff --git a/packages/builder/src/nav/HierarchyRow.svelte b/packages/builder/src/node_modules/components/nav/HierarchyRow.svelte similarity index 100% rename from packages/builder/src/nav/HierarchyRow.svelte rename to packages/builder/src/node_modules/components/nav/HierarchyRow.svelte diff --git a/packages/builder/src/nav/NavItem.svelte b/packages/builder/src/node_modules/components/nav/NavItem.svelte similarity index 100% rename from packages/builder/src/nav/NavItem.svelte rename to packages/builder/src/node_modules/components/nav/NavItem.svelte diff --git a/packages/builder/src/nav/SchemaManagementDrawer.svelte b/packages/builder/src/node_modules/components/nav/SchemaManagementDrawer.svelte similarity index 100% rename from packages/builder/src/nav/SchemaManagementDrawer.svelte rename to packages/builder/src/node_modules/components/nav/SchemaManagementDrawer.svelte diff --git a/packages/builder/src/nav/UsersList.svelte b/packages/builder/src/node_modules/components/nav/UsersList.svelte similarity index 100% rename from packages/builder/src/nav/UsersList.svelte rename to packages/builder/src/node_modules/components/nav/UsersList.svelte diff --git a/packages/builder/src/userInterface/CodeEditor.svelte b/packages/builder/src/node_modules/components/userInterface/CodeEditor.svelte similarity index 100% rename from packages/builder/src/userInterface/CodeEditor.svelte rename to packages/builder/src/node_modules/components/userInterface/CodeEditor.svelte diff --git a/packages/builder/src/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/node_modules/components/userInterface/ComponentPropertiesPanel.svelte similarity index 100% rename from packages/builder/src/userInterface/ComponentPropertiesPanel.svelte rename to packages/builder/src/node_modules/components/userInterface/ComponentPropertiesPanel.svelte diff --git a/packages/builder/src/userInterface/ComponentSearch.svelte b/packages/builder/src/node_modules/components/userInterface/ComponentSearch.svelte similarity index 100% rename from packages/builder/src/userInterface/ComponentSearch.svelte rename to packages/builder/src/node_modules/components/userInterface/ComponentSearch.svelte diff --git a/packages/builder/src/userInterface/ComponentSelectionList.svelte b/packages/builder/src/node_modules/components/userInterface/ComponentSelectionList.svelte similarity index 100% rename from packages/builder/src/userInterface/ComponentSelectionList.svelte rename to packages/builder/src/node_modules/components/userInterface/ComponentSelectionList.svelte diff --git a/packages/builder/src/userInterface/ComponentSelector.svelte b/packages/builder/src/node_modules/components/userInterface/ComponentSelector.svelte similarity index 100% rename from packages/builder/src/userInterface/ComponentSelector.svelte rename to packages/builder/src/node_modules/components/userInterface/ComponentSelector.svelte diff --git a/packages/builder/src/userInterface/ComponentsHierarchy.svelte b/packages/builder/src/node_modules/components/userInterface/ComponentsHierarchy.svelte similarity index 100% rename from packages/builder/src/userInterface/ComponentsHierarchy.svelte rename to packages/builder/src/node_modules/components/userInterface/ComponentsHierarchy.svelte diff --git a/packages/builder/src/userInterface/ComponentsHierarchyChildren.svelte b/packages/builder/src/node_modules/components/userInterface/ComponentsHierarchyChildren.svelte similarity index 100% rename from packages/builder/src/userInterface/ComponentsHierarchyChildren.svelte rename to packages/builder/src/node_modules/components/userInterface/ComponentsHierarchyChildren.svelte diff --git a/packages/builder/src/userInterface/ComponentsPaneSwitcher.svelte b/packages/builder/src/node_modules/components/userInterface/ComponentsPaneSwitcher.svelte similarity index 100% rename from packages/builder/src/userInterface/ComponentsPaneSwitcher.svelte rename to packages/builder/src/node_modules/components/userInterface/ComponentsPaneSwitcher.svelte diff --git a/packages/builder/src/userInterface/CurrentItemPreview.svelte b/packages/builder/src/node_modules/components/userInterface/CurrentItemPreview.svelte similarity index 100% rename from packages/builder/src/userInterface/CurrentItemPreview.svelte rename to packages/builder/src/node_modules/components/userInterface/CurrentItemPreview.svelte diff --git a/packages/builder/src/userInterface/EditComponentProps.svelte b/packages/builder/src/node_modules/components/userInterface/EditComponentProps.svelte similarity index 100% rename from packages/builder/src/userInterface/EditComponentProps.svelte rename to packages/builder/src/node_modules/components/userInterface/EditComponentProps.svelte diff --git a/packages/builder/src/userInterface/EventsEditor/EventEditorModal.svelte b/packages/builder/src/node_modules/components/userInterface/EventsEditor/EventEditorModal.svelte similarity index 100% rename from packages/builder/src/userInterface/EventsEditor/EventEditorModal.svelte rename to packages/builder/src/node_modules/components/userInterface/EventsEditor/EventEditorModal.svelte diff --git a/packages/builder/src/userInterface/EventsEditor/EventsEditor.svelte b/packages/builder/src/node_modules/components/userInterface/EventsEditor/EventsEditor.svelte similarity index 100% rename from packages/builder/src/userInterface/EventsEditor/EventsEditor.svelte rename to packages/builder/src/node_modules/components/userInterface/EventsEditor/EventsEditor.svelte diff --git a/packages/builder/src/userInterface/EventsEditor/HandlerSelector.svelte b/packages/builder/src/node_modules/components/userInterface/EventsEditor/HandlerSelector.svelte similarity index 100% rename from packages/builder/src/userInterface/EventsEditor/HandlerSelector.svelte rename to packages/builder/src/node_modules/components/userInterface/EventsEditor/HandlerSelector.svelte diff --git a/packages/builder/src/userInterface/EventsEditor/StateBindingCascader.svelte b/packages/builder/src/node_modules/components/userInterface/EventsEditor/StateBindingCascader.svelte similarity index 100% rename from packages/builder/src/userInterface/EventsEditor/StateBindingCascader.svelte rename to packages/builder/src/node_modules/components/userInterface/EventsEditor/StateBindingCascader.svelte diff --git a/packages/builder/src/userInterface/EventsEditor/index.js b/packages/builder/src/node_modules/components/userInterface/EventsEditor/index.js similarity index 100% rename from packages/builder/src/userInterface/EventsEditor/index.js rename to packages/builder/src/node_modules/components/userInterface/EventsEditor/index.js diff --git a/packages/builder/src/userInterface/LayoutEditor.svelte b/packages/builder/src/node_modules/components/userInterface/LayoutEditor.svelte similarity index 100% rename from packages/builder/src/userInterface/LayoutEditor.svelte rename to packages/builder/src/node_modules/components/userInterface/LayoutEditor.svelte diff --git a/packages/builder/src/userInterface/LayoutTemplateControls.svelte b/packages/builder/src/node_modules/components/userInterface/LayoutTemplateControls.svelte similarity index 100% rename from packages/builder/src/userInterface/LayoutTemplateControls.svelte rename to packages/builder/src/node_modules/components/userInterface/LayoutTemplateControls.svelte diff --git a/packages/builder/src/userInterface/MasterLayout.svelte b/packages/builder/src/node_modules/components/userInterface/MasterLayout.svelte similarity index 100% rename from packages/builder/src/userInterface/MasterLayout.svelte rename to packages/builder/src/node_modules/components/userInterface/MasterLayout.svelte diff --git a/packages/builder/src/userInterface/NewScreen.svelte b/packages/builder/src/node_modules/components/userInterface/NewScreen.svelte similarity index 100% rename from packages/builder/src/userInterface/NewScreen.svelte rename to packages/builder/src/node_modules/components/userInterface/NewScreen.svelte diff --git a/packages/builder/src/userInterface/PageView.svelte b/packages/builder/src/node_modules/components/userInterface/PageView.svelte similarity index 100% rename from packages/builder/src/userInterface/PageView.svelte rename to packages/builder/src/node_modules/components/userInterface/PageView.svelte diff --git a/packages/builder/src/userInterface/PagesComponents.svelte b/packages/builder/src/node_modules/components/userInterface/PagesComponents.svelte similarity index 100% rename from packages/builder/src/userInterface/PagesComponents.svelte rename to packages/builder/src/node_modules/components/userInterface/PagesComponents.svelte diff --git a/packages/builder/src/userInterface/PagesList.svelte b/packages/builder/src/node_modules/components/userInterface/PagesList.svelte similarity index 100% rename from packages/builder/src/userInterface/PagesList.svelte rename to packages/builder/src/node_modules/components/userInterface/PagesList.svelte diff --git a/packages/builder/src/userInterface/PropControl.svelte b/packages/builder/src/node_modules/components/userInterface/PropControl.svelte similarity index 100% rename from packages/builder/src/userInterface/PropControl.svelte rename to packages/builder/src/node_modules/components/userInterface/PropControl.svelte diff --git a/packages/builder/src/userInterface/PropertyCascader/PropertyCascader.svelte b/packages/builder/src/node_modules/components/userInterface/PropertyCascader/PropertyCascader.svelte similarity index 100% rename from packages/builder/src/userInterface/PropertyCascader/PropertyCascader.svelte rename to packages/builder/src/node_modules/components/userInterface/PropertyCascader/PropertyCascader.svelte diff --git a/packages/builder/src/userInterface/PropertyCascader/StateBindingOptions.svelte b/packages/builder/src/node_modules/components/userInterface/PropertyCascader/StateBindingOptions.svelte similarity index 100% rename from packages/builder/src/userInterface/PropertyCascader/StateBindingOptions.svelte rename to packages/builder/src/node_modules/components/userInterface/PropertyCascader/StateBindingOptions.svelte diff --git a/packages/builder/src/userInterface/PropertyCascader/index.js b/packages/builder/src/node_modules/components/userInterface/PropertyCascader/index.js similarity index 100% rename from packages/builder/src/userInterface/PropertyCascader/index.js rename to packages/builder/src/node_modules/components/userInterface/PropertyCascader/index.js diff --git a/packages/builder/src/userInterface/PropsView.svelte b/packages/builder/src/node_modules/components/userInterface/PropsView.svelte similarity index 100% rename from packages/builder/src/userInterface/PropsView.svelte rename to packages/builder/src/node_modules/components/userInterface/PropsView.svelte diff --git a/packages/builder/src/userInterface/SettingsView.svelte b/packages/builder/src/node_modules/components/userInterface/SettingsView.svelte similarity index 100% rename from packages/builder/src/userInterface/SettingsView.svelte rename to packages/builder/src/node_modules/components/userInterface/SettingsView.svelte diff --git a/packages/builder/src/userInterface/StateBindingControl.svelte b/packages/builder/src/node_modules/components/userInterface/StateBindingControl.svelte similarity index 100% rename from packages/builder/src/userInterface/StateBindingControl.svelte rename to packages/builder/src/node_modules/components/userInterface/StateBindingControl.svelte diff --git a/packages/builder/src/userInterface/UserInterfaceRoot.svelte b/packages/builder/src/node_modules/components/userInterface/UserInterfaceRoot.svelte similarity index 100% rename from packages/builder/src/userInterface/UserInterfaceRoot.svelte rename to packages/builder/src/node_modules/components/userInterface/UserInterfaceRoot.svelte diff --git a/packages/builder/src/userInterface/pagesParsing/createProps.js b/packages/builder/src/node_modules/components/userInterface/pagesParsing/createProps.js similarity index 100% rename from packages/builder/src/userInterface/pagesParsing/createProps.js rename to packages/builder/src/node_modules/components/userInterface/pagesParsing/createProps.js diff --git a/packages/builder/src/userInterface/pagesParsing/defaultPagesObject.js b/packages/builder/src/node_modules/components/userInterface/pagesParsing/defaultPagesObject.js similarity index 100% rename from packages/builder/src/userInterface/pagesParsing/defaultPagesObject.js rename to packages/builder/src/node_modules/components/userInterface/pagesParsing/defaultPagesObject.js diff --git a/packages/builder/src/userInterface/pagesParsing/findDependencies.js b/packages/builder/src/node_modules/components/userInterface/pagesParsing/findDependencies.js similarity index 100% rename from packages/builder/src/userInterface/pagesParsing/findDependencies.js rename to packages/builder/src/node_modules/components/userInterface/pagesParsing/findDependencies.js diff --git a/packages/builder/src/userInterface/pagesParsing/getRootComponent.js b/packages/builder/src/node_modules/components/userInterface/pagesParsing/getRootComponent.js similarity index 100% rename from packages/builder/src/userInterface/pagesParsing/getRootComponent.js rename to packages/builder/src/node_modules/components/userInterface/pagesParsing/getRootComponent.js diff --git a/packages/builder/src/userInterface/pagesParsing/renameScreen.js b/packages/builder/src/node_modules/components/userInterface/pagesParsing/renameScreen.js similarity index 100% rename from packages/builder/src/userInterface/pagesParsing/renameScreen.js rename to packages/builder/src/node_modules/components/userInterface/pagesParsing/renameScreen.js diff --git a/packages/builder/src/userInterface/pagesParsing/searchComponents.js b/packages/builder/src/node_modules/components/userInterface/pagesParsing/searchComponents.js similarity index 100% rename from packages/builder/src/userInterface/pagesParsing/searchComponents.js rename to packages/builder/src/node_modules/components/userInterface/pagesParsing/searchComponents.js diff --git a/packages/builder/src/userInterface/pagesParsing/splitRootComponentName.js b/packages/builder/src/node_modules/components/userInterface/pagesParsing/splitRootComponentName.js similarity index 100% rename from packages/builder/src/userInterface/pagesParsing/splitRootComponentName.js rename to packages/builder/src/node_modules/components/userInterface/pagesParsing/splitRootComponentName.js diff --git a/packages/builder/src/userInterface/pagesParsing/types.js b/packages/builder/src/node_modules/components/userInterface/pagesParsing/types.js similarity index 100% rename from packages/builder/src/userInterface/pagesParsing/types.js rename to packages/builder/src/node_modules/components/userInterface/pagesParsing/types.js diff --git a/packages/builder/src/userInterface/pagesParsing/validatePages.js b/packages/builder/src/node_modules/components/userInterface/pagesParsing/validatePages.js similarity index 100% rename from packages/builder/src/userInterface/pagesParsing/validatePages.js rename to packages/builder/src/node_modules/components/userInterface/pagesParsing/validatePages.js diff --git a/packages/builder/src/pages/_[application]/_layout.svelte b/packages/builder/src/pages/_[application]/_layout.svelte new file mode 100644 index 0000000000..a6df5958ed --- /dev/null +++ b/packages/builder/src/pages/_[application]/_layout.svelte @@ -0,0 +1,159 @@ + + +
+ +
+
+ + + + {#each list as { path, prettyName, children, meta }} + $goto($url(path))}> + {prettyName} + + {/each} + +
+
+ $goto(`${component.parent.path}/settings`)}> + + + console.log}> + + +
+
+ + + +
+ + diff --git a/packages/builder/src/pages/_[application]/backend/_layout.svelte b/packages/builder/src/pages/_[application]/backend/_layout.svelte new file mode 100644 index 0000000000..58452ee636 --- /dev/null +++ b/packages/builder/src/pages/_[application]/backend/_layout.svelte @@ -0,0 +1,48 @@ + + +
+
+ +
+
+ + +
+
+ +
+
+ + diff --git a/packages/builder/src/pages/_[application]/backend/actions/index.svelte b/packages/builder/src/pages/_[application]/backend/actions/index.svelte new file mode 100644 index 0000000000..b527bb251a --- /dev/null +++ b/packages/builder/src/pages/_[application]/backend/actions/index.svelte @@ -0,0 +1,134 @@ + + +
+
+ + + Create New Action + + + Create New Trigger + + +
+ +
+ + + +
+ +
+ + diff --git a/packages/builder/src/pages/_[application]/backend/database/index.svelte b/packages/builder/src/pages/_[application]/backend/database/index.svelte new file mode 100644 index 0000000000..2724e8045a --- /dev/null +++ b/packages/builder/src/pages/_[application]/backend/database/index.svelte @@ -0,0 +1,96 @@ + + + + {#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/index.svelte b/packages/builder/src/pages/_[application]/backend/index.svelte new file mode 100644 index 0000000000..09345bc127 --- /dev/null +++ b/packages/builder/src/pages/_[application]/backend/index.svelte @@ -0,0 +1,6 @@ + + + diff --git a/packages/builder/src/pages/_[application]/frontend/_layout.svelte b/packages/builder/src/pages/_[application]/frontend/_layout.svelte new file mode 100644 index 0000000000..0385342cef --- /dev/null +++ b/packages/builder/src/pages/_[application]/frontend/_layout.svelte @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/builder/src/pages/_[application]/frontend/index.svelte b/packages/builder/src/pages/_[application]/frontend/index.svelte new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/builder/src/pages/_[application]/index.svelte b/packages/builder/src/pages/_[application]/index.svelte new file mode 100644 index 0000000000..25636f83f1 --- /dev/null +++ b/packages/builder/src/pages/_[application]/index.svelte @@ -0,0 +1,6 @@ + + + diff --git a/packages/builder/src/pages/_[application]/settings/_layout.svelte b/packages/builder/src/pages/_[application]/settings/_layout.svelte new file mode 100644 index 0000000000..43a188a476 --- /dev/null +++ b/packages/builder/src/pages/_[application]/settings/_layout.svelte @@ -0,0 +1,2 @@ + + diff --git a/packages/builder/src/pages/_[application]/settings/index.svelte b/packages/builder/src/pages/_[application]/settings/index.svelte new file mode 100644 index 0000000000..163d304af4 --- /dev/null +++ b/packages/builder/src/pages/_[application]/settings/index.svelte @@ -0,0 +1 @@ +Settings diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte new file mode 100644 index 0000000000..004280071b --- /dev/null +++ b/packages/builder/src/pages/index.svelte @@ -0,0 +1,68 @@ + + +
+ + {#await promise} + + {:then result} + + {:catch err} +

{err}

+ {/await} + + +
+ + diff --git a/packages/cli/.gitignore b/packages/cli/.gitignore index 76507387b6..d0c97ab594 100644 --- a/packages/cli/.gitignore +++ b/packages/cli/.gitignore @@ -1 +1,2 @@ -sandbox/ \ No newline at end of file +sandbox/ +node_modules/ \ No newline at end of file diff --git a/packages/datastores/.gitignore b/packages/datastores/.gitignore new file mode 100644 index 0000000000..096746c148 --- /dev/null +++ b/packages/datastores/.gitignore @@ -0,0 +1 @@ +/node_modules/ \ No newline at end of file diff --git a/packages/server/.gitignore b/packages/server/.gitignore index 4e5f6256f0..cf08d58354 100644 --- a/packages/server/.gitignore +++ b/packages/server/.gitignore @@ -1,3 +1,4 @@ +node_modules/ myapps/ config.js /builder/* From 3cdb598b34633878fc6d2b7a4a975e2a5b37a45c Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Tue, 31 Mar 2020 11:56:39 +0200 Subject: [PATCH 05/18] wip: re-configures top level components to import from correct place --- packages/builder/src/App.svelte | 10 ++++++---- packages/builder/src/BackendRoot.svelte | 16 ++++++++-------- packages/builder/src/NoPackage.svelte | 4 ++-- packages/builder/src/PackageRoot.svelte | 8 ++++---- packages/builder/src/Settings.svelte | 6 +++--- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte index 870d057ace..5c7124fd24 100644 --- a/packages/builder/src/App.svelte +++ b/packages/builder/src/App.svelte @@ -2,11 +2,13 @@ import NoPackage from "./NoPackage.svelte" import PackageRoot from "./PackageRoot.svelte" import Settings from "./Settings.svelte" - import { store, initialise } from "./builderStore" + import { store, initialise } from "builderStore" import { onMount } from "svelte" - import IconButton from "./common/IconButton.svelte" - import Spinner from "./common/Spinner.svelte" - import AppNotification, { showAppNotification } from "./common/AppNotification.svelte" + import IconButton from "components/common/IconButton.svelte" + import Spinner from "components/common/Spinner.svelte" + import AppNotification, { + showAppNotification, + } from "components/AppNotification.svelte" let init = initialise() diff --git a/packages/builder/src/BackendRoot.svelte b/packages/builder/src/BackendRoot.svelte index d37e774a96..48b612790b 100644 --- a/packages/builder/src/BackendRoot.svelte +++ b/packages/builder/src/BackendRoot.svelte @@ -1,13 +1,13 @@
diff --git a/packages/builder/src/NoPackage.svelte b/packages/builder/src/NoPackage.svelte index d8cc119108..188051b42c 100644 --- a/packages/builder/src/NoPackage.svelte +++ b/packages/builder/src/NoPackage.svelte @@ -1,6 +1,6 @@ diff --git a/packages/builder/src/PackageRoot.svelte b/packages/builder/src/PackageRoot.svelte index f7a134ed9a..71660ec2e8 100644 --- a/packages/builder/src/PackageRoot.svelte +++ b/packages/builder/src/PackageRoot.svelte @@ -1,10 +1,10 @@ From c120eb934d9326f5f252114a3851455c2b76d681 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Tue, 31 Mar 2020 13:16:03 +0200 Subject: [PATCH 06/18] updates imports and finishes moving all commonly used files to the node_modules folder --- packages/builder/rollup.config.js | 9 ++- packages/builder/src/App.svelte | 2 +- .../node_modules/builderStore/generate_css.js | 2 +- .../builderStore/loadComponentLibraries.js | 2 +- .../builderStore/store/backend.js | 10 +-- .../node_modules/builderStore/store/index.js | 12 ++-- .../accessLevels/AccessLevelsRoot.svelte | 17 +++-- .../actionsAndTriggers/ActionView.svelte | 14 ++-- .../actionsAndTriggers/Actions.svelte | 12 ++-- .../ActionsAndTriggersRoot.svelte | 35 +++++----- .../actionsAndTriggers/TriggerView.svelte | 23 ++++--- .../actionsAndTriggers/Triggers.svelte | 8 +-- .../node_modules/components/common/core.js | 18 +++--- .../components/common/eventHandlers.js | 6 +- .../components/database/DatabaseRoot.svelte | 10 +-- .../components/database/IndexView.svelte | 19 +++--- .../ModelDataTable/ModelDataTable.svelte | 20 ++++-- .../ModelDataTable/TablePagination.svelte | 2 +- .../components/database/ModelDataTable/api.js | 4 +- .../modals/CreateDatabase.svelte | 6 +- .../modals/CreateEditModel.svelte | 6 +- .../modals/CreateEditRecord.svelte | 12 ++-- .../ModelDataTable/modals/CreateUser.svelte | 6 +- .../ModelDataTable/modals/DeleteRecord.svelte | 6 +- .../components/database/ModelView.svelte | 64 ++++++++++--------- .../components/nav/BackendNav.svelte | 5 +- .../components/nav/DatabasesList.svelte | 2 +- .../components/nav/HierarchyRow.svelte | 2 +- .../components/nav/NavItem.svelte | 2 +- .../nav/SchemaManagementDrawer.svelte | 7 +- .../components/nav/UsersList.svelte | 4 +- .../userInterface/CodeEditor.svelte | 6 +- .../ComponentPropertiesPanel.svelte | 6 +- .../ComponentSelectionList.svelte | 29 +++++---- .../userInterface/ComponentsHierarchy.svelte | 31 +++++---- .../ComponentsPaneSwitcher.svelte | 2 +- .../userInterface/CurrentItemPreview.svelte | 4 +- .../EventsEditor/EventsEditor.svelte | 18 +++--- .../EventsEditor/HandlerSelector.svelte | 12 ++-- .../EventsEditor/StateBindingCascader.svelte | 16 ++--- .../userInterface/MasterLayout.svelte | 28 ++++---- .../components/userInterface/NewScreen.svelte | 25 ++++---- .../components/userInterface/PageView.svelte | 18 +++--- .../components/userInterface/PagesList.svelte | 6 +- .../PropertyCascader/PropertyCascader.svelte | 8 +-- .../userInterface/SettingsView.svelte | 10 +-- .../userInterface/UserInterfaceRoot.svelte | 10 +-- .../userInterface/pagesParsing/createProps.js | 2 +- 48 files changed, 305 insertions(+), 273 deletions(-) diff --git a/packages/builder/rollup.config.js b/packages/builder/rollup.config.js index b928418559..615e5b8208 100644 --- a/packages/builder/rollup.config.js +++ b/packages/builder/rollup.config.js @@ -214,13 +214,12 @@ export default { // Watch the `dist` directory and refresh the // browser on changes when not in production - !production && serve(), !production && livereload(outputpath), !production && - browsersync({ - server: outputpath, - middleware: [apiProxy, _builderProxy], - }), + browsersync({ + server: outputpath, + middleware: [apiProxy, _builderProxy], + }), // If we're building for production (npm run build // instead of npm run dev), minify diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte index 5c7124fd24..424c7b9a1e 100644 --- a/packages/builder/src/App.svelte +++ b/packages/builder/src/App.svelte @@ -8,7 +8,7 @@ import Spinner from "components/common/Spinner.svelte" import AppNotification, { showAppNotification, - } from "components/AppNotification.svelte" + } from "components/common/AppNotification.svelte" let init = initialise() diff --git a/packages/builder/src/node_modules/builderStore/generate_css.js b/packages/builder/src/node_modules/builderStore/generate_css.js index 19148ce9b0..0f776a5255 100644 --- a/packages/builder/src/node_modules/builderStore/generate_css.js +++ b/packages/builder/src/node_modules/builderStore/generate_css.js @@ -1,5 +1,5 @@ import { filter, map, reduce, toPairs } from "lodash/fp" -import { pipe } from "../common/core" +import { pipe } from "components/common/core" const self = n => n const join_with = delimiter => a => a.join(delimiter) diff --git a/packages/builder/src/node_modules/builderStore/loadComponentLibraries.js b/packages/builder/src/node_modules/builderStore/loadComponentLibraries.js index 5a142f2798..8534bcf177 100644 --- a/packages/builder/src/node_modules/builderStore/loadComponentLibraries.js +++ b/packages/builder/src/node_modules/builderStore/loadComponentLibraries.js @@ -1,5 +1,5 @@ import { flatten, values, uniq, map } from "lodash/fp" -import { pipe } from "../common/core" +import { pipe } from "components/common/core" export const loadLibs = async (appName, appPackage) => { const allLibraries = {} diff --git a/packages/builder/src/node_modules/builderStore/store/backend.js b/packages/builder/src/node_modules/builderStore/store/backend.js index 65f012e34c..fa888ca9d5 100644 --- a/packages/builder/src/node_modules/builderStore/store/backend.js +++ b/packages/builder/src/node_modules/builderStore/store/backend.js @@ -1,7 +1,7 @@ import { writable } from "svelte/store" import api from "../api" import { cloneDeep, sortBy, find, remove } from "lodash/fp" -import { hierarchy as hierarchyFunctions } from "../../../../core/src" +import { hierarchy as hierarchyFunctions } from "../../../../../core/src" import { getNode, validate, @@ -10,7 +10,7 @@ import { isIndex, canDeleteIndex, canDeleteRecord, -} from "../../common/core" +} from "components/common/core" export const getBackendUiStore = () => { const INITIAL_BACKEND_UI_STATE = { @@ -100,9 +100,9 @@ export const saveBackend = async state => { const instances_currentFirst = state.selectedDatabase ? [ - state.appInstances.find(i => i.id === state.selectedDatabase.id), - ...state.appInstances.filter(i => i.id !== state.selectedDatabase.id), - ] + state.appInstances.find(i => i.id === state.selectedDatabase.id), + ...state.appInstances.filter(i => i.id !== state.selectedDatabase.id), + ] : state.appInstances for (let instance of instances_currentFirst) { diff --git a/packages/builder/src/node_modules/builderStore/store/index.js b/packages/builder/src/node_modules/builderStore/store/index.js index 41230bcaf4..76cdc5a7c3 100644 --- a/packages/builder/src/node_modules/builderStore/store/index.js +++ b/packages/builder/src/node_modules/builderStore/store/index.js @@ -1,18 +1,18 @@ import { filter, cloneDeep, last, concat, isEmpty, values } from "lodash/fp" -import { pipe, getNode, constructHierarchy } from "../../common/core" +import { pipe, getNode, constructHierarchy } from "components/common/core" import * as backendStoreActions from "./backend" import { writable } from "svelte/store" -import { defaultPagesObject } from "../../userInterface/pagesParsing/defaultPagesObject" +import { defaultPagesObject } from "components/userInterface/pagesParsing/defaultPagesObject" import api from "../api" -import { getExactComponent } from "../../userInterface/pagesParsing/searchComponents" -import { rename } from "../../userInterface/pagesParsing/renameScreen" +import { getExactComponent } from "components/userInterface/pagesParsing/searchComponents" +import { rename } from "components/userInterface/pagesParsing/renameScreen" import { getNewScreen, createProps, makePropsSafe, getBuiltin, -} from "../../userInterface/pagesParsing/createProps" -import { expandComponentDefinition } from "../../userInterface/pagesParsing/types" +} from "components/userInterface/pagesParsing/createProps" +import { expandComponentDefinition } from "components/userInterface/pagesParsing/types" import { loadLibs, libUrlsForPreview } from "../loadComponentLibraries" import { buildCodeForScreens } from "../buildCodeForScreens" import { generate_screen_css } from "../generate_css" diff --git a/packages/builder/src/node_modules/components/accessLevels/AccessLevelsRoot.svelte b/packages/builder/src/node_modules/components/accessLevels/AccessLevelsRoot.svelte index 8d57d83f2b..f53afae5f6 100644 --- a/packages/builder/src/node_modules/components/accessLevels/AccessLevelsRoot.svelte +++ b/packages/builder/src/node_modules/components/accessLevels/AccessLevelsRoot.svelte @@ -1,12 +1,15 @@ diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditRecord.svelte b/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditRecord.svelte index 25837db018..99c7e78116 100644 --- a/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditRecord.svelte +++ b/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditRecord.svelte @@ -1,18 +1,18 @@
diff --git a/packages/builder/src/node_modules/components/nav/DatabasesList.svelte b/packages/builder/src/node_modules/components/nav/DatabasesList.svelte index b531d34351..422e1b3136 100644 --- a/packages/builder/src/node_modules/components/nav/DatabasesList.svelte +++ b/packages/builder/src/node_modules/components/nav/DatabasesList.svelte @@ -1,6 +1,6 @@