Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43ebc8d74c | ||
|
|
ee2dc19daa | ||
|
|
9b488164e0 | ||
|
|
aa60acb164 |
@@ -2,9 +2,18 @@ import { resolve } from 'node:path'
|
||||
import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
|
||||
// Bake the Gitea update token into the main bundle at build time so
|
||||
// electron-updater can fetch latest.yml from the private repo. The token
|
||||
// only needs read access to releases. Falls back to empty string if not set
|
||||
// (dev/local builds), in which case auto-update is silently disabled.
|
||||
const updateToken = JSON.stringify(process.env.UPDATE_TOKEN ?? '')
|
||||
|
||||
export default defineConfig({
|
||||
main: {
|
||||
plugins: [externalizeDepsPlugin()],
|
||||
define: {
|
||||
__UPDATE_TOKEN__: updateToken
|
||||
},
|
||||
resolve: {
|
||||
alias: {
|
||||
'@shared': resolve('src/shared')
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "laude",
|
||||
"version": "0.3.1",
|
||||
"version": "0.3.5",
|
||||
"description": "Exercise reminder — Windows desktop app",
|
||||
"main": "out/main/index.js",
|
||||
"author": "AnRil",
|
||||
|
||||
@@ -3,6 +3,10 @@ import { autoUpdater } from 'electron-updater'
|
||||
import { IPC } from '@shared/ipc'
|
||||
import type { UpdaterStatus } from '@shared/types'
|
||||
|
||||
// Build-time defined in electron.vite.config.ts.
|
||||
// Read-only Gitea token, used to fetch latest.yml from the private repo.
|
||||
declare const __UPDATE_TOKEN__: string
|
||||
|
||||
let currentStatus: UpdaterStatus = { kind: 'idle' }
|
||||
let wired = false
|
||||
let checkInterval: NodeJS.Timeout | null = null
|
||||
@@ -38,6 +42,14 @@ export function initUpdater(): void {
|
||||
autoUpdater.autoInstallOnAppQuit = true
|
||||
autoUpdater.allowDowngrade = false
|
||||
|
||||
// Gitea private-repo release assets require a token in Authorization
|
||||
// header — without it Gitea responds 404 (not 401) on download URLs.
|
||||
if (typeof __UPDATE_TOKEN__ === 'string' && __UPDATE_TOKEN__.length > 0) {
|
||||
autoUpdater.requestHeaders = {
|
||||
Authorization: `token ${__UPDATE_TOKEN__}`
|
||||
}
|
||||
}
|
||||
|
||||
autoUpdater.on('checking-for-update', () => setStatus({ kind: 'checking' }))
|
||||
|
||||
autoUpdater.on('update-available', (info) => {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<title>Exercise Reminder</title>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||
<link href="https://fonts.googleapis.com/css2?family=Geist:wght@400;500;600;700&family=Geist+Mono:wght@400;500;600&family=Instrument+Serif:ital@0;1&display=swap" rel="stylesheet" />
|
||||
<link href="https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:wght@400;500;600;700;800&family=Bricolage+Grotesque:opsz,wght@12..96,500;12..96,600;12..96,700;12..96,800&family=JetBrains+Mono:wght@400;500;600;700&display=swap" rel="stylesheet" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
|
||||
@@ -139,22 +139,22 @@ function ExerciseReminder({
|
||||
</div>
|
||||
</motion.div>
|
||||
|
||||
<div className="text-[12px] uppercase tracking-[0.18em] text-text/45 font-medium">
|
||||
<div className="text-[13px] uppercase tracking-[0.18em] text-accent font-bold">
|
||||
Время тренировки
|
||||
</div>
|
||||
<h1 className="font-serif text-[32px] leading-tight tracking-tight mt-2 mb-3">
|
||||
<h1 className="font-serif text-[30px] leading-tight tracking-tight mt-2 mb-3 font-bold">
|
||||
{exercise.name}
|
||||
</h1>
|
||||
|
||||
<div className="inline-flex items-baseline gap-2 font-mono-num">
|
||||
<span className="text-[64px] font-semibold tracking-tight text-text leading-none">
|
||||
<span className="text-[56px] font-semibold tracking-tight text-text leading-none">
|
||||
{exercise.reps}
|
||||
</span>
|
||||
<span className="text-[15px] text-text/55">раз</span>
|
||||
<span className="text-[15px] text-text/65 font-semibold">раз</span>
|
||||
</div>
|
||||
|
||||
<div className="text-[12px] text-text/45 mt-4 inline-flex items-center gap-1.5">
|
||||
<Clock size={11} strokeWidth={2.4} />
|
||||
<div className="text-[13px] text-text/65 mt-4 inline-flex items-center gap-1.5 font-medium">
|
||||
<Clock size={12} strokeWidth={2.4} />
|
||||
Следующее через {formatInterval(exercise.intervalMinutes)}
|
||||
</div>
|
||||
</div>
|
||||
@@ -163,20 +163,20 @@ function ExerciseReminder({
|
||||
<div className="px-4 pb-4 space-y-2">
|
||||
<button
|
||||
onClick={done}
|
||||
className="w-full h-12 rounded-2xl bg-accent text-white text-[15px] font-semibold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
|
||||
className="w-full h-12 rounded-2xl bg-accent text-white text-[16px] font-bold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
|
||||
>
|
||||
<Check size={16} strokeWidth={2.5} /> Готово
|
||||
<Check size={17} strokeWidth={2.5} /> Готово
|
||||
</button>
|
||||
<div className="grid grid-cols-2 gap-2">
|
||||
<button
|
||||
onClick={snooze}
|
||||
className="h-11 rounded-2xl bg-surface-2 text-text text-[14px] font-medium inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
|
||||
className="h-11 rounded-2xl bg-surface-2 text-text text-[15px] font-semibold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
|
||||
>
|
||||
<Clock size={14} strokeWidth={2.5} /> {snoozeMinutes} мин
|
||||
<Clock size={15} strokeWidth={2.5} /> {snoozeMinutes} мин
|
||||
</button>
|
||||
<button
|
||||
onClick={skip}
|
||||
className="h-11 rounded-2xl bg-surface-2 text-text/55 text-[14px] font-medium inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
|
||||
className="h-11 rounded-2xl bg-surface-2 text-text/65 text-[15px] font-semibold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
|
||||
>
|
||||
Пропустить
|
||||
</button>
|
||||
@@ -208,8 +208,8 @@ function MatchSummaryView({
|
||||
return (
|
||||
<div className="reminder-shell flex flex-col h-full">
|
||||
<div className="titlebar-drag h-9 px-2 flex items-center justify-between">
|
||||
<div className="text-[11px] text-text/45 font-medium inline-flex items-center gap-1.5 px-2">
|
||||
<Gamepad2 size={11} strokeWidth={2.4} /> {summary.gameName}
|
||||
<div className="text-[12px] text-text/65 font-semibold inline-flex items-center gap-1.5 px-2">
|
||||
<Gamepad2 size={12} strokeWidth={2.4} /> {summary.gameName}
|
||||
</div>
|
||||
<button
|
||||
onClick={onClose}
|
||||
@@ -238,19 +238,19 @@ function MatchSummaryView({
|
||||
<Gamepad2 size={26} strokeWidth={2} />
|
||||
)}
|
||||
</motion.div>
|
||||
<h1 className="font-serif text-[22px] tracking-tight">
|
||||
<h1 className="font-serif text-[26px] tracking-tight font-bold">
|
||||
{won ? 'Победа' : lost ? 'Поражение' : 'Матч завершён'}
|
||||
</h1>
|
||||
<p className="text-[12px] text-text/45 mt-1">
|
||||
<span className="font-mono-num font-medium text-text/65">
|
||||
<p className="text-[13px] text-text/65 mt-1.5 font-medium">
|
||||
<span className="font-mono-num font-bold text-text">
|
||||
{Math.floor(summary.durationMs / 60_000)}
|
||||
</span>{' '}
|
||||
мин · {summary.results.length} челлендж
|
||||
{summary.results.length === 1 ? '' : 'а'} ·{' '}
|
||||
{allDone ? (
|
||||
<span className="text-success font-medium">всё готово</span>
|
||||
<span className="text-success font-bold">всё готово</span>
|
||||
) : (
|
||||
<span className="text-accent font-mono-num font-semibold">
|
||||
<span className="text-accent font-mono-num font-bold">
|
||||
{remainingReps} осталось
|
||||
</span>
|
||||
)}
|
||||
@@ -269,9 +269,9 @@ function MatchSummaryView({
|
||||
</div>
|
||||
|
||||
<div className="px-4 pb-4 pt-3 flex items-center gap-3">
|
||||
<div className="flex-1 text-[12px] text-text/55">
|
||||
<div className="flex-1 text-[13px] text-text/65 font-medium">
|
||||
Всего ·{' '}
|
||||
<span className="text-text font-mono-num font-semibold text-[14px]">
|
||||
<span className="text-text font-mono-num font-bold text-[16px]">
|
||||
{totalReps}
|
||||
</span>{' '}
|
||||
повторов
|
||||
@@ -326,14 +326,14 @@ function ChallengeRow({
|
||||
<div className="flex-1 min-w-0">
|
||||
<div
|
||||
className={[
|
||||
'text-[14px] font-medium truncate',
|
||||
'text-[15px] font-semibold truncate',
|
||||
done ? 'line-through opacity-55' : ''
|
||||
].join(' ')}
|
||||
>
|
||||
{result.exerciseName}
|
||||
</div>
|
||||
<div className="text-[12px] text-text/55 mt-0.5">
|
||||
<span className="font-mono-num font-semibold text-text/75">
|
||||
<div className="text-[13px] text-text/65 mt-0.5 font-medium">
|
||||
<span className="font-mono-num font-bold text-text">
|
||||
{result.statValue}
|
||||
</span>{' '}
|
||||
{result.statLabel} → <span>{result.name}</span>
|
||||
|
||||
@@ -97,7 +97,7 @@ export function ExerciseCard({
|
||||
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="flex items-center justify-between gap-2">
|
||||
<h3 className="font-display text-[17px] font-semibold leading-tight truncate">
|
||||
<h3 className="font-display text-[18px] font-bold leading-tight truncate">
|
||||
{exercise.name}
|
||||
</h3>
|
||||
<div className="relative">
|
||||
@@ -138,19 +138,19 @@ export function ExerciseCard({
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="text-[13px] text-text/55 mt-0.5">
|
||||
<div className="text-[14px] text-text/65 mt-1 font-medium">
|
||||
{exercise.reps} раз · каждые {formatInterval(exercise.intervalMinutes)}
|
||||
</div>
|
||||
|
||||
{/* Countdown + switch */}
|
||||
<div className="flex items-end justify-between mt-3.5">
|
||||
<div>
|
||||
<div className="text-[11px] text-text/45 uppercase tracking-wider font-medium">
|
||||
<div className="text-[12px] text-text/60 uppercase tracking-wider font-semibold">
|
||||
{isDue ? 'Сейчас' : 'Через'}
|
||||
</div>
|
||||
<div
|
||||
className={[
|
||||
'font-mono-num text-[22px] font-semibold leading-none mt-0.5 tracking-tight',
|
||||
'font-mono-num text-[24px] font-bold leading-none mt-1 tracking-tight',
|
||||
isDue ? 'text-accent' : 'text-text'
|
||||
].join(' ')}
|
||||
>
|
||||
@@ -172,7 +172,7 @@ export function ExerciseCard({
|
||||
initial={{ opacity: 0, y: 4 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
onClick={onMarkDone}
|
||||
className="mt-4 w-full h-10 rounded-xl bg-accent text-white text-[14px] font-semibold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
|
||||
className="mt-4 w-full h-11 rounded-xl bg-accent text-white text-[15px] font-bold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
|
||||
>
|
||||
<Check size={15} strokeWidth={2.5} /> Готово
|
||||
</motion.button>
|
||||
|
||||
@@ -1,38 +1,37 @@
|
||||
import { NavLink } from 'react-router-dom'
|
||||
import { AnimatePresence, motion } from 'framer-motion'
|
||||
import {
|
||||
LayoutDashboard,
|
||||
ListChecks,
|
||||
Gamepad2,
|
||||
Target,
|
||||
Settings as SettingsIcon,
|
||||
Sun,
|
||||
Dumbbell,
|
||||
Joystick,
|
||||
Flame,
|
||||
Settings2,
|
||||
X
|
||||
} from 'lucide-react'
|
||||
|
||||
type Item = {
|
||||
to: string
|
||||
label: string
|
||||
icon: typeof LayoutDashboard
|
||||
icon: typeof Sun
|
||||
end?: boolean
|
||||
tint?: string
|
||||
}
|
||||
|
||||
// Each item gets a tinted icon-square reminiscent of iOS Settings rows.
|
||||
// Tinted icon plaques á la iOS Settings rows.
|
||||
const items: Item[] = [
|
||||
{ to: '/', label: 'Сегодня', icon: Sun, end: true, tint: 'bg-accent' },
|
||||
{
|
||||
to: '/',
|
||||
label: 'Сегодня',
|
||||
icon: LayoutDashboard,
|
||||
end: true,
|
||||
tint: 'bg-accent'
|
||||
to: '/exercises',
|
||||
label: 'Упражнения',
|
||||
icon: Dumbbell,
|
||||
tint: 'bg-info'
|
||||
},
|
||||
{ to: '/exercises', label: 'Упражнения', icon: ListChecks, tint: 'bg-info' },
|
||||
{ to: '/games', label: 'Игры', icon: Gamepad2, tint: 'bg-accent-2' },
|
||||
{ to: '/challenges', label: 'Челленджи', icon: Target, tint: 'bg-warning' },
|
||||
{ to: '/games', label: 'Игры', icon: Joystick, tint: 'bg-accent-2' },
|
||||
{ to: '/challenges', label: 'Челленджи', icon: Flame, tint: 'bg-warning' },
|
||||
{
|
||||
to: '/settings',
|
||||
label: 'Настройки',
|
||||
icon: SettingsIcon,
|
||||
icon: Settings2,
|
||||
tint: 'bg-text/70'
|
||||
}
|
||||
]
|
||||
@@ -98,16 +97,16 @@ function SidebarContent({ onNav }: { onNav?: () => void }): JSX.Element {
|
||||
<>
|
||||
{/* Brand */}
|
||||
<div className="px-5 pt-7 pb-6">
|
||||
<div className="font-serif text-[28px] leading-none tracking-tight">
|
||||
<div className="font-serif text-[36px] leading-none tracking-tight font-bold">
|
||||
Laude
|
||||
</div>
|
||||
<div className="text-[12px] text-text/45 mt-1.5">
|
||||
Move with intention
|
||||
<div className="text-[13px] text-text/55 mt-2 font-medium">
|
||||
Двигайся осознанно
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Nav */}
|
||||
<nav className="px-2.5 flex flex-col gap-0.5">
|
||||
<nav className="px-2.5 flex flex-col gap-1">
|
||||
{items.map(({ to, label, icon: Icon, end, tint }) => (
|
||||
<NavLink
|
||||
key={to}
|
||||
@@ -127,15 +126,15 @@ function SidebarContent({ onNav }: { onNav?: () => void }): JSX.Element {
|
||||
<>
|
||||
<div
|
||||
className={[
|
||||
'w-7 h-7 rounded-lg grid place-items-center text-white shrink-0',
|
||||
'w-8 h-8 rounded-[9px] grid place-items-center text-white shrink-0',
|
||||
tint ?? 'bg-text/70'
|
||||
].join(' ')}
|
||||
>
|
||||
<Icon size={15} strokeWidth={2.4} />
|
||||
<Icon size={17} strokeWidth={2.2} />
|
||||
</div>
|
||||
<span
|
||||
className={[
|
||||
'text-[14px] truncate',
|
||||
'text-[15px] truncate',
|
||||
isActive
|
||||
? 'text-text font-semibold'
|
||||
: 'text-text/85 font-medium'
|
||||
|
||||
@@ -126,19 +126,19 @@ function Body({
|
||||
return (
|
||||
<div className="px-4 py-4">
|
||||
<div className="flex items-center gap-3 mb-3">
|
||||
<div className="w-9 h-9 rounded-xl bg-accent/12 text-accent grid place-items-center">
|
||||
<Download size={16} strokeWidth={2.4} />
|
||||
<div className="w-10 h-10 rounded-xl bg-accent/12 text-accent grid place-items-center">
|
||||
<Download size={17} strokeWidth={2.4} />
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="text-[15px] font-medium leading-tight">
|
||||
<div className="text-[15px] font-semibold leading-tight">
|
||||
Загружаем обновление
|
||||
</div>
|
||||
<div className="text-[12px] text-text/55 mt-0.5 font-mono-num">
|
||||
<div className="text-[13px] text-text/65 mt-1 font-mono-num font-medium">
|
||||
{mb(status.transferred)} / {mb(status.total)} МБ ·{' '}
|
||||
{(status.bytesPerSecond / 1024 / 1024).toFixed(2)} МБ/с
|
||||
</div>
|
||||
</div>
|
||||
<div className="font-mono-num font-semibold text-[17px] text-accent">
|
||||
<div className="font-mono-num font-bold text-[18px] text-accent">
|
||||
{pct.toFixed(0)}%
|
||||
</div>
|
||||
</div>
|
||||
@@ -218,19 +218,19 @@ function Cell({
|
||||
muted: 'bg-surface-2 text-text/55'
|
||||
}[tone]
|
||||
return (
|
||||
<div className="flex items-center gap-3 px-4 py-3.5">
|
||||
<div className="flex items-center gap-3 px-4 py-4">
|
||||
<div
|
||||
className={[
|
||||
'w-9 h-9 rounded-xl grid place-items-center shrink-0',
|
||||
'w-10 h-10 rounded-xl grid place-items-center shrink-0',
|
||||
cls
|
||||
].join(' ')}
|
||||
>
|
||||
{icon}
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="text-[15px] font-medium leading-tight">{title}</div>
|
||||
<div className="text-[15px] font-semibold leading-tight">{title}</div>
|
||||
{subtitle && (
|
||||
<div className="text-[12px] text-text/55 mt-0.5 truncate">
|
||||
<div className="text-[13px] text-text/65 mt-1 truncate font-medium">
|
||||
{subtitle}
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -39,12 +39,16 @@ export function SectionHeader({
|
||||
action?: ReactNode
|
||||
}): JSX.Element {
|
||||
return (
|
||||
<div className="flex items-end justify-between px-4 mb-2">
|
||||
<div className="flex items-end justify-between px-4 mb-2.5">
|
||||
<div>
|
||||
<div className="text-[12px] font-medium uppercase tracking-[0.06em] text-text/45">
|
||||
<div className="text-[13px] font-semibold uppercase tracking-[0.06em] text-text/60">
|
||||
{title}
|
||||
</div>
|
||||
{hint && <div className="text-[12px] text-text/45 mt-0.5">{hint}</div>}
|
||||
{hint && (
|
||||
<div className="text-[13px] text-text/55 mt-0.5 font-medium">
|
||||
{hint}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{action}
|
||||
</div>
|
||||
|
||||
@@ -48,14 +48,14 @@ export default function ChallengesPage(): JSX.Element {
|
||||
<div className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
|
||||
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
|
||||
<div>
|
||||
<div className="text-[13px] text-text/45 font-medium">
|
||||
<div className="text-[14px] text-text/65 font-semibold">
|
||||
Правила за матч
|
||||
</div>
|
||||
<h1 className="font-serif text-[40px] sm:text-[44px] leading-[1.05] tracking-tight mt-1">
|
||||
<h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
|
||||
Челленджи
|
||||
</h1>
|
||||
<p className="text-[14px] text-text/55 mt-2">
|
||||
Повторов = <span className="font-mono-num">статистика × коэффициент</span>
|
||||
<p className="text-[15px] text-text/65 mt-2 font-medium">
|
||||
Повторов = <span className="font-mono-num font-semibold text-text">статистика × коэффициент</span>
|
||||
</p>
|
||||
</div>
|
||||
<Button
|
||||
@@ -70,12 +70,12 @@ export default function ChallengesPage(): JSX.Element {
|
||||
|
||||
{noGamesActive && (
|
||||
<div className="mb-6 rounded-2xl bg-warning/12 p-4 flex items-start gap-3">
|
||||
<div className="w-9 h-9 rounded-xl bg-warning/15 text-warning grid place-items-center shrink-0">
|
||||
<AlertTriangle size={16} strokeWidth={2.5} />
|
||||
<div className="w-10 h-10 rounded-xl bg-warning/18 text-warning grid place-items-center shrink-0">
|
||||
<AlertTriangle size={18} strokeWidth={2.5} />
|
||||
</div>
|
||||
<div className="text-[13px] text-text/80 leading-relaxed">
|
||||
<div className="text-[14px] text-text/85 leading-relaxed font-medium">
|
||||
Челленджи срабатывают после матча. Подключи игру во вкладке{' '}
|
||||
<span className="font-semibold">«Игры»</span>.
|
||||
<span className="font-semibold text-text">«Игры»</span>.
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
@@ -104,13 +104,13 @@ export default function ChallengesPage(): JSX.Element {
|
||||
<Icon name={c.icon} size={18} strokeWidth={2.2} />
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="text-[15px] font-medium truncate leading-tight">
|
||||
<div className="text-[16px] font-semibold truncate leading-tight">
|
||||
{c.name}
|
||||
</div>
|
||||
<div className="text-[13px] text-text/55 mt-0.5 inline-flex items-center gap-1.5">
|
||||
<Gamepad2 size={11} />
|
||||
<div className="text-[14px] text-text/65 mt-1 inline-flex items-center gap-1.5 font-medium">
|
||||
<Gamepad2 size={12} strokeWidth={2.4} />
|
||||
{GAME_NAMES[c.gameId]} ·{' '}
|
||||
<span className="font-mono-num">
|
||||
<span className="font-mono-num font-semibold text-text">
|
||||
{STAT_LABELS[c.stat]} × {c.multiplier}
|
||||
</span>{' '}
|
||||
→ {c.exerciseName}
|
||||
|
||||
@@ -69,10 +69,10 @@ export default function Dashboard(): JSX.Element {
|
||||
{/* Hero — iOS Large Title */}
|
||||
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
|
||||
<div className="min-w-0">
|
||||
<div className="text-[13px] text-text/45 font-medium capitalize">
|
||||
<div className="text-[14px] text-text/65 font-semibold capitalize">
|
||||
{today}
|
||||
</div>
|
||||
<h1 className="font-serif text-[40px] sm:text-[44px] leading-[1.05] tracking-tight mt-1">
|
||||
<h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
|
||||
Сегодня
|
||||
</h1>
|
||||
</div>
|
||||
@@ -139,19 +139,19 @@ export default function Dashboard(): JSX.Element {
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
className="mb-6 rounded-2xl bg-warning/12 p-4 flex items-center gap-3"
|
||||
>
|
||||
<div className="w-9 h-9 rounded-xl bg-warning/15 text-warning grid place-items-center">
|
||||
<Pause size={16} strokeWidth={2.5} />
|
||||
<div className="w-10 h-10 rounded-xl bg-warning/18 text-warning grid place-items-center shrink-0">
|
||||
<Pause size={18} strokeWidth={2.5} />
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="text-[14px] font-semibold">
|
||||
<div className="text-[16px] font-semibold leading-tight">
|
||||
Напоминания на паузе
|
||||
</div>
|
||||
<div className="text-[12px] text-text/55 mt-0.5">
|
||||
<div className="text-[14px] text-text/70 mt-1">
|
||||
Возобнови, чтобы продолжить отсчёт
|
||||
</div>
|
||||
</div>
|
||||
<Button variant="filled" size="sm" onClick={togglePause}>
|
||||
<Play size={13} strokeWidth={2.5} /> Старт
|
||||
<Play size={14} strokeWidth={2.5} /> Старт
|
||||
</Button>
|
||||
</motion.div>
|
||||
)}
|
||||
@@ -225,19 +225,21 @@ function HeroStat({
|
||||
<div className="flex items-center gap-2 mb-3">
|
||||
<div
|
||||
className={[
|
||||
'w-6 h-6 rounded-md grid place-items-center text-white',
|
||||
'w-7 h-7 rounded-lg grid place-items-center text-white',
|
||||
toneBg
|
||||
].join(' ')}
|
||||
>
|
||||
{icon}
|
||||
</div>
|
||||
<div className="text-[12px] text-text/55 font-medium">{label}</div>
|
||||
<div className="text-[14px] text-text/75 font-semibold">{label}</div>
|
||||
</div>
|
||||
<div className="font-display text-[30px] font-semibold tracking-tight leading-none">
|
||||
<div className="font-display text-[28px] font-bold tracking-tight leading-none">
|
||||
{value}
|
||||
</div>
|
||||
{subvalue && (
|
||||
<div className="text-[12px] text-text/45 mt-1.5">{subvalue}</div>
|
||||
<div className="text-[13px] text-text/60 mt-2 font-medium">
|
||||
{subvalue}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -22,10 +22,10 @@ export default function Exercises(): JSX.Element {
|
||||
<div className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
|
||||
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
|
||||
<div>
|
||||
<div className="text-[13px] text-text/45 font-medium">
|
||||
<div className="text-[14px] text-text/65 font-semibold">
|
||||
Программа
|
||||
</div>
|
||||
<h1 className="font-serif text-[40px] sm:text-[44px] leading-[1.05] tracking-tight mt-1">
|
||||
<h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
|
||||
Упражнения
|
||||
</h1>
|
||||
</div>
|
||||
@@ -79,7 +79,7 @@ export default function Exercises(): JSX.Element {
|
||||
|
||||
{exercises.length === 0 && (
|
||||
<Card>
|
||||
<div className="px-5 py-12 text-center text-text/55 text-[14px]">
|
||||
<div className="px-5 py-12 text-center text-text/65 text-[15px] font-medium">
|
||||
Программа пуста — добавь первое упражнение
|
||||
</div>
|
||||
</Card>
|
||||
@@ -126,10 +126,10 @@ function ExerciseRow({
|
||||
onClick={onEdit}
|
||||
className="flex-1 min-w-0 text-left active:opacity-70 transition-opacity"
|
||||
>
|
||||
<div className="text-[15px] font-medium truncate leading-tight">
|
||||
<div className="text-[16px] font-semibold truncate leading-tight">
|
||||
{exercise.name}
|
||||
</div>
|
||||
<div className="text-[13px] text-text/55 mt-0.5">
|
||||
<div className="text-[14px] text-text/65 mt-1 font-medium">
|
||||
{exercise.reps} раз · {formatInterval(exercise.intervalMinutes)}
|
||||
</div>
|
||||
</button>
|
||||
|
||||
@@ -61,18 +61,18 @@ export default function GamesPage(): JSX.Element {
|
||||
<div className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
|
||||
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
|
||||
<div>
|
||||
<div className="text-[13px] text-text/45 font-medium">
|
||||
<div className="text-[14px] text-text/65 font-semibold">
|
||||
Трекинг матчей
|
||||
</div>
|
||||
<h1 className="font-serif text-[40px] sm:text-[44px] leading-[1.05] tracking-tight mt-1">
|
||||
<h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
|
||||
Игры
|
||||
</h1>
|
||||
<p className="text-[14px] text-text/55 mt-2">
|
||||
<p className="text-[15px] text-text/65 mt-2 font-medium leading-relaxed">
|
||||
Подключи игру — челленджи сработают сразу после матча
|
||||
{liveCount > 0 && (
|
||||
<>
|
||||
{' · '}
|
||||
<span className="text-success font-mono-num font-semibold">
|
||||
<span className="text-success font-mono-num font-bold">
|
||||
{liveCount} live
|
||||
</span>
|
||||
</>
|
||||
@@ -154,13 +154,13 @@ function GameCard({
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="flex items-center gap-2 flex-wrap">
|
||||
<h3 className="font-display text-[17px] font-semibold tracking-tight">
|
||||
<h3 className="font-display text-[18px] font-bold tracking-tight">
|
||||
{game.name}
|
||||
</h3>
|
||||
<StatusBadge game={game} isLive={isLive} />
|
||||
</div>
|
||||
{game.installPath && (
|
||||
<div className="text-[12px] text-text/45 mt-1 truncate font-mono-num">
|
||||
<div className="text-[13px] text-text/55 mt-1.5 truncate font-mono-num font-medium">
|
||||
{game.installPath}
|
||||
</div>
|
||||
)}
|
||||
@@ -176,15 +176,15 @@ function GameCard({
|
||||
</div>
|
||||
|
||||
{game.integrationActive && game.launchOptionStatus === 'queued' && (
|
||||
<div className="mt-4 rounded-2xl bg-warning/12 p-3.5 text-[13px] leading-relaxed flex items-start gap-2.5">
|
||||
<div className="mt-4 rounded-2xl bg-warning/12 p-4 text-[14px] leading-relaxed flex items-start gap-2.5 font-medium">
|
||||
<Hourglass
|
||||
size={15}
|
||||
size={17}
|
||||
className="text-warning shrink-0 mt-0.5"
|
||||
strokeWidth={2.4}
|
||||
/>
|
||||
<div className="text-text/80">
|
||||
<div className="text-text/85">
|
||||
Steam запущен. Параметр{' '}
|
||||
<code className="px-1.5 py-0.5 rounded-md bg-surface text-accent font-mono-num text-[12px]">
|
||||
<code className="px-1.5 py-0.5 rounded-md bg-surface text-accent font-mono-num text-[13px] font-semibold">
|
||||
{game.launchOption}
|
||||
</code>{' '}
|
||||
пропишется автоматически при следующем закрытии Steam.
|
||||
@@ -193,15 +193,15 @@ function GameCard({
|
||||
)}
|
||||
|
||||
{game.integrationActive && game.launchOptionStatus === 'no_user' && (
|
||||
<div className="mt-4 rounded-2xl bg-destructive/10 p-3.5 text-[13px] leading-relaxed flex items-start gap-2.5">
|
||||
<div className="mt-4 rounded-2xl bg-destructive/10 p-4 text-[14px] leading-relaxed flex items-start gap-2.5 font-medium">
|
||||
<AlertTriangle
|
||||
size={15}
|
||||
size={17}
|
||||
className="text-destructive shrink-0 mt-0.5"
|
||||
strokeWidth={2.4}
|
||||
/>
|
||||
<div className="text-text/80">
|
||||
<div className="text-text/85">
|
||||
В Steam нет залогиненного аккаунта (нет папки{' '}
|
||||
<code className="font-mono-num text-[12px]">userdata</code>).
|
||||
<code className="font-mono-num text-[13px] font-semibold">userdata</code>).
|
||||
Запусти Steam один раз и нажми «Установить интеграцию».
|
||||
</div>
|
||||
</div>
|
||||
@@ -224,7 +224,7 @@ function GameCard({
|
||||
</Button>
|
||||
)}
|
||||
{!game.installed && (
|
||||
<div className="text-[13px] text-text/55">
|
||||
<div className="text-[14px] text-text/65 font-medium">
|
||||
Установи игру в Steam и нажми «Обновить»
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -21,10 +21,10 @@ export default function SettingsPage(): JSX.Element {
|
||||
<div className="h-full overflow-y-auto">
|
||||
<div className="max-w-2xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
|
||||
<div className="mb-8">
|
||||
<div className="text-[13px] text-text/45 font-medium">
|
||||
<div className="text-[14px] text-text/65 font-semibold">
|
||||
Конфигурация
|
||||
</div>
|
||||
<h1 className="font-serif text-[40px] sm:text-[44px] leading-[1.05] tracking-tight mt-1">
|
||||
<h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
|
||||
Настройки
|
||||
</h1>
|
||||
</div>
|
||||
@@ -132,9 +132,11 @@ function ToggleRow({
|
||||
return (
|
||||
<Row last={last} className={disabled ? 'opacity-50' : ''}>
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="text-[15px] font-medium leading-tight">{label}</div>
|
||||
<div className="text-[15px] font-semibold leading-tight">{label}</div>
|
||||
{hint && (
|
||||
<div className="text-[12px] text-text/55 mt-0.5">{hint}</div>
|
||||
<div className="text-[13px] text-text/65 mt-1 leading-snug">
|
||||
{hint}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<Switch checked={checked} onChange={onChange} disabled={disabled} />
|
||||
@@ -160,9 +162,11 @@ function SelectRow({
|
||||
return (
|
||||
<Row last={last}>
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="text-[15px] font-medium leading-tight">{label}</div>
|
||||
<div className="text-[15px] font-semibold leading-tight">{label}</div>
|
||||
{hint && (
|
||||
<div className="text-[12px] text-text/55 mt-0.5">{hint}</div>
|
||||
<div className="text-[13px] text-text/65 mt-1 leading-snug">
|
||||
{hint}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<select
|
||||
|
||||
@@ -2,34 +2,33 @@
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
||||
/* ===== Design tokens — Apple Human Interface Guidelines ===== */
|
||||
/* ===== Design tokens — Apple HIG with Manrope/Fraunces ===== */
|
||||
|
||||
:root {
|
||||
/* Brand & semantic colors (iOS system palette) */
|
||||
--accent: 255 107 53; /* Apple Fitness Move orange */
|
||||
--accent-2: 255 45 85; /* systemPink */
|
||||
--success: 52 199 89; /* systemGreen */
|
||||
--warning: 255 159 10; /* systemOrange-dark */
|
||||
--warning: 255 159 10; /* systemOrange dark */
|
||||
--destructive: 255 59 48; /* systemRed */
|
||||
--info: 0 122 255; /* systemBlue */
|
||||
|
||||
color-scheme: light dark;
|
||||
}
|
||||
|
||||
/* Light — iOS groupedBackground feel */
|
||||
/* Light — polished iOS groupedBackground with warm undertone */
|
||||
:root {
|
||||
--bg: 242 242 247; /* systemGroupedBackground */
|
||||
--surface: 255 255 255; /* secondarySystemGroupedBackground (cards) */
|
||||
--surface-2: 242 242 247; /* tertiarySystemGroupedBackground */
|
||||
--text: 0 0 0;
|
||||
--text-secondary: 60 60 67; /* used with opacity 0.6 */
|
||||
--text-tertiary: 60 60 67; /* used with opacity 0.3 */
|
||||
--hairline: 60 60 67; /* used with opacity 0.18 */
|
||||
--vibrancy: 255 255 255; /* sidebar translucent base */
|
||||
--bg: 245 245 249; /* slightly warmer than 242,242,247 */
|
||||
--surface: 255 255 255;
|
||||
--surface-2: 240 240 245; /* subtle separation for inputs/sections */
|
||||
--text: 17 17 19; /* not pure black — softer */
|
||||
--text-secondary: 60 60 67;
|
||||
--text-tertiary: 60 60 67;
|
||||
--hairline: 60 60 67;
|
||||
--vibrancy: 255 255 255;
|
||||
|
||||
/* Legacy tokens (mapped to keep some old utility classes working) */
|
||||
--accent-soft: 255 107 53;
|
||||
--bg-deep: 230 230 235;
|
||||
--bg-deep: 232 232 238;
|
||||
--surface-elevated: 255 255 255;
|
||||
--border: 60 60 67;
|
||||
--muted: 60 60 67;
|
||||
@@ -38,11 +37,11 @@
|
||||
--xp: 255 159 10;
|
||||
}
|
||||
|
||||
/* Dark — iOS true black for OLED, elevation via grey steps */
|
||||
/* Dark — true black with grey elevation */
|
||||
.dark {
|
||||
--bg: 0 0 0; /* systemBackground */
|
||||
--surface: 28 28 30; /* secondarySystemBackground */
|
||||
--surface-2: 44 44 46; /* tertiarySystemBackground */
|
||||
--bg: 0 0 0;
|
||||
--surface: 28 28 30;
|
||||
--surface-2: 44 44 46;
|
||||
--text: 255 255 255;
|
||||
--text-secondary: 235 235 245;
|
||||
--text-tertiary: 235 235 245;
|
||||
@@ -68,43 +67,58 @@ body,
|
||||
|
||||
body {
|
||||
font-family:
|
||||
'Geist',
|
||||
'Plus Jakarta Sans',
|
||||
-apple-system,
|
||||
'SF Pro Text',
|
||||
'Segoe UI Variable Text',
|
||||
'Segoe UI',
|
||||
system-ui,
|
||||
sans-serif;
|
||||
font-feature-settings: 'cv11', 'ss01', 'ss03'; /* Geist stylistic alts */
|
||||
background-color: rgb(var(--bg));
|
||||
color: rgb(var(--text));
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
letter-spacing: -0.01em;
|
||||
font-size: 14px;
|
||||
line-height: 1.5;
|
||||
letter-spacing: -0.005em;
|
||||
}
|
||||
|
||||
/* Display — Bricolage Grotesque for headings and brand. Variable opsz axis
|
||||
gives bigger glyphs slightly more character. */
|
||||
.font-display {
|
||||
font-family:
|
||||
'Geist',
|
||||
'Bricolage Grotesque',
|
||||
'Plus Jakarta Sans',
|
||||
-apple-system,
|
||||
'SF Pro Display',
|
||||
'Segoe UI Variable Display',
|
||||
system-ui,
|
||||
sans-serif;
|
||||
font-optical-sizing: auto;
|
||||
font-variation-settings: 'opsz' 24;
|
||||
letter-spacing: -0.02em;
|
||||
}
|
||||
|
||||
/* Serif → repurposed for the "hero" big titles. Same Bricolage but with the
|
||||
opsz axis pushed to 96 for distinctive display feel. */
|
||||
.font-serif {
|
||||
font-family: 'Instrument Serif', 'Iowan Old Style', 'Apple Garamond', Georgia,
|
||||
serif;
|
||||
letter-spacing: -0.01em;
|
||||
font-family:
|
||||
'Bricolage Grotesque',
|
||||
'Plus Jakarta Sans',
|
||||
-apple-system,
|
||||
'SF Pro Display',
|
||||
system-ui,
|
||||
sans-serif;
|
||||
font-optical-sizing: auto;
|
||||
font-variation-settings: 'opsz' 96;
|
||||
letter-spacing: -0.035em;
|
||||
}
|
||||
|
||||
.font-mono-num {
|
||||
font-family: 'Geist Mono', ui-monospace, 'SF Mono', 'Cascadia Code', Menlo,
|
||||
monospace;
|
||||
font-family: 'JetBrains Mono', ui-monospace, 'SF Mono', 'Cascadia Code',
|
||||
Menlo, monospace;
|
||||
font-variant-numeric: tabular-nums;
|
||||
font-feature-settings: 'ss02';
|
||||
font-feature-settings: 'ss02', 'ss19', 'zero';
|
||||
letter-spacing: -0.01em;
|
||||
}
|
||||
|
||||
/* Custom titlebar drag region */
|
||||
@@ -117,7 +131,7 @@ body {
|
||||
app-region: no-drag;
|
||||
}
|
||||
|
||||
/* Thin iOS-style hairline (effectively 0.5px when device DPR allows) */
|
||||
/* iOS 0.5px-style hairlines */
|
||||
.hairline-b {
|
||||
box-shadow: inset 0 -0.5px 0 rgb(var(--hairline) / 0.18);
|
||||
}
|
||||
@@ -129,19 +143,19 @@ body {
|
||||
box-shadow: inset 0 -0.5px 0 rgb(var(--hairline) / 0.4);
|
||||
}
|
||||
|
||||
/* Vibrancy panel (macOS Big Sur+ sidebar feel) */
|
||||
/* macOS vibrancy */
|
||||
.vibrancy {
|
||||
background-color: rgb(var(--vibrancy) / 0.72);
|
||||
backdrop-filter: saturate(180%) blur(30px);
|
||||
-webkit-backdrop-filter: saturate(180%) blur(30px);
|
||||
}
|
||||
|
||||
/* iOS-style soft card shadow */
|
||||
/* Soft iOS card shadow with subtle warmth */
|
||||
.shadow-card {
|
||||
box-shadow:
|
||||
0 0.5px 0 rgb(0 0 0 / 0.03),
|
||||
0 1px 2px rgb(0 0 0 / 0.04),
|
||||
0 4px 12px rgb(0 0 0 / 0.04);
|
||||
0 1px 2px rgb(15 23 42 / 0.04),
|
||||
0 6px 14px -4px rgb(15 23 42 / 0.05);
|
||||
}
|
||||
.dark .shadow-card {
|
||||
box-shadow:
|
||||
@@ -149,7 +163,7 @@ body {
|
||||
0 1px 2px rgb(0 0 0 / 0.4);
|
||||
}
|
||||
|
||||
/* Scrollbar — thin, iOS-style */
|
||||
/* Scrollbar */
|
||||
::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
@@ -165,18 +179,15 @@ body {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
/* Selection */
|
||||
::selection {
|
||||
background: rgb(var(--accent) / 0.25);
|
||||
}
|
||||
|
||||
/* iOS focus ring */
|
||||
*:focus-visible {
|
||||
outline: 2px solid rgb(var(--accent) / 0.55);
|
||||
outline-offset: 2px;
|
||||
}
|
||||
|
||||
/* Reminder window root — iOS sheet */
|
||||
.reminder-shell {
|
||||
position: relative;
|
||||
border: 0.5px solid rgb(var(--hairline) / 0.25);
|
||||
@@ -189,7 +200,6 @@ body {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
/* Text helpers (semantic aliases) */
|
||||
.text-secondary {
|
||||
color: rgb(var(--text-secondary) / 0.6);
|
||||
}
|
||||
|
||||
@@ -121,7 +121,7 @@ export const DEFAULT_SETTINGS: Settings = {
|
||||
startWithWindows: false,
|
||||
minimizeToTray: true,
|
||||
startMinimized: false,
|
||||
theme: 'system',
|
||||
theme: 'light',
|
||||
snoozeMinutes: 5
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ export default {
|
||||
},
|
||||
fontFamily: {
|
||||
sans: [
|
||||
'Geist',
|
||||
'Plus Jakarta Sans',
|
||||
'-apple-system',
|
||||
'SF Pro Text',
|
||||
'Segoe UI Variable Text',
|
||||
@@ -43,22 +43,23 @@ export default {
|
||||
'sans-serif'
|
||||
],
|
||||
display: [
|
||||
'Geist',
|
||||
'Bricolage Grotesque',
|
||||
'Plus Jakarta Sans',
|
||||
'-apple-system',
|
||||
'SF Pro Display',
|
||||
'Segoe UI Variable Display',
|
||||
'system-ui',
|
||||
'sans-serif'
|
||||
],
|
||||
serif: [
|
||||
'Instrument Serif',
|
||||
'Iowan Old Style',
|
||||
'Apple Garamond',
|
||||
'Georgia',
|
||||
'serif'
|
||||
'Bricolage Grotesque',
|
||||
'Plus Jakarta Sans',
|
||||
'-apple-system',
|
||||
'SF Pro Display',
|
||||
'system-ui',
|
||||
'sans-serif'
|
||||
],
|
||||
mono: [
|
||||
'Geist Mono',
|
||||
'JetBrains Mono',
|
||||
'ui-monospace',
|
||||
'SF Mono',
|
||||
'Cascadia Code',
|
||||
|
||||
Reference in New Issue
Block a user