From a46052c9a680b69f41c600c0da890d9e76061427 Mon Sep 17 00:00:00 2001
From: ameer2468 <33054370+ameer2468@users.noreply.github.com>
Date: Wed, 8 Oct 2025 11:29:36 +0300
Subject: [PATCH 1/7] update positioning of some buttons, show video owner on
share page, and more
---
apps/web/app/(org)/dashboard/caps/Caps.tsx | 2 +-
.../caps/components/CapCard/CapCard.tsx | 147 ++++++++++--------
.../caps/components/CapCard/CapCardButton.tsx | 7 +-
.../s/[videoId]/_components/ShareHeader.tsx | 69 +++++---
4 files changed, 138 insertions(+), 87 deletions(-)
diff --git a/apps/web/app/(org)/dashboard/caps/Caps.tsx b/apps/web/app/(org)/dashboard/caps/Caps.tsx
index 10869c80a0..7c98c8b434 100644
--- a/apps/web/app/(org)/dashboard/caps/Caps.tsx
+++ b/apps/web/app/(org)/dashboard/caps/Caps.tsx
@@ -266,7 +266,7 @@ export const Caps = ({
[data, isUploading, uploadingCapId],
);
- if (count === 0) return
Settings
+Download
+Copy link
setIsSharingDialogOpen(true)}
>
Not shared{" "}
setIsSharingDialogOpen(true)}
>
Shared{" "}
Shared with you
; + return ( + + ); } }; @@ -199,8 +210,8 @@ export const ShareHeader = ({- {moment(data.createdAt).fromNow()} -
++ {user?.name} +
++ {moment(data.createdAt).fromNow()} +
+- {user?.name} -
+{data.ownerName}
{moment(data.createdAt).fromNow()}
diff --git a/apps/web/app/s/[videoId]/page.tsx b/apps/web/app/s/[videoId]/page.tsx index 94a44f0974..3a6a50987d 100644 --- a/apps/web/app/s/[videoId]/page.tsx +++ b/apps/web/app/s/[videoId]/page.tsx @@ -270,6 +270,8 @@ export default async function ShareVideoPage(props: PageProps<"/s/[videoId]">) { id: videos.id, name: videos.name, ownerId: videos.ownerId, + ownerName: users.name, + ownerImage: users.image, orgId: videos.orgId, createdAt: videos.createdAt, updatedAt: videos.updatedAt, @@ -363,6 +365,8 @@ async function AuthorizedContent({ sharedOrganization: { organizationId: Organisation.OrganisationId } | null; hasPassword: boolean; ownerIsPro?: boolean; + ownerName?: string | null; + ownerImage?: string | null; orgSettings?: OrganizationSettings | null; videoSettings?: OrganizationSettings | null; }; @@ -466,6 +470,8 @@ async function AuthorizedContent({ id: videos.id, name: videos.name, ownerId: videos.ownerId, + ownerName: users.name, + ownerImage: users.image, ownerIsPro: sql`${users.stripeSubscriptionStatus} IN ('active','trialing','complete','paid') OR ${users.thirdPartyStripeSubscriptionId} IS NOT NULL`.mapWith( Boolean, From aec884b0292f2fa7d79d964e6b8389d349bd0ef5 Mon Sep 17 00:00:00 2001 From: ameer2468 <33054370+ameer2468@users.noreply.github.com> Date: Wed, 8 Oct 2025 11:53:34 +0300 Subject: [PATCH 5/7] make sure to show folders only created by the user himself --- apps/web/app/(org)/dashboard/caps/page.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/web/app/(org)/dashboard/caps/page.tsx b/apps/web/app/(org)/dashboard/caps/page.tsx index b71d6ce162..754d9665da 100644 --- a/apps/web/app/(org)/dashboard/caps/page.tsx +++ b/apps/web/app/(org)/dashboard/caps/page.tsx @@ -227,6 +227,7 @@ export default async function CapsPage(props: PageProps<"/dashboard/caps">) { .where( and( eq(folders.organizationId, user.activeOrganizationId), + eq(folders.createdById, user.id), isNull(folders.parentId), isNull(folders.spaceId), ), From 3b41e5481b2cd10e8da53612be3d158e22820034 Mon Sep 17 00:00:00 2001 From: ameer2468 <33054370+ameer2468@users.noreply.github.com> Date: Wed, 8 Oct 2025 11:54:32 +0300 Subject: [PATCH 6/7] Update CapCardButton.tsx --- .../(org)/dashboard/caps/components/CapCard/CapCardButton.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCardButton.tsx b/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCardButton.tsx index 2af223edfb..cf0724ed93 100644 --- a/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCardButton.tsx +++ b/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCardButton.tsx @@ -37,7 +37,9 @@ export const CapCardButton = ({ size="sm" aria-label={tooltipContent} > - {React.cloneElement(icon, { className: "size-3.5" })} + {React.cloneElement(icon, { + className: clsx(icon.props.className, "size-3.5"), + })} ); From 68abcd123927002cd4761fbc933f37c401ea747e Mon Sep 17 00:00:00 2001 From: ameer2468 <33054370+ameer2468@users.noreply.github.com> Date: Wed, 8 Oct 2025 11:56:21 +0300 Subject: [PATCH 7/7] Update ShareHeader.tsx --- apps/web/app/s/[videoId]/_components/ShareHeader.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/web/app/s/[videoId]/_components/ShareHeader.tsx b/apps/web/app/s/[videoId]/_components/ShareHeader.tsx index 859d55be1c..50989fb70b 100644 --- a/apps/web/app/s/[videoId]/_components/ShareHeader.tsx +++ b/apps/web/app/s/[videoId]/_components/ShareHeader.tsx @@ -243,6 +243,7 @@ export const ShareHeader = ({ src={data.ownerImage} alt={data.ownerName || ""} width={32} + unoptimized height={32} className="rounded-full" />