diff --git a/packages/bbui/src/Avatar/Avatar.svelte b/packages/bbui/src/Avatar/Avatar.svelte index f4e42b28a3..e23c2fc360 100644 --- a/packages/bbui/src/Avatar/Avatar.svelte +++ b/packages/bbui/src/Avatar/Avatar.svelte @@ -12,15 +12,7 @@ export let size = "M" export let url = "" export let disabled = false - export let name = "John Doe" - - function getInitials(name) { - let parts = name.split(" ") - if (parts.length > 0) { - return parts.map(name => name[0]).join("") - } - return name - } + export let initials = "JD" {#if url} @@ -38,7 +30,7 @@ size )}); font-size: calc(var({sizes.get(size)}) / 2)" > - {getInitials(name)} + {initials || ""} {/if} @@ -52,5 +44,6 @@ border-radius: 50%; overflow: hidden; user-select: none; + text-transform: uppercase; } diff --git a/packages/bbui/src/Form/Core/TextField.svelte b/packages/bbui/src/Form/Core/TextField.svelte index e1793c74a6..650aee4f82 100644 --- a/packages/bbui/src/Form/Core/TextField.svelte +++ b/packages/bbui/src/Form/Core/TextField.svelte @@ -82,6 +82,7 @@ on:blur on:focus on:input + on:keyup on:blur={onBlur} on:focus={onFocus} on:input={onInput} diff --git a/packages/bbui/src/Form/Input.svelte b/packages/bbui/src/Form/Input.svelte index fcab178182..1d98982b4f 100644 --- a/packages/bbui/src/Form/Input.svelte +++ b/packages/bbui/src/Form/Input.svelte @@ -34,5 +34,6 @@ on:input on:blur on:focus + on:keyup /> diff --git a/packages/builder/src/components/settings/ChangePasswordModal.svelte b/packages/builder/src/components/settings/ChangePasswordModal.svelte index d78c4c7efd..358e238092 100644 --- a/packages/builder/src/components/settings/ChangePasswordModal.svelte +++ b/packages/builder/src/components/settings/ChangePasswordModal.svelte @@ -8,7 +8,7 @@ const updatePassword = async () => { try { - await auth.updateSelf({ ...$auth.user, password }) + await auth.updateSelf({ password }) notifications.success("Password changed successfully") } catch (error) { notifications.error("Failed to update password") diff --git a/packages/builder/src/components/settings/UpdateUserInfoModal.svelte b/packages/builder/src/components/settings/UpdateUserInfoModal.svelte index 61446f0c00..96e2aa3743 100644 --- a/packages/builder/src/components/settings/UpdateUserInfoModal.svelte +++ b/packages/builder/src/components/settings/UpdateUserInfoModal.svelte @@ -10,7 +10,7 @@ const updateInfo = async () => { try { - await auth.updateSelf({ ...$auth.user, ...$values }) + await auth.updateSelf($values) notifications.success("Information updated successfully") } catch (error) { notifications.error("Failed to update information") diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte index 77a1b43c57..6baf927973 100644 --- a/packages/builder/src/pages/builder/admin/index.svelte +++ b/packages/builder/src/pages/builder/admin/index.svelte @@ -10,8 +10,10 @@ import { goto } from "@roxi/routify" import api from "builderStore/api" import { admin, organisation } from "stores/portal" + import PasswordRepeatInput from "components/common/users/PasswordRepeatInput.svelte" let adminUser = {} + let error async function save() { try { @@ -42,13 +44,11 @@ - + - + diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte index ef7c54a8da..7311c112b8 100644 --- a/packages/builder/src/pages/builder/apps/index.svelte +++ b/packages/builder/src/pages/builder/apps/index.svelte @@ -51,7 +51,7 @@
- +
userInfoModal.show()}> diff --git a/packages/builder/src/pages/builder/auth/reset.svelte b/packages/builder/src/pages/builder/auth/reset.svelte index da7e2a7073..2287ee5ca0 100644 --- a/packages/builder/src/pages/builder/auth/reset.svelte +++ b/packages/builder/src/pages/builder/auth/reset.svelte @@ -13,7 +13,6 @@ try { if (forceResetPassword) { await auth.updateSelf({ - ...$auth.user, password, forceResetPassword: false, }) diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 50901fa36c..fb488c58d7 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -3,7 +3,6 @@ import { Icon, Avatar, - Search, Layout, SideNavigation as Navigation, SideNavigationItem as Item, @@ -77,7 +76,7 @@
- +
userInfoModal.show()}> diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 1729efe101..7857cd658f 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -41,8 +41,8 @@ const enrichedApps = apps.map(app => ({ ...app, deployed: app.status === AppStatus.DEPLOYED, - lockedYou: app.lockedBy?.email === user.email, - lockedOther: app.lockedBy && app.lockedBy.email !== user.email, + lockedYou: app.lockedBy && app.lockedBy.email === user?.email, + lockedOther: app.lockedBy && app.lockedBy.email !== user?.email, })) if (sortBy === "status") { return enrichedApps.sort((a, b) => { diff --git a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte index 9718e14681..86137fddf8 100644 --- a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte @@ -4,7 +4,6 @@ Button, Heading, Divider, - Page, Label, notifications, Layout, @@ -23,6 +22,13 @@ const ConfigFields = { Google: ["clientID", "clientSecret", "callbackURL"], } + const ConfigLabels = { + Google: { + clientID: "Client ID", + clientSecret: "Client secret", + callbackURL: "Callback URL", + }, + } let google @@ -85,7 +91,7 @@ {#each ConfigFields.Google as field}
- +
{/each} diff --git a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte index bbd2e079e0..0fa89bad52 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte @@ -84,7 +84,7 @@ User: {$userFetch?.data?.email} Change user settings and update their app roles. Also contains the ability - to delete the user as well as force reset their password.. + to delete the user as well as force reset their password. @@ -108,7 +108,7 @@
- + - - {#each tags as tag} - - {tag} - - {/each} - {#if leftover} - +{leftover} more - {/if} - +
+ + {#each tags as tag} + + {tag} + + {/each} + {#if leftover} + +{leftover} more + {/if} + +
+ + diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js index c642a5708d..517aad9fc4 100644 --- a/packages/builder/src/stores/portal/auth.js +++ b/packages/builder/src/stores/portal/auth.js @@ -1,25 +1,42 @@ -import { writable } from "svelte/store" +import { derived, writable, get } from "svelte/store" import api from "../../builderStore/api" export function createAuthStore() { - const store = writable({ user: null }) + const user = writable(null) + const store = derived(user, $user => { + let initials = null + if ($user) { + if ($user.firstName) { + initials = $user.firstName[0] + if ($user.lastName) { + initials += $user.lastName[0] + } + } else { + initials = $user.email[0] + } + } + return { + user: $user, + initials, + } + }) return { subscribe: store.subscribe, checkAuth: async () => { const response = await api.get("/api/admin/users/self") if (response.status !== 200) { - store.update(state => ({ ...state, user: null })) + user.set(null) } else { - const user = await response.json() - store.update(state => ({ ...state, user })) + const json = await response.json() + user.set(json) } }, login: async creds => { const response = await api.post(`/api/admin/auth`, creds) const json = await response.json() if (response.status === 200) { - store.update(state => ({ ...state, user: json.user })) + user.set(json.user) } else { throw "Invalid credentials" } @@ -31,12 +48,13 @@ export function createAuthStore() { throw "Unable to create logout" } await response.json() - store.update(state => ({ ...state, user: null })) + user.set(null) }, - updateSelf: async user => { - const response = await api.post("/api/admin/users/self", user) + updateSelf: async fields => { + const newUser = { ...get(user), ...fields } + const response = await api.post("/api/admin/users/self", newUser) if (response.status === 200) { - store.update(state => ({ ...state, user: { ...state.user, ...user } })) + user.set(newUser) } else { throw "Unable to update user details" }