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

Merge branch 'master' of github.com:Budibase/budibase into feature/routify

This commit is contained in:
kevmodrome 2020-04-06 07:47:35 +02:00
parent 25798928d0 70b54cf205
commit 59a7d28c4f
54 changed files with 193 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "0.0.29", "version": "0.0.31",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

1
package.json
View File

@ -17,6 +17,7 @@
"build": "lerna run build", "build": "lerna run build",
"initialise": "lerna run initialise", "initialise": "lerna run initialise",
"publishdev": "lerna run publishdev", "publishdev": "lerna run publishdev",
"publishnpm":"yarn build && lerna publish",
"clean": "lerna clean", "clean": "lerna clean",
"dev": "lerna run --parallel --stream dev:builder", "dev": "lerna run --parallel --stream dev:builder",
"test": "lerna run test", "test": "lerna run test",

4
packages/bootstrap-components/package.json
View File

@ -12,7 +12,7 @@
"publishdev": "yarn build && node ./scripts/publishDev.js" "publishdev": "yarn build && node ./scripts/publishDev.js"
}, },
"devDependencies": { "devDependencies": {
"@budibase/client": "^0.0.29", "@budibase/client": "^0.0.31",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
@ -30,7 +30,7 @@
"keywords": [ "keywords": [
"svelte" "svelte"
], ],
"version": "0.0.29", "version": "0.0.31",
"license": "MIT", "license": "MIT",
"gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e" "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e"
} }

6
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "0.0.29", "version": "0.0.31",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -38,7 +38,7 @@
] ]
}, },
"dependencies": { "dependencies": {
"@budibase/client": "^0.0.29", "@budibase/client": "^0.0.31",
"@nx-js/compiler-util": "^2.0.0", "@nx-js/compiler-util": "^2.0.0",
"codemirror": "^5.51.0", "codemirror": "^5.51.0",
"date-fns": "^1.29.0", "date-fns": "^1.29.0",
@ -80,4 +80,4 @@
"svelte": "^3.0.0" "svelte": "^3.0.0"
}, },
"gitHead": "115189f72a850bfb52b65ec61d932531bf327072" "gitHead": "115189f72a850bfb52b65ec61d932531bf327072"
} }

2
packages/builder/src/BackendRoot.svelte
View File

