From cd1675098fd0055136b69578bed265ce783861ff Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 14 Jun 2023 14:54:27 +0100 Subject: [PATCH] removing need for external internet assets and self hosting our own fonts --- packages/builder/index.html | 7 ++++--- packages/builder/package.json | 2 ++ packages/builder/public/bblogoimgur.png | Bin 0 -> 4612 bytes .../builder/src/pages/builder/Branding.svelte | 4 ++-- .../onboarding/_components/ExampleApp.svelte | 2 +- packages/builder/vite.config.js | 13 +++++++++++++ .../client/src/components/app/Layout.svelte | 2 +- .../app/deprecated/Navigation.svelte | 2 +- .../static/templates/BudibaseApp.svelte | 17 ++++++----------- .../controllers/static/templates/preview.hbs | 14 ++++---------- 10 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 packages/builder/public/bblogoimgur.png diff --git a/packages/builder/index.html b/packages/builder/index.html index 96abc8e582..02743a383b 100644 --- a/packages/builder/index.html +++ b/packages/builder/index.html @@ -5,9 +5,10 @@ Budibase - - + + + + diff --git a/packages/builder/package.json b/packages/builder/package.json index 73bc003343..a2567dc638 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -70,6 +70,7 @@ "@codemirror/state": "^6.2.0", "@codemirror/theme-one-dark": "^6.1.2", "@codemirror/view": "^6.11.2", + "@fontsource/source-sans-pro": "^5.0.3", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", @@ -122,6 +123,7 @@ "tsconfig-paths": "4.0.0", "typescript": "4.7.3", "vite": "^3.0.8", + "vite-plugin-static-copy": "^0.16.0", "vitest": "^0.29.2" }, "nx": { diff --git a/packages/builder/public/bblogoimgur.png b/packages/builder/public/bblogoimgur.png new file mode 100644 index 0000000000000000000000000000000000000000..5ff80d25cd9fe70188def8e7b1b25f6eff946e23 GIT binary patch literal 4612 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 CP_=ac literal 0 HcmV?d00001 diff --git a/packages/builder/src/pages/builder/Branding.svelte b/packages/builder/src/pages/builder/Branding.svelte index 142473abb8..a55b92032f 100644 --- a/packages/builder/src/pages/builder/Branding.svelte +++ b/packages/builder/src/pages/builder/Branding.svelte @@ -8,7 +8,7 @@ $: platformTitle = !$auth.user && platformTitleText ? platformTitleText : "Budibase" - $: faviconUrl = $organisation.faviconUrl || "https://i.imgur.com/Xhdt1YP.png" + $: faviconUrl = $organisation.faviconUrl || "/builder/bblogoimgur.png" onMount(async () => { await organisation.init() @@ -27,6 +27,6 @@ {:else} - + {/if} diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte index 0b290decbf..a997e9086c 100644 --- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte +++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte @@ -44,7 +44,7 @@
- Budibase Logo + Budibase Logo

{name}

Home
diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js index 7227551850..8a26923e1c 100644 --- a/packages/builder/vite.config.js +++ b/packages/builder/vite.config.js @@ -1,6 +1,7 @@ import { svelte } from "@sveltejs/vite-plugin-svelte" import replace from "@rollup/plugin-replace" import { defineConfig, loadEnv } from "vite" +import { viteStaticCopy } from "vite-plugin-static-copy" import path from "path" const ignoredWarnings = [ @@ -59,6 +60,18 @@ export default defineConfig(({ mode }) => { ), "process.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN), }), + viteStaticCopy({ + targets: [ + { + src: "../../node_modules/@fontsource/source-sans-pro", + dest: "fonts" + }, + { + src: "../../node_modules/remixicon/fonts/*", + dest: "fonts", + } + ] + }) ], optimizeDeps: { exclude: ["@roxi/routify"], diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index 244500f266..e30fb14955 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -181,7 +181,7 @@