Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/platform/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ export default withAuth(
);

export const config = {
matcher: ['/user/:path*', '/org/:path*', '/org-invite'],
matcher: ['/user/:path*', '/org/:path*'],
};
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@ export const metadata: Metadata = {
const RequestOrganizationLayout = ({
children,
}: RequestOrganizationLayoutProps) => {
return <MainLayout showSidebar={false}>{children}</MainLayout>;
return (
<MainLayout
showSidebar={false}
showHeaderAuthControlsOnlyWhenAuthenticated={true}
>
{children}
</MainLayout>
);
};

export default RequestOrganizationLayout;
34 changes: 27 additions & 7 deletions src/platform/src/app/(dashboard)/system/feedback/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,18 +161,22 @@ const FeedbackListContent: React.FC = () => {
{
key: 'subject',
label: 'Subject',
minWidth: '240px',
maxWidth: '360px',
render: (_value: unknown, item: FeedbackRow) => (
<div className="space-y-1">
<p className="font-medium text-foreground">{item.subject}</p>
<p className="max-w-xl text-sm text-muted-foreground line-clamp-2">
{item.message}
</p>
</div>
<p
className="font-medium text-foreground truncate"
title={item.subject}
>
{item.subject}
</p>
),
},
{
key: 'category',
label: 'Category',
minWidth: '140px',
cellClassName: 'whitespace-nowrap',
render: (value: unknown) => (
<span className="inline-flex rounded-full bg-muted px-2.5 py-1 text-xs font-medium capitalize text-foreground">
{CATEGORY_LABELS[String(value)] || String(value)}
Expand All @@ -182,6 +186,8 @@ const FeedbackListContent: React.FC = () => {
{
key: 'status',
label: 'Status',
minWidth: '120px',
cellClassName: 'whitespace-nowrap',
render: (value: unknown) => (
<span
className={`inline-flex rounded-full px-2.5 py-1 text-xs font-medium capitalize ${
Expand All @@ -195,6 +201,8 @@ const FeedbackListContent: React.FC = () => {
{
key: 'rating',
label: 'Rating',
minWidth: '90px',
cellClassName: 'whitespace-nowrap',
render: (value: unknown) => (
<span className="text-sm font-medium text-foreground">
{value as number}/5
Expand All @@ -204,13 +212,23 @@ const FeedbackListContent: React.FC = () => {
{
key: 'email',
label: 'Email',
minWidth: '220px',
maxWidth: '280px',
cellClassName: 'whitespace-nowrap',
render: (value: unknown) => (
<span className="text-sm text-muted-foreground">{String(value)}</span>
<span
className="block truncate text-sm text-muted-foreground"
title={String(value)}
>
{String(value)}
</span>
),
},
{
key: 'createdAt',
label: 'Submitted',
minWidth: '190px',
cellClassName: 'whitespace-nowrap',
render: (value: unknown) => (
<span className="text-sm text-muted-foreground">
{formatDateTime(String(value))}
Expand All @@ -220,6 +238,8 @@ const FeedbackListContent: React.FC = () => {
{
key: 'actions',
label: 'Actions',
minWidth: '96px',
cellClassName: 'whitespace-nowrap',
render: (_value: unknown, item: FeedbackRow) => (
<Button
variant="ghost"
Expand Down
8 changes: 4 additions & 4 deletions src/platform/src/modules/billing/BillingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ const BillingPage: React.FC = () => {
return {
className:
'border-emerald-300 bg-emerald-50 dark:border-emerald-700 dark:bg-emerald-950/30 text-emerald-800 dark:text-emerald-200',
text: 'Payment completed. Your subscription details are syncing now.',
text: 'Checkout completed. Your subscription details are updating now.',
};
}

if (checkoutState === 'cancel') {
return {
className:
'border-amber-300 bg-amber-50 dark:border-amber-700 dark:bg-amber-950/30 text-amber-800 dark:text-amber-200',
text: 'Checkout was canceled. You can resume anytime from this page.',
text: 'Checkout was closed before confirmation. You can restart whenever you are ready.',
};
}

Expand All @@ -43,10 +43,10 @@ const BillingPage: React.FC = () => {
<div className="space-y-6">
<div>
<h2 className="text-2xl font-semibold text-gray-900 dark:text-white">
Subscription & Access
API Subscription & Billing
</h2>
<p className="text-sm text-gray-600 dark:text-gray-400 mt-1">
Manage your API tier, renewal preferences, and billing transactions.
Review your current plan, renewal settings, and billing activity.
</p>
</div>

Expand Down
15 changes: 8 additions & 7 deletions src/platform/src/modules/billing/components/CheckoutDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ const CheckoutDialog: React.FC<CheckoutDialogProps> = ({
<ReusableDialog
isOpen={isOpen}
onClose={onClose}
title="Continue To Secure Checkout"
title="Review plan change"
subtitle={
plan
? `${plan.name} · $${plan.price}/${billingCycleLabel}`
: 'Select a subscription plan'
? `${plan.name} · ${plan.currency} ${plan.price}/${billingCycleLabel}`
: 'Select an API subscription plan'
}
primaryAction={{
label: loading ? 'Opening...' : 'Open Checkout',
Expand All @@ -51,8 +51,9 @@ const CheckoutDialog: React.FC<CheckoutDialogProps> = ({
<div className="space-y-4">
<div className="rounded-lg border border-primary/20 bg-primary/5 p-4">
<p className="text-sm text-gray-700 dark:text-gray-200">
Payments are handled in a secure checkout overlay. No card number or
CVV is collected in this application.
Checkout opens in our secure billing window. Payment details are
handled by our billing provider and are never stored in this
application.
</p>
</div>

Expand All @@ -67,7 +68,7 @@ const CheckoutDialog: React.FC<CheckoutDialogProps> = ({
</div>
<div className="rounded-lg border border-gray-200 dark:border-gray-700 p-3">
<p className="text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400">
Selected Plan
Plan To Activate
</p>
<p className="mt-1 text-sm font-medium text-gray-900 dark:text-gray-100">
{plan?.name || '--'}
Expand All @@ -78,7 +79,7 @@ const CheckoutDialog: React.FC<CheckoutDialogProps> = ({
{plan && (
<div className="rounded-lg border border-gray-200 dark:border-gray-700 p-4">
<p className="text-sm font-medium text-gray-900 dark:text-gray-100 mb-3">
Included with {plan.name}
Plan highlights
</p>
<ul className="space-y-2">
{plan.features.slice(0, 4).map(feature => (
Expand Down
Loading
Loading