Skip to content

Commit 2c6c26a

Browse files
steven-teysteven-tey
authored
Merge branch 'main' into combine-link-method
2 parents d2f717c + e33a3e2 commit 2c6c26a

12 files changed

Lines changed: 63 additions & 71 deletions

File tree

‎apps/docs/sdks/overview.mdx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,13 @@ description: "Open-source client libraries for the Dub.co API"
1212
color="#333333"
1313
>
1414
TypeScript SDK for Dub.co API
15+
</Card>
16+
<Card
17+
title="Flutter (Dart)"
18+
icon="github"
19+
href="https://d.to/dart"
20+
color="#333333"
21+
>
22+
Dart Client SDK for Dub.co API
1523
</Card>
1624
</CardGroup>

‎apps/web/ui/layout/user-survey/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export function UserSurveyPopupInner() {
4444
translateY: 0,
4545
}}
4646
exit={{ opacity: 0, y: "100%" }}
47-
className="fixed bottom-4 z-50 mx-2 overflow-hidden rounded-lg border border-gray-200 bg-white shadow-md sm:left-4 sm:mx-auto sm:max-w-sm"
47+
className="fixed bottom-4 z-40 mx-2 overflow-hidden rounded-lg border border-gray-200 bg-white shadow-md sm:left-4 sm:mx-auto sm:max-w-sm"
4848
>
4949
<motion.div
5050
animate={{

‎apps/web/ui/links/link-filters.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ const DomainsFilter = () => {
237237
if (options.length > 0) {
238238
setCollapsed(false);
239239
}
240-
}, [options]);
240+
}, []);
241241

