Skip to content

feat: add a theme picker #11140

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 21 commits into from
Dec 14, 2023
Merged

feat: add a theme picker #11140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f76d803
first stab at PUT /theme
aslilac Dec 11, 2023
8dcd2d9
really bad settings page!
aslilac Dec 11, 2023
c1dd082
Merge branch 'main' into change-theme
aslilac Dec 11, 2023
4610a6c
implement db stuff
aslilac Dec 11, 2023
7649852
🧹
aslilac Dec 12, 2023
9619b59
Merge branch 'main' into change-theme
aslilac Dec 12, 2023
1c0e39a
auto theme
aslilac Dec 12, 2023
b3362c3
`_`
aslilac Dec 12, 2023
a6ac5b1
🍒
aslilac Dec 12, 2023
874c0a9
🧹
aslilac Dec 12, 2023
d0dd169
:P
aslilac Dec 13, 2023
d241f33
fixing tests
aslilac Dec 13, 2023
c7f26ad
ugh
aslilac Dec 13, 2023
46effbe
Merge branch 'main' into change-theme
aslilac Dec 13, 2023
68df77c
YAY
aslilac Dec 13, 2023
36d7b99
🧹
aslilac Dec 13, 2023
0c96ee8
TGho3eijgto;eraerw2r
aslilac Dec 13, 2023
40ede13
🥇
aslilac Dec 13, 2023
8131c0e
rename slightly
aslilac Dec 13, 2023
03f1f43
🧹
aslilac Dec 14, 2023
f667d7a
_sigh_
aslilac Dec 14, 2023
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
ugh
  • Loading branch information
@aslilac
aslilac committed Dec 13, 2023
commit c7f26ad767367e49d4de5eff99153c3018b7dd2b
10 changes: 5 additions & 5 deletions site/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,8 @@ export const AppProviders: FC<AppProvidersProps> = ({
<QueryClientProvider client={queryClient}>
<AuthProvider>
<ThemeProviders>
<ErrorBoundary>
{children}
<GlobalSnackbar />
</ErrorBoundary>
{children}
<GlobalSnackbar />
</ThemeProviders>
</AuthProvider>
</QueryClientProvider>
Expand All @@ -45,7 +43,9 @@ export const AppProviders: FC<AppProvidersProps> = ({
export const App: FC = () => {
return (
<AppProviders>
<AppRouter />
<ErrorBoundary>
<AppRouter />
</ErrorBoundary>
</AppProviders>
);
};
5 changes: 3 additions & 2 deletions site/src/pages/LoginPage/LoginPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import { LoginPage } from "./LoginPage";

describe("LoginPage", () => {
beforeEach(() => {
// appear logged out
server.use(
// Appear logged out
rest.get("/api/v2/users/me", (req, res, ctx) => {
return res(ctx.status(401), ctx.json({ message: "no user here" }));
}),
Expand Down Expand Up @@ -50,7 +50,8 @@ describe("LoginPage", () => {
it("redirects to the setup page if there is no first user", async () => {
// Given
server.use(
rest.get("/api/v2/users/first", async (req, res, ctx) => {
// No first user
rest.get("/api/v2/users/first", (req, res, ctx) => {
return res(ctx.status(404));
}),
);
Expand Down