diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 37f6fdc16..ba34766a5 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -43,7 +43,7 @@ "dist" ], "dependencies": { - "markdown-it": "^12.0.2", + "markdown-it": "^12.0.4", "quill": "^1.3.7", "sirv-cli": "^0.4.6", "svelte-flatpickr": "^2.4.0", diff --git a/packages/bbui/public/global.css b/packages/bbui/public/global.css index e69de29bb..ba3147cd5 100644 --- a/packages/bbui/public/global.css +++ b/packages/bbui/public/global.css @@ -0,0 +1,193 @@ +.svench-content { + color: #666; + font-family: -apple-system, BlinkMacSystemFont, Segoe UI, "Roboto", + Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; +} + +h1.svench-content { + font-size: 2em; +} +h2.svench-content { + font-size: 1.66em; +} +h3.svench-content { + font-size: 1.33em; +} +h4.svench-content { + font-size: 1.33em; + font-weight: normal; +} +h5.svench-content { + font-size: 1em; + font-weight: bold; +} +h6.svench-content { + font-size: 1em; + font-weight: normal; + font-style: italic; +} + +:root { + --background: #ffffff; + --ink: #000000; + + --grey-1: #fafafa; + --grey-2: #f5f5f5; + --grey-3: #eeeeee; + --grey-4: #e0e0e0; + --grey-5: #bdbdbd; + --grey-6: #9e9e9e; + --grey-7: #757575; + --grey-8: #616161; + --grey-9: #424242; + + --blue-light: #f1f4fc; + --blue: #4285f4; + --blue-dark: #2f4c9b; + + --red-light: #ffe6e6; + --red: #e26d69; + --red-dark: #800400; + + --yellow-light: #fff7e6; + --yellow: #ffd26a; + --yellow-dark: #805900; + + --orange-light: #fff0e6; + --orange: #f0955a; + --orange-dark: #803300; + + --green-light: #e6ffeb; + --green: #84c991; + --green-dark: #008017; + + --purple-light: #e9e6ff; + --purple: #806fde; + --purple-dark: #130080; + + --rounded-small: 4px; + --rounded-medium: 8px; + --rounded-large: 16px; + + --font-normal: "Inter"; + --font-black: "Inter Black"; + --font-bold: "Inter Bold"; + --font-medium: "Inter Medium"; + --font-light: "Inter Light"; + --font-sans: Inter, -apple-system, BlinkMacSystemFont, Segoe UI, "Inter", + "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", + "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + --font-serif: "Georgia", Cambria, Times New Roman, Times, serif; + --font-mono: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", + monospace; + + font-size: 16px; + --font-size-xs: 0.75rem; + --font-size-s: 0.875rem; + --font-size-m: 1rem; + --font-size-l: 1.15rem; + --font-size-xl: 1.3rem; + + --heading-font-size-xs: 0.875rem; + --heading-font-size-s: 1.12rem; + --heading-font-size-m: 1.5rem; + --heading-font-size-l: 2.6rem; + --heading-font-size-xl: 3rem; + + --font-render: optimizeLegibility; + --font-smooth: antialiased; + + --spacing-xs: 0.25rem; + --spacing-s: 0.5rem; + --spacing-m: 0.75rem; + --spacing-l: 1rem; + --spacing-xl: 1.25rem; + + --layout-xs: 1.25rem; + --layout-s: 1.5rem; + --layout-m: 2rem; + --layout-l: 3rem; + --layout-xl: 4rem; + + --border-radius-xs: 0.125rem; + --border-radius-s: 0.35rem; + --border-radius-m: 0.5rem; + --border-radius-l: 1rem; + --border-radius-xl: 100rem; + + --border-black: 2px var(--ink) solid; + --border-dark: 2px var(--grey-7) solid; + --border-grey: 1px var(--grey-4) solid; + --border-grey-2: 2px var(--grey-4) solid; + --border-light: 1px var(--grey-3) solid; + --border-light-2: 2px var(--grey-3) solid; + --border-blue: 2px var(--blue) solid; + --border-transparent: 2px transparent solid; +} + +h1 { + font-size: 3rem; + font-family: var(--font-sans); + font-weight: 700; + text-rendering: var(--text-render); + -webkit-font-smoothing: var(--text-smooth); + color: var(--ink); +} + +h2 { + font-size: 2.25rem; + font-family: var(--font-sans); + font-weight: 600; + text-rendering: var(--text-render); + -webkit-font-smoothing: var(--text-smooth); + color: var(--ink); +} + +h3 { + font-size: 1.7rem; + font-family: var(--font-sans); + font-weight: 600; + text-rendering: var(--text-render); + -webkit-font-smoothing: var(--text-smooth); + color: var(--ink); +} + +h4 { + font-size: var(--font-size-xl); + font-family: var(--font-sans); + font-weight: 500; + text-rendering: var(--text-render); + -webkit-font-smoothing: var(--text-smooth); + color: var(--ink); +} + +h5 { + font-size: var(--font-size-l); + font-family: var(--font-sans); + font-weight: 500; + text-rendering: var(--text-render); + -webkit-font-smoothing: var(--text-smooth); + color: var(--ink); +} + +h6 { + font-size: var(--font-size-m); + font-family: var(--font-sans); + font-weight: 500; + text-rendering: var(--text-render); + -webkit-font-smoothing: var(--text-smooth); + color: var(--ink); +} + +p { + font-size: var(--font-size); + font-family: var(--font-sans); + font-weight: 400; + text-rendering: var(--text-render); + -webkit-font-smoothing: var(--text-smooth); + color: var(--ink); +} + +a { + text-decoration: none; +} diff --git a/packages/bbui/src/Form/RichText.svelte b/packages/bbui/src/Form/RichText.svelte index 955282338..ab4b9c3d9 100644 --- a/packages/bbui/src/Form/RichText.svelte +++ b/packages/bbui/src/Form/RichText.svelte @@ -1,6 +1,6 @@ + + \ No newline at end of file diff --git a/packages/builder/package.json b/packages/builder/package.json index 32389a985..361111ddc 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -3,12 +3,14 @@ "version": "0.8.9", "license": "AGPL-3.0", "private": true, + "type": "module", "scripts": { - "build": "routify --routify-dir routify -b && rollup -c", - "start": "routify --routify-dir routify -c rollup", + "build": "routify -b && rollup -c", + "start": "routify -c rollup", "test": "jest", "test:watch": "jest --watchAll", - "dev:builder": "routify --routify-dir routify -c rollup", + "dev:builder": "routify -c dev:vite", + "dev:vite": "vite", "rollup": "rollup -c -w", "cy:setup": "node ./cypress/setup.js", "cy:run": "cypress run", @@ -93,7 +95,9 @@ "@rollup/plugin-alias": "^3.0.1", "@rollup/plugin-commonjs": "^16.0.0", "@rollup/plugin-json": "^4.0.3", - "@sveltech/routify": "1.7.11", + "@rollup/plugin-replace": "^2.4.2", + "@roxi/routify": "2.15.1", + "@sveltejs/vite-plugin-svelte": "^1.0.0-next.5", "@testing-library/jest-dom": "^5.11.0", "@testing-library/svelte": "^3.0.0", "babel-jest": "^24.8.0", @@ -104,21 +108,22 @@ "jest": "^24.8.0", "ncp": "^2.0.0", "rimraf": "^3.0.2", - "rollup": "^2.11.2", - "rollup-plugin-alias": "^1.5.2", - "rollup-plugin-copy": "^3.0.0", - "rollup-plugin-css-only": "^2.1.0", + "rollup": "^2.44.0", + "rollup-plugin-alias": "^2.2.0", + "rollup-plugin-copy": "^3.4.0", + "rollup-plugin-css-only": "^3.1.0", "rollup-plugin-html": "^0.2.1", - "rollup-plugin-livereload": "^1.2.0", + "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-node-builtins": "^2.1.2", "rollup-plugin-node-globals": "^1.4.0", "rollup-plugin-node-resolve": "^5.2.0", - "rollup-plugin-svelte": "^6.1.1", + "rollup-plugin-svelte": "^7.1.0", "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-url": "^2.2.2", - "start-server-and-test": "^1.11.0", - "svelte": "^3.30.0", - "svelte-jester": "^1.0.6" + "rollup-plugin-url": "^3.0.1", + "start-server-and-test": "^1.12.1", + "svelte": "^3.36.0", + "svelte-jester": "^1.3.2", + "vite": "^2.1.5" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" } diff --git a/packages/builder/rollup.config.js b/packages/builder/rollup.config.js index a9897b166..2f55c45fb 100644 --- a/packages/builder/rollup.config.js +++ b/packages/builder/rollup.config.js @@ -77,7 +77,7 @@ export default { { src: "src/favicon.png", dest: outputpath }, { src: "assets", dest: outputpath }, { - src: "node_modules/@budibase/bbui/dist/bbui.css", + src: "../bbui/dist/bbui.css", dest: outputpath, }, { @@ -96,24 +96,13 @@ export default { "process.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN), }), - svelte({ - // enable run-time checks when not in production - dev: !production, - include: [ - "src/**/*.svelte", - "node_modules/**/*.svelte", - "../../../bbui/src/**/*.svelte", - ], - // we'll extract any component CSS out into - // a separate file — better for performance - css: css => { - css.write("bundle.css") - }, - }), + svelte(), - // export all CSS imported in the JS to it's own bundle + // Export all CSS imported in the JS to it's own bundle. + // This is exclusively external stylesheets and vendor stylesheets. + // Svelte CSS is handled by the svelte plugin css({ - output: `${outputpath}/external.css`, + output: `external.css`, }), resolve({ diff --git a/packages/builder/routify.config.cjs b/packages/builder/routify.config.cjs new file mode 100644 index 000000000..4c2b7bc89 --- /dev/null +++ b/packages/builder/routify.config.cjs @@ -0,0 +1,4 @@ +module.exports = { + routifyDir: ".routify", + dynamicImports: false, +} diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte index a5016db11..0f9d0695f 100644 --- a/packages/builder/src/App.svelte +++ b/packages/builder/src/App.svelte @@ -1,7 +1,7 @@ - + diff --git a/packages/builder/src/builderStore/api.js b/packages/builder/src/builderStore/api.js index 0202c5e8a..f359db60a 100644 --- a/packages/builder/src/builderStore/api.js +++ b/packages/builder/src/builderStore/api.js @@ -8,7 +8,8 @@ const apiCall = method => async ( ) => { headers["x-budibase-app-id"] = svelteGet(store).appId const json = headers["Content-Type"] === "application/json" - return await fetch(url, { + const fullUrl = `http://192.168.1.175:4001${url}` + return await fetch(fullUrl, { method: method, body: json ? JSON.stringify(body) : body, headers, diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte index 68a83828a..bb2057955 100644 --- a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte +++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte @@ -1,6 +1,6 @@ - - - - \ No newline at end of file diff --git a/packages/builder/src/main.js b/packages/builder/src/main.js index 501b4325f..507dbdea1 100644 --- a/packages/builder/src/main.js +++ b/packages/builder/src/main.js @@ -1,20 +1,12 @@ +import "@budibase/bbui/dist/bbui.css" +import "remixicon/fonts/remixicon.css" import "./global.css" import "./fonts.css" import "./budibase.css" import "./fonts.css" -import "/assets/Inter-Regular" -import "/assets/Inter-Medium" -import "/assets/Inter-SemiBold" -import "/assets/Inter-Bold" -import "/assets/Inter-ExtraBold" -import "/assets/Inter-Black" -import "/_builder/assets/budibase-logo.png" -import "/_builder/assets/budibase-logo-only.png" -import "remixicon/fonts/remixicon.css" import App from "./App.svelte" -/* eslint-disable */ -const app = new App({ +export default new App({ target: document.getElementById("app"), }) diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte index 2411fad0c..3d8effcf3 100644 --- a/packages/builder/src/pages/[application]/_reset.svelte +++ b/packages/builder/src/pages/[application]/_reset.svelte @@ -5,7 +5,7 @@ import ThemeEditorDropdown from "components/settings/ThemeEditorDropdown.svelte" import FeedbackNavLink from "components/feedback/FeedbackNavLink.svelte" import { get } from "builderStore/api" - import { isActive, goto, layout } from "@sveltech/routify" + import { isActive, goto, layout } from "@roxi/routify" // Get Package and set store export let application @@ -37,9 +37,7 @@ if (!activeTopNav) return store.update(state => { if (!state.previousTopNavPath) state.previousTopNavPath = {} - state.previousTopNavPath[ - activeTopNav.path - ] = window.location.pathname.replace("/_builder", "") + state.previousTopNavPath[activeTopNav.path] = window.location.pathname $goto(state.previousTopNavPath[path] || path) return state }) @@ -51,7 +49,7 @@
diff --git a/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte b/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte index ce6917df6..3be71a1bb 100644 --- a/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte +++ b/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte @@ -1,6 +1,6 @@ - - diff --git a/packages/builder/src/pages/[application]/data/datasource/index.svelte b/packages/builder/src/pages/[application]/data/datasource/index.svelte index 00b08fb7b..3ae831f22 100644 --- a/packages/builder/src/pages/[application]/data/datasource/index.svelte +++ b/packages/builder/src/pages/[application]/data/datasource/index.svelte @@ -1,12 +1,12 @@ diff --git a/packages/builder/src/pages/[application]/data/index.svelte b/packages/builder/src/pages/[application]/data/index.svelte index b893d8680..64f95b491 100644 --- a/packages/builder/src/pages/[application]/data/index.svelte +++ b/packages/builder/src/pages/[application]/data/index.svelte @@ -1,6 +1,6 @@ diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte b/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte index 9892da00d..9446b37b3 100644 --- a/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte +++ b/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte @@ -1,5 +1,5 @@ diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte b/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte index 0ab07a246..8e195ddb1 100644 --- a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte +++ b/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte @@ -1,5 +1,5 @@ diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/index.svelte b/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/index.svelte index aa3b39f01..7d081b697 100644 --- a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/index.svelte +++ b/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/index.svelte @@ -1,5 +1,5 @@ diff --git a/packages/builder/src/pages/[application]/data/table/_layout.svelte b/packages/builder/src/pages/[application]/data/table/_layout.svelte deleted file mode 100644 index 2eea0be4c..000000000 --- a/packages/builder/src/pages/[application]/data/table/_layout.svelte +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/builder/src/pages/[application]/data/table/index.svelte b/packages/builder/src/pages/[application]/data/table/index.svelte index 134d9e510..77ad2ed08 100644 --- a/packages/builder/src/pages/[application]/data/table/index.svelte +++ b/packages/builder/src/pages/[application]/data/table/index.svelte @@ -1,11 +1,11 @@ diff --git a/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte b/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte index e890c7e27..853e34149 100644 --- a/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte +++ b/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte @@ -1,5 +1,5 @@ diff --git a/packages/builder/src/pages/[application]/index.svelte b/packages/builder/src/pages/[application]/index.svelte index 553908cb2..d3321037d 100644 --- a/packages/builder/src/pages/[application]/index.svelte +++ b/packages/builder/src/pages/[application]/index.svelte @@ -1,6 +1,6 @@ diff --git a/packages/builder/src/pages/_layout.svelte b/packages/builder/src/pages/_layout.svelte index ac45ff837..00bce1785 100644 --- a/packages/builder/src/pages/_layout.svelte +++ b/packages/builder/src/pages/_layout.svelte @@ -15,7 +15,7 @@