feat: add multi-channel subscription blocking UI and admin management

- Channel subscription blocking screen with per-channel status display
- Safe URL handling with protocol validation (no open redirect)
- Race-condition-safe subscription check with useRef guard
- Admin channel management page with create, toggle, delete
- Error handlers on all admin mutations with haptic feedback
- Proper type guard for channel subscription error detection
- Accessibility: aria-labels on icon-only buttons
- Localization: en, ru, zh, fa translations
This commit is contained in:
Fringg
2026-02-24 02:50:52 +03:00
parent 8ea9a1d6a0
commit a767fe96d3
12 changed files with 758 additions and 113 deletions

View File

@@ -1,10 +1,22 @@
import { useState, useEffect, useCallback } from 'react';
import { useState, useEffect, useCallback, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { useBlockingStore } from '../../store/blocking';
import { apiClient } from '../../api/client';
import { apiClient, isChannelSubscriptionError } from '../../api/client';
const CHECK_COOLDOWN_SECONDS = 5;
function safeOpenUrl(url: string | undefined | null): void {
if (!url) return;
try {
const parsed = new URL(url);
if (parsed.protocol === 'https:' || parsed.protocol === 'http:') {
window.open(url, '_blank', 'noopener,noreferrer');
}
} catch {
// invalid URL, do nothing
}
}
export default function ChannelSubscriptionScreen() {
const { t } = useTranslation();
const channelInfo = useBlockingStore((state) => state.channelInfo);
@@ -12,6 +24,7 @@ export default function ChannelSubscriptionScreen() {
const [isChecking, setIsChecking] = useState(false);
const [cooldown, setCooldown] = useState(0);
const [error, setError] = useState<string | null>(null);
const isCheckingRef = useRef(false);
// Cooldown timer
useEffect(() => {
@@ -30,43 +43,30 @@ export default function ChannelSubscriptionScreen() {
return () => clearInterval(timer);
}, [cooldown]);
const openChannel = useCallback(() => {
if (channelInfo?.channel_link) {
window.open(channelInfo.channel_link, '_blank');
}
}, [channelInfo?.channel_link]);
const channels = channelInfo?.channels ?? [];
const checkSubscription = useCallback(async () => {
if (isChecking || cooldown > 0) return;
if (isCheckingRef.current) return;
isCheckingRef.current = true;
setIsChecking(true);
setError(null);
try {
// Make any authenticated request - if channel check passes, it will succeed
await apiClient.get('/cabinet/auth/me');
// If we get here, subscription is valid - reload page
clearBlocking();
window.location.reload();
} catch (err: unknown) {
// Check if it's still a channel subscription error
const error = err as {
response?: { status?: number; data?: { detail?: { code?: string } } };
};
if (
error.response?.status === 403 &&
error.response?.data?.detail?.code === 'channel_subscription_required'
) {
if (isChannelSubscriptionError(err)) {
setError(t('blocking.channel.notSubscribed'));
} else {
// Other error - might be network issue
setError(t('blocking.channel.checkError'));
}
} finally {
isCheckingRef.current = false;
setIsChecking(false);
setCooldown(CHECK_COOLDOWN_SECONDS);
}
}, [isChecking, cooldown, clearBlocking, t]);
}, [clearBlocking, t]);
return (
<div className="fixed inset-0 z-[100] flex flex-col items-center justify-center bg-dark-950 p-6">
@@ -84,98 +84,125 @@ export default function ChannelSubscriptionScreen() {
<h1 className="mb-4 text-2xl font-bold text-white">{t('blocking.channel.title')}</h1>
{/* Message */}
<p className="mb-8 text-lg text-gray-400">
<p className="mb-6 text-lg text-gray-400">
{channelInfo?.message || t('blocking.channel.defaultMessage')}
</p>
{/* Channel list */}
{channels.length > 0 && (
<div className="mb-6 space-y-3">
{channels.map((ch) => (
<div
key={ch.channel_id}
className={`flex items-center justify-between rounded-xl border p-3 ${
ch.is_subscribed
? 'border-green-500/30 bg-green-500/10'
: 'border-red-500/30 bg-red-500/10'
}`}
>
<span className="text-sm font-medium text-white">{ch.title || ch.channel_id}</span>
<div className="flex items-center gap-2">
{ch.is_subscribed ? (
<span className="text-xs text-green-400">
{t('blocking.channel.subscribed')}
</span>
) : (
ch.channel_link && (
<button
onClick={() => safeOpenUrl(ch.channel_link)}
className="rounded-lg bg-blue-500/20 px-3 py-1 text-xs font-medium text-blue-400 hover:bg-blue-500/30"
>
{t('blocking.channel.openChannel')}
</button>
)
)}
</div>
</div>
))}
</div>
)}
{/* Fallback: single channel (legacy) */}
{channels.length === 0 && channelInfo?.channel_link && (
<button
onClick={() => safeOpenUrl(channelInfo.channel_link)}
className="mb-6 flex w-full items-center justify-center gap-3 rounded-xl bg-gradient-to-r from-blue-500 to-cyan-500 px-6 py-4 font-semibold text-white transition-all duration-200 hover:from-blue-600 hover:to-cyan-600"
>
{t('blocking.channel.openChannel')}
</button>
)}
{/* Error message */}
{error && (
<div className="mb-6 rounded-xl border border-red-500/30 bg-red-500/10 p-4">
<div className="mb-4 rounded-xl border border-red-500/30 bg-red-500/10 p-3">
<p className="text-sm text-red-400">{error}</p>
</div>
)}
{/* Buttons */}
<div className="space-y-4">
{/* Open channel button */}
<button
onClick={openChannel}
disabled={!channelInfo?.channel_link}
className="flex w-full items-center justify-center gap-3 rounded-xl bg-gradient-to-r from-blue-500 to-cyan-500 px-6 py-4 font-semibold text-white transition-all duration-200 hover:from-blue-600 hover:to-cyan-600 disabled:from-gray-600 disabled:to-gray-600"
>
<svg className="h-5 w-5" fill="currentColor" viewBox="0 0 24 24">
<path d="M11.944 0A12 12 0 0 0 0 12a12 12 0 0 0 12 12 12 12 0 0 0 12-12A12 12 0 0 0 12 0a12 12 0 0 0-.056 0zm4.962 7.224c.1-.002.321.023.465.14a.506.506 0 0 1 .171.325c.016.093.036.306.02.472-.18 1.898-.962 6.502-1.36 8.627-.168.9-.499 1.201-.82 1.23-.696.065-1.225-.46-1.9-.902-1.056-.693-1.653-1.124-2.678-1.8-1.185-.78-.417-1.21.258-1.91.177-.184 3.247-2.977 3.307-3.23.007-.032.014-.15-.056-.212s-.174-.041-.249-.024c-.106.024-1.793 1.14-5.061 3.345-.48.33-.913.49-1.302.48-.428-.008-1.252-.241-1.865-.44-.752-.245-1.349-.374-1.297-.789.027-.216.325-.437.893-.663 3.498-1.524 5.83-2.529 6.998-3.014 3.332-1.386 4.025-1.627 4.476-1.635z" />
</svg>
{t('blocking.channel.openChannel')}
</button>
{/* Check subscription button */}
<button
onClick={checkSubscription}
disabled={isChecking || cooldown > 0}
className="flex w-full items-center justify-center gap-3 rounded-xl bg-dark-800 px-6 py-4 font-semibold text-white transition-all duration-200 hover:bg-dark-700 disabled:bg-dark-800 disabled:opacity-60"
>
{isChecking ? (
<>
<svg
className="h-5 w-5 animate-spin"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
>
<circle
className="opacity-25"
cx="12"
cy="12"
r="10"
stroke="currentColor"
strokeWidth="4"
></circle>
<path
className="opacity-75"
fill="currentColor"
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
></path>
</svg>
{t('blocking.channel.checking')}
</>
) : cooldown > 0 ? (
<>
<svg
className="h-5 w-5 text-gray-500"
fill="none"
viewBox="0 0 24 24"
{/* Check subscription button */}
<button
onClick={checkSubscription}
disabled={isChecking || cooldown > 0}
className="flex w-full items-center justify-center gap-3 rounded-xl bg-dark-800 px-6 py-4 font-semibold text-white transition-all duration-200 hover:bg-dark-700 disabled:bg-dark-800 disabled:opacity-60"
>
{isChecking ? (
<>
<svg
className="h-5 w-5 animate-spin"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
>
<circle
className="opacity-25"
cx="12"
cy="12"
r="10"
stroke="currentColor"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"
/>
</svg>
{t('blocking.channel.waitSeconds', {
seconds: cooldown,
})}
</>
) : (
<>
<svg className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M5 13l4 4L19 7"
/>
</svg>
{t('blocking.channel.checkSubscription')}
</>
)}
</button>
</div>
strokeWidth="4"
/>
<path
className="opacity-75"
fill="currentColor"
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
/>
</svg>
{t('blocking.channel.checking')}
</>
) : cooldown > 0 ? (
<>
<svg
className="h-5 w-5 text-gray-500"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"
/>
</svg>
{t('blocking.channel.waitSeconds', { seconds: cooldown })}
</>
) : (
<>
<svg className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M5 13l4 4L19 7"
/>
</svg>
{t('blocking.channel.checkSubscription')}
</>
)}
</button>
{/* Hint */}
<p className="mt-6 text-sm text-gray-500">{t('blocking.channel.hint')}</p>
<p className="mt-4 text-sm text-gray-500">{t('blocking.channel.hint')}</p>
</div>
</div>
);