From e8104677d6614c9c41f12d60b970944fde19cc3c Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 29 Feb 2024 11:52:07 -0800 Subject: [PATCH 01/15] dev tts progress --- .../components/common/Card/WeightsCards.tsx | 1 - .../src/components/common/index.tsx | 11 ++- .../src/components/entities/CardBadge.tsx | 2 +- .../src/components/entities/index.tsx | 3 +- .../modals/MediaBrowser/MediaBrowser.scss | 5 + .../modals/MediaBrowser/MediaBrowser.tsx | 48 +++++++--- .../src/components/modals/ModalHeader.tsx | 10 +- packages/fakeyou.com/src/hooks/index.tsx | 2 + .../src/hooks/useDebounce/index.tsx | 1 + .../src/hooks/useDebounce/useDebounce.tsx | 21 +++++ .../hooks/useListContent/useListContent.tsx | 2 +- .../fakeyou.com/src/v2/view/PageContainer.tsx | 8 +- .../src/v2/view/pages/dev_tts/DevTTS.scss | 37 ++++++++ .../src/v2/view/pages/dev_tts/DevTTS.tsx | 91 +++++++++++++++++++ 14 files changed, 215 insertions(+), 27 deletions(-) create mode 100644 packages/fakeyou.com/src/hooks/useDebounce/index.tsx create mode 100644 packages/fakeyou.com/src/hooks/useDebounce/useDebounce.tsx create mode 100644 packages/fakeyou.com/src/v2/view/pages/dev_tts/DevTTS.scss create mode 100644 packages/fakeyou.com/src/v2/view/pages/dev_tts/DevTTS.tsx diff --git a/packages/fakeyou.com/src/components/common/Card/WeightsCards.tsx b/packages/fakeyou.com/src/components/common/Card/WeightsCards.tsx index ee8ee9d52b..52245242f8 100644 --- a/packages/fakeyou.com/src/components/common/Card/WeightsCards.tsx +++ b/packages/fakeyou.com/src/components/common/Card/WeightsCards.tsx @@ -9,7 +9,6 @@ interface Props { } export default function WeightsCards({ props, type }: Props) { - console.log(props); switch (type) { case WeightCategory.TTS: case WeightCategory.VC: diff --git a/packages/fakeyou.com/src/components/common/index.tsx b/packages/fakeyou.com/src/components/common/index.tsx index d8032c0830..80e274c861 100644 --- a/packages/fakeyou.com/src/components/common/index.tsx +++ b/packages/fakeyou.com/src/components/common/index.tsx @@ -27,9 +27,11 @@ import NumberSliderV2 from "./NumberSliderV2"; import Pagination from "./Pagination"; import Panel from "./Panel"; import Radio from "./Radio"; +import Scene3D from "./Scene3D"; import Searcher from "./Searcher"; import SegmentButtons from "./SegmentButtons"; import Select from "./Select"; +import SelectionBubbles from "./SelectionBubbles"; import SelectModal, { SelectModalData } from "./SelectModal"; import SelectModalVideoTabs from "./SelectModalVideoTabs"; import SelectModalWeightsTabs from "./SelectModalWeightsTabs"; @@ -49,9 +51,7 @@ import VideoBasic from "./VideoBasic"; import VideoFakeyou from "./VideoFakeyou"; import VideoInput from "./VideoInput"; // import VideoQuickTrim, {QuickTrimType} from "./VideoQuickTrim"; -import SelectionBubbles from "./SelectionBubbles"; -import Scene3D from "./Scene3D"; - +import WeightCoverImage from "./WeightCoverImage"; export type { SelectModalData }; export { @@ -89,9 +89,11 @@ export { Pagination, Panel, Radio, + Scene3D, SegmentButtons, Searcher, Select, + SelectionBubbles, SelectModal, SelectModalVideoTabs, SelectModalWeightsTabs, @@ -110,7 +112,6 @@ export { VideoBasic, VideoFakeyou, VideoInput, + WeightCoverImage, // VideoQuickTrim, - SelectionBubbles, - Scene3D, }; diff --git a/packages/fakeyou.com/src/components/entities/CardBadge.tsx b/packages/fakeyou.com/src/components/entities/CardBadge.tsx index 94587ddda9..6da6e95296 100644 --- a/packages/fakeyou.com/src/components/entities/CardBadge.tsx +++ b/packages/fakeyou.com/src/components/entities/CardBadge.tsx @@ -2,7 +2,7 @@ import React from "react"; import { Badge } from "components/common"; export default function CardBadge(props: any) { - return
+ return
diff --git a/packages/fakeyou.com/src/components/entities/index.tsx b/packages/fakeyou.com/src/components/entities/index.tsx index c93556549c..6773dbf08c 100644 --- a/packages/fakeyou.com/src/components/entities/index.tsx +++ b/packages/fakeyou.com/src/components/entities/index.tsx @@ -1,4 +1,5 @@ import AudioCard from "./AudioCard"; +import CardBadge from "./CardBadge"; import CardFooter from "./CardFooter"; import CardWrapper from "./CardWrapper"; import EntityInput from "./EntityInput"; @@ -6,4 +7,4 @@ import MediaList from "./MediaList"; import OverlayCard from "./OverlayCard"; import WeightCard from "./WeightCard"; -export { AudioCard, CardFooter, CardWrapper, EntityInput, MediaList, OverlayCard, WeightCard }; \ No newline at end of file +export { AudioCard, CardBadge, CardFooter, CardWrapper, EntityInput, MediaList, OverlayCard, WeightCard }; \ No newline at end of file diff --git a/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.scss b/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.scss index a60424f16f..63582fb0ca 100644 --- a/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.scss +++ b/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.scss @@ -17,6 +17,11 @@ margin-bottom: 1rem; } + .fy-input { + margin-bottom: 0; + flex-grow: 1; + } + .icon-close-button { cursor: pointer; height: 1.5rem; diff --git a/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.tsx b/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.tsx index c23fda4946..6a70f43960 100644 --- a/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.tsx +++ b/packages/fakeyou.com/src/components/modals/MediaBrowser/MediaBrowser.tsx @@ -7,10 +7,10 @@ import SkeletonCard from "components/common/Card/SkeletonCard"; import { GetBookmarksByUser } from "@storyteller/components/src/api/bookmarks/GetBookmarksByUser"; import { GetMediaByUser } from "@storyteller/components/src/api/media_files/GetMediaByUser"; import { GetWeightsByUser } from "@storyteller/components/src/api/weights/GetWeightsByUser"; -import { SearchWeights } from "@storyteller/components/src/api/weights/SearchWeights"; +import { SearchWeight } from "@storyteller/components/src/api/weights/Search"; import { MediaFile } from "@storyteller/components/src/api/media_files/GetMedia"; import { Weight } from "@storyteller/components/src/api/weights/GetWeight"; -import { useListContent, +import { useDebounce, useListContent, // useRatings } from "hooks"; import { faArrowDownWideShort, faFilter } from "@fortawesome/pro-solid-svg-icons"; @@ -18,11 +18,14 @@ import prepFilter from "resources/prepFilter"; import ModalHeader from "../ModalHeader"; import "./MediaBrowser.scss"; +const n = () => {}; + interface Props { accept?: AcceptTypes[], handleClose: any; inputMode: EntityInputMode; mediaToken: string; + onSearchChange?: (e: any) => void; onSelect?: any; owner?: string; search?: string; @@ -32,8 +35,9 @@ interface Props { export default function MediaBrowser({ accept, mediaToken, - handleClose = () => {}, + handleClose = n, inputMode, + onSearchChange = n, onSelect, owner, search, @@ -43,15 +47,17 @@ export default function MediaBrowser({ const [showMasonryGrid, setShowMasonryGrid] = useState(true); const [filterType, filterTypeSet] = useState(accept ? accept[0] : "all"); const [list, listSet] = useState([]); - const fetcher = [GetBookmarksByUser,GetMediaByUser,GetWeightsByUser,SearchWeights][inputMode]; + const [localSearch,localSearchSet] = useState(search); + const [searchUpdated,searchUpdatedSet] = useState(false); + const fetcher = [GetBookmarksByUser,GetMediaByUser,GetWeightsByUser,SearchWeight][inputMode]; const entities = useListContent({ debug: "media browser", addQueries: { - ...(search ? {} : { page_size: 24 }), + ...(localSearch ? {} : { page_size: 24 }), ...prepFilter( filterType, - ["maybe_scoped_weight_type", "filter_media_type", "maybe_scoped_weight_type",""][inputMode] + ["maybe_scoped_weight_type", "filter_media_type", "maybe_scoped_weight_type","abc"][inputMode] ), }, addSetters: { filterTypeSet }, @@ -64,13 +70,28 @@ export default function MediaBrowser({ // ratings.gather({ res, key: "token" }); setShowMasonryGrid(true); }, - ...(search ? { request: { search_term: search } } : {}), + ...(localSearch ? { request: { search_term: localSearch } } : {}), requestList: true, - // ...(search ? { resultsKey: "weights" } : {}), - urlParam: owner || username, + ...(localSearch ? { resultsKey: "weights" } : {}), + urlParam: owner || username || "", urlUpdate: false, }); + useDebounce({ + blocked: !searchUpdated, + onTimeout: () => { + searchUpdatedSet(false); + entities.reFetch(); + } + }) + + const localSearchChange = ({ target }: { target: any }) => { + searchUpdatedSet(true); + // entities.reFetch(); + onSearchChange({ target }); + localSearchSet(target.value); + }; + const handlePageClick = (selectedItem: { selected: number }) => { entities.pageChange(selectedItem.selected); }; @@ -108,7 +129,12 @@ export default function MediaBrowser({ return ( <> - + void; + search?: string; title?: string; } -export default function ModalHeader({ children, handleClose, title }: Props) { +export default function ModalHeader({ children, handleClose, onSearchChange = () => {}, search, title }: Props) { return (
- {title &&

{title}

} - {handleClose && ( + { search !== undefined ? : + title &&

{ title }

} + { handleClose && ( any +} + +export default function useDebounce({ blocked, delay = 500, onTimeout = () => {} }: Props) { + useEffect(() => { + const delayed = setTimeout(() => { + if (!blocked) { + onTimeout(); + } + }, delay) + + return () => clearTimeout(delayed) + }, [blocked,delay,onTimeout]); + + return null; +}; \ No newline at end of file diff --git a/packages/fakeyou.com/src/hooks/useListContent/useListContent.tsx b/packages/fakeyou.com/src/hooks/useListContent/useListContent.tsx index 65c17358fa..906aa6e214 100644 --- a/packages/fakeyou.com/src/hooks/useListContent/useListContent.tsx +++ b/packages/fakeyou.com/src/hooks/useListContent/useListContent.tsx @@ -81,7 +81,7 @@ export default function useListContent({ ...(sort ? { sort_ascending: true } : {}), }; - if (urlParam) { + if (urlParam !== undefined) { if (status === FetchStatus.ready) { let search = new URLSearchParams(queries).toString(); diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index d2f2120533..e631c5ab0a 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -123,7 +123,7 @@ import TextToImagePage from "./pages/text_to_image/TextToImagePage"; import DomainConfigProvider from "context/DomainConfigContext"; import DevUpload from "./pages/dev_upload/DevUpload"; import DevMediaInput from "./pages/dev_upload/DevMediaInput"; -// import DevTTS from "./pages/dev_tts/DevTTS"; +import DevTTS from "./pages/dev_tts/DevTTS"; interface Props { sessionWrapper: SessionWrapper; @@ -785,9 +785,9 @@ class PageContainer extends React.Component< { - // - // - // + + + } {/* Route for initial voice creation */} diff --git a/packages/fakeyou.com/src/v2/view/pages/dev_tts/DevTTS.scss b/packages/fakeyou.com/src/v2/view/pages/dev_tts/DevTTS.scss new file mode 100644 index 0000000000..675b4617f0 --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/pages/dev_tts/DevTTS.scss @@ -0,0 +1,37 @@ +@import "scss/colours.scss"; +@import "scss/site-refresh.scss"; + +.fy-weight-picker { + + @include panel; + border-radius: .5rem; + background-color: rgba($secondary, .6); + + &.fy-weight-picker-full { + .fy-input input { border-radius: .5rem .5rem 0 0 } + } + + .fy-weight-picker-preview { + border-top: 1px solid rgba(#fff,.15); + display: flex; + } + + .fy-card-badge { + display: inline-flex; + margin-left: .5rem; + } + + .fy-input { margin-bottom: 0 } + + .fy-weight-picker-reselect { + background-color: $secondary-light; + border-radius: .5rem; + padding: .5rem; + margin: 0 0 auto auto; + } +} + +.fy-card-badge { + display: flex; + height: min-content; +} \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/dev_tts/DevTTS.tsx b/packages/fakeyou.com/src/v2/view/pages/dev_tts/DevTTS.tsx new file mode 100644 index 0000000000..70bfd66bfb --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/pages/dev_tts/DevTTS.tsx @@ -0,0 +1,91 @@ +import React, { useState } from "react"; +import { Link } from "react-router-dom"; +import PageHeader from 'components/layout/PageHeader'; +import { MediaBrowser } from "components/modals"; +import { CardBadge } from "components/entities"; +import { Button, Container, Label, Panel, TempTextArea as TextArea, TempInput as Input, WeightCoverImage } from "components/common"; +import { useDebounce, useModal } from "hooks"; +import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; +import { Weight } from "@storyteller/components/src/api/weights/GetWeight"; +import { FontAwesomeIcon as Icon } from "@fortawesome/react-fontawesome"; +import { faRotateLeft, faSearch } from "@fortawesome/pro-solid-svg-icons"; +import "./DevTTS.scss"; + +interface Props { + value?: any; +} + +export default function DevTTS({ value }: Props) { + const { modalState, open } = useModal(); + const [search,searchSet] = useState(""); + const [updated,updatedSet] = useState(false); + const [selectedVoice,selectedVoiceSet] = useState(); + const [text,textSet] = useState(""); + const bucketConfig = new BucketConfig(); + const preview = bucketConfig.getCdnUrl(selectedVoice?.cover_image?.maybe_cover_image_public_bucket_path || ""); + + const textChange = ({ target }: { target: any }) => { + textSet(target.value); + }; + + const searchChange = (setUpdate = true) => ({ target }: { target: any }) => { + // console.log("🩵",target.value); + if (setUpdate) updatedSet(true); + // console.log("aaaa",); + searchSet(target.value); + }; + + useDebounce({ + blocked: !(updated && !modalState && search), + onTimeout: () => { + updatedSet(false); + open({ + component: MediaBrowser, + props: { + onSelect: (weight: any) => selectedVoiceSet(weight), + inputMode: 3, + onSearchChange: searchChange(false), + search + } + }); + } + }); + + return + + +