Implement Phases 1-5: skeleton, OAuth, categories, video sync/feed, playback
- FastAPI + PostgreSQL + Alembic + React/Vite skeleton, Docker Compose, healthcheck - Google OAuth (single allowed account), encrypted refresh token storage - Subscriptions sync with pagination, uploads playlist batch fetch - Categories CRUD, many-to-many channel assignment, category filtering - Video sync (playlistItems + videos.list batching), cached feed with cursor pagination, background scheduler (APScheduler) - Video detail page with YouTube embed player - SPA fallback routing, optimistic UI updates, client-side query caching 40 backend tests covering OAuth allow-list, sync idempotency, cascade deletes, cursor pagination, and category filtering. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
commit
0ed20bb838
90 changed files with 8545 additions and 0 deletions
404
frontend/src/App.css
Normal file
404
frontend/src/App.css
Normal file
|
|
@ -0,0 +1,404 @@
|
|||
.app {
|
||||
max-width: 960px;
|
||||
margin: 0 auto;
|
||||
padding: 24px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.error {
|
||||
color: #d33;
|
||||
}
|
||||
|
||||
.connect-screen {
|
||||
text-align: center;
|
||||
padding-top: 80px;
|
||||
}
|
||||
|
||||
.connect-screen button {
|
||||
font-size: 16px;
|
||||
padding: 10px 24px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.channels-screen header,
|
||||
.feed-screen header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.channels-screen .actions,
|
||||
.feed-screen .actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.channels-screen .actions a,
|
||||
.feed-screen .actions a {
|
||||
align-self: center;
|
||||
}
|
||||
|
||||
.channels-screen input[type='text'] {
|
||||
width: 100%;
|
||||
padding: 8px;
|
||||
margin-bottom: 16px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.layout {
|
||||
display: flex;
|
||||
gap: 20px;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.category-nav {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
min-width: 160px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.category-nav button {
|
||||
text-align: left;
|
||||
padding: 6px 10px;
|
||||
border: none;
|
||||
background: transparent;
|
||||
cursor: pointer;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.category-nav button.active {
|
||||
background: var(--accent-bg, #eee);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.content {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.channel-list {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.channel-card {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 10px;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 8px;
|
||||
padding: 8px;
|
||||
}
|
||||
|
||||
.channel-card img {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
border-radius: 50%;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
.channel-info {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.channel-title {
|
||||
font-weight: 500;
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.channel-title:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.badge {
|
||||
font-size: 12px;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.channel-categories {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 4px;
|
||||
margin-top: 6px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.chip {
|
||||
font-size: 12px;
|
||||
background: #eee;
|
||||
border-radius: 12px;
|
||||
padding: 2px 8px;
|
||||
}
|
||||
|
||||
.chip-edit {
|
||||
font-size: 12px;
|
||||
padding: 2px 8px;
|
||||
border-radius: 12px;
|
||||
border: 1px dashed #aaa;
|
||||
background: transparent;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.category-popover-wrapper {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.category-popover {
|
||||
position: absolute;
|
||||
top: calc(100% + 4px);
|
||||
left: 0;
|
||||
z-index: 10;
|
||||
background: #fff;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
|
||||
padding: 8px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
font-size: 13px;
|
||||
min-width: 160px;
|
||||
max-height: 240px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.category-popover-empty {
|
||||
color: #999;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.category-checkbox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.categories-screen {
|
||||
max-width: 600px;
|
||||
}
|
||||
|
||||
.back-link {
|
||||
display: inline-block;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.category-form {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.category-form input {
|
||||
flex: 1;
|
||||
padding: 8px;
|
||||
}
|
||||
|
||||
.category-list {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.category-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 8px;
|
||||
padding: 8px 12px;
|
||||
}
|
||||
|
||||
.reorder-buttons {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.reorder-buttons button {
|
||||
border: none;
|
||||
background: transparent;
|
||||
cursor: pointer;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.category-name {
|
||||
flex: 1;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.category-count {
|
||||
font-size: 12px;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.category-edit-form {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.video-grid {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.video-card {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 8px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.video-thumbnail {
|
||||
position: relative;
|
||||
display: block;
|
||||
aspect-ratio: 16 / 9;
|
||||
background: #eee;
|
||||
}
|
||||
|
||||
.video-thumbnail img,
|
||||
.video-thumbnail-placeholder {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: cover;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.video-thumbnail-placeholder {
|
||||
background: #ddd;
|
||||
}
|
||||
|
||||
.duration-badge {
|
||||
position: absolute;
|
||||
right: 6px;
|
||||
bottom: 6px;
|
||||
background: rgba(0, 0, 0, 0.75);
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
padding: 1px 5px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.video-info {
|
||||
padding: 8px 10px;
|
||||
}
|
||||
|
||||
.video-title {
|
||||
font-weight: 500;
|
||||
font-size: 14px;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
overflow: hidden;
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.video-title:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.video-meta {
|
||||
font-size: 12px;
|
||||
color: #999;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.video-actions {
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.button-link {
|
||||
display: inline-block;
|
||||
font-size: 13px;
|
||||
padding: 4px 10px;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 6px;
|
||||
text-decoration: none;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.load-more {
|
||||
display: block;
|
||||
margin: 16px auto 0;
|
||||
padding: 8px 20px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.video-page {
|
||||
max-width: 900px;
|
||||
}
|
||||
|
||||
.player-wrapper {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
aspect-ratio: 16 / 9;
|
||||
background: #000;
|
||||
border-radius: 8px;
|
||||
overflow: hidden;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.player-wrapper iframe {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.video-page-title {
|
||||
font-size: 20px;
|
||||
margin: 0 0 8px;
|
||||
}
|
||||
|
||||
.video-page-meta {
|
||||
color: #999;
|
||||
font-size: 14px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.video-page-meta a {
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.video-page-source {
|
||||
font-size: 13px;
|
||||
color: #999;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.video-page-categories {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.video-page-description {
|
||||
white-space: pre-wrap;
|
||||
font-size: 14px;
|
||||
line-height: 1.5;
|
||||
border-top: 1px solid #ddd;
|
||||
padding-top: 16px;
|
||||
}
|
||||
55
frontend/src/App.tsx
Normal file
55
frontend/src/App.tsx
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
import { useQuery } from '@tanstack/react-query'
|
||||
import { Route, Routes } from 'react-router-dom'
|
||||
import { getAuthStatus } from './api/client'
|
||||
import Connect from './pages/Connect'
|
||||
import Feed from './pages/Feed'
|
||||
import Channels from './pages/Channels'
|
||||
import ChannelVideos from './pages/ChannelVideos'
|
||||
import VideoPage from './pages/VideoPage'
|
||||
import Categories from './pages/Categories'
|
||||
import './App.css'
|
||||
|
||||
function App() {
|
||||
const { data, isLoading, isError } = useQuery({
|
||||
queryKey: ['auth-status'],
|
||||
queryFn: getAuthStatus,
|
||||
})
|
||||
|
||||
if (isLoading) {
|
||||
return (
|
||||
<div className="app">
|
||||
<p>Загрузка...</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
if (isError) {
|
||||
return (
|
||||
<div className="app">
|
||||
<p className="error">Backend недоступен</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
if (!data?.authenticated) {
|
||||
return (
|
||||
<div className="app">
|
||||
<Connect />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="app">
|
||||
<Routes>
|
||||
<Route path="/" element={<Feed />} />
|
||||
<Route path="/channels" element={<Channels />} />
|
||||
<Route path="/channels/:channelId/videos" element={<ChannelVideos />} />
|
||||
<Route path="/video/:youtubeVideoId" element={<VideoPage />} />
|
||||
<Route path="/categories" element={<Categories />} />
|
||||
</Routes>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default App
|
||||
181
frontend/src/api/client.ts
Normal file
181
frontend/src/api/client.ts
Normal file
|
|
@ -0,0 +1,181 @@
|
|||
const AUTH_ERROR_MESSAGES: Record<string, string> = {
|
||||
google_error: 'Google вернул ошибку авторизации',
|
||||
invalid_state: 'Сессия авторизации устарела, попробуйте снова',
|
||||
exchange_failed: 'Не удалось обменять код авторизации',
|
||||
userinfo_failed: 'Не удалось получить данные аккаунта Google',
|
||||
account_not_allowed: 'Этот Google-аккаунт не разрешён для входа',
|
||||
}
|
||||
|
||||
export function authErrorMessage(code: string): string {
|
||||
return AUTH_ERROR_MESSAGES[code] ?? 'Неизвестная ошибка авторизации'
|
||||
}
|
||||
|
||||
async function request<T>(path: string, options: RequestInit = {}): Promise<T> {
|
||||
const res = await fetch(path, {
|
||||
credentials: 'include',
|
||||
headers: { 'Content-Type': 'application/json', ...(options.headers ?? {}) },
|
||||
...options,
|
||||
})
|
||||
if (!res.ok) {
|
||||
let detail = `${res.status}`
|
||||
try {
|
||||
const body = await res.json()
|
||||
detail = body.detail ?? detail
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
throw new Error(detail)
|
||||
}
|
||||
return res.json()
|
||||
}
|
||||
|
||||
export interface AuthStatus {
|
||||
authenticated: boolean
|
||||
connected: boolean
|
||||
email: string | null
|
||||
}
|
||||
|
||||
export function getAuthStatus() {
|
||||
return request<AuthStatus>('/api/auth/status')
|
||||
}
|
||||
|
||||
export function startGoogleAuth() {
|
||||
window.location.href = '/api/auth/google/start'
|
||||
}
|
||||
|
||||
export function logout() {
|
||||
return request<{ ok: boolean }>('/api/auth/logout', { method: 'POST' })
|
||||
}
|
||||
|
||||
export interface ChannelDto {
|
||||
id: number
|
||||
youtube_channel_id: string
|
||||
title: string
|
||||
description: string | null
|
||||
thumbnail_url: string | null
|
||||
uploads_playlist_id: string | null
|
||||
subscribed: boolean
|
||||
last_synced_at: string | null
|
||||
category_ids: number[]
|
||||
}
|
||||
|
||||
export function getChannel(channelId: number) {
|
||||
return request<ChannelDto>(`/api/channels/${channelId}`)
|
||||
}
|
||||
|
||||
export function listChannels(
|
||||
params: { search?: string; categoryId?: number; uncategorized?: boolean } = {},
|
||||
) {
|
||||
const qs = new URLSearchParams()
|
||||
if (params.search) qs.set('search', params.search)
|
||||
if (params.categoryId != null) qs.set('category_id', String(params.categoryId))
|
||||
if (params.uncategorized) qs.set('uncategorized', 'true')
|
||||
const suffix = qs.toString() ? `?${qs.toString()}` : ''
|
||||
return request<ChannelDto[]>(`/api/channels${suffix}`)
|
||||
}
|
||||
|
||||
export function setChannelCategories(channelId: number, categoryIds: number[]) {
|
||||
return request<ChannelDto>(`/api/channels/${channelId}/categories`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify({ category_ids: categoryIds }),
|
||||
})
|
||||
}
|
||||
|
||||
export interface CategoryDto {
|
||||
id: number
|
||||
name: string
|
||||
slug: string
|
||||
sort_order: number
|
||||
channel_count: number
|
||||
}
|
||||
|
||||
export function listCategories() {
|
||||
return request<CategoryDto[]>('/api/categories')
|
||||
}
|
||||
|
||||
export function createCategory(name: string) {
|
||||
return request<CategoryDto>('/api/categories', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ name }),
|
||||
})
|
||||
}
|
||||
|
||||
export function updateCategory(id: number, name: string) {
|
||||
return request<CategoryDto>(`/api/categories/${id}`, {
|
||||
method: 'PATCH',
|
||||
body: JSON.stringify({ name }),
|
||||
})
|
||||
}
|
||||
|
||||
export function deleteCategory(id: number) {
|
||||
return fetch(`/api/categories/${id}`, { method: 'DELETE', credentials: 'include' }).then((res) => {
|
||||
if (!res.ok) throw new Error(`${res.status}`)
|
||||
})
|
||||
}
|
||||
|
||||
export function reorderCategories(categoryIds: number[]) {
|
||||
return request<CategoryDto[]>('/api/categories/reorder', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ category_ids: categoryIds }),
|
||||
})
|
||||
}
|
||||
|
||||
export interface SyncStatus {
|
||||
status: string
|
||||
started_at?: string
|
||||
finished_at?: string | null
|
||||
error?: string | null
|
||||
running: boolean
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
export function getSyncStatus() {
|
||||
return request<{ subscriptions: SyncStatus; videos: SyncStatus }>('/api/sync/status')
|
||||
}
|
||||
|
||||
export function syncSubscriptions() {
|
||||
return request<SyncStatus>('/api/sync/subscriptions', { method: 'POST' })
|
||||
}
|
||||
|
||||
export function syncVideos() {
|
||||
return request<SyncStatus>('/api/sync/videos', { method: 'POST' })
|
||||
}
|
||||
|
||||
export interface FeedVideoDto {
|
||||
youtube_video_id: string
|
||||
title: string
|
||||
description: string | null
|
||||
channel: {
|
||||
id: number
|
||||
youtube_channel_id: string
|
||||
title: string
|
||||
thumbnail_url: string | null
|
||||
}
|
||||
thumbnail_url: string | null
|
||||
published_at: string
|
||||
duration_seconds: number | null
|
||||
youtube_url: string
|
||||
categories: { id: number; name: string }[]
|
||||
local: {
|
||||
available: boolean
|
||||
status: string
|
||||
progress_percent: number | null
|
||||
media_url: string | null
|
||||
}
|
||||
}
|
||||
|
||||
export function getVideo(youtubeVideoId: string) {
|
||||
return request<FeedVideoDto>(`/api/videos/${youtubeVideoId}`)
|
||||
}
|
||||
|
||||
export function getFeed(
|
||||
params: { categoryId?: number; uncategorized?: boolean; channelId?: number; cursor?: string } = {},
|
||||
) {
|
||||
const qs = new URLSearchParams()
|
||||
if (params.categoryId != null) qs.set('category_id', String(params.categoryId))
|
||||
if (params.uncategorized) qs.set('uncategorized', 'true')
|
||||
if (params.channelId != null) qs.set('channel_id', String(params.channelId))
|
||||
if (params.cursor) qs.set('cursor', params.cursor)
|
||||
const suffix = qs.toString() ? `?${qs.toString()}` : ''
|
||||
return request<{ items: FeedVideoDto[]; next_cursor: string | null }>(`/api/feed${suffix}`)
|
||||
}
|
||||
BIN
frontend/src/assets/hero.png
Normal file
BIN
frontend/src/assets/hero.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
1
frontend/src/assets/react.svg
Normal file
1
frontend/src/assets/react.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 4 KiB |
1
frontend/src/assets/vite.svg
Normal file
1
frontend/src/assets/vite.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 8.5 KiB |
33
frontend/src/components/CategoryNav.tsx
Normal file
33
frontend/src/components/CategoryNav.tsx
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
import type { CategoryDto } from '../api/client'
|
||||
|
||||
export type CategoryFilter = 'all' | 'uncategorized' | number
|
||||
|
||||
interface Props {
|
||||
categories: CategoryDto[]
|
||||
value: CategoryFilter
|
||||
onChange: (filter: CategoryFilter) => void
|
||||
}
|
||||
|
||||
function CategoryNav({ categories, value, onChange }: Props) {
|
||||
return (
|
||||
<nav className="category-nav">
|
||||
<button className={value === 'all' ? 'active' : ''} onClick={() => onChange('all')}>
|
||||
Все
|
||||
</button>
|
||||
<button className={value === 'uncategorized' ? 'active' : ''} onClick={() => onChange('uncategorized')}>
|
||||
Без категории
|
||||
</button>
|
||||
{categories.map((category) => (
|
||||
<button
|
||||
key={category.id}
|
||||
className={value === category.id ? 'active' : ''}
|
||||
onClick={() => onChange(category.id)}
|
||||
>
|
||||
{category.name}
|
||||
</button>
|
||||
))}
|
||||
</nav>
|
||||
)
|
||||
}
|
||||
|
||||
export default CategoryNav
|
||||
100
frontend/src/components/ChannelCard.tsx
Normal file
100
frontend/src/components/ChannelCard.tsx
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
import { useEffect, useRef, useState } from 'react'
|
||||
import { useMutation, useQueryClient } from '@tanstack/react-query'
|
||||
import { Link } from 'react-router-dom'
|
||||
import type { CategoryDto, ChannelDto } from '../api/client'
|
||||
import { setChannelCategories } from '../api/client'
|
||||
|
||||
interface Props {
|
||||
channel: ChannelDto
|
||||
categories: CategoryDto[]
|
||||
}
|
||||
|
||||
function ChannelCard({ channel, categories }: Props) {
|
||||
const [open, setOpen] = useState(false)
|
||||
const popoverRef = useRef<HTMLDivElement>(null)
|
||||
const queryClient = useQueryClient()
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return
|
||||
function handleClickOutside(e: MouseEvent) {
|
||||
if (popoverRef.current && !popoverRef.current.contains(e.target as Node)) {
|
||||
setOpen(false)
|
||||
}
|
||||
}
|
||||
document.addEventListener('mousedown', handleClickOutside)
|
||||
return () => document.removeEventListener('mousedown', handleClickOutside)
|
||||
}, [open])
|
||||
|
||||
const mutation = useMutation({
|
||||
mutationFn: (categoryIds: number[]) => setChannelCategories(channel.id, categoryIds),
|
||||
onMutate: async (categoryIds: number[]) => {
|
||||
await queryClient.cancelQueries({ queryKey: ['channels'] })
|
||||
const previous = queryClient.getQueriesData<ChannelDto[]>({ queryKey: ['channels'] })
|
||||
queryClient.setQueriesData<ChannelDto[]>({ queryKey: ['channels'] }, (old) =>
|
||||
old?.map((c) => (c.id === channel.id ? { ...c, category_ids: categoryIds } : c)),
|
||||
)
|
||||
return { previous }
|
||||
},
|
||||
onError: (_err, _vars, context) => {
|
||||
context?.previous.forEach(([key, data]) => queryClient.setQueryData(key, data))
|
||||
},
|
||||
onSettled: () => {
|
||||
queryClient.invalidateQueries({ queryKey: ['channels'] })
|
||||
queryClient.invalidateQueries({ queryKey: ['categories'] })
|
||||
},
|
||||
})
|
||||
|
||||
function toggleCategory(categoryId: number) {
|
||||
const current = new Set(channel.category_ids)
|
||||
if (current.has(categoryId)) {
|
||||
current.delete(categoryId)
|
||||
} else {
|
||||
current.add(categoryId)
|
||||
}
|
||||
mutation.mutate(Array.from(current))
|
||||
}
|
||||
|
||||
const assignedNames = categories.filter((c) => channel.category_ids.includes(c.id)).map((c) => c.name)
|
||||
|
||||
return (
|
||||
<li className="channel-card">
|
||||
{channel.thumbnail_url && <img src={channel.thumbnail_url} alt={channel.title} />}
|
||||
<div className="channel-info">
|
||||
<Link to={`/channels/${channel.id}/videos`} className="channel-title">
|
||||
{channel.title}
|
||||
</Link>
|
||||
{!channel.subscribed && <span className="badge">отписан</span>}
|
||||
|
||||
<div className="channel-categories">
|
||||
{assignedNames.map((name) => (
|
||||
<span key={name} className="chip">
|
||||
{name}
|
||||
</span>
|
||||
))}
|
||||
<div className="category-popover-wrapper" ref={popoverRef}>
|
||||
<button className="chip-edit" onClick={() => setOpen((v) => !v)}>
|
||||
+ Категория
|
||||
</button>
|
||||
{open && (
|
||||
<div className="category-popover">
|
||||
{categories.length === 0 && <div className="category-popover-empty">Сначала создай категорию</div>}
|
||||
{categories.map((category) => (
|
||||
<label key={category.id} className="category-checkbox">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={channel.category_ids.includes(category.id)}
|
||||
onChange={() => toggleCategory(category.id)}
|
||||
/>
|
||||
{category.name}
|
||||
</label>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
)
|
||||
}
|
||||
|
||||
export default ChannelCard
|
||||
40
frontend/src/components/VideoCard.tsx
Normal file
40
frontend/src/components/VideoCard.tsx
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
import { Link } from 'react-router-dom'
|
||||
import type { FeedVideoDto } from '../api/client'
|
||||
import { formatDuration, formatRelativeTime } from '../utils/format'
|
||||
|
||||
interface Props {
|
||||
video: FeedVideoDto
|
||||
}
|
||||
|
||||
function VideoCard({ video }: Props) {
|
||||
const duration = formatDuration(video.duration_seconds)
|
||||
const href = `/video/${video.youtube_video_id}`
|
||||
|
||||
return (
|
||||
<li className="video-card">
|
||||
<Link to={href} className="video-thumbnail">
|
||||
{video.thumbnail_url ? (
|
||||
<img src={video.thumbnail_url} alt={video.title} />
|
||||
) : (
|
||||
<div className="video-thumbnail-placeholder" />
|
||||
)}
|
||||
{duration && <span className="duration-badge">{duration}</span>}
|
||||
</Link>
|
||||
<div className="video-info">
|
||||
<Link to={href} className="video-title" title={video.title}>
|
||||
{video.title}
|
||||
</Link>
|
||||
<div className="video-meta">
|
||||
{video.channel.title} · {formatRelativeTime(video.published_at)}
|
||||
</div>
|
||||
<div className="video-actions">
|
||||
<Link to={href} className="button-link">
|
||||
Смотреть
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
)
|
||||
}
|
||||
|
||||
export default VideoCard
|
||||
111
frontend/src/index.css
Normal file
111
frontend/src/index.css
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
:root {
|
||||
--text: #6b6375;
|
||||
--text-h: #08060d;
|
||||
--bg: #fff;
|
||||
--border: #e5e4e7;
|
||||
--code-bg: #f4f3ec;
|
||||
--accent: #aa3bff;
|
||||
--accent-bg: rgba(170, 59, 255, 0.1);
|
||||
--accent-border: rgba(170, 59, 255, 0.5);
|
||||
--social-bg: rgba(244, 243, 236, 0.5);
|
||||
--shadow:
|
||||
rgba(0, 0, 0, 0.1) 0 10px 15px -3px, rgba(0, 0, 0, 0.05) 0 4px 6px -2px;
|
||||
|
||||
--sans: system-ui, 'Segoe UI', Roboto, sans-serif;
|
||||
--heading: system-ui, 'Segoe UI', Roboto, sans-serif;
|
||||
--mono: ui-monospace, Consolas, monospace;
|
||||
|
||||
font: 18px/145% var(--sans);
|
||||
letter-spacing: 0.18px;
|
||||
color-scheme: light dark;
|
||||
color: var(--text);
|
||||
background: var(--bg);
|
||||
font-synthesis: none;
|
||||
text-rendering: optimizeLegibility;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
|
||||
@media (max-width: 1024px) {
|
||||
font-size: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
:root {
|
||||
--text: #9ca3af;
|
||||
--text-h: #f3f4f6;
|
||||
--bg: #16171d;
|
||||
--border: #2e303a;
|
||||
--code-bg: #1f2028;
|
||||
--accent: #c084fc;
|
||||
--accent-bg: rgba(192, 132, 252, 0.15);
|
||||
--accent-border: rgba(192, 132, 252, 0.5);
|
||||
--social-bg: rgba(47, 48, 58, 0.5);
|
||||
--shadow:
|
||||
rgba(0, 0, 0, 0.4) 0 10px 15px -3px, rgba(0, 0, 0, 0.25) 0 4px 6px -2px;
|
||||
}
|
||||
|
||||
#social .button-icon {
|
||||
filter: invert(1) brightness(2);
|
||||
}
|
||||
}
|
||||
|
||||
#root {
|
||||
width: 1126px;
|
||||
max-width: 100%;
|
||||
margin: 0 auto;
|
||||
text-align: center;
|
||||
border-inline: 1px solid var(--border);
|
||||
min-height: 100svh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
h1,
|
||||
h2 {
|
||||
font-family: var(--heading);
|
||||
font-weight: 500;
|
||||
color: var(--text-h);
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 56px;
|
||||
letter-spacing: -1.68px;
|
||||
margin: 32px 0;
|
||||
@media (max-width: 1024px) {
|
||||
font-size: 36px;
|
||||
margin: 20px 0;
|
||||
}
|
||||
}
|
||||
h2 {
|
||||
font-size: 24px;
|
||||
line-height: 118%;
|
||||
letter-spacing: -0.24px;
|
||||
margin: 0 0 8px;
|
||||
@media (max-width: 1024px) {
|
||||
font-size: 20px;
|
||||
}
|
||||
}
|
||||
p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
code,
|
||||
.counter {
|
||||
font-family: var(--mono);
|
||||
display: inline-flex;
|
||||
border-radius: 4px;
|
||||
color: var(--text-h);
|
||||
}
|
||||
|
||||
code {
|
||||
font-size: 15px;
|
||||
line-height: 135%;
|
||||
padding: 4px 8px;
|
||||
background: var(--code-bg);
|
||||
}
|
||||
26
frontend/src/main.tsx
Normal file
26
frontend/src/main.tsx
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
import { StrictMode } from 'react'
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||
import { BrowserRouter } from 'react-router-dom'
|
||||
import './index.css'
|
||||
import App from './App.tsx'
|
||||
|
||||
const queryClient = new QueryClient({
|
||||
defaultOptions: {
|
||||
queries: {
|
||||
staleTime: 60_000,
|
||||
refetchOnWindowFocus: false,
|
||||
retry: 1,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
createRoot(document.getElementById('root')!).render(
|
||||
<StrictMode>
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<BrowserRouter>
|
||||
<App />
|
||||
</BrowserRouter>
|
||||
</QueryClientProvider>
|
||||
</StrictMode>,
|
||||
)
|
||||
145
frontend/src/pages/Categories.tsx
Normal file
145
frontend/src/pages/Categories.tsx
Normal file
|
|
@ -0,0 +1,145 @@
|
|||
import { useState } from 'react'
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { Link } from 'react-router-dom'
|
||||
import {
|
||||
createCategory,
|
||||
deleteCategory,
|
||||
listCategories,
|
||||
reorderCategories,
|
||||
updateCategory,
|
||||
} from '../api/client'
|
||||
|
||||
function Categories() {
|
||||
const queryClient = useQueryClient()
|
||||
const [newName, setNewName] = useState('')
|
||||
const [editingId, setEditingId] = useState<number | null>(null)
|
||||
const [editingName, setEditingName] = useState('')
|
||||
|
||||
const categoriesQuery = useQuery({ queryKey: ['categories'], queryFn: listCategories })
|
||||
|
||||
const invalidate = () => {
|
||||
queryClient.invalidateQueries({ queryKey: ['categories'] })
|
||||
queryClient.invalidateQueries({ queryKey: ['channels'] })
|
||||
}
|
||||
|
||||
const createMutation = useMutation({
|
||||
mutationFn: (name: string) => createCategory(name),
|
||||
onSuccess: () => {
|
||||
setNewName('')
|
||||
invalidate()
|
||||
},
|
||||
})
|
||||
|
||||
const updateMutation = useMutation({
|
||||
mutationFn: ({ id, name }: { id: number; name: string }) => updateCategory(id, name),
|
||||
onSuccess: () => {
|
||||
setEditingId(null)
|
||||
invalidate()
|
||||
},
|
||||
})
|
||||
|
||||
const deleteMutation = useMutation({
|
||||
mutationFn: (id: number) => deleteCategory(id),
|
||||
onSuccess: invalidate,
|
||||
})
|
||||
|
||||
const reorderMutation = useMutation({
|
||||
mutationFn: (ids: number[]) => reorderCategories(ids),
|
||||
onSuccess: invalidate,
|
||||
})
|
||||
|
||||
const categories = categoriesQuery.data ?? []
|
||||
|
||||
function move(index: number, direction: -1 | 1) {
|
||||
const target = index + direction
|
||||
if (target < 0 || target >= categories.length) return
|
||||
const ids = categories.map((c) => c.id)
|
||||
;[ids[index], ids[target]] = [ids[target], ids[index]]
|
||||
reorderMutation.mutate(ids)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="categories-screen">
|
||||
<Link to="/" className="back-link">
|
||||
← Каналы
|
||||
</Link>
|
||||
<h1>Категории</h1>
|
||||
|
||||
<form
|
||||
onSubmit={(e) => {
|
||||
e.preventDefault()
|
||||
if (newName.trim()) createMutation.mutate(newName.trim())
|
||||
}}
|
||||
className="category-form"
|
||||
>
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Новая категория"
|
||||
value={newName}
|
||||
onChange={(e) => setNewName(e.target.value)}
|
||||
/>
|
||||
<button type="submit" disabled={!newName.trim() || createMutation.isPending}>
|
||||
Создать
|
||||
</button>
|
||||
</form>
|
||||
{createMutation.isError && <p className="error">{(createMutation.error as Error).message}</p>}
|
||||
|
||||
<ul className="category-list">
|
||||
{categories.map((category, index) => (
|
||||
<li key={category.id} className="category-row">
|
||||
<div className="reorder-buttons">
|
||||
<button onClick={() => move(index, -1)} disabled={index === 0} aria-label="Выше">
|
||||
↑
|
||||
</button>
|
||||
<button onClick={() => move(index, 1)} disabled={index === categories.length - 1} aria-label="Ниже">
|
||||
↓
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{editingId === category.id ? (
|
||||
<form
|
||||
className="category-edit-form"
|
||||
onSubmit={(e) => {
|
||||
e.preventDefault()
|
||||
if (editingName.trim()) updateMutation.mutate({ id: category.id, name: editingName.trim() })
|
||||
}}
|
||||
>
|
||||
<input value={editingName} onChange={(e) => setEditingName(e.target.value)} autoFocus />
|
||||
<button type="submit">Сохранить</button>
|
||||
<button type="button" onClick={() => setEditingId(null)}>
|
||||
Отмена
|
||||
</button>
|
||||
</form>
|
||||
) : (
|
||||
<>
|
||||
<span className="category-name">{category.name}</span>
|
||||
<span className="category-count">{category.channel_count} канал(ов)</span>
|
||||
<button
|
||||
onClick={() => {
|
||||
setEditingId(category.id)
|
||||
setEditingName(category.name)
|
||||
}}
|
||||
>
|
||||
Переименовать
|
||||
</button>
|
||||
<button
|
||||
onClick={() => {
|
||||
if (confirm(`Удалить категорию "${category.name}"? Каналы останутся.`)) {
|
||||
deleteMutation.mutate(category.id)
|
||||
}
|
||||
}}
|
||||
>
|
||||
Удалить
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
|
||||
{categories.length === 0 && !categoriesQuery.isLoading && <p>Категорий пока нет.</p>}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default Categories
|
||||
56
frontend/src/pages/ChannelVideos.tsx
Normal file
56
frontend/src/pages/ChannelVideos.tsx
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
import { useInfiniteQuery, useQuery } from '@tanstack/react-query'
|
||||
import { Link, useParams } from 'react-router-dom'
|
||||
import { getChannel, getFeed } from '../api/client'
|
||||
import VideoCard from '../components/VideoCard'
|
||||
|
||||
function ChannelVideos() {
|
||||
const { channelId } = useParams<{ channelId: string }>()
|
||||
const id = Number(channelId)
|
||||
|
||||
const channelQuery = useQuery({ queryKey: ['channel', id], queryFn: () => getChannel(id) })
|
||||
|
||||
const feedQuery = useInfiniteQuery({
|
||||
queryKey: ['feed', 'channel', id],
|
||||
queryFn: ({ pageParam }) => getFeed({ channelId: id, cursor: pageParam }),
|
||||
initialPageParam: undefined as string | undefined,
|
||||
getNextPageParam: (lastPage) => lastPage.next_cursor ?? undefined,
|
||||
})
|
||||
|
||||
const items = feedQuery.data?.pages.flatMap((page) => page.items) ?? []
|
||||
|
||||
return (
|
||||
<div className="feed-screen">
|
||||
<header>
|
||||
<div>
|
||||
<Link to="/channels" className="back-link">
|
||||
← Каналы
|
||||
</Link>
|
||||
<h1>{channelQuery.data?.title ?? 'Канал'}</h1>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{feedQuery.isLoading && <p>Загрузка...</p>}
|
||||
{feedQuery.isError && <p className="error">Не удалось загрузить видео</p>}
|
||||
|
||||
<ul className="video-grid">
|
||||
{items.map((video) => (
|
||||
<VideoCard key={video.youtube_video_id} video={video} />
|
||||
))}
|
||||
</ul>
|
||||
|
||||
{!feedQuery.isLoading && items.length === 0 && <p>У этого канала пока нет синхронизированных видео.</p>}
|
||||
|
||||
{feedQuery.hasNextPage && (
|
||||
<button
|
||||
className="load-more"
|
||||
onClick={() => feedQuery.fetchNextPage()}
|
||||
disabled={feedQuery.isFetchingNextPage}
|
||||
>
|
||||
{feedQuery.isFetchingNextPage ? 'Загрузка...' : 'Показать ещё'}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default ChannelVideos
|
||||
106
frontend/src/pages/Channels.tsx
Normal file
106
frontend/src/pages/Channels.tsx
Normal file
|
|
@ -0,0 +1,106 @@
|
|||
import { useMemo, useState } from 'react'
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { Link } from 'react-router-dom'
|
||||
import { getSyncStatus, listCategories, listChannels, logout, syncSubscriptions } from '../api/client'
|
||||
import ChannelCard from '../components/ChannelCard'
|
||||
import CategoryNav, { type CategoryFilter } from '../components/CategoryNav'
|
||||
|
||||
function Channels() {
|
||||
const [search, setSearch] = useState('')
|
||||
const [filter, setFilter] = useState<CategoryFilter>('all')
|
||||
const queryClient = useQueryClient()
|
||||
|
||||
const categoriesQuery = useQuery({ queryKey: ['categories'], queryFn: listCategories })
|
||||
|
||||
const channelsQuery = useQuery({
|
||||
queryKey: ['channels', filter],
|
||||
queryFn: () =>
|
||||
listChannels({
|
||||
categoryId: typeof filter === 'number' ? filter : undefined,
|
||||
uncategorized: filter === 'uncategorized',
|
||||
}),
|
||||
})
|
||||
|
||||
const filteredChannels = useMemo(() => {
|
||||
const data = channelsQuery.data ?? []
|
||||
if (!search.trim()) return data
|
||||
const needle = search.trim().toLowerCase()
|
||||
return data.filter((c) => c.title.toLowerCase().includes(needle))
|
||||
}, [channelsQuery.data, search])
|
||||
|
||||
const syncStatusQuery = useQuery({
|
||||
queryKey: ['sync-status'],
|
||||
queryFn: getSyncStatus,
|
||||
refetchInterval: (query) => (query.state.data?.subscriptions.running ? 1500 : false),
|
||||
})
|
||||
|
||||
const syncMutation = useMutation({
|
||||
mutationFn: syncSubscriptions,
|
||||
onSuccess: () => {
|
||||
queryClient.invalidateQueries({ queryKey: ['channels'] })
|
||||
queryClient.invalidateQueries({ queryKey: ['sync-status'] })
|
||||
},
|
||||
})
|
||||
|
||||
const logoutMutation = useMutation({
|
||||
mutationFn: logout,
|
||||
onSuccess: () => {
|
||||
queryClient.invalidateQueries({ queryKey: ['auth-status'] })
|
||||
},
|
||||
})
|
||||
|
||||
const running = syncStatusQuery.data?.subscriptions.running
|
||||
const categories = categoriesQuery.data ?? []
|
||||
|
||||
return (
|
||||
<div className="channels-screen">
|
||||
<header>
|
||||
<h1>Каналы</h1>
|
||||
<div className="actions">
|
||||
<Link to="/">Лента</Link>
|
||||
<Link to="/categories">Категории</Link>
|
||||
<button onClick={() => syncMutation.mutate()} disabled={running}>
|
||||
{running ? 'Синхронизация...' : 'Обновить сейчас'}
|
||||
</button>
|
||||
<button onClick={() => logoutMutation.mutate()}>Выйти</button>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{syncMutation.isError && <p className="error">{(syncMutation.error as Error).message}</p>}
|
||||
{syncStatusQuery.data?.subscriptions.status === 'failed' && (
|
||||
<p className="error">Последняя синхронизация завершилась ошибкой: {syncStatusQuery.data.subscriptions.error}</p>
|
||||
)}
|
||||
|
||||
<div className="layout">
|
||||
<CategoryNav categories={categories} value={filter} onChange={setFilter} />
|
||||
|
||||
<div className="content">
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Поиск по названию канала"
|
||||
value={search}
|
||||
onChange={(e) => setSearch(e.target.value)}
|
||||
/>
|
||||
|
||||
{channelsQuery.isLoading && <p>Загрузка...</p>}
|
||||
{channelsQuery.isError && <p className="error">Не удалось загрузить каналы</p>}
|
||||
|
||||
<ul className="channel-list">
|
||||
{filteredChannels.map((channel) => (
|
||||
<ChannelCard key={channel.id} channel={channel} categories={categories} />
|
||||
))}
|
||||
</ul>
|
||||
|
||||
{channelsQuery.data && channelsQuery.data.length === 0 && (
|
||||
<p>Каналы не найдены{filter === 'all' ? '. Нажми "Обновить сейчас".' : ' в этой категории.'}</p>
|
||||
)}
|
||||
{channelsQuery.data && channelsQuery.data.length > 0 && filteredChannels.length === 0 && (
|
||||
<p>Ничего не найдено по запросу "{search}".</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default Channels
|
||||
18
frontend/src/pages/Connect.tsx
Normal file
18
frontend/src/pages/Connect.tsx
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
import { useSearchParams } from 'react-router-dom'
|
||||
import { authErrorMessage, startGoogleAuth } from '../api/client'
|
||||
|
||||
function Connect() {
|
||||
const [searchParams] = useSearchParams()
|
||||
const authError = searchParams.get('auth_error')
|
||||
|
||||
return (
|
||||
<div className="connect-screen">
|
||||
<h1>MyYouTube</h1>
|
||||
<p>Персональная лента YouTube-подписок с категориями.</p>
|
||||
{authError && <p className="error">{authErrorMessage(authError)}</p>}
|
||||
<button onClick={startGoogleAuth}>Подключить YouTube</button>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default Connect
|
||||
102
frontend/src/pages/Feed.tsx
Normal file
102
frontend/src/pages/Feed.tsx
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
import { useMutation, useInfiniteQuery, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { Link } from 'react-router-dom'
|
||||
import { getFeed, getSyncStatus, listCategories, logout, syncVideos } from '../api/client'
|
||||
import CategoryNav, { type CategoryFilter } from '../components/CategoryNav'
|
||||
import VideoCard from '../components/VideoCard'
|
||||
import { useState } from 'react'
|
||||
|
||||
function Feed() {
|
||||
const [filter, setFilter] = useState<CategoryFilter>('all')
|
||||
const queryClient = useQueryClient()
|
||||
|
||||
const categoriesQuery = useQuery({ queryKey: ['categories'], queryFn: listCategories })
|
||||
const categories = categoriesQuery.data ?? []
|
||||
|
||||
const feedQuery = useInfiniteQuery({
|
||||
queryKey: ['feed', filter],
|
||||
queryFn: ({ pageParam }) =>
|
||||
getFeed({
|
||||
categoryId: typeof filter === 'number' ? filter : undefined,
|
||||
uncategorized: filter === 'uncategorized',
|
||||
cursor: pageParam,
|
||||
}),
|
||||
initialPageParam: undefined as string | undefined,
|
||||
getNextPageParam: (lastPage) => lastPage.next_cursor ?? undefined,
|
||||
})
|
||||
|
||||
const syncStatusQuery = useQuery({
|
||||
queryKey: ['sync-status'],
|
||||
queryFn: getSyncStatus,
|
||||
refetchInterval: (query) => (query.state.data?.videos.running ? 1500 : false),
|
||||
})
|
||||
|
||||
const syncMutation = useMutation({
|
||||
mutationFn: syncVideos,
|
||||
onSuccess: () => {
|
||||
queryClient.invalidateQueries({ queryKey: ['feed'] })
|
||||
queryClient.invalidateQueries({ queryKey: ['sync-status'] })
|
||||
},
|
||||
})
|
||||
|
||||
const logoutMutation = useMutation({
|
||||
mutationFn: logout,
|
||||
onSuccess: () => {
|
||||
queryClient.invalidateQueries({ queryKey: ['auth-status'] })
|
||||
},
|
||||
})
|
||||
|
||||
const running = syncStatusQuery.data?.videos.running
|
||||
const items = feedQuery.data?.pages.flatMap((page) => page.items) ?? []
|
||||
|
||||
return (
|
||||
<div className="feed-screen">
|
||||
<header>
|
||||
<h1>Лента</h1>
|
||||
<div className="actions">
|
||||
<Link to="/channels">Каналы</Link>
|
||||
<Link to="/categories">Категории</Link>
|
||||
<button onClick={() => syncMutation.mutate()} disabled={running}>
|
||||
{running ? 'Синхронизация...' : 'Обновить сейчас'}
|
||||
</button>
|
||||
<button onClick={() => logoutMutation.mutate()}>Выйти</button>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{syncMutation.isError && <p className="error">{(syncMutation.error as Error).message}</p>}
|
||||
{syncStatusQuery.data?.videos.status === 'failed' && (
|
||||
<p className="error">Последняя синхронизация видео завершилась ошибкой: {syncStatusQuery.data.videos.error}</p>
|
||||
)}
|
||||
|
||||
<div className="layout">
|
||||
<CategoryNav categories={categories} value={filter} onChange={setFilter} />
|
||||
|
||||
<div className="content">
|
||||
{feedQuery.isLoading && <p>Загрузка...</p>}
|
||||
{feedQuery.isError && <p className="error">Не удалось загрузить ленту</p>}
|
||||
|
||||
<ul className="video-grid">
|
||||
{items.map((video) => (
|
||||
<VideoCard key={video.youtube_video_id} video={video} />
|
||||
))}
|
||||
</ul>
|
||||
|
||||
{!feedQuery.isLoading && items.length === 0 && (
|
||||
<p>Видео пока нет. Нажми "Обновить сейчас" или проверь, есть ли каналы в этой категории.</p>
|
||||
)}
|
||||
|
||||
{feedQuery.hasNextPage && (
|
||||
<button
|
||||
className="load-more"
|
||||
onClick={() => feedQuery.fetchNextPage()}
|
||||
disabled={feedQuery.isFetchingNextPage}
|
||||
>
|
||||
{feedQuery.isFetchingNextPage ? 'Загрузка...' : 'Показать ещё'}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default Feed
|
||||
78
frontend/src/pages/VideoPage.tsx
Normal file
78
frontend/src/pages/VideoPage.tsx
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
import { useQuery } from '@tanstack/react-query'
|
||||
import { Link, useParams } from 'react-router-dom'
|
||||
import { getVideo } from '../api/client'
|
||||
import { formatDuration, formatRelativeTime } from '../utils/format'
|
||||
|
||||
function VideoPage() {
|
||||
const { youtubeVideoId } = useParams<{ youtubeVideoId: string }>()
|
||||
|
||||
const videoQuery = useQuery({
|
||||
queryKey: ['video', youtubeVideoId],
|
||||
queryFn: () => getVideo(youtubeVideoId!),
|
||||
enabled: !!youtubeVideoId,
|
||||
})
|
||||
|
||||
if (videoQuery.isLoading) {
|
||||
return (
|
||||
<div className="video-page">
|
||||
<p>Загрузка...</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
if (videoQuery.isError || !videoQuery.data) {
|
||||
return (
|
||||
<div className="video-page">
|
||||
<Link to="/" className="back-link">
|
||||
← Лента
|
||||
</Link>
|
||||
<p className="error">Видео не найдено</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
const video = videoQuery.data
|
||||
const duration = formatDuration(video.duration_seconds)
|
||||
|
||||
return (
|
||||
<div className="video-page">
|
||||
<Link to="/" className="back-link">
|
||||
← Лента
|
||||
</Link>
|
||||
|
||||
<div className="player-wrapper">
|
||||
<iframe
|
||||
src={`https://www.youtube-nocookie.com/embed/${video.youtube_video_id}`}
|
||||
title={video.title}
|
||||
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
|
||||
allowFullScreen
|
||||
/>
|
||||
</div>
|
||||
|
||||
<h1 className="video-page-title">{video.title}</h1>
|
||||
|
||||
<div className="video-page-meta">
|
||||
<Link to={`/channels/${video.channel.id}/videos`}>{video.channel.title}</Link>
|
||||
{' · '}
|
||||
{formatRelativeTime(video.published_at)}
|
||||
{duration && ` · ${duration}`}
|
||||
</div>
|
||||
|
||||
<div className="video-page-source">Источник: YouTube</div>
|
||||
|
||||
{video.categories.length > 0 && (
|
||||
<div className="video-page-categories">
|
||||
{video.categories.map((c) => (
|
||||
<span key={c.id} className="chip">
|
||||
{c.name}
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{video.description && <p className="video-page-description">{video.description}</p>}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default VideoPage
|
||||
35
frontend/src/utils/format.ts
Normal file
35
frontend/src/utils/format.ts
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
export function formatDuration(seconds: number | null): string | null {
|
||||
if (seconds == null) return null
|
||||
const h = Math.floor(seconds / 3600)
|
||||
const m = Math.floor((seconds % 3600) / 60)
|
||||
const s = Math.floor(seconds % 60)
|
||||
if (h > 0) {
|
||||
return `${h}:${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`
|
||||
}
|
||||
return `${m}:${String(s).padStart(2, '0')}`
|
||||
}
|
||||
|
||||
const RTF = new Intl.RelativeTimeFormat('ru', { numeric: 'auto' })
|
||||
|
||||
export function formatRelativeTime(iso: string): string {
|
||||
const date = new Date(iso)
|
||||
const diffMs = date.getTime() - Date.now()
|
||||
const diffSeconds = Math.round(diffMs / 1000)
|
||||
const absSeconds = Math.abs(diffSeconds)
|
||||
|
||||
const units: [Intl.RelativeTimeFormatUnit, number][] = [
|
||||
['year', 365 * 24 * 3600],
|
||||
['month', 30 * 24 * 3600],
|
||||
['week', 7 * 24 * 3600],
|
||||
['day', 24 * 3600],
|
||||
['hour', 3600],
|
||||
['minute', 60],
|
||||
]
|
||||
|
||||
for (const [unit, secondsInUnit] of units) {
|
||||
if (absSeconds >= secondsInUnit) {
|
||||
return RTF.format(Math.round(diffSeconds / secondsInUnit), unit)
|
||||
}
|
||||
}
|
||||
return RTF.format(diffSeconds, 'second')
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue