From 271956059b32b0caa7523799e53e3553fe1360c9 Mon Sep 17 00:00:00 2001 From: BFlat Date: Fri, 29 Dec 2023 08:49:19 +0700 Subject: [PATCH 01/13] bookmark properly shown, card images --- packages/components/src/api/BucketConfig.ts | 2 +- .../src/api/bookmarks/GetBookmarksByUser.ts | 20 ++++-- .../common/Card/AudioCard/AudioCard.tsx | 54 +++++++++++---- .../common/Card/ImageCard/ImageCard.tsx | 66 +++++++++++++------ .../profile_view/tabs/BookmarksTab.tsx | 32 ++++----- 5 files changed, 115 insertions(+), 59 deletions(-) diff --git a/packages/components/src/api/BucketConfig.ts b/packages/components/src/api/BucketConfig.ts index 89fef8e0c9..42e739773a 100644 --- a/packages/components/src/api/BucketConfig.ts +++ b/packages/components/src/api/BucketConfig.ts @@ -30,7 +30,7 @@ class BucketConfig { const basePath = this.isLocalDev ? "https://dev-cdn.fakeyou.com" : "https://cdn.fakeyou.com"; - let path = bucketRelativePath.startsWith("/") + let path = bucketRelativePath?.startsWith("/") ? bucketRelativePath : "/" + bucketRelativePath; let resizeParams = ""; diff --git a/packages/components/src/api/bookmarks/GetBookmarksByUser.ts b/packages/components/src/api/bookmarks/GetBookmarksByUser.ts index 21bce70f12..671e07d7a7 100644 --- a/packages/components/src/api/bookmarks/GetBookmarksByUser.ts +++ b/packages/components/src/api/bookmarks/GetBookmarksByUser.ts @@ -1,19 +1,25 @@ import MakeRequest from "../MakeRequest"; -import { Pagination } from "../_common/SharedFetchTypes"; +import { Weight } from "../weights/GetWeight"; export interface UserBookmarksListRequest {} export interface UserBookmarksListResponse { // pagination: Pagination, - success: boolean, - // weights: any + success: boolean; + results: Weight[]; } export interface UserBookmarksListQueries { - page_index: number, + page_index: number; } -export const GetBookmarksByUser = MakeRequest({ +export const GetBookmarksByUser = MakeRequest< + string, + UserBookmarksListRequest, + UserBookmarksListResponse, + UserBookmarksListQueries +>({ method: "GET", - routingFunction: (userToken: string) => `/v1/user_bookmarks/list/user/${userToken}`, -}); \ No newline at end of file + routingFunction: (userToken: string) => + `/v1/user_bookmarks/list/user/${userToken}`, +}); 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 32750b312e..3b053da286 100644 --- a/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx +++ b/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx @@ -11,9 +11,10 @@ import { faArrowRight } from "@fortawesome/pro-solid-svg-icons"; import Button from "components/common/Button"; import useWeightTypeInfo from "hooks/useWeightTypeInfo/useWeightTypeInfo"; import WeightCoverImage from "components/common/WeightCoverImage"; +import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; interface AudioCardProps { - bookmarks: any, + bookmarks: any; data: any; type: "media" | "weights"; showCreator?: boolean; @@ -28,7 +29,9 @@ export default function AudioCard({ showCover, }: AudioCardProps) { const linkUrl = - type === "media" ? `/media/${data.token}` : `/weight/${data.weight_token}`; + type === "media" + ? `/media/${data.token}` + : `/weight/${data.weight_token || data.details.entity_token}`; const handleInnerClick = (event: any) => { event.stopPropagation(); @@ -42,7 +45,33 @@ export default function AudioCard({ }; const { label: weightBadgeLabel, color: weightBadgeColor } = - useWeightTypeInfo(data.weights_type); + useWeightTypeInfo( + data.weights_type || data.details?.maybe_weights_data?.weights_type + ); + + const bucketConfig = new BucketConfig(); + let coverImage = "/images/avatars/default-pfp.png"; + + if (type === "media") { + coverImage = bucketConfig.getCdnUrl(data.public_bucket_path, 400, 100); + } else if (type === "weights") { + if (data.maybe_cover_image_public_bucket_path) { + coverImage = bucketConfig.getCdnUrl( + data.maybe_cover_image_public_bucket_path, + 100, + 100 + ); + } + if ( + data.details?.maybe_weights_data?.maybe_cover_image_public_bucket_path + ) { + coverImage = bucketConfig.getCdnUrl( + data.details?.maybe_weights_data?.maybe_cover_image_public_bucket_path, + 100, + 100 + ); + } + } return ( @@ -98,9 +127,7 @@ export default function AudioCard({ {type === "weights" && ( <>
- {showCover && ( - - )} + {showCover && }
@@ -120,7 +147,7 @@ export default function AudioCard({
- {data.title} + {data.title || data.details.maybe_weights_data.title}

{timeAgo}

@@ -151,12 +178,13 @@ export default function AudioCard({
- +
)} 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 bc6ed4f978..58acc9aa6d 100644 --- a/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx +++ b/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx @@ -12,15 +12,22 @@ import useWeightTypeInfo from "hooks/useWeightTypeInfo/useWeightTypeInfo"; import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; interface ImageCardProps { - bookmarks: any, + bookmarks: any; data: any; type: "media" | "weights"; showCreator?: boolean; } -export default function ImageCard({ bookmarks, data, type, showCreator }: ImageCardProps) { +export default function ImageCard({ + bookmarks, + data, + type, + showCreator, +}: ImageCardProps) { const linkUrl = - type === "media" ? `/media/${data.token}` : `/weight/${data.weight_token}`; + type === "media" + ? `/media/${data.token}` + : `/weight/${data.weight_token || data.details.entity_token}`; const handleInnerClick = (event: any) => { event.stopPropagation(); @@ -34,16 +41,40 @@ export default function ImageCard({ bookmarks, data, type, showCreator }: ImageC }; const { label: weightBadgeLabel, color: weightBadgeColor } = - useWeightTypeInfo(data.weights_type); + useWeightTypeInfo( + data.weights_type || data.details?.maybe_weights_data?.weights_type + ); - const imageLink = new BucketConfig().getGcsUrl(data.public_bucket_path); + const bucketConfig = new BucketConfig(); + let coverImage = "/images/avatars/default-pfp.png"; + + if (type === "media") { + coverImage = bucketConfig.getCdnUrl(data.public_bucket_path, 400, 100); + } else if (type === "weights") { + if (data.maybe_cover_image_public_bucket_path) { + coverImage = bucketConfig.getCdnUrl( + data.maybe_cover_image_public_bucket_path, + 400, + 100 + ); + } + if ( + data.details?.maybe_weights_data?.maybe_cover_image_public_bucket_path + ) { + coverImage = bucketConfig.getCdnUrl( + data.details?.maybe_weights_data?.maybe_cover_image_public_bucket_path, + 400, + 100 + ); + } + } return ( {type === "media" && ( <> - {data.weight_name} + {data.weight_name}
@@ -93,14 +124,7 @@ export default function ImageCard({ bookmarks, data, type, showCreator }: ImageC {type === "weights" && ( <> - {data.title} + {data.title}
@@ -125,7 +149,7 @@ export default function ImageCard({ bookmarks, data, type, showCreator }: ImageC
- {data.title} + {data.title || data.details?.maybe_weights_data?.title}

{timeAgo}

@@ -156,11 +180,13 @@ export default function ImageCard({ bookmarks, data, type, showCreator }: ImageC
- +
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 9b41e30e54..0f9123938b 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 @@ -1,8 +1,5 @@ import React, { useRef, useState } from "react"; import MasonryGrid from "components/common/MasonryGrid/MasonryGrid"; -import AudioCard from "components/common/Card/AudioCard"; -import ImageCard from "components/common/Card/ImageCard"; -import VideoCard from "components/common/Card/VideoCard"; import SkeletonCard from "components/common/Card/SkeletonCard"; import { TempSelect } from "components/common"; import { @@ -13,6 +10,7 @@ import Pagination from "components/common/Pagination"; import { useBookmarks, useListContent } from "hooks"; import { GetBookmarksByUser } from "@storyteller/components/src/api/bookmarks/GetBookmarksByUser"; +import WeightsCards from "components/common/Card/WeightsCards"; export default function BookmarksTab({ username }: { username: string }) { const bookmarks = useBookmarks(); @@ -90,19 +88,6 @@ export default function BookmarksTab({ username }: { username: string }) { { value: "SDXL", label: "SD XL" }, ]; - const Card = ({ props, type }: { props: any; type: string }) => { - switch (type) { - case "audio": - return ; - case "image": - return ; - case "video": - return ; - default: - return
Unsupported media type
; - } - }; - return ( <>
@@ -177,7 +162,12 @@ export default function BookmarksTab({ username }: { username: string }) { onLayoutComplete={() => console.log("Layout complete!")} > {dataList.map((data: any, key: number) => { - let props = { bookmarks, data, type: "weights" }; + let props = { + bookmarks, + data, + type: "weights", + showCreator: true, + }; return (
- +
); })} From 713c7d98cc63b007328ab6cd05080bc67eab4c7c Mon Sep 17 00:00:00 2001 From: BFlat Date: Fri, 29 Dec 2023 08:56:41 +0700 Subject: [PATCH 02/13] media card in bookmarks --- .../src/v2/view/pages/profile/profile_view/tabs/BookmarksTab.tsx | 1 + 1 file changed, 1 insertion(+) 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 2ddaa037e2..0711e8ac9f 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 @@ -187,6 +187,7 @@ export default function BookmarksTab({ username }: { username: string }) { props, }} /> +
); })} From 87365c05b2394737ff1f2b08508c43cf8c3e3945 Mon Sep 17 00:00:00 2001 From: BFlat Date: Fri, 29 Dec 2023 08:57:09 +0700 Subject: [PATCH 03/13] removed old image link --- .../src/components/common/Card/ImageCard/ImageCard.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 3313656a47..a49a4480e0 100644 --- a/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx +++ b/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx @@ -47,9 +47,8 @@ export default function ImageCard({ data.weights_type || data.details?.maybe_weights_data?.weights_type ); - const imageLink = new BucketConfig().getGcsUrl(data.public_bucket_path); - console.log("🌇", origin); + const bucketConfig = new BucketConfig(); let coverImage = "/images/avatars/default-pfp.png"; From 599df48c98758959b76bebc94ace8c2b54323ae0 Mon Sep 17 00:00:00 2001 From: BFlat Date: Fri, 29 Dec 2023 09:03:39 +0700 Subject: [PATCH 04/13] updates --- .../common/Card/AudioCard/AudioCard.tsx | 2 +- .../common/Card/ImageCard/ImageCard.tsx | 4 +++- .../profile/profile_view/tabs/BookmarksTab.tsx | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) 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 6d50b7fc04..a2d491473f 100644 --- a/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx +++ b/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx @@ -33,7 +33,7 @@ export default function AudioCard({ const linkUrl = type === "media" ? `/media/${data.token}` - : `/weight/${data.weight_token}${ + : `/weight/${data.weight_token || data.details.entity_token}${ origin ? "?origin=" + origin + "&ehhh=mehh" : "" }`; 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 a49a4480e0..7ba358ecb0 100644 --- a/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx +++ b/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx @@ -29,7 +29,9 @@ export default function ImageCard({ const linkUrl = type === "media" ? `/media/${data.token}` - : `/weight/${data.weight_token || data.details.entity_token}`; + : `/weight/${data.weight_token || data.details.entity_token}${ + origin ? "?origin=" + origin + "&ehhh=mehh" : "" + }`; const handleInnerClick = (event: any) => { event.stopPropagation(); 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 0711e8ac9f..b260149378 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 @@ -165,7 +165,15 @@ export default function BookmarksTab({ username }: { username: string }) { onLayoutComplete={() => console.log("Layout complete!")} > {dataList.map((data: any, key: number) => { - let props = { + let weightProps = { + bookmarks, + data, + origin, + type: "weights", + showCreator: true, + }; + + let mediaProps = { bookmarks, data, origin, @@ -184,10 +192,12 @@ export default function BookmarksTab({ username }: { username: string }) { {...{ type: data.details.maybe_weights_data .weights_category, - props, + props: weightProps, }} /> - +
); })} From 1728ecdfe343de44c6e0d2ed1920fd1a061b3bc7 Mon Sep 17 00:00:00 2001 From: BFlat Date: Fri, 29 Dec 2023 09:06:57 +0700 Subject: [PATCH 05/13] commented out media from bookmarks tab for now --- .../profile/profile_view/tabs/BookmarksTab.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 b260149378..e7e287d045 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 @@ -173,13 +173,13 @@ export default function BookmarksTab({ username }: { username: string }) { showCreator: true, }; - let mediaProps = { - bookmarks, - data, - origin, - type: "weights", - showCreator: true, - }; + // let mediaProps = { + // bookmarks, + // data, + // origin, + // type: "media", + // showCreator: true, + // }; return (
- + /> */}
); })} From a1e59c3753505b8e4d81ecf8fc03b7b9c01a5279 Mon Sep 17 00:00:00 2001 From: BFlat Date: Fri, 29 Dec 2023 09:07:24 +0700 Subject: [PATCH 06/13] commented out media from bookmarks tab for now --- .../profile_view/tabs/BookmarksTab.tsx | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) 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 b260149378..222e4125fb 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 @@ -1,7 +1,6 @@ import React, { useRef, useState } from "react"; import { useLocation } from "react-router-dom"; import MasonryGrid from "components/common/MasonryGrid/MasonryGrid"; -import MediaCards from "components/common/Card/MediaCards"; import SkeletonCard from "components/common/Card/SkeletonCard"; import { TempSelect } from "components/common"; import { @@ -173,13 +172,13 @@ export default function BookmarksTab({ username }: { username: string }) { showCreator: true, }; - let mediaProps = { - bookmarks, - data, - origin, - type: "weights", - showCreator: true, - }; + // let mediaProps = { + // bookmarks, + // data, + // origin, + // type: "media", + // showCreator: true, + // }; return (
- + /> */}
); })} From ee0df1c59a67defec85b403d311b245b8e58c339 Mon Sep 17 00:00:00 2001 From: BFlat Date: Fri, 29 Dec 2023 11:31:11 +0700 Subject: [PATCH 07/13] media page weight used data binding --- .../src/api/_common/enums/MediaFileType.ts | 2 +- .../src/api/media_files/GetMediaFile.ts | 80 +++++++----- .../common/ShareButton/ShareButton.tsx | 2 +- .../src/hooks/useMediaFileTypeInfo/index.ts | 1 + .../useMediaFileTypeInfo.tsx | 33 +++++ .../src/hooks/useWeightTypeInfo/index.ts | 1 + .../src/v2/view/pages/media/MediaPage.tsx | 119 ++++++++++++++---- 7 files changed, 183 insertions(+), 55 deletions(-) create mode 100644 packages/fakeyou.com/src/hooks/useMediaFileTypeInfo/index.ts create mode 100644 packages/fakeyou.com/src/hooks/useMediaFileTypeInfo/useMediaFileTypeInfo.tsx create mode 100644 packages/fakeyou.com/src/hooks/useWeightTypeInfo/index.ts diff --git a/packages/components/src/api/_common/enums/MediaFileType.ts b/packages/components/src/api/_common/enums/MediaFileType.ts index b104aeaa7b..6f1ff419ed 100644 --- a/packages/components/src/api/_common/enums/MediaFileType.ts +++ b/packages/components/src/api/_common/enums/MediaFileType.ts @@ -1,6 +1,6 @@ - export enum MediaFileType { Audio = "audio", Video = "video", Image = "image", + None = "none", } diff --git a/packages/components/src/api/media_files/GetMediaFile.ts b/packages/components/src/api/media_files/GetMediaFile.ts index 29bdc1a7fc..4177077788 100644 --- a/packages/components/src/api/media_files/GetMediaFile.ts +++ b/packages/components/src/api/media_files/GetMediaFile.ts @@ -1,15 +1,25 @@ import { ApiConfig } from "../ApiConfig"; import { UserDetailsLight } from "../_common/UserDetailsLight"; import { MediaFileType } from "../_common/enums/MediaFileType"; +import { WeightCategory } from "../_common/enums/WeightCategory"; +import { WeightType } from "../_common/enums/WeightType"; +// import { Weight } from "../weights/GetWeight"; export interface MediaFile { - token: string, - media_type: MediaFileType, - public_bucket_path: string, - maybe_creator_user: UserDetailsLight | null, - creator_set_visibility: string, - created_at: Date, - updated_at: Date, + token: string; + media_type: MediaFileType; + public_bucket_path: string; + maybe_creator_user?: UserDetailsLight | null; + creator_set_visibility: string; + created_at: Date; + updated_at: Date; + maybe_model_weight_info?: { + title: string; + weight_token: string; + weight_category: WeightCategory; + weight_type: WeightType; + maybe_weight_creator: UserDetailsLight; + }; } export enum MediaFileLookupError { @@ -19,34 +29,40 @@ export enum MediaFileLookupError { } export interface GetMediaFileResponse { - success: boolean, - media_file?: MediaFile, + success: boolean; + media_file?: MediaFile; } -export async function GetMediaFile(mediaFileToken: string) : Promise { +export async function GetMediaFile( + mediaFileToken: string +): Promise { const endpoint = new ApiConfig().getMediaFile(mediaFileToken); - - return await fetch(endpoint, { - method: 'GET', - headers: { - 'Accept': 'application/json', - }, - credentials: 'include', - }) - .then(res => res.json()) - .then(res => { - const response : GetMediaFileResponse = res; - if (response && response.success && response.media_file) { - // NB: Timestamps aren't converted to Date objects on their own! - response.media_file.created_at = new Date(response.media_file.created_at); - response.media_file.updated_at = new Date(response.media_file.updated_at); - return response; - } else { - return { success : false }; - } + return await fetch(endpoint, { + method: "GET", + headers: { + Accept: "application/json", + }, + credentials: "include", }) - .catch(e => { - return { success : false }; - }); + .then(res => res.json()) + .then(res => { + const response: GetMediaFileResponse = res; + + if (response && response.success && response.media_file) { + // NB: Timestamps aren't converted to Date objects on their own! + response.media_file.created_at = new Date( + response.media_file.created_at + ); + response.media_file.updated_at = new Date( + response.media_file.updated_at + ); + return response; + } else { + return { success: false }; + } + }) + .catch(e => { + return { success: false }; + }); } diff --git a/packages/fakeyou.com/src/components/common/ShareButton/ShareButton.tsx b/packages/fakeyou.com/src/components/common/ShareButton/ShareButton.tsx index ed1fe885d2..1351dcda02 100644 --- a/packages/fakeyou.com/src/components/common/ShareButton/ShareButton.tsx +++ b/packages/fakeyou.com/src/components/common/ShareButton/ShareButton.tsx @@ -26,7 +26,7 @@ export default function ShareButton(props: ShareButtonProps) {
setButtonLabel("Copy"), 1000); }; + const subtitleDivider = |; + return (
- + + +
+
+
+

+ {mediaFile.maybe_model_weight_info?.title || + `Media ${mediaType}`} +

+
+
+
+
+ +
+ {subtitleDivider} + + {mediaFile.maybe_model_weight_info && ( + <> +

+ {mediaFile.maybe_model_weight_info?.weight_category} +

+ {subtitleDivider} + + )} + +
+ + {/* */} +
+
+
+
+
+ +
@@ -374,30 +435,46 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) {

Anonymous

)} -

Created: {timeCreated}

+

Created {timeCreated}

- -
-
Weight Used
-
-
- -
- -
Weight Name
- -

by hanashi

+ {mediaFile.maybe_model_weight_info && ( + +
+
Weight Used
+
+
+ +
+ +
+ {mediaFile.maybe_model_weight_info.title} +
+ +

+ by{" "} + + { + mediaFile.maybe_model_weight_info + .maybe_weight_creator.display_name + } + +

+
-
- + + )} From 4ea744cb36eeec1559000ac600a1d17f951d6f1e Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Fri, 29 Dec 2023 00:58:47 -0500 Subject: [PATCH 08/13] fix explore param --- .../fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx index 7a987fc081..9081981d77 100644 --- a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx @@ -33,7 +33,7 @@ export default function MediaTab() { const filterOptions = [ { value: "all", label: "All Media" }, - { value: "images", label: "Images" }, + { value: "image", label: "Images" }, { value: "audio", label: "Audio" }, { value: "video", label: "Video" }, ]; From bd9b599d75e9b1410e5f41a12bebb40c8547b683 Mon Sep 17 00:00:00 2001 From: BFlat Date: Fri, 29 Dec 2023 18:26:19 +0700 Subject: [PATCH 09/13] loader fix --- .../src/v2/view/pages/explore/tabs/MediaTab.tsx | 11 +++++++---- .../src/v2/view/pages/explore/tabs/WeightsTab.tsx | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx index 7a987fc081..e531a87afa 100644 --- a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx @@ -81,11 +81,14 @@ export default function MediaTab() { next={media.getMore} hasMore={!media.list.length || !!media.next} loader={ -
-
- Loading... + media.list.length !== 0 && + media.isLoading && ( +
+
+ Loading... +
-
+ ) } endMessage={

No more results.

diff --git a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx index dc3a40151e..d12b6c2149 100644 --- a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx @@ -117,11 +117,14 @@ export default function WeightsTab() { next={weights.getMore} hasMore={!weights.list.length || !!weights.next} loader={ -
-
- Loading... + weights.list.length !== 0 && + weights.isLoading && ( +
+
+ Loading... +
-
+ ) } endMessage={

No more results.

From c32203bb6d8e0bdb4247a5ada9624265ce0a8d81 Mon Sep 17 00:00:00 2001 From: BFlat Date: Fri, 29 Dec 2023 21:44:12 +0700 Subject: [PATCH 10/13] media weight used cover image --- .../components/src/api/media_files/GetMediaFile.ts | 5 +++-- .../src/v2/view/pages/media/MediaPage.tsx | 13 ++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/components/src/api/media_files/GetMediaFile.ts b/packages/components/src/api/media_files/GetMediaFile.ts index 4177077788..39f42bc1c7 100644 --- a/packages/components/src/api/media_files/GetMediaFile.ts +++ b/packages/components/src/api/media_files/GetMediaFile.ts @@ -9,16 +9,17 @@ export interface MediaFile { token: string; media_type: MediaFileType; public_bucket_path: string; - maybe_creator_user?: UserDetailsLight | null; + maybe_creator_user: UserDetailsLight | null; creator_set_visibility: string; created_at: Date; updated_at: Date; - maybe_model_weight_info?: { + maybe_model_weight_info: { title: string; weight_token: string; weight_category: WeightCategory; weight_type: WeightType; maybe_weight_creator: UserDetailsLight; + maybe_cover_image_public_bucket_path: string; }; } 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 30729b2c26..f146e1b280 100644 --- a/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx @@ -297,6 +297,17 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) { const subtitleDivider = |; + const bucketConfig = new BucketConfig(); + + let weightUsedCoverImage = "/images/avatars/default-pfp.png"; + if (mediaFile.maybe_model_weight_info !== null) { + weightUsedCoverImage = bucketConfig.getCdnUrl( + mediaFile.maybe_model_weight_info.maybe_cover_image_public_bucket_path, + 60, + 100 + ); + } + return (
@@ -447,7 +458,7 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) {
From 085172b88b8a38163bec658c8707fcbb6bffbbac Mon Sep 17 00:00:00 2001 From: BFlat Date: Sat, 30 Dec 2023 00:07:28 +0700 Subject: [PATCH 11/13] weight response fix visibility --- .../hooks/useWeightFetch/useWeightFetch.tsx | 90 +++++++++++-------- .../src/v2/view/pages/weight/WeightPage.tsx | 19 ++-- 2 files changed, 69 insertions(+), 40 deletions(-) diff --git a/packages/fakeyou.com/src/hooks/useWeightFetch/useWeightFetch.tsx b/packages/fakeyou.com/src/hooks/useWeightFetch/useWeightFetch.tsx index 0f7543c1f6..35c882a478 100644 --- a/packages/fakeyou.com/src/hooks/useWeightFetch/useWeightFetch.tsx +++ b/packages/fakeyou.com/src/hooks/useWeightFetch/useWeightFetch.tsx @@ -1,7 +1,10 @@ -import { useEffect, useState } from 'react'; -import { useHistory } from 'react-router-dom'; +import { useEffect, useState } from "react"; +import { useHistory } from "react-router-dom"; import { FetchStatus } from "@storyteller/components/src/api/_common/SharedFetchTypes"; -import { GetWeight, Weight } from "@storyteller/components/src/api/weights/GetWeight"; +import { + GetWeight, + Weight, +} from "@storyteller/components/src/api/weights/GetWeight"; import { UpdateWeight } from "@storyteller/components/src/api/weights/UpdateWeight"; import { DeleteWeight } from "@storyteller/components/src/api/weights/DeleteWeight"; @@ -17,66 +20,83 @@ export default function useWeightFetch({ onRemove = () => {}, token }: Props) { const [title, titleSet] = useState(""); const [visibility, visibilitySet] = useState("public"); const [descriptionMD, descriptionMDSet] = useState(""); - const isLoading = status === FetchStatus.ready || status === FetchStatus.in_progress; + const isLoading = + status === FetchStatus.ready || status === FetchStatus.in_progress; const fetchError = status === FetchStatus.error; const history = useHistory(); const onChange = ({ target }: { target: { name: string; value: any } }) => { - const todo: { [key: string]: (x: any) => void } = { descriptionMDSet, titleSet, visibilitySet }; + const todo: { [key: string]: (x: any) => void } = { + descriptionMDSet, + titleSet, + visibilitySet, + }; todo[target.name + "Set"](target.value); }; const update = () => { writeStatusSet(FetchStatus.in_progress); - UpdateWeight(token,{ + UpdateWeight(token, { description_markdown: descriptionMD, description_rendered_html: data?.description_rendered_html || "", title, visibility, weight_category: data?.weights_category || "", - weight_type: data?.weights_type || "" + weight_type: data?.weights_type || "", }) - .then((res: any) => { - console.log("📝",res); - writeStatusSet(FetchStatus.success); - history.replace(`/weight/${ token }`); - }) - .catch(err => { - writeStatusSet(FetchStatus.error); - }); + .then((res: any) => { + writeStatusSet(FetchStatus.success); + history.replace(`/weight/${token}`); + }) + .catch(err => { + writeStatusSet(FetchStatus.error); + }); }; const remove = () => { writeStatusSet(FetchStatus.in_progress); - DeleteWeight(token,{ + DeleteWeight(token, { as_mod: true, - set_delete: true - }) - .then((res: any) => { + set_delete: true, + }).then((res: any) => { writeStatusSet(FetchStatus.success); - console.log("✂️",res); onRemove(res); }); }; - + useEffect(() => { if (token && !data && status === FetchStatus.ready) { statusSet(FetchStatus.in_progress); GetWeight(token, {}) - .then((res: any) => { - let { creator_set_visibility, description_markdown, title: resTitle, ...response } = res; - console.log("🏋️", res, status); - statusSet(FetchStatus.success); - titleSet(resTitle); - descriptionMDSet(description_markdown); - visibilitySet(creator_set_visibility); - setData(response); - }) - .catch(err => { - statusSet(FetchStatus.error); - }); + .then((res: any) => { + let { + creator_set_visibility, + description_markdown, + title: resTitle, + } = res; + statusSet(FetchStatus.success); + titleSet(resTitle); + descriptionMDSet(description_markdown); + visibilitySet(creator_set_visibility); + setData(res); + }) + .catch(err => { + statusSet(FetchStatus.error); + }); } }, [status, token, data]); - return { data, fetchError, isLoading, descriptionMD, onChange, remove, status, title, update, visibility, writeStatus }; -}; \ No newline at end of file + return { + data, + fetchError, + isLoading, + descriptionMD, + onChange, + remove, + status, + title, + update, + visibility, + writeStatus, + }; +} diff --git a/packages/fakeyou.com/src/v2/view/pages/weight/WeightPage.tsx b/packages/fakeyou.com/src/v2/view/pages/weight/WeightPage.tsx index 11abaee32e..82258feb99 100644 --- a/packages/fakeyou.com/src/v2/view/pages/weight/WeightPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/weight/WeightPage.tsx @@ -67,9 +67,18 @@ export default function WeightPage({ const { weight_token } = useParams<{ weight_token: string }>(); const origin = search ? new URLSearchParams(search).get("origin") : ""; const history = useHistory(); - const { data: weight, descriptionMD, fetchError, isLoading, title, remove } = useWeightFetch({ - onRemove: () => { history.push(origin || ""); }, - token: weight_token + const { + data: weight, + descriptionMD, + fetchError, + isLoading, + title, + remove, + } = useWeightFetch({ + onRemove: () => { + history.push(origin || ""); + }, + token: weight_token, }); const timeUpdated = moment(weight?.updated_at || "").fromNow(); @@ -230,7 +239,7 @@ export default function WeightPage({ { property: "Category", value: weightCategory }, { property: "Visibility", - value: weight.creator_set_visibility?.toString() || "", + value: weight.creator_set_visibility, }, { property: "Created at", value: weight.created_at?.toString() || "" }, { property: "Updated at", value: weight.updated_at?.toString() || "" }, @@ -241,7 +250,7 @@ export default function WeightPage({ { property: "Category", value: weightCategory }, { property: "Visibility", - value: weight.creator_set_visibility?.toString() || "", + value: weight.creator_set_visibility, }, { property: "Created at", value: dateCreated || "" }, { property: "Updated at", value: dateUpdated || "" }, From 5ff00e02e15abf5f86d4278ee39ac866161abf14 Mon Sep 17 00:00:00 2001 From: BFlat Date: Sat, 30 Dec 2023 00:14:57 +0700 Subject: [PATCH 12/13] weights_ rename to weight_ --- packages/components/src/api/weights/GetWeight.ts | 4 ++-- .../components/common/Card/AudioCard/AudioCard.tsx | 2 +- .../components/common/Card/ImageCard/ImageCard.tsx | 2 +- .../src/hooks/useWeightFetch/useWeightFetch.tsx | 4 ++-- .../src/v2/view/pages/explore/tabs/WeightsTab.tsx | 2 +- .../pages/profile/profile_view/tabs/BookmarksTab.tsx | 3 +-- .../pages/profile/profile_view/tabs/WeightsTab.tsx | 4 ++-- .../src/v2/view/pages/weight/WeightPage.tsx | 12 ++++++------ 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/packages/components/src/api/weights/GetWeight.ts b/packages/components/src/api/weights/GetWeight.ts index 3e12ab8b0d..6187dbc915 100644 --- a/packages/components/src/api/weights/GetWeight.ts +++ b/packages/components/src/api/weights/GetWeight.ts @@ -5,8 +5,8 @@ import { WeightType } from "../_common/enums/WeightType"; export interface Weight { weight_token: string; - weights_type: WeightType; - weights_category: WeightCategory; + weight_type: WeightType; + weight_category: WeightCategory; title: string; public_bucket_path: string; creator_set_visibility: string; 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 a2d491473f..ca9be05b57 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.weights_type || data.details?.maybe_weights_data?.weights_type + data.weight_type || data.details?.maybe_weights_data?.weight_type ); const bucketConfig = new BucketConfig(); 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 7ba358ecb0..c1672160a1 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.weights_type || data.details?.maybe_weights_data?.weights_type + data.weight_type || data.details?.maybe_weights_data?.weight_type ); console.log("🌇", origin); diff --git a/packages/fakeyou.com/src/hooks/useWeightFetch/useWeightFetch.tsx b/packages/fakeyou.com/src/hooks/useWeightFetch/useWeightFetch.tsx index 35c882a478..ac886b346d 100644 --- a/packages/fakeyou.com/src/hooks/useWeightFetch/useWeightFetch.tsx +++ b/packages/fakeyou.com/src/hooks/useWeightFetch/useWeightFetch.tsx @@ -41,8 +41,8 @@ export default function useWeightFetch({ onRemove = () => {}, token }: Props) { description_rendered_html: data?.description_rendered_html || "", title, visibility, - weight_category: data?.weights_category || "", - weight_type: data?.weights_type || "", + weight_category: data?.weight_category || "", + weight_type: data?.weight_type || "", }) .then((res: any) => { writeStatusSet(FetchStatus.success); diff --git a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx index d12b6c2149..3540e29c12 100644 --- a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx @@ -158,7 +158,7 @@ export default function WeightsTab() { }} >
); 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 222e4125fb..b43eb67b57 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,8 +189,7 @@ export default function BookmarksTab({ username }: { username: string }) { > diff --git a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/WeightsTab.tsx b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/WeightsTab.tsx index f3b347254e..f40a6b913c 100644 --- a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/WeightsTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/WeightsTab.tsx @@ -43,7 +43,7 @@ export default function WeightsTab({ username }: { username: string }) { addQueries: { page_size: 24 }, }); - console.log("💎",origin); + console.log("💎", origin); const handlePageClick = (selectedItem: { selected: number }) => { weights.pageChange(selectedItem.selected); @@ -178,7 +178,7 @@ export default function WeightsTab({ username }: { username: string }) { }} >
); diff --git a/packages/fakeyou.com/src/v2/view/pages/weight/WeightPage.tsx b/packages/fakeyou.com/src/v2/view/pages/weight/WeightPage.tsx index 82258feb99..76b9bd22e2 100644 --- a/packages/fakeyou.com/src/v2/view/pages/weight/WeightPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/weight/WeightPage.tsx @@ -93,7 +93,7 @@ export default function WeightPage({ const bucketConfig = new BucketConfig(); const weightTypeInfo = useWeightTypeInfo( - weight?.weights_type || WeightType.NONE + weight?.weight_type || WeightType.NONE ); const { label: weightType, @@ -102,7 +102,7 @@ export default function WeightPage({ } = weightTypeInfo; function renderWeightComponent(weight: Weight) { - switch (weight.weights_category) { + switch (weight.weight_category) { case WeightCategory.TTS: return ( ; break; @@ -356,8 +356,8 @@ export default function WeightPage({
- {(weight.weights_category === WeightCategory.VC || - weight.weights_category === WeightCategory.TTS) && ( + {(weight.weight_category === WeightCategory.VC || + weight.weight_category === WeightCategory.TTS) && ( )}
From 57bc7496423cb3f38df65a28d9df30e37e26cd1c Mon Sep 17 00:00:00 2001 From: BFlat Date: Sat, 30 Dec 2023 01:08:33 +0700 Subject: [PATCH 13/13] media image fix and weights renamed to singular weight --- .../common/Card/AudioCard/AudioCard.tsx | 10 ++-- .../common/Card/ImageCard/ImageCard.tsx | 10 ++-- .../view/pages/explore/tabs/FeaturedTab.tsx | 60 ++++++++++++++----- .../view/pages/media/MediaImageComponent.tsx | 11 +--- .../src/v2/view/pages/media/MediaPage.tsx | 15 ++++- .../profile_view/tabs/BookmarksTab.tsx | 2 +- 6 files changed, 70 insertions(+), 38 deletions(-) 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 }) { >