Skip to content

web: re-arrange cap card buttons, share page show owner, and more... #1156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ameer2468 merged 7 commits into from
Oct 8, 2025
Merged

web: re-arrange cap card buttons, share page show owner, and more... #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a46052c
update positioning of some buttons, show video owner on share page, a…
ameer2468 Oct 8, 2025
0d2de4b
Update CapCard.tsx
ameer2468 Oct 8, 2025
2208204
Update CapCard.tsx
ameer2468 Oct 8, 2025
8b88fd7
correct data
ameer2468 Oct 8, 2025
aec884b
make sure to show folders only created by the user himself
ameer2468 Oct 8, 2025
3b41e54
Update CapCardButton.tsx
ameer2468 Oct 8, 2025
68abcd1
Update ShareHeader.tsx
ameer2468 Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/app/(org)/dashboard/caps/Caps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ export const Caps = ({
[data, isUploading, uploadingCapId],
);

if (count === 0) return <EmptyCapState />;
if (count === 0 && folders.length === 0) return <EmptyCapState />;

return (
<div className="flex relative flex-col w-full h-full">
Expand Down
153 changes: 89 additions & 64 deletions apps/web/app/(org)/dashboard/caps/components/CapCard/CapCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
faGear,
faLink,
faLock,
faShare,
faTrash,
faUnlock,
faVideo,
Expand All @@ -42,6 +43,7 @@ import {
} from "@/components/VideoThumbnail";
import { useEffectMutation } from "@/lib/EffectRuntime";
import { withRpc } from "@/lib/Rpcs";
import { usePublicEnv } from "@/utils/public-env";
import { PasswordDialog } from "../PasswordDialog";
import { SettingsDialog } from "../SettingsDialog";
import { SharingDialog } from "../SharingDialog";
Expand Down Expand Up @@ -121,6 +123,8 @@ export const CapCard = ({
const [passwordProtected, setPasswordProtected] = useState(
cap.hasPassword || false,
);
const { webUrl } = usePublicEnv();

const [copyPressed, setCopyPressed] = useState(false);
const [isDragging, setIsDragging] = useState(false);
const [isSettingsDialogOpen, setIsSettingsDialogOpen] = useState(false);
Expand Down Expand Up @@ -345,82 +349,82 @@ export const CapCard = ({
"top-2 right-2 flex-col gap-2 z-[51]",
)}
>
{isOwner ? (
<CapCardButton
tooltipContent="Settings"
onClick={(e) => {
e.stopPropagation();
setIsSettingsDialogOpen(true);
}}
className="delay-0"
icon={() => {
return <FontAwesomeIcon className="size-4" icon={faGear} />;
}}
/>
) : (
<CapCardButton
tooltipContent="Download Cap"
onClick={(e) => {
e.stopPropagation();
handleDownload();
}}
className="delay-0"
icon={() => (
<FontAwesomeIcon className="size-4" icon={faDownload} />
)}
/>
)}
<CapCardButton
tooltipContent="Copy link"
tooltipContent="Share"
onClick={(e) => {
e.stopPropagation();
handleCopy(
buildEnv.NEXT_PUBLIC_IS_CAP &&
NODE_ENV === "production" &&
customDomain &&
domainVerified
? `https://${customDomain}/s/${cap.id}`
: buildEnv.NEXT_PUBLIC_IS_CAP && NODE_ENV === "production"
? `https://cap.link/${cap.id}`
: `${location.origin}/s/${cap.id}`,
);
setIsSharingDialogOpen(true);
}}
className="delay-0"
icon={() => {
return !copyPressed ? (
<FontAwesomeIcon
className="text-gray-12 size-4"
icon={faLink}
/>
) : (
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
className="text-gray-12 size-5 svgpathanimation"
>
<path d="M20 6 9 17l-5-5" />
</svg>
);
icon={<FontAwesomeIcon icon={faShare} />}
/>

<CapCardButton
tooltipContent="Download Cap"
onClick={(e) => {
e.stopPropagation();
handleDownload();
}}
className="delay-0"
icon={<FontAwesomeIcon icon={faDownload} />}
/>

{!isOwner && (
<CapCardButton
tooltipContent="Copy link"
onClick={(e) => {
e.stopPropagation();
handleCopy(
NODE_ENV === "development"
? `${webUrl}/s/${cap.id}`
: buildEnv.NEXT_PUBLIC_IS_CAP &&
customDomain &&
domainVerified
? `https://${customDomain}/s/${cap.id}`
: buildEnv.NEXT_PUBLIC_IS_CAP &&
!customDomain &&
!domainVerified
? `https://cap.link/${cap.id}`
: `${webUrl}/s/${cap.id}`,
);
}}
className="delay-0"
icon={
<>
{!copyPressed ? (
<FontAwesomeIcon
className="text-gray-12 size-4"
icon={faLink}
/>
) : (
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
className="text-gray-12 size-5 svgpathanimation"
>
<path d="M20 6 9 17l-5-5" />
</svg>
)}
</>
}
/>
)}

{isOwner && (
<DropdownMenu modal={false} onOpenChange={setIsDropdownOpen}>
<DropdownMenuTrigger asChild suppressHydrationWarning>
<div>
<CapCardButton
tooltipContent="More options"
className="delay-75"
icon={() => (
<FontAwesomeIcon className="size-4" icon={faEllipsis} />
)}
icon={<FontAwesomeIcon icon={faEllipsis} />}
/>
</div>
</DropdownMenuTrigger>
Expand All @@ -432,12 +436,33 @@ export const CapCard = ({
<DropdownMenuItem
onClick={(e) => {
e.stopPropagation();
handleDownload();
setIsSettingsDialogOpen(true);
}}
className="flex gap-2 items-center rounded-lg"
>
<FontAwesomeIcon className="size-3" icon={faGear} />
<p className="text-sm text-gray-12">Settings</p>
</DropdownMenuItem>
<DropdownMenuItem
onClick={(e) => {
e.stopPropagation();
handleCopy(
buildEnv.NEXT_PUBLIC_IS_CAP &&
NODE_ENV === "production" &&
customDomain &&
domainVerified
? `https://${customDomain}/s/${cap.id}`
: buildEnv.NEXT_PUBLIC_IS_CAP &&
NODE_ENV === "production"
? `https://cap.link/${cap.id}`
: `${location.origin}/s/${cap.id}`,
);
toast.success("Link copied to clipboard");
}}
className="flex gap-2 items-center rounded-lg"
>
<FontAwesomeIcon className="size-3" icon={faDownload} />
<p className="text-sm text-gray-12">Download</p>
<FontAwesomeIcon className="size-3" icon={faLink} />
<p className="text-sm text-gray-12">Copy link</p>
</DropdownMenuItem>
<DropdownMenuItem
onClick={() => {
Expand Down
9 changes: 6 additions & 3 deletions apps/web/app/(org)/dashboard/caps/components/CapCard/CapCardButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@

import { Button } from "@cap/ui";
import clsx from "clsx";
import type { MouseEvent, ReactNode } from "react";
import type { MouseEvent } from "react";
import React from "react";
import { Tooltip } from "@/components/Tooltip";

interface CapCardButtonProps {
tooltipContent: string;
onClick?: (e: MouseEvent) => void;
disabled?: boolean;
className: string;
icon: () => ReactNode;
icon: React.JSX.Element;
asChild?: boolean;
}

Expand All @@ -36,7 +37,9 @@ export const CapCardButton = ({
size="sm"
aria-label={tooltipContent}
>
{icon()}
{React.cloneElement(icon, {
className: clsx(icon.props.className, "size-3.5"),
})}
</Button>
</Tooltip>
);
Expand Down
1 change: 1 addition & 0 deletions apps/web/app/(org)/dashboard/caps/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
Expand Down
Loading