diff --git a/clients/apps/web/src/app/(main)/[organization]/(header)/subscriptions/page.tsx b/clients/apps/web/src/app/(main)/[organization]/(header)/subscriptions/page.tsx index 4316a3ce6f..2fa11e2c52 100644 --- a/clients/apps/web/src/app/(main)/[organization]/(header)/subscriptions/page.tsx +++ b/clients/apps/web/src/app/(main)/[organization]/(header)/subscriptions/page.tsx @@ -3,7 +3,7 @@ import { redirect } from 'next/navigation' export default async function Page({ params, }: { - params: { organization: string; } + params: { organization: string } }) { redirect(`/${params.organization}`) } diff --git a/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/customers/ClientPage.tsx b/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/customers/ClientPage.tsx index 3b501e2aac..851fa491c6 100644 --- a/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/customers/ClientPage.tsx +++ b/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/customers/ClientPage.tsx @@ -4,7 +4,7 @@ import { CustomerModal } from '@/components/Customer/CustomerModal' import { DashboardBody } from '@/components/Layout/DashboardLayout' import { InlineModal } from '@/components/Modal/InlineModal' import { useModal } from '@/components/Modal/useModal' -import { useCustomers} from '@/hooks/queries' +import { useCustomers } from '@/hooks/queries' import useDebouncedCallback from '@/hooks/utils' import { DataTablePaginationState, diff --git a/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/issues/embed/ClientPage.tsx b/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/issues/embed/ClientPage.tsx index 6c1b333cf4..15b2bd6616 100644 --- a/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/issues/embed/ClientPage.tsx +++ b/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/issues/embed/ClientPage.tsx @@ -1,30 +1,24 @@ 'use client' +import { GitHubAppInstallationUpsell } from '@/components/Dashboard/Upsell' +import { DashboardBody } from '@/components/Layout/DashboardLayout' import Spinner from '@/components/Shared/Spinner' -import { useListRepositories } from '@/hooks/queries' import { useHasLinkedExternalOrganizations } from '@/hooks' -import { useSearchParams } from 'next/navigation' +import { useListRepositories } from '@/hooks/queries' +import { MaintainerOrganizationContext } from '@/providers/maintainerOrganization' import { Organization } from '@polar-sh/sdk' -import { GitHubAppInstallationUpsell } from '@/components/Dashboard/Upsell' -import { DashboardBody } from '@/components/Layout/DashboardLayout' +import { useSearchParams } from 'next/navigation' import CopyToClipboardInput from 'polarkit/components/ui/atoms/copytoclipboardinput' -import { MaintainerOrganizationContext } from '@/providers/maintainerOrganization' import ShadowBox from 'polarkit/components/ui/atoms/shadowbox' import { Tabs, TabsList, TabsTrigger } from 'polarkit/components/ui/atoms/tabs' -import { ReactElement, useState } from 'react' -import { useContext } from 'react' - +import { ReactElement, useContext, useState } from 'react' interface Embeddable { preview: ReactElement tag: string } -const EmbedPage = ({ - organization, -}: { - organization: Organization -}) => { +const EmbedPage = ({ organization }: { organization: Organization }) => { const searchParams = useSearchParams() const repoSlug = searchParams.get('repo') const repositories = useListRepositories( @@ -49,11 +43,21 @@ const EmbedPage = ({ const embeds: Record = { Issues: { - preview: GitHub Embed of Fundable Backlog, + preview: ( + GitHub Embed of Fundable Backlog + ), tag: ``, }, Shield: { - preview: GitHub Shield of Fundable Issues, + preview: ( + GitHub Shield of Fundable Issues + ), tag: ``, }, } diff --git a/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/members/ClientPage.tsx b/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/members/ClientPage.tsx index 5ea4accb58..cbb7f674cb 100644 --- a/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/members/ClientPage.tsx +++ b/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/members/ClientPage.tsx @@ -42,7 +42,7 @@ export default function ClientPage() { {sortedMembers.map((m) => ( - +
{ return ( -
+
-
+

{product.name}

- {product.is_archived && ( - Archived - )} + {product.is_archived && Archived}
{product.description && (
= ({ - organization, - orderId -}) => { +const ClientPage: React.FC = ({ organization, orderId }) => { const { data: order } = useOrder(orderId) const { data: product } = useProduct(order?.product.id) const { data: customFields } = useCustomFields(organization.id) @@ -71,22 +66,35 @@ const ClientPage: React.FC = ({ return ( +

Order

- {order.id} + + {order.id} +
} - className='gap-y-8' + className="gap-y-8" contextView={} > - +
- {!product.is_archived && - - } - - + {!product.is_archived && ( + + + + )} + +
@@ -94,16 +102,21 @@ const ClientPage: React.FC = ({

Order Details

- {order.id} + {order.id} - + + + - + - + {formatCurrencyAndAmount(order.tax_amount)} @@ -116,7 +129,7 @@ const ClientPage: React.FC = ({ {order.billing_address ? ( <> - + {order.billing_address?.country} @@ -124,7 +137,7 @@ const ClientPage: React.FC = ({ {order.billing_address?.line1 ?? '—'} - {order.billing_address?.line2 ?? '—'} + {order.billing_address?.line2 ?? '—'} {order.billing_address?.postal_code ?? '—'} @@ -135,7 +148,10 @@ const ClientPage: React.FC = ({ {order.billing_address?.state ?? '—'} - ) : <>} + + ) : ( + <> + )}
@@ -167,7 +183,10 @@ const ClientPage: React.FC = ({ ) } -const DetailRow = ({ title, children }: PropsWithChildren<{ title: string;}>) => { +const DetailRow = ({ + title, + children, +}: PropsWithChildren<{ title: string }>) => { return (
{title} diff --git a/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/sales/[id]/page.tsx b/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/sales/[id]/page.tsx index 49b55aa32d..d1987b1312 100644 --- a/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/sales/[id]/page.tsx +++ b/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/sales/[id]/page.tsx @@ -12,7 +12,7 @@ export async function generateMetadata(): Promise { export default async function Page({ params, }: { - params: { organization: string, id: string } + params: { organization: string; id: string } }) { const api = getServerSideAPI() const organization = await getOrganizationBySlugOrNotFound( @@ -20,10 +20,5 @@ export default async function Page({ params.organization, ) - return ( - - ) + return } diff --git a/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/settings/ClientPage.tsx b/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/settings/ClientPage.tsx index 40505b3df6..32175c7456 100644 --- a/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/settings/ClientPage.tsx +++ b/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/settings/ClientPage.tsx @@ -1,9 +1,9 @@ 'use client' import { DashboardBody } from '@/components/Layout/DashboardLayout' +import FeatureSettings from '@/components/Settings/FeatureSettings' import OrganizationAppearanceSettings from '@/components/Settings/OrganizationAppearanceSettings' import { Section, SectionDescription } from '@/components/Settings/Section' -import FeatureSettings from '@/components/Settings/FeatureSettings' import { MaintainerOrganizationContext } from '@/providers/maintainerOrganization' import { useContext } from 'react' diff --git a/clients/apps/web/src/app/(main)/dashboard/layout.tsx b/clients/apps/web/src/app/(main)/dashboard/layout.tsx index 786e659443..7eb99b2dcd 100644 --- a/clients/apps/web/src/app/(main)/dashboard/layout.tsx +++ b/clients/apps/web/src/app/(main)/dashboard/layout.tsx @@ -1,10 +1,5 @@ - import { PropsWithChildren } from 'react' export default async function Layout({ children }: PropsWithChildren) { - return ( -
- {children} -
- ) + return
{children}
} diff --git a/clients/apps/web/src/app/(main)/docs/developers/webhooks/events/[...event]/page.tsx b/clients/apps/web/src/app/(main)/docs/developers/webhooks/events/[...event]/page.tsx index 8104125cba..cc8b6b734b 100644 --- a/clients/apps/web/src/app/(main)/docs/developers/webhooks/events/[...event]/page.tsx +++ b/clients/apps/web/src/app/(main)/docs/developers/webhooks/events/[...event]/page.tsx @@ -1,4 +1,5 @@ import ProseWrapper from '@/components/Documentation/ProseWrapper' +import { TableOfContents } from '@/components/Documentation/TableOfContents' import { fetchSchema, generateSchemaExample, @@ -9,14 +10,11 @@ import SyntaxHighlighterServer, { Highlighter, getHighlighter, } from '@/components/SyntaxHighlighterShiki/SyntaxHighlighterServer' -import { notFound } from 'next/navigation' import Markdown from 'markdown-to-jsx' +import { notFound } from 'next/navigation' import { OpenAPIV3_1 } from 'openapi-types' -import { TableOfContents } from '@/components/Documentation/TableOfContents' import type { TocItem } from 'remark-flexible-toc' - - export const dynamic = 'force-static' const Webhook = ({ @@ -46,7 +44,7 @@ const Webhook = ({ } export default async function Page({ - params: { event } + params: { event }, }: { params: { event: string[] } }) { @@ -66,7 +64,7 @@ export default async function Page({ depth: 1, numbering: [1], parent: 'root', - } + }, ] return ( diff --git a/clients/apps/web/src/app/(main)/login/magic-link/authenticate/page.tsx b/clients/apps/web/src/app/(main)/login/magic-link/authenticate/page.tsx index 433c0596ab..67ec94c5c7 100644 --- a/clients/apps/web/src/app/(main)/login/magic-link/authenticate/page.tsx +++ b/clients/apps/web/src/app/(main)/login/magic-link/authenticate/page.tsx @@ -17,7 +17,7 @@ export default function Page({ }) return (
diff --git a/clients/apps/web/src/app/(main)/signup/page.tsx b/clients/apps/web/src/app/(main)/signup/page.tsx index 0f2deaff6a..52eb8510d6 100644 --- a/clients/apps/web/src/app/(main)/signup/page.tsx +++ b/clients/apps/web/src/app/(main)/signup/page.tsx @@ -50,9 +50,13 @@ export default async function Page({
*/} - + }} + />
diff --git a/clients/apps/web/src/app/embed/product.svg/route.tsx b/clients/apps/web/src/app/embed/product.svg/route.tsx index 4bba92d7bd..2920bbfead 100644 --- a/clients/apps/web/src/app/embed/product.svg/route.tsx +++ b/clients/apps/web/src/app/embed/product.svg/route.tsx @@ -1,19 +1,14 @@ import { ProductCardEmbed } from '@/components/Embed/ProductCardEmbed' import { getServerURL } from '@/utils/api' -import { - ProductEmbed, -} from '@polar-sh/sdk' +import { ProductEmbed } from '@polar-sh/sdk' const { default: satori } = require('satori') export const runtime = 'edge' const generate304Response = () => { - return new Response( - null, - { - status: 304, - }, - ) + return new Response(null, { + status: 304, + }) } const generate404Response = () => { @@ -47,7 +42,7 @@ const getEmbed = async ( const response = await fetch(url, { method: 'GET', - headers: headers + headers: headers, }) const useCache = response.status === 304 @@ -78,11 +73,7 @@ const render = async ( ).then((res) => res.arrayBuffer()) return await satori( - , + , { fonts: [ { @@ -125,18 +116,14 @@ export async function GET(request: Request) { return generate404Response() } - const svg = await render( - embed, - cta, - darkmode, - ) + const svg = await render(embed, cta, darkmode) - const cacheTTL = 60 * 60 * 24 * 100 // 100 days + const cacheTTL = 60 * 60 * 24 * 100 // 100 days return new Response(svg, { headers: { 'Content-Type': 'image/svg+xml', 'Cache-Control': `public, max-age=${cacheTTL}`, - 'ETag': embed.etag, + ETag: embed.etag, }, status: 200, }) diff --git a/clients/apps/web/src/components/Accounts/AccountSetup.tsx b/clients/apps/web/src/components/Accounts/AccountSetup.tsx index 2ef9a43cf3..2777083367 100644 --- a/clients/apps/web/src/components/Accounts/AccountSetup.tsx +++ b/clients/apps/web/src/components/Accounts/AccountSetup.tsx @@ -60,7 +60,7 @@ export const AccountSetup: React.FC = ({ const link = await api.accounts.dashboardLink({ id: account.id, }) - window.open(link.url, '_blank'); + window.open(link.url, '_blank') } return ( diff --git a/clients/apps/web/src/components/Auth/AuthModal.tsx b/clients/apps/web/src/components/Auth/AuthModal.tsx index 1b95afa604..59dc28bd68 100644 --- a/clients/apps/web/src/components/Auth/AuthModal.tsx +++ b/clients/apps/web/src/components/Auth/AuthModal.tsx @@ -1,6 +1,6 @@ +import { UserSignupAttribution } from '@polar-sh/sdk' import ShadowBox from 'polarkit/components/ui/atoms/shadowbox' import LogoIcon from '../Brand/LogoIcon' -import { UserSignupAttribution } from '@polar-sh/sdk' import Login from './Login' interface AuthModalProps { @@ -17,12 +17,12 @@ export const AuthModal = ({ const isSignup = signup !== undefined const title = isSignup ? 'Sign Up' : 'Log In' - const copy = - isSignup ? ( -

- Join thousands of developers & startups monetizing their products with Polar. -

- ) : null + const copy = isSignup ? ( +

+ Join thousands of developers & startups monetizing their products with + Polar. +

+ ) : null return ( @@ -35,7 +35,11 @@ export const AuthModal = ({
- +
diff --git a/clients/apps/web/src/components/Auth/GetStartedButton.tsx b/clients/apps/web/src/components/Auth/GetStartedButton.tsx index 296e058527..a5069f161f 100644 --- a/clients/apps/web/src/components/Auth/GetStartedButton.tsx +++ b/clients/apps/web/src/components/Auth/GetStartedButton.tsx @@ -1,15 +1,14 @@ 'use client' +import { usePostHog } from '@/hooks/posthog' import { KeyboardArrowRight } from '@mui/icons-material' +import { Organization } from '@polar-sh/sdk' import Button from 'polarkit/components/ui/atoms/button' -import { ComponentProps } from 'react' +import { ComponentProps, FormEvent, useCallback, useMemo } from 'react' import { twMerge } from 'tailwind-merge' -import { Organization } from '@polar-sh/sdk' import { Modal } from '../Modal' import { useModal } from '../Modal/useModal' import { AuthModal } from './AuthModal' -import { useCallback, useMemo, FormEvent } from 'react' -import { usePostHog } from '@/hooks/posthog' interface GetStartedButtonProps extends ComponentProps { text?: string @@ -44,11 +43,14 @@ const GetStartedButton: React.FC = ({ }, [signup, posthog, showModal]) // Supporting embedding the button in a form - const onSubmit = useCallback((e: FormEvent) => { - e.preventDefault() - e.stopPropagation() - onClick() - }, [onClick]) + const onSubmit = useCallback( + (e: FormEvent) => { + e.preventDefault() + e.stopPropagation() + onClick() + }, + [onClick], + ) return ( <> @@ -77,7 +79,7 @@ const GetStartedButton: React.FC = ({ returnParams={slug ? { slug, auto: 'true' } : {}} signup={{ intent: 'creator', - ...signup + ...signup, }} /> } diff --git a/clients/apps/web/src/components/Auth/GithubLoginButton.tsx b/clients/apps/web/src/components/Auth/GithubLoginButton.tsx index eed878f65c..52b9730e0b 100644 --- a/clients/apps/web/src/components/Auth/GithubLoginButton.tsx +++ b/clients/apps/web/src/components/Auth/GithubLoginButton.tsx @@ -1,17 +1,17 @@ 'use client' +import { usePostHog, type EventName } from '@/hooks/posthog' import { getGitHubAuthorizeURL } from '@/utils/auth' +import { UserSignupAttribution } from '@polar-sh/sdk' import Link from 'next/link' import { useSearchParams } from 'next/navigation' import Button from 'polarkit/components/ui/atoms/button' import { twMerge } from 'tailwind-merge' -import { UserSignupAttribution } from '@polar-sh/sdk' -import { usePostHog, type EventName } from '@/hooks/posthog' const GithubLoginButton = (props: { className?: string returnTo?: string - signup?: UserSignupAttribution, + signup?: UserSignupAttribution size?: 'large' | 'small' fullWidth?: boolean text: string @@ -34,7 +34,7 @@ const GithubLoginButton = (props: { } posthog.capture(eventName, { - method: 'github' + method: 'github', }) } diff --git a/clients/apps/web/src/components/Auth/GoogleLoginButton.tsx b/clients/apps/web/src/components/Auth/GoogleLoginButton.tsx index b38f2972fa..cf9a5c64c7 100644 --- a/clients/apps/web/src/components/Auth/GoogleLoginButton.tsx +++ b/clients/apps/web/src/components/Auth/GoogleLoginButton.tsx @@ -1,16 +1,19 @@ +import { usePostHog, type EventName } from '@/hooks/posthog' import { getGoogleAuthorizeURL } from '@/utils/auth' import { Google } from '@mui/icons-material' -import Button from 'polarkit/components/ui/atoms/button' import { UserSignupAttribution } from '@polar-sh/sdk' import Link from 'next/link' -import { usePostHog, type EventName } from '@/hooks/posthog' +import Button from 'polarkit/components/ui/atoms/button' interface GoogleLoginButtonProps { returnTo?: string signup?: UserSignupAttribution } -const GoogleLoginButton: React.FC = ({ returnTo, signup }) => { +const GoogleLoginButton: React.FC = ({ + returnTo, + signup, +}) => { const posthog = usePostHog() const onClick = () => { @@ -20,15 +23,18 @@ const GoogleLoginButton: React.FC = ({ returnTo, signup } posthog.capture(eventName, { - method: 'google' + method: 'google', }) } return ( - + )} diff --git a/clients/apps/web/src/components/Checkout/CheckoutConfirmation.tsx b/clients/apps/web/src/components/Checkout/CheckoutConfirmation.tsx index 63b6ddf143..f7dda65be4 100644 --- a/clients/apps/web/src/components/Checkout/CheckoutConfirmation.tsx +++ b/clients/apps/web/src/components/Checkout/CheckoutConfirmation.tsx @@ -110,7 +110,7 @@ export const CheckoutConfirmation = ({ return (
- {organization.profile_settings?.enabled ? + {organization.profile_settings?.enabled ? ( - : + + ) : ( - } + )}

{status === CheckoutStatus.CONFIRMED && 'We are processing your order'} diff --git a/clients/apps/web/src/components/CommandPalette/CommandPalette.tsx b/clients/apps/web/src/components/CommandPalette/CommandPalette.tsx index 65815928a8..fa9802d146 100644 --- a/clients/apps/web/src/components/CommandPalette/CommandPalette.tsx +++ b/clients/apps/web/src/components/CommandPalette/CommandPalette.tsx @@ -1,5 +1,6 @@ 'use client' +import { usePostHog } from '@/hooks/posthog' import { ArrowBackOutlined } from '@mui/icons-material' import { Organization } from '@polar-sh/sdk' import { @@ -19,7 +20,6 @@ import { } from './commands/useCommands' import { APIContainer } from './containers/APIContainer' import { GlobalContainer } from './containers/GlobalContainer' -import { usePostHog } from '@/hooks/posthog' export interface CommandPaletteProps { organization?: Organization diff --git a/clients/apps/web/src/components/CustomFields/CustomFieldForm.tsx b/clients/apps/web/src/components/CustomFields/CustomFieldForm.tsx index 7b7196cd82..823130535f 100644 --- a/clients/apps/web/src/components/CustomFields/CustomFieldForm.tsx +++ b/clients/apps/web/src/components/CustomFields/CustomFieldForm.tsx @@ -4,13 +4,13 @@ import { CustomFieldType, CustomFieldUpdate, } from '@polar-sh/sdk' +import { Switch } from 'polarkit/components/ui/atoms' import { Accordion, AccordionContent, AccordionItem, AccordionTrigger, } from 'polarkit/components/ui/atoms/Accordion' -import { Switch } from 'polarkit/components/ui/atoms' import Button from 'polarkit/components/ui/atoms/button' import Input from 'polarkit/components/ui/atoms/input' import { diff --git a/clients/apps/web/src/components/Dashboard/BackerConnectUpsell.tsx b/clients/apps/web/src/components/Dashboard/BackerConnectUpsell.tsx index 553dc1e07d..9f74c49649 100644 --- a/clients/apps/web/src/components/Dashboard/BackerConnectUpsell.tsx +++ b/clients/apps/web/src/components/Dashboard/BackerConnectUpsell.tsx @@ -8,7 +8,7 @@ const BackerConnectUpsell = () => { ) return ( -
+
Get funding for your public repositories. diff --git a/clients/apps/web/src/components/Discounts/DiscountForm.tsx b/clients/apps/web/src/components/Discounts/DiscountForm.tsx index 7070fcd841..bb6fc34095 100644 --- a/clients/apps/web/src/components/Discounts/DiscountForm.tsx +++ b/clients/apps/web/src/components/Discounts/DiscountForm.tsx @@ -123,10 +123,9 @@ const DiscountForm: React.FC = ({ - Optional code (case insensitive) that the customer can use to apply the discount. - - If left empty, the discount can only be applied through a - Checkout Link or the API. + Optional code (case insensitive) that the customer can use to + apply the discount. If left empty, the discount can only be + applied through a Checkout Link or the API. ) diff --git a/clients/apps/web/src/components/Documentation/Navigation.tsx b/clients/apps/web/src/components/Documentation/Navigation.tsx index 04d27292f5..2a3241bdd8 100644 --- a/clients/apps/web/src/components/Documentation/Navigation.tsx +++ b/clients/apps/web/src/components/Documentation/Navigation.tsx @@ -399,7 +399,9 @@ export const MainNavigation = () => { Introduction Welcome Quick Start - Supported Countries + + Supported Countries + Fees
diff --git a/clients/apps/web/src/components/Documentation/OAuthSettings.tsx b/clients/apps/web/src/components/Documentation/OAuthSettings.tsx index fd3579dc9d..97b21a9661 100644 --- a/clients/apps/web/src/components/Documentation/OAuthSettings.tsx +++ b/clients/apps/web/src/components/Documentation/OAuthSettings.tsx @@ -2,11 +2,11 @@ import { useAuth } from '@/hooks' import { useLoginLink } from '@/hooks/login' +import { usePostHog } from '@/hooks/posthog' import Link from 'next/link' import { ShadowListGroup } from 'polarkit/components/ui/atoms' import Button from 'polarkit/components/ui/atoms/button' import OAuthSettingsBase from '../Settings/OAuth/OAuthSettings' -import { usePostHog } from '@/hooks/posthog' const OAuthSettings = () => { const posthog = usePostHog() diff --git a/clients/apps/web/src/components/Embed/ProductCardEmbed.tsx b/clients/apps/web/src/components/Embed/ProductCardEmbed.tsx index c2e2e87773..9daa09516a 100644 --- a/clients/apps/web/src/components/Embed/ProductCardEmbed.tsx +++ b/clients/apps/web/src/components/Embed/ProductCardEmbed.tsx @@ -1,9 +1,7 @@ import LogoIcon from '@/components/Brand/LogoIcon' import { ProductEmbed, ProductPrice } from '@polar-sh/sdk' import { formatCurrencyAndAmount } from 'polarkit/lib/money' -import { - getRecurringBillingLabel, -} from '../Subscriptions/utils' +import { getRecurringBillingLabel } from '../Subscriptions/utils' export const ProductCardEmbed = ({ embed, @@ -16,7 +14,7 @@ export const ProductCardEmbed = ({ }) => { const price: ProductPrice = embed.price - const isSubscription = ('recurring_interval' in price) + const isSubscription = 'recurring_interval' in price const isPWYW = price.amount_type === 'custom' const recurringBillingLabel = isSubscription ? getRecurringBillingLabel(price.recurring_interval) @@ -37,17 +35,17 @@ export const ProductCardEmbed = ({ switch (price.amount_type) { case 'free': priceLabel = 'Free' - break; + break case 'custom': priceLabel = 'Pay what you want' - break; + break case 'fixed': priceLabel = formatCurrencyAndAmount( price.price_amount, price.price_currency, 0, ) - break; + break } return ( @@ -104,7 +102,11 @@ export const ProductCardEmbed = ({
{coverUrl && ( - + )} {embed.description && (
@@ -197,7 +197,7 @@ export const HeaderPill = (props: { {props.active && props.amount > 0 && ( <> -
+
)} diff --git a/clients/apps/web/src/components/Finance/ListPledges.tsx b/clients/apps/web/src/components/Finance/ListPledges.tsx index 00281f6317..0562c96f32 100644 --- a/clients/apps/web/src/components/Finance/ListPledges.tsx +++ b/clients/apps/web/src/components/Finance/ListPledges.tsx @@ -53,26 +53,26 @@ const List = (props: { {subtitle} Backer Date {showEstimatedPayoutDate && ( Est. payout date @@ -80,7 +80,7 @@ const List = (props: { {showRefundedDate && ( Refunded date @@ -88,7 +88,7 @@ const List = (props: { Amount @@ -98,7 +98,7 @@ const List = (props: { {pledges && pledges.map((t) => ( - +
{icon(t)} @@ -115,7 +115,7 @@ const List = (props: {
-
+
{t.pledger?.avatar_url && ( {subtitle} @@ -59,7 +59,7 @@ const List = (props: { {showReceiver && ( Receiver @@ -68,7 +68,7 @@ const List = (props: { {showBacker && ( Backer @@ -84,7 +84,7 @@ const List = (props: { {showPaymentStatus && ( Status @@ -93,7 +93,7 @@ const List = (props: { {showPaidOutDate && ( Paid out date @@ -101,7 +101,7 @@ const List = (props: { Amount @@ -129,7 +129,7 @@ const List = (props: { {showReceiver && ( -
+
{t.user && ( -
+
{t.pledge.pledger && ( {
diff --git a/clients/apps/web/src/components/Layout/PolarMenu.tsx b/clients/apps/web/src/components/Layout/PolarMenu.tsx index 8ae32fdfb4..41d1727d38 100644 --- a/clients/apps/web/src/components/Layout/PolarMenu.tsx +++ b/clients/apps/web/src/components/Layout/PolarMenu.tsx @@ -2,10 +2,10 @@ import PublicProfileDropdown from '@/components/Navigation/PublicProfileDropdown' import { useLoginLink } from '@/hooks/login' +import { usePostHog } from '@/hooks/posthog' import { CONFIG } from '@/utils/config' import { Organization, UserRead } from '@polar-sh/sdk' import Link from 'next/link' -import { usePostHog } from '@/hooks/posthog' import Button from 'polarkit/components/ui/atoms/button' import GetStartedButton from '../Auth/GetStartedButton' @@ -57,7 +57,11 @@ const PolarMenu = ({
) : ( <> - + {shouldShowGitHubAuthUpsell && ( - + )} {!hasOrgs && ( @@ -85,7 +78,7 @@ const Topbar = ({
{!hideProfile ? ( -
+
{upsell}
diff --git a/clients/apps/web/src/components/Navigation/DashboardTopbar.tsx b/clients/apps/web/src/components/Navigation/DashboardTopbar.tsx index a774778bba..36452ed6f4 100644 --- a/clients/apps/web/src/components/Navigation/DashboardTopbar.tsx +++ b/clients/apps/web/src/components/Navigation/DashboardTopbar.tsx @@ -17,10 +17,7 @@ export const SubNav = (props: { items: SubRouteWithActive[] }) => { return ( - + {props.items.map((item) => { return ( diff --git a/clients/apps/web/src/components/Organization/RepoSelection.tsx b/clients/apps/web/src/components/Organization/RepoSelection.tsx index d7cdb1ebd8..737af780ff 100644 --- a/clients/apps/web/src/components/Organization/RepoSelection.tsx +++ b/clients/apps/web/src/components/Organization/RepoSelection.tsx @@ -171,7 +171,7 @@ const SelectedRepository = ({
-
+
{displayOrganization && `${repository.organization.name}/`} {repository.name} diff --git a/clients/apps/web/src/components/Pledge/IssueCard.tsx b/clients/apps/web/src/components/Pledge/IssueCard.tsx index f5cc51da9d..5abafb6d8f 100644 --- a/clients/apps/web/src/components/Pledge/IssueCard.tsx +++ b/clients/apps/web/src/components/Pledge/IssueCard.tsx @@ -58,7 +58,7 @@ const IssueCard = ({ {/* Issue details */}
{/* Left part */} -
+
diff --git a/clients/apps/web/src/components/Pledge/PaymentForm.tsx b/clients/apps/web/src/components/Pledge/PaymentForm.tsx index e1983baee8..5ac158ed23 100644 --- a/clients/apps/web/src/components/Pledge/PaymentForm.tsx +++ b/clients/apps/web/src/components/Pledge/PaymentForm.tsx @@ -1,6 +1,7 @@ 'use client' import { useAuth } from '@/hooks/auth' +import { usePostHog } from '@/hooks/posthog' import { Issue, Organization, @@ -17,7 +18,6 @@ import Button from 'polarkit/components/ui/atoms/button' import { Checkbox } from 'polarkit/components/ui/checkbox' import { useEffect, useState } from 'react' import Subtotal from './Subtotal' -import { usePostHog } from '@/hooks/posthog' const PaymentForm = ({ paymentIntent, diff --git a/clients/apps/web/src/components/Pledge/PledgeByLink.tsx b/clients/apps/web/src/components/Pledge/PledgeByLink.tsx index 47b0d590d4..7cb70f99c9 100644 --- a/clients/apps/web/src/components/Pledge/PledgeByLink.tsx +++ b/clients/apps/web/src/components/Pledge/PledgeByLink.tsx @@ -60,7 +60,7 @@ const PledgeByLink = ({ className="text mb-2 mt-4 text-sm font-medium" > GitHub issue link{' '} - + (e.g. https://github.com/ polarsource/ diff --git a/clients/apps/web/src/components/Pledge/PledgeCheckoutContribute.tsx b/clients/apps/web/src/components/Pledge/PledgeCheckoutContribute.tsx index 3504c43809..5d6cafd525 100644 --- a/clients/apps/web/src/components/Pledge/PledgeCheckoutContribute.tsx +++ b/clients/apps/web/src/components/Pledge/PledgeCheckoutContribute.tsx @@ -8,7 +8,7 @@ const PledgeCheckoutContribute = ({ issue }: { issue: Issue }) => {
-
+
Contribution instructions
diff --git a/clients/apps/web/src/components/Pledge/PledgeCheckoutFundByTeam.tsx b/clients/apps/web/src/components/Pledge/PledgeCheckoutFundByTeam.tsx index daea812714..59c0e41419 100644 --- a/clients/apps/web/src/components/Pledge/PledgeCheckoutFundByTeam.tsx +++ b/clients/apps/web/src/components/Pledge/PledgeCheckoutFundByTeam.tsx @@ -184,8 +184,8 @@ const PledgeCheckoutFundByTeam = ({ export default PledgeCheckoutFundByTeam const NextSteps = () => ( -
-
+
+
diff --git a/clients/apps/web/src/components/Pledge/PledgeCheckoutFundOnCompletion.tsx b/clients/apps/web/src/components/Pledge/PledgeCheckoutFundOnCompletion.tsx index 1e38222872..3a39ca6213 100644 --- a/clients/apps/web/src/components/Pledge/PledgeCheckoutFundOnCompletion.tsx +++ b/clients/apps/web/src/components/Pledge/PledgeCheckoutFundOnCompletion.tsx @@ -216,8 +216,8 @@ const NotLoggedInBanner = () => { } const NextSteps = () => ( -
-
+
+
diff --git a/clients/apps/web/src/components/Pledge/PledgeCheckoutFundToday.tsx b/clients/apps/web/src/components/Pledge/PledgeCheckoutFundToday.tsx index 9858229948..92348b6d61 100644 --- a/clients/apps/web/src/components/Pledge/PledgeCheckoutFundToday.tsx +++ b/clients/apps/web/src/components/Pledge/PledgeCheckoutFundToday.tsx @@ -1,4 +1,5 @@ import { useAuth } from '@/hooks/auth' +import { usePostHog } from '@/hooks/posthog' import { useListPaymentMethods } from '@/hooks/queries' import { api } from '@/utils/api' import { EnvelopeIcon } from '@heroicons/react/24/outline' @@ -31,7 +32,6 @@ import { twMerge } from 'tailwind-merge' import OrganizationSelect from './OrganizationSelect' import PaymentForm from './PaymentForm' import { generateRedirectURL, prettyCardName, validateEmail } from './payment' -import { usePostHog } from '@/hooks/posthog' const stripePromise = loadStripe(process.env.NEXT_PUBLIC_STRIPE_KEY || '') diff --git a/clients/apps/web/src/components/Pledge/Status.tsx b/clients/apps/web/src/components/Pledge/Status.tsx index 6a98306dd5..f399b4feb5 100644 --- a/clients/apps/web/src/components/Pledge/Status.tsx +++ b/clients/apps/web/src/components/Pledge/Status.tsx @@ -57,7 +57,7 @@ export const Status = (props: {
{currentUser ? ( -
+
diff --git a/clients/apps/web/src/components/Products/EditProductPage.tsx b/clients/apps/web/src/components/Products/EditProductPage.tsx index 622f0cf0ac..0a74ccd503 100644 --- a/clients/apps/web/src/components/Products/EditProductPage.tsx +++ b/clients/apps/web/src/components/Products/EditProductPage.tsx @@ -273,9 +273,11 @@ export const EditProductPage = ({ > Save Product - {!product.is_archived && } + {!product.is_archived && ( + + )}
diff --git a/clients/apps/web/src/components/Products/ProductThumbnail.tsx b/clients/apps/web/src/components/Products/ProductThumbnail.tsx index ba82d6f72f..22b4cfe2eb 100644 --- a/clients/apps/web/src/components/Products/ProductThumbnail.tsx +++ b/clients/apps/web/src/components/Products/ProductThumbnail.tsx @@ -1,8 +1,14 @@ -import { TextureOutlined } from "@mui/icons-material" -import { Product } from "@polar-sh/sdk" -import { twMerge } from "tailwind-merge" +import { TextureOutlined } from '@mui/icons-material' +import { Product } from '@polar-sh/sdk' +import { twMerge } from 'tailwind-merge' -export const ProductThumbnail = ({ size = 'small', product }: { size?: 'small' | 'medium', product: Product }) => { +export const ProductThumbnail = ({ + size = 'small', + product, +}: { + size?: 'small' | 'medium' + product: Product +}) => { let coverUrl = null if (product.medias.length > 0) { coverUrl = product.medias[0].public_url @@ -11,13 +17,18 @@ export const ProductThumbnail = ({ size = 'small', product }: { size?: 'small' | const sizeClassName = size === 'small' ? 'h-10 rounded-md' : 'h-24 rounded-xl' return ( -
+
{coverUrl ? ( // eslint-disable-next-line @next/next/no-img-element {product.name} ) : ( { const created = await createToken.mutateAsync({ comment: data.comment ? data.comment : '', - expires_in: data.expires_in === 'no-expiration' ? null : data.expires_in, + expires_in: + data.expires_in === 'no-expiration' ? null : data.expires_in, scopes: data.scopes, }) onSuccess(created) @@ -327,49 +327,49 @@ const CreateAccessTokenModal = ({

-
- {Object.values(selectableScopes) - .map((scope) => ( - { - return ( - - - { - if (checked) { - field.onChange([...(field.value || []), scope]) - } else { - field.onChange( - (field.value || []).filter((v) => v !== scope), - ) - } - }} - /> - - - {scope} - - - - ) - }} - /> - ))} + {Object.values(selectableScopes).map((scope) => ( + { + return ( + + + { + if (checked) { + field.onChange([ + ...(field.value || []), + scope, + ]) + } else { + field.onChange( + (field.value || []).filter( + (v) => v !== scope, + ), + ) + } + }} + /> + + + {scope} + + + + ) + }} + /> + ))}
diff --git a/clients/apps/web/src/components/Settings/OAuth/OAuthSettings.tsx b/clients/apps/web/src/components/Settings/OAuth/OAuthSettings.tsx index 83ba6ca4f6..04983c6946 100644 --- a/clients/apps/web/src/components/Settings/OAuth/OAuthSettings.tsx +++ b/clients/apps/web/src/components/Settings/OAuth/OAuthSettings.tsx @@ -116,7 +116,7 @@ const OAuthClientDetails = ({ client, onClick }: OAuthClientDetailsProps) => { className="flex w-full cursor-pointer flex-col gap-y-4" onClick={() => onClick(client)} > -
+
-
+
{' '} {description && ( = ({ -
+
{subscriptionStatusDisplayNames[status]}
diff --git a/clients/apps/web/src/components/Subscriptions/utils.tsx b/clients/apps/web/src/components/Subscriptions/utils.tsx index 0757c0ee53..568a3451f3 100644 --- a/clients/apps/web/src/components/Subscriptions/utils.tsx +++ b/clients/apps/web/src/components/Subscriptions/utils.tsx @@ -1,5 +1,5 @@ import { - CustomerSubscription, + CustomerSubscription, ProductPriceRecurring, ProductPriceType, ProductStorefront, @@ -38,33 +38,33 @@ export const hasRecurringInterval = export const SubscriptionStatusLabel = ({ className, - subscription -}: { className?: string, subscription: Subscription | CustomerSubscription }) => { - + subscription, +}: { + className?: string + subscription: Subscription | CustomerSubscription +}) => { const label = useMemo(() => { + switch (subscription.status) { + case 'active': + return subscription.cancel_at_period_end ? 'To be cancelled' : 'Active' + default: + return subscription.status.split('_').join(' ') + } + }, [subscription]) - switch (subscription.status) { - case 'active': - return subscription.cancel_at_period_end ? 'To be cancelled' : 'Active' - default: - return subscription.status.split('_').join(' ') - } -}, [subscription]) - - - -const statusColor = useMemo(() => { + const statusColor = useMemo(() => { switch (subscription.status) { case 'active': - return subscription.cancel_at_period_end ? 'border-yellow-500' : 'border-emerald-500' + return subscription.cancel_at_period_end + ? 'border-yellow-500' + : 'border-emerald-500' default: return 'border-red-500' } }, [subscription]) - return ( -
+
{label}
diff --git a/clients/apps/web/src/components/Transactions/TransactionsList.tsx b/clients/apps/web/src/components/Transactions/TransactionsList.tsx index cc2dbf37f8..3bf365106d 100644 --- a/clients/apps/web/src/components/Transactions/TransactionsList.tsx +++ b/clients/apps/web/src/components/Transactions/TransactionsList.tsx @@ -103,7 +103,7 @@ const TransactionMeta: React.FC = ({ transaction }) => { <>
= ({ transaction }) => { {'issue' in transactionMeta.meta && (
{transactionMeta.meta.issue.title} diff --git a/clients/apps/web/src/components/Transactions/WithdrawModal.tsx b/clients/apps/web/src/components/Transactions/WithdrawModal.tsx index df94ec97ba..16e9813cae 100644 --- a/clients/apps/web/src/components/Transactions/WithdrawModal.tsx +++ b/clients/apps/web/src/components/Transactions/WithdrawModal.tsx @@ -85,7 +85,7 @@ const WithdrawModal: React.FC = ({ )} {payoutEstimate && ( <> -
+
You're about to withdraw your balance to your bank account. @@ -108,11 +108,11 @@ const WithdrawModal: React.FC = ({
{formatCurrencyAndAmount(payoutEstimate.gross_amount)}
-
+
{formatCurrencyAndAmount(payoutEstimate.fees_amount)}
-
+
{formatCurrencyAndAmount(payoutEstimate.net_amount)}
diff --git a/clients/apps/web/src/components/Widgets/OrdersWidget.tsx b/clients/apps/web/src/components/Widgets/OrdersWidget.tsx index f1892b2bb1..f3dc8014bb 100644 --- a/clients/apps/web/src/components/Widgets/OrdersWidget.tsx +++ b/clients/apps/web/src/components/Widgets/OrdersWidget.tsx @@ -78,9 +78,7 @@ export const OrdersWidget = ({ className }: OrdersWidgetProps) => { ] return ( -
+
{(orders.data?.items.length ?? 0) > 0 ? (
{orders.data?.items diff --git a/clients/apps/web/src/hooks/emailUpdate.ts b/clients/apps/web/src/hooks/emailUpdate.ts index 13e0810cc6..f1ffd9ac0d 100644 --- a/clients/apps/web/src/hooks/emailUpdate.ts +++ b/clients/apps/web/src/hooks/emailUpdate.ts @@ -1,9 +1,9 @@ 'use client' -import { api } from "@/utils/api" -import { EmailUpdateRequest } from "@polar-sh/sdk" -import { useRouter } from "next/navigation" -import { useCallback } from "react" +import { api } from '@/utils/api' +import { EmailUpdateRequest } from '@polar-sh/sdk' +import { useRouter } from 'next/navigation' +import { useCallback } from 'react' export const useSendEmailUpdate = () => { const router = useRouter() diff --git a/clients/apps/web/src/hooks/magicLink.ts b/clients/apps/web/src/hooks/magicLink.ts index ac65fc1d40..f44b42c87b 100644 --- a/clients/apps/web/src/hooks/magicLink.ts +++ b/clients/apps/web/src/hooks/magicLink.ts @@ -1,14 +1,18 @@ 'use client' import { api } from '@/utils/api' -import { UserSignupAttribution, MagicLinkRequest } from '@polar-sh/sdk' +import { MagicLinkRequest, UserSignupAttribution } from '@polar-sh/sdk' import { useRouter } from 'next/navigation' import { useCallback } from 'react' export const useSendMagicLink = () => { const router = useRouter() const func = useCallback( - async (email: string, return_to?: string, signup?: UserSignupAttribution) => { + async ( + email: string, + return_to?: string, + signup?: UserSignupAttribution, + ) => { const body: MagicLinkRequest = { email, return_to, diff --git a/clients/apps/web/src/hooks/queries/orders.ts b/clients/apps/web/src/hooks/queries/orders.ts index 02c8e59b81..441ac0eba5 100644 --- a/clients/apps/web/src/hooks/queries/orders.ts +++ b/clients/apps/web/src/hooks/queries/orders.ts @@ -3,12 +3,16 @@ import { OrdersApiGetRequest, OrdersApiListRequest } from '@polar-sh/sdk' import { useQuery } from '@tanstack/react-query' import { defaultRetry } from './retry' -export const useOrder = (orderId?: string, parameters?: Omit) => useQuery({ - queryKey: ['order', orderId, parameters], - queryFn: () => api.orders.get({ id: orderId ?? '', ...parameters }), - retry: defaultRetry, - enabled: !!orderId, -}) +export const useOrder = ( + orderId?: string, + parameters?: Omit, +) => + useQuery({ + queryKey: ['order', orderId, parameters], + queryFn: () => api.orders.get({ id: orderId ?? '', ...parameters }), + retry: defaultRetry, + enabled: !!orderId, + }) export const useOrders = ( organizationId?: string, diff --git a/clients/apps/web/src/hooks/queries/project.ts b/clients/apps/web/src/hooks/queries/project.ts index ddba31110e..98b0648e10 100644 --- a/clients/apps/web/src/hooks/queries/project.ts +++ b/clients/apps/web/src/hooks/queries/project.ts @@ -5,10 +5,7 @@ import { defaultRetry } from './retry' export const useUpdateProject = () => useMutation({ - mutationFn: (variables: { - id: string - body: RepositoryUpdate - }) => { + mutationFn: (variables: { id: string; body: RepositoryUpdate }) => { return api.repositories.update(variables) }, retry: defaultRetry, diff --git a/clients/packages/mdx/README.md b/clients/packages/mdx/README.md index 9b0749e365..251ce0be37 100644 --- a/clients/packages/mdx/README.md +++ b/clients/packages/mdx/README.md @@ -1,3 +1,3 @@ # @polar-sh/mdx -A remark plugin which automatically turns MDX frontmatter into Next.js Metadata. \ No newline at end of file +A remark plugin which automatically turns MDX frontmatter into Next.js Metadata. diff --git a/clients/packages/polarkit/src/components/ui/atoms/Pill.tsx b/clients/packages/polarkit/src/components/ui/atoms/Pill.tsx index c7e06fecd8..d03320d483 100644 --- a/clients/packages/polarkit/src/components/ui/atoms/Pill.tsx +++ b/clients/packages/polarkit/src/components/ui/atoms/Pill.tsx @@ -21,7 +21,7 @@ const Pill = ({ ? 'dark:bg-polar-700 dark:text-polar-300 bg-gray-100 text-gray-600' : '', color === 'purple' - ? 'bg-purple-100 text-purple-600 dark:bg-purple-700 dark:text-purple-300 ' + ? 'bg-purple-100 text-purple-600 dark:bg-purple-700 dark:text-purple-300' : '', className, )} diff --git a/clients/packages/polarkit/src/components/ui/atoms/Status.tsx b/clients/packages/polarkit/src/components/ui/atoms/Status.tsx index 341de8a80c..017273c797 100644 --- a/clients/packages/polarkit/src/components/ui/atoms/Status.tsx +++ b/clients/packages/polarkit/src/components/ui/atoms/Status.tsx @@ -1,8 +1,19 @@ -import { twMerge } from "tailwind-merge" +import { twMerge } from 'tailwind-merge' -export const Status = ({ className, status }: { className: string, status: string }) => { +export const Status = ({ + className, + status, +}: { + className: string + status: string +}) => { return ( -
+
{status}
) diff --git a/clients/packages/polarkit/src/components/ui/atoms/datatable/DataTablePagination.tsx b/clients/packages/polarkit/src/components/ui/atoms/datatable/DataTablePagination.tsx index ced6207588..118af40b69 100644 --- a/clients/packages/polarkit/src/components/ui/atoms/datatable/DataTablePagination.tsx +++ b/clients/packages/polarkit/src/components/ui/atoms/datatable/DataTablePagination.tsx @@ -46,8 +46,17 @@ export function DataTablePagination({
- Page {table.getState().pagination.pageIndex + 1} of{' '} - {table.getPageCount()} + Viewing{' '} + {table.getState().pagination.pageIndex * + table.getState().pagination.pageSize + + 1} + - + {Math.min( + (table.getState().pagination.pageIndex + 1) * + table.getState().pagination.pageSize, + table.getCoreRowModel().rows.length, + )}{' '} + of {table.getCoreRowModel().rows.length}