Skip to content

Commit e92b049

Browse files
committed
Move hooks
1 parent b35b81a commit e92b049

File tree

3 files changed

+55
-50
lines changed

3 files changed

+55
-50
lines changed

src/generated/client/client.gen.ts

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,3 @@ import { type Config, type ClientOptions as DefaultClientOptions, createClient,
1414
export type CreateClientConfig<T extends DefaultClientOptions = ClientOptions> = (override?: Config<DefaultClientOptions & T>) => Config<Required<DefaultClientOptions> & T>;
1515

1616
export const client = createClient(createConfig<ClientOptions>());
17-
client.setConfig({
18-
baseUrl: import.meta.env.VITE_API_BASE_URL,
19-
});
20-
21-
client.interceptors.request.use((request) => {
22-
const token = localStorage.getItem('token');
23-
24-
if (token) {
25-
let headers = request.headers;
26-
if (!(headers instanceof Headers)) {
27-
headers = new Headers(headers as HeadersInit);
28-
}
29-
headers.set('Authorization', `Bearer ${token}`);
30-
31-
if (!(request.headers instanceof Headers)) {
32-
(request as any).headers = headers;
33-
}
34-
}
35-
return request;
36-
});
37-
38-

src/lib/api-client.ts

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { client as heyApiClient } from "@/generated/client/client.gen"
2+
import * as sdk from "@/generated/client/sdk.gen"
3+
4+
heyApiClient.setConfig({
5+
baseUrl: import.meta.env.VITE_API_BASE_URL,
6+
})
7+
8+
// Add the auth token interceptor
9+
heyApiClient.interceptors.request.use((request) => {
10+
const token = localStorage.getItem("token")
11+
12+
if (token) {
13+
let headers = request.headers
14+
if (!(headers instanceof Headers)) {
15+
headers = new Headers(headers as HeadersInit)
16+
}
17+
headers.set("Authorization", `Bearer ${token}`)
18+
19+
if (!(request.headers instanceof Headers)) {
20+
;(request as any).headers = headers
21+
}
22+
}
23+
return request
24+
})
25+
26+
export const client = heyApiClient
27+
export { sdk }

src/main.tsx

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ import DeniedQuotesPage from "./pages/quotes/DeniedQuotesPage"
2121
// import ExpiredQuotesPage from "./pages/quotes/ExpiredQuotesPage"
2222
import RejectedQuotesPage from "./pages/quotes/RejectedQuotesPage"
2323
import "./keycloak"
24+
import "./lib/api-client"
2425

2526
const queryClient = new QueryClient({
2627
defaultOptions: {
2728
queries: {
28-
enabled: (query) => query.queryKey[0] !== "balances"
29-
}
30-
}
29+
enabled: (query) => query.queryKey[0] !== "balances",
30+
},
31+
},
3132
})
3233

3334
const prepare = async () => {
@@ -38,35 +39,34 @@ const prepare = async () => {
3839
}
3940

4041
function App() {
41-
4242
return (
43-
<QueryClientProvider client={queryClient}>
44-
<BrowserRouter>
45-
<Routes>
46-
<Route element={<Layout />}>
47-
<Route index element={<HomePage />} />
48-
<Route path="balances" element={<BalancesPage />} />
49-
<Route path="earnings" element={<EarningsPage />} />
50-
<Route path="earnings/cashflow" element={<CashFlowPage />} />
51-
<Route path="quotes" element={<QuotesPage />} />
52-
<Route path="quotes/pending" element={<PendingQuotesPage />} />
53-
<Route path="quotes/accepted" element={<AcceptedQuotesPage />} />
54-
<Route path="quotes/offered" element={<OfferedQuotesPage />} />
55-
<Route path="quotes/denied" element={<DeniedQuotesPage />} />
56-
<Route path="quotes/rejected" element={<RejectedQuotesPage />} />
57-
{/* <Route path="quotes/expired" element={<ExpiredQuotesPage />} /> */}
58-
<Route path="quotes/:id" element={<QuotePage />} />
59-
<Route path="settings" element={<SettingsPage />} />
60-
<Route path="info" element={<InfoPage />} />
61-
</Route>
62-
</Routes>
63-
</BrowserRouter>
64-
</QueryClientProvider>
65-
);
43+
<QueryClientProvider client={queryClient}>
44+
<BrowserRouter>
45+
<Routes>
46+
<Route element={<Layout />}>
47+
<Route index element={<HomePage />} />
48+
<Route path="balances" element={<BalancesPage />} />
49+
<Route path="earnings" element={<EarningsPage />} />
50+
<Route path="earnings/cashflow" element={<CashFlowPage />} />
51+
<Route path="quotes" element={<QuotesPage />} />
52+
<Route path="quotes/pending" element={<PendingQuotesPage />} />
53+
<Route path="quotes/accepted" element={<AcceptedQuotesPage />} />
54+
<Route path="quotes/offered" element={<OfferedQuotesPage />} />
55+
<Route path="quotes/denied" element={<DeniedQuotesPage />} />
56+
<Route path="quotes/rejected" element={<RejectedQuotesPage />} />
57+
{/* <Route path="quotes/expired" element={<ExpiredQuotesPage />} /> */}
58+
<Route path="quotes/:id" element={<QuotePage />} />
59+
<Route path="settings" element={<SettingsPage />} />
60+
<Route path="info" element={<InfoPage />} />
61+
</Route>
62+
</Routes>
63+
</BrowserRouter>
64+
</QueryClientProvider>
65+
)
6666
}
6767

6868
void prepare().then(() => {
69-
// loadToken();
69+
// loadToken();
7070
createRoot(document.getElementById("root")!).render(
7171
<StrictMode>
7272
<App />

0 commit comments

Comments
 (0)