From 513c7f5b66c47d618bb2517aaf45ec6f448c6df7 Mon Sep 17 00:00:00 2001 From: BFlat Date: Wed, 10 Jan 2024 11:42:28 +0700 Subject: [PATCH 1/2] dev-profile to profile --- packages/fakeyou.com/src/v2/view/PageContainer.tsx | 12 +----------- .../pages/profile/profile_view/NewProfilePage.tsx | 12 ++++++------ 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index 08a754824e..fd3c26352e 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -97,7 +97,6 @@ import { PasswordResetEmailPage } from "./pages/password_reset/PasswordResetEmai import { PasswordResetVerificationPage } from "./pages/password_reset/PasswordResetVerificationPage"; import DevUpload from "./pages/dev_upload/DevUpload"; import { NewProfilePage } from "./pages/profile/profile_view/NewProfilePage"; -import { ProfilePage } from "./pages/profile/profile_view/ProfilePage"; import { ModerationJobControlPage } from "./pages/moderation/job_control/ModerationJobControlPage"; import WeightPage from "./pages/weight/WeightPage"; import ExplorePage from "./pages/explore/ExplorePage"; @@ -300,17 +299,8 @@ class PageContainer extends React.Component< - - - - {/* New Profile Page */} - + ; + return ; } if (notFoundState) { @@ -355,21 +355,21 @@ function NewProfilePage(this: any, props: Props) { const tabs = [ { - to: `/dev-profile/${username}/media`, + to: `/profile/${username}/media`, label: "Media", content: , icon: faPhotoFilmMusic, padding: true, }, { - to: `/dev-profile/${username}/weights`, + to: `/profile/${username}/weights`, label: "Weights", content: , icon: faLayerGroup, padding: true, }, { - to: `/dev-profile/${username}/bookmarks`, + to: `/profile/${username}/bookmarks`, label: "Bookmarks", content: , icon: faBookmark, From 31c61a536b512f8496f834defe58a22125ac287a Mon Sep 17 00:00:00 2001 From: BFlat Date: Wed, 10 Jan 2024 12:02:01 +0700 Subject: [PATCH 2/2] show creator on explore media cards --- .../view/pages/explore/tabs/FeaturedTab.tsx | 65 +++++++++++-------- .../v2/view/pages/explore/tabs/MediaTab.tsx | 35 ++++++---- 2 files changed, 63 insertions(+), 37 deletions(-) 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 e58f5bd5dc..5d7c531f45 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 @@ -17,20 +17,21 @@ export default function FeaturedTab() { const [list, listSet] = useState([]); // const [showMasonryGrid, setShowMasonryGrid] = useState(true); const [status, statusSet] = useState(FetchStatus.ready); - const isLoading = status === FetchStatus.ready || status === FetchStatus.in_progress; + const isLoading = + status === FetchStatus.ready || status === FetchStatus.in_progress; useEffect(() => { if (status === FetchStatus.ready) { statusSet(FetchStatus.in_progress); - ListFeaturedMediaFiles("",{}).then((res: any) => { - console.log("🏮",res); + ListFeaturedMediaFiles("", {}).then((res: any) => { + console.log("🏮", res); statusSet(FetchStatus.success); if (res.results) { listSet(res.results); } }); } - },[status]); + }, [status]); return (
@@ -43,35 +44,47 @@ export default function FeaturedTab() {
- { isLoading && !list.length ? ( + {isLoading && !list.length ? (
{Array.from({ length: 12 }).map((_, index) => ( ))}
- ) : ( <> - { list.length === 0 && status === 3 ? ( -
- No featured media. -
- ) : ( - console.log("Layout complete!")} - > - { list.map((data: any, key: number) => { - let props = { bookmarks, data, origin, ratings, type: "media" }; + ) : ( + <> + {list.length === 0 && status === 3 ? ( +
+ No featured media. +
+ ) : ( + console.log("Layout complete!")} + > + {list.map((data: any, key: number) => { + let props = { + bookmarks, + data, + origin, + ratings, + type: "media", + showCreator: true, + }; - return
+ return ( +
-
; - }) } - - )} - +
+ ); + })} +
+ )} + )} {/*
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 2a707edd5a..b5e5c09792 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 @@ -37,8 +37,8 @@ export default function MediaTab() { list, listSet, onInputChange: () => setShowMasonryGrid(false), - onSuccess: (res) => { - bookmarks.gather({ res, expand: true }); // expand rather than replace for lazy loading + onSuccess: res => { + bookmarks.gather({ res, expand: true }); // expand rather than replace for lazy loading setShowMasonryGrid(true); }, requestList: true, @@ -118,16 +118,29 @@ export default function MediaTab() { console.log("Layout complete!")} - > { media.list.map((data: any, key: number) => { - let props = { bookmarks, data, origin, ratings, type: "media" }; + > + {" "} + {media.list.map((data: any, key: number) => { + let props = { + bookmarks, + data, + origin, + ratings, + type: "media", + showCreator: true, + }; - return
- -
; - }) } + return ( +
+ +
+ ); + })}
)}