Skip to content

Commit b5b7e39

Browse files
oscartbeaumontoscartbeaumont
committed
Merge branch 'main' into local-upload-tracking
2 parents f26d5c5 + efdf385 commit b5b7e39

File tree

14 files changed

+105
-170
lines changed

14 files changed

+105
-170
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/desktop/src-tauri/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cap-desktop"
3-
version = "0.3.72"
3+
version = "0.3.72-beta.1"
44
description = "Beautiful screen recordings, owned by you."
55
authors = ["you"]
66
edition = "2024"

‎apps/desktop/src/routes/(window-chrome)/new-main/index.tsx‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -318,26 +318,45 @@ function Page() {
318318

319319
const displayTargets = useQuery(() => ({
320320
...listDisplaysWithThumbnails,
321-
enabled: hasOpenedDisplayMenu(),
322321
refetchInterval: false,
323322
}));
324323

325324
const windowTargets = useQuery(() => ({
326325
...listWindowsWithThumbnails,
327-
enabled: hasOpenedWindowMenu(),
328326
refetchInterval: false,
329327
}));
330328

329+
const screens = useQuery(() => listScreens);
330+
const windows = useQuery(() => listWindows);
331+
331332
const hasDisplayTargetsData = () => displayTargets.status === "success";
332333
const hasWindowTargetsData = () => windowTargets.status === "success";
333334

334-
const displayTargetsData = createMemo(() =>
335-
hasDisplayTargetsData() ? displayTargets.data : undefined,
336-
);
335+
const existingDisplayIds = createMemo(() => {
336+
const currentScreens = screens.data;
337+
if (!currentScreens) return undefined;
338+
return new Set(currentScreens.map((screen) => screen.id));
339+
});
337340

338-
const windowTargetsData = createMemo(() =>
339-
hasWindowTargetsData() ? windowTargets.data : undefined,
340-
);
341+
const displayTargetsData = createMemo(() => {
342+
if (!hasDisplayTargetsData()) return undefined;
343+
const ids = existingDisplayIds();
344+
if (!ids) return displayTargets.data;
345+
return displayTargets.data?.filter((target) => ids.has(target.id));
346+
});
347+
348+
const existingWindowIds = createMemo(() => {
349+
const currentWindows = windows.data;
350+
if (!currentWindows) return undefined;
351+
return new Set(currentWindows.map((win) => win.id));
352+
});
353+
354+
const windowTargetsData = createMemo(() => {
355+
if (!hasWindowTargetsData()) return undefined;
356+
const ids = existingWindowIds();
357+
if (!ids) return windowTargets.data;
358+
return windowTargets.data?.filter((target) => ids.has(target.id));
359+
});
341360

342361
const displayMenuLoading = () =>
343362
!hasDisplayTargetsData() &&
@@ -430,8 +449,6 @@ function Page() {
430449
else commands.closeTargetSelectOverlays();
431450
});
432451

433-
const screens = useQuery(() => listScreens);
434-
const windows = useQuery(() => listWindows);
435452
const cameras = useQuery(() => listVideoDevices);
436453
const mics = useQuery(() => listAudioDevices);
437454

