diff --git a/vocodes/src/App.tsx b/vocodes/src/App.tsx index ed5fae8b3b..f950b0a551 100644 --- a/vocodes/src/App.tsx +++ b/vocodes/src/App.tsx @@ -5,7 +5,7 @@ import React from 'react'; import { ApiConfig } from './common/ApiConfig'; import { BrowserRouter, Route, Switch } from "react-router-dom"; import { MigrationTopNav } from './migration/MigrationTopNav'; -import { NewVocodesContainer } from './v2/NewVocodesContainer'; +import { NewVocodesContainer } from './v2/view/NewVocodesContainer'; import { OldVocodesContainer } from './v1/OldVocodesContainer'; import { SessionStateResponse } from './session/SessionState'; import { SessionWrapper } from './session/SessionWrapper'; diff --git a/vocodes/src/v2/NewFooterNavFc.tsx b/vocodes/src/v2/view/NewFooterNavFc.tsx similarity index 96% rename from vocodes/src/v2/NewFooterNavFc.tsx rename to vocodes/src/v2/view/NewFooterNavFc.tsx index 4f59be2537..c4780f0688 100644 --- a/vocodes/src/v2/NewFooterNavFc.tsx +++ b/vocodes/src/v2/view/NewFooterNavFc.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { SessionWrapper } from '../session/SessionWrapper'; +import { SessionWrapper } from '../../session/SessionWrapper'; import { Link } from 'react-router-dom'; import './_css/footer.scss' diff --git a/vocodes/src/v2/NewTopNavFc.tsx b/vocodes/src/v2/view/NewTopNavFc.tsx similarity index 95% rename from vocodes/src/v2/NewTopNavFc.tsx rename to vocodes/src/v2/view/NewTopNavFc.tsx index 976b12d66c..88d407b22a 100644 --- a/vocodes/src/v2/NewTopNavFc.tsx +++ b/vocodes/src/v2/view/NewTopNavFc.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { SessionWrapper } from '../session/SessionWrapper'; +import { SessionWrapper } from '../../session/SessionWrapper'; import { Link } from 'react-router-dom'; interface Props { diff --git a/vocodes/src/v2/NewVocodesContainer.tsx b/vocodes/src/v2/view/NewVocodesContainer.tsx similarity index 97% rename from vocodes/src/v2/NewVocodesContainer.tsx rename to vocodes/src/v2/view/NewVocodesContainer.tsx index e0b0055a86..25232805fd 100644 --- a/vocodes/src/v2/NewVocodesContainer.tsx +++ b/vocodes/src/v2/view/NewVocodesContainer.tsx @@ -9,16 +9,16 @@ import { NewFooterNavFc } from './NewFooterNavFc'; import { NewTopNavFc } from './NewTopNavFc'; import { ProfileEditFc } from './profile/profile_edit/ProfileEditFc'; import { ProfileFc } from './profile/profile_view/ProfileFc'; -import { SessionWrapper } from '../session/SessionWrapper'; +import { SessionWrapper } from '../../session/SessionWrapper'; import { SignupComponent } from './signup/SignupComponent'; import { Switch, Route } from 'react-router-dom'; import { TermsFc } from './about/terms_page/TermsFc'; -import { TtsInferenceJob, W2lInferenceJob } from '../App'; +import { TtsInferenceJob, W2lInferenceJob } from '../../App'; import { TtsModelDeleteFc } from './tts/tts_model_delete/TtsModelDeleteFc'; import { TtsModelEditFc } from './tts/tts_model_edit/TtsModelEditFc'; import { TtsModelFormFc } from './tts/tts_model_list/TtsModelFormFc'; import { TtsModelListComponent } from './tts/tts_model_list/TtsModelListComponent'; -import { TtsModelUploadJob } from '../jobs/TtsModelUploadJobs'; +import { TtsModelUploadJob } from '../../jobs/TtsModelUploadJobs'; import { TtsModelViewFc } from './tts/tts_model_view/TtsModelViewFc'; import { TtsResultDeleteFc } from './tts/tts_result_delete/TtsResultDeleteFc'; import { TtsResultViewFc } from './tts/tts_result_view/TtsResultViewFc'; @@ -28,7 +28,7 @@ import { UploadW2lPhotoFc } from './upload/UploadW2lPhotoFc'; import { UploadW2lVideoFc } from './upload/UploadW2lVideoFc'; import { W2lResultViewFc } from './w2l/w2l_result_view/W2lResultViewFc'; import { W2lTemplateListFc } from './w2l/w2l_template_list/W2lTemplateListFc'; -import { W2lTemplateUploadJob } from '../jobs/W2lTemplateUploadJobs'; +import { W2lTemplateUploadJob } from '../../jobs/W2lTemplateUploadJobs'; import { W2lTemplateViewFc } from './w2l/w2l_template_view/W2lTemplateViewFc'; import { TtsResultEditFc } from './tts/tts_result_edit/TtsResultEditFc'; import { W2lResultEditFc } from './w2l/w2l_result_edit/W2lResultEditFc'; diff --git a/vocodes/src/v2/common/DiscordReportLinkFc.tsx b/vocodes/src/v2/view/_common/DiscordReportLinkFc.tsx similarity index 100% rename from vocodes/src/v2/common/DiscordReportLinkFc.tsx rename to vocodes/src/v2/view/_common/DiscordReportLinkFc.tsx diff --git a/vocodes/src/v2/common/GravatarFc.tsx b/vocodes/src/v2/view/_common/GravatarFc.tsx similarity index 100% rename from vocodes/src/v2/common/GravatarFc.tsx rename to vocodes/src/v2/view/_common/GravatarFc.tsx diff --git a/vocodes/src/v2/common/SessionTtsInferenceResultsListFc.tsx b/vocodes/src/v2/view/_common/SessionTtsInferenceResultsListFc.tsx similarity index 92% rename from vocodes/src/v2/common/SessionTtsInferenceResultsListFc.tsx rename to vocodes/src/v2/view/_common/SessionTtsInferenceResultsListFc.tsx index b577bb7b14..54cd2d5f0d 100644 --- a/vocodes/src/v2/common/SessionTtsInferenceResultsListFc.tsx +++ b/vocodes/src/v2/view/_common/SessionTtsInferenceResultsListFc.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { Link } from 'react-router-dom'; -import { TtsInferenceJob } from '../../App' -import { BucketConfig } from '../../common/BucketConfig'; -import { JobState } from '../../jobs/JobStates'; +import { TtsInferenceJob } from '../../../App' +import { BucketConfig } from '../../../common/BucketConfig'; +import { JobState } from '../../../jobs/JobStates'; interface Props { ttsInferenceJobs: Array, diff --git a/vocodes/src/v2/common/SessionTtsModelUploadResultsListFc.tsx b/vocodes/src/v2/view/_common/SessionTtsModelUploadResultsListFc.tsx similarity index 93% rename from vocodes/src/v2/common/SessionTtsModelUploadResultsListFc.tsx rename to vocodes/src/v2/view/_common/SessionTtsModelUploadResultsListFc.tsx index 4294c5ebdd..92ad8a5a3e 100644 --- a/vocodes/src/v2/common/SessionTtsModelUploadResultsListFc.tsx +++ b/vocodes/src/v2/view/_common/SessionTtsModelUploadResultsListFc.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Link, } from 'react-router-dom'; -import { JobState } from '../../jobs/JobStates'; -import { TtsModelUploadJob } from '../../jobs/TtsModelUploadJobs'; +import { JobState } from '../../../jobs/JobStates'; +import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs'; interface Props { modelUploadJobs: Array, diff --git a/vocodes/src/v2/common/SessionW2lInferenceResultsListFc.tsx b/vocodes/src/v2/view/_common/SessionW2lInferenceResultsListFc.tsx similarity index 94% rename from vocodes/src/v2/common/SessionW2lInferenceResultsListFc.tsx rename to vocodes/src/v2/view/_common/SessionW2lInferenceResultsListFc.tsx index 3cceef67b8..6b85425ba7 100644 --- a/vocodes/src/v2/common/SessionW2lInferenceResultsListFc.tsx +++ b/vocodes/src/v2/view/_common/SessionW2lInferenceResultsListFc.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Link } from 'react-router-dom'; -import { W2lInferenceJob } from '../../App' -import { JobState } from '../../jobs/JobStates'; +import { W2lInferenceJob } from '../../../App' +import { JobState } from '../../../jobs/JobStates'; interface Props { w2lInferenceJobs: Array, diff --git a/vocodes/src/v2/common/SessionW2lTemplateUploadResultsListFc.tsx b/vocodes/src/v2/view/_common/SessionW2lTemplateUploadResultsListFc.tsx similarity index 93% rename from vocodes/src/v2/common/SessionW2lTemplateUploadResultsListFc.tsx rename to vocodes/src/v2/view/_common/SessionW2lTemplateUploadResultsListFc.tsx index 3740c2385a..2372e9b87a 100644 --- a/vocodes/src/v2/common/SessionW2lTemplateUploadResultsListFc.tsx +++ b/vocodes/src/v2/view/_common/SessionW2lTemplateUploadResultsListFc.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Link, } from 'react-router-dom'; -import { JobState } from '../../jobs/JobStates'; -import { W2lTemplateUploadJob } from '../../jobs/W2lTemplateUploadJobs'; +import { JobState } from '../../../jobs/JobStates'; +import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs'; interface Props { w2lTemplateUploadJobs: Array, diff --git a/vocodes/src/v2/_css/footer.scss b/vocodes/src/v2/view/_css/footer.scss similarity index 100% rename from vocodes/src/v2/_css/footer.scss rename to vocodes/src/v2/view/_css/footer.scss diff --git a/vocodes/src/icons/AsteriskIcon.tsx b/vocodes/src/v2/view/_icons/AsteriskIcon.tsx similarity index 100% rename from vocodes/src/icons/AsteriskIcon.tsx rename to vocodes/src/v2/view/_icons/AsteriskIcon.tsx diff --git a/vocodes/src/icons/DownloadIcon.tsx b/vocodes/src/v2/view/_icons/DownloadIcon.tsx similarity index 100% rename from vocodes/src/icons/DownloadIcon.tsx rename to vocodes/src/v2/view/_icons/DownloadIcon.tsx diff --git a/vocodes/src/icons/EnvelopeIcon.tsx b/vocodes/src/v2/view/_icons/EnvelopeIcon.tsx similarity index 100% rename from vocodes/src/icons/EnvelopeIcon.tsx rename to vocodes/src/v2/view/_icons/EnvelopeIcon.tsx diff --git a/vocodes/src/icons/ExclamationIcon.tsx b/vocodes/src/v2/view/_icons/ExclamationIcon.tsx similarity index 100% rename from vocodes/src/icons/ExclamationIcon.tsx rename to vocodes/src/v2/view/_icons/ExclamationIcon.tsx diff --git a/vocodes/src/icons/HiddenIconFc.tsx b/vocodes/src/v2/view/_icons/HiddenIcon.tsx similarity index 100% rename from vocodes/src/icons/HiddenIconFc.tsx rename to vocodes/src/v2/view/_icons/HiddenIcon.tsx diff --git a/vocodes/src/icons/UploadIcon.tsx b/vocodes/src/v2/view/_icons/UploadIcon.tsx similarity index 100% rename from vocodes/src/icons/UploadIcon.tsx rename to vocodes/src/v2/view/_icons/UploadIcon.tsx diff --git a/vocodes/src/icons/UserIcon.tsx b/vocodes/src/v2/view/_icons/UserIcon.tsx similarity index 100% rename from vocodes/src/icons/UserIcon.tsx rename to vocodes/src/v2/view/_icons/UserIcon.tsx diff --git a/vocodes/src/icons/VisibleIconFc.tsx b/vocodes/src/v2/view/_icons/VisibleIcon.tsx similarity index 100% rename from vocodes/src/icons/VisibleIconFc.tsx rename to vocodes/src/v2/view/_icons/VisibleIcon.tsx diff --git a/vocodes/src/v2/about/about_page/AboutFc.tsx b/vocodes/src/v2/view/about/about_page/AboutFc.tsx similarity index 99% rename from vocodes/src/v2/about/about_page/AboutFc.tsx rename to vocodes/src/v2/view/about/about_page/AboutFc.tsx index 6653dc7ca2..ddab6af906 100644 --- a/vocodes/src/v2/about/about_page/AboutFc.tsx +++ b/vocodes/src/v2/view/about/about_page/AboutFc.tsx @@ -1,4 +1,3 @@ - import React from 'react'; interface Props { diff --git a/vocodes/src/v2/about/terms_page/TermsFc.tsx b/vocodes/src/v2/view/about/terms_page/TermsFc.tsx similarity index 100% rename from vocodes/src/v2/about/terms_page/TermsFc.tsx rename to vocodes/src/v2/view/about/terms_page/TermsFc.tsx diff --git a/vocodes/src/v2/firehose/FirehoseEventListFc.tsx b/vocodes/src/v2/view/firehose/FirehoseEventListFc.tsx similarity index 97% rename from vocodes/src/v2/firehose/FirehoseEventListFc.tsx rename to vocodes/src/v2/view/firehose/FirehoseEventListFc.tsx index 007d6726b6..984918e2f6 100644 --- a/vocodes/src/v2/firehose/FirehoseEventListFc.tsx +++ b/vocodes/src/v2/view/firehose/FirehoseEventListFc.tsx @@ -1,8 +1,8 @@ import React, { useState, useEffect, useRef } from 'react'; -import { ApiConfig } from '../../common/ApiConfig'; -import { SessionWrapper } from '../../session/SessionWrapper'; +import { ApiConfig } from '../../../common/ApiConfig'; +import { SessionWrapper } from '../../../session/SessionWrapper'; import { Link } from "react-router-dom"; -import { GravatarFc } from '../common/GravatarFc'; +import { GravatarFc } from '../_common/GravatarFc'; interface FirehoseEventListResponsePayload { success: boolean, diff --git a/vocodes/src/v2/login/LoginComponent.tsx b/vocodes/src/v2/view/login/LoginComponent.tsx similarity index 97% rename from vocodes/src/v2/login/LoginComponent.tsx rename to vocodes/src/v2/view/login/LoginComponent.tsx index 440817fe4c..d827fc7ec9 100644 --- a/vocodes/src/v2/login/LoginComponent.tsx +++ b/vocodes/src/v2/view/login/LoginComponent.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { ApiConfig } from '../../common/ApiConfig'; +import { ApiConfig } from '../../../common/ApiConfig'; import { useHistory, withRouter } from "react-router-dom"; import { History } from 'history' -import { SessionWrapper } from '../../session/SessionWrapper'; +import { SessionWrapper } from '../../../session/SessionWrapper'; enum FieldTriState { EMPTY_FALSE, diff --git a/vocodes/src/v2/login/LoginFc.tsx b/vocodes/src/v2/view/login/LoginFc.tsx similarity index 93% rename from vocodes/src/v2/login/LoginFc.tsx rename to vocodes/src/v2/view/login/LoginFc.tsx index 6bfbe0da9b..d492ec350f 100644 --- a/vocodes/src/v2/login/LoginFc.tsx +++ b/vocodes/src/v2/view/login/LoginFc.tsx @@ -1,9 +1,9 @@ import React, { useState } from 'react'; -import { SessionWrapper } from '../../session/SessionWrapper'; +import { SessionWrapper } from '../../../session/SessionWrapper'; import { useHistory } from "react-router-dom"; -import { ApiConfig } from '../../common/ApiConfig'; -import { UserIcon } from '../../icons/UserIcon'; -import { EnvelopeIcon } from '../../icons/EnvelopeIcon'; +import { ApiConfig } from '../../../common/ApiConfig'; +import { UserIcon } from '../_icons/UserIcon'; +import { EnvelopeIcon } from '../_icons/EnvelopeIcon'; //enum FieldTriState { // EMPTY_FALSE, diff --git a/vocodes/src/v2/moderation/moderation_ip_ban_list/ModerationIpBanListFc.tsx b/vocodes/src/v2/view/moderation/moderation_ip_ban_list/ModerationIpBanListFc.tsx similarity index 97% rename from vocodes/src/v2/moderation/moderation_ip_ban_list/ModerationIpBanListFc.tsx rename to vocodes/src/v2/view/moderation/moderation_ip_ban_list/ModerationIpBanListFc.tsx index 27ed6a515d..46aa2238b1 100644 --- a/vocodes/src/v2/moderation/moderation_ip_ban_list/ModerationIpBanListFc.tsx +++ b/vocodes/src/v2/view/moderation/moderation_ip_ban_list/ModerationIpBanListFc.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import { Link, useHistory } from 'react-router-dom'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { formatDistance } from 'date-fns'; interface Props { diff --git a/vocodes/src/v2/moderation/moderation_main/ModerationFc.tsx b/vocodes/src/v2/view/moderation/moderation_main/ModerationFc.tsx similarity index 90% rename from vocodes/src/v2/moderation/moderation_main/ModerationFc.tsx rename to vocodes/src/v2/view/moderation/moderation_main/ModerationFc.tsx index 1066e18ec0..f5dfc88c8f 100644 --- a/vocodes/src/v2/moderation/moderation_main/ModerationFc.tsx +++ b/vocodes/src/v2/view/moderation/moderation_main/ModerationFc.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Link } from 'react-router-dom'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; interface Props { sessionWrapper: SessionWrapper, diff --git a/vocodes/src/v2/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx b/vocodes/src/v2/view/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx similarity index 96% rename from vocodes/src/v2/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx rename to vocodes/src/v2/view/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx index 2895c2f4da..f11915bf03 100644 --- a/vocodes/src/v2/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx +++ b/vocodes/src/v2/view/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; +import { ApiConfig } from '../../../../common/ApiConfig'; import { Link, useHistory, useParams } from 'react-router-dom'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { formatDistance } from 'date-fns'; interface Props { diff --git a/vocodes/src/v2/profile/profile_edit/ProfileEditFc.tsx b/vocodes/src/v2/view/profile/profile_edit/ProfileEditFc.tsx similarity index 98% rename from vocodes/src/v2/profile/profile_edit/ProfileEditFc.tsx rename to vocodes/src/v2/view/profile/profile_edit/ProfileEditFc.tsx index f5208f1fd9..0a571533bb 100644 --- a/vocodes/src/v2/profile/profile_edit/ProfileEditFc.tsx +++ b/vocodes/src/v2/view/profile/profile_edit/ProfileEditFc.tsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; +import { ApiConfig } from '../../../../common/ApiConfig'; import { Link, useHistory } from 'react-router-dom'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams } from 'react-router-dom'; -import { VisibleIconFc } from '../../../icons/VisibleIconFc'; -import { HiddenIconFc } from '../../../icons/HiddenIconFc'; +import { VisibleIconFc } from '../../_icons/VisibleIcon'; +import { HiddenIconFc } from '../../_icons/HiddenIcon'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faDiscord, faFirefox, faGithub, faTwitch, faTwitter } from '@fortawesome/free-brands-svg-icons'; import { faDollarSign, faUser } from '@fortawesome/free-solid-svg-icons'; diff --git a/vocodes/src/v2/profile/profile_view/ProfileFc.tsx b/vocodes/src/v2/view/profile/profile_view/ProfileFc.tsx similarity index 97% rename from vocodes/src/v2/profile/profile_view/ProfileFc.tsx rename to vocodes/src/v2/view/profile/profile_view/ProfileFc.tsx index 4de3e22220..8367008d28 100644 --- a/vocodes/src/v2/profile/profile_view/ProfileFc.tsx +++ b/vocodes/src/v2/view/profile/profile_view/ProfileFc.tsx @@ -1,12 +1,12 @@ import React, { useEffect, useState } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { GravatarFc } from '../../common/GravatarFc'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { GravatarFc } from '../../_common/GravatarFc'; import { Link } from 'react-router-dom'; import { ProfileTtsInferenceResultsListFc } from './Profile_TtsInferenceResultListFc'; import { ProfileTtsModelListFc } from './Profile_TtsModelListFc'; import { ProfileW2lInferenceResultsListFc } from './Profile_W2lInferenceResultListFc'; import { ProfileW2lTemplateListFc } from './Profile_W2lTemplateListFc'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams } from 'react-router-dom'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faDiscord, faFirefox, faGithub, faTwitch, faTwitter } from '@fortawesome/free-brands-svg-icons'; diff --git a/vocodes/src/v2/profile/profile_view/Profile_TtsInferenceResultListFc.tsx b/vocodes/src/v2/view/profile/profile_view/Profile_TtsInferenceResultListFc.tsx similarity index 96% rename from vocodes/src/v2/profile/profile_view/Profile_TtsInferenceResultListFc.tsx rename to vocodes/src/v2/view/profile/profile_view/Profile_TtsInferenceResultListFc.tsx index b0cfa01005..5e9108c82e 100644 --- a/vocodes/src/v2/profile/profile_view/Profile_TtsInferenceResultListFc.tsx +++ b/vocodes/src/v2/view/profile/profile_view/Profile_TtsInferenceResultListFc.tsx @@ -1,9 +1,9 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig, ListTtsInferenceResultsForUserArgs } from '../../../common/ApiConfig'; +import { ApiConfig, ListTtsInferenceResultsForUserArgs } from '../../../../common/ApiConfig'; import { Link } from 'react-router-dom'; import { formatDistance } from 'date-fns'; -import { VisibleIconFc } from '../../../icons/VisibleIconFc'; -import { HiddenIconFc } from '../../../icons/HiddenIconFc'; +import { VisibleIconFc } from '../../_icons/VisibleIcon'; +import { HiddenIconFc } from '../../_icons/HiddenIcon'; interface TtsInferenceResultListResponsePayload { success: boolean, diff --git a/vocodes/src/v2/profile/profile_view/Profile_TtsModelListFc.tsx b/vocodes/src/v2/view/profile/profile_view/Profile_TtsModelListFc.tsx similarity index 97% rename from vocodes/src/v2/profile/profile_view/Profile_TtsModelListFc.tsx rename to vocodes/src/v2/view/profile/profile_view/Profile_TtsModelListFc.tsx index 715beabe23..38a221a88b 100644 --- a/vocodes/src/v2/profile/profile_view/Profile_TtsModelListFc.tsx +++ b/vocodes/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 '../../../../common/ApiConfig'; import { Link } from 'react-router-dom'; import { formatDistance } from 'date-fns'; diff --git a/vocodes/src/v2/profile/profile_view/Profile_W2lInferenceResultListFc.tsx b/vocodes/src/v2/view/profile/profile_view/Profile_W2lInferenceResultListFc.tsx similarity index 96% rename from vocodes/src/v2/profile/profile_view/Profile_W2lInferenceResultListFc.tsx rename to vocodes/src/v2/view/profile/profile_view/Profile_W2lInferenceResultListFc.tsx index 94176d0831..c9699e70ff 100644 --- a/vocodes/src/v2/profile/profile_view/Profile_W2lInferenceResultListFc.tsx +++ b/vocodes/src/v2/view/profile/profile_view/Profile_W2lInferenceResultListFc.tsx @@ -1,9 +1,9 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig, ListW2lInferenceResultsForUserArgs } from '../../../common/ApiConfig'; +import { ApiConfig, ListW2lInferenceResultsForUserArgs } from '../../../../common/ApiConfig'; import { Link } from 'react-router-dom'; import { formatDistance } from 'date-fns' -import { VisibleIconFc } from '../../../icons/VisibleIconFc'; -import { HiddenIconFc } from '../../../icons/HiddenIconFc'; +import { VisibleIconFc } from '../../_icons/VisibleIcon'; +import { HiddenIconFc } from '../../_icons/HiddenIcon'; interface W2lInferenceResultListResponsePayload { success: boolean, diff --git a/vocodes/src/v2/profile/profile_view/Profile_W2lTemplateListFc.tsx b/vocodes/src/v2/view/profile/profile_view/Profile_W2lTemplateListFc.tsx similarity index 95% rename from vocodes/src/v2/profile/profile_view/Profile_W2lTemplateListFc.tsx rename to vocodes/src/v2/view/profile/profile_view/Profile_W2lTemplateListFc.tsx index 1e39bf5f65..465b037627 100644 --- a/vocodes/src/v2/profile/profile_view/Profile_W2lTemplateListFc.tsx +++ b/vocodes/src/v2/view/profile/profile_view/Profile_W2lTemplateListFc.tsx @@ -1,8 +1,8 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; +import { ApiConfig } from '../../../../common/ApiConfig'; import { Link } from "react-router-dom"; -import { getRandomInt } from '../../../v1/api/Utils'; -import { BucketConfig } from '../../../common/BucketConfig'; +import { getRandomInt } from '../../../../v1/api/Utils'; +import { BucketConfig } from '../../../../common/BucketConfig'; interface W2lTemplateListResponsePayload { success: boolean, diff --git a/vocodes/src/v2/signup/SignupComponent.tsx b/vocodes/src/v2/view/signup/SignupComponent.tsx similarity index 97% rename from vocodes/src/v2/signup/SignupComponent.tsx rename to vocodes/src/v2/view/signup/SignupComponent.tsx index 9b8e49f6db..08c100dd3c 100644 --- a/vocodes/src/v2/signup/SignupComponent.tsx +++ b/vocodes/src/v2/view/signup/SignupComponent.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { ApiConfig } from '../../common/ApiConfig'; -import { AsteriskIcon } from '../../icons/AsteriskIcon'; -import { EnvelopeIcon } from '../../icons/EnvelopeIcon'; +import { ApiConfig } from '../../../common/ApiConfig'; +import { AsteriskIcon } from '../_icons/AsteriskIcon'; +import { EnvelopeIcon } from '../_icons/EnvelopeIcon'; import { Link } from 'react-router-dom'; -import { Mode } from '../../AppMode'; -import { SessionWrapper } from '../../session/SessionWrapper'; -import { UserIcon } from '../../icons/UserIcon'; +import { Mode } from '../../../AppMode'; +import { SessionWrapper } from '../../../session/SessionWrapper'; +import { UserIcon } from '../_icons/UserIcon'; enum FieldTriState { EMPTY_FALSE, diff --git a/vocodes/src/v2/tts/tts_model_delete/TtsModelDeleteFc.tsx b/vocodes/src/v2/view/tts/tts_model_delete/TtsModelDeleteFc.tsx similarity index 97% rename from vocodes/src/v2/tts/tts_model_delete/TtsModelDeleteFc.tsx rename to vocodes/src/v2/view/tts/tts_model_delete/TtsModelDeleteFc.tsx index 71da9b0ca2..f418d7efb9 100644 --- a/vocodes/src/v2/tts/tts_model_delete/TtsModelDeleteFc.tsx +++ b/vocodes/src/v2/view/tts/tts_model_delete/TtsModelDeleteFc.tsx @@ -1,8 +1,8 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; interface TtsModelViewResponsePayload { diff --git a/vocodes/src/v2/tts/tts_model_edit/TtsModelEditFc.tsx b/vocodes/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx similarity index 94% rename from vocodes/src/v2/tts/tts_model_edit/TtsModelEditFc.tsx rename to vocodes/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx index 0cecbe0829..a37791fe13 100644 --- a/vocodes/src/v2/tts/tts_model_edit/TtsModelEditFc.tsx +++ b/vocodes/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx @@ -1,13 +1,13 @@ import React, { useState, useEffect, useCallback } from 'react'; //import axios from 'axios'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; -import { TtsInferenceJob } from '../../../App'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; +import { TtsInferenceJob } from '../../../../App'; import { useParams, Link, useHistory } from 'react-router-dom'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { VisibleIconFc } from '../../../icons/VisibleIconFc'; -import { HiddenIconFc } from '../../../icons/HiddenIconFc'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { VisibleIconFc } from '../../_icons/VisibleIcon'; +import { HiddenIconFc } from '../../_icons/HiddenIcon'; const DEFAULT_VISIBILITY = 'public'; diff --git a/vocodes/src/v2/tts/tts_model_list/TtsModelFormFc.tsx b/vocodes/src/v2/view/tts/tts_model_list/TtsModelFormFc.tsx similarity index 89% rename from vocodes/src/v2/tts/tts_model_list/TtsModelFormFc.tsx rename to vocodes/src/v2/view/tts/tts_model_list/TtsModelFormFc.tsx index 345e75e95e..fb75976f11 100644 --- a/vocodes/src/v2/tts/tts_model_list/TtsModelFormFc.tsx +++ b/vocodes/src/v2/view/tts/tts_model_list/TtsModelFormFc.tsx @@ -1,15 +1,15 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; +import { ApiConfig } from '../../../../common/ApiConfig'; import { Link } from 'react-router-dom'; -import { SessionTtsInferenceResultListFc } from '../../common/SessionTtsInferenceResultsListFc'; -import { SessionTtsModelUploadResultListFc } from '../../common/SessionTtsModelUploadResultsListFc'; -import { SessionW2lInferenceResultListFc } from '../../common/SessionW2lInferenceResultsListFc'; -import { SessionW2lTemplateUploadResultListFc } from '../../common/SessionW2lTemplateUploadResultsListFc'; -import { SessionWrapper } from '../../../session/SessionWrapper'; -import { TtsInferenceJob } from '../../../App'; -import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs'; -import { W2lInferenceJob } from '../../../jobs/W2lInferenceJobs'; -import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs'; +import { SessionTtsInferenceResultListFc } from '../../_common/SessionTtsInferenceResultsListFc'; +import { SessionTtsModelUploadResultListFc } from '../../_common/SessionTtsModelUploadResultsListFc'; +import { SessionW2lInferenceResultListFc } from '../../_common/SessionW2lInferenceResultsListFc'; +import { SessionW2lTemplateUploadResultListFc } from '../../_common/SessionW2lTemplateUploadResultsListFc'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; +import { TtsInferenceJob } from '../../../../App'; +import { TtsModelUploadJob } from '../../../../jobs/TtsModelUploadJobs'; +import { W2lInferenceJob } from '../../../../jobs/W2lInferenceJobs'; +import { W2lTemplateUploadJob } from '../../../../jobs/W2lTemplateUploadJobs'; import { v4 as uuidv4 } from 'uuid'; interface TtsModelListResponsePayload { diff --git a/vocodes/src/v2/tts/tts_model_list/TtsModelListComponent.tsx b/vocodes/src/v2/view/tts/tts_model_list/TtsModelListComponent.tsx similarity index 96% rename from vocodes/src/v2/tts/tts_model_list/TtsModelListComponent.tsx rename to vocodes/src/v2/view/tts/tts_model_list/TtsModelListComponent.tsx index 0dd173aadf..1492c765d1 100644 --- a/vocodes/src/v2/tts/tts_model_list/TtsModelListComponent.tsx +++ b/vocodes/src/v2/view/tts/tts_model_list/TtsModelListComponent.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { Mode } from '../../../AppMode'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { Mode } from '../../../../AppMode'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; enum FieldTriState { EMPTY_FALSE, diff --git a/vocodes/src/v2/tts/tts_model_view/TtsModelViewFc.tsx b/vocodes/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx similarity index 95% rename from vocodes/src/v2/tts/tts_model_view/TtsModelViewFc.tsx rename to vocodes/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx index 796837bbb8..a95939d1c0 100644 --- a/vocodes/src/v2/tts/tts_model_view/TtsModelViewFc.tsx +++ b/vocodes/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx @@ -1,16 +1,16 @@ import React, { useState, useEffect, useCallback } from 'react'; //import axios from 'axios'; -import { ApiConfig } from '../../../common/ApiConfig'; +import { ApiConfig } from '../../../../common/ApiConfig'; import { EnqueueJobResponsePayload } from '../tts_model_list/TtsModelFormFc'; -import { SessionTtsInferenceResultListFc } from '../../common/SessionTtsInferenceResultsListFc'; -import { SessionWrapper } from '../../../session/SessionWrapper'; -import { TtsInferenceJob } from '../../../App'; +import { SessionTtsInferenceResultListFc } from '../../_common/SessionTtsInferenceResultsListFc'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; +import { TtsInferenceJob } from '../../../../App'; import { useParams, Link } from 'react-router-dom'; import { v4 as uuidv4 } from 'uuid'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { HiddenIconFc } from '../../../icons/HiddenIconFc'; -import { VisibleIconFc } from '../../../icons/VisibleIconFc'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { HiddenIconFc } from '../../_icons/HiddenIcon'; +import { VisibleIconFc } from '../../_icons/VisibleIcon'; interface TtsModelViewResponsePayload { success: boolean, diff --git a/vocodes/src/v2/tts/tts_result_delete/TtsResultDeleteFc.tsx b/vocodes/src/v2/view/tts/tts_result_delete/TtsResultDeleteFc.tsx similarity index 96% rename from vocodes/src/v2/tts/tts_result_delete/TtsResultDeleteFc.tsx rename to vocodes/src/v2/view/tts/tts_result_delete/TtsResultDeleteFc.tsx index 16c8cc8340..f341f7c93e 100644 --- a/vocodes/src/v2/tts/tts_result_delete/TtsResultDeleteFc.tsx +++ b/vocodes/src/v2/view/tts/tts_result_delete/TtsResultDeleteFc.tsx @@ -1,9 +1,9 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; -import { GravatarFc } from '../../common/GravatarFc'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; +import { GravatarFc } from '../../_common/GravatarFc'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; interface TtsInferenceResultResponsePayload { success: boolean, diff --git a/vocodes/src/v2/tts/tts_result_edit/TtsResultEditFc.tsx b/vocodes/src/v2/view/tts/tts_result_edit/TtsResultEditFc.tsx similarity index 93% rename from vocodes/src/v2/tts/tts_result_edit/TtsResultEditFc.tsx rename to vocodes/src/v2/view/tts/tts_result_edit/TtsResultEditFc.tsx index 3d04af8073..3a9712a638 100644 --- a/vocodes/src/v2/tts/tts_result_edit/TtsResultEditFc.tsx +++ b/vocodes/src/v2/view/tts/tts_result_edit/TtsResultEditFc.tsx @@ -1,10 +1,10 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { VisibleIconFc } from '../../../icons/VisibleIconFc'; -import { HiddenIconFc } from '../../../icons/HiddenIconFc'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { VisibleIconFc } from '../../_icons/VisibleIcon'; +import { HiddenIconFc } from '../../_icons/HiddenIcon'; const DEFAULT_VISIBILITY = 'public'; diff --git a/vocodes/src/v2/tts/tts_result_view/SpectrogramFc.tsx b/vocodes/src/v2/view/tts/tts_result_view/SpectrogramFc.tsx similarity index 97% rename from vocodes/src/v2/tts/tts_result_view/SpectrogramFc.tsx rename to vocodes/src/v2/view/tts/tts_result_view/SpectrogramFc.tsx index d451e61944..b2c7acacf3 100644 --- a/vocodes/src/v2/tts/tts_result_view/SpectrogramFc.tsx +++ b/vocodes/src/v2/view/tts/tts_result_view/SpectrogramFc.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useRef } from 'react'; import { VIRIDIS, MAGMA } from "@colormap/presets"; import { createColorMap, linearScale } from "@colormap/core"; -import { getRandomArrayValue } from "../../../v1/api/Utils"; +import { getRandomArrayValue } from "../../../../v1/api/Utils"; interface Props { spectrogramJsonLink: string diff --git a/vocodes/src/v2/tts/tts_result_view/TtsResultViewFc.tsx b/vocodes/src/v2/view/tts/tts_result_view/TtsResultViewFc.tsx similarity index 94% rename from vocodes/src/v2/tts/tts_result_view/TtsResultViewFc.tsx rename to vocodes/src/v2/view/tts/tts_result_view/TtsResultViewFc.tsx index b6f714c4ad..cfa1d90591 100644 --- a/vocodes/src/v2/tts/tts_result_view/TtsResultViewFc.tsx +++ b/vocodes/src/v2/view/tts/tts_result_view/TtsResultViewFc.tsx @@ -1,14 +1,14 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link } from 'react-router-dom'; -import { GravatarFc } from '../../common/GravatarFc'; +import { GravatarFc } from '../../_common/GravatarFc'; import { SpectrogramFc } from './SpectrogramFc'; -import { ReportDiscordLinkFc } from '../../common/DiscordReportLinkFc'; -import { BucketConfig } from '../../../common/BucketConfig'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { HiddenIconFc } from '../../../icons/HiddenIconFc'; -import { VisibleIconFc } from '../../../icons/VisibleIconFc'; +import { ReportDiscordLinkFc } from '../../_common/DiscordReportLinkFc'; +import { BucketConfig } from '../../../../common/BucketConfig'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { HiddenIconFc } from '../../_icons/HiddenIcon'; +import { VisibleIconFc } from '../../_icons/VisibleIcon'; interface TtsInferenceResultResponsePayload { success: boolean, diff --git a/vocodes/src/v2/upload/UploadChoiceFc.tsx b/vocodes/src/v2/view/upload/UploadChoiceFc.tsx similarity index 95% rename from vocodes/src/v2/upload/UploadChoiceFc.tsx rename to vocodes/src/v2/view/upload/UploadChoiceFc.tsx index 30ecfe6ee3..73873392f3 100644 --- a/vocodes/src/v2/upload/UploadChoiceFc.tsx +++ b/vocodes/src/v2/view/upload/UploadChoiceFc.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { SessionWrapper } from '../../session/SessionWrapper'; +import { SessionWrapper } from '../../../session/SessionWrapper'; import { Link } from "react-router-dom"; interface Props { diff --git a/vocodes/src/v2/upload/UploadComponent.tsx b/vocodes/src/v2/view/upload/UploadComponent.tsx similarity index 96% rename from vocodes/src/v2/upload/UploadComponent.tsx rename to vocodes/src/v2/view/upload/UploadComponent.tsx index ddf496608e..49b73d120f 100644 --- a/vocodes/src/v2/upload/UploadComponent.tsx +++ b/vocodes/src/v2/view/upload/UploadComponent.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { ApiConfig } from '../../common/ApiConfig'; -import { SessionWrapper } from '../../session/SessionWrapper'; -import { TtsModelUploadJob } from '../../jobs/TtsModelUploadJobs'; -import { W2lTemplateUploadJob } from '../../jobs/W2lTemplateUploadJobs'; +import { ApiConfig } from '../../../common/ApiConfig'; +import { SessionWrapper } from '../../../session/SessionWrapper'; +import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs'; +import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs'; import { v4 } from 'uuid'; enum UploadType { diff --git a/vocodes/src/v2/upload/UploadTtsModelFc.tsx b/vocodes/src/v2/view/upload/UploadTtsModelFc.tsx similarity index 94% rename from vocodes/src/v2/upload/UploadTtsModelFc.tsx rename to vocodes/src/v2/view/upload/UploadTtsModelFc.tsx index d70f664cd4..89298d5b30 100644 --- a/vocodes/src/v2/upload/UploadTtsModelFc.tsx +++ b/vocodes/src/v2/view/upload/UploadTtsModelFc.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react'; -import { ApiConfig } from '../../common/ApiConfig'; -import { SessionTtsModelUploadResultListFc } from '../common/SessionTtsModelUploadResultsListFc'; -import { SessionWrapper } from '../../session/SessionWrapper'; -import { TtsModelUploadJob } from '../../jobs/TtsModelUploadJobs'; +import { ApiConfig } from '../../../common/ApiConfig'; +import { SessionTtsModelUploadResultListFc } from '../_common/SessionTtsModelUploadResultsListFc'; +import { SessionWrapper } from '../../../session/SessionWrapper'; +import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs'; import { useHistory, Link } from "react-router-dom"; import { v4 as uuidv4 } from 'uuid'; diff --git a/vocodes/src/v2/upload/UploadW2lPhotoFc.tsx b/vocodes/src/v2/view/upload/UploadW2lPhotoFc.tsx similarity index 93% rename from vocodes/src/v2/upload/UploadW2lPhotoFc.tsx rename to vocodes/src/v2/view/upload/UploadW2lPhotoFc.tsx index d42851ce8c..796399fa7b 100644 --- a/vocodes/src/v2/upload/UploadW2lPhotoFc.tsx +++ b/vocodes/src/v2/view/upload/UploadW2lPhotoFc.tsx @@ -1,10 +1,10 @@ import React, { useState } from 'react'; -import { ApiConfig } from '../../common/ApiConfig'; -import { SessionWrapper } from '../../session/SessionWrapper'; -import { W2lTemplateUploadJob } from '../../jobs/W2lTemplateUploadJobs'; +import { ApiConfig } from '../../../common/ApiConfig'; +import { SessionWrapper } from '../../../session/SessionWrapper'; +import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs'; import { useHistory, Link } from "react-router-dom"; import { v4 as uuidv4 } from 'uuid'; -import { SessionW2lTemplateUploadResultListFc } from '../common/SessionW2lTemplateUploadResultsListFc'; +import { SessionW2lTemplateUploadResultListFc } from '../_common/SessionW2lTemplateUploadResultsListFc'; interface W2lTemplateUploadJobResponsePayload { success: boolean, diff --git a/vocodes/src/v2/upload/UploadW2lVideoFc.tsx b/vocodes/src/v2/view/upload/UploadW2lVideoFc.tsx similarity index 93% rename from vocodes/src/v2/upload/UploadW2lVideoFc.tsx rename to vocodes/src/v2/view/upload/UploadW2lVideoFc.tsx index 31143b0357..fa68aee4a9 100644 --- a/vocodes/src/v2/upload/UploadW2lVideoFc.tsx +++ b/vocodes/src/v2/view/upload/UploadW2lVideoFc.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react'; -import { ApiConfig } from '../../common/ApiConfig'; -import { SessionW2lTemplateUploadResultListFc } from '../common/SessionW2lTemplateUploadResultsListFc'; -import { SessionWrapper } from '../../session/SessionWrapper'; -import { W2lTemplateUploadJob } from '../../jobs/W2lTemplateUploadJobs'; +import { ApiConfig } from '../../../common/ApiConfig'; +import { SessionW2lTemplateUploadResultListFc } from '../_common/SessionW2lTemplateUploadResultsListFc'; +import { SessionWrapper } from '../../../session/SessionWrapper'; +import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs'; import { useHistory, Link } from "react-router-dom"; import { v4 as uuidv4 } from 'uuid'; diff --git a/vocodes/src/v2/w2l/w2l_result_delete/W2lResultDeleteFc.tsx b/vocodes/src/v2/view/w2l/w2l_result_delete/W2lResultDeleteFc.tsx similarity index 93% rename from vocodes/src/v2/w2l/w2l_result_delete/W2lResultDeleteFc.tsx rename to vocodes/src/v2/view/w2l/w2l_result_delete/W2lResultDeleteFc.tsx index ab6f78ee0d..becb82521f 100644 --- a/vocodes/src/v2/w2l/w2l_result_delete/W2lResultDeleteFc.tsx +++ b/vocodes/src/v2/view/w2l/w2l_result_delete/W2lResultDeleteFc.tsx @@ -1,10 +1,10 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; -import { GetW2lResult, W2lResult } from '../../api/w2l/GetW2lResult'; +import { GetW2lResult, W2lResult } from '../../../api/w2l/GetW2lResult'; interface Props { sessionWrapper: SessionWrapper, diff --git a/vocodes/src/v2/w2l/w2l_result_edit/W2lResultEditFc.tsx b/vocodes/src/v2/view/w2l/w2l_result_edit/W2lResultEditFc.tsx similarity index 93% rename from vocodes/src/v2/w2l/w2l_result_edit/W2lResultEditFc.tsx rename to vocodes/src/v2/view/w2l/w2l_result_edit/W2lResultEditFc.tsx index 9a1b58278d..9bd532c35a 100644 --- a/vocodes/src/v2/w2l/w2l_result_edit/W2lResultEditFc.tsx +++ b/vocodes/src/v2/view/w2l/w2l_result_edit/W2lResultEditFc.tsx @@ -1,10 +1,10 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { VisibleIconFc } from '../../../icons/VisibleIconFc'; -import { HiddenIconFc } from '../../../icons/HiddenIconFc'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { VisibleIconFc } from '../../_icons/VisibleIcon'; +import { HiddenIconFc } from '../../_icons/HiddenIcon'; const DEFAULT_VISIBILITY = 'public'; diff --git a/vocodes/src/v2/w2l/w2l_result_view/W2lResultViewFc.tsx b/vocodes/src/v2/view/w2l/w2l_result_view/W2lResultViewFc.tsx similarity index 91% rename from vocodes/src/v2/w2l/w2l_result_view/W2lResultViewFc.tsx rename to vocodes/src/v2/view/w2l/w2l_result_view/W2lResultViewFc.tsx index 82145b9ffd..ce76ab17b2 100644 --- a/vocodes/src/v2/w2l/w2l_result_view/W2lResultViewFc.tsx +++ b/vocodes/src/v2/view/w2l/w2l_result_view/W2lResultViewFc.tsx @@ -1,14 +1,14 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { GravatarFc } from '../../common/GravatarFc'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { GravatarFc } from '../../_common/GravatarFc'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link } from 'react-router-dom'; -import { ReportDiscordLinkFc } from '../../common/DiscordReportLinkFc'; -import { BucketConfig } from '../../../common/BucketConfig'; -import { HiddenIconFc } from '../../../icons/HiddenIconFc'; -import { VisibleIconFc } from '../../../icons/VisibleIconFc'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { DownloadIcon } from '../../../icons/DownloadIcon'; -import { GetW2lResult, W2lResult } from '../../api/w2l/GetW2lResult'; +import { ReportDiscordLinkFc } from '../../_common/DiscordReportLinkFc'; +import { BucketConfig } from '../../../../common/BucketConfig'; +import { HiddenIconFc } from '../../_icons/HiddenIcon'; +import { VisibleIconFc } from '../../_icons/VisibleIcon'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { DownloadIcon } from '../../_icons/DownloadIcon'; +import { GetW2lResult, W2lResult } from '../../../api/w2l/GetW2lResult'; interface Props { sessionWrapper: SessionWrapper, diff --git a/vocodes/src/v2/w2l/w2l_template_approve/W2lTemplateApproveFc.tsx b/vocodes/src/v2/view/w2l/w2l_template_approve/W2lTemplateApproveFc.tsx similarity index 92% rename from vocodes/src/v2/w2l/w2l_template_approve/W2lTemplateApproveFc.tsx rename to vocodes/src/v2/view/w2l/w2l_template_approve/W2lTemplateApproveFc.tsx index f041d62f66..c206d5d1ce 100644 --- a/vocodes/src/v2/w2l/w2l_template_approve/W2lTemplateApproveFc.tsx +++ b/vocodes/src/v2/view/w2l/w2l_template_approve/W2lTemplateApproveFc.tsx @@ -1,10 +1,10 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; -import { GetW2lTemplate, W2lTemplate } from '../../api/w2l/GetW2lTemplate'; -import { GetW2lTemplateUseCount } from '../../api/w2l/GetW2lTemplateUseCount'; +import { GetW2lTemplate, W2lTemplate } from '../../../api/w2l/GetW2lTemplate'; +import { GetW2lTemplateUseCount } from '../../../api/w2l/GetW2lTemplateUseCount'; const DEFAULT_APPROVED_STATE = true; diff --git a/vocodes/src/v2/w2l/w2l_template_delete/W2lTemplateDeleteFc.tsx b/vocodes/src/v2/view/w2l/w2l_template_delete/W2lTemplateDeleteFc.tsx similarity index 93% rename from vocodes/src/v2/w2l/w2l_template_delete/W2lTemplateDeleteFc.tsx rename to vocodes/src/v2/view/w2l/w2l_template_delete/W2lTemplateDeleteFc.tsx index 5da6cacf94..7363b43964 100644 --- a/vocodes/src/v2/w2l/w2l_template_delete/W2lTemplateDeleteFc.tsx +++ b/vocodes/src/v2/view/w2l/w2l_template_delete/W2lTemplateDeleteFc.tsx @@ -1,10 +1,10 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; -import { GetW2lTemplate, W2lTemplate } from '../../api/w2l/GetW2lTemplate'; -import { GetW2lTemplateUseCount } from '../../api/w2l/GetW2lTemplateUseCount'; +import { GetW2lTemplate, W2lTemplate } from '../../../api/w2l/GetW2lTemplate'; +import { GetW2lTemplateUseCount } from '../../../api/w2l/GetW2lTemplateUseCount'; interface Props { sessionWrapper: SessionWrapper, diff --git a/vocodes/src/v2/w2l/w2l_template_edit/W2lTemplateEditFc.tsx b/vocodes/src/v2/view/w2l/w2l_template_edit/W2lTemplateEditFc.tsx similarity index 92% rename from vocodes/src/v2/w2l/w2l_template_edit/W2lTemplateEditFc.tsx rename to vocodes/src/v2/view/w2l/w2l_template_edit/W2lTemplateEditFc.tsx index bd15472edf..6fdf5c4c09 100644 --- a/vocodes/src/v2/w2l/w2l_template_edit/W2lTemplateEditFc.tsx +++ b/vocodes/src/v2/view/w2l/w2l_template_edit/W2lTemplateEditFc.tsx @@ -1,11 +1,11 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { VisibleIconFc } from '../../../icons/VisibleIconFc'; -import { HiddenIconFc } from '../../../icons/HiddenIconFc'; -import { GetW2lTemplate, W2lTemplate } from '../../api/w2l/GetW2lTemplate'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { VisibleIconFc } from '../../_icons/VisibleIcon'; +import { HiddenIconFc } from '../../_icons/HiddenIcon'; +import { GetW2lTemplate, W2lTemplate } from '../../../api/w2l/GetW2lTemplate'; const DEFAULT_VISIBILITY = 'public'; diff --git a/vocodes/src/v2/w2l/w2l_template_list/W2lTemplateListFc.tsx b/vocodes/src/v2/view/w2l/w2l_template_list/W2lTemplateListFc.tsx similarity index 94% rename from vocodes/src/v2/w2l/w2l_template_list/W2lTemplateListFc.tsx rename to vocodes/src/v2/view/w2l/w2l_template_list/W2lTemplateListFc.tsx index 1c6f977405..fe77a39f32 100644 --- a/vocodes/src/v2/w2l/w2l_template_list/W2lTemplateListFc.tsx +++ b/vocodes/src/v2/view/w2l/w2l_template_list/W2lTemplateListFc.tsx @@ -1,9 +1,9 @@ import React, { useState, useEffect } from 'react'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; import { Link } from "react-router-dom"; -import { getRandomInt } from '../../../v1/api/Utils'; -import { BucketConfig } from '../../../common/BucketConfig'; +import { getRandomInt } from '../../../../v1/api/Utils'; +import { BucketConfig } from '../../../../common/BucketConfig'; interface W2lTemplateListResponsePayload { success: boolean, diff --git a/vocodes/src/v2/w2l/w2l_template_view/W2lTemplateViewFc.tsx b/vocodes/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx similarity index 93% rename from vocodes/src/v2/w2l/w2l_template_view/W2lTemplateViewFc.tsx rename to vocodes/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx index 6b517041a6..f07e972d3c 100644 --- a/vocodes/src/v2/w2l/w2l_template_view/W2lTemplateViewFc.tsx +++ b/vocodes/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx @@ -1,19 +1,19 @@ import React, { useState, useEffect, useCallback } from 'react'; import axios from 'axios'; -import { ApiConfig } from '../../../common/ApiConfig'; -import { SessionWrapper } from '../../../session/SessionWrapper'; -import { W2lInferenceJob } from '../../../App'; +import { ApiConfig } from '../../../../common/ApiConfig'; +import { SessionWrapper } from '../../../../session/SessionWrapper'; +import { W2lInferenceJob } from '../../../../App'; import { useParams, Link } from 'react-router-dom'; import { v4 as uuidv4 } from 'uuid'; -import { SessionW2lInferenceResultListFc } from '../../common/SessionW2lInferenceResultsListFc'; -import { ReportDiscordLinkFc } from '../../common/DiscordReportLinkFc'; -import { BucketConfig } from '../../../common/BucketConfig'; -import { UploadIcon } from '../../../icons/UploadIcon'; -import { VisibleIconFc } from '../../../icons/VisibleIconFc'; -import { HiddenIconFc } from '../../../icons/HiddenIconFc'; -import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; -import { GetW2lTemplate, W2lTemplate } from '../../api/w2l/GetW2lTemplate'; -import { GetW2lTemplateUseCount } from '../../api/w2l/GetW2lTemplateUseCount'; +import { SessionW2lInferenceResultListFc } from '../../_common/SessionW2lInferenceResultsListFc'; +import { ReportDiscordLinkFc } from '../../_common/DiscordReportLinkFc'; +import { BucketConfig } from '../../../../common/BucketConfig'; +import { UploadIcon } from '../../_icons/UploadIcon'; +import { VisibleIconFc } from '../../_icons/VisibleIcon'; +import { HiddenIconFc } from '../../_icons/HiddenIcon'; +import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; +import { GetW2lTemplate, W2lTemplate } from '../../../api/w2l/GetW2lTemplate'; +import { GetW2lTemplateUseCount } from '../../../api/w2l/GetW2lTemplateUseCount'; interface EnqueueJobResponsePayload { success: boolean,