From 3f9bdd9589f3840c7c0008a12617637b31e3f7a2 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 25 May 2021 08:21:07 +0100 Subject: [PATCH 01/54] Remove dependency on server repo to provide logo URL to navigation component --- packages/server/src/constants/index.js | 2 -- packages/server/src/constants/layouts.js | 3 --- 2 files changed, 5 deletions(-) diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js index 728938759e..c64e99a2e8 100644 --- a/packages/server/src/constants/index.js +++ b/packages/server/src/constants/index.js @@ -2,8 +2,6 @@ const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles") const { UserStatus } = require("@budibase/auth").constants const { ObjectStoreBuckets } = require("@budibase/auth").objectStore -exports.LOGO_URL = "https://i.imgur.com/ycNeYTy.png" - exports.JobQueues = { AUTOMATIONS: "automationQueue", } diff --git a/packages/server/src/constants/layouts.js b/packages/server/src/constants/layouts.js index 2ec657e817..78d9442980 100644 --- a/packages/server/src/constants/layouts.js +++ b/packages/server/src/constants/layouts.js @@ -1,5 +1,3 @@ -const { LOGO_URL } = require("../constants") - const BASE_LAYOUT_PROP_IDS = { PRIVATE: "layout_private_master", PUBLIC: "layout_public_master", @@ -109,7 +107,6 @@ const BASE_LAYOUTS = [ active: {}, selected: {}, }, - logoUrl: LOGO_URL, title: "", backgroundColor: "", color: "", From c91fb7d5006e55d8f5e7848f317210eb38936c17 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 25 May 2021 08:21:28 +0100 Subject: [PATCH 02/54] Default logo URL in navigation component and add setting to hide logo --- packages/standard-components/manifest.json | 6 +++++ .../standard-components/src/Navigation.svelte | 22 ++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json index a3fbc5aa52..050f1fe254 100644 --- a/packages/standard-components/manifest.json +++ b/packages/standard-components/manifest.json @@ -338,6 +338,12 @@ "type": "text", "label": "Logo URL", "key": "logoUrl" + }, + { + "type": "boolean", + "label": "Hide logo", + "key": "hideLogo", + "defaultValue": false } ] }, diff --git a/packages/standard-components/src/Navigation.svelte b/packages/standard-components/src/Navigation.svelte index b0f043b75c..43d8a0fa2a 100644 --- a/packages/standard-components/src/Navigation.svelte +++ b/packages/standard-components/src/Navigation.svelte @@ -5,16 +5,22 @@ const component = getContext("component") export let logoUrl + export let hideLogo