diff --git a/packages/bbui/src/Avatar/Avatar.svelte b/packages/bbui/src/Avatar/Avatar.svelte index 141b7c1b37..1b2310b61f 100644 --- a/packages/bbui/src/Avatar/Avatar.svelte +++ b/packages/bbui/src/Avatar/Avatar.svelte @@ -16,7 +16,7 @@ function getInitials(name) { let parts = name.split(" ") - return parts.map((name) => name[0]).join("") + return parts.map(name => name[0]).join("") } diff --git a/packages/bbui/src/SideNavigation/Item.svelte b/packages/bbui/src/SideNavigation/Item.svelte index 75440796b5..f50270dfbd 100644 --- a/packages/bbui/src/SideNavigation/Item.svelte +++ b/packages/bbui/src/SideNavigation/Item.svelte @@ -20,7 +20,7 @@ {/if} { const type = $store.currentFrontEndType diff --git a/packages/builder/src/builderStore/store/admin.js b/packages/builder/src/builderStore/store/admin.js deleted file mode 100644 index dcf7fef485..0000000000 --- a/packages/builder/src/builderStore/store/admin.js +++ /dev/null @@ -1,11 +0,0 @@ -import { writable } from "svelte/store" - -const INITIAL_ADMIN_STATE = { - oauth: [], -} - -export const getAdminStore = () => { - const store = writable({ ...INITIAL_ADMIN_STATE }) - store.actions = {} - return store -} diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte index c9f6aac4af..e26148b666 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -10,15 +10,12 @@ SideNavigation as Navigation, SideNavigationItem as Item, } from "@budibase/bbui" + import { organisation } from "stores/portal" + organisation.init() - let orgName, orgLogo, onBoardingProgress, user + let onBoardingProgress, user async function getInfo() { - // fetch orgInfo - orgName = "ACME Inc." - orgLogo = "https://via.placeholder.com/150" - - // set onBoardingProgress onBoardingProgress = 20 user = { name: "John Doe" } } @@ -26,13 +23,13 @@ onMount(getInfo) let menu = [ - { title: "Apps", href: "/portal" }, + { title: "Apps", href: "/portal/" }, { title: "Drafts", href: "/portal/drafts" }, { title: "Users", href: "/portal/users", heading: "Manage" }, { title: "Groups", href: "/portal/groups" }, { title: "Auth", href: "/portal/oauth" }, { title: "Email", href: "/portal/email" }, - { title: "General", href: "/portal/general", heading: "Settings" }, + { title: "General", href: "/portal/settings/general", heading: "Settings" }, { title: "Theming", href: "/portal/theming" }, { title: "Account", href: "/portal/account" }, ] @@ -43,8 +40,11 @@
- Logotype - {orgName} + Logotype + {$organisation?.company}
@@ -88,6 +88,7 @@ } .branding { display: grid; + grid-gap: var(--spacing-s); grid-template-columns: auto auto; justify-content: space-between; align-items: center; @@ -100,7 +101,11 @@ align-items: center; } .content { - padding: var(--spacing-m); + display: grid; + padding: calc(var(--spacing-xl) * 2) var(--spacing-m) var(--spacing-m) + var(--spacing-m); + max-width: 80ch; + margin: 0 auto; } .avatar { display: grid; @@ -123,4 +128,8 @@ width: 32px; height: 32px; } + span { + overflow: hidden; + text-overflow: ellipsis; + } diff --git a/packages/builder/src/pages/portal/oauth/index.svelte b/packages/builder/src/pages/portal/oauth/index.svelte index ac23a9c3a4..d4e5332d0d 100644 --- a/packages/builder/src/pages/portal/oauth/index.svelte +++ b/packages/builder/src/pages/portal/oauth/index.svelte @@ -58,7 +58,7 @@ }) -
+
OAuth @@ -91,10 +91,6 @@
diff --git a/packages/builder/src/pages/portal/settings/index.svelte b/packages/builder/src/pages/portal/settings/index.svelte new file mode 100644 index 0000000000..9e264e0583 --- /dev/null +++ b/packages/builder/src/pages/portal/settings/index.svelte @@ -0,0 +1,4 @@ + diff --git a/packages/builder/src/stores/portal/admin.js b/packages/builder/src/stores/portal/admin.js new file mode 100644 index 0000000000..5af677efbf --- /dev/null +++ b/packages/builder/src/stores/portal/admin.js @@ -0,0 +1,7 @@ +import { writable } from "svelte/store" + +const INITIAL_ADMIN_STATE = { + oauth: [], +} + +export const admin = writable({ ...INITIAL_ADMIN_STATE }) diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js new file mode 100644 index 0000000000..5aba1c2731 --- /dev/null +++ b/packages/builder/src/stores/portal/index.js @@ -0,0 +1,2 @@ +export { organisation } from "./organisation" +export { admin } from "./admin" diff --git a/packages/builder/src/stores/portal/organisation.js b/packages/builder/src/stores/portal/organisation.js new file mode 100644 index 0000000000..7926121ea3 --- /dev/null +++ b/packages/builder/src/stores/portal/organisation.js @@ -0,0 +1,37 @@ +import { writable } from "svelte/store" +import api from "builderStore/api" + +export function createOrganisationStore() { + const { subscribe, set } = writable({}) + + async function init() { + try { + const response = await api.get(`/api/admin/configs/settings`) + const json = await response.json() + set(json) + } catch (error) { + set({ + platformUrl: "", + logoUrl: "", + docsUrl: "", + company: "", + }) + } + } + + return { + subscribe, + save: async config => { + try { + await api.post("/api/admin/configs", { type: "settings", config }) + await init() + return { status: 200 } + } catch (error) { + return { error } + } + }, + init, + } +} + +export const organisation = createOrganisationStore() diff --git a/packages/server/src/api/index.js b/packages/server/src/api/index.js index f2537d8047..d6719f4734 100644 --- a/packages/server/src/api/index.js +++ b/packages/server/src/api/index.js @@ -74,6 +74,4 @@ for (let route of mainRoutes) { router.use(staticRoutes.routes()) router.use(staticRoutes.allowedMethods()) -router.redirect("/", "/builder") - module.exports = router