diff --git a/.all-contributorsrc b/.all-contributorsrc new file mode 100644 index 0000000000..9841a9047b --- /dev/null +++ b/.all-contributorsrc @@ -0,0 +1,115 @@ +{ + "files": [ + "README.md" + ], + "imageSize": 100, + "commit": false, + "contributors": [ + { + "login": "shogunpurple", + "name": "Martin McKeaveney", + "avatar_url": "https://avatars1.githubusercontent.com/u/11256663?v=4", + "profile": "http://martinmck.com", + "contributions": [ + "code", + "doc", + "test", + "infra" + ] + }, + { + "login": "mike12345567", + "name": "Michael Drury", + "avatar_url": "https://avatars2.githubusercontent.com/u/4407001?v=4", + "profile": "http://www.michaeldrury.co.uk/", + "contributions": [ + "doc", + "code", + "test", + "infra" + ] + }, + { + "login": "aptkingston", + "name": "Andrew Kingston", + "avatar_url": "https://avatars3.githubusercontent.com/u/9075550?v=4", + "profile": "https://github.com/aptkingston", + "contributions": [ + "doc", + "code", + "test", + "design" + ] + }, + { + "login": "mjashanks", + "name": "Michael Shanks", + "avatar_url": "https://avatars3.githubusercontent.com/u/3524181?v=4", + "profile": "https://budibase.com/", + "contributions": [ + "doc", + "code", + "test" + ] + }, + { + "login": "kevmodrome", + "name": "Kevin Γ…berg Kultalahti", + "avatar_url": "https://avatars3.githubusercontent.com/u/534488?v=4", + "profile": "https://github.com/kevmodrome", + "contributions": [ + "doc", + "code", + "test" + ] + }, + { + "login": "joebudi", + "name": "Joe", + "avatar_url": "https://avatars2.githubusercontent.com/u/49767913?v=4", + "profile": "https://www.budibase.com/", + "contributions": [ + "doc", + "code", + "content", + "design" + ] + }, + { + "login": "Conor-Mack", + "name": "Conor_Mack", + "avatar_url": "https://avatars1.githubusercontent.com/u/36074859?v=4", + "profile": "https://github.com/Conor-Mack", + "contributions": [ + "code", + "test" + ] + }, + { + "login": "pngwn", + "name": "pngwn", + "avatar_url": "https://avatars1.githubusercontent.com/u/12937446?v=4", + "profile": "https://github.com/pngwn", + "contributions": [ + "code", + "test" + ] + }, + { + "login": "HugoLd", + "name": "HugoLd", + "avatar_url": "https://avatars0.githubusercontent.com/u/26521848?v=4", + "profile": "https://github.com/HugoLd", + "contributions": [ + "code" + ] + } + ], + "contributorsPerLine": 7, + "projectName": "budibase", + "projectOwner": "Budibase", + "repoType": "github", + "repoHost": "https://github.com", + "skipCi": true, + "commitConvention": "none" +} diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000..1be855e3fa --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at community@budibase.com. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..f5ffc2d9cc --- /dev/null +++ b/LICENSE @@ -0,0 +1,6 @@ +Each Budibase package has its own license: + +builder: AGPLv3 +server: GPLv3 +client: MPLv2.0 +standard-components: MPLv2.0 diff --git a/README.md b/README.md new file mode 100644 index 0000000000..5056479db9 --- /dev/null +++ b/README.md @@ -0,0 +1,179 @@ +

+ + Budibase + +

+

+ Budibase +

+ +

+ Build business apps 50x faster +

+

+ Budibase is an open-source low-code platform that helps developers and IT professionals design, build, and ship business apps 50x faster. +

+ +

+ πŸ€– 🎨 πŸš€ +

+ + +

+ +

+ +

+ + GitHub all releases + + + GitHub release (latest by date) + + + Discord + + + Follow @budibase + + Code of conduct +

+ +

+ Sign-up + Β· + Docs + Β· + Feature request + Β· + Report a bug + Β· + Support: Discussions + & + Discord +

