Skip to content

feat: add breadcrumbs to admin settings pages #15865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Dec 18, 2024
Merged

feat: add breadcrumbs to admin settings pages #15865

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
fe442e6
wip
jaaydenh Oct 2, 2024
66b921c
fix
jaaydenh Oct 15, 2024
2d2a7fe
wip
jaaydenh Oct 16, 2024
10ed32d
revert css
jaaydenh Oct 16, 2024
7b280d4
feat: changes for premium page
jaaydenh Oct 30, 2024
0371e7d
feat: implement Premium page with Tailwind and shadcn button
jaaydenh Nov 1, 2024
37ac859
chore: updates to button styles
jaaydenh Nov 1, 2024
32b127c
chore: update variant
jaaydenh Nov 1, 2024
ac8172c
chore: move CacheProvider to ThemeProvider
jaaydenh Nov 1, 2024
26bc3da
chore: update paths for shadcn
jaaydenh Nov 1, 2024
7dbbc46
feat: show premium tab if no premium license
jaaydenh Nov 3, 2024
f93b261
fix: fix format
jaaydenh Nov 3, 2024
65250ef
fix: remove fontSize
jaaydenh Nov 5, 2024
f14c0e1
feat: add breadcrumbs to admin settings pages
jaaydenh Dec 13, 2024
a8e0bea
fix: breadcrumbs left alignment
jaaydenh Dec 16, 2024
69cce6b
chore: add avatar next to organization name
jaaydenh Dec 18, 2024
f6fddb1
fix: format
jaaydenh Dec 18, 2024
5b428e4
fix: format
jaaydenh Dec 18, 2024
801bcff
fix: format
jaaydenh Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: add avatar next to organization name
  • Loading branch information
@jaaydenh
jaaydenh committed Dec 18, 2024
commit 69cce6b1e7083bbd914b8615a4a4eaa5f041ff5f
2 changes: 1 addition & 1 deletion site/src/components/Breadcrumb/Breadcrumb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export const BreadcrumbPage = forwardRef<
<span
ref={ref}
aria-current="page"
className={cn("text-content-secondary", className)}
className={cn("flex items-center gap-2 text-content-secondary", className)}
{...props}
/>
));
Expand Down
7 changes: 7 additions & 0 deletions site/src/modules/management/OrganizationSettingsLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { useDashboard } from "modules/dashboard/useDashboard";
import { type FC, Suspense, createContext, useContext } from "react";
import { Outlet, useParams } from "react-router-dom";
import { OrganizationSidebar } from "./OrganizationSidebar";
import { UserAvatar } from "components/UserAvatar/UserAvatar";

export const OrganizationSettingsContext = createContext<
OrganizationSettingsValue | undefined
Expand Down Expand Up @@ -89,6 +90,12 @@ const OrganizationSettingsLayout: FC = () => {
<BreadcrumbSeparator />
<BreadcrumbItem>
<BreadcrumbPage className="text-content-primary">
<UserAvatar
key={organization.id}
size="xs"
username={organization.display_name}
avatarURL={organization.icon}
/>
{organization?.name}
</BreadcrumbPage>
</BreadcrumbItem>
Expand Down