diff --git a/app/p/[didOrHandle]/(profile)/PostsContent.tsx b/app/(home-pages)/p/[didOrHandle]/PostsContent.tsx similarity index 95% rename from app/p/[didOrHandle]/(profile)/PostsContent.tsx rename to app/(home-pages)/p/[didOrHandle]/PostsContent.tsx index 2242b938..d8fbea2d 100644 --- a/app/p/[didOrHandle]/(profile)/PostsContent.tsx +++ b/app/(home-pages)/p/[didOrHandle]/PostsContent.tsx @@ -2,8 +2,8 @@ import { PostListing } from "components/PostListing"; import type { Post } from "app/(home-pages)/reader/getReaderFeed"; -import type { Cursor } from "../getProfilePosts"; -import { getProfilePosts } from "../getProfilePosts"; +import type { Cursor } from "./getProfilePosts"; +import { getProfilePosts } from "./getProfilePosts"; import useSWRInfinite from "swr/infinite"; import { useEffect, useRef } from "react"; diff --git a/app/p/[didOrHandle]/(profile)/ProfileHeader.tsx b/app/(home-pages)/p/[didOrHandle]/ProfileHeader.tsx similarity index 100% rename from app/p/[didOrHandle]/(profile)/ProfileHeader.tsx rename to app/(home-pages)/p/[didOrHandle]/ProfileHeader.tsx diff --git a/app/(home-pages)/p/[didOrHandle]/ProfileLayout.tsx b/app/(home-pages)/p/[didOrHandle]/ProfileLayout.tsx new file mode 100644 index 00000000..9661c35c --- /dev/null +++ b/app/(home-pages)/p/[didOrHandle]/ProfileLayout.tsx @@ -0,0 +1,28 @@ +"use client"; + +import { useCardBorderHidden } from "components/Pages/useCardBorderHidden"; + +export function ProfileLayout(props: { children: React.ReactNode }) { + let borderHidden = useCardBorderHidden(); + return ( +
+
+ {props.children} +
+
+ ); +} diff --git a/app/p/[didOrHandle]/(profile)/ProfileTabs.tsx b/app/(home-pages)/p/[didOrHandle]/ProfileTabs.tsx similarity index 99% rename from app/p/[didOrHandle]/(profile)/ProfileTabs.tsx rename to app/(home-pages)/p/[didOrHandle]/ProfileTabs.tsx index ecbd96af..2b9f32ce 100644 --- a/app/p/[didOrHandle]/(profile)/ProfileTabs.tsx +++ b/app/(home-pages)/p/[didOrHandle]/ProfileTabs.tsx @@ -41,7 +41,7 @@ export const ProfileTabs = (props: { didOrHandle: string }) => { // const bgColor = !cardBorderHidden ? "var(--bg-leaflet)" : "var(--bg-page)"; return ( -
+
; children: React.ReactNode; }) { @@ -45,25 +46,29 @@ export default async function ProfileLayout(props: { if (!profile) return null; return ( - -
-
- - -
- {props.children} -
-
-
-
+ + + +
+ {props.children} +
+ + ), + }, + }} + /> ); } diff --git a/app/p/[didOrHandle]/(profile)/page.tsx b/app/(home-pages)/p/[didOrHandle]/page.tsx similarity index 92% rename from app/p/[didOrHandle]/(profile)/page.tsx rename to app/(home-pages)/p/[didOrHandle]/page.tsx index d608d5b2..f1d4002b 100644 --- a/app/p/[didOrHandle]/(profile)/page.tsx +++ b/app/(home-pages)/p/[didOrHandle]/page.tsx @@ -1,5 +1,5 @@ import { idResolver } from "app/(home-pages)/reader/idResolver"; -import { getProfilePosts } from "../getProfilePosts"; +import { getProfilePosts } from "./getProfilePosts"; import { ProfilePostsContent } from "./PostsContent"; export default async function ProfilePostsPage(props: { diff --git a/app/p/[didOrHandle]/(profile)/subscriptions/SubscriptionsContent.tsx b/app/(home-pages)/p/[didOrHandle]/subscriptions/SubscriptionsContent.tsx similarity index 100% rename from app/p/[didOrHandle]/(profile)/subscriptions/SubscriptionsContent.tsx rename to app/(home-pages)/p/[didOrHandle]/subscriptions/SubscriptionsContent.tsx diff --git a/app/p/[didOrHandle]/(profile)/subscriptions/page.tsx b/app/(home-pages)/p/[didOrHandle]/subscriptions/page.tsx similarity index 100% rename from app/p/[didOrHandle]/(profile)/subscriptions/page.tsx rename to app/(home-pages)/p/[didOrHandle]/subscriptions/page.tsx diff --git a/app/p/[didOrHandle]/(profile)/ProfileDashboardLayout.tsx b/app/p/[didOrHandle]/(profile)/ProfileDashboardLayout.tsx deleted file mode 100644 index dd2d846c..00000000 --- a/app/p/[didOrHandle]/(profile)/ProfileDashboardLayout.tsx +++ /dev/null @@ -1,42 +0,0 @@ -"use client"; - -import { Actions } from "app/(home-pages)/home/Actions/Actions"; -import { Footer } from "components/ActionBar/Footer"; -import { Sidebar } from "components/ActionBar/Sidebar"; -import { - DesktopNavigation, - MobileNavigation, -} from "components/ActionBar/Navigation"; -import { MediaContents } from "components/Media"; -import { Separator } from "components/Layout"; - -export function ProfileDashboardLayout(props: { - did: string; - children: React.ReactNode; -}) { - return ( -
- -
- - - - -
-
-
- {props.children} -
- -
- ); -} diff --git a/components/ActionBar/Navigation.tsx b/components/ActionBar/Navigation.tsx index 4336c9a3..636dc851 100644 --- a/components/ActionBar/Navigation.tsx +++ b/components/ActionBar/Navigation.tsx @@ -25,7 +25,8 @@ export type navPages = | "discover" | "notifications" | "looseleafs" - | "tag"; + | "tag" + | "profile"; export const DesktopNavigation = (props: { currentPage: navPages;