‎apps/desktop/src/routes/target-select-overlay.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ function ShowCapFreeWarning(props: { isInstantMode: boolean }) {
875875
return (
876876
<Suspense>
877877
<Show when={props.isInstantMode && auth.data?.plan?.upgraded === false}>
878-
<p class="text-sm text-center max-w-64">
878+
<p class="text-sm text-center text-white max-w-64">
879879
Instant Mode recordings are limited to 5 mins,{" "}
880880
<button
881881
class="underline"

‎apps/web/components/pages/HomePage/Features.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,10 @@ const features: Feature[] = homepageCopy.features.features.map(
149149
const Features = () => {
150150
return (
151151
<div className="text-center max-w-[1440px] mx-auto px-5">
152-
<h2 className="mb-3">{homepageCopy.features.title}</h2>
153-
<p className="text-lg leading-[1.75rem] w-full max-w-[600px] mx-auto">
152+
<h1 className="mb-3 text-4xl font-medium text-gray-12">
153+
{homepageCopy.features.title}
154+
</h1>
155+
<p className="text-lg text-gray-10 leading-[1.75rem] w-full max-w-[600px] mx-auto">
154156
{homepageCopy.features.subtitle}
155157
</p>
156158
<div className="flex flex-col gap-4 mt-[52px]">

‎apps/web/components/pages/HomePage/Pricing/CommercialCard.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ export const CommercialCard = () => {
7777
<h3 className="mb-2 text-xl font-semibold text-center text-gray-12">
7878
{homepageCopy.pricing.commercial.title}
7979
</h3>
80-
<p className="mb-3 text-sm text-center text-gray-11 w-full max-w-[285px] mx-auto font-medium">
80+
<p className="mb-3 text-base text-center text-gray-11 w-full max-w-[285px] mx-auto">
8181
{homepageCopy.pricing.commercial.description}
8282
</p>
8383
<div className="mb-6 text-center">
8484
<a
8585
href="/docs/commercial-license"
86-
className="text-xs underline text-gray-10 hover:text-gray-12"
86+
className="text-sm underline text-gray-10 hover:text-gray-12"
8787
>
8888
Learn more about the commercial license here
8989
</a>
@@ -99,15 +99,15 @@ export const CommercialCard = () => {
9999
/ {billingCycleText}
100100
</span>
101101
{isYearly ? (
102-
<p className="text-sm tabular-nums text-gray-10">
102+
<p className="text-base tabular-nums text-gray-10">
103103
or, $
104104
<NumberFlow
105105
value={licenses * COMMERCIAL_LICENSE_LIFETIME_PRICE}
106106
/>{" "}
107107
one-time payment
108108
</p>
109109
) : (
110-
<p className="text-sm tabular-nums text-gray-10">
110+
<p className="text-base tabular-nums text-gray-10">
111111
or, $
112112
<NumberFlow value={licenses * COMMERCIAL_LICENSE_YEARLY_PRICE} />{" "}
113113
/ year

‎apps/web/components/pages/HomePage/Pricing/EnterpriseCard.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export const EnterpriseCard = () => {
6262
<h3 className="mb-2 text-xl font-semibold text-center text-gray-12">
6363
Cap for Enterprise
6464
</h3>
65-
<p className="mb-4 text-sm font-medium text-center text-gray-11">
65+
<p className="mb-4 text-base text-center text-gray-11">
6666
Deploy Cap across your organization with enterprise-grade
6767
features, dedicated support, and custom integrations.
6868
</p>

‎apps/web/components/pages/HomePage/Pricing/ProCard.tsx‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export const ProCard = () => {
120120
<h3 className="mb-2 text-xl font-semibold text-center">
121121
{homepageCopy.pricing.pro.title}
122122
</h3>
123-
<p className="mb-4 text-sm font-medium text-center text-gray-6">
123+
<p className="mb-4 text-base text-center text-gray-6">
124124
{homepageCopy.pricing.pro.description}
125125
</p>
126126
</div>
@@ -134,11 +134,11 @@ export const ProCard = () => {
134134
{billingCycleTextPro}
135135
</span>
136136
{isAnnually ? (
137-
<p className="text-sm text-gray-8">
137+
<p className="text-base text-gray-8">
138138
or,{" "}
139139
<NumberFlow
140140
value={CAP_PRO_MONTHLY_PRICE_PER_USER * users}
141-
className="text-sm tabular-nums"
141+
className="text-base tabular-nums"
142142
format={{
143143
notation: "compact",
144144
style: "currency",
@@ -151,18 +151,21 @@ export const ProCard = () => {
151151
) : (
152152
<>
153153
for{" "}
154-
<NumberFlow value={users} className="text-sm tabular-nums" />{" "}
154+
<NumberFlow
155+
value={users}
156+
className="text-base tabular-nums"
157+
/>{" "}
155158
users,{" "}
156159
</>
157160
)}
158161
billed monthly
159162
</p>
160163
) : (
161-
<p className="text-sm text-gray-8">
164+
<p className="text-base text-gray-8">
162165
or,{" "}
163166
<NumberFlow
164167
value={CAP_PRO_ANNUAL_PRICE_PER_USER * users}
165-
className="text-sm tabular-nums"
168+
className="text-base tabular-nums"
166169
format={{
167170
notation: "compact",
168171
style: "currency",
@@ -175,7 +178,10 @@ export const ProCard = () => {
175178
) : (
176179
<>
177180
for{" "}
178-
<NumberFlow value={users} className="text-sm tabular-nums" />{" "}
181+
<NumberFlow
182+
value={users}
183+
className="text-base tabular-nums"
184+
/>{" "}
179185
users,{" "}
180186
</>
181187
)}

‎apps/web/components/pages/HomePage/Pricing/index.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ const Pricing = () => {
1111
return (
1212
<div className="w-full max-w-[1100px] mx-auto px-5">
1313
<div className="px-5 mb-16 text-center">
14-
<h2 className="mb-3 w-full">{homepageCopy.pricing.title}</h2>
15-
<p className="text-lg max-w-[800px] mx-auto leading-[1.75rem] w-full">
14+
<h1 className="mb-3 w-full text-4xl font-medium text-gray-12">
15+
{homepageCopy.pricing.title}
16+
</h1>
17+
<p className="text-lg text-gray-10 max-w-[800px] mx-auto leading-[1.75rem] w-full">
1618
{homepageCopy.pricing.subtitle}
1719
</p>
1820
<div className="flex justify-center items-center px-5 py-2.5 gap-2 mx-auto mt-6 rounded-full border bg-gray-1 border-gray-5 w-fit">

‎apps/web/components/pages/HomePage/RecordingModes.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ const RecordingModes = () => {
5656
return (
5757
<div className="w-full max-w-[1000px] mx-auto px-5">
5858
<div className="flex flex-col gap-2 justify-center items-center text-center">
59-
<h1 className="text-4xl font-medium text-12">
59+
<h1 className="text-4xl font-medium text-gray-12">
6060
{homepageCopy.recordingModes.title}
6161
</h1>
62-
<p className="text-lg text-gray-10">
62+
<p className="text-lg text-gray-10 w-full max-w-[670px] mx-auto">
6363
{homepageCopy.recordingModes.subtitle}
6464
</p>
6565
</div>
@@ -143,7 +143,7 @@ const RecordingModes = () => {
143143
</div>
144144
{/*Video Description*/}
145145
<div className="p-4 border-t border-b bg-gray-2 border-gray-5">
146-
<p className="mx-auto w-full text-sm text-center md:text-xl text-gray-12">
146+
<p className="mx-auto w-full text-lg text-center text-gray-12">
147147
{activeMode?.description}
148148
</p>
149149
</div>

0 commit comments

Comments
 (0)