Skip to content

feat: split management settings sidebar into deployment/organization sidebars #15388

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: split management settings sidebar into deployment/organization sidebars #15388

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
8eae1d2
wip
jaaydenh Oct 2, 2024
212918a
fix
jaaydenh Oct 15, 2024
8b9417a
wip
jaaydenh Oct 16, 2024
8c5458f
revert css
jaaydenh Oct 16, 2024
ed22bea
feat: changes for premium page
jaaydenh Oct 30, 2024
d65a965
feat: implement Premium page with Tailwind and shadcn button
jaaydenh Nov 1, 2024
d7f71ed
chore: updates to button styles
jaaydenh Nov 1, 2024
312eef0
chore: update variant
jaaydenh Nov 1, 2024
18286d7
chore: move CacheProvider to ThemeProvider
jaaydenh Nov 1, 2024
739f95f
chore: update paths for shadcn
jaaydenh Nov 1, 2024
c4bf0c1
feat: show premium tab if no premium license
jaaydenh Nov 3, 2024
547914a
fix: fix format
jaaydenh Nov 3, 2024
f5f355e
fix: remove fontSize
jaaydenh Nov 5, 2024
a1f1b0e
feat: split management settings sidebar into deployment and organizat…
jaaydenh Nov 5, 2024
f176dab
fix: fix format
jaaydenh Nov 6, 2024
406e328
fix: update permissions
jaaydenh Dec 13, 2024
7307273
fix: format
jaaydenh Dec 13, 2024
ac71d6c
chore: remove unused stories
jaaydenh Dec 13, 2024
73a3c74
chore: indent sidebar subitems
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: move CacheProvider to ThemeProvider
  • Loading branch information
@jaaydenh
jaaydenh committed Dec 17, 2024
commit 18286d7067e38b072a874cd6503f9480e54dc9a1
31 changes: 11 additions & 20 deletions site/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import "./theme/globalFonts";
import createCache from "@emotion/cache";
import { CacheProvider } from "@emotion/react";
import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
import {
type FC,
Expand Down Expand Up @@ -40,11 +38,6 @@ declare global {
}
}

const cache = createCache({
key: "css",
prepend: true,
});

export const AppProviders: FC<AppProvidersProps> = ({
children,
queryClient = defaultQueryClient,
Expand All @@ -71,19 +64,17 @@ export const AppProviders: FC<AppProvidersProps> = ({
}, []);

return (
<CacheProvider value={cache}>
<HelmetProvider>
<QueryClientProvider client={queryClient}>
<AuthProvider>
<ThemeProvider>
{children}
<GlobalSnackbar />
</ThemeProvider>
</AuthProvider>
{showDevtools && <ReactQueryDevtools initialIsOpen={showDevtools} />}
</QueryClientProvider>
</HelmetProvider>
</CacheProvider>
<HelmetProvider>
<QueryClientProvider client={queryClient}>
<AuthProvider>
<ThemeProvider>
{children}
<GlobalSnackbar />
</ThemeProvider>
</AuthProvider>
{showDevtools && <ReactQueryDevtools initialIsOpen={showDevtools} />}
</QueryClientProvider>
</HelmetProvider>
);
};

Expand Down
1 change: 0 additions & 1 deletion site/src/contexts/ThemeProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ export const ThemeProvider: FC<PropsWithChildren> = ({ children }) => {

useEffect(() => {
const root = document.documentElement;

if (themePreference === "auto") {
root.classList.add(preferredColorScheme);
} else {
Expand Down