From 42e0b3c1f90181fc36146c52c9373250bc58af88 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 6 May 2021 10:57:24 +0100 Subject: [PATCH] lint :sparkles: --- packages/builder/src/pages/admin/index.svelte | 3 ++- packages/builder/src/pages/builder/_layout.svelte | 6 ++++-- packages/builder/src/stores/portal/admin.js | 9 ++++++--- packages/worker/src/api/controllers/admin/configs.js | 9 +++++---- packages/worker/src/api/controllers/admin/users.js | 2 -- .../src/api/routes/tests/utilities/TestConfiguration.js | 2 +- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/packages/builder/src/pages/admin/index.svelte b/packages/builder/src/pages/admin/index.svelte index f0d708602c..3f7793da2a 100644 --- a/packages/builder/src/pages/admin/index.svelte +++ b/packages/builder/src/pages/admin/index.svelte @@ -41,7 +41,8 @@ + bind:value={adminUser.password} + /> diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte index 59ebc28a8b..77f8b655f5 100644 --- a/packages/builder/src/pages/builder/_layout.svelte +++ b/packages/builder/src/pages/builder/_layout.svelte @@ -32,13 +32,15 @@ + icon="PeopleGroup" + > Community + icon="Bug" + > Raise an issue diff --git a/packages/builder/src/stores/portal/admin.js b/packages/builder/src/stores/portal/admin.js index 570d925a76..33eb23a64d 100644 --- a/packages/builder/src/stores/portal/admin.js +++ b/packages/builder/src/stores/portal/admin.js @@ -11,15 +11,18 @@ export function createAdminStore() { const onboardingSteps = Object.keys(json) - const stepsComplete = onboardingSteps.reduce((score, step) => score + Number(!!json[step]), 0) + const stepsComplete = onboardingSteps.reduce( + (score, step) => score + Number(!!json[step]), + 0 + ) set({ checklist: json, - onboardingProgress: stepsComplete / onboardingSteps.length * 100 + onboardingProgress: (stepsComplete / onboardingSteps.length) * 100, }) } catch (err) { set({ - checklist: null + checklist: null, }) } } diff --git a/packages/worker/src/api/controllers/admin/configs.js b/packages/worker/src/api/controllers/admin/configs.js index b7cf731be4..ef54898326 100644 --- a/packages/worker/src/api/controllers/admin/configs.js +++ b/packages/worker/src/api/controllers/admin/configs.js @@ -104,13 +104,14 @@ exports.destroy = async function (ctx) { } } -exports.configChecklist = async function(ctx) { +exports.configChecklist = async function (ctx) { const db = new CouchDB(GLOBAL_DB) try { // TODO: Watch get started video // Apps exist + let allDbs if (env.COUCH_DB_URL) { allDbs = await (await fetch(`${env.COUCH_DB_URL}/_all_dbs`)).json() } else { @@ -120,7 +121,7 @@ exports.configChecklist = async function(ctx) { // They have set up SMTP const smtpConfig = await determineScopedConfig(db, { - type: Configs.SMTP + type: Configs.SMTP, }) // They have set up an admin user @@ -131,10 +132,10 @@ exports.configChecklist = async function(ctx) { ) const adminUser = users.rows.some(row => row.doc.admin) - ctx.body = { + ctx.body = { apps: appDbNames.length, smtp: !!smtpConfig, - adminUser + adminUser, } } catch (err) { ctx.throw(err.status, err) diff --git a/packages/worker/src/api/controllers/admin/users.js b/packages/worker/src/api/controllers/admin/users.js index 94c7463690..452c3be846 100644 --- a/packages/worker/src/api/controllers/admin/users.js +++ b/packages/worker/src/api/controllers/admin/users.js @@ -7,8 +7,6 @@ const { const { hash, getGlobalUserByEmail } = require("@budibase/auth").utils const { UserStatus } = require("../../../constants") -const FIRST_USER_EMAIL = "test@test.com" -const FIRST_USER_PASSWORD = "test" const GLOBAL_DB = StaticDatabases.GLOBAL.name exports.save = async ctx => { diff --git a/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js b/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js index a262f6a2e2..e0e2f966ff 100644 --- a/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js +++ b/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js @@ -162,7 +162,7 @@ class TestConfiguration { await this._req( { email: "testuser@test.com", - password: "test@test.com" + password: "test@test.com", }, null, controllers.users.adminUser