diff --git a/packages/bbui/src/IconPicker/IconPicker.svelte b/packages/bbui/src/IconPicker/IconPicker.svelte
index 995394adca..954145b42d 100644
--- a/packages/bbui/src/IconPicker/IconPicker.svelte
+++ b/packages/bbui/src/IconPicker/IconPicker.svelte
@@ -1,5 +1,5 @@
diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte
index ae0362af72..5da8b34700 100644
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@@ -52,6 +52,11 @@
href: "/builder/portal/manage/users",
heading: "Manage",
},
+ {
+ title: "User Groups",
+ href: "/builder/portal/manage/groups",
+ },
+
{ title: "Auth", href: "/builder/portal/manage/auth" },
{ title: "Email", href: "/builder/portal/manage/email" },
{
diff --git a/packages/builder/src/pages/builder/portal/manage/_layout.svelte b/packages/builder/src/pages/builder/portal/manage/_layout.svelte
index b4ffa4910c..47d9aaf59e 100644
--- a/packages/builder/src/pages/builder/portal/manage/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/_layout.svelte
@@ -9,10 +9,14 @@
$redirect("../")
}
}
+
+ $: wide =
+ $page.path.includes("email/:template") ||
+ ($page.path.includes("groups") && !$page.path.includes(":groupId"))
{#if $auth.isAdmin}
-
+
{/if}
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
new file mode 100644
index 0000000000..d33f144680
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
@@ -0,0 +1,211 @@
+
+
+
+
+
$goto("../groups")} size="S" icon="ArrowLeft">
+ Back
+
+
+
+
+
+ {#if groupUsers.length}
+ {#each groupUsers as user}
+
+
+
+ {/each}
+ {:else}
+
+
+
+ {/if}
+
+
+
+
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte
new file mode 100644
index 0000000000..c4f38f080b
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+ {parseInt(userCount)} app{parseInt(userCount) === 1 ? "" : "s"}
+
+
+
+
+
+
+ {parseInt(appCount)} app{parseInt(appCount) === 1 ? "" : "s"}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte
new file mode 100644
index 0000000000..873b45e151
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte
@@ -0,0 +1,55 @@
+
+
+
+
+
+ {user.email}
+
+ {user.access}
+
+
+
+
+
+
+
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_layout.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_layout.svelte
new file mode 100644
index 0000000000..a13211a9bb
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/manage/groups/_layout.svelte
@@ -0,0 +1,3 @@
+
+
+
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte
new file mode 100644
index 0000000000..63fcd105f3
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte
@@ -0,0 +1,155 @@
+
+
+
+
+
+
User groups
+ {#if !proPlan}
+
+
+
+ {/if}
+
+ Easily assign and manage your users access with User Groups
+
+
+
+ {#if !proPlan}
+
+ {/if}
+
+
+
+ {#each userGroupData as group}
+
+
+
+ {/each}
+
+
+
+
+
+
+
+
+
+
+