diff --git a/packages/fakeyou.com/package.json b/packages/fakeyou.com/package.json index 84921b79ec..4b797df8cf 100644 --- a/packages/fakeyou.com/package.json +++ b/packages/fakeyou.com/package.json @@ -15,8 +15,6 @@ "@fortawesome/pro-regular-svg-icons": "^6.2.1", "@fortawesome/pro-solid-svg-icons": "^6.2.1", "@fortawesome/react-fontawesome": "^0.2.0", - "@types/react-paginate": "^7.1.4", - "react-paginate": "^8.2.0", "@react-spring/types": "^9.7.3", "@react-spring/web": "^9.7.3", "@storyteller/components": "0.1.0", @@ -37,6 +35,7 @@ "@types/node": "^12.12.47", "@types/react": "^16.9.36", "@types/react-dom": "^16.9.8", + "@types/react-paginate": "^7.1.4", "axios": "^0.21.0", "bootstrap": "5.1.3", "bulma": "^0.9.0", @@ -62,6 +61,7 @@ "react-drag-drop-files": "^2.3.9", "react-i18next": "^11.15.4", "react-infinite-scroll-component": "^6.1.0", + "react-paginate": "^8.2.0", "react-range": "^1.8.14", "react-reveal": "^1.2.2", "react-router-dom": "^5.2.0", diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index 79fda6c95a..cc2912a33b 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -6,7 +6,7 @@ import { LoginPage } from "./pages/login/LoginPage"; import { ModerationFc } from "./pages/moderation/moderation_main/ModerationFc"; import { ModerationIpBanListFc } from "./pages/moderation/moderation_ip_ban_list/ModerationIpBanListFc"; import { ModerationViewIpBanFc } from "./pages/moderation/moderation_view_ip_ban/ModerationViewIpBanFc"; -import { LipsyncEditor } from "./pages/lipsync"; +import FaceAnimator from "./pages/face_animator"; import { ProfileEditFc } from "./pages/profile/profile_edit/ProfileEditFc"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; @@ -625,7 +625,7 @@ class PageContainer extends React.Component< - ; -}; \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/face-aniamtor/index.ts b/packages/fakeyou.com/src/v2/view/pages/face-aniamtor/index.ts deleted file mode 100644 index 5379bd55fa..0000000000 --- a/packages/fakeyou.com/src/v2/view/pages/face-aniamtor/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import FaceAnimator from './FaceAnimator'; - -export { FaceAnimator }; \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/DynamicButton.scss b/packages/fakeyou.com/src/v2/view/pages/face_animator/DynamicButton.scss similarity index 100% rename from packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/DynamicButton.scss rename to packages/fakeyou.com/src/v2/view/pages/face_animator/DynamicButton.scss diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/DynamicButton.tsx b/packages/fakeyou.com/src/v2/view/pages/face_animator/DynamicButton.tsx similarity index 100% rename from packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/DynamicButton.tsx rename to packages/fakeyou.com/src/v2/view/pages/face_animator/DynamicButton.tsx diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/LipsyncEditor.scss b/packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimator.scss similarity index 100% rename from packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/LipsyncEditor.scss rename to packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimator.scss diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/LipsyncEditor.tsx b/packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimator.tsx similarity index 96% rename from packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/LipsyncEditor.tsx rename to packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimator.tsx index 37862ce69c..80470943d3 100644 --- a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/LipsyncEditor.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimator.tsx @@ -26,13 +26,12 @@ import FaceAnimatorSuccess from "./FaceAnimatorSuccess"; import InferenceJobsList from "components/layout/InferenceJobsList"; import { FaceAnimatorCore } from "./FaceAnimatorTypes"; import { BasicVideo } from "components/common"; -import "./LipsyncEditor.scss"; import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/InferenceJob"; import { usePrefixedDocumentTitle } from "common/UsePrefixedDocumentTitle"; import { Analytics } from "common/Analytics"; -// import { GetMedia } from "@storyteller/components/src/api/media_files/GetMedia"; +import "./FaceAnimator.scss"; -export default function LipsyncEditor({ enqueueInferenceJob, sessionSubscriptionsWrapper, inferenceJobs, inferenceJobsByCategory, ...rest }: FaceAnimatorCore) { +export default function FaceAnimator({ enqueueInferenceJob, sessionSubscriptionsWrapper, inferenceJobs, inferenceJobsByCategory, ...rest }: FaceAnimatorCore) { const { mediaToken } = useParams<{ mediaToken: string }>(); const [presetAudio] = useMedia({ mediaToken }); const { t } = useLocalize("FaceAnimator"); diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorInput.tsx b/packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorInput.tsx similarity index 100% rename from packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorInput.tsx rename to packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorInput.tsx diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorJobs.tsx b/packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorJobs.tsx similarity index 100% rename from packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorJobs.tsx rename to packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorJobs.tsx diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorSuccess.tsx b/packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorSuccess.tsx similarity index 100% rename from packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorSuccess.tsx rename to packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorSuccess.tsx diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorTitle.tsx b/packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorTitle.tsx similarity index 100% rename from packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorTitle.tsx rename to packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorTitle.tsx diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorTypes.ts b/packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorTypes.ts similarity index 100% rename from packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorTypes.ts rename to packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorTypes.ts diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorWorking.tsx b/packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorWorking.tsx similarity index 100% rename from packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/FaceAnimatorWorking.tsx rename to packages/fakeyou.com/src/v2/view/pages/face_animator/FaceAnimatorWorking.tsx diff --git a/packages/fakeyou.com/src/v2/view/pages/face_animator/index.tsx b/packages/fakeyou.com/src/v2/view/pages/face_animator/index.tsx new file mode 100644 index 0000000000..5d75413662 --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/pages/face_animator/index.tsx @@ -0,0 +1 @@ +export { default } from './FaceAnimator'; \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/index.tsx b/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/index.tsx deleted file mode 100644 index 02f8db5b47..0000000000 --- a/packages/fakeyou.com/src/v2/view/pages/lipsync/LipsyncEditor/index.tsx +++ /dev/null @@ -1 +0,0 @@ -export { default } from './LipsyncEditor'; \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/lipsync/index.tsx b/packages/fakeyou.com/src/v2/view/pages/lipsync/index.tsx deleted file mode 100644 index e9598cfc23..0000000000 --- a/packages/fakeyou.com/src/v2/view/pages/lipsync/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import LipsyncEditor from './LipsyncEditor'; - -export { LipsyncEditor }; \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 900eb8c403..199c847f81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4441,6 +4441,7 @@ __metadata: "@types/react": ^16.9.36 "@types/react-autocomplete": ^1.8.6 "@types/react-dom": ^16.9.8 + "@types/react-paginate": ^7.1.4 "@types/react-router-dom": ^5.1.7 "@types/uuid": ^8.3.0 "@types/wavesurfer.js": ^5.2.0 @@ -4469,6 +4470,7 @@ __metadata: react-drag-drop-files: ^2.3.9 react-i18next: ^11.15.4 react-infinite-scroll-component: ^6.1.0 + react-paginate: ^8.2.0 react-range: ^1.8.14 react-reveal: ^1.2.2 react-router-dom: ^5.2.0 @@ -4582,7 +4584,6 @@ __metadata: resolution: "@storyteller/root@workspace:." dependencies: "@react-spring/types": ^9.7.3 - "@types/react-paginate": ^7.1.4 craco: ^0.0.3 cross-env: ^7.0.3 husky: ^8.0.3 @@ -4590,7 +4591,6 @@ __metadata: moment: ^2.29.4 prettier: ^3.1.0 pretty-quick: ^3.1.3 - react-paginate: ^8.2.0 universal-cookie: ^6.1.1 yarn: ^1.22.19 languageName: unknown