Compare commits

...

4 Commits

Author SHA1 Message Date
Mary Hipp
4fd3f62679 hardcode gen.invoker 2023-08-25 15:06:45 -04:00
Mary Hipp
3dee9b21df hardcode baseurl 2023-08-25 14:42:42 -04:00
Mary Hipp
56d56b5018 add logging 2023-08-25 14:06:18 -04:00
Mary Hipp
bc585ba964 dont render app until API is ready 2023-08-25 13:34:25 -04:00
2 changed files with 17 additions and 12 deletions

View File

@@ -7,6 +7,7 @@ import React, {
PropsWithChildren,
ReactNode,
useEffect,
useState,
} from 'react';
import { Provider } from 'react-redux';
import { addMiddleware, resetMiddlewares } from 'redux-dynamic-middlewares';
@@ -36,20 +37,21 @@ const InvokeAIUI = ({
middleware,
projectId,
}: Props) => {
const [isReady, setIsReady] = useState(false);
useEffect(() => {
// configure API client token
if (token) {
console.log({ apiUrl });
if (token && apiUrl && projectId) {
$authToken.set(token);
}
// configure API client base url
if (apiUrl) {
$baseUrl.set(apiUrl);
}
// configure API client project header
if (projectId) {
$projectId.set(projectId);
setIsReady(true);
} else if (token && apiUrl) {
$authToken.set(token);
$baseUrl.set(apiUrl);
setIsReady(true);
} else {
$baseUrl.set('');
setIsReady(true);
}
// reset dynamically added middlewares
@@ -81,7 +83,9 @@ const InvokeAIUI = ({
<React.Suspense fallback={<Loading />}>
<ThemeLocaleProvider>
<AppDndContext>
<App config={config} headerComponent={headerComponent} />
{isReady && (
<App config={config} headerComponent={headerComponent} />
)}
</AppDndContext>
</ThemeLocaleProvider>
</React.Suspense>

View File

@@ -7,6 +7,7 @@ import {
fetchBaseQuery,
} from '@reduxjs/toolkit/query/react';
import { $authToken, $baseUrl, $projectId } from 'services/api/client';
import { undefined } from 'zod';
export const tagTypes = [
'Board',
@@ -33,7 +34,7 @@ const dynamicBaseQuery: BaseQueryFn<
const projectId = $projectId.get();
const rawBaseQuery = fetchBaseQuery({
baseUrl: `${baseUrl ?? ''}/api/v1`,
baseUrl: `https://gen.invoker.ai/api/v1`,
prepareHeaders: (headers) => {
if (authToken) {
headers.set('Authorization', `Bearer ${authToken}`);