diff --git a/packages/fakeyou.com/src/components/common/Panel/Panel.tsx b/packages/fakeyou.com/src/components/common/Panel/Panel.tsx index f86e65d2f9..270fdd313c 100644 --- a/packages/fakeyou.com/src/components/common/Panel/Panel.tsx +++ b/packages/fakeyou.com/src/components/common/Panel/Panel.tsx @@ -5,13 +5,22 @@ interface PanelProps { padding?: boolean; mb?: boolean; mt?: boolean; + className?: string; } -export default function Panel({ children, padding, mb, mt }: PanelProps) { +export default function Panel({ + children, + padding, + mb, + mt, + className, +}: PanelProps) { return (
{children}
diff --git a/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx b/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx index 8b1cef17a0..1a56737b7a 100644 --- a/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx @@ -178,7 +178,6 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) { value: mediaFile.creator_set_visibility.toString(), }, /*{ - property: "Model", value: mediaFile.model_used, link: mediaFile.model_link, }, diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerCreatePage.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerCreatePage.tsx index 9b2d3a18fb..47d454be8f 100644 --- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerCreatePage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerCreatePage.tsx @@ -54,14 +54,14 @@ function VoiceDesignerCreatePage() { return ( {/* Stepper */} -
+
diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx index 0cc9f99d6a..9ed4e072cc 100644 --- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx @@ -6,31 +6,43 @@ import PageHeader from "components/layout/PageHeader"; import Container from "components/common/Container"; import { Route, NavLink, Switch, Redirect } from "react-router-dom"; import ListItems from "./components/ListItems/ListItems"; -import { Button } from "components/common"; function VoiceDesignerMainPage() { usePrefixedDocumentTitle("Voice Designer"); - const dummyData: any[] = []; + const voicesList = [ + { + name: "Donald Trump (45th US President)", + edit: "/tts", + delete: "/", + use: "/", + }, + { + name: "Spongebob Squarepants (Season 1)", + edit: "/", + delete: "/", + use: "/", + }, + ]; + const datasetList = [ + { name: "Donald Trump (45th US President)", edit: "/", delete: "/" }, + ]; + const emptyList = [] as any[]; - const MyVoices: React.FC = () => { - return ; - }; + function MyVoices() { + return ; + } - const Datasets: React.FC = () => { - return ( -
-

Datasets

-
- ); - }; + function MyDatasets() { + return ; + } return (
  • @@ -66,13 +78,13 @@ function VoiceDesignerMainPage() {
    + - - +
    diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/ListItems/ListItems.scss b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/ListItems/ListItems.scss index 0c91927648..cb465afc62 100644 --- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/ListItems/ListItems.scss +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/ListItems/ListItems.scss @@ -1,17 +1,17 @@ @import "scss/colours.scss"; .list-items { - background-color: lighten($panel, 5%); + background-color: lighten($panel, 4%); border-radius: 0.5rem; - border: 1px solid lighten($panel, 10%); + border: 1px solid lighten($panel, 8%); - .type-tag { + .dataset-badge { font-weight: 600; border-radius: 0.35rem; font-size: 13px; - padding: 4px 8px; - background-color: $secondary; - color: $white; + padding: 2px 6px; + background-color: #f7daed; + color: #961574; transition: 0.2s; -moz-user-select: none; -khtml-user-select: none; @@ -19,16 +19,7 @@ -ms-user-select: none; user-select: none; height: 100%; - - &.public { - color: #494ea9; - background-color: #c6c7e1; - } - - &.private { - color: #494ea9; - background-color: #c6c7e1; - } + margin-bottom: 10px; } .model-details { diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/ListItems/ListItems.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/ListItems/ListItems.tsx index 969be258a1..716a27a9a7 100644 --- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/ListItems/ListItems.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/ListItems/ListItems.tsx @@ -1,19 +1,42 @@ import React from "react"; import "./ListItems.scss"; import Button from "../../../../../../components/common/Button"; -import { faPlus } from "@fortawesome/pro-solid-svg-icons"; +import { faMicrophone, faPlus } from "@fortawesome/pro-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; interface ListItemsProps { data: any[]; + type: "voices" | "datasets"; } -export default function ListItems({ data }: ListItemsProps) { +export default function ListItems({ data, type }: ListItemsProps) { if (data.length === 0) { return (
    -
    You haven't created any voices.
    - -
    ); } @@ -32,13 +55,38 @@ export default function ListItems({ data }: ListItemsProps) { {data.map((item) => { return (
    -
    {item.name}
    +
    + {type === "datasets" && ( + Dataset + )} +
    + {type === "voices" && ( + + )} + {item.name} +
    +
    -