Browse Source

Merge pull request #301 from mjashanks/master

Few Bugfixes
master
Michael Shanks 6 years ago
committed by GitHub
parent
commit
a0aa7400c1
  1. 2
      packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
  2. 1
      packages/builder/src/components/userInterface/ModelSelect.svelte
  3. 1
      packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
  4. 1
      packages/server/src/api/index.js
  5. 6
      packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
  6. 6
      packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json
  7. 3
      packages/server/src/utilities/builder/buildPage.js
  8. 2
      packages/standard-components/src/Link.svelte

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

@ -28,7 +28,7 @@
{/each}
</select>
{:else}
<Input on:change={onChange} value={parameter.value} />
<Input onChange={onChange} value={parameter.value} />
<button on:click={() => (isOpen = !isOpen)}>
<div class="icon" style={`transform: rotate(${isOpen ? 0 : 90}deg);`}>
<ArrowDownIcon size={36} />

1
packages/builder/src/components/userInterface/ModelSelect.svelte

@ -7,6 +7,7 @@
<div class="uk-margin block-field">
<div class="uk-form-controls">
<select class="budibase__input" on:change {value}>
<option value=""></option>
{#each $backendUiStore.models as model}
<option value={model._id}>{model.name}</option>
{/each}

1
packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte

@ -7,6 +7,7 @@
<div class="uk-margin block-field">
<div class="uk-form-controls">
<select class="budibase__input" bind:value>
<option value=""></option>
{#each $backendUiStore.models as model}
<option value={model}>{model.name}</option>
{/each}

1
packages/server/src/api/index.js

@ -38,6 +38,7 @@ router
ctx.config = {
latestPackagesFolder: budibaseAppsDir(),
jwtSecret: env.JWT_SECRET,
useAppRootPath: true,
}
ctx.isDev = env.NODE_ENV !== "production" && env.NODE_ENV !== "jest"
await next()

6
packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json

@ -9,8 +9,10 @@
"_id": 0,
"type": "div",
"_styles": {
"layout": {},
"position": {}
"active": {},
"hover": {},
"normal": {},
"selected": {}
},
"_code": ""
},

6
packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json

@ -9,8 +9,10 @@
"_id": 1,
"type": "div",
"_styles": {
"layout": {},
"position": {}
"active": {},
"hover": {},
"normal": {},
"selected": {}
},
"_code": ""
},

3
packages/server/src/utilities/builder/buildPage.js

@ -28,8 +28,7 @@ module.exports = async (config, appId, pageName, pkg) => {
await savePageJson(appPath, pageName, pkg)
}
const rootPath = (config, appname) =>
config.useAppRootPath ? `/${appname}` : ""
const rootPath = (config, appId) => (config.useAppRootPath ? `/${appId}` : "")
const copyClientLib = async (appPath, pageName) => {
const sourcepath = require.resolve("@budibase/client")

2
packages/standard-components/src/Link.svelte

@ -13,7 +13,7 @@
$: target = openInNewTab ? "_blank" : "_self"
</script>
<a href={url} bind:this={anchorElement} {target}>{text}</a>
<a href={_bb.relativeUrl(url)} bind:this={anchorElement} {target}>{text}</a>
<style>
.textDecoration {

Loading…
Cancel
Save