Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43ebc8d74c | ||
|
|
ee2dc19daa | ||
|
|
9b488164e0 |
@@ -2,9 +2,18 @@ import { resolve } from 'node:path'
|
|||||||
import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
|
import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
|
||||||
import react from '@vitejs/plugin-react'
|
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({
|
export default defineConfig({
|
||||||
main: {
|
main: {
|
||||||
plugins: [externalizeDepsPlugin()],
|
plugins: [externalizeDepsPlugin()],
|
||||||
|
define: {
|
||||||
|
__UPDATE_TOKEN__: updateToken
|
||||||
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
alias: {
|
alias: {
|
||||||
'@shared': resolve('src/shared')
|
'@shared': resolve('src/shared')
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "laude",
|
"name": "laude",
|
||||||
"version": "0.3.2",
|
"version": "0.3.5",
|
||||||
"description": "Exercise reminder — Windows desktop app",
|
"description": "Exercise reminder — Windows desktop app",
|
||||||
"main": "out/main/index.js",
|
"main": "out/main/index.js",
|
||||||
"author": "AnRil",
|
"author": "AnRil",
|
||||||
|
|||||||
@@ -3,6 +3,10 @@ import { autoUpdater } from 'electron-updater'
|
|||||||
import { IPC } from '@shared/ipc'
|
import { IPC } from '@shared/ipc'
|
||||||
import type { UpdaterStatus } from '@shared/types'
|
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 currentStatus: UpdaterStatus = { kind: 'idle' }
|
||||||
let wired = false
|
let wired = false
|
||||||
let checkInterval: NodeJS.Timeout | null = null
|
let checkInterval: NodeJS.Timeout | null = null
|
||||||
@@ -38,6 +42,14 @@ export function initUpdater(): void {
|
|||||||
autoUpdater.autoInstallOnAppQuit = true
|
autoUpdater.autoInstallOnAppQuit = true
|
||||||
autoUpdater.allowDowngrade = false
|
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('checking-for-update', () => setStatus({ kind: 'checking' }))
|
||||||
|
|
||||||
autoUpdater.on('update-available', (info) => {
|
autoUpdater.on('update-available', (info) => {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<title>Exercise Reminder</title>
|
<title>Exercise Reminder</title>
|
||||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||||
<link href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;600;700;800&family=Fraunces:opsz,wght@9..144,400;9..144,500;9..144,600;9..144,700&family=JetBrains+Mono:wght@400;500;600;700&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>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
|
|||||||
@@ -139,10 +139,10 @@ function ExerciseReminder({
|
|||||||
</div>
|
</div>
|
||||||
</motion.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>
|
</div>
|
||||||
<h1 className="font-serif text-[28px] leading-tight tracking-tight mt-2 mb-3 font-medium">
|
<h1 className="font-serif text-[30px] leading-tight tracking-tight mt-2 mb-3 font-bold">
|
||||||
{exercise.name}
|
{exercise.name}
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
@@ -150,11 +150,11 @@ function ExerciseReminder({
|
|||||||
<span className="text-[56px] font-semibold tracking-tight text-text leading-none">
|
<span className="text-[56px] font-semibold tracking-tight text-text leading-none">
|
||||||
{exercise.reps}
|
{exercise.reps}
|
||||||
</span>
|
</span>
|
||||||
<span className="text-[14px] text-text/55">раз</span>
|
<span className="text-[15px] text-text/65 font-semibold">раз</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="text-[12px] text-text/45 mt-4 inline-flex items-center gap-1.5">
|
<div className="text-[13px] text-text/65 mt-4 inline-flex items-center gap-1.5 font-medium">
|
||||||
<Clock size={11} strokeWidth={2.4} />
|
<Clock size={12} strokeWidth={2.4} />
|
||||||
Следующее через {formatInterval(exercise.intervalMinutes)}
|
Следующее через {formatInterval(exercise.intervalMinutes)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -163,20 +163,20 @@ function ExerciseReminder({
|
|||||||
<div className="px-4 pb-4 space-y-2">
|
<div className="px-4 pb-4 space-y-2">
|
||||||
<button
|
<button
|
||||||
onClick={done}
|
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>
|
</button>
|
||||||
<div className="grid grid-cols-2 gap-2">
|
<div className="grid grid-cols-2 gap-2">
|
||||||
<button
|
<button
|
||||||
onClick={snooze}
|
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>
|
||||||
<button
|
<button
|
||||||
onClick={skip}
|
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>
|
</button>
|
||||||
@@ -208,8 +208,8 @@ function MatchSummaryView({
|
|||||||
return (
|
return (
|
||||||
<div className="reminder-shell flex flex-col h-full">
|
<div className="reminder-shell flex flex-col h-full">
|
||||||
<div className="titlebar-drag h-9 px-2 flex items-center justify-between">
|
<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">
|
<div className="text-[12px] text-text/65 font-semibold inline-flex items-center gap-1.5 px-2">
|
||||||
<Gamepad2 size={11} strokeWidth={2.4} /> {summary.gameName}
|
<Gamepad2 size={12} strokeWidth={2.4} /> {summary.gameName}
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
onClick={onClose}
|
onClick={onClose}
|
||||||
@@ -238,19 +238,19 @@ function MatchSummaryView({
|
|||||||
<Gamepad2 size={26} strokeWidth={2} />
|
<Gamepad2 size={26} strokeWidth={2} />
|
||||||
)}
|
)}
|
||||||
</motion.div>
|
</motion.div>
|
||||||
<h1 className="font-serif text-[24px] tracking-tight font-medium">
|
<h1 className="font-serif text-[26px] tracking-tight font-bold">
|
||||||
{won ? 'Победа' : lost ? 'Поражение' : 'Матч завершён'}
|
{won ? 'Победа' : lost ? 'Поражение' : 'Матч завершён'}
|
||||||
</h1>
|
</h1>
|
||||||
<p className="text-[12px] text-text/45 mt-1">
|
<p className="text-[13px] text-text/65 mt-1.5 font-medium">
|
||||||
<span className="font-mono-num font-medium text-text/65">
|
<span className="font-mono-num font-bold text-text">
|
||||||
{Math.floor(summary.durationMs / 60_000)}
|
{Math.floor(summary.durationMs / 60_000)}
|
||||||
</span>{' '}
|
</span>{' '}
|
||||||
мин · {summary.results.length} челлендж
|
мин · {summary.results.length} челлендж
|
||||||
{summary.results.length === 1 ? '' : 'а'} ·{' '}
|
{summary.results.length === 1 ? '' : 'а'} ·{' '}
|
||||||
{allDone ? (
|
{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} осталось
|
{remainingReps} осталось
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
@@ -269,9 +269,9 @@ function MatchSummaryView({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="px-4 pb-4 pt-3 flex items-center gap-3">
|
<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}
|
{totalReps}
|
||||||
</span>{' '}
|
</span>{' '}
|
||||||
повторов
|
повторов
|
||||||
@@ -326,14 +326,14 @@ function ChallengeRow({
|
|||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
<div
|
<div
|
||||||
className={[
|
className={[
|
||||||
'text-[14px] font-medium truncate',
|
'text-[15px] font-semibold truncate',
|
||||||
done ? 'line-through opacity-55' : ''
|
done ? 'line-through opacity-55' : ''
|
||||||
].join(' ')}
|
].join(' ')}
|
||||||
>
|
>
|
||||||
{result.exerciseName}
|
{result.exerciseName}
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[12px] text-text/55 mt-0.5">
|
<div className="text-[13px] text-text/65 mt-0.5 font-medium">
|
||||||
<span className="font-mono-num font-semibold text-text/75">
|
<span className="font-mono-num font-bold text-text">
|
||||||
{result.statValue}
|
{result.statValue}
|
||||||
</span>{' '}
|
</span>{' '}
|
||||||
{result.statLabel} → <span>{result.name}</span>
|
{result.statLabel} → <span>{result.name}</span>
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ export function ExerciseCard({
|
|||||||
|
|
||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
<div className="flex items-center justify-between gap-2">
|
<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}
|
{exercise.name}
|
||||||
</h3>
|
</h3>
|
||||||
<div className="relative">
|
<div className="relative">
|
||||||
@@ -138,19 +138,19 @@ export function ExerciseCard({
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</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)}
|
{exercise.reps} раз · каждые {formatInterval(exercise.intervalMinutes)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Countdown + switch */}
|
{/* Countdown + switch */}
|
||||||
<div className="flex items-end justify-between mt-3.5">
|
<div className="flex items-end justify-between mt-3.5">
|
||||||
<div>
|
<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 ? 'Сейчас' : 'Через'}
|
{isDue ? 'Сейчас' : 'Через'}
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
className={[
|
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'
|
isDue ? 'text-accent' : 'text-text'
|
||||||
].join(' ')}
|
].join(' ')}
|
||||||
>
|
>
|
||||||
@@ -172,7 +172,7 @@ export function ExerciseCard({
|
|||||||
initial={{ opacity: 0, y: 4 }}
|
initial={{ opacity: 0, y: 4 }}
|
||||||
animate={{ opacity: 1, y: 0 }}
|
animate={{ opacity: 1, y: 0 }}
|
||||||
onClick={onMarkDone}
|
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} /> Готово
|
<Check size={15} strokeWidth={2.5} /> Готово
|
||||||
</motion.button>
|
</motion.button>
|
||||||
|
|||||||
@@ -97,10 +97,10 @@ function SidebarContent({ onNav }: { onNav?: () => void }): JSX.Element {
|
|||||||
<>
|
<>
|
||||||
{/* Brand */}
|
{/* Brand */}
|
||||||
<div className="px-5 pt-7 pb-6">
|
<div className="px-5 pt-7 pb-6">
|
||||||
<div className="font-serif text-[34px] leading-none tracking-tight font-medium">
|
<div className="font-serif text-[36px] leading-none tracking-tight font-bold">
|
||||||
Laude
|
Laude
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[12px] text-text/45 mt-2 tracking-tight">
|
<div className="text-[13px] text-text/55 mt-2 font-medium">
|
||||||
Двигайся осознанно
|
Двигайся осознанно
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -126,19 +126,19 @@ function Body({
|
|||||||
return (
|
return (
|
||||||
<div className="px-4 py-4">
|
<div className="px-4 py-4">
|
||||||
<div className="flex items-center gap-3 mb-3">
|
<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">
|
<div className="w-10 h-10 rounded-xl bg-accent/12 text-accent grid place-items-center">
|
||||||
<Download size={16} strokeWidth={2.4} />
|
<Download size={17} strokeWidth={2.4} />
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 min-w-0">
|
<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>
|
||||||
<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)} МБ ·{' '}
|
{mb(status.transferred)} / {mb(status.total)} МБ ·{' '}
|
||||||
{(status.bytesPerSecond / 1024 / 1024).toFixed(2)} МБ/с
|
{(status.bytesPerSecond / 1024 / 1024).toFixed(2)} МБ/с
|
||||||
</div>
|
</div>
|
||||||
</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)}%
|
{pct.toFixed(0)}%
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -218,19 +218,19 @@ function Cell({
|
|||||||
muted: 'bg-surface-2 text-text/55'
|
muted: 'bg-surface-2 text-text/55'
|
||||||
}[tone]
|
}[tone]
|
||||||
return (
|
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
|
<div
|
||||||
className={[
|
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
|
cls
|
||||||
].join(' ')}
|
].join(' ')}
|
||||||
>
|
>
|
||||||
{icon}
|
{icon}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 min-w-0">
|
<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 && (
|
{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}
|
{subtitle}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -39,12 +39,16 @@ export function SectionHeader({
|
|||||||
action?: ReactNode
|
action?: ReactNode
|
||||||
}): JSX.Element {
|
}): JSX.Element {
|
||||||
return (
|
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>
|
||||||
<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}
|
{title}
|
||||||
</div>
|
</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>
|
</div>
|
||||||
{action}
|
{action}
|
||||||
</div>
|
</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="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 className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
|
||||||
<div>
|
<div>
|
||||||
<div className="text-[13px] text-text/45 font-medium">
|
<div className="text-[14px] text-text/65 font-semibold">
|
||||||
Правила за матч
|
Правила за матч
|
||||||
</div>
|
</div>
|
||||||
<h1 className="font-serif text-[32px] sm:text-[36px] leading-[1.05] tracking-tight mt-1 font-medium">
|
<h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
|
||||||
Челленджи
|
Челленджи
|
||||||
</h1>
|
</h1>
|
||||||
<p className="text-[14px] text-text/55 mt-2">
|
<p className="text-[15px] text-text/65 mt-2 font-medium">
|
||||||
Повторов = <span className="font-mono-num">статистика × коэффициент</span>
|
Повторов = <span className="font-mono-num font-semibold text-text">статистика × коэффициент</span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<Button
|
<Button
|
||||||
@@ -70,12 +70,12 @@ export default function ChallengesPage(): JSX.Element {
|
|||||||
|
|
||||||
{noGamesActive && (
|
{noGamesActive && (
|
||||||
<div className="mb-6 rounded-2xl bg-warning/12 p-4 flex items-start gap-3">
|
<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">
|
<div className="w-10 h-10 rounded-xl bg-warning/18 text-warning grid place-items-center shrink-0">
|
||||||
<AlertTriangle size={16} strokeWidth={2.5} />
|
<AlertTriangle size={18} strokeWidth={2.5} />
|
||||||
</div>
|
</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>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -104,13 +104,13 @@ export default function ChallengesPage(): JSX.Element {
|
|||||||
<Icon name={c.icon} size={18} strokeWidth={2.2} />
|
<Icon name={c.icon} size={18} strokeWidth={2.2} />
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 min-w-0">
|
<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}
|
{c.name}
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[13px] text-text/55 mt-0.5 inline-flex items-center gap-1.5">
|
<div className="text-[14px] text-text/65 mt-1 inline-flex items-center gap-1.5 font-medium">
|
||||||
<Gamepad2 size={11} />
|
<Gamepad2 size={12} strokeWidth={2.4} />
|
||||||
{GAME_NAMES[c.gameId]} ·{' '}
|
{GAME_NAMES[c.gameId]} ·{' '}
|
||||||
<span className="font-mono-num">
|
<span className="font-mono-num font-semibold text-text">
|
||||||
{STAT_LABELS[c.stat]} × {c.multiplier}
|
{STAT_LABELS[c.stat]} × {c.multiplier}
|
||||||
</span>{' '}
|
</span>{' '}
|
||||||
→ {c.exerciseName}
|
→ {c.exerciseName}
|
||||||
|
|||||||
@@ -69,10 +69,10 @@ export default function Dashboard(): JSX.Element {
|
|||||||
{/* Hero — iOS Large Title */}
|
{/* Hero — iOS Large Title */}
|
||||||
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
|
<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="min-w-0">
|
||||||
<div className="text-[13px] text-text/45 font-medium capitalize">
|
<div className="text-[14px] text-text/65 font-semibold capitalize">
|
||||||
{today}
|
{today}
|
||||||
</div>
|
</div>
|
||||||
<h1 className="font-serif text-[32px] sm:text-[36px] leading-[1.05] tracking-tight mt-1 font-medium">
|
<h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
|
||||||
Сегодня
|
Сегодня
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
@@ -139,19 +139,19 @@ export default function Dashboard(): JSX.Element {
|
|||||||
animate={{ opacity: 1, y: 0 }}
|
animate={{ opacity: 1, y: 0 }}
|
||||||
className="mb-6 rounded-2xl bg-warning/12 p-4 flex items-center gap-3"
|
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">
|
<div className="w-10 h-10 rounded-xl bg-warning/18 text-warning grid place-items-center shrink-0">
|
||||||
<Pause size={16} strokeWidth={2.5} />
|
<Pause size={18} strokeWidth={2.5} />
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
<div className="text-[14px] font-semibold">
|
<div className="text-[16px] font-semibold leading-tight">
|
||||||
Напоминания на паузе
|
Напоминания на паузе
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[12px] text-text/55 mt-0.5">
|
<div className="text-[14px] text-text/70 mt-1">
|
||||||
Возобнови, чтобы продолжить отсчёт
|
Возобнови, чтобы продолжить отсчёт
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Button variant="filled" size="sm" onClick={togglePause}>
|
<Button variant="filled" size="sm" onClick={togglePause}>
|
||||||
<Play size={13} strokeWidth={2.5} /> Старт
|
<Play size={14} strokeWidth={2.5} /> Старт
|
||||||
</Button>
|
</Button>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
)}
|
)}
|
||||||
@@ -225,19 +225,21 @@ function HeroStat({
|
|||||||
<div className="flex items-center gap-2 mb-3">
|
<div className="flex items-center gap-2 mb-3">
|
||||||
<div
|
<div
|
||||||
className={[
|
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
|
toneBg
|
||||||
].join(' ')}
|
].join(' ')}
|
||||||
>
|
>
|
||||||
{icon}
|
{icon}
|
||||||
</div>
|
</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>
|
||||||
<div className="font-display text-[26px] font-semibold tracking-tight leading-none">
|
<div className="font-display text-[28px] font-bold tracking-tight leading-none">
|
||||||
{value}
|
{value}
|
||||||
</div>
|
</div>
|
||||||
{subvalue && (
|
{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>
|
</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="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 className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
|
||||||
<div>
|
<div>
|
||||||
<div className="text-[13px] text-text/45 font-medium">
|
<div className="text-[14px] text-text/65 font-semibold">
|
||||||
Программа
|
Программа
|
||||||
</div>
|
</div>
|
||||||
<h1 className="font-serif text-[32px] sm:text-[36px] leading-[1.05] tracking-tight mt-1 font-medium">
|
<h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
|
||||||
Упражнения
|
Упражнения
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
@@ -79,7 +79,7 @@ export default function Exercises(): JSX.Element {
|
|||||||
|
|
||||||
{exercises.length === 0 && (
|
{exercises.length === 0 && (
|
||||||
<Card>
|
<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>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
@@ -126,10 +126,10 @@ function ExerciseRow({
|
|||||||
onClick={onEdit}
|
onClick={onEdit}
|
||||||
className="flex-1 min-w-0 text-left active:opacity-70 transition-opacity"
|
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}
|
{exercise.name}
|
||||||
</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)}
|
{exercise.reps} раз · {formatInterval(exercise.intervalMinutes)}
|
||||||
</div>
|
</div>
|
||||||
</button>
|
</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="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 className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
|
||||||
<div>
|
<div>
|
||||||
<div className="text-[13px] text-text/45 font-medium">
|
<div className="text-[14px] text-text/65 font-semibold">
|
||||||
Трекинг матчей
|
Трекинг матчей
|
||||||
</div>
|
</div>
|
||||||
<h1 className="font-serif text-[32px] sm:text-[36px] leading-[1.05] tracking-tight mt-1 font-medium">
|
<h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
|
||||||
Игры
|
Игры
|
||||||
</h1>
|
</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 && (
|
{liveCount > 0 && (
|
||||||
<>
|
<>
|
||||||
{' · '}
|
{' · '}
|
||||||
<span className="text-success font-mono-num font-semibold">
|
<span className="text-success font-mono-num font-bold">
|
||||||
{liveCount} live
|
{liveCount} live
|
||||||
</span>
|
</span>
|
||||||
</>
|
</>
|
||||||
@@ -154,13 +154,13 @@ function GameCard({
|
|||||||
</div>
|
</div>
|
||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
<div className="flex items-center gap-2 flex-wrap">
|
<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}
|
{game.name}
|
||||||
</h3>
|
</h3>
|
||||||
<StatusBadge game={game} isLive={isLive} />
|
<StatusBadge game={game} isLive={isLive} />
|
||||||
</div>
|
</div>
|
||||||
{game.installPath && (
|
{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}
|
{game.installPath}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -176,15 +176,15 @@ function GameCard({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{game.integrationActive && game.launchOptionStatus === 'queued' && (
|
{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
|
<Hourglass
|
||||||
size={15}
|
size={17}
|
||||||
className="text-warning shrink-0 mt-0.5"
|
className="text-warning shrink-0 mt-0.5"
|
||||||
strokeWidth={2.4}
|
strokeWidth={2.4}
|
||||||
/>
|
/>
|
||||||
<div className="text-text/80">
|
<div className="text-text/85">
|
||||||
Steam запущен. Параметр{' '}
|
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}
|
{game.launchOption}
|
||||||
</code>{' '}
|
</code>{' '}
|
||||||
пропишется автоматически при следующем закрытии Steam.
|
пропишется автоматически при следующем закрытии Steam.
|
||||||
@@ -193,15 +193,15 @@ function GameCard({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{game.integrationActive && game.launchOptionStatus === 'no_user' && (
|
{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
|
<AlertTriangle
|
||||||
size={15}
|
size={17}
|
||||||
className="text-destructive shrink-0 mt-0.5"
|
className="text-destructive shrink-0 mt-0.5"
|
||||||
strokeWidth={2.4}
|
strokeWidth={2.4}
|
||||||
/>
|
/>
|
||||||
<div className="text-text/80">
|
<div className="text-text/85">
|
||||||
В Steam нет залогиненного аккаунта (нет папки{' '}
|
В Steam нет залогиненного аккаунта (нет папки{' '}
|
||||||
<code className="font-mono-num text-[12px]">userdata</code>).
|
<code className="font-mono-num text-[13px] font-semibold">userdata</code>).
|
||||||
Запусти Steam один раз и нажми «Установить интеграцию».
|
Запусти Steam один раз и нажми «Установить интеграцию».
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -224,7 +224,7 @@ function GameCard({
|
|||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
{!game.installed && (
|
{!game.installed && (
|
||||||
<div className="text-[13px] text-text/55">
|
<div className="text-[14px] text-text/65 font-medium">
|
||||||
Установи игру в Steam и нажми «Обновить»
|
Установи игру в Steam и нажми «Обновить»
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -21,10 +21,10 @@ export default function SettingsPage(): JSX.Element {
|
|||||||
<div className="h-full overflow-y-auto">
|
<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="max-w-2xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
|
||||||
<div className="mb-8">
|
<div className="mb-8">
|
||||||
<div className="text-[13px] text-text/45 font-medium">
|
<div className="text-[14px] text-text/65 font-semibold">
|
||||||
Конфигурация
|
Конфигурация
|
||||||
</div>
|
</div>
|
||||||
<h1 className="font-serif text-[32px] sm:text-[36px] leading-[1.05] tracking-tight mt-1 font-medium">
|
<h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
|
||||||
Настройки
|
Настройки
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
@@ -132,9 +132,11 @@ function ToggleRow({
|
|||||||
return (
|
return (
|
||||||
<Row last={last} className={disabled ? 'opacity-50' : ''}>
|
<Row last={last} className={disabled ? 'opacity-50' : ''}>
|
||||||
<div className="flex-1 min-w-0">
|
<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 && (
|
{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>
|
</div>
|
||||||
<Switch checked={checked} onChange={onChange} disabled={disabled} />
|
<Switch checked={checked} onChange={onChange} disabled={disabled} />
|
||||||
@@ -160,9 +162,11 @@ function SelectRow({
|
|||||||
return (
|
return (
|
||||||
<Row last={last}>
|
<Row last={last}>
|
||||||
<div className="flex-1 min-w-0">
|
<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 && (
|
{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>
|
</div>
|
||||||
<select
|
<select
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ body,
|
|||||||
|
|
||||||
body {
|
body {
|
||||||
font-family:
|
font-family:
|
||||||
'Manrope',
|
'Plus Jakarta Sans',
|
||||||
-apple-system,
|
-apple-system,
|
||||||
'SF Pro Text',
|
'SF Pro Text',
|
||||||
'Segoe UI Variable Text',
|
'Segoe UI Variable Text',
|
||||||
@@ -79,28 +79,38 @@ body {
|
|||||||
-webkit-font-smoothing: antialiased;
|
-webkit-font-smoothing: antialiased;
|
||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
line-height: 1.45;
|
line-height: 1.5;
|
||||||
letter-spacing: -0.005em;
|
letter-spacing: -0.005em;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Display — same Manrope but slightly tighter for headings */
|
/* Display — Bricolage Grotesque for headings and brand. Variable opsz axis
|
||||||
|
gives bigger glyphs slightly more character. */
|
||||||
.font-display {
|
.font-display {
|
||||||
font-family:
|
font-family:
|
||||||
'Manrope',
|
'Bricolage Grotesque',
|
||||||
|
'Plus Jakarta Sans',
|
||||||
-apple-system,
|
-apple-system,
|
||||||
'SF Pro Display',
|
'SF Pro Display',
|
||||||
'Segoe UI Variable Display',
|
|
||||||
system-ui,
|
system-ui,
|
||||||
sans-serif;
|
sans-serif;
|
||||||
|
font-optical-sizing: auto;
|
||||||
|
font-variation-settings: 'opsz' 24;
|
||||||
letter-spacing: -0.02em;
|
letter-spacing: -0.02em;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Serif — Fraunces for hero titles with optical-size axis */
|
/* Serif → repurposed for the "hero" big titles. Same Bricolage but with the
|
||||||
|
opsz axis pushed to 96 for distinctive display feel. */
|
||||||
.font-serif {
|
.font-serif {
|
||||||
font-family: 'Fraunces', 'Iowan Old Style', 'New York', Georgia, serif;
|
font-family:
|
||||||
|
'Bricolage Grotesque',
|
||||||
|
'Plus Jakarta Sans',
|
||||||
|
-apple-system,
|
||||||
|
'SF Pro Display',
|
||||||
|
system-ui,
|
||||||
|
sans-serif;
|
||||||
font-optical-sizing: auto;
|
font-optical-sizing: auto;
|
||||||
font-variation-settings: 'opsz' 144;
|
font-variation-settings: 'opsz' 96;
|
||||||
letter-spacing: -0.025em;
|
letter-spacing: -0.035em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.font-mono-num {
|
.font-mono-num {
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ export default {
|
|||||||
},
|
},
|
||||||
fontFamily: {
|
fontFamily: {
|
||||||
sans: [
|
sans: [
|
||||||
'Manrope',
|
'Plus Jakarta Sans',
|
||||||
'-apple-system',
|
'-apple-system',
|
||||||
'SF Pro Text',
|
'SF Pro Text',
|
||||||
'Segoe UI Variable Text',
|
'Segoe UI Variable Text',
|
||||||
@@ -43,19 +43,20 @@ export default {
|
|||||||
'sans-serif'
|
'sans-serif'
|
||||||
],
|
],
|
||||||
display: [
|
display: [
|
||||||
'Manrope',
|
'Bricolage Grotesque',
|
||||||
|
'Plus Jakarta Sans',
|
||||||
'-apple-system',
|
'-apple-system',
|
||||||
'SF Pro Display',
|
'SF Pro Display',
|
||||||
'Segoe UI Variable Display',
|
|
||||||
'system-ui',
|
'system-ui',
|
||||||
'sans-serif'
|
'sans-serif'
|
||||||
],
|
],
|
||||||
serif: [
|
serif: [
|
||||||
'Fraunces',
|
'Bricolage Grotesque',
|
||||||
'Iowan Old Style',
|
'Plus Jakarta Sans',
|
||||||
'New York',
|
'-apple-system',
|
||||||
'Georgia',
|
'SF Pro Display',
|
||||||
'serif'
|
'system-ui',
|
||||||
|
'sans-serif'
|
||||||
],
|
],
|
||||||
mono: [
|
mono: [
|
||||||
'JetBrains Mono',
|
'JetBrains Mono',
|
||||||
|
|||||||
Reference in New Issue
Block a user