Skip to content

feat(site): add basic organization management ui #13288

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 24 commits into from
Jun 17, 2024
Merged

feat(site): add basic organization management ui #13288

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f36f106
rebased old version
aslilac Jun 3, 2024
325148c
move out of deployment settings
aslilac Jun 3, 2024
c304463
padding and cleanup
aslilac Jun 4, 2024
2cb6c5d
🧹
aslilac Jun 6, 2024
25a8ee7
Merge branch 'main' into org-management-ui
aslilac Jun 6, 2024
b297d3d
w h o o p s
aslilac Jun 6, 2024
5f84937
Merge branch 'main' into org-management-ui
aslilac Jun 7, 2024
0f9de62
a mostly nice org settings page
aslilac Jun 7, 2024
17a890d
🧹
aslilac Jun 7, 2024
050d553
wibbles
aslilac Jun 10, 2024
bed1bd4
Merge branch 'main' into org-management-ui
aslilac Jun 10, 2024
3bab8cb
🔮
aslilac Jun 10, 2024
353ef76
Merge branch 'main' into org-management-ui
aslilac Jun 11, 2024
b071231
formik strikes again
aslilac Jun 11, 2024
f8ccd96
🧹
aslilac Jun 11, 2024
98b66a2
Merge branch 'main' into org-management-ui
aslilac Jun 12, 2024
0a2bfea
add support for icon
aslilac Jun 13, 2024
ed57254
🧹
aslilac Jun 13, 2024
d07a319
🧹
aslilac Jun 13, 2024
c2263f1
fix footer stories
aslilac Jun 13, 2024
1c397bc
🧹
aslilac Jun 13, 2024
551191d
🧹
aslilac Jun 14, 2024
ab91af8
show update errors and fix padding
aslilac Jun 17, 2024
e5bddc6
🧹
aslilac Jun 17, 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
🧹
  • Loading branch information
@aslilac
aslilac committed Jun 11, 2024
commit f8ccd9652fd4b759629b714c8f6f3f170b30c02c
1 change: 0 additions & 1 deletion site/src/api/queries/organizations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export const updateOrganization = (queryClient: QueryClient) => {
API.updateOrganization(variables.orgId, variables.req),

onSuccess: async () => {
await queryClient.invalidateQueries(meKey);
await queryClient.invalidateQueries(myOrganizationsKey);
},
};
Expand Down
62 changes: 13 additions & 49 deletions site/src/components/Sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,29 +77,6 @@ export const SidebarNavItem: FC<SidebarNavItemProps> = ({
);
};

interface SidebarNavSubItemProps {
children?: ReactNode;
href: string;
}

export const SidebarNavSubItem: FC<SidebarNavSubItemProps> = ({
children,
href,
}) => {
const link = useClassName(classNames.subLink, []);
const activeLink = useClassName(classNames.activeSubLink, []);

return (
<NavLink
end
to={href}
className={({ isActive }) => cx([link, isActive && activeLink])}
>
{children}
</NavLink>
);
};

const styles = {
sidebar: {
width: 245,
Expand Down Expand Up @@ -141,35 +118,22 @@ const classNames = {
&:hover {
background-color: ${theme.palette.action.hover};
}

border-left: 3px solid transparent;
`,

activeLink: (css, theme) => css`
border-left-color: ${theme.palette.primary.main};
`,

subLink: (css, theme) => css`
color: inherit;
text-decoration: none;

display: block;
font-size: 13px;
margin-left: 16px;
padding: 8px;
border-radius: 4px;
transition: background-color 0.15s ease-in-out;
margin-bottom: 1px;
position: relative;
border-left: 3px solid transparent;

&:hover {
background-color: ${theme.palette.action.hover};
background-color: ${theme.palette.action.hover};

&:before {
content: "";
display: block;
width: 3px;
height: 100%;
position: absolute;
left: 0;
top: 0;
background-color: ${theme.palette.primary.main};
border-top-left-radius: 8px;
border-bottom-left-radius: 8px;
}
`,

activeSubLink: (css, theme) => css`
border-left-color: ${theme.palette.primary.main};
font-weight: 500;
`,
} satisfies Record<string, ClassName>;
Loading