diff --git a/vocodes/src/App.tsx b/vocodes/src/App.tsx index bbf9c7d7e7..31ab2bb0a8 100644 --- a/vocodes/src/App.tsx +++ b/vocodes/src/App.tsx @@ -2,7 +2,7 @@ import 'bulma/css/bulma.css' import './App.scss'; import React from 'react'; -import { ApiConfig } from './v1/api/ApiConfig'; +import { ApiConfig } from './common/ApiConfig'; import { BrowserRouter, Route, Switch } from "react-router-dom"; import { MigrationTopNav } from './migration/MigrationTopNav'; import { NewVocodesContainer } from './v2/NewVocodesContainer'; diff --git a/vocodes/src/v1/api/ApiConfig.ts b/vocodes/src/common/ApiConfig.ts similarity index 100% rename from vocodes/src/v1/api/ApiConfig.ts rename to vocodes/src/common/ApiConfig.ts diff --git a/vocodes/src/migration/MigrationTopNav_Session.tsx b/vocodes/src/migration/MigrationTopNav_Session.tsx index d8055c51ab..df367fda82 100644 --- a/vocodes/src/migration/MigrationTopNav_Session.tsx +++ b/vocodes/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 '../v1/api/ApiConfig'; +import { ApiConfig } from '../common/ApiConfig'; interface Props { sessionWrapper: SessionWrapper, diff --git a/vocodes/src/v1/OldVocodesContainer.tsx b/vocodes/src/v1/OldVocodesContainer.tsx index 44a7c51583..e72ef94f0d 100644 --- a/vocodes/src/v1/OldVocodesContainer.tsx +++ b/vocodes/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 './api/ApiConfig'; +import { ApiConfig } from '../common/ApiConfig'; import { SessionStateResponse } from './api/SessionState'; interface Props { diff --git a/vocodes/src/v2/firehose/FirehoseEventListFc.tsx b/vocodes/src/v2/firehose/FirehoseEventListFc.tsx index d771dbdc7e..90dfd536f5 100644 --- a/vocodes/src/v2/firehose/FirehoseEventListFc.tsx +++ b/vocodes/src/v2/firehose/FirehoseEventListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useRef } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { SessionWrapper } from '../../session/SessionWrapper'; import { Link } from "react-router-dom"; import { GravatarFc } from '../common/GravatarFc'; diff --git a/vocodes/src/v2/login/LoginComponent.tsx b/vocodes/src/v2/login/LoginComponent.tsx index 656cfee58a..440817fe4c 100644 --- a/vocodes/src/v2/login/LoginComponent.tsx +++ b/vocodes/src/v2/login/LoginComponent.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { useHistory, withRouter } from "react-router-dom"; import { History } from 'history' import { SessionWrapper } from '../../session/SessionWrapper'; diff --git a/vocodes/src/v2/login/LoginFc.tsx b/vocodes/src/v2/login/LoginFc.tsx index 9dcb7c2db3..efdfc04f8e 100644 --- a/vocodes/src/v2/login/LoginFc.tsx +++ b/vocodes/src/v2/login/LoginFc.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { SessionWrapper } from '../../session/SessionWrapper'; import { useHistory } from "react-router-dom"; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; //enum FieldTriState { // EMPTY_FALSE, diff --git a/vocodes/src/v2/profile/ProfileFc.tsx b/vocodes/src/v2/profile/ProfileFc.tsx index 9ba7d63a7f..4aac738f1d 100644 --- a/vocodes/src/v2/profile/ProfileFc.tsx +++ b/vocodes/src/v2/profile/ProfileFc.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { GravatarFc } from '../common/GravatarFc'; import { Link } from 'react-router-dom'; import { ProfileTtsInferenceResultsListFc } from './Profile_TtsInferenceResultListFc'; diff --git a/vocodes/src/v2/profile/Profile_TtsInferenceResultListFc.tsx b/vocodes/src/v2/profile/Profile_TtsInferenceResultListFc.tsx index 94bc38c51e..7692ab3903 100644 --- a/vocodes/src/v2/profile/Profile_TtsInferenceResultListFc.tsx +++ b/vocodes/src/v2/profile/Profile_TtsInferenceResultListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { Link } from "react-router-dom"; interface TtsInferenceResultListResponsePayload { diff --git a/vocodes/src/v2/profile/Profile_TtsModelListFc.tsx b/vocodes/src/v2/profile/Profile_TtsModelListFc.tsx index 034d8a8c31..f6df05d1d7 100644 --- a/vocodes/src/v2/profile/Profile_TtsModelListFc.tsx +++ b/vocodes/src/v2/profile/Profile_TtsModelListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { Link } from "react-router-dom"; import { getRandomInt } from '../../Utils'; diff --git a/vocodes/src/v2/profile/Profile_W2lInferenceResultListFc.tsx b/vocodes/src/v2/profile/Profile_W2lInferenceResultListFc.tsx index 7cfb3a45bc..96b98a597f 100644 --- a/vocodes/src/v2/profile/Profile_W2lInferenceResultListFc.tsx +++ b/vocodes/src/v2/profile/Profile_W2lInferenceResultListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { Link } from "react-router-dom"; interface W2lInferenceResultListResponsePayload { diff --git a/vocodes/src/v2/profile/Profile_W2lTemplateListFc.tsx b/vocodes/src/v2/profile/Profile_W2lTemplateListFc.tsx index 68211fedc3..4c3788851b 100644 --- a/vocodes/src/v2/profile/Profile_W2lTemplateListFc.tsx +++ b/vocodes/src/v2/profile/Profile_W2lTemplateListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { Link } from "react-router-dom"; import { getRandomInt } from '../../Utils'; diff --git a/vocodes/src/v2/profile_data/ProfileData_W2lTemplateListFc.tsx b/vocodes/src/v2/profile_data/ProfileData_W2lTemplateListFc.tsx index 84748d2998..f334b021ba 100644 --- a/vocodes/src/v2/profile_data/ProfileData_W2lTemplateListFc.tsx +++ b/vocodes/src/v2/profile_data/ProfileData_W2lTemplateListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { Link } from "react-router-dom"; import { getRandomInt } from '../../Utils'; diff --git a/vocodes/src/v2/profile_edit/ProfileEditFc.tsx b/vocodes/src/v2/profile_edit/ProfileEditFc.tsx index b2f88ec94c..bce9904af5 100644 --- a/vocodes/src/v2/profile_edit/ProfileEditFc.tsx +++ b/vocodes/src/v2/profile_edit/ProfileEditFc.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { GravatarFc } from '../common/GravatarFc'; import { Link } from 'react-router-dom'; import { SessionWrapper } from '../../session/SessionWrapper'; diff --git a/vocodes/src/v2/signup/SignupComponent.tsx b/vocodes/src/v2/signup/SignupComponent.tsx index 1527bc5d8e..3aa6c9a684 100644 --- a/vocodes/src/v2/signup/SignupComponent.tsx +++ b/vocodes/src/v2/signup/SignupComponent.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { Mode } from '../../AppMode'; import { SessionWrapper } from '../../session/SessionWrapper'; import { Link } from 'react-router-dom'; diff --git a/vocodes/src/v2/tts_model_list/TtsModelFormFc.tsx b/vocodes/src/v2/tts_model_list/TtsModelFormFc.tsx index 4926daa638..d7fc3b0c8d 100644 --- a/vocodes/src/v2/tts_model_list/TtsModelFormFc.tsx +++ b/vocodes/src/v2/tts_model_list/TtsModelFormFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { Link } from 'react-router-dom'; import { SessionTtsInferenceResultListFc } from '../common/SessionTtsInferenceResultsListFc'; import { SessionWrapper } from '../../session/SessionWrapper'; diff --git a/vocodes/src/v2/tts_model_list/TtsModelListComponent.tsx b/vocodes/src/v2/tts_model_list/TtsModelListComponent.tsx index 44c29599b1..b9e95defef 100644 --- a/vocodes/src/v2/tts_model_list/TtsModelListComponent.tsx +++ b/vocodes/src/v2/tts_model_list/TtsModelListComponent.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { Mode } from '../../AppMode'; import { SessionWrapper } from '../../session/SessionWrapper'; diff --git a/vocodes/src/v2/tts_model_view/TtsModelViewComponent.tsx b/vocodes/src/v2/tts_model_view/TtsModelViewComponent.tsx index 148b09f4f4..641aa18e7f 100644 --- a/vocodes/src/v2/tts_model_view/TtsModelViewComponent.tsx +++ b/vocodes/src/v2/tts_model_view/TtsModelViewComponent.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { Mode } from '../../AppMode'; import { SessionWrapper } from '../../session/SessionWrapper'; diff --git a/vocodes/src/v2/tts_model_view/TtsModelViewFc.tsx b/vocodes/src/v2/tts_model_view/TtsModelViewFc.tsx index 1968fa4a8a..d1f3cefc45 100644 --- a/vocodes/src/v2/tts_model_view/TtsModelViewFc.tsx +++ b/vocodes/src/v2/tts_model_view/TtsModelViewFc.tsx @@ -1,7 +1,7 @@ import React, { useState, useEffect } from 'react'; //import axios from 'axios'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { EnqueueJobResponsePayload } from '../tts_model_list/TtsModelFormFc'; import { SessionTtsInferenceResultListFc } from '../common/SessionTtsInferenceResultsListFc'; import { SessionWrapper } from '../../session/SessionWrapper'; diff --git a/vocodes/src/v2/tts_result_view/TtsResultViewFc.tsx b/vocodes/src/v2/tts_result_view/TtsResultViewFc.tsx index b097b86123..097d9dfa3a 100644 --- a/vocodes/src/v2/tts_result_view/TtsResultViewFc.tsx +++ b/vocodes/src/v2/tts_result_view/TtsResultViewFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { SessionWrapper } from '../../session/SessionWrapper'; import { useParams, Link } from 'react-router-dom'; import { GravatarFc } from '../common/GravatarFc'; diff --git a/vocodes/src/v2/upload/UploadComponent.tsx b/vocodes/src/v2/upload/UploadComponent.tsx index 5a40006938..5b6645fac3 100644 --- a/vocodes/src/v2/upload/UploadComponent.tsx +++ b/vocodes/src/v2/upload/UploadComponent.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { v4 } from 'uuid'; import { SessionWrapper } from '../../session/SessionWrapper'; diff --git a/vocodes/src/v2/upload/UploadTtsModelFc.tsx b/vocodes/src/v2/upload/UploadTtsModelFc.tsx index 8ae19877d7..7e54458875 100644 --- a/vocodes/src/v2/upload/UploadTtsModelFc.tsx +++ b/vocodes/src/v2/upload/UploadTtsModelFc.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { SessionWrapper } from '../../session/SessionWrapper'; import { useHistory, Link } from "react-router-dom"; import { v1 as uuidv1 } from 'uuid'; diff --git a/vocodes/src/v2/upload/UploadW2lPhotoFc.tsx b/vocodes/src/v2/upload/UploadW2lPhotoFc.tsx index 35e514c027..1fcd5a9c4c 100644 --- a/vocodes/src/v2/upload/UploadW2lPhotoFc.tsx +++ b/vocodes/src/v2/upload/UploadW2lPhotoFc.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { SessionWrapper } from '../../session/SessionWrapper'; import { useHistory, Link } from "react-router-dom"; import { v1 as uuidv1 } from 'uuid'; diff --git a/vocodes/src/v2/upload/UploadW2lVideoFc.tsx b/vocodes/src/v2/upload/UploadW2lVideoFc.tsx index 11d3928cfa..36955cfd64 100644 --- a/vocodes/src/v2/upload/UploadW2lVideoFc.tsx +++ b/vocodes/src/v2/upload/UploadW2lVideoFc.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { SessionWrapper } from '../../session/SessionWrapper'; import { useHistory, Link } from "react-router-dom"; import { v1 as uuidv1 } from 'uuid'; diff --git a/vocodes/src/v2/w2l_result_view/W2lResultViewFc.tsx b/vocodes/src/v2/w2l_result_view/W2lResultViewFc.tsx index 8a619f0c03..5ab38db2ba 100644 --- a/vocodes/src/v2/w2l_result_view/W2lResultViewFc.tsx +++ b/vocodes/src/v2/w2l_result_view/W2lResultViewFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { GravatarFc } from '../common/GravatarFc'; import { SessionWrapper } from '../../session/SessionWrapper'; import { useParams, Link } from 'react-router-dom'; diff --git a/vocodes/src/v2/w2l_template_list/W2lTemplateListFc.tsx b/vocodes/src/v2/w2l_template_list/W2lTemplateListFc.tsx index 3927fb2df3..779a4a8236 100644 --- a/vocodes/src/v2/w2l_template_list/W2lTemplateListFc.tsx +++ b/vocodes/src/v2/w2l_template_list/W2lTemplateListFc.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { SessionWrapper } from '../../session/SessionWrapper'; import { Link } from "react-router-dom"; import { getRandomInt } from '../../Utils'; diff --git a/vocodes/src/v2/w2l_template_view/W2lTemplateViewFc.tsx b/vocodes/src/v2/w2l_template_view/W2lTemplateViewFc.tsx index 3dac9d06c1..1d1a789bea 100644 --- a/vocodes/src/v2/w2l_template_view/W2lTemplateViewFc.tsx +++ b/vocodes/src/v2/w2l_template_view/W2lTemplateViewFc.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; import axios from 'axios'; -import { ApiConfig } from '../../v1/api/ApiConfig'; +import { ApiConfig } from '../../common/ApiConfig'; import { SessionWrapper } from '../../session/SessionWrapper'; import { W2lInferenceJob } from '../../App'; import { useParams, Link } from 'react-router-dom';