feat: add subscription management to settings panel #2868
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,7 +57,7 @@ export async function devLogin() { | |
|
|
||
| if (error) { | ||
| console.error('Error signing in with password:', error); | ||
| throw new Error(error.message); | ||
| } | ||
| redirect(Routes.AUTH_REDIRECT); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ import { getInitials } from '@onlook/utility'; | |
| import { usePathname, useRouter, useSearchParams } from 'next/navigation'; | ||
| import { useState } from 'react'; | ||
| import { UsageSection } from './plans'; | ||
| import { SettingsTabValue } from '../settings-modal/helpers'; | ||
|
|
||
| export const CurrentUserAvatar = ({ className }: { className?: string }) => { | ||
| const stateManager = useStateManager(); | ||
|
|
@@ -40,11 +41,13 @@ export const CurrentUserAvatar = ({ className }: { className?: string }) => { | |
| }; | ||
|
|
||
| const handleOpenSubscription = () => { | ||
| stateManager.settingsTab = SettingsTabValue.SUBSCRIPTION; | ||
| stateManager.isSettingsModalOpen = true; | ||
| setOpen(false); | ||
| }; | ||
|
|
||
| const handleOpenSettings = () => { | ||
| stateManager.settingsTab = SettingsTabValue.PREFERENCES; | ||
| stateManager.isSettingsModalOpen = true; | ||
| setOpen(false); | ||
| }; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,8 @@ | ||
| export enum SettingsTabValue { | ||
| DOMAIN = 'domain', | ||
| PROJECT = 'project', | ||
| PREFERENCES = 'account', | ||
| SUBSCRIPTION = 'subscription', | ||
| VERSIONS = 'versions', | ||
| ADVANCED = 'advanced', | ||
| SITE = 'site', | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ import { AnimatePresence, motion } from 'framer-motion'; | |
| import { observer } from 'mobx-react-lite'; | ||
| import { SettingsTabValue, type SettingTab } from './helpers'; | ||
| import { PreferencesTab } from './preferences-tab'; | ||
| import { SubscriptionTab } from './subscription-tab'; | ||
|
|
||
| export const NonProjectSettingsModal = observer(() => { | ||
| const stateManager = useStateManager(); | ||
|
|
@@ -18,6 +19,11 @@ export const NonProjectSettingsModal = observer(() => { | |
| icon: <Icons.Person className="mr-2 h-4 w-4" />, | ||
| component: <PreferencesTab />, | ||
| }, | ||
| { | ||
| label: SettingsTabValue.SUBSCRIPTION, | ||
| icon: <Icons.CreditCard className="mr-2 h-4 w-4" />, | ||
| component: <SubscriptionTab />, | ||
| }, | ||
| ] | ||
|
|
||
| return ( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,122 +1,10 @@ | ||
| import { observer } from 'mobx-react-lite'; | ||
| import { UserDeleteSection } from './user-delete-section'; | ||
|
|
||
| export const PreferencesTab = observer(() => { | ||
|
There was a problem hiding this comment. 🧩 Analysis chainConfirm client boundary exists for this tab tRPC React hooks (and MobX observer if retained) require a client component boundary above. Verify the parent settings modal or entry file has 'use client'. Run: 🏁 Script executed: #!/bin/bash
# Verify a client boundary exists in settings modal tree
rg -n --type=ts,tsx -C1 $'^[ \t]*[\'"]use client[\'"]' apps/web/client/src/components/ui/settings-modal
# Also check modal entry points mentioned in the PR
rg -n --type=ts,tsx -C1 $'^[ \t]*[\'"]use client[\'"]' apps/web/client/src/components/ui/settings-modal/{non-project.tsx,with-project.tsx} 2>/dev/null || trueLength of output: 30 🏁 Script executed: #!/bin/bash
# Verify client boundary exists in settings modal tree (search for 'use client' in ts/tsx)
dir="apps/web/client/src/components/ui/settings-modal"
echo "Checking directory: $dir"
if [ ! -d "$dir" ]; then
echo "DIR_NOT_FOUND"
exit 0
fi
echo "Listing files in $dir"
ls -la "$dir"
echo "Searching for 'use client' in .ts/.tsx under $dir"
grep -nR --include='*.tsx' --include='*.ts' -E "^\s*['\"]use client['\"]" "$dir" -n -H -C1 || true
echo "Also checking specific entry files (non-project.tsx, with-project.tsx)"
for f in non-project.tsx with-project.tsx; do
p="$dir/$f"
if [ -f "$p" ]; then
echo "---- $p (first 120 lines) ----"
sed -n '1,120p' "$p"
echo "grep result:"
grep -nE "^\s*['\"]use client['\"]" "$p" || true
else
echo "MISSING: $p"
fi
doneLength of output: 11899 Add 'use client' to the settings modal entry components PreferencesTab is a MobX observer (and may use tRPC hooks); the modal entry files lack a client boundary—add a top-line "use client" to one of these entry components (or otherwise ensure a higher client boundary):
🤖 Prompt for AI Agents |
||
| return ( | ||
| <div className="flex flex-col gap-8 p-6"> | ||
| <UserDeleteSection /> | ||
| </div> | ||
| ); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| 'use client'; | ||
|
|
||
| import { Button } from '@onlook/ui/button'; | ||
| import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@onlook/ui/dialog'; | ||
|
|
||
| interface SubscriptionCancelModalProps { | ||
| open: boolean; | ||
| onOpenChange: (open: boolean) => void; | ||
| onConfirmCancel: () => void; | ||
| } | ||
|
|
||
| export const SubscriptionCancelModal = ({ open, onOpenChange, onConfirmCancel }: SubscriptionCancelModalProps) => { | ||
| return ( | ||
| <Dialog open={open} onOpenChange={onOpenChange}> | ||
| <DialogContent className="max-w-md"> | ||
| <DialogHeader> | ||
| <DialogTitle>Cancel Subscription</DialogTitle> | ||
| <DialogDescription className="pt-2"> | ||
| Are you sure you want to cancel your subscription? You'll lose access to all premium features at the end of your current billing period. | ||
| </DialogDescription> | ||
| </DialogHeader> | ||
| <DialogFooter className="flex-col sm:flex-row gap-3 sm:gap-2"> | ||
| <Button | ||
| variant="outline" | ||
| onClick={() => onOpenChange(false)} | ||
| className="order-2 sm:order-1" | ||
| > | ||
| Keep Subscription | ||
| </Button> | ||
| <Button | ||
| variant="outline" | ||
| onClick={onConfirmCancel} | ||
| className="order-1 sm:order-2 text-red-200 hover:text-red-100 hover:bg-red-500/10 border-red-200 hover:border-red-100" | ||
| > | ||
| Cancel Subscription | ||
| </Button> | ||
| </DialogFooter> | ||
| </DialogContent> | ||
| </Dialog> | ||
| ); | ||
| }; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider using a generic error message instead of 'Error signing in with password' since this flow may not always involve a password (e.g., OAuth).