+ + +## ✨ Features +When other platforms chose the closed source route, we decided to go open source. When other platforms chose cloud builders, we decided a local builder offered the better developer experience. We like to do things differently at Budibase. + +- **Build and ship real software.** Unlike other platforms, with Budibase you build and ship single page applications. Budibase applications have performance baked in and can be designed responsively, providing your users with a great experience. + +- **Open source and extensable.** Budibase is open-source. The builder is licensed AGPL v3, the server is GPL v3, and the client is MPL. This should fill you with confidence that Budibase will always be around. You can also code against Budibase or fork it and make changes as you please, providing a developer-friendly experience. + +- **Load data or start from scratch.** Budibase pulls in data from multiple sources, whether it’s a CSV, an external database (coming very soon), or a REST API. And unlike other platforms, with Budibase you can start from scratch and create business apps with no data sources. [Request new data sources](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas). + +- **Design and build apps with powerful pre-made components.** Budibase comes out of the box with beautifully designed, powerful components which you can use like building blocks to build your UI. We also expose a lot of your favourite CSS styling options so you can go that extra creative mile. [Request new components](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas). + +- **Automate processes, integrate with other tools, and connect to webhooks.** Save time by automating manual processes and workflows. From connecting to webhooks, to automating emails, simply tell Budibase what to do and let it work for you. You can easily [create new automations for Budibase here](https://github.com/Budibase/automations) or [request new integrations here](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas). + +- **Cloud hosting (available) and self-hosting (coming soon).** Users will soon have the option to host with Budibase in AWS (available now) or self-host (coming very soon). From the very beginning, we wanted our users to have the option to self-host. We understand the importance of having full control over data. This is why we are working incredibly hard to offer an easy path to self-hosting. If you are interested in self-hosting, please [join the conversation and add your thoughts](https://github.com/Budibase/budibase/discussions/648). + + +## βŒ› Status +- [x] Alpha: We are demoing Budibase to users and receiving feedback +- [x] Private Beta: We are testing Budibase with a closed set of customers +- [x] Public Beta: Anyone can [sign-up and use Budibase](https://portal.budi.live/signup) but it's not production ready. We cannot ensure backwards compatibility +- [ ] Official Launch: Production-ready + + +We are currently in Public Beta. Until our official launch, we cannot ensure backwards compatibility for your Budibase applications between versions. Issues may arise when trying to edit apps created with old versions of the Budibase builder. + +Watch "releases" of this repo to get notified of major updates, and give the star button a click whilst you're there. + +

+ +

