diff --git a/packages/fakeyou/src/common/ApiConfig.ts b/packages/components/src/api/ApiConfig.ts similarity index 98% rename from packages/fakeyou/src/common/ApiConfig.ts rename to packages/components/src/api/ApiConfig.ts index e940ee657d..963dbf63ab 100644 --- a/packages/fakeyou/src/common/ApiConfig.ts +++ b/packages/components/src/api/ApiConfig.ts @@ -338,6 +338,10 @@ class ApiConfig { return `${this.getScheme()}://${this.getNewApiHost()}/moderation/categories/${categoryToken}/delete`; } + obsEventsWebsocket(twitchUsername: string) : string { + return `ws://localhost:54321/obs/${twitchUsername}`; + } + private getScheme() : string { return this.useSsl ? "https" : "http"; } diff --git a/packages/components/src/index.tsx b/packages/components/src/index.tsx index 38509dc495..a558b94a8a 100644 --- a/packages/components/src/index.tsx +++ b/packages/components/src/index.tsx @@ -1,7 +1,10 @@ import Box from "./components/Box"; import Common from "./components/Common"; +//import { ApiConfig } from "./api/ApiConfig"; export { Box, Common, -}; \ No newline at end of file +}; + +export * from './api/ApiConfig'; diff --git a/packages/fakeyou/package.json b/packages/fakeyou/package.json index 74d6cfc8fd..f3e484d15a 100644 --- a/packages/fakeyou/package.json +++ b/packages/fakeyou/package.json @@ -3,10 +3,10 @@ "version": "0.1.0", "private": true, "dependencies": { + "@storyteller/components": "0.1.0", "@colormap/core": "0.1.0-3", "@colormap/presets": "0.1.0-4", "@craco/craco": "^6.4.3", - "@storyteller/components": "0.1.0", "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-brands-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", diff --git a/packages/fakeyou/src/App.tsx b/packages/fakeyou/src/App.tsx index 3108ec7dda..d6342b4b01 100644 --- a/packages/fakeyou/src/App.tsx +++ b/packages/fakeyou/src/App.tsx @@ -2,7 +2,7 @@ import 'bulma/css/bulma.css' import './App.scss'; import React from 'react'; -import { ApiConfig } from './common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { BrowserRouter, Route, Switch } from "react-router-dom"; import { NewVocodesContainer } from './v2/view/NewVocodesContainer'; import { OldVocodesContainer } from './v1/OldVocodesContainer'; diff --git a/packages/fakeyou/src/migration/MigrationTopNav_Session.tsx b/packages/fakeyou/src/migration/MigrationTopNav_Session.tsx index 47827b7000..bd77670fae 100644 --- a/packages/fakeyou/src/migration/MigrationTopNav_Session.tsx +++ b/packages/fakeyou/src/migration/MigrationTopNav_Session.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { SessionWrapper } from '../session/SessionWrapper'; import { Link, useHistory } from 'react-router-dom'; -import { ApiConfig } from '../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; interface Props { sessionWrapper: SessionWrapper, diff --git a/packages/fakeyou/src/v1/OldVocodesContainer.tsx b/packages/fakeyou/src/v1/OldVocodesContainer.tsx index 1a4649889d..2a3c17ba19 100644 --- a/packages/fakeyou/src/v1/OldVocodesContainer.tsx +++ b/packages/fakeyou/src/v1/OldVocodesContainer.tsx @@ -15,7 +15,7 @@ import { VideoJob, VideoJobStatus } from './modes/video/VideoJob'; import { VideoJobPoller } from './modes/video/VideoJobPoller'; import { VideoQueuePoller } from './modes/video/VideoQueuePoller'; import { VideoQueueStats } from './modes/video/VideoQueueStats'; -import { ApiConfig } from '../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionStateResponse } from './api/SessionState'; import { Link } from 'react-router-dom'; import { FrontendUrlConfig } from '../common/FrontendUrlConfig'; diff --git a/packages/fakeyou/src/v2/api/category/AssignTtsCategory.ts b/packages/fakeyou/src/v2/api/category/AssignTtsCategory.ts index f6829774a6..410da39ed6 100644 --- a/packages/fakeyou/src/v2/api/category/AssignTtsCategory.ts +++ b/packages/fakeyou/src/v2/api/category/AssignTtsCategory.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface AssignTtsCategoryRequest { category_token: string, diff --git a/packages/fakeyou/src/v2/api/category/CreateCategory.ts b/packages/fakeyou/src/v2/api/category/CreateCategory.ts index 1cb9df1cb7..f734797d15 100644 --- a/packages/fakeyou/src/v2/api/category/CreateCategory.ts +++ b/packages/fakeyou/src/v2/api/category/CreateCategory.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface CreateCategoryRequest { name: string, diff --git a/packages/fakeyou/src/v2/api/category/GetCategory.ts b/packages/fakeyou/src/v2/api/category/GetCategory.ts index 51581196ba..b82902d973 100644 --- a/packages/fakeyou/src/v2/api/category/GetCategory.ts +++ b/packages/fakeyou/src/v2/api/category/GetCategory.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface GetCategorySuccessResponse { success: boolean, diff --git a/packages/fakeyou/src/v2/api/category/ListTtsCategories.ts b/packages/fakeyou/src/v2/api/category/ListTtsCategories.ts index 1753431642..35e358ea77 100644 --- a/packages/fakeyou/src/v2/api/category/ListTtsCategories.ts +++ b/packages/fakeyou/src/v2/api/category/ListTtsCategories.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface ListTtsCategoriesSuccessResponse { success: boolean, diff --git a/packages/fakeyou/src/v2/api/category/ListTtsCategoriesForModel.ts b/packages/fakeyou/src/v2/api/category/ListTtsCategoriesForModel.ts index b244c6912c..29aaa34382 100644 --- a/packages/fakeyou/src/v2/api/category/ListTtsCategoriesForModel.ts +++ b/packages/fakeyou/src/v2/api/category/ListTtsCategoriesForModel.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface ListTtsCategoriesForModelSuccessResponse { success: boolean, diff --git a/packages/fakeyou/src/v2/api/misc/GetLeaderboard.ts b/packages/fakeyou/src/v2/api/misc/GetLeaderboard.ts index ed15b6c3a9..6202df8661 100644 --- a/packages/fakeyou/src/v2/api/misc/GetLeaderboard.ts +++ b/packages/fakeyou/src/v2/api/misc/GetLeaderboard.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface Leaderboard { success: boolean, diff --git a/packages/fakeyou/src/v2/api/moderation/GetPendingW2lTemplates.ts b/packages/fakeyou/src/v2/api/moderation/GetPendingW2lTemplates.ts index 7ca1dde2ab..878d58e4dc 100644 --- a/packages/fakeyou/src/v2/api/moderation/GetPendingW2lTemplates.ts +++ b/packages/fakeyou/src/v2/api/moderation/GetPendingW2lTemplates.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface PendingW2lTemplates { success: boolean, diff --git a/packages/fakeyou/src/v2/api/moderation/GetTtsInferenceStats.ts b/packages/fakeyou/src/v2/api/moderation/GetTtsInferenceStats.ts index 162f3e80e0..80f1f19c35 100644 --- a/packages/fakeyou/src/v2/api/moderation/GetTtsInferenceStats.ts +++ b/packages/fakeyou/src/v2/api/moderation/GetTtsInferenceStats.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface TtsInferenceStats { success: boolean, diff --git a/packages/fakeyou/src/v2/api/moderation/GetUserList.ts b/packages/fakeyou/src/v2/api/moderation/GetUserList.ts index c127e5570a..3363df3e58 100644 --- a/packages/fakeyou/src/v2/api/moderation/GetUserList.ts +++ b/packages/fakeyou/src/v2/api/moderation/GetUserList.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface GetUserListSuccessResponse { success: boolean, diff --git a/packages/fakeyou/src/v2/api/moderation/GetVoiceInventoryStats.ts b/packages/fakeyou/src/v2/api/moderation/GetVoiceInventoryStats.ts index 7748eae7a8..24736e23ff 100644 --- a/packages/fakeyou/src/v2/api/moderation/GetVoiceInventoryStats.ts +++ b/packages/fakeyou/src/v2/api/moderation/GetVoiceInventoryStats.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface VoiceInventoryStats { success: boolean, diff --git a/packages/fakeyou/src/v2/api/moderation/GetW2lInferenceStats.ts b/packages/fakeyou/src/v2/api/moderation/GetW2lInferenceStats.ts index 99e441b10d..5a0d8b8cb2 100644 --- a/packages/fakeyou/src/v2/api/moderation/GetW2lInferenceStats.ts +++ b/packages/fakeyou/src/v2/api/moderation/GetW2lInferenceStats.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface W2lInferenceStats { success: boolean, diff --git a/packages/fakeyou/src/v2/api/moderation/category/EditCategory.ts b/packages/fakeyou/src/v2/api/moderation/category/EditCategory.ts index 0a77e2891b..aa2262b9ec 100644 --- a/packages/fakeyou/src/v2/api/moderation/category/EditCategory.ts +++ b/packages/fakeyou/src/v2/api/moderation/category/EditCategory.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface EditCategoryRequest { name: string, diff --git a/packages/fakeyou/src/v2/api/moderation/category/ListTtsCategoriesForModeration.ts b/packages/fakeyou/src/v2/api/moderation/category/ListTtsCategoriesForModeration.ts index 1773366d4a..e8bd3e51bd 100644 --- a/packages/fakeyou/src/v2/api/moderation/category/ListTtsCategoriesForModeration.ts +++ b/packages/fakeyou/src/v2/api/moderation/category/ListTtsCategoriesForModeration.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export enum ListTtsCategoriesTriState { Include, diff --git a/packages/fakeyou/src/v2/api/moderation/category/SetCategoryDeletionState.ts b/packages/fakeyou/src/v2/api/moderation/category/SetCategoryDeletionState.ts index 4c78bf1264..cc5279f4b4 100644 --- a/packages/fakeyou/src/v2/api/moderation/category/SetCategoryDeletionState.ts +++ b/packages/fakeyou/src/v2/api/moderation/category/SetCategoryDeletionState.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface SetCategoryDeletionStateSuccessResponse { success: boolean, diff --git a/packages/fakeyou/src/v2/api/tts/GetTtsModel.ts b/packages/fakeyou/src/v2/api/tts/GetTtsModel.ts index 6a29ecc1c7..f1d535642e 100644 --- a/packages/fakeyou/src/v2/api/tts/GetTtsModel.ts +++ b/packages/fakeyou/src/v2/api/tts/GetTtsModel.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface TtsModel { model_token: string, diff --git a/packages/fakeyou/src/v2/api/tts/GetTtsModelUseCount.ts b/packages/fakeyou/src/v2/api/tts/GetTtsModelUseCount.ts index 93e8aa7b6c..8205eff3a9 100644 --- a/packages/fakeyou/src/v2/api/tts/GetTtsModelUseCount.ts +++ b/packages/fakeyou/src/v2/api/tts/GetTtsModelUseCount.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; interface TtsModelUseCountResponsePayload { success: boolean, diff --git a/packages/fakeyou/src/v2/api/tts/GetTtsResult.ts b/packages/fakeyou/src/v2/api/tts/GetTtsResult.ts index 349f896f9c..de05a1c6cb 100644 --- a/packages/fakeyou/src/v2/api/tts/GetTtsResult.ts +++ b/packages/fakeyou/src/v2/api/tts/GetTtsResult.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface TtsResult { tts_result_token: string, diff --git a/packages/fakeyou/src/v2/api/tts/ListTtsModels.ts b/packages/fakeyou/src/v2/api/tts/ListTtsModels.ts index ea6ecb3f24..d8ef548e65 100644 --- a/packages/fakeyou/src/v2/api/tts/ListTtsModels.ts +++ b/packages/fakeyou/src/v2/api/tts/ListTtsModels.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; interface TtsModelListResponsePayload { success: boolean, diff --git a/packages/fakeyou/src/v2/api/user/CreateAccount.ts b/packages/fakeyou/src/v2/api/user/CreateAccount.ts index cdb7288d6e..3b65cab8fc 100644 --- a/packages/fakeyou/src/v2/api/user/CreateAccount.ts +++ b/packages/fakeyou/src/v2/api/user/CreateAccount.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface CreateAccountRequest { username: string, diff --git a/packages/fakeyou/src/v2/api/user/CreateSession.ts b/packages/fakeyou/src/v2/api/user/CreateSession.ts index 1d8e249b12..6680de19aa 100644 --- a/packages/fakeyou/src/v2/api/user/CreateSession.ts +++ b/packages/fakeyou/src/v2/api/user/CreateSession.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface CreateSessionRequest { username_or_email: string, diff --git a/packages/fakeyou/src/v2/api/user/GetUserByUsername.ts b/packages/fakeyou/src/v2/api/user/GetUserByUsername.ts index 1926dd371a..2c293e4f92 100644 --- a/packages/fakeyou/src/v2/api/user/GetUserByUsername.ts +++ b/packages/fakeyou/src/v2/api/user/GetUserByUsername.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface User { user_token: string, diff --git a/packages/fakeyou/src/v2/api/w2l/GetW2lResult.ts b/packages/fakeyou/src/v2/api/w2l/GetW2lResult.ts index b86a6aaa38..858f50f8be 100644 --- a/packages/fakeyou/src/v2/api/w2l/GetW2lResult.ts +++ b/packages/fakeyou/src/v2/api/w2l/GetW2lResult.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface W2lResult { w2l_result_token: string, diff --git a/packages/fakeyou/src/v2/api/w2l/GetW2lTemplate.ts b/packages/fakeyou/src/v2/api/w2l/GetW2lTemplate.ts index 5ae986f650..527a55a51e 100644 --- a/packages/fakeyou/src/v2/api/w2l/GetW2lTemplate.ts +++ b/packages/fakeyou/src/v2/api/w2l/GetW2lTemplate.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; export interface W2lTemplate { template_token: string, diff --git a/packages/fakeyou/src/v2/api/w2l/GetW2lTemplateUseCount.ts b/packages/fakeyou/src/v2/api/w2l/GetW2lTemplateUseCount.ts index a697b5aaae..3ccf7ebafb 100644 --- a/packages/fakeyou/src/v2/api/w2l/GetW2lTemplateUseCount.ts +++ b/packages/fakeyou/src/v2/api/w2l/GetW2lTemplateUseCount.ts @@ -1,4 +1,4 @@ -import { ApiConfig } from "../../../common/ApiConfig"; +import { ApiConfig } from "@storyteller/components"; interface W2lTemplateUseCountResponsePayload { success: boolean, diff --git a/packages/fakeyou/src/v2/view/firehose/FirehoseEventListFc.tsx b/packages/fakeyou/src/v2/view/firehose/FirehoseEventListFc.tsx index 1ef29ff947..3eede3e0b1 100644 --- a/packages/fakeyou/src/v2/view/firehose/FirehoseEventListFc.tsx +++ b/packages/fakeyou/src/v2/view/firehose/FirehoseEventListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useRef } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionWrapper } from '../../../session/SessionWrapper'; import { Link } from "react-router-dom"; import { GravatarFc } from '../_common/GravatarFc'; diff --git a/packages/fakeyou/src/v2/view/moderation/moderation_ip_ban_list/ModerationIpBanListFc.tsx b/packages/fakeyou/src/v2/view/moderation/moderation_ip_ban_list/ModerationIpBanListFc.tsx index a67859e83d..f56bf1581f 100644 --- a/packages/fakeyou/src/v2/view/moderation/moderation_ip_ban_list/ModerationIpBanListFc.tsx +++ b/packages/fakeyou/src/v2/view/moderation/moderation_ip_ban_list/ModerationIpBanListFc.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; import { Link, useHistory } from 'react-router-dom'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { formatDistance } from 'date-fns'; import { BackLink } from '../../_common/BackLink'; diff --git a/packages/fakeyou/src/v2/view/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx b/packages/fakeyou/src/v2/view/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx index f11915bf03..c461e95269 100644 --- a/packages/fakeyou/src/v2/view/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx +++ b/packages/fakeyou/src/v2/view/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { Link, useHistory, useParams } from 'react-router-dom'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { formatDistance } from 'date-fns'; diff --git a/packages/fakeyou/src/v2/view/profile/profile_ban/ProfileBanFc.tsx b/packages/fakeyou/src/v2/view/profile/profile_ban/ProfileBanFc.tsx index 5564ed1307..9a550fec1e 100644 --- a/packages/fakeyou/src/v2/view/profile/profile_ban/ProfileBanFc.tsx +++ b/packages/fakeyou/src/v2/view/profile/profile_ban/ProfileBanFc.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useEffect, useState } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { useHistory } from 'react-router-dom'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams } from 'react-router-dom'; diff --git a/packages/fakeyou/src/v2/view/profile/profile_edit/ProfileEditFc.tsx b/packages/fakeyou/src/v2/view/profile/profile_edit/ProfileEditFc.tsx index 6e749f9024..a61aa0ea54 100644 --- a/packages/fakeyou/src/v2/view/profile/profile_edit/ProfileEditFc.tsx +++ b/packages/fakeyou/src/v2/view/profile/profile_edit/ProfileEditFc.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { useHistory } from 'react-router-dom'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams } from 'react-router-dom'; diff --git a/packages/fakeyou/src/v2/view/profile/profile_view/Profile_TtsInferenceResultListFc.tsx b/packages/fakeyou/src/v2/view/profile/profile_view/Profile_TtsInferenceResultListFc.tsx index f7654168ab..51dbdda159 100644 --- a/packages/fakeyou/src/v2/view/profile/profile_view/Profile_TtsInferenceResultListFc.tsx +++ b/packages/fakeyou/src/v2/view/profile/profile_view/Profile_TtsInferenceResultListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig, ListTtsInferenceResultsForUserArgs } from '../../../../common/ApiConfig'; +import { ApiConfig, ListTtsInferenceResultsForUserArgs } from '@storyteller/components'; import { Link } from 'react-router-dom'; import { formatDistance } from 'date-fns'; import { VisibleIconFc } from '../../_icons/VisibleIcon'; diff --git a/packages/fakeyou/src/v2/view/profile/profile_view/Profile_TtsModelListFc.tsx b/packages/fakeyou/src/v2/view/profile/profile_view/Profile_TtsModelListFc.tsx index 38a221a88b..4632b08c29 100644 --- a/packages/fakeyou/src/v2/view/profile/profile_view/Profile_TtsModelListFc.tsx +++ b/packages/fakeyou/src/v2/view/profile/profile_view/Profile_TtsModelListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { Link } from 'react-router-dom'; import { formatDistance } from 'date-fns'; diff --git a/packages/fakeyou/src/v2/view/profile/profile_view/Profile_W2lInferenceResultListFc.tsx b/packages/fakeyou/src/v2/view/profile/profile_view/Profile_W2lInferenceResultListFc.tsx index 0428e037aa..1aebe3f70b 100644 --- a/packages/fakeyou/src/v2/view/profile/profile_view/Profile_W2lInferenceResultListFc.tsx +++ b/packages/fakeyou/src/v2/view/profile/profile_view/Profile_W2lInferenceResultListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig, ListW2lInferenceResultsForUserArgs } from '../../../../common/ApiConfig'; +import { ApiConfig, ListW2lInferenceResultsForUserArgs } from '@storyteller/components'; import { Link } from 'react-router-dom'; import { formatDistance } from 'date-fns' import { VisibleIconFc } from '../../_icons/VisibleIcon'; diff --git a/packages/fakeyou/src/v2/view/profile/profile_view/Profile_W2lTemplateListFc.tsx b/packages/fakeyou/src/v2/view/profile/profile_view/Profile_W2lTemplateListFc.tsx index 98ef1806f3..dff81c7631 100644 --- a/packages/fakeyou/src/v2/view/profile/profile_view/Profile_W2lTemplateListFc.tsx +++ b/packages/fakeyou/src/v2/view/profile/profile_view/Profile_W2lTemplateListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { Link } from "react-router-dom"; //import { getRandomInt } from '../../../../v1/api/Utils'; import { BucketConfig } from '../../../../common/BucketConfig'; diff --git a/packages/fakeyou/src/v2/view/tts/tts_model_delete/TtsModelDeleteFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_model_delete/TtsModelDeleteFc.tsx index 467fad0c18..f23b4a39b4 100644 --- a/packages/fakeyou/src/v2/view/tts/tts_model_delete/TtsModelDeleteFc.tsx +++ b/packages/fakeyou/src/v2/view/tts/tts_model_delete/TtsModelDeleteFc.tsx @@ -1,6 +1,5 @@ - import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; diff --git a/packages/fakeyou/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx index 914dab3a3a..f1b5bd6af1 100644 --- a/packages/fakeyou/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx +++ b/packages/fakeyou/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { TtsInferenceJob } from '../../../../jobs/TtsInferenceJobs'; import { useParams, useHistory } from 'react-router-dom'; diff --git a/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx index db8a276ece..36d1d5ed84 100644 --- a/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx +++ b/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { Link } from 'react-router-dom'; import { SessionTtsInferenceResultListFc } from '../../_common/SessionTtsInferenceResultsListFc'; import { SessionTtsModelUploadResultListFc } from '../../_common/SessionTtsModelUploadResultsListFc'; diff --git a/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx index 48217a36d1..b908d8aaad 100644 --- a/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx +++ b/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { EnqueueJobResponsePayload } from '../tts_model_list/TtsModelListFc'; import { SessionTtsInferenceResultListFc } from '../../_common/SessionTtsInferenceResultsListFc'; import { SessionWrapper } from '../../../../session/SessionWrapper'; diff --git a/packages/fakeyou/src/v2/view/tts/tts_result_delete/TtsResultDeleteFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_result_delete/TtsResultDeleteFc.tsx index 78f6581059..32e4c04110 100644 --- a/packages/fakeyou/src/v2/view/tts/tts_result_delete/TtsResultDeleteFc.tsx +++ b/packages/fakeyou/src/v2/view/tts/tts_result_delete/TtsResultDeleteFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; import { GravatarFc } from '../../_common/GravatarFc'; diff --git a/packages/fakeyou/src/v2/view/tts/tts_result_edit/TtsResultEditFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_result_edit/TtsResultEditFc.tsx index 3a9712a638..e5847940c5 100644 --- a/packages/fakeyou/src/v2/view/tts/tts_result_edit/TtsResultEditFc.tsx +++ b/packages/fakeyou/src/v2/view/tts/tts_result_edit/TtsResultEditFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; diff --git a/packages/fakeyou/src/v2/view/upload/UploadComponent.tsx b/packages/fakeyou/src/v2/view/upload/UploadComponent.tsx index 866571436d..ea8e7bcb82 100644 --- a/packages/fakeyou/src/v2/view/upload/UploadComponent.tsx +++ b/packages/fakeyou/src/v2/view/upload/UploadComponent.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionWrapper } from '../../../session/SessionWrapper'; import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs'; import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs'; diff --git a/packages/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx b/packages/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx index 9a33d78cf0..c92618d39c 100644 --- a/packages/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx +++ b/packages/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionTtsModelUploadResultListFc } from '../_common/SessionTtsModelUploadResultsListFc'; import { SessionWrapper } from '../../../session/SessionWrapper'; import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs'; diff --git a/packages/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx b/packages/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx index 72d8b98198..48f0379696 100644 --- a/packages/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx +++ b/packages/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionWrapper } from '../../../session/SessionWrapper'; import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs'; import { useHistory } from "react-router-dom"; diff --git a/packages/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx b/packages/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx index ce2966e460..4510478379 100644 --- a/packages/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx +++ b/packages/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionW2lTemplateUploadResultListFc } from '../_common/SessionW2lTemplateUploadResultsListFc'; import { SessionWrapper } from '../../../session/SessionWrapper'; import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs'; diff --git a/packages/fakeyou/src/v2/view/w2l/w2l_result_delete/W2lResultDeleteFc.tsx b/packages/fakeyou/src/v2/view/w2l/w2l_result_delete/W2lResultDeleteFc.tsx index ba2704833c..45b5782492 100644 --- a/packages/fakeyou/src/v2/view/w2l/w2l_result_delete/W2lResultDeleteFc.tsx +++ b/packages/fakeyou/src/v2/view/w2l/w2l_result_delete/W2lResultDeleteFc.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; diff --git a/packages/fakeyou/src/v2/view/w2l/w2l_result_edit/W2lResultEditFc.tsx b/packages/fakeyou/src/v2/view/w2l/w2l_result_edit/W2lResultEditFc.tsx index 9bd532c35a..3757151111 100644 --- a/packages/fakeyou/src/v2/view/w2l/w2l_result_edit/W2lResultEditFc.tsx +++ b/packages/fakeyou/src/v2/view/w2l/w2l_result_edit/W2lResultEditFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; diff --git a/packages/fakeyou/src/v2/view/w2l/w2l_template_approve/W2lTemplateApproveFc.tsx b/packages/fakeyou/src/v2/view/w2l/w2l_template_approve/W2lTemplateApproveFc.tsx index a33e6ccceb..f293d3559e 100644 --- a/packages/fakeyou/src/v2/view/w2l/w2l_template_approve/W2lTemplateApproveFc.tsx +++ b/packages/fakeyou/src/v2/view/w2l/w2l_template_approve/W2lTemplateApproveFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; diff --git a/packages/fakeyou/src/v2/view/w2l/w2l_template_delete/W2lTemplateDeleteFc.tsx b/packages/fakeyou/src/v2/view/w2l/w2l_template_delete/W2lTemplateDeleteFc.tsx index d746c445b9..49d30dfef9 100644 --- a/packages/fakeyou/src/v2/view/w2l/w2l_template_delete/W2lTemplateDeleteFc.tsx +++ b/packages/fakeyou/src/v2/view/w2l/w2l_template_delete/W2lTemplateDeleteFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; diff --git a/packages/fakeyou/src/v2/view/w2l/w2l_template_edit/W2lTemplateEditFc.tsx b/packages/fakeyou/src/v2/view/w2l/w2l_template_edit/W2lTemplateEditFc.tsx index 50e3763b6f..626cf6c241 100644 --- a/packages/fakeyou/src/v2/view/w2l/w2l_template_edit/W2lTemplateEditFc.tsx +++ b/packages/fakeyou/src/v2/view/w2l/w2l_template_edit/W2lTemplateEditFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, useHistory } from 'react-router-dom'; import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; diff --git a/packages/fakeyou/src/v2/view/w2l/w2l_template_list/W2lTemplateListFc.tsx b/packages/fakeyou/src/v2/view/w2l/w2l_template_list/W2lTemplateListFc.tsx index f88ab0a456..e1a4f04b47 100644 --- a/packages/fakeyou/src/v2/view/w2l/w2l_template_list/W2lTemplateListFc.tsx +++ b/packages/fakeyou/src/v2/view/w2l/w2l_template_list/W2lTemplateListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { Link } from "react-router-dom"; //import { getRandomInt } from '../../../../v1/api/Utils'; diff --git a/packages/fakeyou/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx b/packages/fakeyou/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx index e504c149cc..931c6e3e03 100644 --- a/packages/fakeyou/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx +++ b/packages/fakeyou/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect, useCallback } from 'react'; import axios from 'axios'; -import { ApiConfig } from '../../../../common/ApiConfig'; +import { ApiConfig } from '@storyteller/components'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { W2lInferenceJob } from '../../../../App'; import { useParams, Link } from 'react-router-dom'; diff --git a/packages/storyteller/package.json b/packages/storyteller/package.json index 4088b6c61a..fe141456da 100644 --- a/packages/storyteller/package.json +++ b/packages/storyteller/package.json @@ -3,12 +3,12 @@ "version": "0.1.0", "private": true, "dependencies": { + "@storyteller/components": "0.1.0", "@craco/craco": "^6.4.3", "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-brands-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", "@fortawesome/react-fontawesome": "^0.1.15", - "@storyteller/components": "0.1.0", "@testing-library/jest-dom": "^5.16.1", "@testing-library/react": "^9.5.0", "@testing-library/user-event": "^13.5.0", diff --git a/packages/storyteller/src/pages/obs-layer/ObsLayerPage.tsx b/packages/storyteller/src/pages/obs-layer/ObsLayerPage.tsx index b64da85d01..0569bb50f3 100644 --- a/packages/storyteller/src/pages/obs-layer/ObsLayerPage.tsx +++ b/packages/storyteller/src/pages/obs-layer/ObsLayerPage.tsx @@ -1,5 +1,6 @@ import React, { useEffect } from 'react'; import { useParams } from 'react-router-dom'; +import { ApiConfig } from '@storyteller/components'; function ObsLayerPage() { const { username } : { username : string } = useParams(); @@ -22,7 +23,7 @@ function ObsLayerPage() { } function openWebsocket(twitchUsername: string) { - const url = `ws://localhost:54321/obs/${twitchUsername}`; + const url = new ApiConfig().obsEventsWebsocket(twitchUsername); const sock = new WebSocket(url); sock.onopen = function (event: Event) {