HeagBoKaT/cats
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: доработано оформление — тени, анимации, градиенты, iOS-стиль

Browse Source
This commit is contained in:
HeagBoKaT
2026-05-29 11:52:04 +03:00
parent a67b8c3341
commit f8f220469c
13 changed files with 362 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
client/src/components/CatCard.tsx
View File

@@ -22,7 +22,6 @@ export default function CatCard({ cat, onOpen }: CatCardProps) {
const toggleLike = async () => {
if (isOwner || !user) return;
if (liked) {
setLiked(false);
setLikeCount((c) => c - 1);
@@ -47,13 +46,12 @@ export default function CatCard({ cat, onOpen }: CatCardProps) {
return (
<article className="animate-fade-in-up mb-4 last:mb-0">
<div className="card overflow-hidden">
{/* Header */}
<div className="flex items-center justify-between px-4 py-3">
<div
className="flex items-center gap-3 cursor-pointer group"
onClick={() => onOpen(cat.id)}
>
<Avatar className="h-10 w-10">
<div
className="flex items-center justify-between px-4 py-3 cursor-pointer group"
onClick={() => onOpen(cat.id)}
>
<div className="flex items-center gap-3">
<Avatar className="h-10 w-10 ring-1 ring-[var(--border)]">
<AvatarFallback className="text-sm avatar-initials">
{cat.username.charAt(0).toUpperCase()}
</AvatarFallback>
@@ -62,28 +60,23 @@ export default function CatCard({ cat, onOpen }: CatCardProps) {
<h3 className="text-[15px] font-semibold group-hover:text-[var(--primary)] transition-colors">
@{cat.username}
</h3>
<time className="text-[11px] text-[var(--foreground-tertiary)]">{timeAgo}</time>
<time className="text-[11px] text-[var(--fg-tertiary)]">{timeAgo}</time>
</div>
</div>
</div>
{/* Image */}
<figure
className="cursor-pointer bg-[var(--secondary)] img-loading"
onClick={() => onOpen(cat.id)}
>
<figure className="cursor-pointer bg-[var(--secondary)] img-shimmer" onClick={() => onOpen(cat.id)}>
<img
src={cat.image_url}
alt={cat.caption || 'Фото кота'}
className="w-full max-h-[500px] object-contain select-none mx-auto transition-opacity"
className="w-full max-h-[520px] object-contain select-none mx-auto"
draggable={false}
loading="lazy"
/>
</figure>
{/* Caption */}
{cat.caption && (
<div className="px-4 pt-3 pb-1 cursor-pointer" onClick={() => onOpen(cat.id)}>
<div className="px-4 pt-3 pb-0.5 cursor-pointer" onClick={() => onOpen(cat.id)}>
<p className="text-[15px] leading-[1.4]">
<span className="font-semibold mr-1.5">@{cat.username}</span>
{cat.caption}
@@ -91,7 +84,6 @@ export default function CatCard({ cat, onOpen }: CatCardProps) {
</div>
)}
{/* Actions */}
<div className="flex items-center justify-between px-4 py-3">
<div className="flex items-center gap-5">
<button
@@ -99,31 +91,28 @@ export default function CatCard({ cat, onOpen }: CatCardProps) {
disabled={isOwner || !user}
className={`btn-icon flex items-center gap-1.5 text-[14px] font-medium ${
isOwner
? 'text-[var(--foreground-tertiary)] cursor-not-allowed'
? 'text-[var(--fg-tertiary)] cursor-not-allowed'
: liked
? 'text-[var(--danger)]'
: 'text-[var(--foreground-secondary)] hover:text-[var(--foreground)]'
: 'text-[var(--fg-secondary)] hover:text-[var(--fg)]'
}`}
>
<Heart
className={`h-5 w-5 transition-all ${liked ? 'fill-[var(--danger)] stroke-[var(--danger)] animate-heart' : 'stroke-[1.5]'}`}
/>
<Heart className={`h-5 w-5 transition-all ${liked ? 'fill-[var(--danger)] stroke-[var(--danger)] animate-heart' : 'stroke-[1.5]'}`} />
{likeCount > 0 && <span className="tabular-nums">{likeCount}</span>}
</button>
<button
onClick={() => onOpen(cat.id)}
className="btn-icon flex items-center gap-1.5 text-[14px] font-medium text-[var(--foreground-secondary)] hover:text-[var(--foreground)]"
className="btn-icon flex items-center gap-1.5 text-[14px] font-medium text-[var(--fg-secondary)] hover:text-[var(--fg)]"
>
<MessageCircle className="h-5 w-5 stroke-[1.5]" />
<span className="hidden sm:inline text-[13px]">Комментарии</span>
</button>
</div>
<span className="flex items-center gap-1 text-[12px] text-[var(--foreground-tertiary)]">
<span className="flex items-center gap-1 text-[12px] text-[var(--fg-tertiary)]">
<span>🏆</span>
<span className="font-medium">{cat.user_points}</span>
<span className="hidden sm:inline">баллов</span>
</span>
</div>
</div>

96
client/src/components/CatModal.tsx
View File

@@ -26,10 +26,12 @@ export default function CatModal({ catId, onClose }: CatModalProps) {
useEffect(() => { if (likeData) setLiked(likeData.liked); }, [likeData]);
useEffect(() => { if (data?.cat) setLikeCount(data.cat.likes_count); }, [data]);
useEffect(() => { document.body.style.overflow = 'hidden'; return () => { document.body.style.overflow = ''; }; }, []);
useEffect(() => {
document.body.style.overflow = 'hidden';
return () => { document.body.style.overflow = ''; };
}, []);
const handler = (e: KeyboardEvent) => { if (e.key === 'Escape') onClose(); };
window.addEventListener('keydown', handler);
return () => window.removeEventListener('keydown', handler);
}, [onClose]);
const cat = data?.cat;
const isOwner = cat && user && cat.user_id === user.id;
@@ -37,17 +39,14 @@ export default function CatModal({ catId, onClose }: CatModalProps) {
const toggleLike = async () => {
if (isOwner || !user || !cat) return;
if (liked) {
setLiked(false);
setLikeCount((c) => c - 1);
setLiked(false); setLikeCount((c) => c - 1);
try {
const res = await unlikeMutation.mutateAsync();
if (res.ownerPoints !== undefined && cat.user_id === user.id)
updateUser({ ...user, points: res.ownerPoints });
if (res.ownerPoints !== undefined && cat.user_id === user.id) updateUser({ ...user, points: res.ownerPoints });
refetchLike();
} catch { setLiked(true); setLikeCount((c) => c + 1); }
} else {
setLiked(true);
setLikeCount((c) => c + 1);
setLiked(true); setLikeCount((c) => c + 1);
toast('Нравится ❤️');
try { await likeMutation.mutateAsync(); refetchLike(); }
catch { setLiked(false); setLikeCount((c) => c - 1); }
@@ -63,19 +62,12 @@ export default function CatModal({ catId, onClose }: CatModalProps) {
} catch { toast('Ошибка удаления', 'error'); }
};
// Close on Escape
useEffect(() => {
const handler = (e: KeyboardEvent) => { if (e.key === 'Escape') onClose(); };
window.addEventListener('keydown', handler);
return () => window.removeEventListener('keydown', handler);
}, [onClose]);
if (isLoading || !cat) {
return (
<div className="fixed inset-0 z-[60] bg-black/50 backdrop-blur-sm flex items-center justify-center" onClick={onClose}>
<div className="flex items-center gap-3 px-6 py-4 bg-white rounded-full shadow-lg animate-scale-in">
<div className="h-5 w-5 rounded-full border-2 border-[var(--primary)]/30 border-t-[var(--primary)] animate-spin" />
<span className="text-[14px] font-medium text-[var(--foreground-secondary)]">Загрузка...</span>
<span className="text-[14px] font-medium text-[var(--fg-secondary)]">Загрузка...</span>
</div>
</div>
);
@@ -86,51 +78,37 @@ export default function CatModal({ catId, onClose }: CatModalProps) {
});
return (
<div
className="fixed inset-0 z-[60] bg-black/50 backdrop-blur-sm flex items-end sm:items-center justify-center"
onClick={onClose}
>
<div className="fixed inset-0 z-[60] bg-black/50 backdrop-blur-sm flex items-end sm:items-center justify-center" onClick={onClose}>
<div
className="w-full sm:max-w-xl bg-white sm:rounded-xl sm:mx-4 max-h-[92vh] flex flex-col overflow-hidden shadow-xl animate-scale-in"
className="w-full sm:max-w-xl bg-white sm:rounded-2xl sm:mx-4 max-h-[92vh] flex flex-col overflow-hidden shadow-xl animate-scale-in"
onClick={(e) => e.stopPropagation()}
>
{/* Header */}
<div className="flex items-center justify-between px-5 py-4 border-b shrink-0">
<div className="flex items-center gap-3">
<Avatar className="h-9 w-9">
<AvatarFallback className="text-sm avatar-initials">
{cat.username.charAt(0).toUpperCase()}
</AvatarFallback>
<AvatarFallback className="text-sm avatar-initials">{cat.username.charAt(0).toUpperCase()}</AvatarFallback>
</Avatar>
<div>
<span className="text-[15px] font-semibold">@{cat.username}</span>
<p className="text-[11px] text-[var(--foreground-tertiary)]">{dateStr}</p>
<p className="text-[11px] text-[var(--fg-tertiary)]">{dateStr}</p>
</div>
</div>
<div className="flex items-center gap-1">
{isOwner && (
<button
onClick={handleDelete}
className="btn-icon h-9 w-9 text-[var(--foreground-secondary)] hover:text-[var(--danger)] hover:bg-[var(--danger-light)]"
title="Удалить"
>
<button onClick={handleDelete} className="btn-icon h-9 w-9 text-[var(--fg-secondary)] hover:text-[var(--danger)] hover:bg-[var(--danger-light)]">
<Trash2 className="h-4 w-4" strokeWidth={1.5} />
</button>
)}
<button
onClick={onClose}
className="btn-icon h-9 w-9 text-[var(--foreground-secondary)] hover:text-[var(--foreground)] hover:bg-[var(--secondary)]"
>
<button onClick={onClose} className="btn-icon h-9 w-9 text-[var(--fg-secondary)] hover:text-[var(--fg)] hover:bg-[var(--secondary)]">
<X className="h-5 w-5" strokeWidth={1.5} />
</button>
</div>
</div>
{/* Image */}
<div className="bg-[var(--secondary)] flex items-center justify-center shrink-0 relative">
{!imageLoaded && (
<div className="absolute inset-0 flex items-center justify-center">
<div className="h-8 w-8 rounded-full border-2 border-[var(--foreground-tertiary)]/30 border-t-[var(--primary)] animate-spin" />
<div className="h-8 w-8 rounded-full border-2 border-[var(--fg-tertiary)]/30 border-t-[var(--primary)] animate-spin" />
</div>
)}
<img
@@ -141,13 +119,10 @@ export default function CatModal({ catId, onClose }: CatModalProps) {
/>
</div>
{/* Info */}
<div className="flex-1 overflow-y-auto px-5 py-4 space-y-3">
<div className="flex items-start gap-3">
<Avatar className="h-8 w-8 shrink-0 mt-0.5">
<AvatarFallback className="text-[10px] avatar-initials">
{cat.username.charAt(0).toUpperCase()}
</AvatarFallback>
<AvatarFallback className="text-[10px] avatar-initials">{cat.username.charAt(0).toUpperCase()}</AvatarFallback>
</Avatar>
<div>
<p className="text-[15px] leading-[1.4]">
@@ -158,31 +133,26 @@ export default function CatModal({ catId, onClose }: CatModalProps) {
</div>
</div>
{/* Actions */}
<div className="border-t px-5 py-4 shrink-0">
<div className="flex items-center justify-between">
<div className="flex items-center gap-5">
<button
onClick={toggleLike}
disabled={isOwner || !user}
className={`btn-icon flex items-center gap-1.5 text-[15px] font-medium ${
isOwner
? 'text-[var(--foreground-tertiary)] cursor-not-allowed'
: liked
? 'text-[var(--danger)]'
: 'text-[var(--foreground-secondary)] hover:text-[var(--foreground)]'
}`}
>
<Heart
className={`h-6 w-6 transition-all ${liked ? 'fill-[var(--danger)] stroke-[var(--danger)] animate-heart' : 'stroke-[1.5]'}`}
/>
{likeCount > 0 && <span className="tabular-nums">{likeCount}</span>}
</button>
</div>
<span className="flex items-center gap-1.5 text-[13px] text-[var(--foreground-secondary)]">
<button
onClick={toggleLike}
disabled={isOwner || !user}
className={`btn-icon flex items-center gap-1.5 text-[15px] font-medium ${
isOwner
? 'text-[var(--fg-tertiary)] cursor-not-allowed'
: liked
? 'text-[var(--danger)]'
: 'text-[var(--fg-secondary)] hover:text-[var(--fg)]'
}`}
>
<Heart className={`h-6 w-6 transition-all ${liked ? 'fill-[var(--danger)] stroke-[var(--danger)] animate-heart' : 'stroke-[1.5]'}`} />
{likeCount > 0 && <span className="tabular-nums">{likeCount}</span>}
</button>
<span className="flex items-center gap-1.5 text-[13px] text-[var(--fg-secondary)]">
<span>🏆</span>
<span className="font-semibold">{cat.user_points}</span>
<span>баллов</span>
<span className="text-[var(--fg-tertiary)]">баллов</span>
</span>
</div>
</div>

77
client/src/components/FeedSidebar.tsx
View File

@@ -4,6 +4,19 @@ import { Avatar, AvatarFallback } from '@/components/ui/avatar';
import { Link } from 'react-router-dom';
import { Trophy, Sparkles } from 'lucide-react';
function MedalBadge({ rank }: { rank: number }) {
const colors = [
'bg-amber-100 text-amber-600 shadow-[0_0_0_1px_rgba(217,119,6,0.15)]',
'bg-gray-100 text-gray-500 shadow-[0_0_0_1px_rgba(107,114,128,0.15)]',
'bg-orange-100 text-orange-600 shadow-[0_0_0_1px_rgba(234,88,12,0.15)]',
];
return (
<span className={`w-6 h-6 rounded-full flex items-center justify-center text-[11px] font-bold ${colors[rank] || 'text-[var(--fg-tertiary)]'}`}>
{rank + 1}
</span>
);
}
export default function FeedSidebar() {
const { user } = useAuth();
const { data } = useCats(1);
@@ -21,82 +34,46 @@ export default function FeedSidebar() {
.slice(0, 5);
return (
<div className="space-y-6">
{/* Current user */}
<div className="space-y-5">
{user && (
<Link
to="/profile"
className="card flex items-center gap-3 p-3 hover:shadow-md transition-all group"
>
<Avatar className="h-11 w-11">
<Link to="/profile" className="card flex items-center gap-3 p-3 hover:shadow-md transition-all group">
<Avatar className="h-11 w-11 ring-1 ring-[var(--border)]">
<AvatarFallback className="text-sm font-semibold avatar-initials">
{user.username.charAt(0).toUpperCase()}
</AvatarFallback>
</Avatar>
<div className="min-w-0 flex-1">
<p className="text-[14px] font-semibold truncate group-hover:text-[var(--primary)] transition-colors">
{user.username}
</p>
<p className="text-[12px] text-[var(--foreground-secondary)]">
🏆 {user.points} баллов
</p>
<p className="text-[14px] font-semibold truncate group-hover:text-[var(--primary)] transition-colors">{user.username}</p>
<p className="text-[12px] text-[var(--fg-secondary)]">🏆 {user.points} баллов</p>
</div>
</Link>
)}
{/* Top users */}
<div className="card p-4">
<div className="flex items-center gap-2 mb-4">
<Trophy className="h-4 w-4 text-amber-500" strokeWidth={1.5} />
<h3 className="text-[12px] font-bold text-[var(--foreground-secondary)] uppercase tracking-widest">
Лидеры
</h3>
<h3 className="text-[11px] font-bold text-[var(--fg-secondary)] uppercase tracking-[0.08em]">Лидеры</h3>
</div>
{topUsers.length === 0 ? (
<p className="text-[13px] text-[var(--foreground-tertiary)] text-center py-4">
Пока нет пользователей
</p>
<p className="text-[13px] text-[var(--fg-tertiary)] text-center py-4">Пока нет пользователей</p>
) : (
<div className="space-y-3">
<div className="space-y-2.5">
{topUsers.map(([id, u], i) => (
<Link
key={id}
to={`/profile/${id}`}
className="flex items-center gap-3 group"
>
<span
className={`w-6 h-6 rounded-full flex items-center justify-center text-[11px] font-bold ${
i === 0
? 'bg-amber-100 text-amber-600'
: i === 1
? 'bg-gray-100 text-gray-500'
: i === 2
? 'bg-orange-100 text-orange-600'
: 'text-[var(--foreground-tertiary)]'
}`}
>
{i + 1}
</span>
<Link key={id} to={`/profile/${id}`} className="flex items-center gap-3 group">
<MedalBadge rank={i} />
<Avatar className="h-8 w-8">
<AvatarFallback className="text-[10px] avatar-initials">
{u.username.charAt(0).toUpperCase()}
</AvatarFallback>
<AvatarFallback className="text-[10px] avatar-initials">{u.username.charAt(0).toUpperCase()}</AvatarFallback>
</Avatar>
<span className="text-[14px] flex-1 truncate font-medium group-hover:text-[var(--primary)] transition-colors">
{u.username}
</span>
<span className="text-[12px] font-semibold text-[var(--foreground-secondary)] tabular-nums">
{u.points}
</span>
<span className="text-[14px] flex-1 truncate font-medium group-hover:text-[var(--primary)] transition-colors">{u.username}</span>
<span className="text-[12px] font-semibold text-[var(--fg-secondary)] tabular-nums">{u.points}</span>
</Link>
))}
</div>
)}
</div>
{/* Info */}
<div className="px-1 text-[11px] text-[var(--foreground-tertiary)] space-y-1">
<div className="px-1 text-[11px] text-[var(--fg-tertiary)]">
<div className="flex items-center gap-1.5">
<Sparkles className="h-3 w-3" strokeWidth={1.5} />
<span>Catstagram · Сообщество котоводов</span>

56
client/src/components/Navbar.tsx
View File

@@ -1,7 +1,6 @@
import { Link, useLocation } from 'react-router-dom';
import { useAuth } from '@/hooks/useAuth';
import { Avatar, AvatarFallback } from '@/components/ui/avatar';
import { House, Plus } from 'lucide-react';
export default function Navbar() {
const { user } = useAuth();
@@ -9,44 +8,19 @@ export default function Navbar() {
if (!user) return null;
const navItems = [
{ to: '/feed', label: 'Лента', icon: House },
{ to: '/upload', label: 'Добавить', icon: Plus },
];
return (
<nav className="sticky top-0 z-50 bg-[var(--surface)]/90 backdrop-blur-xl border-b border-[var(--border)]">
<nav className="sticky top-0 z-50 bg-[var(--surface)]/80 backdrop-blur-xl border-b">
<div className="mx-auto flex h-14 max-w-[660px] items-center justify-between px-4">
<Link
to="/feed"
className="text-[18px] font-bold tracking-tight"
style={{ background: 'linear-gradient(135deg, #007aff, #5856d6)', WebkitBackgroundClip: 'text', WebkitTextFillColor: 'transparent' }}
>
<Link to="/feed" className="text-[19px] font-bold gradient-text tracking-tight">
Catstagram
</Link>
<div className="flex items-center gap-1">
{navItems.map((item) => {
const Icon = item.icon;
const isActive = location.pathname === item.to;
return (
<Link
key={item.to}
to={item.to}
className={`flex items-center gap-1.5 px-3.5 py-2 rounded-full text-[13px] font-medium transition-all ${
isActive
? 'bg-[var(--primary-light)] text-[var(--primary)]'
: 'text-[var(--foreground-secondary)] hover:text-[var(--foreground)] hover:bg-[var(--secondary)]'
}`}
>
<Icon className={`h-4 w-4 ${isActive ? 'stroke-[2.5]' : 'stroke-[1.5]'}`} />
<span className="hidden sm:inline">{item.label}</span>
</Link>
);
})}
<div className="flex items-center gap-0.5">
<NavLink to="/feed" active={location.pathname === '/feed'} emoji="🏠" label="Лента" />
<NavLink to="/upload" active={location.pathname === '/upload'} emoji="➕" label="Добавить" short />
<Link to="/profile" className="ml-1">
<Avatar className="h-8 w-8 border-2 border-transparent hover:border-[var(--primary)] transition-all">
<Link to="/profile" className="ml-2">
<Avatar className="h-8 w-8 ring-1 ring-[var(--border)] hover:ring-[var(--primary)] transition-all">
<AvatarFallback className="text-[11px] avatar-initials">
{user.username.charAt(0).toUpperCase()}
</AvatarFallback>
@@ -57,3 +31,19 @@ export default function Navbar() {
</nav>
);
}
function NavLink({ to, active, emoji, label, short }: { to: string; active: boolean; emoji: string; label: string; short?: boolean }) {
return (
<Link
to={to}
className={`flex items-center gap-1.5 px-3 py-1.5 rounded-full text-[13px] font-medium transition-all ${
active
? 'bg-[var(--primary-soft)] text-[var(--primary)]'
: 'text-[var(--fg-secondary)] hover:text-[var(--fg)] hover:bg-[var(--secondary)]'
}`}
>
<span className="text-[15px] leading-none">{emoji}</span>
{(!short || true) && <span className={short ? 'hidden sm:inline' : ''}>{label}</span>}
</Link>
);
}

14
client/src/components/ProtectedRoute.tsx
View File

@@ -1,20 +1,24 @@
import { Navigate } from 'react-router-dom';
import { useAuth } from '@/hooks/useAuth';
import { Cat } from 'lucide-react';
export default function ProtectedRoute({ children }: { children: React.ReactNode }) {
const { user, isLoading } = useAuth();
if (isLoading) {
return (
<div className="flex h-screen items-center justify-center">
<div className="h-8 w-8 animate-spin rounded-full border-4 border-primary border-t-transparent" />
<div className="flex h-screen items-center justify-center bg-[var(--bg)]">
<div className="flex flex-col items-center gap-4">
<div className="h-14 w-14 rounded-full flex items-center justify-center" style={{ background: 'linear-gradient(135deg, #007aff, #5856d6)' }}>
<Cat className="h-7 w-7 text-white" strokeWidth={1.5} />
</div>
<div className="h-6 w-6 rounded-full border-2 border-[var(--primary)]/30 border-t-[var(--primary)] animate-spin" />
</div>
</div>
);
}
if (!user) {
return <Navigate to="/login" replace />;
}
if (!user) return <Navigate to="/login" replace />;
return <>{children}</>;
}

6
client/src/components/Toast.tsx
View File

@@ -1,6 +1,6 @@
import { createContext, useContext, useState, useCallback, ReactNode } from 'react';
type ToastType = 'success' | 'error' | 'like';
type ToastType = 'success' | 'error';
interface ToastItem { id: number; message: string; type: ToastType; }
@@ -25,10 +25,10 @@ export function ToastProvider({ children }: { children: ReactNode }) {
{toasts.map((t) => (
<div
key={t.id}
className="animate-toast-in rounded-full px-6 py-2.5 text-[14px] font-medium shadow-lg pointer-events-auto"
className="animate-toast-in rounded-full px-5 py-2.5 text-[14px] font-medium shadow-lg pointer-events-auto"
style={{
background: t.type === 'error'
? 'var(--danger)'
? 'linear-gradient(135deg, #ff3b30, #ff6b6b)'
: 'linear-gradient(135deg, #007aff, #5856d6)',
color: 'white',
}}

207
client/src/index.css
View File

@@ -2,39 +2,34 @@
@plugin "tailwindcss-animate";
:root {
--background: #f5f5f7;
--bg: #f2f2f7;
--surface: #ffffff;
--surface-hover: #f8f8fa;
--foreground: #1c1c1e;
--foreground-secondary: #8a8a8e;
--foreground-tertiary: #aeaeb2;
--fg: #1c1c1e;
--fg-secondary: #8a8a8e;
--fg-tertiary: #aeaeb2;
--primary: #007aff;
--primary-hover: #0066d6;
--primary-hover: #0056cc;
--primary-light: #e8f2ff;
--primary-foreground: #ffffff;
--primary-soft: rgba(0, 122, 255, 0.08);
--secondary: #f2f2f5;
--secondary-foreground: #1c1c1e;
--border: #e5e5ea;
--border-light: #f0f0f3;
--danger: #ff3b30;
--danger-hover: #d6342b;
--danger-light: #ffe8e6;
--success: #34c759;
--success-light: #e8f8ed;
--shadow-sm: 0 1px 3px rgba(0,0,0,0.04), 0 1px 2px rgba(0,0,0,0.03);
--shadow-md: 0 4px 12px rgba(0,0,0,0.06), 0 2px 4px rgba(0,0,0,0.03);
--shadow-lg: 0 12px 32px rgba(0,0,0,0.08), 0 4px 8px rgba(0,0,0,0.04);
--radius-sm: 8px;
--radius-md: 14px;
--radius-lg: 20px;
--radius-full: 9999px;
--shadow-sm: 0 1px 2px rgba(0,0,0,0.04);
--shadow-md: 0 4px 12px rgba(0,0,0,0.06);
--shadow-lg: 0 8px 30px rgba(0,0,0,0.08);
--shadow-card: 0 1px 3px rgba(0,0,0,0.04), 0 1px 2px rgba(0,0,0,0.02);
}
* { border-color: var(--border); }
body {
background: var(--background);
color: var(--foreground);
background: var(--bg);
color: var(--fg);
font-family: -apple-system, BlinkMacSystemFont, "SF Pro Display", "SF Pro Text",
"Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-webkit-font-smoothing: antialiased;
@@ -43,71 +38,56 @@ body {
letter-spacing: -0.01em;
}
::selection { background: var(--primary); color: white; }
/* ── Animations ── */
@keyframes fade-in {
from { opacity: 0; }
to { opacity: 1; }
}
@keyframes fade-in-up {
from { opacity: 0; transform: translateY(6px); }
from { opacity: 0; transform: translateY(8px); }
to { opacity: 1; transform: translateY(0); }
}
@keyframes scale-in {
from { opacity: 0; transform: scale(0.96); }
to { opacity: 1; transform: scale(1); }
}
@keyframes slide-up {
from { opacity: 0; transform: translateY(100%); }
to { opacity: 1; transform: translateY(0); }
}
@keyframes heart-bounce {
0% { transform: scale(1); }
25% { transform: scale(1.3); }
50% { transform: scale(0.95); }
25% { transform: scale(1.35); }
50% { transform: scale(0.9); }
75% { transform: scale(1.1); }
100% { transform: scale(1); }
}
@keyframes spin-slow {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}
@keyframes shimmer {
0% { background-position: -200% 0; }
100% { background-position: 200% 0; }
}
@keyframes toast-in {
from { opacity: 0; transform: translateY(12px) scale(0.96); }
from { opacity: 0; transform: translateY(16px) scale(0.95); }
to { opacity: 1; transform: translateY(0) scale(1); }
}
@keyframes toast-out {
from { opacity: 1; transform: translateY(0) scale(1); }
to { opacity: 0; transform: translateY(-8px) scale(0.96); }
@keyframes skeleton-pulse {
0% { opacity: 0.6; }
50% { opacity: 1; }
100% { opacity: 0.6; }
}
@keyframes float {
0%, 100% { transform: translateY(0); }
50% { transform: translateY(-4px); }
}
.animate-fade-in { animation: fade-in 0.15s ease-out; }
.animate-fade-in-up { animation: fade-in-up 0.25s cubic-bezier(0.16, 1, 0.3, 1); }
.animate-scale-in { animation: scale-in 0.2s cubic-bezier(0.16, 1, 0.3, 1); }
.animate-slide-up { animation: slide-up 0.3s cubic-bezier(0.16, 1, 0.3, 1); }
.animate-heart { animation: heart-bounce 0.35s cubic-bezier(0.16, 1, 0.3, 1); }
.animate-spin-slow { animation: spin-slow 1s linear infinite; }
.animate-toast-in { animation: toast-in 0.25s cubic-bezier(0.16, 1, 0.3, 1); }
.animate-fade-in-up { animation: fade-in-up 0.3s cubic-bezier(0.16, 1, 0.3, 1); }
.animate-scale-in { animation: scale-in 0.25s cubic-bezier(0.16, 1, 0.3, 1); }
.animate-heart { animation: heart-bounce 0.4s cubic-bezier(0.16, 1, 0.3, 1); }
.animate-toast-in { animation: toast-in 0.3s cubic-bezier(0.16, 1, 0.3, 1); }
.animate-skeleton { animation: skeleton-pulse 1.5s ease-in-out infinite; }
.animate-float { animation: float 3s ease-in-out infinite; }
/* ── Shared UI ── */
/* ── Card ── */
.card {
background: var(--surface);
border-radius: var(--radius-md);
box-shadow: var(--shadow-sm);
border-radius: 16px;
box-shadow: var(--shadow-card);
border: 1px solid var(--border);
transition: box-shadow 0.2s ease;
}
.card:hover {
box-shadow: var(--shadow-md);
transition: box-shadow 0.2s, transform 0.15s;
}
/* ── Avatar ── */
.avatar-initials {
border-radius: 50%;
display: flex;
@@ -115,105 +95,68 @@ body {
justify-content: center;
font-weight: 600;
color: white;
background: var(--primary);
background: linear-gradient(135deg, var(--primary), #5856d6);
user-select: none;
}
/* ── Buttons ── */
.btn-icon {
display: inline-flex;
align-items: center;
justify-content: center;
border-radius: var(--radius-full);
transition: background 0.15s ease, transform 0.1s ease;
cursor: pointer;
border: none;
}
.btn-icon:active {
transform: scale(0.92);
}
.link-blue {
color: var(--primary);
font-weight: 600;
transition: opacity 0.15s;
}
.link-blue:hover {
opacity: 0.8;
text-decoration: underline;
}
.text-secondary { color: var(--foreground-secondary); }
.text-tertiary { color: var(--foreground-tertiary); }
/* ── Utility ── */
.skeleton-shimmer {
background: linear-gradient(90deg, #e8e8ec 25%, #f2f2f5 50%, #e8e8ec 75%);
background-size: 200% 100%;
animation: shimmer 1.2s ease-in-out infinite;
}
/* ── Modal backdrop ── */
.backdrop-blur {
backdrop-filter: blur(8px);
-webkit-backdrop-filter: blur(8px);
}
/* ── Button base ── */
.btn-primary {
display: inline-flex;
align-items: center;
justify-content: center;
font-weight: 600;
border-radius: var(--radius-full);
background: var(--primary);
color: white;
border-radius: 9999px;
transition: background 0.15s, transform 0.1s;
cursor: pointer;
border: none;
}
.btn-primary:hover { background: var(--primary-hover); }
.btn-primary:active { transform: scale(0.97); }
.btn-primary:disabled {
opacity: 0.5;
cursor: not-allowed;
transform: none;
}
.btn-icon:active { transform: scale(0.9); }
.btn-outline {
display: inline-flex;
align-items: center;
justify-content: center;
font-weight: 500;
border-radius: var(--radius-full);
background: transparent;
color: var(--foreground);
border: 1px solid var(--border);
transition: background 0.15s, border-color 0.15s;
cursor: pointer;
.link-accent {
color: var(--primary);
font-weight: 600;
transition: opacity 0.15s;
}
.btn-outline:hover { background: var(--secondary); border-color: var(--foreground-tertiary); }
.btn-outline:active { transform: scale(0.97); }
.link-accent:hover { opacity: 0.8; text-decoration: underline; }
/* ── Scrollbar ── */
/* ── Utilities ── */
.text-secondary { color: var(--fg-secondary); }
.text-tertiary { color: var(--fg-tertiary); }
.scrollbar-none::-webkit-scrollbar { display: none; }
.scrollbar-none { -ms-overflow-style: none; scrollbar-width: none; }
/* ── Image loading ── */
/* ── Image shimmer ── */
.img-loading {
background: var(--secondary);
.img-shimmer {
position: relative;
overflow: hidden;
}
.img-loading::after {
.img-shimmer::after {
content: '';
position: absolute;
inset: 0;
background: linear-gradient(90deg, transparent, rgba(255,255,255,0.15), transparent);
animation: shimmer 1.5s infinite;
background-size: 200% 100%;
background: linear-gradient(90deg, transparent, rgba(255,255,255,0.1), transparent);
animation: skeleton-pulse 1.5s ease-in-out infinite;
}
/* ── Gradient text ── */
.gradient-text {
background: linear-gradient(135deg, #007aff, #5856d6);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
/* ── Focus ring ── */
.input-focus {
transition: border-color 0.15s, box-shadow 0.15s;
}
.input-focus:focus {
border-color: var(--primary);
box-shadow: 0 0 0 3px rgba(0, 122, 255, 0.15);
outline: none;
}

95
client/src/pages/CatPage.tsx
View File

@@ -36,8 +36,7 @@ export default function CatPage() {
setLiked(false);
try {
const res = await unlikeMutation.mutateAsync();
if (res.ownerPoints !== undefined && cat.user_id === user.id)
updateUser({ ...user, points: res.ownerPoints });
if (res.ownerPoints !== undefined && cat.user_id === user.id) updateUser({ ...user, points: res.ownerPoints });
refetchLike();
} catch { setLiked(true); }
} else {
@@ -73,21 +72,13 @@ export default function CatPage() {
if (isError || !cat) {
return (
<div className="flex flex-col items-center justify-center py-24 animate-fade-in">
<div className="flex flex-col items-center justify-center py-24 animate-fade-in-up">
<div className="mb-5 flex h-16 w-16 items-center justify-center rounded-full bg-[var(--secondary)]">
<span className="text-2xl">🔍</span>
</div>
<p className="text-[17px] font-semibold mb-1.5">Кот не найден</p>
<p className="text-[14px] text-[var(--foreground-secondary)] mb-6">
Возможно, публикация была удалена
</p>
<Button
variant="outline"
onClick={() => navigate('/feed')}
className="rounded-full text-[13px]"
>
Перейти в ленту
</Button>
<p className="text-[14px] text-[var(--fg-secondary)] mb-6">Возможно, публикация была удалена</p>
<Button variant="outline" onClick={() => navigate('/feed')} className="rounded-full text-[13px]">Перейти в ленту</Button>
</div>
);
}
@@ -97,59 +88,43 @@ export default function CatPage() {
});
return (
<div className="mx-auto max-w-[580px] px-4 py-6 animate-fade-in">
<button
onClick={() => navigate(-1)}
className="mb-5 flex items-center gap-1.5 text-[14px] text-[var(--foreground-secondary)] hover:text-[var(--foreground)] transition-colors group"
>
<div className="mx-auto max-w-[580px] px-4 py-6 animate-fade-in-up">
<button onClick={() => navigate(-1)}
className="mb-5 flex items-center gap-1.5 text-[14px] text-[var(--fg-secondary)] hover:text-[var(--fg)] transition-colors group">
<ArrowLeft className="h-4 w-4 stroke-[1.5] group-hover:-translate-x-0.5 transition-transform" />
Назад
</button>
<div className="card overflow-hidden">
{/* Image */}
<div className="bg-[var(--secondary)] relative img-loading">
<div className="bg-[var(--secondary)] relative img-shimmer">
{!imageLoaded && (
<div className="absolute inset-0 flex items-center justify-center">
<div className="h-8 w-8 rounded-full border-2 border-[var(--foreground-tertiary)]/30 border-t-[var(--primary)] animate-spin" />
<div className="h-8 w-8 rounded-full border-2 border-[var(--fg-tertiary)]/30 border-t-[var(--primary)] animate-spin" />
</div>
)}
<img
src={cat.image_url}
alt={cat.caption || 'Фото кота'}
<img src={cat.image_url} alt={cat.caption || 'Фото кота'}
className={`w-full max-h-[60vh] object-contain mx-auto transition-opacity duration-300 ${imageLoaded ? 'opacity-100' : 'opacity-0'}`}
onLoad={() => setImageLoaded(true)}
/>
onLoad={() => setImageLoaded(true)} />
</div>
<div className="p-5 space-y-4">
{/* Header */}
<div className="flex items-start justify-between">
<Link to={`/profile/${cat.user_id}`} className="flex items-center gap-3 group">
<Avatar className="h-10 w-10">
<AvatarFallback className="text-sm avatar-initials">
{cat.username.charAt(0).toUpperCase()}
</AvatarFallback>
<Avatar className="h-10 w-10 ring-1 ring-[var(--border)]">
<AvatarFallback className="text-sm avatar-initials">{cat.username.charAt(0).toUpperCase()}</AvatarFallback>
</Avatar>
<div>
<span className="text-[15px] font-semibold group-hover:text-[var(--primary)] transition-colors">
@{cat.username}
</span>
<p className="text-[12px] text-[var(--foreground-tertiary)]">{dateStr}</p>
<span className="text-[15px] font-semibold group-hover:text-[var(--primary)] transition-colors">@{cat.username}</span>
<p className="text-[12px] text-[var(--fg-tertiary)]">{dateStr}</p>
</div>
</Link>
{isOwner && (
<button
onClick={handleDelete}
className="btn-icon h-9 w-9 text-[var(--foreground-secondary)] hover:text-[var(--danger)] hover:bg-[var(--danger-light)]"
title="Удалить"
>
<button onClick={handleDelete} className="btn-icon h-9 w-9 text-[var(--fg-secondary)] hover:text-[var(--danger)] hover:bg-[var(--danger-light)]">
<Trash2 className="h-4 w-4" strokeWidth={1.5} />
</button>
)}
</div>
{/* Caption */}
{cat.caption && (
<p className="text-[15px] leading-[1.4]">
<span className="font-semibold mr-1.5">@{cat.username}</span>
@@ -157,44 +132,26 @@ export default function CatPage() {
</p>
)}
{/* Divider */}
<div className="border-t border-[var(--border)]" />
<div className="border-t" />
{/* Actions */}
<div className="flex items-center gap-6">
<button
onClick={toggleLike}
disabled={isOwner || !user}
<button onClick={toggleLike} disabled={isOwner || !user}
className={`btn-icon flex items-center gap-2 text-[15px] font-medium ${
isOwner
? 'text-[var(--foreground-tertiary)] cursor-not-allowed'
: liked
? 'text-[var(--danger)]'
: 'text-[var(--foreground-secondary)] hover:text-[var(--foreground)]'
}`}
>
<Heart
className={`h-6 w-6 transition-all ${liked ? 'fill-[var(--danger)] stroke-[var(--danger)] animate-heart' : 'stroke-[1.5]'}`}
/>
isOwner ? 'text-[var(--fg-tertiary)] cursor-not-allowed' : liked ? 'text-[var(--danger)]' : 'text-[var(--fg-secondary)] hover:text-[var(--fg)]'
}`}>
<Heart className={`h-6 w-6 transition-all ${liked ? 'fill-[var(--danger)] stroke-[var(--danger)] animate-heart' : 'stroke-[1.5]'}`} />
{cat.likes_count > 0 && <span className="tabular-nums">{cat.likes_count}</span>}
</button>
<span className="flex items-center gap-1.5 text-[14px] text-[var(--foreground-secondary)]">
<span className="flex items-center gap-1.5 text-[14px] text-[var(--fg-secondary)]">
<span>🏆</span>
<span className="font-semibold">{cat.user_points}</span>
<span className="text-[var(--foreground-tertiary)]">баллов</span>
<span className="text-[var(--fg-tertiary)]">баллов</span>
</span>
</div>
{/* Back to feed button */}
<div className="pt-2">
<Button
variant="outline"
size="sm"
onClick={() => navigate('/feed')}
className="rounded-full text-[12px] h-8"
>
← В ленту
<div className="pt-1">
<Button variant="outline" size="sm" onClick={() => navigate('/feed')} className="rounded-full text-[12px] h-8 gap-1">
<ArrowLeft className="h-3.5 w-3.5" strokeWidth={1.5} /> В ленту
</Button>
</div>
</div>

90
client/src/pages/FeedPage.tsx
View File

@@ -4,7 +4,6 @@ import CatCard from '@/components/CatCard';
import FeedSidebar from '@/components/FeedSidebar';
import CatModal from '@/components/CatModal';
import { Button } from '@/components/ui/button';
import { Skeleton } from '@/components/ui/skeleton';
import { ChevronLeft, ChevronRight, RefreshCw } from 'lucide-react';
function FeedSkeleton() {
@@ -13,16 +12,16 @@ function FeedSkeleton() {
{Array.from({ length: 3 }).map((_, i) => (
<div key={i} className="card overflow-hidden">
<div className="flex items-center gap-3 px-4 py-3">
<Skeleton className="h-10 w-10 rounded-full" />
<div className="space-y-1.5">
<Skeleton className="h-4 w-28 rounded-full" />
<Skeleton className="h-3 w-16 rounded-full" />
<div className="h-10 w-10 rounded-full bg-[var(--secondary)] animate-skeleton" />
<div className="space-y-2">
<div className="h-3.5 w-28 rounded-full bg-[var(--secondary)] animate-skeleton" />
<div className="h-2.5 w-16 rounded-full bg-[var(--secondary)] animate-skeleton" />
</div>
</div>
<Skeleton className="aspect-[4/3] w-full" />
<div className="aspect-[4/3] w-full bg-[var(--secondary)] animate-skeleton" />
<div className="p-4 space-y-2">
<Skeleton className="h-4 w-40 rounded-full" />
<Skeleton className="h-4 w-20 rounded-full" />
<div className="h-3.5 w-40 rounded-full bg-[var(--secondary)] animate-skeleton" />
<div className="h-3.5 w-20 rounded-full bg-[var(--secondary)] animate-skeleton" />
</div>
</div>
))}
@@ -39,34 +38,23 @@ export default function FeedPage() {
<div className="mx-auto max-w-[660px] px-4 py-4">
<div className="flex gap-6">
<main className="flex-1 min-w-0">
{/* Page indicator */}
{data && data.totalPages > 0 && (
<div className="flex items-center justify-between mb-4">
<h2 className="text-[13px] font-semibold text-[var(--foreground-secondary)] uppercase tracking-wider">
Лента
</h2>
<span className="text-[12px] text-[var(--foreground-tertiary)] tabular-nums">
{data.total} публикаций
</span>
<h2 className="text-[12px] font-bold text-[var(--fg-secondary)] uppercase tracking-[0.08em]">Лента</h2>
<span className="text-[11px] text-[var(--fg-tertiary)] tabular-nums">{data.total} публикаций</span>
</div>
)}
{isLoading && <FeedSkeleton />}
{isError && (
<div className="flex flex-col items-center justify-center py-24 text-center animate-fade-in">
<div className="flex flex-col items-center justify-center py-24 text-center animate-fade-in-up">
<div className="mb-5 flex h-16 w-16 items-center justify-center rounded-full bg-[var(--danger-light)]">
<span className="text-2xl">😿</span>
</div>
<p className="text-[17px] font-semibold mb-1.5">Не удалось загрузить</p>
<p className="text-[14px] text-[var(--foreground-secondary)] mb-6 max-w-xs">
Проверьте подключение к интернету и попробуйте снова
</p>
<Button
variant="outline"
onClick={() => refetch()}
className="rounded-full text-[13px] gap-1.5"
>
<p className="text-[14px] text-[var(--fg-secondary)] mb-6 max-w-xs">Проверьте подключение и попробуйте снова</p>
<Button variant="outline" onClick={() => refetch()} className="rounded-full text-[13px] gap-1.5">
<RefreshCw className="h-3.5 w-3.5" strokeWidth={1.5} />
Попробовать снова
</Button>
@@ -74,18 +62,14 @@ export default function FeedPage() {
)}
{data && data.cats.length === 0 && (
<div className="flex flex-col items-center justify-center py-24 text-center animate-fade-in">
<div className="flex flex-col items-center justify-center py-24 text-center animate-fade-in-up">
<div className="mb-5 flex h-16 w-16 items-center justify-center rounded-full bg-[var(--primary-light)]">
<span className="text-2xl">🐱</span>
</div>
<p className="text-[17px] font-semibold mb-1.5">Пока нет котов</p>
<p className="text-[14px] text-[var(--foreground-secondary)] mb-6">
Будьте первым, кто загрузит фото кота
</p>
<Button
onClick={() => window.location.href = '/upload'}
className="rounded-full text-[13px] bg-[var(--primary)] hover:bg-[var(--primary-hover)]"
>
<p className="text-[14px] text-[var(--fg-secondary)] mb-6">Будьте первым, кто загрузит фото кота</p>
<Button onClick={() => window.location.href = '/upload'} className="rounded-full text-[13px]"
style={{ background: 'linear-gradient(135deg, #007aff, #5856d6)' }}>
Загрузить кота
</Button>
</div>
@@ -93,48 +77,32 @@ export default function FeedPage() {
{data && data.cats.length > 0 && (
<>
{data.cats.map((cat, index) => (
{data.cats.map((cat) => (
<CatCard key={cat.id} cat={cat} onOpen={setModalCatId} />
))}
{data.totalPages > 1 && (
<nav className="flex items-center justify-center gap-4 mt-6 pb-6">
<Button
variant="outline"
size="sm"
onClick={() => setPage((p) => Math.max(1, p - 1))}
disabled={page === 1}
className="rounded-full text-[13px] h-9 px-4 gap-1"
>
<ChevronLeft className="h-4 w-4" strokeWidth={1.5} />
Назад
<nav className="flex items-center justify-center gap-3 mt-6 pb-6">
<Button variant="outline" size="sm" onClick={() => setPage((p) => Math.max(1, p - 1))} disabled={page === 1}
className="rounded-full text-[13px] h-9 px-4 gap-0.5">
<ChevronLeft className="h-4 w-4" strokeWidth={1.5} /> Назад
</Button>
<div className="flex gap-1.5">
{Array.from({ length: data.totalPages }, (_, i) => i + 1).map((p) => (
<button
key={p}
onClick={() => setPage(p)}
<button key={p} onClick={() => setPage(p)}
className={`h-8 w-8 rounded-full text-[13px] font-medium transition-all ${
p === page
? 'bg-[var(--primary)] text-white'
: 'text-[var(--foreground-secondary)] hover:bg-[var(--secondary)]'
p === page ? 'text-white shadow-md' : 'text-[var(--fg-secondary)] hover:bg-[var(--secondary)]'
}`}
>
style={p === page ? { background: 'linear-gradient(135deg, #007aff, #5856d6)' } : {}}>
{p}
</button>
))}
</div>
<Button
variant="outline"
size="sm"
onClick={() => setPage((p) => p + 1)}
disabled={page >= data.totalPages}
className="rounded-full text-[13px] h-9 px-4 gap-1"
>
Вперёд
<ChevronRight className="h-4 w-4" strokeWidth={1.5} />
<Button variant="outline" size="sm" onClick={() => setPage((p) => p + 1)} disabled={page >= data.totalPages}
className="rounded-full text-[13px] h-9 px-4 gap-0.5">
Вперёд <ChevronRight className="h-4 w-4" strokeWidth={1.5} />
</Button>
</nav>
)}
@@ -143,9 +111,7 @@ export default function FeedPage() {
</main>
<aside className="hidden lg:block w-[240px] shrink-0">
<div className="sticky top-20">
<FeedSidebar />
</div>
<div className="sticky top-20"><FeedSidebar /></div>
</aside>
</div>

43
client/src/pages/LoginPage.tsx
View File

@@ -26,22 +26,22 @@ export default function LoginPage() {
};
return (
<div className="flex min-h-screen items-center justify-center p-5 bg-[#f5f5f7]">
<div className="flex min-h-screen items-center justify-center p-5 bg-[var(--bg)]">
<div className="w-full max-w-sm animate-fade-in-up">
<div className="text-center mb-10">
<div className="mx-auto mb-5 flex h-20 w-20 items-center justify-center rounded-full"
<div className="mx-auto mb-5 flex h-20 w-20 items-center justify-center rounded-full animate-float"
style={{ background: 'linear-gradient(135deg, #007aff 0%, #5856d6 100%)' }}>
<Cat className="h-10 w-10 text-white" strokeWidth={1.5} />
</div>
<h1 className="text-[28px] font-bold tracking-tight">Catstagram</h1>
<p className="text-[15px] text-[var(--foreground-secondary)] mt-1.5">
<h1 className="text-[28px] font-bold gradient-text">Catstagram</h1>
<p className="text-[15px] text-[var(--fg-secondary)] mt-1.5">
Войдите, чтобы смотреть котов
</p>
</div>
<form onSubmit={handleSubmit} className="space-y-3.5">
<div className="space-y-1">
<label className="text-[13px] font-medium text-[var(--foreground-secondary)] ml-1">
<form onSubmit={handleSubmit} className="space-y-4">
<div className="space-y-1.5">
<label className="text-[13px] font-medium text-[var(--fg-secondary)] ml-1">
Имя пользователя
</label>
<Input
@@ -50,11 +50,11 @@ export default function LoginPage() {
placeholder="your_cat_lover"
required
autoFocus
className="h-12 text-[15px] rounded-xl bg-white border focus:border-[var(--primary)] focus:ring-2 focus:ring-[var(--primary)]/20 transition-all"
className="h-12 text-[15px] rounded-xl bg-white border input-focus"
/>
</div>
<div className="space-y-1">
<label className="text-[13px] font-medium text-[var(--foreground-secondary)] ml-1">
<div className="space-y-1.5">
<label className="text-[13px] font-medium text-[var(--fg-secondary)] ml-1">
Пароль
</label>
<Input
@@ -63,13 +63,13 @@ export default function LoginPage() {
onChange={(e) => setPassword(e.target.value)}
placeholder="••••••••"
required
className="h-12 text-[15px] rounded-xl bg-white border focus:border-[var(--primary)] focus:ring-2 focus:ring-[var(--primary)]/20 transition-all"
className="h-12 text-[15px] rounded-xl bg-white border input-focus"
/>
</div>
{error && (
<div className="flex items-center gap-2 px-4 py-3 rounded-xl bg-[var(--danger-light)] text-[var(--danger)] text-[13px] font-medium animate-fade-in">
<span>⚠</span>
<div className="flex items-center gap-2 px-4 py-3 rounded-xl bg-[var(--danger-light)] text-[var(--danger)] text-[13px] font-medium animate-fade-in-up">
<span>⚠️</span>
<span>{error}</span>
</div>
)}
@@ -77,7 +77,8 @@ export default function LoginPage() {
<Button
type="submit"
disabled={loading}
className="w-full h-12 rounded-xl text-[15px] font-semibold bg-[var(--primary)] hover:bg-[var(--primary-hover)] disabled:opacity-60 transition-all"
className="w-full h-12 rounded-xl text-[15px] font-semibold transition-all active:scale-[0.98]"
style={{ background: 'linear-gradient(135deg, #007aff, #5856d6)' }}
>
{loading ? (
<span className="flex items-center gap-2">
@@ -89,21 +90,15 @@ export default function LoginPage() {
</form>
<div className="relative my-8">
<div className="absolute inset-0 flex items-center">
<div className="w-full border-t border-[var(--border)]"></div>
</div>
<div className="absolute inset-0 flex items-center"><div className="w-full border-t"></div></div>
<div className="relative flex justify-center">
<span className="px-4 text-[13px] text-[var(--foreground-tertiary)] bg-[#f5f5f7]">
или
</span>
<span className="px-4 text-[13px] text-[var(--fg-tertiary)] bg-[var(--bg)]">или</span>
</div>
</div>
<p className="text-center text-[14px] text-[var(--foreground-secondary)]">
<p className="text-center text-[14px] text-[var(--fg-secondary)]">
Нет аккаунта?{' '}
<Link to="/register" className="link-blue">
Зарегистрироваться
</Link>
<Link to="/register" className="link-accent">Зарегистрироваться</Link>
</p>
</div>
</div>

147
client/src/pages/ProfilePage.tsx
View File

@@ -13,7 +13,7 @@ export default function ProfilePage() {
const navigate = useNavigate();
const { user: me, logout } = useAuth();
const [modalCatId, setModalCatId] = useState<number | null>(null);
const [tab, setTab] = useState<'photos' | 'likes'>('photos');
const [tab, setTab] = useState<'photos'>('photos');
const profileUserId = paramId ? parseInt(paramId) : me?.id;
const isMe = !paramId || (me && profileUserId === me.id);
@@ -37,9 +37,7 @@ export default function ProfilePage() {
</div>
</div>
<div className="grid grid-cols-3 gap-2">
{Array.from({ length: 6 }).map((_, i) => (
<Skeleton key={i} className="aspect-square rounded-xl" />
))}
{Array.from({ length: 6 }).map((_, i) => (<Skeleton key={i} className="aspect-square rounded-xl" />))}
</div>
</div>
);
@@ -47,14 +45,10 @@ export default function ProfilePage() {
if (!profileUser && !isMe) {
return (
<div className="flex flex-col items-center justify-center py-24 animate-fade-in">
<div className="mb-5 flex h-16 w-16 items-center justify-center rounded-full bg-[var(--secondary)]">
<span className="text-2xl">🔍</span>
</div>
<div className="flex flex-col items-center justify-center py-24 animate-fade-in-up">
<div className="mb-5 flex h-16 w-16 items-center justify-center rounded-full bg-[var(--secondary)]"><span className="text-2xl">🔍</span></div>
<p className="text-[17px] font-semibold mb-1.5">Пользователь не найден</p>
<Button variant="outline" onClick={() => navigate('/feed')} className="rounded-full text-[13px] mt-2">
Вернуться в ленту
</Button>
<Button variant="outline" onClick={() => navigate('/feed')} className="rounded-full text-[13px] mt-2">Вернуться в ленту</Button>
</div>
);
}
@@ -64,21 +58,17 @@ export default function ProfilePage() {
const totalLikes = cats.reduce((sum, c) => sum + c.likes_count, 0);
return (
<div className="mx-auto max-w-[660px] px-4 py-6">
<div className="mx-auto max-w-[660px] px-4 py-6 animate-fade-in-up">
{!isMe && (
<button
onClick={() => navigate(-1)}
className="mb-4 flex items-center gap-1.5 text-[14px] text-[var(--foreground-secondary)] hover:text-[var(--foreground)] transition-colors"
>
<ArrowLeft className="h-4 w-4" strokeWidth={1.5} />
<button onClick={() => navigate(-1)} className="mb-4 flex items-center gap-1.5 text-[14px] text-[var(--fg-secondary)] hover:text-[var(--fg)] transition-colors group">
<ArrowLeft className="h-4 w-4 stroke-[1.5] group-hover:-translate-x-0.5 transition-transform" />
Назад
</button>
)}
{/* Profile header */}
<div className="flex items-center gap-6 mb-8">
<Avatar className="h-20 w-20 shrink-0 ring-2 ring-[var(--primary)]/20 ring-offset-2">
<AvatarFallback className="text-[26px] font-bold avatar-initials">
<AvatarFallback className="text-[26px] font-bold" style={{ background: 'linear-gradient(135deg, #007aff, #5856d6)', color: 'white', borderRadius: '50%', display: 'flex', alignItems: 'center', justifyContent: 'center', width: '100%', height: '100%' }}>
{initials}
</AvatarFallback>
</Avatar>
@@ -86,11 +76,7 @@ export default function ProfilePage() {
<div className="flex items-center gap-3 mb-2">
<h1 className="text-[20px] font-bold truncate">@{profileUser?.username}</h1>
{isMe && (
<button
onClick={logout}
className="btn-icon h-8 w-8 text-[var(--foreground-secondary)] hover:text-[var(--danger)] hover:bg-[var(--danger-light)] ml-auto"
title="Выйти"
>
<button onClick={logout} className="btn-icon h-8 w-8 text-[var(--fg-secondary)] hover:text-[var(--danger)] hover:bg-[var(--danger-light)] ml-auto" title="Выйти">
<LogOut className="h-4 w-4" strokeWidth={1.5} />
</button>
)}
@@ -99,21 +85,22 @@ export default function ProfilePage() {
<div className="flex items-center gap-6 text-[14px] mb-3">
<div className="text-center">
<p className="font-bold text-[16px]">{cats.length}</p>
<p className="text-[12px] text-[var(--foreground-secondary)]">публикаций</p>
<p className="text-[11px] text-[var(--fg-secondary)]">публикаций</p>
</div>
<div className="text-center">
<p className="font-bold text-[16px]">{totalLikes}</p>
<p className="text-[12px] text-[var(--foreground-secondary)]">лайков</p>
<p className="text-[11px] text-[var(--fg-secondary)]">лайков</p>
</div>
<div className="text-center">
<p className="font-bold text-[16px]">🏆{profileUser?.points ?? 0}</p>
<p className="text-[12px] text-[var(--foreground-secondary)]">баллов</p>
<p className="text-[11px] text-[var(--fg-secondary)]">баллов</p>
</div>
</div>
{isMe && (
<Link to="/upload">
<Button size="sm" className="rounded-full text-[13px] h-8 bg-[var(--primary)] hover:bg-[var(--primary-hover)] gap-1.5">
<Button size="sm" className="rounded-full text-[13px] h-8 gap-1.5"
style={{ background: 'linear-gradient(135deg, #007aff, #5856d6)' }}>
<Plus className="h-3.5 w-3.5" strokeWidth={2} />
Новая публикация
</Button>
@@ -122,84 +109,42 @@ export default function ProfilePage() {
</div>
</div>
{/* Tabs */}
<div className="flex gap-1 mb-5 border-b border-[var(--border)]">
<button
onClick={() => setTab('photos')}
className={`px-5 py-3 text-[14px] font-medium border-b-2 transition-all ${
tab === 'photos'
? 'border-[var(--primary)] text-[var(--primary)]'
: 'border-transparent text-[var(--foreground-secondary)] hover:text-[var(--foreground)]'
}`}
>
<div className="flex gap-1 mb-5">
<button onClick={() => setTab('photos')}
className={`px-5 py-2.5 text-[14px] font-medium rounded-lg transition-all ${
tab === 'photos' ? 'bg-[var(--primary-soft)] text-[var(--primary)]' : 'text-[var(--fg-secondary)] hover:text-[var(--fg)] hover:bg-[var(--secondary)]'
}`}>
Фото
</button>
<button
onClick={() => setTab('likes')}
className={`px-5 py-3 text-[14px] font-medium border-b-2 transition-all ${
tab === 'likes'
? 'border-[var(--primary)] text-[var(--primary)]'
: 'border-transparent text-[var(--foreground-secondary)] hover:text-[var(--foreground)]'
}`}
>
Избранное
</button>
</div>
{/* Content */}
{tab === 'photos' && (
cats.length === 0 ? (
<div className="flex flex-col items-center justify-center py-16 text-center animate-fade-in">
<div className="mb-4 flex h-14 w-14 items-center justify-center rounded-full bg-[var(--secondary)]">
<span className="text-xl">📸</span>
</div>
<p className="text-[15px] font-medium mb-1">Пока нет котов</p>
<p className="text-[13px] text-[var(--foreground-secondary)] mb-5 max-w-xs">
{isMe ? 'Поделитесь первым фото кота' : 'У пользователя пока нет котов'}
</p>
{isMe && (
<Link to="/upload">
<Button size="sm" className="rounded-full text-[13px] bg-[var(--primary)] hover:bg-[var(--primary-hover)]">
Загрузить кота
</Button>
</Link>
)}
</div>
) : (
<div className="grid grid-cols-3 gap-2">
{cats.map((cat) => (
<button
key={cat.id}
onClick={() => setModalCatId(cat.id)}
className="group relative aspect-square overflow-hidden bg-[var(--secondary)] rounded-xl"
>
<img
src={cat.image_url}
alt={cat.caption || 'Фото кота'}
className="h-full w-full object-cover transition-all duration-300 group-hover:scale-105"
loading="lazy"
/>
<div className="absolute inset-0 bg-gradient-to-t from-black/40 via-transparent to-transparent opacity-0 group-hover:opacity-100 transition-opacity flex items-end p-3">
<div className="flex items-center gap-1.5 text-white text-[13px] font-semibold">
<Heart className="h-4 w-4 fill-white" strokeWidth={2} />
<span>{cat.likes_count}</span>
</div>
</div>
</button>
))}
</div>
)
)}
{tab === 'likes' && (
<div className="flex flex-col items-center justify-center py-16 text-center animate-fade-in">
<div className="mb-4 flex h-14 w-14 items-center justify-center rounded-full bg-[var(--primary-light)]">
<Heart className="h-6 w-6 text-[var(--primary)]" strokeWidth={1.5} />
</div>
<p className="text-[15px] font-medium mb-1">Скоро</p>
<p className="text-[13px] text-[var(--foreground-secondary)]">
Здесь появятся понравившиеся коты
{cats.length === 0 ? (
<div className="flex flex-col items-center justify-center py-16 text-center animate-fade-in-up">
<div className="mb-4 flex h-14 w-14 items-center justify-center rounded-full bg-[var(--secondary)]"><span className="text-xl">📸</span></div>
<p className="text-[15px] font-medium mb-1">Пока нет котов</p>
<p className="text-[13px] text-[var(--fg-secondary)] mb-5 max-w-xs">
{isMe ? 'Поделитесь первым фото кота' : 'У пользователя пока нет котов'}
</p>
{isMe && (
<Link to="/upload"><Button size="sm" className="rounded-full text-[13px]"
style={{ background: 'linear-gradient(135deg, #007aff, #5856d6)' }}>Загрузить кота</Button></Link>
)}
</div>
) : (
<div className="grid grid-cols-3 gap-1.5">
{cats.map((cat) => (
<button key={cat.id} onClick={() => setModalCatId(cat.id)}
className="group relative aspect-square overflow-hidden bg-[var(--secondary)] rounded-xl shadow-sm">
<img src={cat.image_url} alt={cat.caption || 'Фото кота'}
className="h-full w-full object-cover transition-all duration-300 group-hover:scale-105" loading="lazy" />
<div className="absolute inset-0 bg-gradient-to-t from-black/40 via-transparent to-transparent opacity-0 group-hover:opacity-100 transition-opacity flex items-end p-3">
<div className="flex items-center gap-1.5 text-white text-[13px] font-semibold drop-shadow-sm">
<Heart className="h-4 w-4 fill-white" strokeWidth={2} />
<span>{cat.likes_count}</span>
</div>
</div>
</button>
))}
</div>
)}

91
client/src/pages/RegisterPage.tsx
View File

@@ -18,12 +18,7 @@ export default function RegisterPage() {
const handleSubmit = async (e: FormEvent) => {
e.preventDefault();
setError('');
if (password !== confirm) {
setError('Пароли не совпадают');
return;
}
if (password !== confirm) { setError('Пароли не совпадают'); return; }
setLoading(true);
try {
await register(username, password);
@@ -33,73 +28,41 @@ export default function RegisterPage() {
};
return (
<div className="flex min-h-screen items-center justify-center p-5 bg-[#f5f5f7]">
<div className="flex min-h-screen items-center justify-center p-5 bg-[var(--bg)]">
<div className="w-full max-w-sm animate-fade-in-up">
<div className="text-center mb-10">
<div className="mx-auto mb-5 flex h-20 w-20 items-center justify-center rounded-full"
<div className="mx-auto mb-5 flex h-20 w-20 items-center justify-center rounded-full animate-float"
style={{ background: 'linear-gradient(135deg, #007aff 0%, #5856d6 100%)' }}>
<Cat className="h-10 w-10 text-white" strokeWidth={1.5} />
</div>
<h1 className="text-[28px] font-bold tracking-tight">Catstagram</h1>
<p className="text-[15px] text-[var(--foreground-secondary)] mt-1.5">
Присоединяйтесь к сообществу
</p>
<h1 className="text-[28px] font-bold gradient-text">Catstagram</h1>
<p className="text-[15px] text-[var(--fg-secondary)] mt-1.5">Присоединяйтесь к сообществу</p>
</div>
<form onSubmit={handleSubmit} className="space-y-3.5">
<div className="space-y-1">
<label className="text-[13px] font-medium text-[var(--foreground-secondary)] ml-1">
Имя пользователя
</label>
<Input
value={username}
onChange={(e) => setUsername(e.target.value)}
placeholder="your_cat_lover"
minLength={3}
required
autoFocus
className="h-12 text-[15px] rounded-xl bg-white border focus:border-[var(--primary)] focus:ring-2 focus:ring-[var(--primary)]/20 transition-all"
/>
<form onSubmit={handleSubmit} className="space-y-4">
<div className="space-y-1.5">
<label className="text-[13px] font-medium text-[var(--fg-secondary)] ml-1">Имя пользователя</label>
<Input value={username} onChange={(e) => setUsername(e.target.value)} placeholder="your_cat_lover" minLength={3} required autoFocus className="h-12 text-[15px] rounded-xl bg-white border input-focus" />
</div>
<div className="space-y-1">
<label className="text-[13px] font-medium text-[var(--foreground-secondary)] ml-1">
Пароль
</label>
<Input
type="password"
value={password}
onChange={(e) => setPassword(e.target.value)}
placeholder="Минимум 4 символа"
minLength={4}
required
className="h-12 text-[15px] rounded-xl bg-white border focus:border-[var(--primary)] focus:ring-2 focus:ring-[var(--primary)]/20 transition-all"
/>
<div className="space-y-1.5">
<label className="text-[13px] font-medium text-[var(--fg-secondary)] ml-1">Пароль</label>
<Input type="password" value={password} onChange={(e) => setPassword(e.target.value)} placeholder="Минимум 4 символа" minLength={4} required className="h-12 text-[15px] rounded-xl bg-white border input-focus" />
</div>
<div className="space-y-1">
<label className="text-[13px] font-medium text-[var(--foreground-secondary)] ml-1">
Подтвердите пароль
</label>
<Input
type="password"
value={confirm}
onChange={(e) => setConfirm(e.target.value)}
placeholder="Повторите пароль"
required
className="h-12 text-[15px] rounded-xl bg-white border focus:border-[var(--primary)] focus:ring-2 focus:ring-[var(--primary)]/20 transition-all"
/>
<div className="space-y-1.5">
<label className="text-[13px] font-medium text-[var(--fg-secondary)] ml-1">Подтвердите пароль</label>
<Input type="password" value={confirm} onChange={(e) => setConfirm(e.target.value)} placeholder="Повторите пароль" required className="h-12 text-[15px] rounded-xl bg-white border input-focus" />
</div>
{error && (
<div className="flex items-center gap-2 px-4 py-3 rounded-xl bg-[var(--danger-light)] text-[var(--danger)] text-[13px] font-medium animate-fade-in">
<span>⚠</span>
<span>{error}</span>
<div className="flex items-center gap-2 px-4 py-3 rounded-xl bg-[var(--danger-light)] text-[var(--danger)] text-[13px] font-medium animate-fade-in-up">
<span>⚠️</span><span>{error}</span>
</div>
)}
<Button
type="submit"
disabled={loading}
className="w-full h-12 rounded-xl text-[15px] font-semibold bg-[var(--primary)] hover:bg-[var(--primary-hover)] disabled:opacity-60 transition-all"
type="submit" disabled={loading}
className="w-full h-12 rounded-xl text-[15px] font-semibold active:scale-[0.98] transition-all"
style={{ background: 'linear-gradient(135deg, #007aff, #5856d6)' }}
>
{loading ? (
<span className="flex items-center gap-2">
@@ -111,21 +74,15 @@ export default function RegisterPage() {
</form>
<div className="relative my-8">
<div className="absolute inset-0 flex items-center">
<div className="w-full border-t border-[var(--border)]"></div>
</div>
<div className="absolute inset-0 flex items-center"><div className="w-full border-t"></div></div>
<div className="relative flex justify-center">
<span className="px-4 text-[13px] text-[var(--foreground-tertiary)] bg-[#f5f5f7]">
или
</span>
<span className="px-4 text-[13px] text-[var(--fg-tertiary)] bg-[var(--bg)]">или</span>
</div>
</div>
<p className="text-center text-[14px] text-[var(--foreground-secondary)]">
<p className="text-center text-[14px] text-[var(--fg-secondary)]">
Уже есть аккаунт?{' '}
<Link to="/login" className="link-blue">
Войти
</Link>
<Link to="/login" className="link-accent">Войти</Link>
</p>
</div>
</div>

124
client/src/pages/UploadPage.tsx
View File

@@ -19,18 +19,13 @@ export default function UploadPage() {
const onDrop = useCallback((accepted: File[]) => {
const f = accepted[0];
if (f) {
setFile(f);
if (preview) URL.revokeObjectURL(preview);
setPreview(URL.createObjectURL(f));
}
if (f) { setFile(f); if (preview) URL.revokeObjectURL(preview); setPreview(URL.createObjectURL(f)); }
}, [preview]);
const { getRootProps, getInputProps, isDragActive } = useDropzone({
onDrop,
accept: { 'image/*': ['.jpg', '.jpeg', '.png', '.gif', '.webp'] },
maxFiles: 1,
maxSize: 10 * 1024 * 1024,
maxFiles: 1, maxSize: 10 * 1024 * 1024,
});
const handleUpload = async () => {
@@ -38,129 +33,77 @@ export default function UploadPage() {
const fd = new FormData();
fd.append('image', file);
fd.append('caption', caption);
try {
const result = await uploadMutation.mutateAsync(fd);
if (user) updateUser({ ...user, points: (user.points || 0) + 10 });
toast('+10 баллов 🎉');
navigate(`/cat/${result.cat.id}`);
} catch {
toast('Ошибка загрузки', 'error');
}
} catch { toast('Ошибка загрузки', 'error'); }
};
const clearFile = () => {
setFile(null);
if (preview) URL.revokeObjectURL(preview);
setPreview(null);
};
const clearFile = () => { setFile(null); if (preview) URL.revokeObjectURL(preview); setPreview(null); };
return (
<div className="mx-auto max-w-[580px] px-4 py-6">
<button
onClick={() => navigate(-1)}
className="mb-5 flex items-center gap-1.5 text-[14px] text-[var(--foreground-secondary)] hover:text-[var(--foreground)] transition-colors group"
>
<button onClick={() => navigate(-1)}
className="mb-5 flex items-center gap-1.5 text-[14px] text-[var(--fg-secondary)] hover:text-[var(--fg)] transition-colors group">
<ArrowLeft className="h-4 w-4 stroke-[1.5] group-hover:-translate-x-0.5 transition-transform" />
Назад
</button>
<h1 className="text-[22px] font-bold mb-6">Новая публикация</h1>
<h1 className="text-[22px] font-bold mb-6 gradient-text">Новая публикация</h1>
{!preview ? (
<div
{...getRootProps()}
<div {...getRootProps()}
className={`border-2 border-dashed rounded-2xl p-16 text-center cursor-pointer transition-all ${
isDragActive
? 'border-[var(--primary)] bg-[var(--primary-light)] scale-[1.02]'
: 'border-[var(--border)] hover:bg-[var(--secondary)] hover:border-[var(--foreground-tertiary)]'
}`}
>
isDragActive ? 'border-[var(--primary)] bg-[var(--primary-light)] scale-[1.02]' : 'border-[var(--border)] hover:bg-[var(--secondary)] hover:border-[var(--fg-tertiary)]'
}`}>
<input {...getInputProps()} />
<div className="mb-5 flex justify-center">
<div className="h-16 w-16 rounded-full bg-[var(--secondary)] flex items-center justify-center">
{isDragActive ? (
<Image className="h-7 w-7 text-[var(--primary)]" strokeWidth={1.5} />
) : (
<Upload className="h-7 w-7 text-[var(--foreground-secondary)]" strokeWidth={1.5} />
)}
{isDragActive ? <Image className="h-7 w-7 text-[var(--primary)]" strokeWidth={1.5} /> : <Upload className="h-7 w-7 text-[var(--fg-secondary)]" strokeWidth={1.5} />}
</div>
</div>
<p className="text-[16px] font-semibold mb-1">
{isDragActive ? 'Отпустите фото' : 'Перетащите фото сюда'}
</p>
<p className="text-[14px] text-[var(--foreground-secondary)] mb-6">
или нажмите, чтобы выбрать
</p>
<Button
variant="outline"
size="sm"
className="rounded-full text-[13px] px-6"
>
Выбрать файл
</Button>
<p className="mt-5 text-[12px] text-[var(--foreground-tertiary)]">
JPG, PNG, GIF, WebP · до 10 МБ
</p>
<p className="text-[16px] font-semibold mb-1">{isDragActive ? 'Отпустите фото' : 'Перетащите фото сюда'}</p>
<p className="text-[14px] text-[var(--fg-secondary)] mb-6">или нажмите, чтобы выбрать</p>
<Button variant="outline" size="sm" className="rounded-full text-[13px] px-6">Выбрать файл</Button>
<p className="mt-5 text-[12px] text-[var(--fg-tertiary)]">JPG, PNG, GIF, WebP · до 10 МБ</p>
</div>
) : (
<div className="space-y-5 animate-fade-in-up">
{/* Preview */}
<div className="relative bg-[var(--secondary)] rounded-2xl overflow-hidden shadow-sm">
<img
src={preview!}
alt="Preview"
className="max-h-[420px] w-full object-contain"
/>
<button
onClick={clearFile}
className="absolute right-3 top-3 flex h-9 w-9 items-center justify-center rounded-full bg-black/40 text-white hover:bg-black/60 transition-all backdrop-blur-sm"
>
<img src={preview!} alt="Preview" className="max-h-[420px] w-full object-contain" />
<button onClick={clearFile}
className="absolute right-3 top-3 flex h-9 w-9 items-center justify-center rounded-full bg-black/40 text-white hover:bg-black/60 transition-all backdrop-blur-sm">
<X className="h-4 w-4" strokeWidth={2} />
</button>
</div>
{/* Caption input */}
<div className="flex items-start gap-3">
<Avatar className="h-9 w-9 shrink-0">
<AvatarFallback className="text-xs avatar-initials">
{user?.username?.charAt(0).toUpperCase() || '?'}
</AvatarFallback>
<Avatar className="h-9 w-9 shrink-0 ring-1 ring-[var(--border)]">
<AvatarFallback className="text-xs avatar-initials">{user?.username?.charAt(0).toUpperCase() || '?'}</AvatarFallback>
</Avatar>
<div className="flex-1">
<p className="text-[14px] font-semibold mb-1.5">{user?.username}</p>
<textarea
placeholder="Напишите подпись к фото..."
value={caption}
onChange={(e) => setCaption(e.target.value)}
maxLength={200}
rows={3}
className="w-full resize-none text-[15px] bg-transparent outline-none placeholder:text-[var(--foreground-tertiary)] leading-[1.4]"
/>
<textarea placeholder="Напишите подпись к фото..." value={caption} onChange={(e) => setCaption(e.target.value)}
maxLength={200} rows={3}
className="w-full resize-none text-[15px] bg-transparent outline-none placeholder:text-[var(--fg-tertiary)] leading-[1.4]" />
<div className="flex items-center justify-between mt-1">
<span className="text-[11px] text-[var(--foreground-tertiary)]">
{caption.length > 150 ? `Осталось ${200 - caption.length} символов` : ''}
</span>
<span className="text-[11px] text-[var(--foreground-tertiary)] tabular-nums">
{caption.length}/200
</span>
<span className="text-[11px] text-[var(--fg-tertiary)]">{caption.length > 150 ? `Осталось ${200 - caption.length} символов` : ''}</span>
<span className="text-[11px] text-[var(--fg-tertiary)] tabular-nums">{caption.length}/200</span>
</div>
</div>
</div>
{/* Submit */}
<div className="flex items-center justify-between pt-2 border-t border-[var(--border)]">
<div className="flex items-center gap-2 text-[13px] text-[var(--foreground-secondary)]">
<div className="flex items-center justify-between pt-3 border-t">
<div className="flex items-center gap-2 text-[13px] text-[var(--fg-secondary)]">
<span>🏆</span>
<span className="font-medium">+10 баллов</span>
<span className="text-[var(--foreground-tertiary)]">за публикацию</span>
<span className="text-[var(--fg-tertiary)]">за публикацию</span>
</div>
<Button
onClick={handleUpload}
disabled={uploadMutation.isPending}
size="sm"
className="rounded-full text-[14px] bg-[var(--primary)] hover:bg-[var(--primary-hover)] px-6 h-10 disabled:opacity-60"
>
<Button onClick={handleUpload} disabled={uploadMutation.isPending}
size="sm" className="rounded-full text-[14px] px-6 h-10 disabled:opacity-60"
style={{ background: 'linear-gradient(135deg, #007aff, #5856d6)' }}>
{uploadMutation.isPending ? (
<span className="flex items-center gap-2">
<span className="h-4 w-4 rounded-full border-2 border-white/30 border-t-white animate-spin" />
@@ -171,9 +114,8 @@ export default function UploadPage() {
</div>
{uploadMutation.isError && (
<div className="flex items-center gap-2 px-4 py-3 rounded-xl bg-[var(--danger-light)] text-[var(--danger)] text-[13px] font-medium animate-fade-in">
<span>⚠</span>
<span>Не удалось загрузить. Попробуйте снова.</span>
<div className="flex items-center gap-2 px-4 py-3 rounded-xl bg-[var(--danger-light)] text-[var(--danger)] text-[13px] font-medium animate-fade-in-up">
<span>⚠️</span><span>Не удалось загрузить. Попробуйте снова.</span>
</div>
)}
</div>