Merge branch 'master' of github.com:Budibase/budibase into feature/handlebars-helpers

This commit is contained in:
mike12345567 2021-01-28 09:59:28 +00:00
commit 9cc8c08cf1
12 changed files with 61 additions and 48 deletions

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "0.5.3",
"version": "0.6.2",
"license": "AGPL-3.0",
"private": true,
"scripts": {
@ -63,10 +63,10 @@
}
},
"dependencies": {
"@budibase/bbui": "^1.54.1",
"@budibase/client": "^0.5.3",
"@budibase/bbui": "^1.55.2",
"@budibase/client": "^0.6.2",
"@budibase/colorpicker": "^1.0.1",
"@budibase/string-templates": "^0.5.3",
"@budibase/string-templates": "^0.6.2",
"@budibase/svelte-ag-grid": "^0.0.16",
"@sentry/browser": "5.19.1",
"@svelteschool/svelte-forms": "^0.7.0",

View File

@ -45,10 +45,9 @@
<div class="drawer-contents">
<div class="container" data-cy="binding-dropdown-modal">
<div class="list">
<Heading extraSmall>Objects</Heading>
<Spacer medium />
{#if context}
<Heading extraSmall>Tables</Heading>
<Heading extraSmall>Columns</Heading>
<Spacer small />
<ul>
{#each context as { readableBinding }}
<li on:click={() => addToText(readableBinding)}>
@ -72,8 +71,8 @@
<TextArea
thin
bind:value
placeholder="Add text, or click the objects on the left to add them to the
textbox." />
placeholder="Add text, or click the objects on the left to add them to
the textbox." />
{#if !valid}
<p class="syntax-error">
Current Handlebars syntax is invalid, please check the guide
@ -89,15 +88,20 @@
.container {
height: 100%;
display: grid;
grid-template-columns: auto 1fr;
grid-template-columns: 260px 1fr;
}
.list {
width: 150px;
border-right: 1.5px solid var(--grey-4);
padding: var(--spacing-s);
border-right: var(--border-light);
padding: var(--spacing-l);
overflow: auto;
}
.list::-webkit-scrollbar {
display: none;
}
.text {
padding: var(--spacing-s);
padding: var(--spacing-xl);
font-family: var(--font-sans);
}
.text :global(p) {
@ -115,10 +119,12 @@
font-family: var(--font-sans);
font-size: var(--font-size-xs);
color: var(--grey-7);
padding: var(--spacing-s) 0;
padding: var(--spacing-m) 0;
margin: auto 0px;
align-items: center;
cursor: pointer;
border: var(--border-light);
border-width: 1px 0 1px 0;
}
li:hover {

View File

@ -1,10 +1,10 @@
<script>
import {
Button,
TextButton,
Body,
DropdownMenu,
ModalContent,
Spacer,
} from "@budibase/bbui"
import { AddIcon, ArrowDownIcon } from "components/common/Icons/"
import actionTypes from "./actions"
@ -33,6 +33,9 @@
parameters: {},
[EVENT_TYPE_KEY]: actionType.name,
}
if (!actions) {
actions = []
}
actions.push(newAction)
selectedAction = newAction
actions = actions
@ -48,12 +51,11 @@
<div class="actions-list">
<div>
<div bind:this={addActionButton}>
<TextButton text small blue on:click={addActionDropdown.show}>
<div style="height: 20px; width: 20px;">
<AddIcon />
</div>
<Spacer small />
<Button wide secondary on:click={addActionDropdown.show}>
Add Action
</TextButton>
</Button>
<Spacer medium />
</div>
<DropdownMenu
bind:this={addActionDropdown}
@ -80,7 +82,7 @@
</div>
<i
class="ri-close-fill"
style="margin-left: var(--spacing-m);"
style="margin-left: auto;"
on:click={() => deleteAction(index)} />
</div>
{/each}
@ -107,7 +109,7 @@
.action-header > span {
margin-bottom: var(--spacing-m);
font-size: var(--font-size-s);
font-size: var(--font-size-xs);
}
.action-header > span:hover,
@ -117,13 +119,13 @@
}
.actions-list {
border: var(--border-light);
border-right: var(--border-light);
padding: var(--spacing-s);
}
.available-action {
padding: var(--spacing-s);
font-size: var(--font-size-m);
font-size: var(--font-size-xs);
cursor: pointer;
}
@ -135,7 +137,7 @@
height: 40vh;
display: grid;
grid-gap: var(--spacing-m);
grid-template-columns: 15% 1fr;
grid-template-columns: 260px 1fr;
grid-auto-flow: column;
min-height: 0;
padding-top: 0;
@ -143,15 +145,13 @@
}
.action-container {
border: var(--border-light);
border-width: 1px 0 0 0;
border-top: var(--border-light);
display: flex;
align-items: center;
}
.selected-action-container {
padding-bottom: var(--spacing-s);
padding-top: var(--spacing-s);
padding: var(--spacing-xl);
}
a {
@ -164,4 +164,9 @@
a:hover {
color: var(--blue);
}
i:hover {
color: var(--red);
cursor: pointer;
}
</style>

View File

@ -156,7 +156,7 @@
}
.available-action {
padding: var(--spacing-s);
padding: var(--spacing-m);
font-size: var(--font-size-m);
cursor: pointer;
}

View File

@ -842,10 +842,10 @@
lodash "^4.17.19"
to-fast-properties "^2.0.0"
"@budibase/bbui@^1.54.1":
version "1.54.1"
resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.54.1.tgz#ad0439c0be6a4dc818cd9dacda00f053b0daa9d5"
integrity sha512-ZY2OP/tF+ReMSyzZIGZV6wpQ4eIEzYGxZV3n+C+oNjzK5u3rwWPCDEVDlZgJSqJ61z+sEf2zuIyAh88lq9RTaA==
"@budibase/bbui@^1.55.2":
version "1.55.2"
resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.55.2.tgz#be636e8b86b7e516a08eb626bb50c4b1f9774bf8"
integrity sha512-CevH/olxDFIko9uwYUpUTevPmpShrLwJSR7+wn/JetZERwhTwbLhOXzpsyXaK226qQ8vWhm0U31HRSKI1HwDDg==
dependencies:
markdown-it "^12.0.2"
quill "^1.3.7"

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "0.5.3",
"version": "0.6.2",
"license": "MPL-2.0",
"main": "dist/budibase-client.js",
"module": "dist/budibase-client.js",
@ -9,14 +9,14 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/string-templates": "^0.5.3",
"@budibase/string-templates": "^0.6.2",
"deep-equal": "^2.0.1",
"regexparam": "^1.3.0",
"shortid": "^2.2.15",
"svelte-spa-router": "^3.0.5"
},
"devDependencies": {
"@budibase/standard-components": "^0.5.3",
"@budibase/standard-components": "^0.6.2",
"@rollup/plugin-commonjs": "^16.0.0",
"@rollup/plugin-node-resolve": "^10.0.0",
"fs-extra": "^8.1.0",

View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "0.5.3",
"version": "0.6.2",
"description": "Budibase Web Server",
"main": "src/electron.js",
"repository": {
@ -49,8 +49,8 @@
"author": "Budibase",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@budibase/client": "^0.5.3",
"@budibase/string-templates": "^0.5.3",
"@budibase/client": "^0.6.2",
"@budibase/string-templates": "^0.6.2",
"@elastic/elasticsearch": "^7.10.0",
"@koa/router": "^8.0.0",
"@sendgrid/mail": "^7.1.1",

View File

@ -1,3 +0,0 @@
*
!dist/*
!components.json

View File

@ -10,6 +10,11 @@
"start:dev": "sirv public --single --dev",
"dev:builder": "rollup -cw"
},
"files": [
"manifest.json",
"package.json",
"dist"
],
"devDependencies": {
"@rollup/plugin-alias": "^3.1.1",
"@rollup/plugin-commonjs": "^16.0.0",
@ -29,7 +34,7 @@
"keywords": [
"svelte"
],
"version": "0.5.3",
"version": "0.6.2",
"license": "MIT",
"gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491",
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "0.5.3",
"version": "0.6.2",
"description": "Handlebars wrapper for Budibase templating.",
"main": "dist/bundle.js",
"module": "dist/bundle.js",

View File

@ -1,7 +1,7 @@
{
"name": "@budibase/deployment",
"email": "hi@budibase.com",
"version": "0.5.3",
"version": "0.6.2",
"description": "Budibase Deployment Server",
"main": "src/index.js",
"repository": {