apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

lint(gui): move root fn to config module

This commit is contained in:
Sean Sube 2023-01-18 00:01:32 -06:00
parent 58ea836e20
commit 87bf27ea64
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gui/src/config.ts
View File

@ -1,4 +1,4 @@
import { Maybe } from '@apextoaster/js-utils'; import { doesExist, Maybe } from '@apextoaster/js-utils';
import { Img2ImgParams, InpaintParams, ModelParams, OutpaintParams, STATUS_SUCCESS, Txt2ImgParams, UpscaleParams } from './client.js'; import { Img2ImgParams, InpaintParams, ModelParams, OutpaintParams, STATUS_SUCCESS, Txt2ImgParams, UpscaleParams } from './client.js';
@ -76,3 +76,14 @@ export async function loadConfig(): Promise<Config> {
throw new Error('could not load config'); throw new Error('could not load config');
} }
} }
export function getApiRoot(config: Config): string {
const query = new URLSearchParams(window.location.search);
const api = query.get('api');
if (doesExist(api)) {
return api;
} else {
return config.api.root;
}
}

15
gui/src/main.tsx
View File

@ -1,5 +1,5 @@
/* eslint-disable no-console */ /* eslint-disable no-console */
import { doesExist, mustDefault, mustExist } from '@apextoaster/js-utils'; import { mustDefault, mustExist } from '@apextoaster/js-utils';
import { merge } from 'lodash'; import { merge } from 'lodash';
import * as React from 'react'; import * as React from 'react';
import ReactDOM from 'react-dom/client'; import ReactDOM from 'react-dom/client';
@ -13,20 +13,9 @@ import { ParamsVersionError } from './components/error/ParamsVersion.js';
import { ServerParamsError } from './components/error/ServerParams.js'; import { ServerParamsError } from './components/error/ServerParams.js';
import { OnnxError } from './components/OnnxError.js'; import { OnnxError } from './components/OnnxError.js';
import { OnnxWeb } from './components/OnnxWeb.js'; import { OnnxWeb } from './components/OnnxWeb.js';
import { Config, loadConfig, PARAM_VERSION } from './config.js'; import { getApiRoot, loadConfig, PARAM_VERSION } from './config.js';
import { ClientContext, ConfigContext, createStateSlices, OnnxState, StateContext } from './state.js'; import { ClientContext, ConfigContext, createStateSlices, OnnxState, StateContext } from './state.js';
export function getApiRoot(config: Config): string {
const query = new URLSearchParams(window.location.search);
const api = query.get('api');
if (doesExist(api)) {
return api;
} else {
return config.api.root;
}
}
export async function main() { export async function main() {
// load config from GUI server // load config from GUI server
const config = await loadConfig(); const config = await loadConfig();