Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

checkout -> subscribe

Blue Mousef79b4129c27f
diff --git a/web/app/pages/Checkout/index.tsx b/web/app/pages/Checkout/index.tsx
deleted file mode 100644
index ed3da5028..000000000
--- a/web/app/pages/Checkout/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Checkout'
diff --git a/web/app/pages/Onboarding/Onboarding.tsx b/web/app/pages/Onboarding/Onboarding.tsx
index 618e49861..d35ff7848 100644
--- a/web/app/pages/Onboarding/Onboarding.tsx
+++ b/web/app/pages/Onboarding/Onboarding.tsx
@@ -1150,7 +1150,7 @@ const Onboarding = () => {
loadUser()
} else if (intent === 'complete-onboarding') {
loadUser()
- navigate(isSelfhosted ? routes.dashboard : routes.checkout)
+ navigate(isSelfhosted ? routes.dashboard : routes.subscribe)
}
} else if (fetcher.data?.error) {
toast.error(fetcher.data.error)
diff --git a/web/app/pages/Checkout/Checkout.tsx b/web/app/pages/Subscribe/Subscribe.tsx
similarity index 98%
rename from web/app/pages/Checkout/Checkout.tsx
rename to web/app/pages/Subscribe/Subscribe.tsx
index 266376e76..6fd99be4e 100644
--- a/web/app/pages/Checkout/Checkout.tsx
+++ b/web/app/pages/Subscribe/Subscribe.tsx
@@ -21,7 +21,7 @@ import {
} from '~/lib/constants'
import { useAuth } from '~/providers/AuthProvider'
import { useTheme } from '~/providers/ThemeProvider'
-import type { CheckoutLoaderData } from '~/routes/checkout'
+import type { SubscribeLoaderData } from '~/routes/subscribe'
import Button from '~/ui/Button'
import { Text } from '~/ui/Text'
import { Switch } from '~/ui/Switch'
@@ -32,12 +32,12 @@ const INITIAL_VISIBLE_PLANS = 3
const formatEventsLong = (value: number, locale = 'en-US') =>
value.toLocaleString(locale)
-const Checkout = () => {
+const Subscribe = () => {
const { t, i18n } = useTranslation('common')
const { theme } = useTheme()
const { user } = useAuth()
const navigate = useNavigate()
- const { metainfo } = useLoaderData<CheckoutLoaderData>()
+ const { metainfo } = useLoaderData<SubscribeLoaderData>()
const [selectedPlan, setSelectedPlan] = useState('100k')
const [selectedBillingFrequency, setSelectedBillingFrequency] = useState<
@@ -442,4 +442,4 @@ const Checkout = () => {
)
}
-export default Checkout
+export default Subscribe
diff --git a/web/app/pages/Subscribe/index.tsx b/web/app/pages/Subscribe/index.tsx
new file mode 100644
index 000000000..8ec6f9768
--- /dev/null
+++ b/web/app/pages/Subscribe/index.tsx
@@ -0,0 +1 @@
+export { default } from './Subscribe'
diff --git a/web/app/routes/dashboard.tsx b/web/app/routes/dashboard.tsx
index 8764222ea..2bf486e84 100644
--- a/web/app/routes/dashboard.tsx
+++ b/web/app/routes/dashboard.tsx
@@ -215,11 +215,11 @@ export async function loader({ request }: LoaderFunctionArgs) {
!user?.dashboardBlockReason
) {
if (authCookies.length > 0) {
- return redirect('/checkout', {
+ return redirect('/subscribe', {
headers: createHeadersWithCookies(authCookies),
})
}
- return redirect('/checkout')
+ return redirect('/subscribe')
}
const url = new URL(request.url)
diff --git a/web/app/routes/checkout.tsx b/web/app/routes/subscribe.tsx
similarity index 91%
rename from web/app/routes/checkout.tsx
rename to web/app/routes/subscribe.tsx
index ed3f6d8a9..1b9ac5364 100644
--- a/web/app/routes/checkout.tsx
+++ b/web/app/routes/subscribe.tsx
@@ -6,7 +6,7 @@ import type { SitemapFunction } from 'remix-sitemap'
import { getAuthenticatedUser, serverFetch } from '~/api/api.server'
import { isSelfhosted } from '~/lib/constants'
import { DEFAULT_METAINFO, Metainfo } from '~/lib/models/Metainfo'
-import Checkout from '~/pages/Checkout'
+import Subscribe from '~/pages/Subscribe'
import { getDescription, getPreviewImage, getTitle } from '~/utils/seo'
import {
redirectIfNotAuthenticated,
@@ -28,7 +28,7 @@ export const meta: MetaFunction = () => {
]
}
-export interface CheckoutLoaderData {
+export interface SubscribeLoaderData {
metainfo: Metainfo
}
@@ -69,7 +69,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
const metainfo = metainfoResult.data ?? DEFAULT_METAINFO
const allCookies = [...cookies, ...metainfoResult.cookies]
- const loaderData: CheckoutLoaderData = { metainfo }
+ const loaderData: SubscribeLoaderData = { metainfo }
if (allCookies.length > 0) {
return data(loaderData, {
@@ -80,6 +80,6 @@ export async function loader({ request }: LoaderFunctionArgs) {
return loaderData
}
-export default function CheckoutRoute() {
- return <Checkout />
+export default function SubscribeRoute() {
+ return <Subscribe />
}
diff --git a/web/app/utils/routes.ts b/web/app/utils/routes.ts
index 70deb8fd1..9a111d1d6 100644
--- a/web/app/utils/routes.ts
+++ b/web/app/utils/routes.ts
@@ -6,7 +6,7 @@ const routes = Object.freeze({
captchaLanding: '/captcha',
captchaDemo: '/captcha/demo',
onboarding: '/onboarding',
- checkout: '/checkout',
+ subscribe: '/subscribe',
reset_password: '/recovery',
new_password_form: '/password-reset/:id',
confirm_share: '/share/:id',