feat: multi-subscription frontend support

- Add SubscriptionListItem and SubscriptionsListResponse types
- Add getSubscriptions/getSubscriptionById API methods
- Add optional subscriptionId parameter to all 30+ API methods
- Create /subscriptions page with subscription list cards
- Add /subscription/:subscriptionId route for per-subscription management
- Dashboard: show multi-tariff navigation block when user has 2+ subscriptions
- Subscription page: read subscriptionId from URL params, pass to all queries
- SubscriptionPurchase: accept subscriptionId from query params
- SubscriptionCardExpired: pass subscription.id to API calls
- Full backward compatibility: without subscriptionId, works as before
This commit is contained in:
c0mrade
2026-03-19 19:26:42 +03:00
parent 84bded7974
commit 820ba46cc4
8 changed files with 562 additions and 173 deletions

View File

@@ -26,6 +26,7 @@ import OAuthCallback from './pages/OAuthCallback';
import Dashboard from './pages/Dashboard'; import Dashboard from './pages/Dashboard';
// User pages - lazy load // User pages - lazy load
const Subscriptions = lazy(() => import('./pages/Subscriptions'));
const Subscription = lazy(() => import('./pages/Subscription')); const Subscription = lazy(() => import('./pages/Subscription'));
const SubscriptionPurchase = lazy(() => import('./pages/SubscriptionPurchase')); const SubscriptionPurchase = lazy(() => import('./pages/SubscriptionPurchase'));
const Balance = lazy(() => import('./pages/Balance')); const Balance = lazy(() => import('./pages/Balance'));
@@ -257,6 +258,26 @@ function App() {
</ProtectedRoute> </ProtectedRoute>
} }
/> />
<Route
path="/subscriptions"
element={
<ProtectedRoute>
<LazyPage>
<Subscriptions />
</LazyPage>
</ProtectedRoute>
}
/>
<Route
path="/subscription/:subscriptionId"
element={
<ProtectedRoute>
<LazyPage>
<Subscription />
</LazyPage>
</ProtectedRoute>
}
/>
<Route <Route
path="/subscription" path="/subscription"
element={ element={

View File

@@ -2,6 +2,8 @@ import apiClient from './client';
import type { import type {
Subscription, Subscription,
SubscriptionStatusResponse, SubscriptionStatusResponse,
SubscriptionListItem,
SubscriptionsListResponse,
RenewalOption, RenewalOption,
TrafficPackage, TrafficPackage,
TrialInfo, TrialInfo,
@@ -11,50 +13,150 @@ import type {
AppConfig, AppConfig,
} from '../types'; } from '../types';
/** Helper: build query params with optional subscription_id */
const withSubId = (subscriptionId?: number, extra?: Record<string, unknown>) => ({
params: {
...(subscriptionId != null && { subscription_id: subscriptionId }),
...extra,
},
});
/** Helper: merge subscription_id into request body */
const bodyWithSubId = (body: Record<string, unknown>, subscriptionId?: number) => ({
...body,
...(subscriptionId != null && { subscription_id: subscriptionId }),
});
export const subscriptionApi = { export const subscriptionApi = {
getSubscription: async (): Promise<SubscriptionStatusResponse> => { // ── Multi-tariff endpoints ──────────────────────────────────────────
const response = await apiClient.get<SubscriptionStatusResponse>('/cabinet/subscription');
getSubscriptions: async (): Promise<SubscriptionsListResponse> => {
const response = await apiClient.get<SubscriptionsListResponse>('/cabinet/subscriptions');
return response.data; return response.data;
}, },
getRenewalOptions: async (): Promise<RenewalOption[]> => { getSubscriptionById: async (subscriptionId: number): Promise<SubscriptionListItem> => {
const response = await apiClient.get<RenewalOption[]>('/cabinet/subscription/renewal-options'); const response = await apiClient.get<SubscriptionListItem>(
`/cabinet/subscriptions/${subscriptionId}`,
);
return response.data;
},
// ── Legacy single-subscription status ───────────────────────────────
getSubscription: async (subscriptionId?: number): Promise<SubscriptionStatusResponse> => {
const response = await apiClient.get<SubscriptionStatusResponse>(
'/cabinet/subscription',
withSubId(subscriptionId),
);
return response.data;
},
// ── Renewal ─────────────────────────────────────────────────────────
getRenewalOptions: async (subscriptionId?: number): Promise<RenewalOption[]> => {
const response = await apiClient.get<RenewalOption[]>(
'/cabinet/subscription/renewal-options',
withSubId(subscriptionId),
);
return response.data; return response.data;
}, },
renewSubscription: async ( renewSubscription: async (
periodDays: number, periodDays: number,
subscriptionId?: number,
): Promise<{ ): Promise<{
message: string; message: string;
new_end_date: string; new_end_date: string;
amount_paid_kopeks: number; amount_paid_kopeks: number;
}> => { }> => {
const response = await apiClient.post('/cabinet/subscription/renew', { const response = await apiClient.post(
period_days: periodDays, '/cabinet/subscription/renew',
}); bodyWithSubId({ period_days: periodDays }, subscriptionId),
);
return response.data; return response.data;
}, },
getTrafficPackages: async (): Promise<TrafficPackage[]> => { // ── Traffic ─────────────────────────────────────────────────────────
getTrafficPackages: async (subscriptionId?: number): Promise<TrafficPackage[]> => {
const response = await apiClient.get<TrafficPackage[]>( const response = await apiClient.get<TrafficPackage[]>(
'/cabinet/subscription/traffic-packages', '/cabinet/subscription/traffic-packages',
withSubId(subscriptionId),
); );
return response.data; return response.data;
}, },
purchaseTraffic: async ( purchaseTraffic: async (
gb: number, gb: number,
subscriptionId?: number,
): Promise<{ ): Promise<{
message: string; message: string;
gb_added: number; gb_added: number;
amount_paid_kopeks: number; amount_paid_kopeks: number;
}> => { }> => {
const response = await apiClient.post('/cabinet/subscription/traffic', { gb }); const response = await apiClient.post(
'/cabinet/subscription/traffic',
bodyWithSubId({ gb }, subscriptionId),
);
return response.data; return response.data;
}, },
switchTraffic: async (
gb: number,
subscriptionId?: number,
): Promise<{
success: boolean;
message: string;
old_traffic_gb: number;
new_traffic_gb: number;
charged_kopeks: number;
balance_kopeks: number;
balance_label: string;
}> => {
const response = await apiClient.put(
'/cabinet/subscription/traffic',
bodyWithSubId({ gb }, subscriptionId),
);
return response.data;
},
saveTrafficCart: async (trafficGb: number, subscriptionId?: number): Promise<void> => {
await apiClient.post(
'/cabinet/subscription/traffic/save-cart',
bodyWithSubId({ gb: trafficGb }, subscriptionId),
);
},
refreshTraffic: async (
subscriptionId?: number,
): Promise<{
success: boolean;
cached: boolean;
rate_limited?: boolean;
retry_after_seconds?: number;
source?: string;
traffic_used_bytes: number;
traffic_used_gb: number;
traffic_limit_bytes: number;
traffic_limit_gb: number;
traffic_used_percent: number;
is_unlimited: boolean;
lifetime_used_bytes?: number;
lifetime_used_gb?: number;
}> => {
const response = await apiClient.post(
'/cabinet/subscription/refresh-traffic',
subscriptionId != null ? { subscription_id: subscriptionId } : undefined,
);
return response.data;
},
// ── Devices ─────────────────────────────────────────────────────────
purchaseDevices: async ( purchaseDevices: async (
devices: number, devices: number,
subscriptionId?: number,
): Promise<{ ): Promise<{
success: boolean; success: boolean;
message: string; message: string;
@@ -65,12 +167,16 @@ export const subscriptionApi = {
balance_kopeks: number; balance_kopeks: number;
balance_label: string; balance_label: string;
}> => { }> => {
const response = await apiClient.post('/cabinet/subscription/devices/purchase', { devices }); const response = await apiClient.post(
'/cabinet/subscription/devices/purchase',
bodyWithSubId({ devices }, subscriptionId),
);
return response.data; return response.data;
}, },
getDevicePrice: async ( getDevicePrice: async (
devices: number = 1, devices: number = 1,
subscriptionId?: number,
): Promise<{ ): Promise<{
available: boolean; available: boolean;
reason?: string; reason?: string;
@@ -84,23 +190,30 @@ export const subscriptionApi = {
can_add?: number; can_add?: number;
days_left?: number; days_left?: number;
base_device_price_kopeks?: number; base_device_price_kopeks?: number;
// Discount fields (from promo group)
original_price_per_device_kopeks?: number; original_price_per_device_kopeks?: number;
base_total_price_kopeks?: number; base_total_price_kopeks?: number;
discount_percent?: number; discount_percent?: number;
discount_kopeks?: number; discount_kopeks?: number;
}> => { }> => {
const response = await apiClient.get('/cabinet/subscription/devices/price', { const response = await apiClient.get('/cabinet/subscription/devices/price', {
params: { devices }, params: {
devices,
...(subscriptionId != null && { subscription_id: subscriptionId }),
},
}); });
return response.data; return response.data;
}, },
saveDevicesCart: async (devices: number): Promise<void> => { saveDevicesCart: async (devices: number, subscriptionId?: number): Promise<void> => {
await apiClient.post('/cabinet/subscription/devices/save-cart', { devices }); await apiClient.post(
'/cabinet/subscription/devices/save-cart',
bodyWithSubId({ devices }, subscriptionId),
);
}, },
getDeviceReductionInfo: async (): Promise<{ getDeviceReductionInfo: async (
subscriptionId?: number,
): Promise<{
available: boolean; available: boolean;
reason?: string; reason?: string;
current_device_limit: number; current_device_limit: number;
@@ -108,43 +221,97 @@ export const subscriptionApi = {
can_reduce: number; can_reduce: number;
connected_devices_count: number; connected_devices_count: number;
}> => { }> => {
const response = await apiClient.get('/cabinet/subscription/devices/reduction-info'); const response = await apiClient.get(
'/cabinet/subscription/devices/reduction-info',
withSubId(subscriptionId),
);
return response.data; return response.data;
}, },
reduceDevices: async ( reduceDevices: async (
newDeviceLimit: number, newDeviceLimit: number,
subscriptionId?: number,
): Promise<{ ): Promise<{
success: boolean; success: boolean;
message: string; message: string;
old_device_limit: number; old_device_limit: number;
new_device_limit: number; new_device_limit: number;
}> => { }> => {
const response = await apiClient.post('/cabinet/subscription/devices/reduce', { const response = await apiClient.post(
new_device_limit: newDeviceLimit, '/cabinet/subscription/devices/reduce',
}); bodyWithSubId({ new_device_limit: newDeviceLimit }, subscriptionId),
);
return response.data; return response.data;
}, },
saveTrafficCart: async (trafficGb: number): Promise<void> => { getDevices: async (
await apiClient.post('/cabinet/subscription/traffic/save-cart', { gb: trafficGb }); subscriptionId?: number,
): Promise<{
devices: Array<{
hwid: string;
platform: string;
device_model: string;
created_at: string | null;
}>;
total: number;
device_limit: number;
}> => {
const response = await apiClient.get(
'/cabinet/subscription/devices',
withSubId(subscriptionId),
);
return response.data;
}, },
deleteDevice: async (
hwid: string,
subscriptionId?: number,
): Promise<{
success: boolean;
message: string;
deleted_hwid: string;
}> => {
const response = await apiClient.delete(
`/cabinet/subscription/devices/${encodeURIComponent(hwid)}`,
withSubId(subscriptionId),
);
return response.data;
},
deleteAllDevices: async (
subscriptionId?: number,
): Promise<{
success: boolean;
message: string;
deleted_count: number;
}> => {
const response = await apiClient.delete(
'/cabinet/subscription/devices',
withSubId(subscriptionId),
);
return response.data;
},
// ── Autopay ─────────────────────────────────────────────────────────
updateAutopay: async ( updateAutopay: async (
enabled: boolean, enabled: boolean,
daysBefore?: number, daysBefore?: number,
subscriptionId?: number,
): Promise<{ ): Promise<{
message: string; message: string;
autopay_enabled: boolean; autopay_enabled: boolean;
autopay_days_before: number; autopay_days_before: number;
}> => { }> => {
const response = await apiClient.patch('/cabinet/subscription/autopay', { const response = await apiClient.patch(
enabled, '/cabinet/subscription/autopay',
days_before: daysBefore, bodyWithSubId({ enabled, days_before: daysBefore }, subscriptionId),
}); );
return response.data; return response.data;
}, },
// ── Trial ───────────────────────────────────────────────────────────
getTrialInfo: async (): Promise<TrialInfo> => { getTrialInfo: async (): Promise<TrialInfo> => {
const response = await apiClient.get<TrialInfo>('/cabinet/subscription/trial'); const response = await apiClient.get<TrialInfo>('/cabinet/subscription/trial');
return response.data; return response.data;
@@ -155,32 +322,40 @@ export const subscriptionApi = {
return response.data; return response.data;
}, },
getPurchaseOptions: async (): Promise<PurchaseOptions> => { // ── Purchase ────────────────────────────────────────────────────────
const response = await apiClient.get<PurchaseOptions>('/cabinet/subscription/purchase-options');
getPurchaseOptions: async (subscriptionId?: number): Promise<PurchaseOptions> => {
const response = await apiClient.get<PurchaseOptions>(
'/cabinet/subscription/purchase-options',
withSubId(subscriptionId),
);
return response.data; return response.data;
}, },
previewPurchase: async (selection: PurchaseSelection): Promise<PurchasePreview> => { previewPurchase: async (
selection: PurchaseSelection,
subscriptionId?: number,
): Promise<PurchasePreview> => {
const response = await apiClient.post<PurchasePreview>( const response = await apiClient.post<PurchasePreview>(
'/cabinet/subscription/purchase-preview', '/cabinet/subscription/purchase-preview',
{ bodyWithSubId({ selection }, subscriptionId),
selection,
},
); );
return response.data; return response.data;
}, },
submitPurchase: async ( submitPurchase: async (
selection: PurchaseSelection, selection: PurchaseSelection,
subscriptionId?: number,
): Promise<{ ): Promise<{
success: boolean; success: boolean;
message: string; message: string;
subscription: Subscription; subscription: Subscription;
was_trial_conversion: boolean; was_trial_conversion: boolean;
}> => { }> => {
const response = await apiClient.post('/cabinet/subscription/purchase', { const response = await apiClient.post(
selection, '/cabinet/subscription/purchase',
}); bodyWithSubId({ selection }, subscriptionId),
);
return response.data; return response.data;
}, },
@@ -205,12 +380,11 @@ export const subscriptionApi = {
return response.data; return response.data;
}, },
getAppConfig: async (): Promise<AppConfig> => { // ── Countries / Servers ─────────────────────────────────────────────
const response = await apiClient.get<AppConfig>('/cabinet/subscription/app-config');
return response.data;
},
getCountries: async (): Promise<{ getCountries: async (
subscriptionId?: number,
): Promise<{
countries: Array<{ countries: Array<{
uuid: string; uuid: string;
name: string; name: string;
@@ -229,12 +403,16 @@ export const subscriptionApi = {
days_left: number; days_left: number;
discount_percent: number; discount_percent: number;
}> => { }> => {
const response = await apiClient.get('/cabinet/subscription/countries'); const response = await apiClient.get(
'/cabinet/subscription/countries',
withSubId(subscriptionId),
);
return response.data; return response.data;
}, },
updateCountries: async ( updateCountries: async (
countries: string[], countries: string[],
subscriptionId?: number,
): Promise<{ ): Promise<{
message: string; message: string;
added: string[]; added: string[];
@@ -242,11 +420,18 @@ export const subscriptionApi = {
amount_paid_kopeks: number; amount_paid_kopeks: number;
connected_squads: string[]; connected_squads: string[];
}> => { }> => {
const response = await apiClient.post('/cabinet/subscription/countries', { countries }); const response = await apiClient.post(
'/cabinet/subscription/countries',
bodyWithSubId({ countries }, subscriptionId),
);
return response.data; return response.data;
}, },
getConnectionLink: async (): Promise<{ // ── Connection ──────────────────────────────────────────────────────
getConnectionLink: async (
subscriptionId?: number,
): Promise<{
subscription_url: string | null; subscription_url: string | null;
display_link: string | null; display_link: string | null;
happ_redirect_link: string | null; happ_redirect_link: string | null;
@@ -257,7 +442,10 @@ export const subscriptionApi = {
steps: string[]; steps: string[];
}; };
}> => { }> => {
const response = await apiClient.get('/cabinet/subscription/connection-link'); const response = await apiClient.get(
'/cabinet/subscription/connection-link',
withSubId(subscriptionId),
);
return response.data; return response.data;
}, },
@@ -276,44 +464,19 @@ export const subscriptionApi = {
return response.data; return response.data;
}, },
getDevices: async (): Promise<{ getAppConfig: async (subscriptionId?: number): Promise<AppConfig> => {
devices: Array<{ const response = await apiClient.get<AppConfig>(
hwid: string; '/cabinet/subscription/app-config',
platform: string; withSubId(subscriptionId),
device_model: string;
created_at: string | null;
}>;
total: number;
device_limit: number;
}> => {
const response = await apiClient.get('/cabinet/subscription/devices');
return response.data;
},
deleteDevice: async (
hwid: string,
): Promise<{
success: boolean;
message: string;
deleted_hwid: string;
}> => {
const response = await apiClient.delete(
`/cabinet/subscription/devices/${encodeURIComponent(hwid)}`,
); );
return response.data; return response.data;
}, },
deleteAllDevices: async (): Promise<{ // ── Tariff switch ───────────────────────────────────────────────────
success: boolean;
message: string;
deleted_count: number;
}> => {
const response = await apiClient.delete('/cabinet/subscription/devices');
return response.data;
},
previewTariffSwitch: async ( previewTariffSwitch: async (
tariffId: number, tariffId: number,
subscriptionId?: number,
): Promise<{ ): Promise<{
can_switch: boolean; can_switch: boolean;
current_tariff_id: number | null; current_tariff_id: number | null;
@@ -329,20 +492,20 @@ export const subscriptionApi = {
missing_amount_kopeks: number; missing_amount_kopeks: number;
missing_amount_label: string; missing_amount_label: string;
is_upgrade: boolean; is_upgrade: boolean;
// Discount fields (from promo group)
base_upgrade_cost_kopeks?: number; base_upgrade_cost_kopeks?: number;
discount_percent?: number; discount_percent?: number;
discount_kopeks?: number; discount_kopeks?: number;
}> => { }> => {
const response = await apiClient.post('/cabinet/subscription/tariff/switch/preview', { const response = await apiClient.post(
tariff_id: tariffId, '/cabinet/subscription/tariff/switch/preview',
period_days: 30, // Default period for switch bodyWithSubId({ tariff_id: tariffId, period_days: 30 }, subscriptionId),
}); );
return response.data; return response.data;
}, },
switchTariff: async ( switchTariff: async (
tariffId: number, tariffId: number,
subscriptionId?: number,
): Promise<{ ): Promise<{
success: boolean; success: boolean;
message: string; message: string;
@@ -354,56 +517,28 @@ export const subscriptionApi = {
balance_kopeks: number; balance_kopeks: number;
balance_label: string; balance_label: string;
}> => { }> => {
const response = await apiClient.post('/cabinet/subscription/tariff/switch', { const response = await apiClient.post(
tariff_id: tariffId, '/cabinet/subscription/tariff/switch',
period_days: 30, bodyWithSubId({ tariff_id: tariffId, period_days: 30 }, subscriptionId),
}); );
return response.data; return response.data;
}, },
togglePause: async (): Promise<{ // ── Daily subscription ──────────────────────────────────────────────
togglePause: async (
subscriptionId?: number,
): Promise<{
success: boolean; success: boolean;
message: string; message: string;
is_paused: boolean; is_paused: boolean;
balance_kopeks: number; balance_kopeks: number;
balance_label: string; balance_label: string;
}> => { }> => {
const response = await apiClient.post('/cabinet/subscription/pause'); const response = await apiClient.post(
return response.data; '/cabinet/subscription/pause',
}, subscriptionId != null ? { subscription_id: subscriptionId } : undefined,
);
switchTraffic: async (
gb: number,
): Promise<{
success: boolean;
message: string;
old_traffic_gb: number;
new_traffic_gb: number;
charged_kopeks: number;
balance_kopeks: number;
balance_label: string;
}> => {
const response = await apiClient.put('/cabinet/subscription/traffic', { gb });
return response.data;
},
// Refresh traffic usage from RemnaWave (rate limited: 1 per 60 seconds)
refreshTraffic: async (): Promise<{
success: boolean;
cached: boolean;
rate_limited?: boolean;
retry_after_seconds?: number;
source?: string;
traffic_used_bytes: number;
traffic_used_gb: number;
traffic_limit_bytes: number;
traffic_limit_gb: number;
traffic_used_percent: number;
is_unlimited: boolean;
lifetime_used_bytes?: number;
lifetime_used_gb?: number;
}> => {
const response = await apiClient.post('/cabinet/subscription/refresh-traffic');
return response.data; return response.data;
}, },
}; };

View File

@@ -57,12 +57,12 @@ export default function SubscriptionCardExpired({
try { try {
if (isDisabledDaily) { if (isDisabledDaily) {
// Resume daily subscription via toggle pause endpoint // Resume daily subscription via toggle pause endpoint
await subscriptionApi.togglePause(); await subscriptionApi.togglePause(subscription.id);
} else if (isDaily && subscription.tariff_id) { } else if (isDaily && subscription.tariff_id) {
// Expired daily tariff — purchase for 1 day // Expired daily tariff — purchase for 1 day
await subscriptionApi.purchaseTariff(subscription.tariff_id, 1); await subscriptionApi.purchaseTariff(subscription.tariff_id, 1);
} else { } else {
await subscriptionApi.renewSubscription(30); await subscriptionApi.renewSubscription(30, subscription.id);
} }
haptic.success(); haptic.success();
queryClient.invalidateQueries({ queryKey: ['subscription'] }); queryClient.invalidateQueries({ queryKey: ['subscription'] });

View File

@@ -51,7 +51,7 @@ export default function Dashboard() {
const { data: subscriptionResponse, isLoading: subLoading } = useQuery({ const { data: subscriptionResponse, isLoading: subLoading } = useQuery({
queryKey: ['subscription'], queryKey: ['subscription'],
queryFn: subscriptionApi.getSubscription, queryFn: () => subscriptionApi.getSubscription(),
retry: false, retry: false,
staleTime: API.BALANCE_STALE_TIME_MS, staleTime: API.BALANCE_STALE_TIME_MS,
refetchOnMount: 'always', refetchOnMount: 'always',
@@ -59,15 +59,24 @@ export default function Dashboard() {
const subscription = subscriptionResponse?.subscription ?? null; const subscription = subscriptionResponse?.subscription ?? null;
// Multi-tariff: check if user has multiple subscriptions
const { data: multiSubData } = useQuery({
queryKey: ['subscriptions-list'],
queryFn: () => subscriptionApi.getSubscriptions(),
staleTime: 60_000,
});
const isMultiTariff = multiSubData?.multi_tariff_enabled ?? false;
const multiSubCount = multiSubData?.subscriptions?.length ?? 0;
const { data: trialInfo, isLoading: trialLoading } = useQuery({ const { data: trialInfo, isLoading: trialLoading } = useQuery({
queryKey: ['trial-info'], queryKey: ['trial-info'],
queryFn: subscriptionApi.getTrialInfo, queryFn: () => subscriptionApi.getTrialInfo(),
enabled: !subscription && !subLoading, enabled: !subscription && !subLoading,
}); });
const { data: devicesData } = useQuery({ const { data: devicesData } = useQuery({
queryKey: ['devices'], queryKey: ['devices'],
queryFn: subscriptionApi.getDevices, queryFn: () => subscriptionApi.getDevices(),
enabled: !!subscription, enabled: !!subscription,
staleTime: API.BALANCE_STALE_TIME_MS, staleTime: API.BALANCE_STALE_TIME_MS,
}); });
@@ -99,7 +108,7 @@ export default function Dashboard() {
}); });
const activateTrialMutation = useMutation({ const activateTrialMutation = useMutation({
mutationFn: subscriptionApi.activateTrial, mutationFn: () => subscriptionApi.activateTrial(),
onSuccess: () => { onSuccess: () => {
setTrialError(null); setTrialError(null);
queryClient.invalidateQueries({ queryKey: ['subscription'] }); queryClient.invalidateQueries({ queryKey: ['subscription'] });
@@ -122,7 +131,7 @@ export default function Dashboard() {
} | null>(null); } | null>(null);
const refreshTrafficMutation = useMutation({ const refreshTrafficMutation = useMutation({
mutationFn: subscriptionApi.refreshTraffic, mutationFn: () => subscriptionApi.refreshTraffic(),
onSuccess: (data) => { onSuccess: (data) => {
setTrafficData({ setTrafficData({
traffic_used_gb: data.traffic_used_gb, traffic_used_gb: data.traffic_used_gb,
@@ -266,6 +275,21 @@ export default function Dashboard() {
{/* Pending Gift Activations */} {/* Pending Gift Activations */}
{pendingGifts && pendingGifts.length > 0 && <PendingGiftCard gifts={pendingGifts} />} {pendingGifts && pendingGifts.length > 0 && <PendingGiftCard gifts={pendingGifts} />}
{/* Multi-tariff: show link to subscriptions list */}
{isMultiTariff && multiSubCount > 1 && (
<Link to="/subscriptions" className="bento-card flex items-center justify-between">
<div>
<div className="text-sm font-medium opacity-60">
{t('dashboard.subscriptions', 'Подписки')}
</div>
<div className="text-lg font-bold">
{multiSubCount} {t('dashboard.activeTariffs', 'активных тарифов')}
</div>
</div>
<ChevronRightIcon />
</Link>
)}
{/* Subscription Status Card */} {/* Subscription Status Card */}
{subLoading ? ( {subLoading ? (
<div className="bento-card"> <div className="bento-card">

View File

@@ -1,7 +1,7 @@
import { useState, useEffect, useRef, useCallback, memo } from 'react'; import { useState, useEffect, useRef, useCallback, memo } from 'react';
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'; import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router'; import { useNavigate, useParams } from 'react-router';
import { subscriptionApi } from '../api/subscription'; import { subscriptionApi } from '../api/subscription';
import TrafficProgressBar from '../components/dashboard/TrafficProgressBar'; import TrafficProgressBar from '../components/dashboard/TrafficProgressBar';
import { HoverBorderGradient } from '../components/ui/hover-border-gradient'; import { HoverBorderGradient } from '../components/ui/hover-border-gradient';
@@ -168,6 +168,8 @@ export default function Subscription() {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const { formatAmount, currencySymbol } = useCurrency(); const { formatAmount, currencySymbol } = useCurrency();
const navigate = useNavigate(); const navigate = useNavigate();
const { subscriptionId: subIdParam } = useParams<{ subscriptionId?: string }>();
const subscriptionId = subIdParam ? parseInt(subIdParam, 10) : undefined;
const { isDark } = useTheme(); const { isDark } = useTheme();
const g = getGlassColors(isDark); const g = getGlassColors(isDark);
const haptic = useHaptic(); const haptic = useHaptic();
@@ -195,10 +197,10 @@ export default function Subscription() {
} | null>(null); } | null>(null);
const { data: subscriptionResponse, isLoading } = useQuery({ const { data: subscriptionResponse, isLoading } = useQuery({
queryKey: ['subscription'], queryKey: ['subscription', subscriptionId],
queryFn: subscriptionApi.getSubscription, queryFn: () => subscriptionApi.getSubscription(subscriptionId),
retry: false, retry: false,
staleTime: 0, // Always refetch to get latest data staleTime: 0,
refetchOnMount: 'always', refetchOnMount: 'always',
}); });
@@ -211,8 +213,8 @@ export default function Subscription() {
// Purchase options (needed for balance_kopeks in device/traffic/server management) // Purchase options (needed for balance_kopeks in device/traffic/server management)
const { data: purchaseOptions } = useQuery({ const { data: purchaseOptions } = useQuery({
queryKey: ['purchase-options'], queryKey: ['purchase-options', subscriptionId],
queryFn: subscriptionApi.getPurchaseOptions, queryFn: () => subscriptionApi.getPurchaseOptions(subscriptionId),
staleTime: 0, staleTime: 0,
refetchOnMount: 'always', refetchOnMount: 'always',
}); });
@@ -220,40 +222,41 @@ export default function Subscription() {
const isTariffsMode = purchaseOptions?.sales_mode === 'tariffs'; const isTariffsMode = purchaseOptions?.sales_mode === 'tariffs';
const autopayMutation = useMutation({ const autopayMutation = useMutation({
mutationFn: (enabled: boolean) => subscriptionApi.updateAutopay(enabled), mutationFn: (enabled: boolean) =>
subscriptionApi.updateAutopay(enabled, undefined, subscriptionId),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['subscription'] }); queryClient.invalidateQueries({ queryKey: ['subscription', subscriptionId] });
}, },
}); });
// Devices query // Devices query
const { data: devicesData, isLoading: devicesLoading } = useQuery({ const { data: devicesData, isLoading: devicesLoading } = useQuery({
queryKey: ['devices'], queryKey: ['devices', subscriptionId],
queryFn: subscriptionApi.getDevices, queryFn: () => subscriptionApi.getDevices(subscriptionId),
enabled: !!subscription, enabled: !!subscription,
}); });
// Delete device mutation // Delete device mutation
const deleteDeviceMutation = useMutation({ const deleteDeviceMutation = useMutation({
mutationFn: (hwid: string) => subscriptionApi.deleteDevice(hwid), mutationFn: (hwid: string) => subscriptionApi.deleteDevice(hwid, subscriptionId),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['devices'] }); queryClient.invalidateQueries({ queryKey: ['devices', subscriptionId] });
}, },
}); });
// Delete all devices mutation // Delete all devices mutation
const deleteAllDevicesMutation = useMutation({ const deleteAllDevicesMutation = useMutation({
mutationFn: () => subscriptionApi.deleteAllDevices(), mutationFn: () => subscriptionApi.deleteAllDevices(subscriptionId),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['devices'] }); queryClient.invalidateQueries({ queryKey: ['devices', subscriptionId] });
}, },
}); });
// Pause subscription mutation // Pause subscription mutation
const pauseMutation = useMutation({ const pauseMutation = useMutation({
mutationFn: () => subscriptionApi.togglePause(), mutationFn: () => subscriptionApi.togglePause(subscriptionId),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['subscription'] }); queryClient.invalidateQueries({ queryKey: ['subscription', subscriptionId] });
queryClient.invalidateQueries({ queryKey: ['balance'] }); queryClient.invalidateQueries({ queryKey: ['balance'] });
}, },
}); });
@@ -269,17 +272,17 @@ export default function Subscription() {
// Device price query // Device price query
const { data: devicePriceData } = useQuery({ const { data: devicePriceData } = useQuery({
queryKey: ['device-price', devicesToAdd], queryKey: ['device-price', devicesToAdd, subscriptionId],
queryFn: () => subscriptionApi.getDevicePrice(devicesToAdd), queryFn: () => subscriptionApi.getDevicePrice(devicesToAdd, subscriptionId),
enabled: showDeviceTopup && !!subscription, enabled: showDeviceTopup && !!subscription,
}); });
// Device purchase mutation // Device purchase mutation
const devicePurchaseMutation = useMutation({ const devicePurchaseMutation = useMutation({
mutationFn: () => subscriptionApi.purchaseDevices(devicesToAdd), mutationFn: () => subscriptionApi.purchaseDevices(devicesToAdd, subscriptionId),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['subscription'] }); queryClient.invalidateQueries({ queryKey: ['subscription', subscriptionId] });
queryClient.invalidateQueries({ queryKey: ['devices'] }); queryClient.invalidateQueries({ queryKey: ['devices', subscriptionId] });
queryClient.invalidateQueries({ queryKey: ['device-price'] }); queryClient.invalidateQueries({ queryKey: ['device-price'] });
setShowDeviceTopup(false); setShowDeviceTopup(false);
setDevicesToAdd(1); setDevicesToAdd(1);
@@ -288,8 +291,8 @@ export default function Subscription() {
// Device reduction info query // Device reduction info query
const { data: deviceReductionInfo } = useQuery({ const { data: deviceReductionInfo } = useQuery({
queryKey: ['device-reduction-info'], queryKey: ['device-reduction-info', subscriptionId],
queryFn: subscriptionApi.getDeviceReductionInfo, queryFn: () => subscriptionApi.getDeviceReductionInfo(subscriptionId),
enabled: showDeviceReduction && !!subscription, enabled: showDeviceReduction && !!subscription,
}); });
@@ -307,27 +310,27 @@ export default function Subscription() {
// Device reduction mutation // Device reduction mutation
const deviceReductionMutation = useMutation({ const deviceReductionMutation = useMutation({
mutationFn: () => subscriptionApi.reduceDevices(targetDeviceLimit), mutationFn: () => subscriptionApi.reduceDevices(targetDeviceLimit, subscriptionId),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['subscription'] }); queryClient.invalidateQueries({ queryKey: ['subscription', subscriptionId] });
queryClient.invalidateQueries({ queryKey: ['devices'] }); queryClient.invalidateQueries({ queryKey: ['devices', subscriptionId] });
queryClient.invalidateQueries({ queryKey: ['device-reduction-info'] }); queryClient.invalidateQueries({ queryKey: ['device-reduction-info', subscriptionId] });
setShowDeviceReduction(false); setShowDeviceReduction(false);
}, },
}); });
// Traffic packages query // Traffic packages query
const { data: trafficPackages } = useQuery({ const { data: trafficPackages } = useQuery({
queryKey: ['traffic-packages'], queryKey: ['traffic-packages', subscriptionId],
queryFn: subscriptionApi.getTrafficPackages, queryFn: () => subscriptionApi.getTrafficPackages(subscriptionId),
enabled: showTrafficTopup && !!subscription, enabled: showTrafficTopup && !!subscription,
}); });
// Traffic purchase mutation // Traffic purchase mutation
const trafficPurchaseMutation = useMutation({ const trafficPurchaseMutation = useMutation({
mutationFn: (gb: number) => subscriptionApi.purchaseTraffic(gb), mutationFn: (gb: number) => subscriptionApi.purchaseTraffic(gb, subscriptionId),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['subscription'] }); queryClient.invalidateQueries({ queryKey: ['subscription', subscriptionId] });
setShowTrafficTopup(false); setShowTrafficTopup(false);
setSelectedTrafficPackage(null); setSelectedTrafficPackage(null);
}, },
@@ -335,8 +338,8 @@ export default function Subscription() {
// Countries/servers query // Countries/servers query
const { data: countriesData, isLoading: countriesLoading } = useQuery({ const { data: countriesData, isLoading: countriesLoading } = useQuery({
queryKey: ['countries'], queryKey: ['countries', subscriptionId],
queryFn: subscriptionApi.getCountries, queryFn: () => subscriptionApi.getCountries(subscriptionId),
enabled: showServerManagement && !!subscription && !subscription.is_trial, enabled: showServerManagement && !!subscription && !subscription.is_trial,
}); });
@@ -350,17 +353,17 @@ export default function Subscription() {
// Countries update mutation // Countries update mutation
const updateCountriesMutation = useMutation({ const updateCountriesMutation = useMutation({
mutationFn: (countries: string[]) => subscriptionApi.updateCountries(countries), mutationFn: (countries: string[]) => subscriptionApi.updateCountries(countries, subscriptionId),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['subscription'] }); queryClient.invalidateQueries({ queryKey: ['subscription', subscriptionId] });
queryClient.invalidateQueries({ queryKey: ['countries'] }); queryClient.invalidateQueries({ queryKey: ['countries', subscriptionId] });
setShowServerManagement(false); setShowServerManagement(false);
}, },
}); });
// Traffic refresh mutation // Traffic refresh mutation
const refreshTrafficMutation = useMutation({ const refreshTrafficMutation = useMutation({
mutationFn: subscriptionApi.refreshTraffic, mutationFn: () => subscriptionApi.refreshTraffic(subscriptionId),
onSuccess: (data) => { onSuccess: (data) => {
setTrafficData({ setTrafficData({
traffic_used_gb: data.traffic_used_gb, traffic_used_gb: data.traffic_used_gb,
@@ -1381,7 +1384,7 @@ export default function Subscription() {
} }
compact compact
onBeforeTopUp={async () => { onBeforeTopUp={async () => {
await subscriptionApi.saveDevicesCart(devicesToAdd); await subscriptionApi.saveDevicesCart(devicesToAdd, subscriptionId);
}} }}
/> />
)} )}
@@ -1721,7 +1724,10 @@ export default function Subscription() {
compact compact
className="mb-3" className="mb-3"
onBeforeTopUp={async () => { onBeforeTopUp={async () => {
await subscriptionApi.saveTrafficCart(selectedTrafficPackage); await subscriptionApi.saveTrafficCart(
selectedTrafficPackage,
subscriptionId,
);
}} }}
/> />
)} )}

View File

@@ -1,7 +1,7 @@
import { useState, useEffect, useMemo, useRef, useCallback } from 'react'; import { useState, useEffect, useMemo, useRef, useCallback } from 'react';
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'; import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router'; import { useNavigate, useSearchParams } from 'react-router';
import { AxiosError } from 'axios'; import { AxiosError } from 'axios';
import { subscriptionApi } from '../api/subscription'; import { subscriptionApi } from '../api/subscription';
import { promoApi } from '../api/promo'; import { promoApi } from '../api/promo';
@@ -28,6 +28,10 @@ export default function SubscriptionPurchase() {
const { t } = useTranslation(); const { t } = useTranslation();
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const navigate = useNavigate(); const navigate = useNavigate();
const [searchParams] = useSearchParams();
const subscriptionId = searchParams.get('subscriptionId')
? parseInt(searchParams.get('subscriptionId')!, 10)
: undefined;
const { formatAmount, currencySymbol } = useCurrency(); const { formatAmount, currencySymbol } = useCurrency();
const { isDark } = useTheme(); const { isDark } = useTheme();
const g = getGlassColors(isDark); const g = getGlassColors(isDark);
@@ -37,7 +41,7 @@ export default function SubscriptionPurchase() {
// Subscription query (shares cache with /subscription page) // Subscription query (shares cache with /subscription page)
const { data: subscriptionResponse, isLoading } = useQuery({ const { data: subscriptionResponse, isLoading } = useQuery({
queryKey: ['subscription'], queryKey: ['subscription'],
queryFn: subscriptionApi.getSubscription, queryFn: () => subscriptionApi.getSubscription(subscriptionId),
retry: false, retry: false,
staleTime: 0, staleTime: 0,
refetchOnMount: 'always', refetchOnMount: 'always',
@@ -52,7 +56,7 @@ export default function SubscriptionPurchase() {
refetch: refetchOptions, refetch: refetchOptions,
} = useQuery({ } = useQuery({
queryKey: ['purchase-options'], queryKey: ['purchase-options'],
queryFn: subscriptionApi.getPurchaseOptions, queryFn: () => subscriptionApi.getPurchaseOptions(subscriptionId),
staleTime: 0, staleTime: 0,
refetchOnMount: 'always', refetchOnMount: 'always',
}); });
@@ -217,13 +221,13 @@ export default function SubscriptionPurchase() {
// Preview query (classic) // Preview query (classic)
const { data: preview, isLoading: previewLoading } = useQuery({ const { data: preview, isLoading: previewLoading } = useQuery({
queryKey: ['purchase-preview', currentSelection], queryKey: ['purchase-preview', currentSelection],
queryFn: () => subscriptionApi.previewPurchase(currentSelection), queryFn: () => subscriptionApi.previewPurchase(currentSelection, subscriptionId),
enabled: !!selectedPeriod && showPurchaseForm && currentStep === 'confirm', enabled: !!selectedPeriod && showPurchaseForm && currentStep === 'confirm',
}); });
// Classic purchase mutation // Classic purchase mutation
const purchaseMutation = useMutation({ const purchaseMutation = useMutation({
mutationFn: () => subscriptionApi.submitPurchase(currentSelection), mutationFn: () => subscriptionApi.submitPurchase(currentSelection, subscriptionId),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['subscription'] }); queryClient.invalidateQueries({ queryKey: ['subscription'] });
queryClient.invalidateQueries({ queryKey: ['purchase-options'] }); queryClient.invalidateQueries({ queryKey: ['purchase-options'] });
@@ -234,13 +238,13 @@ export default function SubscriptionPurchase() {
// Switch preview query // Switch preview query
const { data: switchPreview, isLoading: switchPreviewLoading } = useQuery({ const { data: switchPreview, isLoading: switchPreviewLoading } = useQuery({
queryKey: ['tariff-switch-preview', switchTariffId], queryKey: ['tariff-switch-preview', switchTariffId],
queryFn: () => subscriptionApi.previewTariffSwitch(switchTariffId!), queryFn: () => subscriptionApi.previewTariffSwitch(switchTariffId!, subscriptionId),
enabled: !!switchTariffId, enabled: !!switchTariffId,
}); });
// Tariff switch mutation // Tariff switch mutation
const switchTariffMutation = useMutation({ const switchTariffMutation = useMutation({
mutationFn: (tariffId: number) => subscriptionApi.switchTariff(tariffId), mutationFn: (tariffId: number) => subscriptionApi.switchTariff(tariffId, subscriptionId),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['subscription'] }); queryClient.invalidateQueries({ queryKey: ['subscription'] });
queryClient.invalidateQueries({ queryKey: ['purchase-options'] }); queryClient.invalidateQueries({ queryKey: ['purchase-options'] });

176
src/pages/Subscriptions.tsx Normal file
View File

@@ -0,0 +1,176 @@
import { useQuery } from '@tanstack/react-query';
import { useNavigate } from 'react-router';
import { useTranslation } from 'react-i18next';
import { subscriptionApi } from '../api/subscription';
import { useTheme } from '../hooks/useTheme';
import { getGlassColors } from '../utils/glassTheme';
import { useHaptic } from '../platform';
import type { SubscriptionListItem } from '../types';
function formatTrafficDisplay(used: number, limit: number): string {
if (limit === 0) return '∞';
return `${used.toFixed(1)} / ${limit} ГБ`;
}
function formatDate(iso: string | null): string {
if (!iso) return '—';
try {
return new Date(iso).toLocaleDateString('ru-RU', {
day: '2-digit',
month: '2-digit',
year: 'numeric',
});
} catch {
return '—';
}
}
function StatusDot({ status }: { status: string }) {
const color =
status === 'active' || status === 'trial'
? 'bg-emerald-400'
: status === 'limited'
? 'bg-amber-400'
: 'bg-red-400';
return <span className={`inline-block h-2.5 w-2.5 rounded-full ${color}`} />;
}
function SubscriptionCard({
subscription,
onClick,
}: {
subscription: SubscriptionListItem;
onClick: () => void;
}) {
const { theme } = useTheme();
const glass = getGlassColors(theme);
const haptic = useHaptic();
const handleClick = () => {
haptic?.();
onClick();
};
return (
<button
onClick={handleClick}
className={`w-full rounded-2xl p-4 text-left transition-all duration-200 hover:scale-[1.01] active:scale-[0.99] ${glass.card} ${glass.border} border`}
>
<div className="flex items-center justify-between">
<div className="flex items-center gap-2">
<StatusDot status={subscription.status} />
<span className="text-base font-semibold">{subscription.tariff_name || 'Подписка'}</span>
</div>
<svg
className="h-5 w-5 opacity-40"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
strokeWidth={2}
>
<path strokeLinecap="round" strokeLinejoin="round" d="M8.25 4.5l7.5 7.5-7.5 7.5" />
</svg>
</div>
<div className="mt-3 grid grid-cols-3 gap-3 text-sm opacity-70">
<div>
<div className="text-xs opacity-60">Трафик</div>
<div>
{formatTrafficDisplay(subscription.traffic_used_gb, subscription.traffic_limit_gb)}
</div>
</div>
<div>
<div className="text-xs opacity-60">Устройства</div>
<div>{subscription.device_limit}</div>
</div>
<div>
<div className="text-xs opacity-60">До</div>
<div>{formatDate(subscription.end_date)}</div>
</div>
</div>
{subscription.is_trial && (
<div className="mt-2">
<span className="inline-block rounded-full bg-amber-500/20 px-2 py-0.5 text-xs text-amber-300">
Тестовая
</span>
</div>
)}
</button>
);
}
function EmptyState({ onBuy }: { onBuy: () => void }) {
const { theme } = useTheme();
const glass = getGlassColors(theme);
return (
<div className={`rounded-2xl p-6 text-center ${glass.card} ${glass.border} border`}>
<div className="mb-3 text-4xl">📋</div>
<h3 className="mb-1 text-lg font-semibold">Нет подписок</h3>
<p className="mb-4 text-sm opacity-60">У вас пока нет активных подписок</p>
<button
onClick={onBuy}
className="rounded-xl bg-blue-500 px-6 py-2.5 text-sm font-medium text-white transition-colors hover:bg-blue-600"
>
Купить подписку
</button>
</div>
);
}
export default function Subscriptions() {
const { t } = useTranslation();
const navigate = useNavigate();
const { data, isLoading } = useQuery({
queryKey: ['subscriptions-list'],
queryFn: () => subscriptionApi.getSubscriptions(),
staleTime: 30_000,
refetchOnMount: 'always',
});
// If multi_tariff not enabled, redirect to legacy subscription page
if (data && !data.multi_tariff_enabled) {
navigate('/subscription', { replace: true });
return null;
}
const subscriptions = data?.subscriptions ?? [];
return (
<div className="mx-auto max-w-lg space-y-4 p-4">
<h1 className="text-2xl font-bold">{t('subscriptions.title', 'Мои подписки')}</h1>
{isLoading && (
<div className="space-y-3">
{[1, 2].map((i) => (
<div key={i} className="h-28 animate-pulse rounded-2xl bg-white/5" />
))}
</div>
)}
{!isLoading && subscriptions.length === 0 && (
<EmptyState onBuy={() => navigate('/subscription/purchase')} />
)}
{subscriptions.map((sub) => (
<SubscriptionCard
key={sub.id}
subscription={sub}
onClick={() => navigate(`/subscription/${sub.id}`)}
/>
))}
{!isLoading && subscriptions.length > 0 && (
<button
onClick={() => navigate('/subscription/purchase')}
className="flex w-full items-center justify-center gap-2 rounded-2xl border border-dashed border-white/20 p-4 text-sm opacity-60 transition-opacity hover:opacity-100"
>
<span className="text-lg">+</span>
{t('subscriptions.buyAnother', 'Купить ещё тариф')}
</button>
)}
</div>
);
}

View File

@@ -110,6 +110,29 @@ export interface SubscriptionStatusResponse {
subscription: Subscription | null; subscription: Subscription | null;
} }
// Multi-tariff subscription list item (from GET /cabinet/subscriptions)
export interface SubscriptionListItem {
id: number;
status: string;
tariff_id: number | null;
tariff_name: string | null;
traffic_limit_gb: number;
traffic_used_gb: number;
device_limit: number;
end_date: string | null;
subscription_url: string | null;
subscription_crypto_link: string | null;
is_trial: boolean;
autopay_enabled: boolean;
connected_squads: string[] | null;
}
// Response from GET /cabinet/subscriptions (multi-tariff)
export interface SubscriptionsListResponse {
subscriptions: SubscriptionListItem[];
multi_tariff_enabled: boolean;
}
// Device types // Device types
export interface Device { export interface Device {
hwid: string; hwid: string;