3 Commits

Author SHA1 Message Date
Codex
a92f642a3e chore(release): v0.7.1 2026-06-09 01:00:35 +07:00
Codex
8176df3ca2 docs(release): note rollback to last good design 2026-06-09 00:58:59 +07:00
Codex
20a260d0cc Revert "feat(ui): redesign desktop experience"
This reverts commit f61e076e46.
2026-06-09 00:56:40 +07:00
28 changed files with 461 additions and 468 deletions

View File

@@ -6,23 +6,15 @@
## [Unreleased] ## [Unreleased]
## [0.7.0] — 2026-06-08 ## [0.7.1] — 2026-06-09
### Added
- Текущая версия `v0.6.6` сохранена отдельным тегом `последнее-удачное`
как точка отката перед большим редизайном.
### Changed ### Changed
- Интерфейс приложения пересобран в новом desktop-направлении: темный сайдбар, - Полный редизайн `v0.7.0` откачен: интерфейс возвращен к сохраненной
плотный рабочий контент, нейтральная палитра, чёткие панели и радиусы 810px. версии `последнее-удачное` / `v0.6.6`, потому что новое направление не
- Главный экран стал операционным overview: верхняя панель состояния, компактные подошло.
status tiles, план ближайшего шага, цели, питание, режим и игровые долги. - `v0.7.1` публикуется как обычное обновление, чтобы пользователи на `v0.7.0`
- Страницы упражнений, питания, игр, челленджей и настроек получили единый автоматически получили возврат к последнему удачному внешнему виду.
desktop-контейнер, более плотные списки и менее декоративные summary-блоки.
- Редакторы, модальные окна, кнопки, переключатели, heatmap, достижения и окно
напоминания приведены к новой desktop-системе.
## [0.6.6] — 2026-06-08 ## [0.6.6] — 2026-06-08
@@ -188,7 +180,7 @@ clearHistory/import`, Dashboard на него подписан.
### Fixed (P1 — UX просадки) ### Fixed (P1 — UX просадки)
- **Удаление упражнения теперь спрашивает подтверждение.** Раньше - **Удаление упражнения теперь спрашивает подтверждение.** Раньше
один клик в menu «Удалить» сразу удалял. Сейчас ConfirmModal один клик в menu «Удалить» сразу удалял. Сейчас iOS-style ConfirmModal
с destructive-кнопкой. с destructive-кнопкой.
- **Daily goal закрыт — больше не «25 часов 13 минут».** Когда дневная - **Daily goal закрыт — больше не «25 часов 13 минут».** Когда дневная
цель достигнута, ExerciseCard показывает «Цель закрыта · 100/100» цель достигнута, ExerciseCard показывает «Цель закрыта · 100/100»
@@ -197,7 +189,7 @@ clearHistory/import`, Dashboard на него подписан.
молча — пользователь не понимал почему через 12 мин ничего не пришло. молча — пользователь не понимал почему через 12 мин ничего не пришло.
Сейчас info-баннер активной встречи с указанием закрыть Сейчас info-баннер активной встречи с указанием закрыть
Zoom/Teams/etc. Zoom/Teams/etc.
- **Native `window.confirm()` → ConfirmModal** в restore-операции. - **Native `window.confirm()` → iOS-style ConfirmModal** в restore-операции.
Раньше всплывал серый системный диалог. Раньше всплывал серый системный диалог.
### Fixed (P2 — полировка) ### Fixed (P2 — полировка)
@@ -223,7 +215,7 @@ clearHistory/import`, Dashboard на него подписан.
### Added ### Added
- `src/renderer/src/components/ui/ConfirmModal.tsx` — переиспользуемый - `src/renderer/src/components/ui/ConfirmModal.tsx` — переиспользуемый
confirm с focus-trap'ом через Modal. iOS-style confirm с focus-trap'ом через Modal.
- IPC `markChallengeDone(challengeId, reps)` — handler в main, метод в - IPC `markChallengeDone(challengeId, reps)` — handler в main, метод в
preload (раньше канал был в IPC enum, handler не зарегистрирован). preload (раньше канал был в IPC enum, handler не зарегистрирован).
- IPC `getMeetingActive` + event `evtMeetingChanged` — meeting-detect - IPC `getMeetingActive` + event `evtMeetingChanged` — meeting-detect
@@ -550,9 +542,9 @@ days=[Mon..Fri]` теперь правильно проверяется день
## [0.3.x] — 2026-05-17 ## [0.3.x] — 2026-05-17
Серия мелких релизов с ранними дизайн-итерациями: Серия мелких релизов с дизайн-итерациями (Apple iOS / macOS aesthetic):
шрифты Plus Jakarta Sans + Bricolage Grotesque, светлая/тёмная/системная шрифты Plus Jakarta Sans + Bricolage Grotesque, светлая/тёмная/системная
тема, полупрозрачный сайдбар, grouped lists, spring-анимации. тема, vibrancy sidebar, iOS-grouped lists, spring-анимации.
## [0.2.0] — 2026-05-16 ## [0.2.0] — 2026-05-16
@@ -568,8 +560,8 @@ days=[Mon..Fri]` теперь правильно проверяется день
иконки), системный трей, автозапуск с Windows, native-уведомления, иконки), системный трей, автозапуск с Windows, native-уведомления,
NSIS-инсталлятор, auto-update через electron-updater. NSIS-инсталлятор, auto-update через electron-updater.
[Unreleased]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.7.0...HEAD [Unreleased]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.7.1...HEAD
[0.7.0]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.6...v0.7.0 [0.7.1]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.7.0...v0.7.1
[0.6.6]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.5...v0.6.6 [0.6.6]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.5...v0.6.6
[0.6.5]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.4...v0.6.5 [0.6.5]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.4...v0.6.5
[0.6.4]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.3...v0.6.4 [0.6.4]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.3...v0.6.4

View File

@@ -2,7 +2,7 @@
Windows desktop приложение, которое помогает делать короткие перерывы без потери фокуса: держит план дня, напоминает размяться, ведёт недельные челленджи и превращает Dota 2 статистику после матча в игровые долги. Windows desktop приложение, которое помогает делать короткие перерывы без потери фокуса: держит план дня, напоминает размяться, ведёт недельные челленджи и превращает Dota 2 статистику после матча в игровые долги.
[![release](https://img.shields.io/badge/release-v0.7.0-orange)](https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/latest) [![release](https://img.shields.io/badge/release-v0.7.1-orange)](https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/latest)
[![tests](https://img.shields.io/badge/tests-245%20passing-green)]() [![tests](https://img.shields.io/badge/tests-245%20passing-green)]()
[![platform](https://img.shields.io/badge/platform-Windows%2010%2F11-blue)]() [![platform](https://img.shields.io/badge/platform-Windows%2010%2F11-blue)]()
@@ -15,7 +15,7 @@ Windows desktop приложение, которое помогает делат
- **Тихие часы** — окно времени когда напоминания подавляются (например `22:00 → 08:00`), с выбором дней недели. - **Тихие часы** — окно времени когда напоминания подавляются (например `22:00 → 08:00`), с выбором дней недели.
- **Сделал частично** — степпер `/+` в окне напоминания: если ты сделал 5 из 10, в историю запишется честное число. - **Сделал частично** — степпер `/+` в окне напоминания: если ты сделал 5 из 10, в историю запишется честное число.
- **Игровая интеграция (Dota 2)** — Game State Integration читает статистику матча, после Победа/Поражение показывает экран с «причитающимися» повторениями (например `10 смертей × 3 = 30 приседаний`). - **Игровая интеграция (Dota 2)** — Game State Integration читает статистику матча, после Победа/Поражение показывает экран с «причитающимися» повторениями (например `10 смертей × 3 = 30 приседаний`).
- **Desktop-интерфейс** — темный сайдбар, плотные рабочие панели, чёткие строки списков, светлая/тёмная/системная тема. - **Фирменный desktop-интерфейс** — Plus Jakarta Sans + Bricolage Grotesque, мягкая палитра, sidebar, spring-анимации, светлая/тёмная/системная тема.
- **Два языка** — русский и английский, переключение мгновенное. - **Два языка** — русский и английский, переключение мгновенное.
- **Auto-update** — приложение само скачивает новые версии из фиксированного `update-channel` (проверка каждый час, силент-ретрай при сетевых сбоях). - **Auto-update** — приложение само скачивает новые версии из фиксированного `update-channel` (проверка каждый час, силент-ретрай при сетевых сбоях).

View File

@@ -1,6 +1,6 @@
{ {
"name": "laude", "name": "laude",
"version": "0.7.0", "version": "0.7.1",
"description": "Разомнись — Windows desktop break and exercise reminder", "description": "Разомнись — Windows desktop break and exercise reminder",
"main": "out/main/index.js", "main": "out/main/index.js",
"author": "AnRil", "author": "AnRil",

View File

@@ -89,14 +89,14 @@ export default function App(): JSX.Element {
return ( return (
<ErrorBoundary> <ErrorBoundary>
<HashRouter> <HashRouter>
<div className="h-screen w-screen flex flex-col app-shell bg-bg"> <div className="h-screen w-screen flex flex-col bg-bg">
<Titlebar onMenuClick={() => setCompactNavOpen(true)} /> <Titlebar onMenuClick={() => setCompactNavOpen(true)} />
<div className="flex-1 flex overflow-hidden"> <div className="flex-1 flex overflow-hidden">
<Sidebar <Sidebar
compactOpen={compactNavOpen} compactOpen={compactNavOpen}
onCompactClose={() => setCompactNavOpen(false)} onCompactClose={() => setCompactNavOpen(false)}
/> />
<main className="flex-1 overflow-hidden min-w-0 app-main-surface"> <main className="flex-1 overflow-hidden min-w-0">
{hydrated ? ( {hydrated ? (
<ErrorBoundary> <ErrorBoundary>
<RoutedPages onNav={() => setCompactNavOpen(false)} /> <RoutedPages onNav={() => setCompactNavOpen(false)} />

View File

@@ -226,7 +226,8 @@ export default function ReminderApp(): JSX.Element {
void window.api.markChallengeDone(id, result.reps) void window.api.markChallengeDone(id, result.reps)
} }
// 2) Functional update: rapid-click race-safe. // 2) Functional update: rapid-click race-safe.
setMode((m) => { setMode((m) =>
{
if (m.kind !== 'match') return m if (m.kind !== 'match') return m
const nextMode: Mode = { const nextMode: Mode = {
kind: 'match', kind: 'match',
@@ -235,7 +236,8 @@ export default function ReminderApp(): JSX.Element {
} }
modeRef.current = nextMode modeRef.current = nextMode
return nextMode return nextMode
}) }
)
}} }}
onClose={close} onClose={close}
/> />
@@ -328,7 +330,7 @@ function ExerciseReminder({
transition={{ type: 'spring', stiffness: 300, damping: 24 }} transition={{ type: 'spring', stiffness: 300, damping: 24 }}
className="relative mb-6" className="relative mb-6"
> >
<div className="w-20 h-20 rounded-xl bg-accent text-white grid place-items-center shadow-[0_12px_36px_-24px_rgb(var(--accent)/0.75)]"> <div className="w-24 h-24 rounded-full bg-accent text-white grid place-items-center shadow-[0_8px_30px_-8px_rgb(var(--accent)/0.5)]">
<Icon name={exercise.icon} size={44} strokeWidth={2} /> <Icon name={exercise.icon} size={44} strokeWidth={2} />
</div> </div>
</motion.div> </motion.div>
@@ -336,7 +338,7 @@ function ExerciseReminder({
<div className="text-[13px] uppercase tracking-[0.18em] text-accent font-bold"> <div className="text-[13px] uppercase tracking-[0.18em] text-accent font-bold">
{t(`category.${exercise.category ?? 'exercise'}.cta`)} {t(`category.${exercise.category ?? 'exercise'}.cta`)}
</div> </div>
<h1 className="font-display text-[30px] leading-tight mt-2 mb-3 font-bold"> <h1 className="font-serif text-[30px] leading-tight tracking-tight mt-2 mb-3 font-bold">
{exercise.name} {exercise.name}
</h1> </h1>
@@ -344,7 +346,7 @@ function ExerciseReminder({
<div className="inline-flex items-center gap-3 select-none"> <div className="inline-flex items-center gap-3 select-none">
<button <button
onClick={dec} onClick={dec}
className="w-9 h-9 grid place-items-center rounded-lg bg-surface-2 text-text/65 hover:text-text hover:bg-hairline/25 active:scale-95 transition-all" className="w-9 h-9 grid place-items-center rounded-full bg-surface-2 text-text/65 hover:text-text hover:bg-hairline/25 active:scale-90 transition-all"
aria-label={t('reminder.aria.decrement')} aria-label={t('reminder.aria.decrement')}
> >
<Minus size={16} strokeWidth={2.5} /> <Minus size={16} strokeWidth={2.5} />
@@ -352,7 +354,7 @@ function ExerciseReminder({
<div className="inline-flex items-baseline gap-2 font-mono-num min-w-[120px] justify-center"> <div className="inline-flex items-baseline gap-2 font-mono-num min-w-[120px] justify-center">
<span <span
className={[ className={[
'text-[54px] font-semibold leading-none', 'text-[56px] font-semibold tracking-tight leading-none',
adjusted ? 'text-accent' : 'text-text' adjusted ? 'text-accent' : 'text-text'
].join(' ')} ].join(' ')}
> >
@@ -364,7 +366,7 @@ function ExerciseReminder({
</div> </div>
<button <button
onClick={inc} onClick={inc}
className="w-9 h-9 grid place-items-center rounded-lg bg-surface-2 text-text/65 hover:text-text hover:bg-hairline/25 active:scale-95 transition-all" className="w-9 h-9 grid place-items-center rounded-full bg-surface-2 text-text/65 hover:text-text hover:bg-hairline/25 active:scale-90 transition-all"
aria-label={t('reminder.aria.increment')} aria-label={t('reminder.aria.increment')}
> >
<Plus size={16} strokeWidth={2.5} /> <Plus size={16} strokeWidth={2.5} />
@@ -390,21 +392,21 @@ 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-11 rounded-lg bg-accent text-white text-[15px] font-bold inline-flex items-center justify-center gap-1.5 active:translate-y-px 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={17} strokeWidth={2.5} /> {t('reminder.btn.done')} <Check size={17} strokeWidth={2.5} /> {t('reminder.btn.done')}
</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-10 rounded-lg bg-surface-2 text-text text-[14px] font-semibold inline-flex items-center justify-center gap-1.5 active:translate-y-px 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={15} strokeWidth={2.5} />{' '} <Clock size={15} strokeWidth={2.5} />{' '}
{t('btn.snooze_min', { n: snoozeMinutes })} {t('btn.snooze_min', { n: snoozeMinutes })}
</button> </button>
<button <button
onClick={skip} onClick={skip}
className="h-10 rounded-lg bg-surface-2 text-text/65 text-[14px] font-semibold inline-flex items-center justify-center gap-1.5 active:translate-y-px 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"
> >
{t('btn.skip')} {t('btn.skip')}
</button> </button>
@@ -450,10 +452,7 @@ function MealReminder({
} else if (e.key === 'Escape') { } else if (e.key === 'Escape') {
e.preventDefault() e.preventDefault()
onClose() onClose()
} else if ( } else if ((e.key === ' ' || e.code === 'Space') && targetTag !== 'BUTTON') {
(e.key === ' ' || e.code === 'Space') &&
targetTag !== 'BUTTON'
) {
e.preventDefault() e.preventDefault()
void snooze() void snooze()
} }
@@ -482,7 +481,7 @@ function MealReminder({
transition={{ type: 'spring', stiffness: 300, damping: 24 }} transition={{ type: 'spring', stiffness: 300, damping: 24 }}
className="relative mb-6" className="relative mb-6"
> >
<div className="w-20 h-20 rounded-xl bg-success text-white grid place-items-center shadow-[0_12px_36px_-24px_rgb(var(--success)/0.75)]"> <div className="w-24 h-24 rounded-full bg-success text-white grid place-items-center shadow-[0_8px_30px_-8px_rgb(var(--success)/0.5)]">
<Icon name={meal.icon} size={44} strokeWidth={2} /> <Icon name={meal.icon} size={44} strokeWidth={2} />
</div> </div>
</motion.div> </motion.div>
@@ -490,7 +489,7 @@ function MealReminder({
<div className="text-[13px] uppercase tracking-[0.18em] text-success font-bold"> <div className="text-[13px] uppercase tracking-[0.18em] text-success font-bold">
{t('meal.cta')} {t('meal.cta')}
</div> </div>
<h1 className="font-display text-[30px] leading-tight mt-2 mb-3 font-bold"> <h1 className="font-serif text-[30px] leading-tight tracking-tight mt-2 mb-3 font-bold">
{meal.name} {meal.name}
</h1> </h1>
<div className="text-[13px] text-text/65 mt-1 inline-flex items-center gap-1.5 font-medium font-mono-num"> <div className="text-[13px] text-text/65 mt-1 inline-flex items-center gap-1.5 font-medium font-mono-num">
@@ -501,13 +500,13 @@ function MealReminder({
<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-11 rounded-lg bg-success text-white text-[15px] font-bold inline-flex items-center justify-center gap-1.5 active:translate-y-px transition-transform" className="w-full h-12 rounded-2xl bg-success text-white text-[16px] font-bold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
> >
<Check size={17} strokeWidth={2.5} /> {t('meal.btn.ate')} <Check size={17} strokeWidth={2.5} /> {t('meal.btn.ate')}
</button> </button>
<button <button
onClick={snooze} onClick={snooze}
className="w-full h-10 rounded-lg bg-surface-2 text-text text-[14px] font-semibold inline-flex items-center justify-center gap-1.5 active:translate-y-px transition-transform" className="w-full 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={15} strokeWidth={2.5} />{' '} <Clock size={15} strokeWidth={2.5} />{' '}
{t('btn.snooze_min', { n: snoozeMinutes })} {t('btn.snooze_min', { n: snoozeMinutes })}
@@ -568,7 +567,7 @@ function MatchSummaryView({
animate={{ scale: 1, opacity: 1 }} animate={{ scale: 1, opacity: 1 }}
transition={{ type: 'spring', stiffness: 280, damping: 22 }} transition={{ type: 'spring', stiffness: 280, damping: 22 }}
className={[ className={[
'inline-flex items-center justify-center w-12 h-12 rounded-xl mb-3 text-white', 'inline-flex items-center justify-center w-14 h-14 rounded-2xl mb-3 text-white',
won ? 'bg-success' : lost ? 'bg-destructive' : 'bg-accent' won ? 'bg-success' : lost ? 'bg-destructive' : 'bg-accent'
].join(' ')} ].join(' ')}
> >
@@ -580,7 +579,7 @@ function MatchSummaryView({
<Gamepad2 size={26} strokeWidth={2} /> <Gamepad2 size={26} strokeWidth={2} />
)} )}
</motion.div> </motion.div>
<h1 className="font-display text-[25px] font-bold"> <h1 className="font-serif text-[26px] tracking-tight font-bold">
{won {won
? t('match.title.won') ? t('match.title.won')
: lost : lost
@@ -627,7 +626,7 @@ function MatchSummaryView({
<button <button
onClick={onClose} onClick={onClose}
className={[ className={[
'h-10 px-4 rounded-lg text-white text-[14px] font-semibold inline-flex items-center gap-1.5 active:translate-y-px transition-all', 'h-11 px-5 rounded-2xl text-white text-[14px] font-semibold inline-flex items-center gap-1.5 active:scale-[0.98] transition-all',
allDone ? 'bg-success' : 'bg-accent' allDone ? 'bg-success' : 'bg-accent'
].join(' ')} ].join(' ')}
> >
@@ -662,13 +661,13 @@ function ChallengeRow({
initial={{ opacity: 0, x: -8 }} initial={{ opacity: 0, x: -8 }}
animate={{ opacity: 1, x: 0 }} animate={{ opacity: 1, x: 0 }}
className={[ className={[
'flex items-center gap-3 rounded-lg p-3 transition-colors', 'flex items-center gap-3 rounded-2xl p-3 transition-colors',
done ? 'bg-success/10' : 'bg-surface-2' done ? 'bg-success/10' : 'bg-surface-2'
].join(' ')} ].join(' ')}
> >
<div <div
className={[ className={[
'w-9 h-9 rounded-lg grid place-items-center shrink-0', 'w-10 h-10 rounded-xl grid place-items-center shrink-0',
done ? 'bg-success text-white' : 'bg-accent text-white' done ? 'bg-success text-white' : 'bg-accent text-white'
].join(' ')} ].join(' ')}
> >
@@ -692,7 +691,7 @@ function ChallengeRow({
</div> </div>
<div <div
className={[ className={[
'font-mono-num text-[20px] font-semibold', 'font-mono-num text-[20px] font-semibold tracking-tight',
done ? 'text-success' : 'text-accent' done ? 'text-success' : 'text-accent'
].join(' ')} ].join(' ')}
> >
@@ -702,7 +701,7 @@ function ChallengeRow({
onClick={onMarkDone} onClick={onMarkDone}
disabled={done} disabled={done}
className={[ className={[
'h-9 w-9 grid place-items-center rounded-lg transition-all', 'h-9 w-9 grid place-items-center rounded-full transition-all',
done done
? 'bg-success text-white cursor-default' ? 'bg-success text-white cursor-default'
: 'bg-accent text-white active:scale-90' : 'bg-accent text-white active:scale-90'

View File

@@ -1,13 +1,6 @@
import { useEffect, useMemo, useState } from 'react' import { useEffect, useMemo, useState } from 'react'
import { motion } from 'framer-motion' import { motion } from 'framer-motion'
import { import { Award, Activity, Flame, Sparkles, TrendingUp, Lock } from 'lucide-react'
Award,
Activity,
Flame,
Sparkles,
TrendingUp,
Lock
} from 'lucide-react'
import type { Exercise, HistoryEntry } from '@shared/types' import type { Exercise, HistoryEntry } from '@shared/types'
import { import {
computeAchievements, computeAchievements,
@@ -113,7 +106,7 @@ export function AchievementsCard({ history, exercises }: Props): JSX.Element {
if (visible.length === 0) return <></> if (visible.length === 0) return <></>
return ( return (
<div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30"> <div className="bg-surface rounded-2xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30">
<div className="flex items-center justify-between mb-3"> <div className="flex items-center justify-between mb-3">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<div className="w-7 h-7 rounded-lg bg-accent text-white grid place-items-center"> <div className="w-7 h-7 rounded-lg bg-accent text-white grid place-items-center">
@@ -132,7 +125,11 @@ export function AchievementsCard({ history, exercises }: Props): JSX.Element {
</div> </div>
<div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-2"> <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-2">
{visible.map((a) => ( {visible.map((a) => (
<Badge key={a.def.id} a={a} fresh={freshlyUnlocked.has(a.def.id)} /> <Badge
key={a.def.id}
a={a}
fresh={freshlyUnlocked.has(a.def.id)}
/>
))} ))}
</div> </div>
</div> </div>
@@ -180,7 +177,7 @@ function Badge({
: {} : {}
} }
className={[ className={[
'rounded-lg p-2.5 transition-opacity', 'rounded-xl p-2.5 transition-opacity',
a.unlocked ? 'bg-surface-2' : 'bg-surface-2 opacity-55' a.unlocked ? 'bg-surface-2' : 'bg-surface-2 opacity-55'
].join(' ')} ].join(' ')}
title={t(a.def.descKey, { target: a.target })} title={t(a.def.descKey, { target: a.target })}
@@ -188,7 +185,7 @@ function Badge({
<div className="flex items-center gap-2 mb-1.5"> <div className="flex items-center gap-2 mb-1.5">
<div <div
className={[ className={[
'w-7 h-7 rounded-md grid place-items-center text-white shrink-0', 'w-7 h-7 rounded-lg grid place-items-center text-white shrink-0',
a.unlocked ? toneBg : 'bg-text/30' a.unlocked ? toneBg : 'bg-text/30'
].join(' ')} ].join(' ')}
> >

View File

@@ -19,6 +19,11 @@ type Props = {
onMarkDone: () => void onMarkDone: () => void
} }
/**
* iOS-flavoured exercise card. White surface, soft shadow, big readable
* countdown. A subtle ring around the icon shows interval progress —
* Apple Fitness ring spirit but minimalist.
*/
export function ExerciseCard({ export function ExerciseCard({
exercise, exercise,
tick, tick,
@@ -110,31 +115,32 @@ export function ExerciseCard({
animate={{ opacity: 1, y: 0 }} animate={{ opacity: 1, y: 0 }}
exit={{ opacity: 0, scale: 0.97 }} exit={{ opacity: 0, scale: 0.97 }}
transition={{ type: 'spring', stiffness: 380, damping: 30 }} transition={{ type: 'spring', stiffness: 380, damping: 30 }}
className="relative bg-surface rounded-xl p-4 shadow-card border border-hairline/30" className="relative bg-surface rounded-3xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30"
> >
<div className="flex items-start gap-3"> <div className="flex items-start gap-4">
<div className="relative w-12 h-12 shrink-0"> {/* Icon + progress ring */}
<div className="relative w-14 h-14 shrink-0">
<svg <svg
className="absolute inset-0 -rotate-90" className="absolute inset-0 -rotate-90"
viewBox="0 0 48 48" viewBox="0 0 56 56"
width="48" width="56"
height="48" height="56"
> >
<circle <circle
cx="24" cx="28"
cy="24" cy="28"
r={R} r={R}
fill="none" fill="none"
strokeWidth="2" strokeWidth="2.5"
className="stroke-hairline/15 dark:stroke-hairline/30" className="stroke-hairline/15 dark:stroke-hairline/30"
/> />
{exercise.enabled && ( {exercise.enabled && (
<circle <circle
cx="24" cx="28"
cy="24" cy="28"
r={R} r={R}
fill="none" fill="none"
strokeWidth="2" strokeWidth="2.5"
strokeLinecap="round" strokeLinecap="round"
strokeDasharray={C} strokeDasharray={C}
strokeDashoffset={dashOffset} strokeDashoffset={dashOffset}
@@ -145,7 +151,7 @@ export function ExerciseCard({
</svg> </svg>
<div <div
className={[ className={[
'absolute inset-[7px] rounded-lg grid place-items-center', 'absolute inset-[8px] rounded-full grid place-items-center',
exercise.enabled exercise.enabled
? 'bg-accent/10 text-accent' ? 'bg-accent/10 text-accent'
: 'bg-surface-2 text-text/40' : 'bg-surface-2 text-text/40'
@@ -157,14 +163,14 @@ 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-bold 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">
<button <button
ref={triggerRef} ref={triggerRef}
onClick={() => setMenuOpen((v) => !v)} onClick={() => setMenuOpen((v) => !v)}
className="w-7 h-7 grid place-items-center rounded-md text-text/45 hover:bg-surface-2 active:scale-95 transition-all" className="w-7 h-7 grid place-items-center rounded-full text-text/45 hover:bg-surface-2 active:scale-90 transition-all"
aria-label={t('titlebar.menu_aria')} aria-label={t('titlebar.menu_aria')}
aria-haspopup="menu" aria-haspopup="menu"
aria-expanded={menuOpen} aria-expanded={menuOpen}
@@ -182,7 +188,7 @@ export function ExerciseCard({
role="menu" role="menu"
aria-label={exercise.name} aria-label={exercise.name}
onKeyDown={onMenuKeyDown} onKeyDown={onMenuKeyDown}
className="absolute right-0 top-8 z-20 min-w-[140px] bg-surface rounded-lg shadow-sheet ring-1 ring-hairline/30 py-1 overflow-hidden" className="absolute right-0 top-8 z-20 min-w-[140px] bg-surface rounded-xl shadow-sheet ring-0.5 ring-hairline/30 py-1 overflow-hidden"
> >
<button <button
role="menuitem" role="menuitem"
@@ -209,16 +215,17 @@ export function ExerciseCard({
)} )}
</div> </div>
</div> </div>
<div className="text-[13px] text-text/60 mt-1 font-medium"> <div className="text-[14px] text-text/65 mt-1 font-medium">
{t('editor.exercise.preview.meta', { {t('editor.exercise.preview.meta', {
reps: exercise.reps, reps: exercise.reps,
min: exercise.intervalMinutes min: exercise.intervalMinutes
})} })}
</div> </div>
<div className="flex items-end justify-between mt-3"> {/* Countdown + switch */}
<div className="flex items-end justify-between mt-3.5">
<div> <div>
<div className="text-[12px] text-text/60 font-semibold inline-flex items-center gap-1"> <div className="text-[12px] text-text/60 uppercase tracking-wider font-semibold inline-flex items-center gap-1">
{goalReached ? ( {goalReached ? (
<> <>
<CheckCircle2 <CheckCircle2
@@ -244,7 +251,7 @@ export function ExerciseCard({
</div> </div>
<div <div
className={[ className={[
'font-mono-num text-[22px] font-bold leading-none mt-1', 'font-mono-num text-[24px] font-bold leading-none mt-1 tracking-tight',
goalReached goalReached
? 'text-success' ? 'text-success'
: isDue : isDue
@@ -276,7 +283,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={handleMarkDone} onClick={handleMarkDone}
className="mt-3 w-full h-10 rounded-lg bg-accent text-white text-[14px] font-bold inline-flex items-center justify-center gap-1.5 active:translate-y-px 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} /> {t('btn.done')} <Check size={15} strokeWidth={2.5} /> {t('btn.done')}
</motion.button> </motion.button>

View File

@@ -85,12 +85,12 @@ export function ExerciseEditor({
} }
> >
<div className="space-y-5"> <div className="space-y-5">
<div className="rounded-lg bg-surface-2 p-4 flex items-center gap-4 border border-hairline/25"> <div className="rounded-2xl bg-surface-2 p-4 flex items-center gap-4">
<div className="w-12 h-12 rounded-lg bg-accent text-white grid place-items-center shrink-0"> <div className="w-14 h-14 rounded-2xl bg-accent text-white grid place-items-center shrink-0">
<Icon name={draft.icon} size={26} strokeWidth={2.2} /> <Icon name={draft.icon} size={26} strokeWidth={2.2} />
</div> </div>
<div className="min-w-0"> <div className="min-w-0">
<div className="font-display text-[18px] font-semibold truncate"> <div className="font-display text-[18px] font-semibold tracking-tight truncate">
{draft.name || t('editor.exercise.preview.placeholder')} {draft.name || t('editor.exercise.preview.placeholder')}
</div> </div>
<div className="text-[13px] text-text/55 mt-0.5 font-mono-num"> <div className="text-[13px] text-text/55 mt-0.5 font-mono-num">
@@ -120,7 +120,7 @@ export function ExerciseEditor({
type="button" type="button"
onClick={() => setDraft({ ...draft, category: c })} onClick={() => setDraft({ ...draft, category: c })}
className={[ className={[
'h-9 px-2 rounded-lg text-[13px] font-semibold transition-colors active:translate-y-px truncate', 'h-10 px-2 rounded-xl text-[13px] font-semibold transition-all active:scale-95 truncate',
draft.category === c draft.category === c
? 'bg-accent text-white' ? 'bg-accent text-white'
: 'bg-surface-2 text-text/65 hover:text-text' : 'bg-surface-2 text-text/65 hover:text-text'
@@ -185,7 +185,7 @@ export function ExerciseEditor({
<button <button
type="button" type="button"
onClick={() => setDraft({ ...draft, dailyGoal: undefined })} onClick={() => setDraft({ ...draft, dailyGoal: undefined })}
className="h-9 px-3 rounded-lg bg-surface-2 text-text/65 text-[13px] font-semibold hover:text-text" className="h-9 px-3 rounded-xl bg-surface-2 text-text/65 text-[13px] font-semibold hover:text-text"
> >
{t('editor.field.daily_goal.clear')} {t('editor.field.daily_goal.clear')}
</button> </button>
@@ -200,7 +200,9 @@ export function ExerciseEditor({
<input <input
type="checkbox" type="checkbox"
checked={draft.adaptive ?? false} checked={draft.adaptive ?? false}
onChange={(e) => setDraft({ ...draft, adaptive: e.target.checked })} onChange={(e) =>
setDraft({ ...draft, adaptive: e.target.checked })
}
className="mt-0.5 w-4 h-4 accent-accent" className="mt-0.5 w-4 h-4 accent-accent"
/> />
<div> <div>
@@ -214,14 +216,14 @@ export function ExerciseEditor({
</label> </label>
<Field label={t('editor.field.icon')}> <Field label={t('editor.field.icon')}>
<div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-lg bg-surface-2"> <div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-2xl bg-surface-2">
{ICON_CHOICES.map((name) => ( {ICON_CHOICES.map((name) => (
<button <button
key={name} key={name}
type="button" type="button"
onClick={() => setDraft({ ...draft, icon: name })} onClick={() => setDraft({ ...draft, icon: name })}
className={[ className={[
'h-10 w-10 grid place-items-center rounded-lg transition-colors active:translate-y-px', 'h-10 w-10 grid place-items-center rounded-xl transition-all active:scale-90',
draft.icon === name draft.icon === name
? 'bg-accent text-white' ? 'bg-accent text-white'
: 'bg-surface text-text/65 hover:text-text' : 'bg-surface text-text/65 hover:text-text'
@@ -239,9 +241,9 @@ export function ExerciseEditor({
width: 100%; width: 100%;
height: 44px; height: 44px;
padding: 0 14px; padding: 0 14px;
border-radius: 8px; border-radius: 12px;
border: 1px solid rgb(var(--hairline) / 0.35); border: 0;
background: rgb(var(--surface)); background: rgb(var(--surface-2));
color: rgb(var(--text)); color: rgb(var(--text));
font-size: 15px; font-size: 15px;
outline: none; outline: none;

View File

@@ -109,7 +109,7 @@ export function HistoryHeatmap({
translateN(lang, 'heatmap.tooltip.reps', n) translateN(lang, 'heatmap.tooltip.reps', n)
return ( return (
<div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30"> <div className="bg-surface rounded-2xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30">
<div className="flex items-center gap-2 mb-3"> <div className="flex items-center gap-2 mb-3">
<div className="text-[14px] text-text/75 font-semibold"> <div className="text-[14px] text-text/75 font-semibold">
{t('heatmap.title')} {t('heatmap.title')}

View File

@@ -84,12 +84,12 @@ export function MealEditor({
} }
> >
<div className="space-y-5"> <div className="space-y-5">
<div className="rounded-lg bg-surface-2 p-4 flex items-center gap-4 border border-hairline/25"> <div className="rounded-2xl bg-surface-2 p-4 flex items-center gap-4">
<div className="w-12 h-12 rounded-lg bg-accent text-white grid place-items-center shrink-0"> <div className="w-14 h-14 rounded-2xl bg-accent text-white grid place-items-center shrink-0">
<Icon name={draft.icon} size={26} strokeWidth={2.2} /> <Icon name={draft.icon} size={26} strokeWidth={2.2} />
</div> </div>
<div className="min-w-0"> <div className="min-w-0">
<div className="font-display text-[18px] font-semibold truncate"> <div className="font-display text-[18px] font-semibold tracking-tight truncate">
{draft.name || t('editor.meal.preview.placeholder')} {draft.name || t('editor.meal.preview.placeholder')}
</div> </div>
<div className="text-[13px] text-text/55 mt-0.5 font-mono-num"> <div className="text-[13px] text-text/55 mt-0.5 font-mono-num">
@@ -128,7 +128,7 @@ export function MealEditor({
aria-pressed={active} aria-pressed={active}
onClick={() => toggleDay(dow)} onClick={() => toggleDay(dow)}
className={[ className={[
'h-9 rounded-lg text-[13px] font-semibold transition-colors active:translate-y-px', 'h-10 rounded-xl text-[13px] font-semibold transition-all active:scale-95',
active active
? 'bg-accent text-white' ? 'bg-accent text-white'
: 'bg-surface-2 text-text/65 hover:text-text' : 'bg-surface-2 text-text/65 hover:text-text'
@@ -145,14 +145,14 @@ export function MealEditor({
</Field> </Field>
<Field label={t('editor.field.icon')}> <Field label={t('editor.field.icon')}>
<div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-lg bg-surface-2"> <div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-2xl bg-surface-2">
{ICON_CHOICES.map((name) => ( {ICON_CHOICES.map((name) => (
<button <button
key={name} key={name}
type="button" type="button"
onClick={() => setDraft({ ...draft, icon: name })} onClick={() => setDraft({ ...draft, icon: name })}
className={[ className={[
'h-10 w-10 grid place-items-center rounded-lg transition-colors active:translate-y-px', 'h-10 w-10 grid place-items-center rounded-xl transition-all active:scale-90',
draft.icon === name draft.icon === name
? 'bg-accent text-white' ? 'bg-accent text-white'
: 'bg-surface text-text/65 hover:text-text' : 'bg-surface text-text/65 hover:text-text'
@@ -170,9 +170,9 @@ export function MealEditor({
width: 100%; width: 100%;
height: 44px; height: 44px;
padding: 0 14px; padding: 0 14px;
border-radius: 8px; border-radius: 12px;
border: 1px solid rgb(var(--hairline) / 0.35); border: 0;
background: rgb(var(--surface)); background: rgb(var(--surface-2));
color: rgb(var(--text)); color: rgb(var(--text));
font-size: 15px; font-size: 15px;
outline: none; outline: none;

View File

@@ -16,12 +16,12 @@ export function PageHeader({
return ( return (
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-6"> <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-6">
<div className="min-w-0"> <div className="min-w-0">
<div className="text-[13px] text-text/60 font-bold">{kicker}</div> <div className="text-[14px] text-text/65 font-semibold">{kicker}</div>
<h1 className="font-display text-[28px] sm:text-[32px] leading-tight mt-1 font-bold"> <h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
{title} {title}
</h1> </h1>
{subtitle && ( {subtitle && (
<p className="text-[14px] text-text/60 mt-1.5 font-medium leading-relaxed max-w-2xl"> <p className="text-[15px] text-text/65 mt-2 font-medium leading-relaxed max-w-2xl">
{subtitle} {subtitle}
</p> </p>
)} )}
@@ -41,7 +41,7 @@ export function InsightGrid({
return ( return (
<div <div
className={[ className={[
'grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-3 gap-3 mb-6', 'grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3 mb-8',
className className
].join(' ')} ].join(' ')}
> >
@@ -75,21 +75,21 @@ export function InsightCard({
: 'bg-text/12 text-text/55' : 'bg-text/12 text-text/55'
return ( return (
<div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30 min-w-0"> <div className="bg-surface rounded-2xl p-4 shadow-card dark:ring-0.5 dark:ring-hairline/30 min-w-0">
<div className="flex items-start gap-3"> <div className="flex items-start gap-3">
<div <div
className={[ className={[
'w-8 h-8 rounded-lg grid place-items-center shrink-0', 'w-9 h-9 rounded-xl grid place-items-center shrink-0',
iconClass iconClass
].join(' ')} ].join(' ')}
> >
{icon} {icon}
</div> </div>
<div className="min-w-0"> <div className="min-w-0">
<div className="text-[12px] text-text/50 font-bold leading-tight"> <div className="text-[12px] uppercase tracking-[0.06em] text-text/50 font-bold leading-tight">
{label} {label}
</div> </div>
<div className="font-display text-[20px] font-bold leading-tight mt-1 break-words"> <div className="font-display text-[22px] font-bold leading-tight mt-1 break-words">
{value} {value}
</div> </div>
{hint && ( {hint && (

View File

@@ -46,7 +46,7 @@ const items: Item[] = [
to: '/settings', to: '/settings',
labelKey: 'nav.settings', labelKey: 'nav.settings',
icon: Settings2, icon: Settings2,
tint: 'bg-sidebar-muted' tint: 'bg-text/70'
} }
] ]
@@ -63,6 +63,8 @@ export function Sidebar({
const drawerRef = useRef<HTMLElement | null>(null) const drawerRef = useRef<HTMLElement | null>(null)
const lastFocusedRef = useRef<HTMLElement | null>(null) const lastFocusedRef = useRef<HTMLElement | null>(null)
// Esc closes + focus trap while the compact drawer is open. Mirrors the
// pattern used in Modal.tsx for keyboard users.
useEffect(() => { useEffect(() => {
if (!compactOpen) return undefined if (!compactOpen) return undefined
lastFocusedRef.current = document.activeElement as HTMLElement | null lastFocusedRef.current = document.activeElement as HTMLElement | null
@@ -88,14 +90,18 @@ export function Sidebar({
e.preventDefault() e.preventDefault()
last.focus() last.focus()
} }
} else if (active === last || !root.contains(active)) { } else {
if (active === last || !root.contains(active)) {
e.preventDefault() e.preventDefault()
first.focus() first.focus()
} }
} }
}
document.addEventListener('keydown', onKeyDown, true) document.addEventListener('keydown', onKeyDown, true)
return () => { return () => {
document.removeEventListener('keydown', onKeyDown, true) document.removeEventListener('keydown', onKeyDown, true)
// Return focus to the trigger (Titlebar's hamburger) so keyboard users
// pick up where they left off.
const target = lastFocusedRef.current const target = lastFocusedRef.current
if (target && document.body.contains(target)) target.focus() if (target && document.body.contains(target)) target.focus()
} }
@@ -103,7 +109,7 @@ export function Sidebar({
return ( return (
<> <>
<aside className="hidden md:flex w-[276px] shrink-0 bg-sidebar text-sidebar-text flex-col border-r border-black/25"> <aside className="hidden md:flex w-64 shrink-0 vibrancy hairline-b border-r-0 flex-col">
<SidebarContent /> <SidebarContent />
</aside> </aside>
@@ -117,7 +123,7 @@ export function Sidebar({
transition={{ duration: 0.18 }} transition={{ duration: 0.18 }}
> >
<motion.div <motion.div
className="absolute inset-0 bg-black/35" className="absolute inset-0 bg-black/30 backdrop-blur-md"
onClick={onCompactClose} onClick={onCompactClose}
initial={{ opacity: 0 }} initial={{ opacity: 0 }}
animate={{ opacity: 1 }} animate={{ opacity: 1 }}
@@ -129,7 +135,7 @@ export function Sidebar({
role="dialog" role="dialog"
aria-modal="true" aria-modal="true"
aria-label={t('sidebar.aria.nav')} aria-label={t('sidebar.aria.nav')}
className="relative w-72 max-w-[85vw] h-full bg-sidebar text-sidebar-text flex flex-col" className="relative w-72 max-w-[85vw] h-full vibrancy flex flex-col"
initial={{ x: '-100%' }} initial={{ x: '-100%' }}
animate={{ x: 0 }} animate={{ x: 0 }}
exit={{ x: '-100%' }} exit={{ x: '-100%' }}
@@ -137,7 +143,7 @@ export function Sidebar({
> >
<button <button
onClick={onCompactClose} onClick={onCompactClose}
className="absolute top-3 right-3 w-8 h-8 grid place-items-center rounded-md bg-white/[0.08] hover:bg-white/[0.14] text-sidebar-muted hover:text-sidebar-text transition-colors active:scale-95" className="absolute top-3 right-3 w-8 h-8 grid place-items-center rounded-full bg-surface-2 hover:bg-hairline/25 text-text/60 transition-colors active:scale-90"
aria-label={t('btn.close')} aria-label={t('btn.close')}
> >
<X size={14} strokeWidth={2.5} /> <X size={14} strokeWidth={2.5} />
@@ -156,23 +162,16 @@ function SidebarContent({ onNav }: { onNav?: () => void }): JSX.Element {
const running = useAppStore((s) => s.state?.settings.globalEnabled ?? true) const running = useAppStore((s) => s.state?.settings.globalEnabled ?? true)
return ( return (
<> <>
<div className="px-4 pt-5 pb-4"> <div className="px-5 pt-7 pb-6">
<div className="h-10 flex items-center gap-3"> <div className="font-serif text-[36px] leading-none tracking-tight font-bold">
<div className="h-9 w-9 rounded-lg bg-accent text-white grid place-items-center font-display text-[18px] font-bold">
Р
</div>
<div className="min-w-0">
<div className="font-display text-[20px] leading-tight font-bold">
Разомнись Разомнись
</div> </div>
<div className="text-[12px] text-sidebar-muted font-medium"> <div className="text-[13px] text-text/55 mt-2 font-medium">
{t('sidebar.slogan')} {t('sidebar.slogan')}
</div> </div>
</div> </div>
</div>
</div>
<nav className="px-3 flex flex-col gap-1"> <nav className="px-2.5 flex flex-col gap-1">
{items.map(({ to, labelKey, icon: Icon, end, tint }) => ( {items.map(({ to, labelKey, icon: Icon, end, tint }) => (
<NavLink <NavLink
key={to} key={to}
@@ -181,32 +180,31 @@ function SidebarContent({ onNav }: { onNav?: () => void }): JSX.Element {
onClick={onNav} onClick={onNav}
className={({ isActive }) => className={({ isActive }) =>
[ [
'group relative flex items-center gap-3 px-3 py-2 rounded-lg transition-colors duration-150', 'flex items-center gap-3 px-2.5 py-2 rounded-xl transition-colors duration-150',
isActive isActive
? 'bg-white/10 text-sidebar-text' ? 'bg-text/[0.06] dark:bg-white/[0.08]'
: 'text-sidebar-muted hover:bg-white/[0.06] hover:text-sidebar-text' : 'hover:bg-text/[0.04] dark:hover:bg-white/[0.04]'
].join(' ') ].join(' ')
} }
> >
{({ isActive }) => ( {({ isActive }) => (
<> <>
<span
className={[
'absolute left-0 top-2 bottom-2 w-[3px] rounded-r-full',
isActive ? 'bg-accent' : 'bg-transparent'
].join(' ')}
/>
<div <div
className={[ className={[
'w-8 h-8 rounded-md grid place-items-center shrink-0', 'w-8 h-8 rounded-[9px] grid place-items-center text-white shrink-0',
isActive tint ?? 'bg-text/70'
? `${tint ?? 'bg-accent'} text-white`
: 'bg-white/[0.06] text-sidebar-muted group-hover:text-sidebar-text'
].join(' ')} ].join(' ')}
> >
<Icon size={17} strokeWidth={2.2} /> <Icon size={17} strokeWidth={2.2} />
</div> </div>
<span className="text-[14px] truncate font-semibold"> <span
className={[
'text-[15px] truncate',
isActive
? 'text-text font-semibold'
: 'text-text/85 font-medium'
].join(' ')}
>
{t(labelKey)} {t(labelKey)}
</span> </span>
</> </>
@@ -215,26 +213,20 @@ function SidebarContent({ onNav }: { onNav?: () => void }): JSX.Element {
))} ))}
</nav> </nav>
<div className="mt-auto px-4 pb-4"> <div className="mt-auto px-5 pb-5">
<div className="rounded-lg bg-white/[0.06] px-3 py-2.5"> <div className="flex items-center gap-2 text-[11px] text-text/45">
<div className="flex items-center gap-2 text-[12px] text-sidebar-muted"> <span className="relative flex h-1.5 w-1.5">
<span className="relative flex h-2 w-2">
{running && ( {running && (
<span className="absolute inline-flex h-full w-full rounded-full bg-success opacity-60 animate-ping" /> <span className="absolute inline-flex h-full w-full rounded-full bg-success opacity-60 animate-ping" />
)} )}
<span <span
className={[ className={[
'relative inline-flex rounded-full h-2 w-2', 'relative inline-flex rounded-full h-1.5 w-1.5',
running ? 'bg-success' : 'bg-warning' running ? 'bg-success' : 'bg-warning'
].join(' ')} ].join(' ')}
/> />
</span> </span>
<span className="font-semibold"> {running ? t('sidebar.status_tracking') : t('sidebar.status_paused')}
{running
? t('sidebar.status_tracking')
: t('sidebar.status_paused')}
</span>
</div>
</div> </div>
</div> </div>
</> </>

View File

@@ -32,13 +32,13 @@ export function Titlebar({ title, onMenuClick }: Props): JSX.Element {
return ( return (
<div <div
onDoubleClick={onDoubleClick} onDoubleClick={onDoubleClick}
className="titlebar-drag relative h-9 px-2 sm:px-3 flex items-center justify-between bg-sidebar text-sidebar-text hairline-b" className="titlebar-drag relative h-10 px-2 sm:px-3 flex items-center justify-between vibrancy hairline-b"
> >
<div className="flex items-center gap-1 min-w-0 flex-1 basis-0"> <div className="flex items-center gap-1 min-w-0 flex-1 basis-0">
{onMenuClick && ( {onMenuClick && (
<button <button
onClick={onMenuClick} onClick={onMenuClick}
className="titlebar-nodrag md:hidden w-8 h-7 grid place-items-center rounded-md hover:bg-white/10 text-sidebar-muted hover:text-sidebar-text transition-colors" className="titlebar-nodrag md:hidden w-8 h-7 grid place-items-center rounded-md hover:bg-text/[0.08] text-text/65 hover:text-text transition-colors"
aria-label={t('titlebar.menu_aria')} aria-label={t('titlebar.menu_aria')}
> >
<Menu size={15} strokeWidth={2} /> <Menu size={15} strokeWidth={2} />
@@ -46,7 +46,7 @@ export function Titlebar({ title, onMenuClick }: Props): JSX.Element {
)} )}
</div> </div>
<div className="text-[12px] font-semibold text-sidebar-muted truncate px-2"> <div className="text-[12px] font-medium text-text/55 truncate px-2">
{effectiveTitle} {effectiveTitle}
</div> </div>
@@ -63,7 +63,9 @@ export function Titlebar({ title, onMenuClick }: Props): JSX.Element {
<WinBtn <WinBtn
onClick={() => window.api.toggleMaximizeMain()} onClick={() => window.api.toggleMaximizeMain()}
label={ label={
maximized ? t('titlebar.restore_aria') : t('titlebar.maximize_aria') maximized
? t('titlebar.restore_aria')
: t('titlebar.maximize_aria')
} }
> >
{maximized ? ( {maximized ? (
@@ -100,10 +102,10 @@ function WinBtn({
onClick={onClick} onClick={onClick}
aria-label={label} aria-label={label}
className={[ className={[
'titlebar-nodrag w-9 h-7 grid place-items-center rounded-md transition-colors text-sidebar-muted', 'titlebar-nodrag w-9 h-7 grid place-items-center rounded-md transition-colors text-text/55',
danger danger
? 'hover:bg-destructive hover:text-white' ? 'hover:bg-destructive hover:text-white'
: 'hover:bg-white/10 hover:text-sidebar-text' : 'hover:bg-text/[0.08] hover:text-text'
].join(' ')} ].join(' ')}
> >
{children} {children}

View File

@@ -25,7 +25,11 @@ const TAG_META = {
* (a) автоматически после апдейта (когда `lastSeenVersion` != `currentVersion`) * (a) автоматически после апдейта (когда `lastSeenVersion` != `currentVersion`)
* и (b) вручную из Settings. * и (b) вручную из Settings.
*/ */
export function WhatsNewModal({ open, versions, onClose }: Props): JSX.Element { export function WhatsNewModal({
open,
versions,
onClose
}: Props): JSX.Element {
const { t, lang } = useT() const { t, lang } = useT()
return ( return (
<Modal <Modal
@@ -64,7 +68,7 @@ function VersionSection({
return ( return (
<div> <div>
<div className="text-[12px] text-text/55 font-bold mb-3 font-mono-num"> <div className="text-[12px] uppercase tracking-wider text-text/55 font-bold mb-3 font-mono-num">
v{version} v{version}
</div> </div>
<div className="space-y-2.5"> <div className="space-y-2.5">

View File

@@ -1,8 +1,8 @@
import { ButtonHTMLAttributes, forwardRef } from 'react' import { ButtonHTMLAttributes, forwardRef } from 'react'
/** /**
* Desktop button. Three primary flavours cover filled, bordered, and plain actions. * iOS-style button. Three primary flavours mirror iOS's filled / tinted / plain.
* Press feedback stays subtle so dense tool surfaces do not jump around. * Press feedback is a subtle scale, mirroring UIKit's button highlight.
*/ */
type Variant = 'filled' | 'tinted' | 'plain' | 'destructive' | 'success' type Variant = 'filled' | 'tinted' | 'plain' | 'destructive' | 'success'
type Size = 'sm' | 'md' | 'lg' type Size = 'sm' | 'md' | 'lg'
@@ -24,21 +24,19 @@ const legacyMap: Record<LegacyVariant, Variant> = {
} }
const variantClasses: Record<Variant, string> = { const variantClasses: Record<Variant, string> = {
filled: filled: 'bg-accent text-white hover:brightness-105 active:brightness-95',
'bg-accent text-white hover:bg-accent/90 active:bg-accent/85 shadow-[0_1px_0_rgb(255_255_255_/_0.18)_inset]',
tinted: tinted:
'bg-surface border border-hairline/45 text-text hover:border-accent/45 hover:text-accent active:bg-surface-2', 'bg-accent/12 text-accent hover:bg-accent/18 active:bg-accent/22 dark:bg-accent/20 dark:hover:bg-accent/25',
plain: plain: 'text-accent hover:bg-accent/10 active:bg-accent/15',
'text-text/70 hover:bg-surface-2 hover:text-text active:bg-hairline/20',
destructive: destructive:
'bg-destructive/10 border border-destructive/20 text-destructive hover:bg-destructive/14 active:bg-destructive/18', 'bg-destructive/12 text-destructive hover:bg-destructive/18 active:bg-destructive/22 dark:bg-destructive/20',
success: 'bg-success text-white hover:bg-success/90 active:bg-success/80' success: 'bg-success text-white hover:brightness-105 active:brightness-95'
} }
const sizeClasses: Record<Size, string> = { const sizeClasses: Record<Size, string> = {
sm: 'h-8 px-3 text-[13px] rounded-lg', sm: 'h-8 px-3.5 text-[13px] rounded-xl',
md: 'h-9 px-3.5 text-[14px] rounded-lg', md: 'h-10 px-4 text-[14px] rounded-2xl',
lg: 'h-10 px-4 text-[15px] rounded-lg' lg: 'h-12 px-6 text-[16px] rounded-2xl'
} }
export const Button = forwardRef<HTMLButtonElement, Props>(function Button( export const Button = forwardRef<HTMLButtonElement, Props>(function Button(
@@ -51,9 +49,9 @@ export const Button = forwardRef<HTMLButtonElement, Props>(function Button(
<button <button
ref={ref} ref={ref}
className={[ className={[
'inline-flex items-center justify-center gap-1.5 font-semibold transition-colors duration-150 ease-out', 'inline-flex items-center justify-center gap-1.5 font-semibold transition-all duration-150 ease-out',
'disabled:opacity-40 disabled:cursor-not-allowed', 'disabled:opacity-40 disabled:cursor-not-allowed',
'active:translate-y-px', 'active:scale-[0.97]',
variantClasses[v], variantClasses[v],
sizeClasses[size], sizeClasses[size],
className className

View File

@@ -1,5 +1,9 @@
import { ReactNode } from 'react' import { ReactNode } from 'react'
/**
* iOS grouped-list card. Wraps rows; first/last row hairline rules handled
* by `Row` itself (only top/middle hairline shown).
*/
export function Card({ export function Card({
children, children,
className = '' className = ''
@@ -10,7 +14,9 @@ export function Card({
return ( return (
<div <div
className={[ className={[
'bg-surface rounded-xl overflow-hidden border border-hairline/35 shadow-card', 'bg-surface rounded-2xl overflow-hidden',
'shadow-[0_0.5px_0_rgb(0_0_0_/_0.04),_0_1px_2px_rgb(0_0_0_/_0.04)]',
'dark:shadow-none dark:ring-0.5 dark:ring-hairline/30',
className className
].join(' ')} ].join(' ')}
> >
@@ -19,6 +25,10 @@ export function Card({
) )
} }
/**
* Section heading above a Card group — iOS Settings style: tiny uppercase
* label, generous spacing.
*/
export function SectionHeader({ export function SectionHeader({
title, title,
hint, hint,
@@ -29,11 +39,13 @@ export function SectionHeader({
action?: ReactNode action?: ReactNode
}): JSX.Element { }): JSX.Element {
return ( return (
<div className="flex items-end justify-between mb-2.5"> <div className="flex items-end justify-between px-4 mb-2.5">
<div> <div>
<div className="text-[13px] font-bold text-text/70">{title}</div> <div className="text-[13px] font-semibold uppercase tracking-[0.06em] text-text/60">
{title}
</div>
{hint && ( {hint && (
<div className="text-[12px] text-text/55 mt-0.5 font-medium"> <div className="text-[13px] text-text/55 mt-0.5 font-medium">
{hint} {hint}
</div> </div>
)} )}
@@ -43,6 +55,10 @@ export function SectionHeader({
) )
} }
/**
* A single row inside Card — left icon (optional), title + subtitle, right
* accessory (switch / chevron / button). Adds bottom hairline unless `last`.
*/
export function Row({ export function Row({
children, children,
className = '', className = '',
@@ -59,9 +75,9 @@ export function Row({
<div <div
onClick={onClick} onClick={onClick}
className={[ className={[
'flex items-center gap-3 px-4 py-3 relative min-h-[58px]', 'flex items-center gap-3 px-4 py-3 relative',
interactive interactive
? 'cursor-pointer hover:bg-surface-2/65 active:bg-surface-2 transition-colors' ? 'cursor-pointer active:bg-surface-2 dark:active:bg-white/5 transition-colors'
: '', : '',
!last ? 'hairline-b' : '', !last ? 'hairline-b' : '',
className className

View File

@@ -18,10 +18,10 @@ type Props = {
} }
/** /**
* Desktop confirm-диалог. Заменяет `window.confirm()` — нативный prompt * iOS-style confirm-диалог. Заменяет `window.confirm()` — нативный prompt
* выглядит инородно в дизайне приложения и не поддерживает focus-trap. * выглядит инородно в дизайне приложения, без вибрации accent-цвета и без
* Использует наш Modal под капотом, поэтому получаем focus-trap и * focus-trap'a. Использует наш Modal под капотом, поэтому получаем
* Esc-to-cancel бесплатно. * focus-trap и Esc-to-cancel бесплатно.
*/ */
export function ConfirmModal({ export function ConfirmModal({
open, open,

View File

@@ -27,6 +27,17 @@ function getFocusable(root: HTMLElement): HTMLElement[] {
).filter((el) => el.offsetParent !== null || el === document.activeElement) ).filter((el) => el.offsetParent !== null || el === document.activeElement)
} }
/**
* iOS-style centred sheet. Spring-snap on enter, soft fade-out.
*
* Accessibility:
* - role="dialog" + aria-modal="true" + aria-labelledby on the title <h2>
* - Focus is trapped inside the dialog while open; Tab/Shift-Tab cycle
* through focusable children and never escape to the underlying page.
* - On open the first focusable element is focused.
* - On close, focus returns to whatever was focused when the modal opened.
* - Esc closes (parent handles confirm-on-dirty if it wants).
*/
export function Modal({ export function Modal({
open, open,
onClose, onClose,
@@ -108,7 +119,7 @@ export function Modal({
<AnimatePresence> <AnimatePresence>
{open && ( {open && (
<motion.div <motion.div
className="fixed inset-0 z-50 grid place-items-center p-4 bg-black/40" className="fixed inset-0 z-50 grid place-items-center p-4 bg-black/40 backdrop-blur-md"
initial={{ opacity: 0 }} initial={{ opacity: 0 }}
animate={{ opacity: 1 }} animate={{ opacity: 1 }}
exit={{ opacity: 0 }} exit={{ opacity: 0 }}
@@ -121,36 +132,39 @@ export function Modal({
aria-modal="true" aria-modal="true"
aria-labelledby={titleId} aria-labelledby={titleId}
className={[ className={[
'relative w-full bg-surface rounded-xl shadow-sheet flex flex-col overflow-hidden border border-hairline/45', 'relative w-full bg-surface rounded-3xl shadow-sheet flex flex-col overflow-hidden',
sizeClass[size] sizeClass[size]
].join(' ')} ].join(' ')}
initial={{ scale: 0.98, y: 10, opacity: 0 }} initial={{ scale: 0.94, y: 24, opacity: 0 }}
animate={{ scale: 1, y: 0, opacity: 1 }} animate={{ scale: 1, y: 0, opacity: 1 }}
exit={{ scale: 0.98, y: 6, opacity: 0 }} exit={{ scale: 0.96, y: 12, opacity: 0 }}
transition={{ type: 'spring', stiffness: 400, damping: 32 }} transition={{ type: 'spring', stiffness: 400, damping: 32 }}
onClick={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}
> >
<div className="flex items-center justify-between px-5 py-3 hairline-b bg-surface-elevated"> {/* Header — iOS large modal title */}
<div className="flex items-center justify-between px-5 pt-5 pb-3">
<h2 <h2
id={titleId} id={titleId}
className="font-display text-[18px] font-semibold" className="font-display text-[20px] font-semibold tracking-tight"
> >
{title} {title}
</h2> </h2>
<button <button
onClick={onClose} onClick={onClose}
data-modal-close="" data-modal-close=""
className="w-7 h-7 grid place-items-center rounded-md bg-surface-2 hover:bg-hairline/25 text-text/60 hover:text-text transition-colors active:scale-95" className="w-7 h-7 grid place-items-center rounded-full bg-surface-2 hover:bg-hairline/25 text-text/60 hover:text-text transition-colors active:scale-90"
aria-label={t('btn.close')} aria-label={t('btn.close')}
> >
<X size={14} strokeWidth={2.5} /> <X size={14} strokeWidth={2.5} />
</button> </button>
</div> </div>
<div className="p-5 overflow-y-auto max-h-[72vh]">{children}</div> <div className="px-5 pb-5 overflow-y-auto max-h-[70vh]">
{children}
</div>
{footer && ( {footer && (
<div className="hairline-t px-5 py-3 flex justify-end gap-2 bg-surface-elevated"> <div className="hairline-t px-5 py-3 flex justify-end gap-2 bg-surface">
{footer} {footer}
</div> </div>
)} )}

View File

@@ -7,6 +7,9 @@ type Props = {
'aria-label'?: string 'aria-label'?: string
} }
/**
* iOS UISwitch — 51×31 spec, green when on, smooth spring knob.
*/
export function Switch({ export function Switch({
checked, checked,
onChange, onChange,
@@ -22,18 +25,17 @@ export function Switch({
onClick={() => !disabled && onChange(!checked)} onClick={() => !disabled && onChange(!checked)}
disabled={disabled} disabled={disabled}
className={[ className={[
'relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full transition-colors duration-150 ease-out border', 'relative inline-flex h-[31px] w-[51px] shrink-0 cursor-pointer rounded-full transition-colors duration-200 ease-out',
checked checked ? 'bg-success' : 'bg-hairline/25 dark:bg-hairline/50',
? 'bg-success border-success'
: 'bg-surface-2 border-hairline/55',
disabled ? 'opacity-40 cursor-not-allowed' : '' disabled ? 'opacity-40 cursor-not-allowed' : ''
].join(' ')} ].join(' ')}
style={{ padding: 2 }} style={{ padding: 2 }}
> >
<motion.span <motion.span
className="block h-[18px] w-[18px] rounded-full bg-white" className="block h-[27px] w-[27px] rounded-full bg-white"
style={{ style={{
boxShadow: '0 1px 2px rgba(0,0,0,0.18), 0 0 0 0.5px rgba(0,0,0,0.08)' boxShadow:
'0 3px 8px rgba(0,0,0,0.15), 0 3px 1px rgba(0,0,0,0.06), 0 0 0 0.5px rgba(0,0,0,0.04)'
}} }}
animate={{ x: checked ? 20 : 0 }} animate={{ x: checked ? 20 : 0 }}
transition={{ type: 'spring', stiffness: 700, damping: 35 }} transition={{ type: 'spring', stiffness: 700, damping: 35 }}

View File

@@ -65,14 +65,14 @@ export default function ChallengesPage(): JSX.Element {
) )
return ( return (
<div className="h-full overflow-y-auto desktop-scroll"> <div className="h-full overflow-y-auto">
<div className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10"> <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-6"> <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
<div> <div>
<div className="text-[14px] text-text/65 font-semibold"> <div className="text-[14px] text-text/65 font-semibold">
{t('challenges.kicker')} {t('challenges.kicker')}
</div> </div>
<h1 className="font-display text-[30px] sm:text-[34px] leading-tight mt-1 font-bold"> <h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
{t('challenges.title')} {t('challenges.title')}
</h1> </h1>
<p className="text-[15px] text-text/65 mt-2 font-medium"> <p className="text-[15px] text-text/65 mt-2 font-medium">
@@ -92,7 +92,7 @@ export default function ChallengesPage(): JSX.Element {
</div> </div>
{noGamesActive && ( {noGamesActive && (
<div className="mb-5 rounded-xl border border-warning/25 bg-warning/10 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-10 h-10 rounded-xl bg-warning/18 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={18} strokeWidth={2.5} /> <AlertTriangle size={18} strokeWidth={2.5} />
</div> </div>
@@ -178,7 +178,7 @@ export default function ChallengesPage(): JSX.Element {
) : ( ) : (
<Card> <Card>
<div className="px-5 py-12 flex flex-col items-center text-center"> <div className="px-5 py-12 flex flex-col items-center text-center">
<div className="inline-flex w-12 h-12 rounded-xl bg-accent text-white items-center justify-center mb-4"> <div className="inline-flex w-14 h-14 rounded-2xl bg-accent text-white items-center justify-center mb-4">
<Gamepad2 size={24} strokeWidth={2.4} /> <Gamepad2 size={24} strokeWidth={2.4} />
</div> </div>
<div className="text-text/65 text-[15px] font-medium max-w-xs leading-snug"> <div className="text-text/65 text-[15px] font-medium max-w-xs leading-snug">
@@ -342,7 +342,7 @@ function ChallengeEditor({
</Field> </Field>
<Field label={t('editor.field.icon')}> <Field label={t('editor.field.icon')}>
<div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-lg bg-surface-2"> <div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-2xl bg-surface-2">
{ICON_CHOICES.map((name) => ( {ICON_CHOICES.map((name) => (
<button <button
key={name} key={name}
@@ -361,8 +361,8 @@ function ChallengeEditor({
</div> </div>
</Field> </Field>
<div className="rounded-lg bg-accent/[0.08] p-4"> <div className="rounded-2xl bg-accent/8 p-4">
<div className="text-[11px] text-accent font-semibold mb-2"> <div className="text-[11px] uppercase tracking-wider text-accent font-semibold mb-2">
{t('editor.challenge.preview.kicker')} {t('editor.challenge.preview.kicker')}
</div> </div>
<div className="font-mono-num text-[14px] text-text/75 flex items-baseline gap-1.5 flex-wrap"> <div className="font-mono-num text-[14px] text-text/75 flex items-baseline gap-1.5 flex-wrap">
@@ -370,7 +370,7 @@ function ChallengeEditor({
<span className="text-text/40">×</span> <span className="text-text/40">×</span>
<span>{draft.multiplier}</span> <span>{draft.multiplier}</span>
<span className="text-text/40">=</span> <span className="text-text/40">=</span>
<span className="text-[32px] font-display font-semibold text-accent leading-none ml-1"> <span className="text-[32px] font-display font-semibold text-accent leading-none ml-1 tracking-tight">
{previewReps} {previewReps}
</span> </span>
<span className="text-text/55"> <span className="text-text/55">

View File

@@ -197,28 +197,27 @@ export default function Dashboard(): JSX.Element {
}) })
return ( return (
<div className="h-full overflow-y-auto desktop-scroll"> <div className="h-full overflow-y-auto">
<div className="max-w-[1180px] mx-auto px-5 lg:px-8 pt-6 pb-10"> <div className="max-w-5xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
<section className="mb-4 rounded-xl border border-hairline/35 bg-surface p-5 shadow-card"> <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-6">
<div className="flex flex-col xl:flex-row xl:items-start xl:justify-between gap-4">
<div className="min-w-0"> <div className="min-w-0">
<div className="text-[13px] text-text/60 font-bold"> <div className="text-[14px] text-text/65 font-semibold">
{t('dashboard.header.date', { date: today })} {t('dashboard.header.date', { date: today })}
</div> </div>
<div className="mt-1.5 flex flex-wrap items-center gap-3"> <div className="mt-2 flex flex-wrap items-center gap-3">
<h1 className="font-display text-[30px] sm:text-[34px] leading-tight font-bold"> <h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight font-bold">
{header.title} {header.title}
</h1> </h1>
<span <span
className={[ className={[
'h-7 px-2.5 rounded-md inline-flex items-center text-[12px] font-bold', 'h-7 px-3 rounded-full inline-flex items-center text-[12px] font-bold uppercase tracking-[0.06em]',
dashboardStatusClass(header.tone) dashboardStatusClass(header.tone)
].join(' ')} ].join(' ')}
> >
{header.status} {header.status}
</span> </span>
</div> </div>
<p className="text-[14px] text-text/60 mt-2 font-medium leading-relaxed max-w-3xl"> <p className="text-[15px] text-text/65 mt-2 font-medium leading-relaxed max-w-2xl">
{header.subtitle} {header.subtitle}
</p> </p>
</div> </div>
@@ -239,9 +238,8 @@ export default function Dashboard(): JSX.Element {
</Button> </Button>
</div> </div>
</div> </div>
</section>
<div className="grid grid-cols-2 xl:grid-cols-4 gap-3 mb-5"> <div className="grid grid-cols-2 lg:grid-cols-4 gap-3 mb-8">
<HeroStat <HeroStat
tone="accent" tone="accent"
label={t('dashboard.stat.today_done')} label={t('dashboard.stat.today_done')}
@@ -315,7 +313,7 @@ export default function Dashboard(): JSX.Element {
<motion.div <motion.div
initial={{ opacity: 0, y: -4 }} initial={{ opacity: 0, y: -4 }}
animate={{ opacity: 1, y: 0 }} animate={{ opacity: 1, y: 0 }}
className="mb-4 rounded-xl border border-warning/25 bg-warning/10 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-10 h-10 rounded-xl bg-warning/18 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">
<Pause size={18} strokeWidth={2.5} /> <Pause size={18} strokeWidth={2.5} />
@@ -338,7 +336,7 @@ export default function Dashboard(): JSX.Element {
<motion.div <motion.div
initial={{ opacity: 0, y: -4 }} initial={{ opacity: 0, y: -4 }}
animate={{ opacity: 1, y: 0 }} animate={{ opacity: 1, y: 0 }}
className="mb-4 rounded-xl border border-info/25 bg-info/10 p-4 flex items-center gap-3" className="mb-6 rounded-2xl bg-info/12 p-4 flex items-center gap-3"
> >
<div className="w-10 h-10 rounded-xl bg-info/18 text-info grid place-items-center shrink-0"> <div className="w-10 h-10 rounded-xl bg-info/18 text-info grid place-items-center shrink-0">
<Video size={18} strokeWidth={2.5} /> <Video size={18} strokeWidth={2.5} />
@@ -378,7 +376,7 @@ export default function Dashboard(): JSX.Element {
</div> </div>
)} )}
<div className="grid grid-cols-1 xl:grid-cols-2 gap-3"> <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-2 gap-4">
<AnimatePresence> <AnimatePresence>
{exercises.map((ex) => ( {exercises.map((ex) => (
<ExerciseCard <ExerciseCard
@@ -401,7 +399,7 @@ export default function Dashboard(): JSX.Element {
{exercises.length === 0 && ( {exercises.length === 0 && (
<div className="mt-12 text-center"> <div className="mt-12 text-center">
<div className="inline-flex w-12 h-12 rounded-xl bg-accent text-white items-center justify-center mb-4"> <div className="inline-flex w-14 h-14 rounded-2xl bg-accent text-white items-center justify-center mb-4">
<Plus size={24} strokeWidth={2.5} /> <Plus size={24} strokeWidth={2.5} />
</div> </div>
<div className="font-display text-[20px] font-semibold"> <div className="font-display text-[20px] font-semibold">
@@ -546,17 +544,17 @@ function MomentumPanel({
: t('momentum.game.off') : t('momentum.game.off')
return ( return (
<section className="mb-6 grid grid-cols-1 xl:grid-cols-[0.9fr_1.15fr_0.95fr] gap-3"> <section className="mb-8 grid grid-cols-1 lg:grid-cols-[0.9fr_1.1fr_0.95fr] gap-4">
<div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30 min-w-0"> <div className="bg-surface rounded-3xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30 min-w-0">
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<div className="w-9 h-9 rounded-lg bg-warning text-white grid place-items-center shrink-0"> <div className="w-10 h-10 rounded-2xl bg-warning text-white grid place-items-center shrink-0">
<Trophy size={19} strokeWidth={2.5} /> <Trophy size={19} strokeWidth={2.5} />
</div> </div>
<div className="min-w-0"> <div className="min-w-0">
<div className="text-[13px] text-text/55 font-semibold"> <div className="text-[13px] text-text/55 font-semibold">
{t('momentum.level.title')} {t('momentum.level.title')}
</div> </div>
<div className="font-display text-[20px] font-bold leading-tight truncate"> <div className="font-display text-[22px] font-bold leading-tight truncate">
{t(momentum.level.key)} {t(momentum.level.key)}
</div> </div>
</div> </div>
@@ -584,13 +582,13 @@ function MomentumPanel({
<ProgressBar pct={momentum.level.progressPct} tone="warning" /> <ProgressBar pct={momentum.level.progressPct} tone="warning" />
</div> </div>
<div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30 min-w-0"> <div className="bg-surface rounded-3xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30 min-w-0">
<div className="flex items-start justify-between gap-3 mb-3"> <div className="flex items-start justify-between gap-3 mb-3">
<div className="min-w-0"> <div className="min-w-0">
<div className="text-[13px] text-text/55 font-semibold"> <div className="text-[13px] text-text/55 font-semibold">
{t('momentum.week.kicker')} {t('momentum.week.kicker')}
</div> </div>
<h2 className="font-display text-[20px] font-bold leading-tight"> <h2 className="font-display text-[22px] font-bold leading-tight">
{t('momentum.week.title')} {t('momentum.week.title')}
</h2> </h2>
</div> </div>
@@ -608,29 +606,29 @@ function MomentumPanel({
</div> </div>
</div> </div>
<div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30 min-w-0"> <div className="bg-surface rounded-3xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30 min-w-0">
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<div className="w-9 h-9 rounded-lg bg-accent-2 text-white grid place-items-center shrink-0"> <div className="w-10 h-10 rounded-2xl bg-accent-2 text-white grid place-items-center shrink-0">
<Swords size={19} strokeWidth={2.5} /> <Swords size={19} strokeWidth={2.5} />
</div> </div>
<div className="min-w-0"> <div className="min-w-0">
<div className="text-[13px] text-text/55 font-semibold"> <div className="text-[13px] text-text/55 font-semibold">
{t('momentum.game.kicker')} {t('momentum.game.kicker')}
</div> </div>
<h2 className="font-display text-[20px] font-bold leading-tight"> <h2 className="font-display text-[22px] font-bold leading-tight">
{t('momentum.game.title')} {t('momentum.game.title')}
</h2> </h2>
</div> </div>
</div> </div>
<div className="mt-4 rounded-lg bg-surface-2 p-3.5"> <div className="mt-4 rounded-2xl bg-surface-2 p-4">
<div className="flex items-center justify-between gap-3"> <div className="flex items-center justify-between gap-3">
<div className="text-[13px] text-text/60 font-semibold"> <div className="text-[13px] text-text/60 font-semibold">
{t('momentum.game.status')} {t('momentum.game.status')}
</div> </div>
<div <div
className={[ className={[
'text-[12px] px-2 py-1 rounded-md font-semibold', 'text-[12px] px-2.5 py-1 rounded-full font-semibold',
gamesLive gamesLive
? 'bg-success/12 text-success' ? 'bg-success/12 text-success'
: gamesEnabledButNotLive : gamesEnabledButNotLive
@@ -664,7 +662,7 @@ function MomentumPanel({
})} })}
/> />
</div> </div>
<div className="mt-4 text-[13px] text-text/60 leading-relaxed"> <div className="mt-4 text-[13px] text-text/62 leading-relaxed">
{momentum.gameDebt.lastMatchAt {momentum.gameDebt.lastMatchAt
? t('momentum.game.last', { ? t('momentum.game.last', {
date: new Date( date: new Date(
@@ -708,7 +706,7 @@ function WeeklyQuestRow({
<div className="py-3 flex items-center gap-3 min-w-0"> <div className="py-3 flex items-center gap-3 min-w-0">
<div <div
className={[ className={[
'w-8 h-8 rounded-lg grid place-items-center text-white shrink-0', 'w-9 h-9 rounded-xl grid place-items-center text-white shrink-0',
quest.complete quest.complete
? 'bg-success' ? 'bg-success'
: quest.tone === 'warning' : quest.tone === 'warning'
@@ -786,14 +784,14 @@ function TodayPlanPanel({
const recovery = recoveryCopy(plan, t) const recovery = recoveryCopy(plan, t)
return ( return (
<section className="mb-6 bg-surface rounded-xl p-4 shadow-card border border-hairline/30"> <section className="mb-8 bg-surface rounded-3xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30">
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3"> <div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
<div className="flex items-center gap-3 min-w-0"> <div className="flex items-center gap-3 min-w-0">
<div className="w-9 h-9 rounded-lg bg-accent/12 text-accent grid place-items-center shrink-0"> <div className="w-10 h-10 rounded-2xl bg-accent/12 text-accent grid place-items-center shrink-0">
<CalendarCheck size={19} strokeWidth={2.5} /> <CalendarCheck size={19} strokeWidth={2.5} />
</div> </div>
<div className="min-w-0"> <div className="min-w-0">
<h2 className="font-display text-[20px] font-bold leading-tight"> <h2 className="font-display text-[22px] font-bold leading-tight">
{t('dashboard.plan.title')} {t('dashboard.plan.title')}
</h2> </h2>
<div className="text-[14px] text-text/60 mt-0.5"> <div className="text-[14px] text-text/60 mt-0.5">
@@ -803,7 +801,7 @@ function TodayPlanPanel({
</div> </div>
<div <div
className={[ className={[
'self-start sm:self-auto h-8 px-2.5 rounded-md inline-flex items-center text-[13px] font-semibold', 'self-start sm:self-auto h-8 px-3 rounded-full inline-flex items-center text-[13px] font-semibold',
plan.dueCount > 0 plan.dueCount > 0
? 'bg-accent/12 text-accent' ? 'bg-accent/12 text-accent'
: 'bg-success/12 text-success' : 'bg-success/12 text-success'
@@ -860,7 +858,7 @@ function TodayPlanPanel({
</> </>
) : ( ) : (
<div className="mt-3 min-w-0"> <div className="mt-3 min-w-0">
<div className="font-display text-[19px] leading-tight font-bold"> <div className="font-display text-[20px] leading-tight font-bold">
{t('dashboard.plan.clear.title')} {t('dashboard.plan.clear.title')}
</div> </div>
<div className="text-[14px] text-text/60 mt-1"> <div className="text-[14px] text-text/60 mt-1">
@@ -925,7 +923,7 @@ function TodayPlanPanel({
<div className="mt-3 flex items-start gap-3"> <div className="mt-3 flex items-start gap-3">
<div <div
className={[ className={[
'w-8 h-8 rounded-lg grid place-items-center shrink-0', 'w-9 h-9 rounded-xl grid place-items-center shrink-0',
recovery.tone recovery.tone
].join(' ')} ].join(' ')}
> >
@@ -975,7 +973,7 @@ function PlanItemGlyph({ item }: { item: PlanItem }): JSX.Element {
return ( return (
<div <div
className={[ className={[
'w-9 h-9 rounded-lg grid place-items-center shrink-0', 'w-11 h-11 rounded-2xl grid place-items-center shrink-0',
dueClass dueClass
].join(' ')} ].join(' ')}
> >
@@ -1006,7 +1004,7 @@ function PlanListRow({
{planItemMeta(item, t)} {planItemMeta(item, t)}
</div> </div>
</div> </div>
<div className="text-[13px] text-text/60 shrink-0 max-w-[42%] truncate"> <div className="text-[13px] text-text/62 shrink-0 max-w-[42%] truncate">
{planItemTiming(item, paused, lang, t)} {planItemTiming(item, paused, lang, t)}
</div> </div>
</div> </div>
@@ -1133,25 +1131,23 @@ function HeroStat({
: 'bg-text/40' : 'bg-text/40'
return ( return (
<div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30 min-w-0"> <div className="bg-surface rounded-2xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30">
<div className="flex items-center gap-2 mb-2"> <div className="flex items-center gap-2 mb-3">
<div <div
className={[ className={[
'w-7 h-7 rounded-md grid place-items-center text-white shrink-0', 'w-7 h-7 rounded-lg grid place-items-center text-white',
toneBg toneBg
].join(' ')} ].join(' ')}
> >
{icon} {icon}
</div> </div>
<div className="text-[13px] text-text/70 font-bold truncate"> <div className="text-[14px] text-text/75 font-semibold">{label}</div>
{label}
</div> </div>
</div> <div className="font-display text-[28px] font-bold tracking-tight leading-none">
<div className="font-display text-[24px] font-bold leading-tight truncate">
{value} {value}
</div> </div>
{subvalue && ( {subvalue && (
<div className="text-[12px] text-text/58 mt-1 font-medium truncate"> <div className="text-[13px] text-text/60 mt-2 font-medium">
{subvalue} {subvalue}
</div> </div>
)} )}

View File

@@ -27,8 +27,8 @@ export default function Exercises(): JSX.Element {
const totalReps = enabled.reduce((sum, e) => sum + e.reps, 0) const totalReps = enabled.reduce((sum, e) => sum + e.reps, 0)
return ( return (
<div className="h-full overflow-y-auto desktop-scroll"> <div className="h-full overflow-y-auto">
<div className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10"> <div className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
<PageHeader <PageHeader
kicker={t('exercises.kicker')} kicker={t('exercises.kicker')}
title={t('exercises.title')} title={t('exercises.title')}
@@ -122,7 +122,7 @@ export default function Exercises(): JSX.Element {
{exercises.length === 0 && ( {exercises.length === 0 && (
<Card> <Card>
<div className="px-5 py-12 flex flex-col items-center text-center"> <div className="px-5 py-12 flex flex-col items-center text-center">
<div className="inline-flex w-12 h-12 rounded-xl bg-accent text-white items-center justify-center mb-4"> <div className="inline-flex w-14 h-14 rounded-2xl bg-accent text-white items-center justify-center mb-4">
<Plus size={24} strokeWidth={2.5} /> <Plus size={24} strokeWidth={2.5} />
</div> </div>
<div className="text-text/65 text-[15px] font-medium max-w-xs leading-snug"> <div className="text-text/65 text-[15px] font-medium max-w-xs leading-snug">

View File

@@ -66,14 +66,14 @@ export default function GamesPage(): JSX.Element {
).length ).length
return ( return (
<div className="h-full overflow-y-auto desktop-scroll"> <div className="h-full overflow-y-auto">
<div className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10"> <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-6"> <div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
<div> <div>
<div className="text-[14px] text-text/65 font-semibold"> <div className="text-[14px] text-text/65 font-semibold">
{t('games.kicker')} {t('games.kicker')}
</div> </div>
<h1 className="font-display text-[30px] sm:text-[34px] leading-tight mt-1 font-bold"> <h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
{t('games.title')} {t('games.title')}
</h1> </h1>
<p className="text-[15px] text-text/65 mt-2 font-medium leading-relaxed"> <p className="text-[15px] text-text/65 mt-2 font-medium leading-relaxed">
@@ -124,7 +124,7 @@ export default function GamesPage(): JSX.Element {
</InsightGrid> </InsightGrid>
<SectionHeader title={t('games.section.supported')} /> <SectionHeader title={t('games.section.supported')} />
<div className="space-y-3"> <div className="space-y-4">
{games.map((g, i) => ( {games.map((g, i) => (
<motion.div <motion.div
key={g.id} key={g.id}
@@ -185,12 +185,12 @@ function GameCard({
game.enabled game.enabled
return ( return (
<div className="bg-surface rounded-xl p-4 shadow-card border border-hairline/30"> <div className="bg-surface rounded-3xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30">
<div className="flex items-start justify-between gap-4"> <div className="flex items-start justify-between gap-4">
<div className="flex items-start gap-4 min-w-0 flex-1"> <div className="flex items-start gap-4 min-w-0 flex-1">
<div <div
className={[ className={[
'w-10 h-10 rounded-lg grid place-items-center shrink-0 text-white', 'w-12 h-12 rounded-2xl grid place-items-center shrink-0 text-white',
isLive isLive
? 'bg-success' ? 'bg-success'
: game.integrationActive : game.integrationActive
@@ -202,7 +202,7 @@ 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-[18px] font-bold"> <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} />
@@ -220,7 +220,7 @@ function GameCard({
</div> </div>
{game.integrationActive && game.launchOptionStatus === 'queued' && ( {game.integrationActive && game.launchOptionStatus === 'queued' && (
<div className="mt-4 rounded-lg bg-warning/12 p-3.5 text-[14px] leading-relaxed flex items-start gap-2.5 font-medium"> <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={17} size={17}
className="text-warning shrink-0 mt-0.5" className="text-warning shrink-0 mt-0.5"
@@ -235,7 +235,7 @@ function GameCard({
)} )}
{game.integrationActive && game.launchOptionStatus === 'no_user' && ( {game.integrationActive && game.launchOptionStatus === 'no_user' && (
<div className="mt-4 rounded-lg bg-destructive/10 p-3.5 text-[14px] leading-relaxed flex items-start gap-2.5 font-medium"> <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={17} size={17}
className="text-destructive shrink-0 mt-0.5" className="text-destructive shrink-0 mt-0.5"
@@ -345,7 +345,7 @@ function DevPanel({ games }: { games: GameStatus[] }): JSX.Element | null {
<div className="mt-10"> <div className="mt-10">
<button <button
onClick={() => setOpen(!open)} onClick={() => setOpen(!open)}
className="text-[12px] text-text/40 hover:text-text/70 font-mono-num font-medium transition-colors" className="text-[12px] uppercase tracking-wider text-text/40 hover:text-text/70 font-mono-num font-medium transition-colors"
> >
{open ? '▾' : '▸'} {t('games.dev.toggle')} {open ? '▾' : '▸'} {t('games.dev.toggle')}
</button> </button>

View File

@@ -64,8 +64,8 @@ export default function Meals(): JSX.Element {
} }
return ( return (
<div className="h-full overflow-y-auto desktop-scroll"> <div className="h-full overflow-y-auto">
<div className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10"> <div className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
<PageHeader <PageHeader
kicker={t('meals.kicker')} kicker={t('meals.kicker')}
title={t('meals.title')} title={t('meals.title')}
@@ -113,7 +113,7 @@ export default function Meals(): JSX.Element {
<button <button
key={p.nameKey} key={p.nameKey}
onClick={() => addPreset(p)} onClick={() => addPreset(p)}
className="inline-flex items-center gap-2 h-9 px-3 rounded-lg bg-surface border border-hairline/35 hover:border-accent/45 hover:text-accent text-text/80 text-[14px] font-semibold transition-colors active:translate-y-px" className="inline-flex items-center gap-2 h-10 px-3.5 rounded-2xl bg-surface-2 hover:bg-accent/15 hover:text-accent text-text/80 text-[14px] font-semibold transition-colors active:scale-95"
> >
<Icon name={p.icon} size={16} strokeWidth={2.3} /> <Icon name={p.icon} size={16} strokeWidth={2.3} />
{t(p.nameKey)} {t(p.nameKey)}
@@ -157,7 +157,7 @@ export default function Meals(): JSX.Element {
{meals.length === 0 && ( {meals.length === 0 && (
<Card> <Card>
<div className="px-5 py-12 flex flex-col items-center text-center"> <div className="px-5 py-12 flex flex-col items-center text-center">
<div className="inline-flex w-12 h-12 rounded-xl bg-accent text-white items-center justify-center mb-4"> <div className="inline-flex w-14 h-14 rounded-2xl bg-accent text-white items-center justify-center mb-4">
<UtensilsCrossed size={24} strokeWidth={2.3} /> <UtensilsCrossed size={24} strokeWidth={2.3} />
</div> </div>
<div className="text-text/65 text-[15px] font-medium max-w-xs leading-snug"> <div className="text-text/65 text-[15px] font-medium max-w-xs leading-snug">

View File

@@ -36,7 +36,7 @@ export default function SettingsPage(): JSX.Element {
if (!settings) if (!settings)
return ( return (
<div <div
className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10 space-y-5" className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12 space-y-5"
role="status" role="status"
aria-label={t('settings.loading')} aria-label={t('settings.loading')}
> >
@@ -52,13 +52,13 @@ export default function SettingsPage(): JSX.Element {
} }
return ( return (
<div className="h-full overflow-y-auto desktop-scroll"> <div className="h-full overflow-y-auto">
<div className="max-w-[980px] mx-auto px-5 lg:px-8 pt-6 pb-10"> <div className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
<div className="mb-6"> <div className="mb-6">
<div className="text-[14px] text-text/65 font-semibold"> <div className="text-[14px] text-text/65 font-semibold">
{t('settings.kicker')} {t('settings.kicker')}
</div> </div>
<h1 className="font-display text-[30px] sm:text-[34px] leading-tight mt-1 font-bold"> <h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
{t('settings.title')} {t('settings.title')}
</h1> </h1>
</div> </div>
@@ -260,27 +260,27 @@ function SettingsStatusPanel({
}): JSX.Element { }): JSX.Element {
const { t } = useT() const { t } = useT()
return ( return (
<section className="mb-5 rounded-xl bg-surface p-4 shadow-card border border-hairline/30"> <section className="mb-6 rounded-3xl bg-surface p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30">
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4"> <div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
<div className="flex items-start gap-3 min-w-0"> <div className="flex items-start gap-3 min-w-0">
<div <div
className={[ className={[
'w-10 h-10 rounded-lg grid place-items-center text-white shrink-0', 'w-11 h-11 rounded-2xl grid place-items-center text-white shrink-0',
settings.globalEnabled ? 'bg-success' : 'bg-warning' settings.globalEnabled ? 'bg-success' : 'bg-warning'
].join(' ')} ].join(' ')}
> >
<Power size={20} strokeWidth={2.5} /> <Power size={20} strokeWidth={2.5} />
</div> </div>
<div className="min-w-0 flex-1"> <div className="min-w-0 flex-1">
<div className="text-[13px] text-text/50 font-bold"> <div className="text-[13px] uppercase tracking-[0.06em] text-text/50 font-bold">
{t('settings.status.kicker')} {t('settings.status.kicker')}
</div> </div>
<h2 className="font-display text-[20px] font-bold leading-tight mt-1"> <h2 className="font-display text-[22px] font-bold leading-tight mt-1">
{settings.globalEnabled {settings.globalEnabled
? t('settings.status.title.on') ? t('settings.status.title.on')
: t('settings.status.title.off')} : t('settings.status.title.off')}
</h2> </h2>
<p className="text-[14px] text-text/60 mt-1 leading-relaxed max-w-xl break-words"> <p className="text-[14px] text-text/62 mt-1 leading-relaxed max-w-xl break-words">
{settingsStatusHint(settings, t)} {settingsStatusHint(settings, t)}
</p> </p>
</div> </div>
@@ -352,7 +352,7 @@ function StatusPill({
}): JSX.Element { }): JSX.Element {
const activeClass = tone === 'info' ? 'text-info' : 'text-success' const activeClass = tone === 'info' ? 'text-info' : 'text-success'
return ( return (
<div className="rounded-lg bg-surface-2 px-3.5 py-3 min-w-0"> <div className="rounded-2xl bg-surface-2 px-3.5 py-3 min-w-0">
<div className="text-[12px] text-text/50 font-semibold leading-tight"> <div className="text-[12px] text-text/50 font-semibold leading-tight">
{label} {label}
</div> </div>

View File

@@ -20,59 +20,56 @@
@tailwind components; @tailwind components;
@tailwind utilities; @tailwind utilities;
/* ===== Design tokens: desktop workstation ===== */ /* ===== Design tokens — Apple HIG with Manrope/Fraunces ===== */
:root { :root {
--accent: 16 118 110; /* Brand & semantic colors (iOS system palette) */
--accent-2: 225 29 72; --accent: 255 107 53; /* Apple Fitness Move orange */
--success: 22 163 74; --accent-2: 255 45 85; /* systemPink */
--warning: 217 119 6; --success: 52 199 89; /* systemGreen */
--destructive: 220 38 38; --warning: 255 159 10; /* systemOrange dark */
--info: 37 99 235; --destructive: 255 59 48; /* systemRed */
--info: 0 122 255; /* systemBlue */
color-scheme: light dark; color-scheme: light dark;
} }
/* Light — polished iOS groupedBackground with warm undertone */
:root { :root {
--bg: 244 246 247; --bg: 245 245 249; /* slightly warmer than 242,242,247 */
--surface: 255 255 255; --surface: 255 255 255;
--surface-2: 236 240 242; --surface-2: 240 240 245; /* subtle separation for inputs/sections */
--text: 22 27 29; --text: 17 17 19; /* not pure black — softer */
--text-secondary: 72 82 87; --text-secondary: 60 60 67;
--text-tertiary: 103 113 118; --text-tertiary: 60 60 67;
--hairline: 174 185 190; --hairline: 60 60 67;
--vibrancy: 255 255 255; --vibrancy: 255 255 255;
--sidebar: 26 31 33;
--sidebar-text: 245 247 248;
--sidebar-muted: 156 170 176;
--accent-soft: 16 118 110; --accent-soft: 255 107 53;
--bg-deep: 226 231 233; --bg-deep: 232 232 238;
--surface-elevated: 255 255 255; --surface-elevated: 255 255 255;
--border: 174 185 190; --border: 60 60 67;
--muted: 72 82 87; --muted: 60 60 67;
--victory: 22 163 74; --victory: 52 199 89;
--defeat: 220 38 38; --defeat: 255 59 48;
--xp: 217 119 6; --xp: 255 159 10;
} }
/* Dark — true black with grey elevation */
.dark { .dark {
--bg: 16 18 19; --bg: 0 0 0;
--surface: 28 32 34; --surface: 28 28 30;
--surface-2: 40 46 49; --surface-2: 44 44 46;
--text: 245 247 248; --text: 255 255 255;
--text-secondary: 203 211 215; --text-secondary: 235 235 245;
--text-tertiary: 152 164 170; --text-tertiary: 235 235 245;
--hairline: 84 96 101; --hairline: 84 84 88;
--vibrancy: 28 32 34; --vibrancy: 28 28 30;
--sidebar: 17 22 24;
--sidebar-text: 248 250 250;
--sidebar-muted: 146 161 168;
--bg-deep: 12 14 15; --bg-deep: 0 0 0;
--surface-elevated: 36 42 45; --surface-elevated: 44 44 46;
--border: 84 96 101; --border: 84 84 88;
--muted: 203 211 215; --muted: 235 235 245;
} }
/* ===== Base ===== */ /* ===== Base ===== */
@@ -88,31 +85,50 @@ body,
body { body {
font-family: font-family:
-apple-system, 'Segoe UI Variable Text', 'Segoe UI', 'Plus Jakarta Sans', 'Plus Jakarta Sans',
system-ui, sans-serif; -apple-system,
'SF Pro Text',
'Segoe UI Variable Text',
'Segoe UI',
system-ui,
sans-serif;
background-color: rgb(var(--bg)); background-color: rgb(var(--bg));
color: rgb(var(--text)); color: rgb(var(--text));
-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.5; line-height: 1.5;
letter-spacing: 0; letter-spacing: -0.005em;
} }
/* Display — Bricolage Grotesque for headings and brand. Variable opsz axis
gives bigger glyphs slightly more character. */
.font-display { .font-display {
font-family: font-family:
-apple-system, 'Segoe UI Variable Display', 'Segoe UI', 'Plus Jakarta Sans', 'Bricolage Grotesque',
system-ui, sans-serif; 'Plus Jakarta Sans',
-apple-system,
'SF Pro Display',
system-ui,
sans-serif;
font-optical-sizing: auto; font-optical-sizing: auto;
letter-spacing: 0; 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-serif {
font-family: font-family:
-apple-system, 'Segoe UI Variable Display', 'Segoe UI', 'Plus Jakarta Sans', 'Bricolage Grotesque',
system-ui, sans-serif; 'Plus Jakarta Sans',
-apple-system,
'SF Pro Display',
system-ui,
sans-serif;
font-optical-sizing: auto; font-optical-sizing: auto;
letter-spacing: 0; font-variation-settings: 'opsz' 96;
letter-spacing: -0.035em;
} }
.font-mono-num { .font-mono-num {
@@ -120,14 +136,7 @@ body {
'JetBrains Mono', ui-monospace, 'SF Mono', 'Cascadia Code', Menlo, monospace; 'JetBrains Mono', ui-monospace, 'SF Mono', 'Cascadia Code', Menlo, monospace;
font-variant-numeric: tabular-nums; font-variant-numeric: tabular-nums;
font-feature-settings: 'ss02', 'ss19', 'zero'; font-feature-settings: 'ss02', 'ss19', 'zero';
letter-spacing: 0; letter-spacing: -0.01em;
}
.tracking-tight,
.tracking-wider,
.tracking-\[0\.06em\],
.tracking-\[0\.18em\] {
letter-spacing: 0 !important;
} }
/* Custom titlebar drag region */ /* Custom titlebar drag region */
@@ -140,47 +149,36 @@ body {
app-region: no-drag; app-region: no-drag;
} }
/* Crisp panel separators for dense desktop surfaces */ /* iOS 0.5px-style hairlines */
.hairline-b { .hairline-b {
box-shadow: inset 0 -1px 0 rgb(var(--hairline) / 0.34); box-shadow: inset 0 -0.5px 0 rgb(var(--hairline) / 0.18);
} }
.hairline-t { .hairline-t {
box-shadow: inset 0 1px 0 rgb(var(--hairline) / 0.34); box-shadow: inset 0 0.5px 0 rgb(var(--hairline) / 0.18);
}
.dark .hairline-b,
.dark .hairline-t {
box-shadow: inset 0 -0.5px 0 rgb(var(--hairline) / 0.4);
} }
/* macOS vibrancy */
.vibrancy { .vibrancy {
background-color: rgb(var(--vibrancy) / 0.96); background-color: rgb(var(--vibrancy) / 0.72);
backdrop-filter: none; backdrop-filter: saturate(180%) blur(30px);
-webkit-backdrop-filter: none; -webkit-backdrop-filter: saturate(180%) blur(30px);
} }
/* Soft iOS card shadow with subtle warmth */
.shadow-card { .shadow-card {
box-shadow: box-shadow:
0 0 0 1px rgb(var(--hairline) / 0.24), 0 0.5px 0 rgb(0 0 0 / 0.03),
0 10px 28px -24px rgb(15 23 42 / 0.45); 0 1px 2px rgb(15 23 42 / 0.04),
0 6px 14px -4px rgb(15 23 42 / 0.05);
} }
.dark .shadow-card { .dark .shadow-card {
box-shadow: box-shadow:
0 0 0 1px rgb(var(--hairline) / 0.38), 0 0.5px 0 rgb(255 255 255 / 0.04) inset,
0 16px 40px -30px rgb(0 0 0 / 0.9); 0 1px 2px rgb(0 0 0 / 0.4);
}
.app-shell {
background: linear-gradient(
180deg,
rgb(var(--bg)) 0%,
rgb(var(--bg-deep)) 100%
);
}
.app-main-surface {
background:
linear-gradient(180deg, rgb(var(--surface) / 0.78), transparent 220px),
rgb(var(--bg));
}
.desktop-scroll {
scrollbar-gutter: stable;
} }
/* Scrollbar */ /* Scrollbar */
@@ -210,12 +208,12 @@ body {
.reminder-shell { .reminder-shell {
position: relative; position: relative;
border: 1px solid rgb(var(--hairline) / 0.35); border: 0.5px solid rgb(var(--hairline) / 0.25);
border-radius: 12px; border-radius: 22px;
background: rgb(var(--surface)); background: rgb(var(--surface));
box-shadow: box-shadow:
0 1px 2px rgb(0 0 0 / 0.08), 0 1px 2px rgb(0 0 0 / 0.06),
0 24px 70px -28px rgb(0 0 0 / 0.55); 0 20px 50px -16px rgb(0 0 0 / 0.4);
overflow: hidden; overflow: hidden;
height: 100%; height: 100%;
} }

View File

@@ -21,57 +21,33 @@ export type ReleaseNoteItem = {
export type ReleaseNotes = Record<Language, ReleaseNoteItem[]> export type ReleaseNotes = Record<Language, ReleaseNoteItem[]>
export const RELEASE_NOTES: Record<string, ReleaseNotes> = { export const RELEASE_NOTES: Record<string, ReleaseNotes> = {
'0.7.0': { '0.7.1': {
ru: [ ru: [
{ {
title: 'Новый desktop-дизайн', title: 'Вернули последний удачный дизайн',
detail: detail:
'Приложение стало рабочей панелью: темный сайдбар, четкие панели, меньше декоративности и больше полезной плотности.', 'Редизайн 0.7.0 откатан: интерфейс снова выглядит как сохраненная версия “последнее-удачное”.',
tag: 'new' tag: 'fix'
}, },
{ {
title: 'Обзор стал операционным экраном', title: 'Откат придет через автообновление',
detail: detail:
'Главный экран теперь быстрее показывает ближайший шаг, статус, цели, питание, режим и игровые долги.', 'Версия 0.7.1 опубликована как обычный релиз, чтобы установленная 0.7.0 сама вернулась к старому виду.',
tag: 'new' tag: 'fix'
},
{
title: 'Настройки и списки стали спокойнее',
detail:
'Упражнения, питание, игры, челленджи и настройки получили единый desktop-контейнер и компактные строки.',
tag: 'new'
},
{
title: 'Модалки и напоминания обновлены',
detail:
'Редакторы, переключатели, кнопки и окно напоминания приведены к новой desktop-системе.',
tag: 'new'
} }
], ],
en: [ en: [
{ {
title: 'New desktop design', title: 'Restored the last good design',
detail: detail:
'The app now feels like a focused workstation: dark sidebar, crisp panels, less decoration and better density.', 'The 0.7.0 redesign was rolled back: the UI is back to the saved last-good version.',
tag: 'new' tag: 'fix'
}, },
{ {
title: 'Overview is more operational', title: 'Rollback ships through auto-update',
detail: detail:
'The main screen surfaces the next action, status, goals, meals, mode and game debt faster.', 'Version 0.7.1 is a normal release so installed 0.7.0 copies can return to the old look automatically.',
tag: 'new' tag: 'fix'
},
{
title: 'Settings and lists are calmer',
detail:
'Exercises, meals, games, challenges and settings now share a tighter desktop container and compact rows.',
tag: 'new'
},
{
title: 'Dialogs and reminders were refreshed',
detail:
'Editors, switches, buttons and the reminder window now follow the new desktop system.',
tag: 'new'
} }
] ]
}, },

View File

@@ -5,7 +5,7 @@ export default {
theme: { theme: {
extend: { extend: {
colors: { colors: {
// Desktop semantic palette // iOS semantic palette
accent: 'rgb(var(--accent) / <alpha-value>)', accent: 'rgb(var(--accent) / <alpha-value>)',
'accent-soft': 'rgb(var(--accent-soft) / <alpha-value>)', 'accent-soft': 'rgb(var(--accent-soft) / <alpha-value>)',
'accent-2': 'rgb(var(--accent-2) / <alpha-value>)', 'accent-2': 'rgb(var(--accent-2) / <alpha-value>)',
@@ -20,9 +20,6 @@ export default {
surface: 'rgb(var(--surface) / <alpha-value>)', surface: 'rgb(var(--surface) / <alpha-value>)',
'surface-2': 'rgb(var(--surface-2) / <alpha-value>)', 'surface-2': 'rgb(var(--surface-2) / <alpha-value>)',
'surface-elevated': 'rgb(var(--surface-elevated) / <alpha-value>)', 'surface-elevated': 'rgb(var(--surface-elevated) / <alpha-value>)',
sidebar: 'rgb(var(--sidebar) / <alpha-value>)',
'sidebar-text': 'rgb(var(--sidebar-text) / <alpha-value>)',
'sidebar-muted': 'rgb(var(--sidebar-muted) / <alpha-value>)',
// Text & lines // Text & lines
text: 'rgb(var(--text) / <alpha-value>)', text: 'rgb(var(--text) / <alpha-value>)',
@@ -71,14 +68,15 @@ export default {
] ]
}, },
borderRadius: { borderRadius: {
xl: '8px', // iOS-specific radii
'2xl': '10px', xl: '14px',
'3xl': '12px' '2xl': '18px',
'3xl': '22px'
}, },
boxShadow: { boxShadow: {
ios: '0 1px 2px rgb(15 23 42 / 0.06), 0 10px 28px -24px rgb(15 23 42 / 0.35)', ios: '0 0.5px 0 rgb(0 0 0 / 0.04), 0 1px 2px rgb(0 0 0 / 0.05), 0 4px 12px rgb(0 0 0 / 0.04)',
sheet: sheet:
'0 1px 2px rgb(15 23 42 / 0.08), 0 24px 60px -28px rgb(15 23 42 / 0.45)' '0 1px 2px rgb(0 0 0 / 0.06), 0 20px 50px -16px rgb(0 0 0 / 0.4)'
} }
} }
}, },