diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 70120b92fc..6d39d2844d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -92,6 +92,16 @@ then `cd ` into your local copy. ### 3. Install and Build +To develop the Budibase platform you'll need [Docker](https://www.docker.com/) and [Docker Compose](https://docs.docker.com/compose/) installed. + +#### Quick method + +`yarn setup` will check that all necessary components are installed and setup the repo for usage. + +#### Manual method + +The following commands can be executed to manually get Budibase up and running (assuming Docker/Docker Compose has been installed). + `yarn` to install project dependencies `yarn bootstrap` will install all budibase modules and symlink them together using lerna. @@ -112,10 +122,17 @@ To run the budibase server and builder in dev mode (i.e. with live reloading): 1. Open a new console 2. `yarn dev` (from root) -3. Access the builder on http://localhost:4001/_builder/ +3. Access the builder on http://localhost:10000/builder This will enable watch mode for both the builder app, server, client library and any component libraries. +### 5. Cleanup + +If you wish to delete all the apps created in development and reset the environment then run the following: + +1. `yarn nuke:docker` will wipe all the Budibase services +2. `yarn dev` will restart all the services + ## Data Storage When you are running locally, budibase stores data on disk using [PouchDB](https://pouchdb.com/), as well as some JSON on local files. After setting up budibase, you can find all of this data in the `~/.budibase` directory. diff --git a/hosting/envoy.dev.yaml.hbs b/hosting/envoy.dev.yaml.hbs index 3a7e73c89c..054ceb9d3f 100644 --- a/hosting/envoy.dev.yaml.hbs +++ b/hosting/envoy.dev.yaml.hbs @@ -16,6 +16,11 @@ static_resources: - name: local_services domains: ["*"] routes: + # special case to redirect specifically the route path + # to the builder, if this were a prefix then it would break minio + - match: { path: "/" } + redirect: { path_redirect: "/builder/" } + - match: { prefix: "/db/" } route: cluster: couchdb-service @@ -33,7 +38,14 @@ static_resources: route: cluster: server-dev - - match: { prefix: "/" } + # the below three cases are needed to make sure + # all traffic prefixed for the builder is passed through + # correctly. + - match: { path: "/" } + route: + cluster: builder-dev + + - match: { prefix: "/builder/" } route: cluster: builder-dev @@ -41,7 +53,7 @@ static_resources: route: cluster: builder-dev prefix_rewrite: "/builder/" - + # minio is on the default route because this works # best, minio + AWS SDK doesn't handle path proxy - match: { prefix: "/" } diff --git a/hosting/envoy.yaml b/hosting/envoy.yaml index d2202ff870..95db418352 100644 --- a/hosting/envoy.yaml +++ b/hosting/envoy.yaml @@ -21,7 +21,6 @@ static_resources: cluster: app-service prefix_rewrite: "/" - # special case for presenting our static self hosting page - match: { path: "/" } route: cluster: app-service diff --git a/hosting/scripts/setup.js b/hosting/scripts/setup.js new file mode 100755 index 0000000000..c62ac14f29 --- /dev/null +++ b/hosting/scripts/setup.js @@ -0,0 +1,61 @@ +#!/usr/bin/env node + +const os = require("os") +const exec = require("child_process").exec +const fs = require("fs") +const platform = os.platform() + +const windows = platform === "win32" +const mac = platform === "darwin" +const linux = platform === "linux" + +function execute(command) { + return new Promise(resolve => { + exec(command, (err, stdout) => resolve(linux ? !!stdout : true)) + }) +} + +async function commandExistsUnix(command) { + const unixCmd = `command -v ${command} 2>/dev/null && { echo >&1 ${command}; exit 0; }` + return execute(command) +} + +async function commandExistsWindows(command) { + if (/[\x00-\x1f<>:"|?*]/.test(command)) { + return false + } + return execute(`where ${command}`) +} + +function commandExists(command) { + return windows ? commandExistsWindows(command) : commandExistsUnix(command) +} + +async function init() { + const docker = commandExists("docker") + const dockerCompose = commandExists("docker-compose") + if (docker && dockerCompose) { + console.log("Docker installed - continuing.") + return + } + if (mac) { + console.log( + "Please install docker by visiting: https://docs.docker.com/docker-for-mac/install/" + ) + } else if (windows) { + console.log( + "Please install docker by visiting: https://docs.docker.com/docker-for-windows/install/" + ) + } else if (linux) { + console.log("Beginning automated linux installation.") + await execute(`./hosting/scripts/linux/get-docker.sh`) + await execute(`./hosting/scripts/linux/get-docker-compose.sh`) + } else { + console.error( + "Platform unknown - please look online for information about installing docker for our OS." + ) + } + console.log("Once installation complete please re-run the setup script.") + process.exit(-1) +} +init() diff --git a/package.json b/package.json index 171f9510f3..4d26be9941 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,10 @@ "prettier-plugin-svelte": "^2.2.0", "rimraf": "^3.0.2", "rollup-plugin-replace": "^2.2.0", - "svelte": "^3.37.0" + "svelte": "^3.38.2" }, "scripts": { + "setup": "./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", "bootstrap": "lerna link && lerna bootstrap", "build": "lerna run build", "initialise": "lerna run initialise", diff --git a/packages/auth/package.json b/packages/auth/package.json index dfbb63c431..56b904c966 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -6,15 +6,20 @@ "author": "Budibase", "license": "AGPL-3.0", "dependencies": { + "aws-sdk": "^2.901.0", "bcryptjs": "^2.4.3", "ioredis": "^4.27.1", "jsonwebtoken": "^8.5.1", "koa-passport": "^4.1.4", + "node-fetch": "^2.6.1", "passport-google-auth": "^1.0.2", "passport-google-oauth": "^2.0.0", "passport-jwt": "^4.0.0", "passport-local": "^1.0.0", - "uuid": "^8.3.2" + "sanitize-s3-objectkey": "^0.0.1", + "tar-fs": "^2.1.1", + "uuid": "^8.3.2", + "zlib": "^1.0.5" }, "devDependencies": { "ioredis-mock": "^5.5.5" diff --git a/packages/auth/src/environment.js b/packages/auth/src/environment.js index 5b0b141019..db24aaafcc 100644 --- a/packages/auth/src/environment.js +++ b/packages/auth/src/environment.js @@ -12,5 +12,8 @@ module.exports = { SALT_ROUNDS: process.env.SALT_ROUNDS, REDIS_URL: process.env.REDIS_URL, REDIS_PASSWORD: process.env.REDIS_PASSWORD, + MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, + MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, + MINIO_URL: process.env.MINIO_URL, isTest, } diff --git a/packages/auth/src/index.js b/packages/auth/src/index.js index e330684197..d2ba86a524 100644 --- a/packages/auth/src/index.js +++ b/packages/auth/src/index.js @@ -32,6 +32,10 @@ module.exports = { Client: require("./redis"), utils: require("./redis/utils"), }, + objectStore: { + ...require("./objectStore"), + ...require("./objectStore/utils"), + }, utils: { ...require("./utils"), ...require("./hashing"), diff --git a/packages/auth/src/objectStore/index.js b/packages/auth/src/objectStore/index.js new file mode 100644 index 0000000000..a78253f90a --- /dev/null +++ b/packages/auth/src/objectStore/index.js @@ -0,0 +1,240 @@ +const sanitize = require("sanitize-s3-objectkey") +const AWS = require("aws-sdk") +const stream = require("stream") +const fetch = require("node-fetch") +const tar = require("tar-fs") +const zlib = require("zlib") +const { promisify } = require("util") +const { join } = require("path") +const fs = require("fs") +const env = require("../environment") +const { budibaseTempDir, ObjectStoreBuckets } = require("./utils") +const { v4 } = require("uuid") + +const streamPipeline = promisify(stream.pipeline) +// use this as a temporary store of buckets that are being created +const STATE = { + bucketCreationPromises: {}, +} + +const CONTENT_TYPE_MAP = { + html: "text/html", + css: "text/css", + js: "application/javascript", +} +const STRING_CONTENT_TYPES = [ + CONTENT_TYPE_MAP.html, + CONTENT_TYPE_MAP.css, + CONTENT_TYPE_MAP.js, +] + +function publicPolicy(bucketName) { + return { + Version: "2012-10-17", + Statement: [ + { + Effect: "Allow", + Principal: { + AWS: ["*"], + }, + Action: "s3:GetObject", + Resource: [`arn:aws:s3:::${bucketName}/*`], + }, + ], + } +} + +const PUBLIC_BUCKETS = [ObjectStoreBuckets.APPS, ObjectStoreBuckets.GLOBAL] + +/** + * Gets a connection to the object store using the S3 SDK. + * @param {string} bucket the name of the bucket which blobs will be uploaded/retrieved from. + * @return {Object} an S3 object store object, check S3 Nodejs SDK for usage. + * @constructor + */ +exports.ObjectStore = bucket => { + AWS.config.update({ + accessKeyId: env.MINIO_ACCESS_KEY, + secretAccessKey: env.MINIO_SECRET_KEY, + }) + const config = { + s3ForcePathStyle: true, + signatureVersion: "v4", + params: { + Bucket: bucket, + }, + } + if (env.MINIO_URL) { + config.endpoint = env.MINIO_URL + } + return new AWS.S3(config) +} + +/** + * Given an object store and a bucket name this will make sure the bucket exists, + * if it does not exist then it will create it. + */ +exports.makeSureBucketExists = async (client, bucketName) => { + try { + await client + .headBucket({ + Bucket: bucketName, + }) + .promise() + } catch (err) { + const promises = STATE.bucketCreationPromises + if (promises[bucketName]) { + await promises[bucketName] + } else if (err.statusCode === 404) { + // bucket doesn't exist create it + promises[bucketName] = client + .createBucket({ + Bucket: bucketName, + }) + .promise() + await promises[bucketName] + delete promises[bucketName] + // public buckets are quite hidden in the system, make sure + // no bucket is set accidentally + if (PUBLIC_BUCKETS.includes(bucketName)) { + await client + .putBucketPolicy({ + Bucket: bucketName, + Policy: JSON.stringify(publicPolicy(bucketName)), + }) + .promise() + } + } else { + throw err + } + } +} + +/** + * Uploads the contents of a file given the required parameters, useful when + * temp files in use (for example file uploaded as an attachment). + */ +exports.upload = async ({ bucket, filename, path, type, metadata }) => { + const extension = [...filename.split(".")].pop() + const fileBytes = fs.readFileSync(path) + + const objectStore = exports.ObjectStore(bucket) + await exports.makeSureBucketExists(objectStore, bucket) + + const config = { + // windows file paths need to be converted to forward slashes for s3 + Key: sanitize(filename).replace(/\\/g, "/"), + Body: fileBytes, + ContentType: type || CONTENT_TYPE_MAP[extension.toLowerCase()], + } + if (metadata) { + config.Metadata = metadata + } + return objectStore.upload(config).promise() +} + +/** + * Similar to the upload function but can be used to send a file stream + * through to the object store. + */ +exports.streamUpload = async (bucket, filename, stream) => { + const objectStore = exports.ObjectStore(bucket) + await exports.makeSureBucketExists(objectStore, bucket) + + const params = { + Bucket: bucket, + Key: sanitize(filename).replace(/\\/g, "/"), + Body: stream, + } + return objectStore.upload(params).promise() +} + +/** + * retrieves the contents of a file from the object store, if it is a known content type it + * will be converted, otherwise it will be returned as a buffer stream. + */ +exports.retrieve = async (bucket, filepath) => { + const objectStore = exports.ObjectStore(bucket) + const params = { + Bucket: bucket, + Key: sanitize(filepath).replace(/\\/g, "/"), + } + const response = await objectStore.getObject(params).promise() + // currently these are all strings + if (STRING_CONTENT_TYPES.includes(response.ContentType)) { + return response.Body.toString("utf8") + } else { + return response.Body + } +} + +/** + * Same as retrieval function but puts to a temporary file. + */ +exports.retrieveToTmp = async (bucket, filepath) => { + const data = await exports.retrieve(bucket, filepath) + const outputPath = join(budibaseTempDir(), v4()) + fs.writeFileSync(outputPath, data) + return outputPath +} + +exports.deleteFolder = async (bucket, folder) => { + const client = exports.ObjectStore(bucket) + const listParams = { + Bucket: bucket, + Prefix: folder, + } + + let response = await client.listObjects(listParams).promise() + if (response.Contents.length === 0) { + return + } + const deleteParams = { + Bucket: bucket, + Delete: { + Objects: [], + }, + } + + response.Contents.forEach(content => { + deleteParams.Delete.Objects.push({ Key: content.Key }) + }) + + response = await client.deleteObjects(deleteParams).promise() + // can only empty 1000 items at once + if (response.Deleted.length === 1000) { + return exports.deleteFolder(bucket, folder) + } +} + +exports.uploadDirectory = async (bucket, localPath, bucketPath) => { + let uploads = [] + const files = fs.readdirSync(localPath, { withFileTypes: true }) + for (let file of files) { + const path = join(bucketPath, file.name) + const local = join(localPath, file.name) + if (file.isDirectory()) { + uploads.push(exports.uploadDirectory(bucket, local, path)) + } else { + uploads.push( + exports.streamUpload(bucket, path, fs.createReadStream(local)) + ) + } + } + await Promise.all(uploads) +} + +exports.downloadTarball = async (url, bucket, path) => { + const response = await fetch(url) + if (!response.ok) { + throw new Error(`unexpected response ${response.statusText}`) + } + + const tmpPath = join(budibaseTempDir(), path) + await streamPipeline(response.body, zlib.Unzip(), tar.extract(tmpPath)) + if (!env.isTest()) { + await exports.uploadDirectory(bucket, tmpPath, path) + } + // return the temporary path incase there is a use for it + return tmpPath +} diff --git a/packages/auth/src/objectStore/utils.js b/packages/auth/src/objectStore/utils.js new file mode 100644 index 0000000000..41fa18d99e --- /dev/null +++ b/packages/auth/src/objectStore/utils.js @@ -0,0 +1,13 @@ +const { join } = require("path") +const { tmpdir } = require("os") + +exports.ObjectStoreBuckets = { + BACKUPS: "backups", + APPS: "prod-budi-app-assets", + TEMPLATES: "templates", + GLOBAL: "global", +} + +exports.budibaseTempDir = function () { + return join(tmpdir(), ".budibase") +} diff --git a/packages/auth/yarn.lock b/packages/auth/yarn.lock index a3c95bf42c..80625a9345 100644 --- a/packages/auth/yarn.lock +++ b/packages/auth/yarn.lock @@ -36,6 +36,21 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= +aws-sdk@^2.901.0: + version "2.901.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.901.0.tgz#96b387778cf2b3537383fba04994e815f1fab4d4" + integrity sha512-prmUjg4mjguamnwaXMdm/g1xtnT9515cjSaV/MhBsMUVzhe66EX7dLwiA7Jo8qUlwFMyCVIcp/2T+6KwJ9sQgQ== + dependencies: + buffer "4.9.2" + events "1.1.1" + ieee754 "1.1.13" + jmespath "0.15.0" + querystring "0.2.0" + sax "1.2.1" + url "0.10.3" + uuid "3.3.2" + xml2js "0.4.19" + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -51,6 +66,11 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +base64-js@^1.0.2, base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + base64url@3.x.x: version "3.0.1" resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d" @@ -68,6 +88,15 @@ bcryptjs@^2.4.3: resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= +bl@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -81,11 +110,33 @@ buffer-equal-constant-time@1.0.1: resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk= +buffer@4.9.2: + version "4.9.2" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" + integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + isarray "^1.0.0" + +buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + cluster-key-slot@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d" @@ -147,6 +198,18 @@ ecdsa-sig-formatter@1.0.11: dependencies: safe-buffer "^5.0.1" +end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +events@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" + integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= + extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" @@ -200,6 +263,11 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -265,6 +333,21 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" +ieee754@1.1.13: + version "1.1.13" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" + integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== + +ieee754@^1.1.13, ieee754@^1.1.4: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +inherits@^2.0.3, inherits@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + ioredis-mock@^5.5.5: version "5.5.5" resolved "https://registry.yarnpkg.com/ioredis-mock/-/ioredis-mock-5.5.5.tgz#dec9fedd238c6ab9f56c026fc366533144f8a256" @@ -297,11 +380,21 @@ is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +isarray@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= +jmespath@0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" + integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -451,6 +544,11 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" +mkdirp-classic@^0.5.2: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -461,6 +559,11 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +node-fetch@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + node-forge@^0.7.1: version "0.7.6" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac" @@ -476,6 +579,13 @@ oauth@0.9.x: resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1" integrity sha1-vR/vr2hslrdUda7VGWQS/2DPucE= +once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -579,6 +689,19 @@ psl@^1.1.28: resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" @@ -589,6 +712,20 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== +querystring@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + +readable-stream@^3.1.1, readable-stream@^3.4.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readline-sync@^1.4.9: version "1.4.10" resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b" @@ -637,7 +774,7 @@ request@^2.72.0, request@^2.74.0: tunnel-agent "^0.6.0" uuid "^3.3.2" -safe-buffer@^5.0.1, safe-buffer@^5.1.2: +safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -647,6 +784,21 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sanitize-s3-objectkey@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e" + integrity sha512-ZTk7aqLxy4sD40GWcYWoLfbe05XLmkKvh6vGKe13ADlei24xlezcvjgKy1qRArlaIbIMYaqK7PCalvZtulZlaQ== + +sax@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" + integrity sha1-e45lYZCyKOgaZq6nSEgNgozS03o= + +sax@>=0.6.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -682,6 +834,34 @@ string-template@~1.0.0: resolved "https://registry.yarnpkg.com/string-template/-/string-template-1.0.0.tgz#9e9f2233dc00f218718ec379a28a5673ecca8b96" integrity sha1-np8iM9wA8hhxjsN5oopWc+zKi5Y= +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +tar-fs@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -721,11 +901,29 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +url@0.10.3: + version "0.10.3" + resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" + integrity sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ= + dependencies: + punycode "1.3.2" + querystring "0.2.0" + +util-deprecate@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + utils-merge@1.x.x: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= +uuid@3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" + integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== + uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" @@ -744,3 +942,26 @@ verror@1.10.0: assert-plus "^1.0.0" core-util-is "1.0.2" extsprintf "^1.2.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +xml2js@0.4.19: + version "0.4.19" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" + integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== + dependencies: + sax ">=0.6.0" + xmlbuilder "~9.0.1" + +xmlbuilder@~9.0.1: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + +zlib@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" + integrity sha1-bnyXL8NxxkWmr7A6sUdp3vEU/MA= diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 573e115377..056f4229cb 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -27,7 +27,7 @@ "rollup-plugin-postcss": "^4.0.0", "rollup-plugin-svelte": "^7.1.0", "rollup-plugin-terser": "^7.0.2", - "svelte": "^3.37.0" + "svelte": "^3.38.2" }, "keywords": [ "svelte" diff --git a/packages/bbui/src/ActionMenu/ActionMenu.svelte b/packages/bbui/src/ActionMenu/ActionMenu.svelte index 6947e69a7e..8f17f260a8 100644 --- a/packages/bbui/src/ActionMenu/ActionMenu.svelte +++ b/packages/bbui/src/ActionMenu/ActionMenu.svelte @@ -4,6 +4,7 @@ import Menu from "../Menu/Menu.svelte" export let disabled = false + export let align = "left" let anchor let dropdown @@ -31,7 +32,7 @@
- + diff --git a/packages/bbui/src/Form/Core/Dropzone.svelte b/packages/bbui/src/Form/Core/Dropzone.svelte index 9dd2cbbc73..5b5c72b809 100644 --- a/packages/bbui/src/Form/Core/Dropzone.svelte +++ b/packages/bbui/src/Form/Core/Dropzone.svelte @@ -15,6 +15,8 @@ export let fileSizeLimit = BYTES_IN_MB * 20 export let processFiles = null export let handleFileTooLarge = null + export let gallery = true + export let error = null const dispatch = createEventDispatcher() const imageExtensions = [ @@ -52,6 +54,8 @@ const newValue = [...value, ...processedFiles] dispatch("change", newValue) selectedImageIdx = newValue.length - 1 + } else { + dispatch("change", fileList) } } @@ -94,47 +98,68 @@
{#if selectedImage} -
-
-
{selectedImage.name}
-
- {#if selectedImage.size <= BYTES_IN_MB} - {`${selectedImage.size / BYTES_IN_KB} KB`} - {:else}{`${selectedImage.size / BYTES_IN_MB} MB`}{/if} + {#if gallery} +
+
+
{selectedImage.name}
+
+ {#if selectedImage.size <= BYTES_IN_MB} + {`${selectedImage.size / BYTES_IN_KB} KB`} + {:else}{`${selectedImage.size / BYTES_IN_MB} MB`}{/if} +
+ {#if !disabled} +
+ +
+ {/if}
- {#if !disabled} -
- + {#if isImage} + preview + {:else} +
+
{selectedImage.extension}
+
Preview not supported
{/if} -
- {#if isImage} - preview - {:else} -
-
{selectedImage.extension}
-
Preview not supported
+
0} + on:click={navigateLeft} + > +
- {/if} -
0} - on:click={navigateLeft} - > - +
+ +
+
File {selectedImageIdx + 1} of {fileCount}
-
- -
-
File {selectedImageIdx + 1} of {fileCount}
-
+ {:else if value?.length} + {#each value as file} +
+
+
{file.name}
+
+ {#if file.size <= BYTES_IN_MB} + {`${file.size / BYTES_IN_KB} KB`} + {:else}{`${file.size / BYTES_IN_MB} MB`}{/if} +
+ {#if !disabled} +
+ +
+ {/if} +
+
+ {/each} + {/if} {/if}
option export let open = false export let readonly = false + export let quiet = false const dispatch = createEventDispatcher() const onClick = e => { @@ -33,6 +34,7 @@ diff --git a/packages/builder/src/components/start/Steps/Info.svelte b/packages/builder/src/components/start/Steps/Info.svelte deleted file mode 100644 index 42cd5e1e2f..0000000000 --- a/packages/builder/src/components/start/Steps/Info.svelte +++ /dev/null @@ -1,121 +0,0 @@ - - -
- {#if template?.fromFile} - Import your Web App - {:else} - Create your Web App - {/if} - {#if template?.fromFile} -
- -
- - -
-
- {:else if template} -
- - {template.name} -
- {/if} - ($touched.applicationName = true)} - bind:value={$values.applicationName} - label="Web App Name" - placeholder="Enter name of your web application" - error={$touched.applicationName && $errors.applicationName} - /> -
- - diff --git a/packages/builder/src/components/start/Steps/User.svelte b/packages/builder/src/components/start/Steps/User.svelte deleted file mode 100644 index b51e5faaff..0000000000 --- a/packages/builder/src/components/start/Steps/User.svelte +++ /dev/null @@ -1,29 +0,0 @@ - - -
- What's your role for this app? - - - - -
-
- - - diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte index 77f8b655f5..b15001b788 100644 --- a/packages/builder/src/pages/builder/_layout.svelte +++ b/packages/builder/src/pages/builder/_layout.svelte @@ -1,116 +1,33 @@ -{#if $auth} - {#if $auth.user} -
-
- -
-
- - Apps - - Hosting - - - Documentation - - - Community - - - Raise an issue - - -
-
- - -
-
-
-
- -
-
- {:else} - - {/if} +{#if loaded} + {/if} - - diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte new file mode 100644 index 0000000000..d3027f881e --- /dev/null +++ b/packages/builder/src/pages/builder/admin/index.svelte @@ -0,0 +1,78 @@ + + +
+
+ + + +
+ + Create an admin user + The admin user has access to everything in Budibase. + +
+ + + + + + + +
+
+ + diff --git a/packages/builder/src/pages/builder/[application]/_reset.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte similarity index 96% rename from packages/builder/src/pages/builder/[application]/_reset.svelte rename to packages/builder/src/pages/builder/app/[application]/_layout.svelte index 8a9e047f23..98846b3db7 100644 --- a/packages/builder/src/pages/builder/[application]/_reset.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -6,9 +6,9 @@ import ThemeEditorDropdown from "components/settings/ThemeEditorDropdown.svelte" import FeedbackNavLink from "components/feedback/FeedbackNavLink.svelte" import { get } from "builderStore/api" - import { isActive, goto, layout, params } from "@roxi/routify" + import { isActive, goto, layout } from "@roxi/routify" import Logo from "/assets/bb-logo.svg" - import { capitalise } from "../../../helpers" + import { capitalise } from "helpers" // Get Package and set store export let application @@ -60,7 +60,7 @@ budibase icon $goto(`/builder/`)} + on:click={() => $goto(`../../portal/`)} /> diff --git a/packages/builder/src/pages/builder/[application]/automate/[automation]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automate/[automation]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/automate/[automation]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/automate/[automation]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/automate/[automation]/index.svelte b/packages/builder/src/pages/builder/app/[application]/automate/[automation]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/automate/[automation]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/automate/[automation]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/automate/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/automate/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/automate/index.svelte b/packages/builder/src/pages/builder/app/[application]/automate/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/automate/index.svelte rename to packages/builder/src/pages/builder/app/[application]/automate/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte similarity index 98% rename from packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte index c0f8b99778..7651eed33d 100644 --- a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte @@ -5,7 +5,7 @@ import { notifications } from "@budibase/bbui" import IntegrationConfigForm from "components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte" import ICONS from "components/backend/DatasourceNavigator/icons" - import { capitalise } from "../../../../../../helpers" + import { capitalise } from "helpers" let unsaved = false diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/datasource/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/datasource/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/[selectedView]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/view/[selectedView]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/[selectedView]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/view/[selectedView]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/view/[selectedView]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/deploy/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/deploy/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/deploy/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/deploy/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/deploy/index.svelte b/packages/builder/src/pages/builder/app/[application]/deploy/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/deploy/index.svelte rename to packages/builder/src/pages/builder/app/[application]/deploy/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/design/[assetType]/[asset]/_fallback.svelte b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/[asset]/_fallback.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/design/[assetType]/[asset]/_fallback.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[assetType]/[asset]/_fallback.svelte diff --git a/packages/builder/src/pages/builder/[application]/design/[assetType]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/design/[assetType]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/design/[assetType]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/design/[assetType]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/design/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/design/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/design/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/design/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/design/index.svelte rename to packages/builder/src/pages/builder/app/[application]/design/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/index.svelte b/packages/builder/src/pages/builder/app/[application]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/settings/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/settings/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/settings/index.svelte rename to packages/builder/src/pages/builder/app/[application]/settings/index.svelte diff --git a/packages/builder/src/pages/builder/app/index.svelte b/packages/builder/src/pages/builder/app/index.svelte new file mode 100644 index 0000000000..110b5e83d9 --- /dev/null +++ b/packages/builder/src/pages/builder/app/index.svelte @@ -0,0 +1,4 @@ + diff --git a/packages/builder/src/pages/builder/auth/index.svelte b/packages/builder/src/pages/builder/auth/index.svelte new file mode 100644 index 0000000000..bf30c6b310 --- /dev/null +++ b/packages/builder/src/pages/builder/auth/index.svelte @@ -0,0 +1,4 @@ + diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte new file mode 100644 index 0000000000..b3efe9c121 --- /dev/null +++ b/packages/builder/src/pages/builder/auth/login.svelte @@ -0,0 +1,5 @@ + + + diff --git a/packages/builder/src/pages/builder/index.svelte b/packages/builder/src/pages/builder/index.svelte index 53e4d8a950..dc44c9e636 100644 --- a/packages/builder/src/pages/builder/index.svelte +++ b/packages/builder/src/pages/builder/index.svelte @@ -1,123 +1,4 @@ - -
-
- Welcome to the Budibase Beta - - - - -
- - - - - - -
- - - - - - diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte similarity index 58% rename from packages/builder/src/pages/portal/_layout.svelte rename to packages/builder/src/pages/builder/portal/_layout.svelte index 06c650309e..1b693173bf 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -1,49 +1,53 @@ @@ -51,7 +55,7 @@
-
+
$goto("./apps")}> Logotype
-
- - -
+ +
+ + +
+ + Old settings + + Log out +
-
+
+ + + diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte new file mode 100644 index 0000000000..ff60750f36 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -0,0 +1,231 @@ + + + + {#if $apps.length} + +
+ Apps + + + + +
+
+
+ -
- {/each} - - -
- - {/if} - + + To allow users to authenticate using their Google accounts, fill out + the fields below. + +
+ + {#each ConfigFields.Google as field} +
+ + +
+ {/each} +
+ +
+ + {/if} + + diff --git a/packages/builder/src/pages/portal/manage/oauth/_logos/Google.svelte b/packages/builder/src/pages/builder/portal/manage/oauth/_logos/Google.svelte similarity index 100% rename from packages/builder/src/pages/portal/manage/oauth/_logos/Google.svelte rename to packages/builder/src/pages/builder/portal/manage/oauth/_logos/Google.svelte diff --git a/packages/builder/src/pages/portal/manage/oauth/index.svelte b/packages/builder/src/pages/builder/portal/manage/oauth/index.svelte similarity index 100% rename from packages/builder/src/pages/portal/manage/oauth/index.svelte rename to packages/builder/src/pages/builder/portal/manage/oauth/index.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte new file mode 100644 index 0000000000..e32392b944 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte @@ -0,0 +1,107 @@ + + + +
+ $goto("./")} quiet size="S" icon="BackAndroid" + >Back to users +
+
+ + User: {$request?.data?.email} + Lorem ipsum dolor sit amet consectetur adipisicing elit. Debitis porro + ut nesciunt ipsam perspiciatis aliquam et hic minus alias beatae. Odit + veritatis quos quas laborum magnam tenetur perspiciatis ex hic. + +
+ +
+ General +
+
+ + +
+
+
+ Regenerate password +
+
+ +
+ Delete user + Deleting a user completely removes them from your account. +
+ +
+
+ + + + + Are you sure you want to delete {$request?.data?.email} + + + + diff --git a/packages/builder/src/pages/portal/manage/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte similarity index 55% rename from packages/builder/src/pages/portal/manage/users/_components/AddUserModal.svelte rename to packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte index 572a18cedb..9eb9caf2a0 100644 --- a/packages/builder/src/pages/portal/manage/users/_components/AddUserModal.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte @@ -1,14 +1,19 @@ @@ -17,6 +22,16 @@ automated email onboarding flow. Otherwise, use our basic onboarding process with autogenerated passwords. - + diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte new file mode 100644 index 0000000000..b057a51241 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte @@ -0,0 +1,23 @@ + + + + Below you will find the user’s username and password. The password will not + be accessible from this point. Please download the credentials. + + +
+ Download user credentials +
+ diff --git a/packages/builder/src/pages/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte similarity index 50% rename from packages/builder/src/pages/portal/manage/users/index.svelte rename to packages/builder/src/pages/builder/portal/manage/users/index.svelte index 4d67dabc0c..25836260d6 100644 --- a/packages/builder/src/pages/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -1,18 +1,20 @@ @@ -41,18 +59,19 @@
Users
- - + +
- - + +
$goto(`./${detail._id}`)} {schema} - data={$users} + data={filteredUsers || $users} allowEditColumns={false} allowEditRows={false} allowSelectRows={false} @@ -60,7 +79,16 @@ - + + diff --git a/packages/builder/src/pages/portal/settings/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/_layout.svelte similarity index 100% rename from packages/builder/src/pages/portal/settings/_layout.svelte rename to packages/builder/src/pages/builder/portal/settings/_layout.svelte diff --git a/packages/builder/src/pages/portal/settings/general.svelte b/packages/builder/src/pages/builder/portal/settings/general.svelte similarity index 83% rename from packages/builder/src/pages/portal/settings/general.svelte rename to packages/builder/src/pages/builder/portal/settings/general.svelte index 6793d1852d..a12abac6df 100644 --- a/packages/builder/src/pages/portal/settings/general.svelte +++ b/packages/builder/src/pages/builder/portal/settings/general.svelte @@ -45,12 +45,12 @@
General - Lorem ipsum, dolor sit amet consectetur adipisicing elit. Hic vero, aut + + Lorem ipsum, dolor sit amet consectetur adipisicing elit. Hic vero, aut culpa provident sunt ratione! Voluptas doloremque, dicta nisi velit perspiciatis, ratione vel blanditiis totam, nam voluptate repellat - aperiam fuga! + aperiam fuga! +
@@ -58,7 +58,7 @@ Here you can update your logo and organization name.
- +