242242
return (
243243
<fieldset className="overflow-hidden py-6">

‎apps/web/ui/modals/add-edit-link-modal/android-section.tsx‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { LinkProps } from "@/lib/types";
2-
import { BadgeTooltip, SimpleTooltipContent, Switch } from "@dub/ui";
2+
import { ProBadgeTooltip } from "@/ui/shared/pro-badge-tooltip";
3+
import { SimpleTooltipContent, Switch } from "@dub/ui";
34
import { FADE_IN_ANIMATION_SETTINGS } from "@dub/utils";
45
import { motion } from "framer-motion";
5-
import { Crown } from "lucide-react";
66
import { Dispatch, SetStateAction, useEffect, useState } from "react";
77

88
export default function AndroidSection({
@@ -36,20 +36,15 @@ export default function AndroidSection({
3636
<h2 className="text-sm font-medium text-gray-900">
3737
Android Targeting
3838
</h2>
39-
<BadgeTooltip
39+
<ProBadgeTooltip
4040
content={
4141
<SimpleTooltipContent
4242
title="Redirect your Android users to a different link."
4343
cta="Learn more about device targeting."
4444
href="https://dub.co/help/article/device-targeting"
4545
/>
4646
}
47-
>
48-
<div className="flex items-center space-x-1">
49-
<Crown size={12} />
50-
<p>PRO</p>
51-
</div>
52-
</BadgeTooltip>
47+
/>
5348
</div>
5449
<Switch fn={() => setEnabled(!enabled)} checked={enabled} />
5550
</div>

‎apps/web/ui/modals/add-edit-link-modal/cloaking-section.tsx‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
import { LinkProps } from "@/lib/types";
22
import { AlertCircleFill, CheckCircleFill } from "@/ui/shared/icons";
3-
import {
4-
BadgeTooltip,
5-
LoadingSpinner,
6-
SimpleTooltipContent,
7-
Switch,
8-
} from "@dub/ui";
3+
import { ProBadgeTooltip } from "@/ui/shared/pro-badge-tooltip";
4+
import { LoadingSpinner, SimpleTooltipContent, Switch } from "@dub/ui";
95
import {
106
FADE_IN_ANIMATION_SETTINGS,
117
fetcher,
128
getUrlFromString,
139
} from "@dub/utils";
1410
import { motion } from "framer-motion";
15-
import { Crown } from "lucide-react";
1611
import { Dispatch, SetStateAction, useEffect, useState } from "react";
1712
import useSWR from "swr";
1813

@@ -43,20 +38,15 @@ export default function CloakingSection({
4338
<div className="flex items-center justify-between">
4439
<div className="flex items-center justify-between space-x-2">
4540
<h2 className="text-sm font-medium text-gray-900">Link Cloaking</h2>
46-
<BadgeTooltip
41+
<ProBadgeTooltip
4742
content={
4843
<SimpleTooltipContent
4944
title="Mask your destination URL so your users only see the short link in the browser address bar."
5045
cta="Learn more."
5146
href="https://dub.co/help/article/link-cloaking"
5247
/>
5348
}
54-
>
55-
<div className="flex items-center space-x-1">
56-
<Crown size={12} />
57-
<p>PRO</p>
58-
</div>
59-
</BadgeTooltip>
49+
/>
6050
</div>
6151
<Switch fn={() => setEnabled(!enabled)} checked={enabled} />
6252
</div>

‎apps/web/ui/modals/add-edit-link-modal/expiration-section.tsx‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { LinkProps } from "@/lib/types";
2+
import { ProBadgeTooltip } from "@/ui/shared/pro-badge-tooltip";
23
import {
3-
BadgeTooltip,
44
ExpandingArrow,
55
InfoTooltip,
66
SimpleTooltipContent,
@@ -13,7 +13,6 @@ import {
1313
parseDateTime,
1414
} from "@dub/utils";
1515
import { motion } from "framer-motion";
16-
import { Crown } from "lucide-react";
1716
import { Dispatch, SetStateAction, useEffect, useRef, useState } from "react";
1817

1918
export default function ExpirationSection({
@@ -48,20 +47,15 @@ export default function ExpirationSection({
4847
<div className="flex items-center justify-between">
4948
<div className="flex items-center justify-between space-x-2">
5049
<h2 className="text-sm font-medium text-gray-900">Link Expiration</h2>
51-
<BadgeTooltip
50+
<ProBadgeTooltip
5251
content={
5352
<SimpleTooltipContent
5453
title="Set an expiration date for your links – after which it won't be accessible."
5554
cta="Learn more."
5655
href="https://dub.co/help/article/link-expiration"
5756
/>
5857
}
59-
>
60-
<div className="flex items-center space-x-1">
61-
<Crown size={12} />
62-
<p>PRO</p>
63-
</div>
64-
</BadgeTooltip>
58+
/>
6559
</div>
6660
<Switch fn={() => setEnabled(!enabled)} checked={enabled} />
6761
</div>

‎apps/web/ui/modals/add-edit-link-modal/geo-section.tsx‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { LinkProps } from "@/lib/types";
2-
import { BadgeTooltip, SimpleTooltipContent, Switch } from "@dub/ui";
2+
import { ProBadgeTooltip } from "@/ui/shared/pro-badge-tooltip";
3+
import { SimpleTooltipContent, Switch } from "@dub/ui";
34
import { COUNTRIES, FADE_IN_ANIMATION_SETTINGS } from "@dub/utils";
45
import { motion } from "framer-motion";
5-
import { Crown, Trash } from "lucide-react";
6+
import { Trash } from "lucide-react";
67
import { Dispatch, SetStateAction, useEffect, useState } from "react";
78

89
export default function GeoSection({
@@ -44,20 +45,15 @@ export default function GeoSection({
4445
<div className="flex items-center justify-between">
4546
<div className="flex items-center justify-between space-x-2">
4647
<h2 className="text-sm font-medium text-gray-900">Geo Targeting</h2>
47-
<BadgeTooltip
48+
<ProBadgeTooltip
4849
content={
4950
<SimpleTooltipContent
5051
title="Redirect your users to different links based on their location."
5152
cta="Learn more about geo targeting."
5253
href="https://dub.co/help/article/geo-targeting"
5354
/>
5455
}
55-
>
56-
<div className="flex items-center space-x-1">
57-
<Crown size={12} />
58-
<p>PRO</p>
59-
</div>
60-
</BadgeTooltip>
56+
/>
6157
</div>
6258
<Switch fn={() => setEnabled(!enabled)} checked={enabled} />
6359
</div>

‎apps/web/ui/modals/add-edit-link-modal/ios-section.tsx‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { LinkProps } from "@/lib/types";
2-
import { BadgeTooltip, SimpleTooltipContent, Switch } from "@dub/ui";
2+
import { ProBadgeTooltip } from "@/ui/shared/pro-badge-tooltip";
3+
import { SimpleTooltipContent, Switch } from "@dub/ui";
34
import { FADE_IN_ANIMATION_SETTINGS } from "@dub/utils";
45
import { motion } from "framer-motion";
5-
import { Crown } from "lucide-react";
66
import { Dispatch, SetStateAction, useEffect, useState } from "react";
77

88
export default function IOSSection({
@@ -34,20 +34,15 @@ export default function IOSSection({
3434
<div className="flex items-center justify-between">
3535
<div className="flex items-center justify-between space-x-2">
3636
<h2 className="text-sm font-medium text-gray-900">iOS Targeting</h2>
37-
<BadgeTooltip
37+
<ProBadgeTooltip
3838
content={
3939
<SimpleTooltipContent
4040
title="Redirect your iOS users to a different link."
4141
cta="Learn more about device targeting."
4242
href="https://dub.co/help/article/device-targeting"
4343
/>
4444
}
45-
>
46-
<div className="flex items-center space-x-1">
47-
<Crown size={12} />
48-
<p>PRO</p>
49-
</div>
50-
</BadgeTooltip>
45+
/>
5146
</div>
5247
<Switch fn={() => setEnabled(!enabled)} checked={enabled} />
5348
</div>

‎apps/web/ui/modals/add-edit-link-modal/og-section.tsx‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { resizeImage } from "@/lib/images";
22
import useWorkspace from "@/lib/swr/use-workspace";
33
import { LinkProps } from "@/lib/types";
44
import { UploadCloud } from "@/ui/shared/icons";
5+
import { ProBadgeTooltip } from "@/ui/shared/pro-badge-tooltip";
56
import { UpgradeToProToast } from "@/ui/shared/upgrade-to-pro-toast";
67
import {
7-
BadgeTooltip,
88
ButtonTooltip,
99
LoadingCircle,
1010
LoadingSpinner,
@@ -18,7 +18,7 @@ import { FADE_IN_ANIMATION_SETTINGS, truncate } from "@dub/utils";
1818
import va from "@vercel/analytics";
1919
import { useCompletion } from "ai/react";
2020
import { motion } from "framer-motion";
21-
import { Crown, Link2 } from "lucide-react";
21+
import { Link2 } from "lucide-react";
2222
import { Dispatch, SetStateAction, useEffect, useState } from "react";
2323
import TextareaAutosize from "react-textarea-autosize";
2424
import { toast } from "sonner";
@@ -177,20 +177,15 @@ export default function OGSection({
177177
<h2 className="text-sm font-medium text-gray-900">
178178
Custom Social Media Cards
179179
</h2>
180-
<BadgeTooltip
180+
<ProBadgeTooltip
181181
content={
182182
<SimpleTooltipContent
183183
title="Customize how your links look when shared on social media."
184184
cta="Learn more."
185185
href="https://dub.co/help/article/custom-social-media-cards"
186186
/>
187187
}
188-
>
189-
<div className="flex items-center space-x-1">
190-
<Crown size={12} />
191-
<p>PRO</p>
192-
</div>
193-
</BadgeTooltip>
188+
/>
194189
</div>
195190
<Switch
196191
fn={() => setData((prev) => ({ ...prev, proxy: !proxy }))}

‎apps/web/ui/modals/add-edit-link-modal/password-section.tsx‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { LinkProps } from "@/lib/types";
22
import { Eye, EyeOff } from "@/ui/shared/icons";
3-
import { BadgeTooltip, SimpleTooltipContent, Switch } from "@dub/ui";
3+
import { ProBadgeTooltip } from "@/ui/shared/pro-badge-tooltip";
4+
import { SimpleTooltipContent, Switch } from "@dub/ui";
45
import { FADE_IN_ANIMATION_SETTINGS } from "@dub/utils";
56
import { motion } from "framer-motion";
6-
import { Crown } from "lucide-react";
77
import { Dispatch, SetStateAction, useEffect, useState } from "react";
88

99
export default function PasswordSection({
@@ -39,20 +39,15 @@ export default function PasswordSection({
3939
<h2 className="text-sm font-medium text-gray-900">
4040
Password Protection
4141
</h2>
42-
<BadgeTooltip
42+
<ProBadgeTooltip
4343
content={
4444
<SimpleTooltipContent
4545
title="Restrict access to your short links by encrypting it with a password."
4646
cta="Learn more."
4747
href="https://dub.co/help/article/password-protected-links"
4848
/>
4949
}
50-
>
51-
<div className="flex items-center space-x-1">
52-
<Crown size={12} />
53-
<p>PRO</p>
54-
</div>
55-
</BadgeTooltip>
50+
/>
5651
</div>
5752
<Switch fn={() => setEnabled(!enabled)} checked={enabled} />
5853
</div>

0 commit comments

Comments
 (0)