@ -37,7 +37,7 @@
.content { .content {
flex: 1 1 auto; flex: 1 1 auto;
margin: 40px 40px; margin: 20px 40px;
} }
.nav { .nav {

4
packages/builder/src/budibase.css
View File

@ -37,7 +37,7 @@
.budibase__label--medium { .budibase__label--medium {
font-weight: 500; font-weight: 500;
font-size: 12px; font-size: 13px;
opacity: 0.6; opacity: 0.6;
text-transform: uppercase; text-transform: uppercase;
} }
@ -64,7 +64,7 @@
display: flex; display: flex;
align-items: baseline; align-items: baseline;
font-weight: 500; font-weight: 500;
font-size: 12px; font-size: 13px;
} }
.budibase__nav-item.selected { .budibase__nav-item.selected {

3
packages/builder/src/components/common/ActionButton.svelte
View File

@ -46,7 +46,8 @@
.button:hover { .button:hover {
cursor: pointer; cursor: pointer;
font-weight: 700; font-weight: 600;
filter:saturate(90%);
} }
.button:disabled { .button:disabled {

2
packages/builder/src/components/common/AppNotification.svelte
View File

@ -63,7 +63,7 @@
} }
:global(.refresh-page-button) { :global(.refresh-page-button) {
font-size: 12px; font-size: 13px;
font-weight: 600; font-weight: 600;
border-radius: 5px; border-radius: 5px;
border: none; border: none;

10
packages/builder/src/components/common/Icons/DownArrow.svelte Normal file
View File

@ -0,0 +1,10 @@
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
width="100%"
height="100%">
<path fill="none" d="M0 0h24v24H0z"/>
<path
fill="rgba(0,3,51,1)"
d="M12 14l-4-4h8z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 228 B

1
packages/builder/src/components/common/Icons/index.js
View File

@ -4,6 +4,7 @@ export { default as TerminalIcon } from "./Terminal.svelte"
export { default as InputIcon } from "./Input.svelte" export { default as InputIcon } from "./Input.svelte"
export { default as ImageIcon } from "./Image.svelte" export { default as ImageIcon } from "./Image.svelte"
export { default as ArrowDownIcon } from "./ArrowDown.svelte" export { default as ArrowDownIcon } from "./ArrowDown.svelte"
export { default as DownArrowIcon } from "./DownArrow.svelte"
export { default as CircleIndicator } from "./CircleIndicator.svelte" export { default as CircleIndicator } from "./CircleIndicator.svelte"
export { default as PencilIcon } from "./Pencil.svelte" export { default as PencilIcon } from "./Pencil.svelte"
export { default as EventsIcon } from "./Events.svelte" export { default as EventsIcon } from "./Events.svelte"

2
packages/builder/src/components/common/Inputs/InputGroup.svelte
View File

@ -30,7 +30,7 @@
input { input {
width: 83px; width: 83px;
font-size: 12px; font-size: 13px;
font-weight: 700; font-weight: 700;
color: #163057; color: #163057;
opacity: 0.7; opacity: 0.7;

21
packages/builder/src/components/common/Select.svelte
View File

@ -19,22 +19,22 @@
<style> <style>
.select-container { .select-container {
font-size: 0.9rem; font-size: 14px;
color: var(--secondary50); color: var(--secondary60);
font-weight: bold; font-weight: bold;
position: relative; position: relative;
max-width: 300px; max-width: 400px;
min-width: 200px; min-width: 275px;
} }
.adjusted { .adjusted {
padding-left: 2.5em; padding-left: 30px;
} }
i { i {
position: absolute; position: absolute;
left: 8px; left: 10px;
top: 8px; top: 10px;
} }
select { select {
@ -42,8 +42,9 @@
display: block; display: block;
font-family: sans-serif; font-family: sans-serif;
font-weight: 400; font-weight: 400;
font-size: 14px;
color: #000333; color: #000333;
padding: 0 2.6em 0em 1.4em; padding: 0 40px 0px 20px;
width: 100%; width: 100%;
max-width: 100%; max-width: 100%;
box-sizing: border-box; box-sizing: border-box;
@ -51,7 +52,7 @@
-moz-appearance: none; -moz-appearance: none;
-webkit-appearance: none; -webkit-appearance: none;
appearance: none; appearance: none;
background: var(--lightslate); background: var(--white);
} }
.arrow { .arrow {
@ -62,6 +63,6 @@
width: 30px; width: 30px;
height: 30px; height: 30px;
pointer-events: none; pointer-events: none;
color: var(--primary100); color: var(--secondary100);
} }
</style> </style>

28
packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte
View File

@ -99,9 +99,9 @@
<section> <section>
<div class="table-controls"> <div class="table-controls">
<h4 class="budibase__title--3"> <h2 class="title">
{takeRight(2, $backendUiStore.breadcrumbs).join(' / ')} {takeRight(2, $backendUiStore.breadcrumbs).join(' / ')}
</h4> </h2>
<Select icon="ri-eye-line" bind:value={$backendUiStore.selectedView}> <Select icon="ri-eye-line" bind:value={$backendUiStore.selectedView}>
{#each views as view} {#each views as view}
<option value={view}>{view.name}</option> <option value={view}>{view.name}</option>
@ -166,6 +166,18 @@
</section> </section>
<style> <style>
.title {
font-size: 24px;
font-weight: 600;
text-rendering: optimizeLegibility;
text-transform: capitalize;
}
.select {
background: white;
}
table { table {
border: 1px solid #ccc; border: 1px solid #ccc;
background: #fff; background: #fff;
@ -174,19 +186,24 @@
} }
thead { thead {
background: var(--background-button); background: #f9f9f9;
border: 1px solid #ccc;
} }
thead th { thead th {
color: var(--button-text); color: var(--button-text);
text-transform: capitalize; text-transform: capitalize;
font-weight: 500; font-weight: 500;
font-size: 14px;
text-rendering: optimizeLegibility;
letter-spacing: 1px;
} }
tbody tr { tbody tr {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
transition: 0.3s background-color; transition: 0.3s background-color;
color: var(--darkslate); color: var(--secondary100);
font-size: 14px;
} }
tbody tr:hover { tbody tr:hover {
@ -196,7 +213,8 @@
.table-controls { .table-controls {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: baseline;
margin-top: 10px;
} }
.ri-more-line:hover, .ri-more-line:hover,

3
packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte
View File

@ -18,6 +18,7 @@
export let onClosed export let onClosed
let errors = [] let errors = []
let selectedModel
const childModelsForModel = compose(flatten, map("children"), get("children")) const childModelsForModel = compose(flatten, map("children"), get("children"))
@ -29,7 +30,6 @@
? childModelsForModel($store.hierarchy) ? childModelsForModel($store.hierarchy)
: $store.hierarchy.children : $store.hierarchy.children
let selectedModel
$: { $: {
if (record) { if (record) {
selectedModel = getExactNodeForKey($store.hierarchy)(record.key) selectedModel = getExactNodeForKey($store.hierarchy)(record.key)
@ -48,7 +48,6 @@
$: editingRecord = $: editingRecord =
record || record ||
editingRecord ||
getNewRecord( getNewRecord(
selectedModel, selectedModel,
getCurrentCollectionKey($backendUiStore.selectedRecord) getCurrentCollectionKey($backendUiStore.selectedRecord)

4
packages/builder/src/components/nav/BackendNav.svelte
View File

@ -53,7 +53,7 @@
flex-direction: column; flex-direction: column;
max-height: 100%; max-height: 100%;
height: 100%; height: 100%;
background-color: var(--white); background: var(--white);
} }
.nav-group-header { .nav-group-header {
@ -66,7 +66,7 @@
.hierarchy-title { .hierarchy-title {
align-items: center; align-items: center;
text-transform: uppercase; text-transform: uppercase;
font-size: 12px; font-size: 13px;
font-weight: bold; font-weight: bold;
opacity: 0.6; opacity: 0.6;
letter-spacing: 1px; letter-spacing: 1px;

4
packages/builder/src/components/nav/DatabasesList.svelte
View File

@ -60,7 +60,7 @@
<style> <style>
.root { .root {
font-size: 12px; font-size: 13px;
color: var(--secondary100); color: var(--secondary100);
position: relative; position: relative;
padding-left: 20px; padding-left: 20px;
@ -88,7 +88,7 @@
padding: 0; padding: 0;
border: none; border: none;
font-family: Roboto; font-family: Roboto;
font-size: 12px; font-size: 13px;
outline: none; outline: none;
cursor: pointer; cursor: pointer;
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);

2
packages/builder/src/components/nav/HierarchyRow.svelte
View File

@ -52,7 +52,7 @@
<style> <style>
.hierarchy-item { .hierarchy-item {
font-size: 12px; font-size: 13px;
font-weight: 400; font-weight: 400;
margin-bottom: 10px; margin-bottom: 10px;
} }

2
packages/builder/src/components/nav/SchemaManagementDrawer.svelte
View File

@ -68,7 +68,7 @@
.hierarchy-title { .hierarchy-title {
align-items: center; align-items: center;
text-transform: uppercase; text-transform: uppercase;
font-size: 12px; font-size: 13px;
font-weight: bold; font-weight: bold;
opacity: 0.6; opacity: 0.6;
letter-spacing: 1px; letter-spacing: 1px;

2
packages/builder/src/components/nav/UsersList.svelte
View File

@ -68,7 +68,7 @@
padding: 0; padding: 0;
border: none; border: none;
font-family: Roboto; font-family: Roboto;
font-size: 0.8rem; font-size: 13px;
outline: none; outline: none;
cursor: pointer; cursor: pointer;
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);

4
packages/builder/src/components/userInterface/CodeEditor.svelte
View File

@ -86,14 +86,14 @@
<style> <style>
h3 { h3 {
text-transform: uppercase; text-transform: uppercase;
font-size: 12px; font-size: 13px;
font-weight: 700; font-weight: 700;
color: #8997ab; color: #8997ab;
margin-bottom: 10px; margin-bottom: 10px;
} }
p { p {
font-size: 12px; font-size: 13px;
color: #333; color: #333;
margin-top: 0; margin-top: 0;
} }

4
packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
View File

@ -120,11 +120,11 @@
.detail-prop label { .detail-prop label {
word-wrap: break-word; word-wrap: break-word;
font-size: 12px; font-size: 13px;
font-weight: 700; font-weight: 700;
color: #163057; color: #163057;
opacity: 0.6; opacity: 0.6;
padding-top: 12px; padding-top: 13px;
margin-bottom: 0; margin-bottom: 0;
} }

6
packages/builder/src/components/userInterface/ComponentSelectionList.svelte
View File

@ -258,7 +258,7 @@
.component > .name { .component > .name {
color: #000333; color: #000333;
display: inline-block; display: inline-block;
font-size: 12px; font-size: 13px;
opacity: 0.8; opacity: 0.8;
} }
@ -282,7 +282,7 @@
} }
.preset-menu > span { .preset-menu > span {
font-size: 12px; font-size: 13px;
text-transform: uppercase; text-transform: uppercase;
margin-top: 5px; margin-top: 5px;
} }
@ -308,7 +308,7 @@
background: none; background: none;
border: none; border: none;
border-radius: 5px; border-radius: 5px;
padding: 12px; padding: 13px;
outline: none; outline: none;
cursor: pointer; cursor: pointer;
} */ } */

3
packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
View File

@ -98,12 +98,13 @@
<style> <style>
.root { .root {
font-weight: 400; font-weight: 400;
color: #333; color: #000333;
} }
.title { .title {
margin-left: 10px; margin-left: 10px;
margin-top: 2px; margin-top: 2px;
font-size: 13px;
} }
.icon { .icon {

1
packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte
View File

@ -95,6 +95,7 @@
height: 35px; height: 35px;
align-items: center; align-items: center;
font-weight: 400; font-weight: 400;
font-size: 13px;
} }
.item button { .item button {

2
packages/builder/src/components/userInterface/EditComponentProps.svelte
View File

@ -85,6 +85,6 @@
background: none; background: none;
border: none; border: none;
border-radius: 5px; border-radius: 5px;
padding: 12px; padding: 13px;
} }
</style> </style>

2
packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
View File

@ -160,7 +160,7 @@
a { a {
color: rgba(22, 48, 87, 0.6); color: rgba(22, 48, 87, 0.6);
font-size: 12px; font-size: 13px;
margin-top: 0; margin-top: 0;
} }
</style> </style>

2
packages/builder/src/components/userInterface/EventsEditor/EventsEditor.svelte
View File

@ -88,7 +88,7 @@
<style> <style>
h3 { h3 {
text-transform: uppercase; text-transform: uppercase;
font-size: 12px; font-size: 13px;
font-weight: 700; font-weight: 700;
color: #8997ab; color: #8997ab;
margin-bottom: 10px; margin-bottom: 10px;

2
packages/builder/src/components/userInterface/EventsEditor/HandlerSelector.svelte
View File

@ -139,7 +139,7 @@
} }
span { span {
font-size: 12px; font-size: 13px;
margin-bottom: 5px; margin-bottom: 5px;
} }
</style> </style>

2
packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
View File

@ -68,7 +68,7 @@
} }
span { span {
font-size: 12px; font-size: 13px;
margin-bottom: 5px; margin-bottom: 5px;
} }
</style> </style>

6
packages/builder/src/components/userInterface/LayoutEditor.svelte
View File

@ -131,7 +131,7 @@
<style> <style>
h3 { h3 {
text-transform: uppercase; text-transform: uppercase;
font-size: 12px; font-size: 13px;
font-weight: 700; font-weight: 700;
color: #000333; color: #000333;
opacity: 0.6; opacity: 0.6;
@ -149,11 +149,11 @@
} }
h5 { h5 {
font-size: 12px; font-size: 13px;
font-weight: 400; font-weight: 400;
color: #000333; color: #000333;
opacity: 0.8; opacity: 0.8;
padding-top: 12px; padding-top: 13px;
margin-bottom: 0; margin-bottom: 0;
} }

33
packages/builder/src/components/userInterface/MasterLayout.svelte → packages/builder/src/components/userInterface/PageLayout.svelte
View File

@ -50,24 +50,23 @@
} }
</script> </script>
<div> <div class="pagelayoutSection">
<div class="components-nav-page">Page Layout</div>
<div <div
class="budibase__nav-item" class="budibase__nav-item root"
class:selected={$store.currentComponentInfo._id === _layout.component.props._id} class:selected={$store.currentComponentInfo._id === _layout.component.props._id}
on:click|stopPropagation={() => store.setScreenType('page')}> on:click|stopPropagation={() => store.setScreenType('page')}>
<span <span
class="icon" class="icon"
class:rotate={$store.currentPreviewItem.name !== _layout.title}> class:rotate={$store.currentPreviewItem.name !== _layout.title}>
{#if _layout.component.props._children.length} <ArrowDownIcon />
<ArrowDownIcon />
{/if}
</span> </span>
<span class="icon"> <span class="icon">
<GridIcon /> <GridIcon />
</span> </span>
<span class="title">Master Layout</span> <span class="title">Page Layout</span>
</div> </div>
{#if $store.currentPreviewItem.name === _layout.title && _layout.component.props._children} {#if $store.currentPreviewItem.name === _layout.title && _layout.component.props._children}
@ -90,9 +89,27 @@
onOk={() => store.deleteComponent(componentToDelete)} /> onOk={() => store.deleteComponent(componentToDelete)} />
<style> <style>
.components-nav-page {
font-size: 13px;
color: #000333;
text-transform: uppercase;
margin-bottom: 10px;
padding-left: 20px;
font-weight: 600;
opacity: 0.4;
letter-spacing: 1px;
}
.pagelayoutSection {
margin: 20px 0px 20px 0px;
}
.root {
}
.title { .title {
margin-left: 10px; margin-left: 10px;
margin-top: 2px; font-size: 13px;
} }
.icon { .icon {
@ -100,7 +117,7 @@
transition: 0.2s; transition: 0.2s;
width: 20px; width: 20px;
margin-top: 2px; margin-top: 2px;
color: #333; color: #000333;
} }
.icon:nth-of-type(2) { .icon:nth-of-type(2) {

2
packages/builder/src/components/userInterface/PagesList.svelte
View File

@ -67,7 +67,7 @@
padding: 0; padding: 0;
border: none; border: none;
font-family: Roboto; font-family: Roboto;
font-size: 0.8rem; font-size: 13px;
outline: none; outline: none;
cursor: pointer; cursor: pointer;
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);

4
packages/builder/src/components/userInterface/PropControl.svelte
View File

@ -39,11 +39,11 @@
h5 { h5 {
word-wrap: break-word; word-wrap: break-word;
font-size: 12px; font-size: 13px;
font-weight: 400; font-weight: 400;
color: #000333; color: #000333;
opacity: 0.8; opacity: 0.8;
padding-top: 12px; padding-top: 13px;
margin-bottom: 0; margin-bottom: 0;
} }
</style> </style>

2
packages/builder/src/components/userInterface/PropertyCascader/StateBindingOptions.svelte
View File

@ -45,7 +45,7 @@
.name { .name {
color: rgba(22, 48, 87, 0.6); color: rgba(22, 48, 87, 0.6);
font-size: 12px; font-size: 13px;
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
margin-top: 5px; margin-top: 5px;

11
packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
View File

@ -1,7 +1,7 @@
<script> <script>
import ComponentsHierarchy from "./ComponentsHierarchy.svelte" import ComponentsHierarchy from "./ComponentsHierarchy.svelte"
import ComponentsHierarchyChildren from "./ComponentsHierarchyChildren.svelte" import ComponentsHierarchyChildren from "./ComponentsHierarchyChildren.svelte"
import MasterLayout from "./MasterLayout.svelte" import PageLayout from "./PageLayout.svelte"
import PagesList from "./PagesList.svelte" import PagesList from "./PagesList.svelte"
import { store } from "builderStore" import { store } from "builderStore"
import IconButton from "components/common/IconButton.svelte" import IconButton from "components/common/IconButton.svelte"
@ -55,6 +55,10 @@
<div class="border-line" /> <div class="border-line" />
<PageLayout layout={$store.pages[$store.currentPageName]} />
<div class="border-line" />
<div class="components-list-container"> <div class="components-list-container">
<div class="nav-group-header"> <div class="nav-group-header">
<span class="components-nav-header" style="margin-top: 0;"> <span class="components-nav-header" style="margin-top: 0;">
@ -67,7 +71,6 @@
</div> </div>
</div> </div>
<div class="nav-items-container"> <div class="nav-items-container">
<MasterLayout layout={$store.pages[$store.currentPageName]} />
<ComponentsHierarchy screens={$store.screens} /> <ComponentsHierarchy screens={$store.screens} />
</div> </div>
</div> </div>
@ -154,7 +157,7 @@
} }
.components-nav-page { .components-nav-page {
font-size: 12px; font-size: 13px;
color: #000333; color: #000333;
text-transform: uppercase; text-transform: uppercase;
padding-left: 20px; padding-left: 20px;
@ -165,7 +168,7 @@
} }
.components-nav-header { .components-nav-header {
font-size: 12px; font-size: 13px;
color: #000333; color: #000333;
text-transform: uppercase; text-transform: uppercase;
margin-top: 20px; margin-top: 20px;

1
packages/builder/src/index.html
View File

@ -7,6 +7,7 @@
<title>Budibase Builder</title> <title>Budibase Builder</title>
<link href="https://cdn.jsdelivr.net/npm/remixicon@2.3.0/fonts/remixicon.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/npm/remixicon@2.3.0/fonts/remixicon.css" rel="stylesheet">
<link rel='icon' type='image/png' href='/_builder/favicon.png'> <link rel='icon' type='image/png' href='/_builder/favicon.png'>
<link rel='stylesheet' href='/_builder/global.css'> <link rel='stylesheet' href='/_builder/global.css'>
<link rel='stylesheet' href='/_builder/codemirror.css'> <link rel='stylesheet' href='/_builder/codemirror.css'>

3
packages/builder/src/pages/[application]/backend/database/_layout.svelte
View File

@ -59,7 +59,7 @@
<div class="root"> <div class="root">
<div class="node-view"> <div class="node-view">
<slot />
</div> </div>
</div> </div>
@ -73,4 +73,5 @@
overflow-y: auto; overflow-y: auto;
flex: 1 1 auto; flex: 1 1 auto;
} }
</style> </style>

6
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "budibase", "name": "budibase",
"version": "0.0.29", "version": "0.0.31",
"description": "Budibase CLI", "description": "Budibase CLI",
"repository": "https://github.com/Budibase/Budibase", "repository": "https://github.com/Budibase/Budibase",
"homepage": "https://budibase.com", "homepage": "https://budibase.com",
@ -20,8 +20,8 @@
"author": "Budibase", "author": "Budibase",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@budibase/datastores": "^0.0.29", "@budibase/datastores": "^0.0.31",
"@budibase/server": "^0.0.29", "@budibase/server": "^0.0.31",
"@inquirer/password": "^0.0.6-alpha.0", "@inquirer/password": "^0.0.6-alpha.0",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",

2
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "0.0.29", "version": "0.0.31",
"license": "MPL-2.0", "license": "MPL-2.0",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
"module": "dist/budibase-client.esm.mjs", "module": "dist/budibase-client.esm.mjs",

2
packages/core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/core", "name": "@budibase/core",
"version": "0.0.29", "version": "0.0.31",
"description": "core javascript library for budibase", "description": "core javascript library for budibase",
"main": "dist/budibase-core.umd.js", "main": "dist/budibase-core.umd.js",
"module": "dist/budibase-core.esm.js", "module": "dist/budibase-core.esm.js",

4
packages/datastores/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/datastores", "name": "@budibase/datastores",
"version": "0.0.29", "version": "0.0.31",
"description": "implementations of all the datastores... azureblob, local etc", "description": "implementations of all the datastores... azureblob, local etc",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@ -27,7 +27,7 @@
"@babel/core": "^7.1.2", "@babel/core": "^7.1.2",
"@babel/node": "^7.0.0", "@babel/node": "^7.0.0",
"@babel/preset-env": "^7.1.0", "@babel/preset-env": "^7.1.0",
"@budibase/core": "^0.0.29", "@budibase/core": "^0.0.31",
"es6-promisify": "^6.0.1", "es6-promisify": "^6.0.1",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",
"lodash": "^4.17.13", "lodash": "^4.17.13",

4
packages/materialdesign-components/components.json
View File

@ -14,7 +14,9 @@
"name": "Body1", "name": "Body1",
"description": "Sets the font properties as Roboto Body 1", "description": "Sets the font properties as Roboto Body 1",
"props": { "props": {
"text": "string" "text": "string",
"verticalMargin": "number",
"horizontalMargin": "number"
}, },
"tags": [] "tags": []
}, },

1
packages/materialdesign-components/dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
packages/materialdesign-components/package.json
View File

@ -12,8 +12,8 @@
"publishdev": "yarn build && node ./scripts/publishDev.js" "publishdev": "yarn build && node ./scripts/publishDev.js"
}, },
"devDependencies": { "devDependencies": {
"@budibase/client": "^0.0.29", "@budibase/client": "^0.0.31",
"@budibase/standard-components": "^0.0.29", "@budibase/standard-components": "^0.0.31",
"@material/button": "^4.0.0", "@material/button": "^4.0.0",
"@material/checkbox": "^4.0.0", "@material/checkbox": "^4.0.0",
"@material/data-table": "4.0.0", "@material/data-table": "4.0.0",
@ -50,7 +50,7 @@
"keywords": [ "keywords": [
"svelte" "svelte"
], ],
"version": "0.0.29", "version": "0.0.31",
"license": "MIT", "license": "MIT",
"gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e", "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e",
"dependencies": { "dependencies": {

3
packages/materialdesign-components/public/index.html
View File

@ -5,9 +5,6 @@
<meta name='viewport' content='width=device-width'> <meta name='viewport' content='width=device-width'>
<title>Budibase-Material Design</title> <title>Budibase-Material Design</title>
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
rel="stylesheet">
<link rel='icon' type='image/png' href='/favicon.png'> <link rel='icon' type='image/png' href='/favicon.png'>
<link rel='stylesheet' href='/build/bundle.css'> <link rel='stylesheet' href='/build/bundle.css'>

3
packages/materialdesign-components/src/Button/Button.svelte
View File

@ -65,6 +65,9 @@
{/if} {/if}
<style> <style>
.mdc-button:not(.fullwidth) {
width: fit-content;
}
.fullwidth { .fullwidth {
width: 100%; width: 100%;
} }

3
packages/materialdesign-components/src/ClassBuilder.js
View File

@ -1,9 +1,10 @@
export default class ClassBuilder { export default class ClassBuilder {
constructor(block, defaultIgnoreList) { constructor(block, defaultIgnoreList) {
this.block = `mdc-${block}` this.block = `mdc-${block}`
this.defaultIgnoreList = defaultIgnoreList //will be ignored when building custom classes this.defaultIgnoreList = defaultIgnoreList //will be ignored when building custom classes
} }
/* /*
handles both blocks and elementss (BEM MD Notation) handles both blocks and elementss (BEM MD Notation)
params = {elementName: string, props: {modifiers{}, customs:{}, extras: []}} params = {elementName: string, props: {modifiers{}, customs:{}, extras: []}}

1
packages/materialdesign-components/src/Test/TestApp.svelte
View File

@ -34,6 +34,7 @@
props: { props: {
_component: "testcomponents/rootComponent", _component: "testcomponents/rootComponent",
_children: [ _children: [
Button,
Textfield, Textfield,
Checkboxgroup, Checkboxgroup,
Radiobutton, Radiobutton,

5
packages/materialdesign-components/src/Test/props.js
View File

@ -35,7 +35,7 @@ export const props = {
Button: { Button: {
_component: "@budibase/materialdesign-components/Button", _component: "@budibase/materialdesign-components/Button",
_children: [], _children: [],
variant: "raised", variant: "text",
colour: "secondary", colour: "secondary",
size: "large", size: "large",
href: "", href: "",
@ -64,7 +64,8 @@ export const props = {
_children: [], _children: [],
label: "First", label: "First",
colour: "secondary", colour: "secondary",
fullwidth: true, icon: "alarm_on",
trailingIcon: true,
maxLength: 500, maxLength: 500,
helperText: "Add Surname", helperText: "Add Surname",
value: "store.surname", value: "store.surname",

2
packages/materialdesign-components/src/_material-fonts.scss Normal file
View File

@ -0,0 +1,2 @@
@import "https://fonts.googleapis.com/css?family=Roboto:300,400,500";
@import "https://fonts.googleapis.com/icon?family=Material+Icons";

1
packages/materialdesign-components/src/index.js
View File

@ -1,4 +1,5 @@
import "@material/theme/mdc-theme.scss" import "@material/theme/mdc-theme.scss"
import "./_material-fonts.scss"
export { Button } from "./Button" export { Button } from "./Button"
export { default as Icon } from "./Common/Icon.svelte" export { default as Icon } from "./Common/Icon.svelte"

6
packages/server/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/server", "name": "@budibase/server",
"version": "0.0.29", "version": "0.0.31",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@ -16,8 +16,8 @@
"author": "Michael Shanks", "author": "Michael Shanks",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@budibase/client": "^0.0.29", "@budibase/client": "^0.0.31",
"@budibase/core": "^0.0.29", "@budibase/core": "^0.0.31",
"@koa/router": "^8.0.0", "@koa/router": "^8.0.0",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",
"koa": "^2.7.0", "koa": "^2.7.0",

4
packages/standard-components/package.json
View File

@ -12,7 +12,7 @@
"publishdev": "yarn build && node ./scripts/publishDev.js" "publishdev": "yarn build && node ./scripts/publishDev.js"
}, },
"devDependencies": { "devDependencies": {
"@budibase/client": "^0.0.29", "@budibase/client": "^0.0.31",
"@nx-js/compiler-util": "^2.0.0", "@nx-js/compiler-util": "^2.0.0",
"bcryptjs": "2.4.3", "bcryptjs": "2.4.3",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",
@ -32,7 +32,7 @@
"keywords": [ "keywords": [
"svelte" "svelte"
], ],
"version": "0.0.29", "version": "0.0.31",
"license": "MIT", "license": "MIT",
"gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e" "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e"
} }

40
yarn.lock
View File

@ -1363,7 +1363,7 @@ caseless@~0.12.0:
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.2: chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2" version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@ -3394,6 +3394,11 @@ mem@^4.0.0:
mimic-fn "^2.0.0" mimic-fn "^2.0.0"
p-is-promise "^2.0.0" p-is-promise "^2.0.0"
memorystream@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
meow@^3.3.0: meow@^3.3.0:
version "3.7.0" version "3.7.0"
resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@ -3773,6 +3778,21 @@ npm-registry-fetch@^4.0.0:
npm-package-arg "^6.1.0" npm-package-arg "^6.1.0"
safe-buffer "^5.2.0" safe-buffer "^5.2.0"
npm-run-all@^4.1.5:
version "4.1.5"
resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
dependencies:
ansi-styles "^3.2.1"
chalk "^2.4.1"
cross-spawn "^6.0.5"
memorystream "^0.3.1"
minimatch "^3.0.4"
pidtree "^0.3.0"
read-pkg "^3.0.0"
shell-quote "^1.6.1"
string.prototype.padend "^3.0.0"
npm-run-path@^2.0.0: npm-run-path@^2.0.0:
version "2.0.2" version "2.0.2"
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@ -4174,6 +4194,11 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
pidtree@^0.3.0:
version "0.3.1"
resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
pify@^2.0.0, pify@^2.3.0: pify@^2.0.0, pify@^2.3.0:
version "2.3.0" version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@ -4688,6 +4713,11 @@ shebang-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
shell-quote@^1.6.1:
version "1.7.2"
resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
signal-exit@^3.0.0, signal-exit@^3.0.2: signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2" version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@ -4931,6 +4961,14 @@ string-width@^4.1.0:
is-fullwidth-code-point "^3.0.0" is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.0" strip-ansi "^6.0.0"
string.prototype.padend@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz#dc08f57a8010dc5c153550318f67e13adbb72ac3"
integrity sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==
dependencies:
define-properties "^1.1.3"
es-abstract "^1.17.0-next.1"
string.prototype.trimleft@^2.1.1: string.prototype.trimleft@^2.1.1:
version "2.1.1" version "2.1.1"
resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"