fix and update

This commit is contained in:
lendry
2026-07-07 11:06:14 +03:00
parent f1821c2edc
commit 911e76f232
4 changed files with 131 additions and 221 deletions

View File

@@ -1,7 +1,7 @@
'use client';
import { useCallback, useEffect, useMemo, useState } from 'react';
import { Download, Loader2, Monitor, Smartphone, Trash2, Upload } from 'lucide-react';
import { Download, Loader2, Smartphone, Trash2, Upload } from 'lucide-react';
import { useAuth } from '@/components/id/auth-provider';
import { AdminShell } from '@/components/id/admin-shell';
import { useToast } from '@/components/id/toast-provider';
@@ -9,14 +9,15 @@ import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import {
AppRelease,
AppReleasePlatform,
deleteAdminAppRelease,
fetchAdminAppReleases,
getApiErrorMessage,
updateAdminAppRelease,
uploadAdminAppRelease
} from '@/lib/api';
import { cn } from '@/lib/utils';
const ANDROID_PLATFORM = 'ANDROID' as const;
const APK_ACCEPT = '.apk,application/vnd.android.package-archive';
function formatBytes(value: string) {
const size = Number(value);
@@ -41,18 +42,12 @@ function formatDate(value: string) {
}).format(new Date(value));
}
const platformMeta: Record<AppReleasePlatform, { label: string; icon: typeof Smartphone; accept: string }> = {
ANDROID: { label: 'Android', icon: Smartphone, accept: '.apk,application/vnd.android.package-archive' },
WINDOWS: { label: 'Windows', icon: Monitor, accept: '.exe,application/vnd.microsoft.portable-executable' }
};
export default function AdminReleasesPage() {
const { token, user } = useAuth();
const { showToast } = useToast();
const [releases, setReleases] = useState<AppRelease[]>([]);
const [loading, setLoading] = useState(true);
const [uploading, setUploading] = useState(false);
const [platform, setPlatform] = useState<AppReleasePlatform>('ANDROID');
const [version, setVersion] = useState('');
const [versionCode, setVersionCode] = useState('');
const [releaseNotes, setReleaseNotes] = useState('');
@@ -64,7 +59,7 @@ export default function AdminReleasesPage() {
if (!token || !canManage) return;
setLoading(true);
try {
const response = await fetchAdminAppReleases(token);
const response = await fetchAdminAppReleases(token, ANDROID_PLATFORM);
setReleases(response.releases ?? []);
} catch (error) {
showToast(getApiErrorMessage(error, 'Не удалось загрузить релизы') ?? 'Ошибка');
@@ -77,11 +72,10 @@ export default function AdminReleasesPage() {
void loadReleases();
}, [loadReleases]);
const grouped = useMemo(() => {
const android = releases.filter((item) => item.platform === 'ANDROID');
const windows = releases.filter((item) => item.platform === 'WINDOWS');
return { android, windows };
}, [releases]);
const androidReleases = useMemo(
() => releases.filter((item) => item.platform === ANDROID_PLATFORM),
[releases]
);
async function handleUpload(event: React.FormEvent<HTMLFormElement>) {
event.preventDefault();
@@ -98,7 +92,7 @@ export default function AdminReleasesPage() {
setUploading(true);
try {
const created = await uploadAdminAppRelease(token, {
platform,
platform: ANDROID_PLATFORM,
version: version.trim(),
versionCode: parsedVersionCode,
releaseNotes: releaseNotes.trim() || undefined,
@@ -130,7 +124,7 @@ export default function AdminReleasesPage() {
async function removeRelease(release: AppRelease) {
if (!token) return;
if (!window.confirm(`Удалить версию ${release.version} (${platformMeta[release.platform].label})?`)) return;
if (!window.confirm(`Удалить версию ${release.version} (Android)?`)) return;
try {
await deleteAdminAppRelease(token, release.id);
setReleases((current) => current.filter((item) => item.id !== release.id));
@@ -151,14 +145,13 @@ export default function AdminReleasesPage() {
return (
<div className="space-y-3">
{items.map((release, index) => {
const Icon = platformMeta[release.platform].icon;
const isLatest = index === 0 && release.isPublished;
return (
<div key={release.id} className="rounded-[20px] border border-[#eceef4] bg-white p-4 shadow-sm">
<div className="flex flex-wrap items-start justify-between gap-3">
<div className="flex min-w-0 items-start gap-3">
<div className="flex h-11 w-11 shrink-0 items-center justify-center rounded-2xl bg-[#f4f5f8]">
<Icon className="h-5 w-5 text-[#3390ec]" />
<Smartphone className="h-5 w-5 text-[#3390ec]" />
</div>
<div className="min-w-0">
<div className="flex flex-wrap items-center gap-2">
@@ -188,7 +181,7 @@ export default function AdminReleasesPage() {
</div>
<div className="flex shrink-0 flex-wrap gap-2">
<Button variant="outline" size="sm" className="rounded-xl" asChild>
<a href={`/downloads/${release.platform === 'ANDROID' ? 'android' : 'windows'}`} target="_blank" rel="noreferrer">
<a href="/downloads/android" target="_blank" rel="noreferrer">
<Download className="mr-2 h-4 w-4" />
Скачать
</a>
@@ -221,8 +214,6 @@ export default function AdminReleasesPage() {
);
}
const PlatformIcon = platformMeta[platform].icon;
return (
<AdminShell active="/admin/releases">
<div className="grid gap-8 xl:grid-cols-[380px_minmax(0,1fr)]">
@@ -232,35 +223,12 @@ export default function AdminReleasesPage() {
<Upload className="h-6 w-6" />
</div>
<div>
<h2 className="text-xl font-semibold">Новая версия</h2>
<p className="text-sm text-[#667085]">Загрузите APK или EXE с подписью SHA-256</p>
<h2 className="text-xl font-semibold">Новая версия Android</h2>
<p className="text-sm text-[#667085]">Загрузите APK с подписью SHA-256</p>
</div>
</div>
<form className="space-y-4" onSubmit={(event) => void handleUpload(event)}>
<div className="grid grid-cols-2 gap-2">
{(['ANDROID', 'WINDOWS'] as AppReleasePlatform[]).map((item) => {
const meta = platformMeta[item];
const Icon = meta.icon;
return (
<button
key={item}
type="button"
className={cn(
'flex items-center justify-center gap-2 rounded-2xl border px-3 py-3 text-sm font-medium transition',
platform === item
? 'border-[#3390ec] bg-[#eef4ff] text-[#1f2430]'
: 'border-[#eceef4] bg-[#f8f9fb] text-[#667085] hover:bg-[#f1f2f6]'
)}
onClick={() => setPlatform(item)}
>
<Icon className="h-4 w-4" />
{meta.label}
</button>
);
})}
</div>
<Input
placeholder="Версия, например 1.2.0"
value={version}
@@ -283,15 +251,13 @@ export default function AdminReleasesPage() {
/>
<label className="flex cursor-pointer flex-col items-center justify-center rounded-[20px] border border-dashed border-[#c7d2fe] bg-[#f8faff] px-4 py-8 text-center transition hover:bg-[#eef4ff]">
<PlatformIcon className="mb-3 h-8 w-8 text-[#3390ec]" />
<span className="text-sm font-medium text-[#1f2430]">
{file ? file.name : `Выберите файл ${platform === 'ANDROID' ? '.apk' : '.exe'}`}
</span>
<Smartphone className="mb-3 h-8 w-8 text-[#3390ec]" />
<span className="text-sm font-medium text-[#1f2430]">{file ? file.name : 'Выберите файл .apk'}</span>
<span className="mt-1 text-xs text-[#667085]">До 350 МБ</span>
<input
type="file"
className="hidden"
accept={platformMeta[platform].accept}
accept={APK_ACCEPT}
onChange={(event) => setFile(event.target.files?.[0] ?? null)}
/>
</label>
@@ -303,16 +269,10 @@ export default function AdminReleasesPage() {
</form>
</section>
<div className="space-y-8">
<section>
<h2 className="mb-4 text-xl font-semibold">Android</h2>
{renderReleaseList(grouped.android, 'Релизы Android пока не загружены')}
</section>
<section>
<h2 className="mb-4 text-xl font-semibold">Windows</h2>
{renderReleaseList(grouped.windows, 'Релизы Windows пока не загружены')}
</section>
</div>
<section>
<h2 className="mb-4 text-xl font-semibold">Версии Android</h2>
{renderReleaseList(androidReleases, 'Релизы Android пока не загружены')}
</section>
</div>
</AdminShell>
);

View File

@@ -2,13 +2,12 @@
import { useEffect, useMemo, useState } from 'react';
import Link from 'next/link';
import { ArrowRight, Download, Monitor, ShieldCheck, Smartphone, Sparkles } from 'lucide-react';
import { ArrowRight, Download, ShieldCheck, Smartphone, Sparkles } from 'lucide-react';
import { BrandLogo } from '@/components/id/brand-logo';
import { usePublicSettings } from '@/components/id/public-settings-provider';
import { Button } from '@/components/ui/button';
import {
AppRelease,
AppReleasePlatform,
buildAppReleaseDownloadUrl,
fetchPublicAppReleases
} from '@/lib/api';
@@ -34,32 +33,6 @@ function formatDate(value: string) {
}).format(new Date(value));
}
const platformCards: Array<{
platform: AppReleasePlatform;
slug: 'android' | 'windows';
title: string;
subtitle: string;
icon: typeof Smartphone;
gradient: string;
}> = [
{
platform: 'ANDROID',
slug: 'android',
title: 'Android',
subtitle: 'Скачайте APK для телефона или планшета',
icon: Smartphone,
gradient: 'from-[#34c759] to-[#0f9d58]'
},
{
platform: 'WINDOWS',
slug: 'windows',
title: 'Windows',
subtitle: 'Установщик для компьютера',
icon: Monitor,
gradient: 'from-[#3390ec] to-[#1d4ed8]'
}
];
export default function DownloadsPage() {
const { projectName } = usePublicSettings();
const [releases, setReleases] = useState<AppRelease[]>([]);
@@ -68,7 +41,7 @@ export default function DownloadsPage() {
useEffect(() => {
void (async () => {
try {
const response = await fetchPublicAppReleases();
const response = await fetchPublicAppReleases('ANDROID');
setReleases(response.releases ?? []);
} finally {
setLoading(false);
@@ -76,24 +49,19 @@ export default function DownloadsPage() {
})();
}, []);
const latestByPlatform = useMemo(() => {
const map = new Map<AppReleasePlatform, AppRelease>();
for (const release of releases) {
if (!map.has(release.platform)) {
map.set(release.platform, release);
}
}
return map;
}, [releases]);
const latestRelease = useMemo(
() => releases.find((item) => item.platform === 'ANDROID') ?? null,
[releases]
);
const historyByPlatform = useMemo(() => ({
ANDROID: releases.filter((item) => item.platform === 'ANDROID'),
WINDOWS: releases.filter((item) => item.platform === 'WINDOWS')
}), [releases]);
const androidHistory = useMemo(
() => releases.filter((item) => item.platform === 'ANDROID'),
[releases]
);
return (
<main className="min-h-screen bg-[linear-gradient(180deg,#f7f9fc_0%,#ffffff_42%,#f4f7fb_100%)]">
<div className="mx-auto max-w-6xl px-4 py-10 sm:px-6 lg:py-14">
<div className="mx-auto max-w-4xl px-4 py-10 sm:px-6 lg:py-14">
<div className="mb-10 flex flex-wrap items-center justify-between gap-4">
<BrandLogo />
<Button variant="outline" className="rounded-full" asChild>
@@ -107,128 +75,112 @@ export default function DownloadsPage() {
<div className="relative max-w-3xl">
<div className="mb-4 inline-flex items-center gap-2 rounded-full bg-[#eef4ff] px-3 py-1 text-sm font-medium text-[#3390ec]">
<Sparkles className="h-4 w-4" />
Официальные сборки {projectName}
Официальная сборка {projectName}
</div>
<h1 className="text-4xl font-semibold tracking-tight text-[#1f2430] sm:text-5xl">
Скачайте приложение
</h1>
<p className="mt-4 max-w-2xl text-base leading-relaxed text-[#667085] sm:text-lg">
Актуальные версии для Android и Windows. Каждый релиз подписан SHA-256 мобильное приложение может
Актуальная версия для Android. Каждый релиз подписан SHA-256 мобильное приложение может
автоматически проверять обновления по коду версии.
</p>
</div>
</section>
<section className="mt-8 grid gap-5 lg:grid-cols-2">
{platformCards.map((card) => {
const latest = latestByPlatform.get(card.platform);
const Icon = card.icon;
return (
<div
key={card.platform}
className="overflow-hidden rounded-[28px] border border-[#eceef4] bg-white shadow-[0_18px_50px_rgba(31,36,48,0.06)]"
>
<div className={`bg-gradient-to-br ${card.gradient} px-6 py-8 text-white`}>
<div className="flex items-center gap-3">
<div className="flex h-14 w-14 items-center justify-center rounded-2xl bg-white/15 backdrop-blur">
<Icon className="h-7 w-7" />
</div>
<div>
<h2 className="text-2xl font-semibold">{card.title}</h2>
<p className="mt-1 text-sm text-white/85">{card.subtitle}</p>
</div>
</div>
<section className="mt-8">
<div className="overflow-hidden rounded-[28px] border border-[#eceef4] bg-white shadow-[0_18px_50px_rgba(31,36,48,0.06)]">
<div className="bg-gradient-to-br from-[#34c759] to-[#0f9d58] px-6 py-8 text-white">
<div className="flex items-center gap-3">
<div className="flex h-14 w-14 items-center justify-center rounded-2xl bg-white/15 backdrop-blur">
<Smartphone className="h-7 w-7" />
</div>
<div className="space-y-5 px-6 py-6">
{loading ? (
<p className="text-sm text-[#667085]">Проверяем доступные версии...</p>
) : latest ? (
<>
<div>
<p className="text-sm text-[#667085]">Последняя версия</p>
<div className="mt-2 flex flex-wrap items-center gap-2">
<span className="text-2xl font-semibold text-[#1f2430]">v{latest.version}</span>
<span className="rounded-full bg-[#eef4ff] px-2.5 py-1 text-xs font-medium text-[#3390ec]">
build {latest.versionCode}
</span>
</div>
<p className="mt-2 text-sm text-[#667085]">
{formatBytes(latest.fileSize)} · {formatDate(latest.createdAt)}
</p>
</div>
{latest.releaseNotes ? (
<p className="rounded-2xl bg-[#f8f9fb] px-4 py-3 text-sm leading-relaxed text-[#1f2430]">
{latest.releaseNotes}
</p>
) : null}
<div className="flex flex-col gap-3 sm:flex-row">
<Button className="flex-1 rounded-xl" asChild>
<a href={`/downloads/${card.slug}`}>
<Download className="mr-2 h-4 w-4" />
Скачать последнюю
</a>
</Button>
<Button variant="outline" className="flex-1 rounded-xl" asChild>
<a href={buildAppReleaseDownloadUrl(card.platform, latest.id)}>
Прямая ссылка
<ArrowRight className="ml-2 h-4 w-4" />
</a>
</Button>
</div>
</>
) : (
<p className="text-sm text-[#667085]">Сборка для этой платформы пока не опубликована.</p>
)}
<div>
<h2 className="text-2xl font-semibold">Android</h2>
<p className="mt-1 text-sm text-white/85">Скачайте APK для телефона или планшета</p>
</div>
</div>
);
})}
</div>
<div className="space-y-5 px-6 py-6">
{loading ? (
<p className="text-sm text-[#667085]">Проверяем доступные версии...</p>
) : latestRelease ? (
<>
<div>
<p className="text-sm text-[#667085]">Последняя версия</p>
<div className="mt-2 flex flex-wrap items-center gap-2">
<span className="text-2xl font-semibold text-[#1f2430]">v{latestRelease.version}</span>
<span className="rounded-full bg-[#eef4ff] px-2.5 py-1 text-xs font-medium text-[#3390ec]">
build {latestRelease.versionCode}
</span>
</div>
<p className="mt-2 text-sm text-[#667085]">
{formatBytes(latestRelease.fileSize)} · {formatDate(latestRelease.createdAt)}
</p>
</div>
{latestRelease.releaseNotes ? (
<p className="rounded-2xl bg-[#f8f9fb] px-4 py-3 text-sm leading-relaxed text-[#1f2430]">
{latestRelease.releaseNotes}
</p>
) : null}
<div className="flex flex-col gap-3 sm:flex-row">
<Button className="flex-1 rounded-xl" asChild>
<a href="/downloads/android">
<Download className="mr-2 h-4 w-4" />
Скачать последнюю
</a>
</Button>
<Button variant="outline" className="flex-1 rounded-xl" asChild>
<a href={buildAppReleaseDownloadUrl('ANDROID', latestRelease.id)}>
Прямая ссылка
<ArrowRight className="ml-2 h-4 w-4" />
</a>
</Button>
</div>
</>
) : (
<p className="text-sm text-[#667085]">Сборка для Android пока не опубликована.</p>
)}
</div>
</div>
</section>
<section className="mt-10 grid gap-6 lg:grid-cols-2">
{platformCards.map((card) => {
const history = historyByPlatform[card.platform];
return (
<div key={`history-${card.platform}`} className="rounded-[24px] border border-[#eceef4] bg-white p-6 shadow-sm">
<h3 className="text-xl font-semibold">История версий · {card.title}</h3>
<div className="mt-4 space-y-3">
{loading ? (
<p className="text-sm text-[#667085]">Загружаем список версий...</p>
) : history.length ? (
history.map((release, index) => (
<div
key={release.id}
className="flex flex-wrap items-center justify-between gap-3 rounded-2xl bg-[#f8f9fb] px-4 py-3"
>
<div>
<div className="flex items-center gap-2">
<span className="font-medium text-[#1f2430]">v{release.version}</span>
<span className="text-xs text-[#667085]">build {release.versionCode}</span>
{index === 0 ? (
<span className="rounded-full bg-[#e8f8ee] px-2 py-0.5 text-[11px] font-medium text-[#1a7f37]">
Актуальная
</span>
) : null}
</div>
<p className="mt-1 text-xs text-[#667085]">
{formatDate(release.createdAt)} · {formatBytes(release.fileSize)}
</p>
</div>
<Button variant="outline" size="sm" className="rounded-xl" asChild>
<a href={buildAppReleaseDownloadUrl(card.platform, release.id)}>Скачать</a>
</Button>
</div>
))
) : (
<p className="text-sm text-[#667085]">Версии пока не опубликованы.</p>
)}
<section className="mt-10 rounded-[24px] border border-[#eceef4] bg-white p-6 shadow-sm">
<h3 className="text-xl font-semibold">История версий</h3>
<div className="mt-4 space-y-3">
{loading ? (
<p className="text-sm text-[#667085]">Загружаем список версий...</p>
) : androidHistory.length ? (
androidHistory.map((release, index) => (
<div
key={release.id}
className="flex flex-wrap items-center justify-between gap-3 rounded-2xl bg-[#f8f9fb] px-4 py-3"
>
<div>
<div className="flex items-center gap-2">
<span className="font-medium text-[#1f2430]">v{release.version}</span>
<span className="text-xs text-[#667085]">build {release.versionCode}</span>
{index === 0 ? (
<span className="rounded-full bg-[#e8f8ee] px-2 py-0.5 text-[11px] font-medium text-[#1a7f37]">
Актуальная
</span>
) : null}
</div>
<p className="mt-1 text-xs text-[#667085]">
{formatDate(release.createdAt)} · {formatBytes(release.fileSize)}
</p>
</div>
<Button variant="outline" size="sm" className="rounded-xl" asChild>
<a href={buildAppReleaseDownloadUrl('ANDROID', release.id)}>Скачать</a>
</Button>
</div>
</div>
);
})}
))
) : (
<p className="text-sm text-[#667085]">Версии пока не опубликованы.</p>
)}
</div>
</section>
<section className="mt-10 rounded-[24px] border border-[#eceef4] bg-white p-6 shadow-sm">
@@ -241,9 +193,8 @@ export default function DownloadsPage() {
<p className="mt-2 text-sm leading-relaxed text-[#667085]">
Мобильный клиент может запрашивать{' '}
<code className="rounded bg-[#f4f5f8] px-1.5 py-0.5">GET /idp-api/releases/check?platform=ANDROID&amp;versionCode=...</code>{' '}
и сравнивать SHA-256 перед установкой. Постоянные ссылки на последнюю версию:
и сравнивать SHA-256 перед установкой. Постоянная ссылка на последнюю версию:
<span className="mt-2 block font-medium text-[#1f2430]">/downloads/android</span>
<span className="block font-medium text-[#1f2430]">/downloads/windows</span>
</p>
</div>
</div>

View File

@@ -1,9 +1,8 @@
import type { NextRequest } from 'next/server';
import { proxyReleaseDownload } from '@/lib/proxy-release-download';
import { NextRequest, NextResponse } from 'next/server';
export const runtime = 'nodejs';
export async function GET(request: NextRequest, context: { params: Promise<{ releaseId: string }> }) {
const { releaseId } = await context.params;
return proxyReleaseDownload(request, 'windows', releaseId);
export async function GET(request: NextRequest) {
const target = new URL('/downloads', request.nextUrl.origin);
return NextResponse.redirect(target, 302);
}

View File

@@ -1,8 +1,8 @@
import type { NextRequest } from 'next/server';
import { proxyReleaseDownload } from '@/lib/proxy-release-download';
import { NextRequest, NextResponse } from 'next/server';
export const runtime = 'nodejs';
export async function GET(request: NextRequest) {
return proxyReleaseDownload(request, 'windows');
const target = new URL('/downloads', request.nextUrl.origin);
return NextResponse.redirect(target, 302);
}