+ +If you are having issues between updates of the builder, please use the guide [here](https://github.com/Budibase/budibase/blob/master/CONTRIBUTING.md#troubleshooting) to clear down your environment. + +## Roadmap + +Checkout our [Public Roadmap](https://github.com/Budibase/budibase/projects/10). If you would like to discuss some of the items on the roadmap, please feel to reach out on [Discord](https://discord.gg/rCYayfe), or via [Github discussions](https://github.com/Budibase/budibase/discussions) + + +## 🏁 Getting Started with Budibase + +The Budibase builder runs in Electron, on Mac, PC and Linux. Follow the steps below to get started: +- [ ] [Sign-up to Budibase](https://portal.budi.live/signup) +- [ ] Create a username and password +- [ ] Copy your API key +- [ ] Download Budibase +- [ ] Open Budibase and enter your API key + +[Here is a guided tutorial](https://docs.budibase.com/tutorial/tutorial-signing-up) if you need extra help. + +

+ Budibase design ui +

+ + +## πŸŽ“ Learning Budibase + +The Budibase [documentation lives here](https://docs.budibase.com). + +You can also follow a quick tutorial on [how to build a CRM with Budibase](https://docs.budibase.com/tutorial/tutorial-introduction) + +## ❗ Code of Conduct + +Budibase is dedicated to providing a welcoming, diverse, and harrassment-free experience for everyone. We expect everyone in the Budibase community to abide by our [**Code of Conduct**](https://github.com/Budibase/budibase/blob/master/CODE_OF_CONDUCT.md). Please read it. + +## πŸ™Œ Contributing to Budibase + +From opening a bug report to creating a pull request: every contribution is appreciated and welcomed. If you're planning to implement a new feature or change the API please create an issue first. This way we can ensure your work is not in vain. + +### Not Sure Where to Start? +A good place to start contributing, is the [First time issues project](https://github.com/Budibase/budibase/projects/22). + +### How the repository is organized +Budibase is a monorepo managed by lerna. Lerna manages the building and publishing of the budibase packages. At a high level, here are the packages that make up Budibase. + +- [packages/builder](https://github.com/Budibase/budibase/tree/master/packages/builder) - contains code for the budibase builder client side svelte application. + +- [packages/client](https://github.com/Budibase/budibase/tree/master/packages/client) - A module that runs in the browser responsible for reading JSON definition and creating living, breathing web apps from it. + +- [packages/server](https://github.com/Budibase/budibase/tree/master/packages/server) - The budibase server. This Koa app is responsible for serving the JS for the builder and budibase apps, as well as providing the API for interaction with the database and file system. + +For more information, see [CONTRIBUTING.md](./CONTRIBUTING.md) + +## πŸ“ License + +Budibase is open-source. The builder is licensed [AGPL v3](https://www.gnu.org/licenses/agpl-3.0.en.html), the server is licensed [GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html), and the client is licensed [MPL](https://directory.fsf.org/wiki/License:MPL-2.0). + +## πŸ’¬ Get in touch + +If you have a question or would like to talk with other Budibase users, please hop over to [Github discussions](https://github.com/Budibase/budibase/discussions) or join our Discord server: + +[Discord chatroom](https://discord.gg/rCYayfe) + +![Discord Shield](https://discordapp.com/api/guilds/733030666647765003/widget.png?style=shield) + +## Contributors ✨ + +Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): + + + + + + + + + + + + + + + + + + +

Martin McKeaveney
πŸ’» πŸ“– ⚠️ πŸš‡
Michael Drury
πŸ“– πŸ’» ⚠️ πŸš‡
Andrew Kingston
πŸ“– πŸ’» ⚠️ 🎨
Michael Shanks
πŸ“– πŸ’» ⚠️
Kevin Γ…berg Kultalahti
πŸ“– πŸ’» ⚠️
Joe
πŸ“– πŸ’» πŸ–‹ 🎨
Conor_Mack
πŸ’» ⚠️

pngwn
πŸ’» ⚠️
HugoLd
πŸ’»
+ + + + + + +This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! diff --git a/package.json b/package.json index b5cd1e26cc..d58e36517d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "prettier-plugin-svelte": "^1.4.0", "rimraf": "^3.0.2", "rollup-plugin-replace": "^2.2.0", - "svelte": "^3.28.0" + "svelte": "^3.30.0" }, "scripts": { "bootstrap": "lerna bootstrap", diff --git a/packages/builder/cypress/integration/screens.spec.js b/packages/builder/cypress/integration/screens.spec.js index f78d7266e8..6df8af3602 100644 --- a/packages/builder/cypress/integration/screens.spec.js +++ b/packages/builder/cypress/integration/screens.spec.js @@ -7,17 +7,7 @@ context('Screen Tests', () => { cy.navigateToFrontend() }) - it('Should successful create a screen', () => { + it('Should successfully create a screen', () => { cy.createScreen("test Screen", "/test") }) - - it('Should rename a screen', () => { - cy.get(".components-pane").within(() => { - cy.contains("Settings").click() - cy.get("input[name=_instanceName]").clear().type("About Us").blur() - }) - cy.get('.nav-items-container').within(() => { - cy.contains("About Us").should('exist') - }) - }) }) \ No newline at end of file diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index f82ff30827..15564083ba 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -166,6 +166,6 @@ Cypress.Commands.add("createScreen", (screenName, route) => { cy.contains("Create Screen").click() }) cy.get(".nav-items-container").within(() => { - cy.contains(screenName).should("exist") + cy.contains(route).should("exist") }) }) diff --git a/packages/builder/package.json b/packages/builder/package.json index 9dab2460fb..c327a4e908 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -115,7 +115,7 @@ "rollup-plugin-terser": "^7.0.2", "rollup-plugin-url": "^2.2.2", "start-server-and-test": "^1.11.0", - "svelte": "^3.29.0", + "svelte": "^3.30.0", "svelte-jester": "^1.0.6" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js index 1bd86480a4..ae77889404 100644 --- a/packages/builder/src/builderStore/index.js +++ b/packages/builder/src/builderStore/index.js @@ -31,6 +31,12 @@ export const currentScreens = derived(store, $store => { : Object.values(currentScreens) }) +export const selectedPage = derived(store, $store => { + if (!$store.pages) return null + + return $store.pages[$store.currentPageName || "main"] +}) + export const initialise = async () => { try { await analytics.activate() diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 8cac56df66..50c4347583 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -5,8 +5,7 @@ import { getBuiltin, makePropsSafe, } from "components/userInterface/pagesParsing/createProps" -import { getExactComponent } from "components/userInterface/pagesParsing/searchComponents" -import { allScreens, backendUiStore } from "builderStore" +import { allScreens, backendUiStore, selectedPage } from "builderStore" import { generate_screen_css } from "../generate_css" import { fetchComponentLibDefinitions } from "../loadComponentLibraries" import api from "../api" @@ -37,6 +36,7 @@ const INITIAL_FRONTEND_STATE = { hasAppPackage: false, libraries: null, appId: "", + routes: {}, } export const getFrontendStore = () => { @@ -111,10 +111,9 @@ export const getFrontendStore = () => { store.update(state => { state.currentFrontEndType = type - const pageOrScreen = - type === "page" - ? state.pages[state.currentPageName] - : state.pages[state.currentPageName]._screens[0] + const page = get(selectedPage) + + const pageOrScreen = type === "page" ? page : page._screens[0] state.currentComponentInfo = pageOrScreen ? pageOrScreen.props : null state.currentPreviewItem = pageOrScreen @@ -122,10 +121,21 @@ export const getFrontendStore = () => { return state }) }, - screens: { - select: screenName => { + routing: { + fetch: async () => { + const response = await api.get("/api/routing") + const json = await response.json() + store.update(state => { - const screen = getExactComponent(get(allScreens), screenName, true) + state.routes = json.routes + return state + }) + }, + }, + screens: { + select: screenId => { + store.update(state => { + const screen = get(allScreens).find(screen => screen._id === screenId) state.currentPreviewItem = screen state.currentFrontEndType = "screen" state.currentView = "detail" @@ -158,32 +168,25 @@ export const getFrontendStore = () => { await savePromise }, save: async screen => { - const storeContents = get(store) - const pageName = storeContents.currentPageName || "main" - const currentPage = storeContents.pages[pageName] - const currentPageScreens = currentPage._screens + const page = get(selectedPage) + const currentPageScreens = page._screens const creatingNewScreen = screen._id === undefined let savePromise - const response = await api.post( - `/api/screens/${currentPage._id}`, - screen - ) + const response = await api.post(`/api/screens/${page._id}`, screen) const json = await response.json() screen._rev = json.rev screen._id = json.id - const foundScreen = currentPageScreens.findIndex( - el => el._id === screen._id - ) + const foundScreen = page._screens.findIndex(el => el._id === screen._id) if (foundScreen !== -1) { - currentPageScreens.splice(foundScreen, 1) + page._screens.splice(foundScreen, 1) } - currentPageScreens.push(screen) + page._screens.push(screen) // TODO: should carry out all server updates to screen in a single call store.update(state => { - state.pages[pageName]._screens = currentPageScreens + page._screens = currentPageScreens if (creatingNewScreen) { state.currentPreviewItem = screen @@ -209,21 +212,21 @@ export const getFrontendStore = () => { store.actions.screens.regenerateCss(currentPreviewItem) } }, - delete: async (screensToDelete, pageName) => { + delete: async screens => { let deletePromise + const screensToDelete = Array.isArray(screens) ? screens : [screens] + store.update(state => { - if (pageName == null) { - pageName = state.pages.main.name - } - for (let screenToDelete of Array.isArray(screensToDelete) - ? screensToDelete - : [screensToDelete]) { + const currentPage = get(selectedPage) + + for (let screenToDelete of screensToDelete) { // Remove screen from current page as well // TODO: Should be done server side - state.pages[pageName]._screens = state.pages[ - pageName - ]._screens.filter(scr => scr._id !== screenToDelete._id) + currentPage._screens = currentPage._screens.filter( + scr => scr._id !== screenToDelete._id + ) + deletePromise = api.delete( `/api/screens/${screenToDelete._id}/${screenToDelete._rev}` ) @@ -309,14 +312,13 @@ export const getFrontendStore = () => { create: (componentToAdd, presetProps) => { store.update(state => { function findSlot(component_array) { - for (let i = 0; i < component_array.length; i += 1) { - if (component_array[i]._component === "##builtin/screenslot") { + for (let component of component_array) { + if (component._component === "##builtin/screenslot") { return true } - if (component_array[i]._children) findSlot(component_array[i]) + if (component._children) findSlot(component) } - return false } @@ -377,7 +379,7 @@ export const getFrontendStore = () => { component._id ) parent._children = parent._children.filter( - c => c._id !== component._id + child => child._id !== component._id ) store.actions.components.select(parent) } diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index 9a5eaef83a..063ca34633 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -31,7 +31,7 @@ - {#if Object.keys(schema).length > 0} + {#if schema && Object.keys(schema).length > 0} diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/ComponentTree.svelte b/packages/builder/src/components/userInterface/ComponentNavigationTree/ComponentTree.svelte new file mode 100644 index 0000000000..ee162f0eba --- /dev/null +++ b/packages/builder/src/components/userInterface/ComponentNavigationTree/ComponentTree.svelte @@ -0,0 +1,113 @@ + + +
    + {#each components as component, index (component._id)} +
  • selectComponent(component)}> + {#if $dragDropStore?.targetComponent === component && $dragDropStore.dropPosition === DropPosition.ABOVE} +
    + {/if} + + + + + + {#if component._children} + + {/if} + + {#if $dragDropStore?.targetComponent === component && ($dragDropStore.dropPosition === DropPosition.INSIDE || $dragDropStore.dropPosition === DropPosition.BELOW)} +
    + {/if} +
    • + {/each} +
+ + diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/PathTree.svelte b/packages/builder/src/components/userInterface/ComponentNavigationTree/PathTree.svelte new file mode 100644 index 0000000000..a06f120de5 --- /dev/null +++ b/packages/builder/src/components/userInterface/ComponentNavigationTree/PathTree.svelte @@ -0,0 +1,51 @@ + + + + +{#each Object.entries(route.subpaths) as [url, subpath]} + {#each Object.values(subpath.screens) as screenId} + changeScreen(screenId)}> + + + {#if selectedScreen?._id === screenId} + + {/if} + {/each} +{/each} diff --git a/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte b/packages/builder/src/components/userInterface/ComponentNavigationTree/ScreenDropdownMenu.svelte similarity index 75% rename from packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte rename to packages/builder/src/components/userInterface/ComponentNavigationTree/ScreenDropdownMenu.svelte index e675006412..3ecd8ce0dc 100644 --- a/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte +++ b/packages/builder/src/components/userInterface/ComponentNavigationTree/ScreenDropdownMenu.svelte @@ -1,6 +1,6 @@ + +
+ {#each Object.keys($store.routes) as path} + + {/each} +
diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte deleted file mode 100644 index 78f17613c5..0000000000 --- a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte +++ /dev/null @@ -1,61 +0,0 @@ - - -
- {#each sortedScreens as screen} - changeScreen(screen)}> - - - - {#if $store.currentPreviewItem.props._instanceName && $store.currentPreviewItem.props._instanceName === screen.props._instanceName && screen.props._children} - - {/if} - {/each} -
diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte deleted file mode 100644 index 1034238c0a..0000000000 --- a/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte +++ /dev/null @@ -1,181 +0,0 @@ - - -
    - {#each components as component, index (component._id)} -
  • selectComponent(component)}> - {#if $dragDropStore && $dragDropStore.targetComponent === component && $dragDropStore.dropPosition === 'above'} -
    - {/if} - - - - - - {#if component._children} - - {/if} - - {#if $dragDropStore && $dragDropStore.targetComponent === component && ($dragDropStore.dropPosition === 'inside' || $dragDropStore.dropPosition === 'below')} -
    - {/if} -
    • - {/each} -
- - diff --git a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte b/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte index 11fc02d029..90d03e16a2 100644 --- a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte +++ b/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte @@ -1,12 +1,20 @@
@@ -16,7 +24,7 @@
- +
diff --git a/packages/builder/src/components/userInterface/NewScreenModal.svelte b/packages/builder/src/components/userInterface/NewScreenModal.svelte index ebee601838..293f623fe7 100644 --- a/packages/builder/src/components/userInterface/NewScreenModal.svelte +++ b/packages/builder/src/components/userInterface/NewScreenModal.svelte @@ -76,6 +76,7 @@ if (createLink) { await store.actions.components.links.save(route, name) } + await store.actions.routing.fetch() if (templateIndex !== undefined) { const template = templates[templateIndex] diff --git a/packages/builder/src/components/userInterface/PageLayout.svelte b/packages/builder/src/components/userInterface/PageLayout.svelte index 932fc0a4f0..14cb835c6b 100644 --- a/packages/builder/src/components/userInterface/PageLayout.svelte +++ b/packages/builder/src/components/userInterface/PageLayout.svelte @@ -1,6 +1,6 @@ - - - -
{#if dataLoaded} {#if canAddDelete} diff --git a/packages/standard-components/src/index.js b/packages/standard-components/src/index.js index f578dc8f6f..9c109b88a8 100644 --- a/packages/standard-components/src/index.js +++ b/packages/standard-components/src/index.js @@ -1,4 +1,5 @@ import "@budibase/bbui/dist/bbui.css" +import "flatpickr/dist/flatpickr.css" export { default as container } from "./Container.svelte" export { default as text } from "./Text.svelte" diff --git a/readme.md b/readme.md deleted file mode 100644 index 4b1d1eb2c2..0000000000 --- a/readme.md +++ /dev/null @@ -1,45 +0,0 @@ -# Budibase -[Budibase](https://www.budibase.com) is an open source no-code platform for building and deploying custom software, without coding. - -

- -

- -# Status -- [x] Alpha: We are demoing Budibase to users and receiving feedback -- [x] Private Beta: We are testing Budibase with a closed set of customers -- [x] Public Beta: Anyone can [sign-up and use Budibase](https://portal.budi.live/signup) but it's not production ready. We cannot ensure backwards compatibility -- [ ] Official Launch: Production-ready - - -We are currently in Public Beta. Until our official launch, we cannot ensure backwards compatibility for your budibase applications between versions. Issues may arise when trying to edit apps created with old versions of the budibase builder. - -Watch "releases" of this repo to get notified of major updates, and give the star button a click whilst you're there. - -

- -

- -If you are having issues between updates of the builder, please use the guide [here](https://github.com/Budibase/budibase/blob/master/CONTRIBUTING.md#troubleshooting) to clear down your environment. - - -# Getting Started with Budibase - -The Budibase builder runs in Electron, on Mac, PC and Linux. [Download the latest release](https://github.com/Budibase/budibase/releases), and start building! - - -## Documentation and tutorial - -Our documentation and tutorials live here: https://docs.budibase.com - -## Contributing - -Contributors, see [CONTRIBUTING.md](./CONTRIBUTING.md) - -## Get in touch - -If you have a question or would like to talk with other Budibase users, please hop over to [Github discussions](https://github.com/Budibase/budibase/discussions) or join our Discord server: - -[Discord chatroom](https://discord.gg/rCYayfe) - -![Discord Shield](https://discordapp.com/api/guilds/733030666647765003/widget.png?style=shield) diff --git a/yarn.lock b/yarn.lock index 66b1d808cf..e9f9998edc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4417,10 +4417,10 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -svelte@^3.28.0: - version "3.29.0" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.29.0.tgz#80acac4254341ad8f3301e5ef03f4127ea967d96" - integrity sha512-f+A65eyOQ5ujETLy+igNXtlr6AEjAQLYd1yJE1VwNiXMQO5Z/Vmiy3rL+zblV/9jd7rtTTWqO1IcuXsP2Qv0OA== +svelte@^3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.30.0.tgz#cbde341e96bf34f4ac73c8f14f8a014e03bfb7d6" + integrity sha512-z+hdIACb9TROGvJBQWcItMtlr4s0DBUgJss6qWrtFkOoIInkG+iAMo/FJZQFyDBQZc+dul2+TzYSi/tpTT5/Ag== table@^5.2.3: version "5.4.6"