diff --git a/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx b/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx index ca9be05b57..a9406dc41b 100644 --- a/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx +++ b/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx @@ -50,7 +50,7 @@ export default function AudioCard({ const { label: weightBadgeLabel, color: weightBadgeColor } = useWeightTypeInfo( - data.weight_type || data.details?.maybe_weights_data?.weight_type + data.weight_type || data.details?.maybe_weight_data?.weight_type ); const bucketConfig = new BucketConfig(); @@ -66,11 +66,9 @@ export default function AudioCard({ 100 ); } - if ( - data.details?.maybe_weights_data?.maybe_cover_image_public_bucket_path - ) { + if (data.details?.maybe_weight_data?.maybe_cover_image_public_bucket_path) { coverImage = bucketConfig.getCdnUrl( - data.details?.maybe_weights_data?.maybe_cover_image_public_bucket_path, + data.details?.maybe_weight_data?.maybe_cover_image_public_bucket_path, 100, 100 ); @@ -157,7 +155,7 @@ export default function AudioCard({
- {data.title || data.details.maybe_weights_data.title} + {data.title || data.details.maybe_weight_data.title}

{timeAgo}

diff --git a/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx b/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx index c1672160a1..b25cae811a 100644 --- a/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx +++ b/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx @@ -46,7 +46,7 @@ export default function ImageCard({ const { label: weightBadgeLabel, color: weightBadgeColor } = useWeightTypeInfo( - data.weight_type || data.details?.maybe_weights_data?.weight_type + data.weight_type || data.details?.maybe_weight_data?.weight_type ); console.log("🌇", origin); @@ -64,11 +64,9 @@ export default function ImageCard({ 100 ); } - if ( - data.details?.maybe_weights_data?.maybe_cover_image_public_bucket_path - ) { + if (data.details?.maybe_weight_data?.maybe_cover_image_public_bucket_path) { coverImage = bucketConfig.getCdnUrl( - data.details?.maybe_weights_data?.maybe_cover_image_public_bucket_path, + data.details?.maybe_weight_data?.maybe_cover_image_public_bucket_path, 400, 100 ); @@ -161,7 +159,7 @@ export default function ImageCard({
- {data.title || data.details?.maybe_weights_data?.title} + {data.title || data.details?.maybe_weight_data?.title}

{timeAgo}

diff --git a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/FeaturedTab.tsx b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/FeaturedTab.tsx index 74ae59902a..22236bf888 100644 --- a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/FeaturedTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/FeaturedTab.tsx @@ -9,6 +9,8 @@ import { MediaFile } from "@storyteller/components/src/api/media_files/GetMedia" import { useBookmarks, useLazyLists } from "hooks"; import { ListFeaturedMediaFiles } from "@storyteller/components/src/api/media_files/ListFeaturedMediaFiles"; import SkeletonCard from "components/common/Card/SkeletonCard"; +import ImageCard from "components/common/Card/ImageCard"; +import VideoCard from "components/common/Card/VideoCard"; export default function FeaturedTab() { const bookmarks = useBookmarks(); @@ -23,7 +25,7 @@ export default function FeaturedTab() { onInputChange: () => setShowMasonryGrid(false), onSuccess: () => setShowMasonryGrid(true), requestList: true, - addQueries: { page_size: 12 }, + debug: "featured media", }); return ( @@ -55,22 +57,52 @@ export default function FeaturedTab() { gridRef={gridContainerRef} onLayoutComplete={() => console.log("Layout complete!")} > - {media.list.map((data, index) => { - let card = ( - - ); + {media.list.map((data: any, index: number) => { + let card; + switch (data.media_type) { + case "audio": + card = ( + + ); + break; + case "image": + card = ( + + ); + break; + case "video": + card = ( + + ); + break; + default: + card =
Unsupported media type
; + } return (
{card}
diff --git a/packages/fakeyou.com/src/v2/view/pages/media/MediaImageComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/media/MediaImageComponent.tsx index 07a178e4cf..d47877dab3 100644 --- a/packages/fakeyou.com/src/v2/view/pages/media/MediaImageComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/media/MediaImageComponent.tsx @@ -9,17 +9,10 @@ interface MediaImageComponentProps { export default function MediaImageComponent({ mediaFile, }: MediaImageComponentProps) { - const imagePath = new BucketConfig().getGcsUrl( - mediaFile.public_bucket_path - ); + const imagePath = new BucketConfig().getGcsUrl(mediaFile.public_bucket_path); return (
- test + test
); } 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 f146e1b280..060905d507 100644 --- a/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx @@ -2,7 +2,6 @@ import React, { useCallback, useEffect, useState } from "react"; import { Link, useParams } from "react-router-dom"; import MediaAudioComponent from "./MediaAudioComponent"; import MediaVideoComponent from "./MediaVideoComponent"; -import MediaImageComponent from "./MediaImageComponent"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { GetMediaFile, @@ -37,6 +36,7 @@ import LikeButton from "components/common/LikeButton"; import Badge from "components/common/Badge"; import useMediaFileTypeInfo from "hooks/useMediaFileTypeInfo"; import { useBookmarks } from "hooks"; +import SdCoverImagePanel from "../weight/cover_image_panels/SdCoverImagePanel"; interface MediaPageProps { sessionWrapper: SessionWrapper; @@ -111,7 +111,18 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) { ); case MediaFileType.Image: - return ; + let sdMediaImage = "/images/avatars/default-pfp.png"; + if ( + mediaFile.maybe_model_weight_info && + mediaFile.maybe_model_weight_info + .maybe_cover_image_public_bucket_path !== null + ) { + sdMediaImage = bucketConfig.getGcsUrl( + mediaFile.maybe_model_weight_info + .maybe_cover_image_public_bucket_path + ); + } + return ; default: return
Unsupported media type
; } diff --git a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/BookmarksTab.tsx b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/BookmarksTab.tsx index b43eb67b57..67a6196e5f 100644 --- a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/BookmarksTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/BookmarksTab.tsx @@ -189,7 +189,7 @@ export default function BookmarksTab({ username }: { username: string }) { >