diff --git a/packages/fakeyou.com/src/scss/site-refresh.scss b/packages/fakeyou.com/src/scss/site-refresh.scss index da4780ee4c..f45ea3846a 100644 --- a/packages/fakeyou.com/src/scss/site-refresh.scss +++ b/packages/fakeyou.com/src/scss/site-refresh.scss @@ -310,6 +310,15 @@ styles with important tags: box-shadow: none !important; } + .video-bg { + background-color: $black; + } + + .panel-border { + border-color: #ffffff12 !important; + border: 1px solid; + } + .panel-inner { background-color: lighten($panel, 4%); } @@ -510,7 +519,7 @@ styles with important tags: box-shadow: none; } - .panel-border { + .pricing-border { box-sizing: border-box; box-shadow: inset 0px 0px 0px 3px $primary; } diff --git a/packages/fakeyou.com/src/v2/view/pages/media/MediaAudioPlayer.tsx b/packages/fakeyou.com/src/v2/view/pages/media/MediaAudioPlayer.tsx index 4b5cd6481b..283b7dbdee 100644 --- a/packages/fakeyou.com/src/v2/view/pages/media/MediaAudioPlayer.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/media/MediaAudioPlayer.tsx @@ -2,9 +2,14 @@ import React from "react"; import WaveSurfer from "wavesurfer.js"; import { useEffect, useState } from "react"; import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { faPlay, faPause } from "@fortawesome/pro-solid-svg-icons"; +import { + faPlay, + faPause, + faRepeat, + faArrowRight, +} from "@fortawesome/pro-solid-svg-icons"; import { MediaFile } from "@storyteller/components/src/api/media_files/GetMediaFile"; +import Button from "components/common/Button"; enum PlaybackSpeed { HALF, @@ -26,13 +31,12 @@ export default function MediaAudioPlayer({ mediaFile }: MediaAudioPlayerProps) { const wavesurferInstance = WaveSurfer.create({ container: "#waveform", // Previousy I used 'this.ref.current' and React.createRef() height: 200, - responsive: true, waveColor: "#cbcbcb", progressColor: "#fc8481", cursorColor: "#fc6b68", cursorWidth: 2, - normalize: false, + normalize: true, }); setWaveSurfer(wavesurferInstance); @@ -93,20 +97,12 @@ export default function MediaAudioPlayer({ mediaFile }: MediaAudioPlayerProps) { setPlaybackSpeed(nextSpeed); }; - let playButtonText = ( - <> - - - ); + let playButtonIcon = faPlay; if (isPlaying) { - playButtonText = ( - <> - - - ); + playButtonIcon = faPause; } - let repeatButtonText = isRepeating ? "Repeat" : "NoRepeat"; + let repeatButtonIcon = isRepeating ? faRepeat : faArrowRight; let speedButtonText = "1x"; switch (playbackSpeed) { @@ -117,33 +113,34 @@ export default function MediaAudioPlayer({ mediaFile }: MediaAudioPlayerProps) { speedButtonText = "2x"; break; case PlaybackSpeed.HALF: - speedButtonText = "1/2x"; + speedButtonText = "0.5x"; break; } return (
-
-
- +
+ + -
+
); 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 2ae398610a..003f710653 100644 --- a/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx @@ -61,24 +61,39 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) { switch (mediaFile.media_type) { case MediaFileType.Audio: return ( -
+
+ {/* Voice model name that is used to generate the audio */} +

[Voice Model Name]

+ -
-
- - Audio Text -
- {/*

{mediaFile?.audio_text && mediaFile.audio_text}

*/} -
+ + {/* Show TTS text input if it is a TTS result */} + {mediaFile.public_bucket_path.includes("tts_inference_output") && ( +
+
+ + Audio Text +
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed + do eiusmod tempor incididunt ut labore et dolore magna aliqua. + Pellentesque elit ullamcorper dignissim cras tincidunt + lobortis. Integer malesuada nunc vel risus commodo viverra + maecenas accumsan lacus. +

+
+ )}
); case MediaFileType.Video: return ( -
-
- + <> +
+
+ +
-
+ ); case MediaFileType.Image: @@ -187,24 +202,26 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) { }, ]; + const imageDetails = [ + { property: "Type", value: mediaFile.media_type }, + { property: "Created at", value: mediaFile.created_at.toString() }, + { + property: "Visibility", + value: mediaFile.creator_set_visibility.toString(), + }, + ]; + let mediaDetails = undefined; switch (mediaFile.media_type) { case MediaFileType.Audio: - mediaDetails = ( - - - - ); + mediaDetails = ; break; case MediaFileType.Video: - mediaDetails = ( - - - - ); + mediaDetails = ; break; case MediaFileType.Image: + mediaDetails = ; break; default: } @@ -307,7 +324,10 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) {
- {mediaDetails} + + {mediaDetails} + + {modMediaDetails}
diff --git a/packages/fakeyou.com/src/v2/view/pages/premium/PricingPage.tsx b/packages/fakeyou.com/src/v2/view/pages/premium/PricingPage.tsx index 039364da46..47822836db 100644 --- a/packages/fakeyou.com/src/v2/view/pages/premium/PricingPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/premium/PricingPage.tsx @@ -143,7 +143,7 @@ function PricingPage(props: Props) { // Highlight the mid-tier plan if nothing is subscribed if (!userHasPaidPremium) { - proBorderCss = "rounded panel p-4 h-100 panel-border"; + proBorderCss = "rounded panel p-4 h-100 pricing-border"; } return (