diff --git a/src/components/app/app.tsx b/src/components/app/app.tsx index 93222d2..4926b4d 100644 --- a/src/components/app/app.tsx +++ b/src/components/app/app.tsx @@ -17,6 +17,7 @@ import { Toolbar } from '@/components/toolbar'; import { SnackbarProvider } from '@/contexts/snackbar'; import { MediaControls } from '@/components/media-controls'; import { ThemeToggle } from '@/components/theme-toggle'; +import { AuthButton } from '@/components/auth-button'; import { sounds } from '@/data/sounds'; import { FADE_OUT } from '@/constants/events'; @@ -95,6 +96,7 @@ export function App() { return ( + diff --git a/src/components/donate.astro b/src/components/donate.astro deleted file mode 100644 index cac9a5a..0000000 --- a/src/components/donate.astro +++ /dev/null @@ -1,65 +0,0 @@ ---- -import { Container } from './container'; -import { getTranslation } from '@/data/i18n'; - -// Get language from URL path -const url = Astro.url; -const pathname = url.pathname; -const isZhPage = pathname === '/zh' || pathname.startsWith('/zh/'); -const lang = isZhPage ? 'zh-CN' : 'en'; -const t = getTranslation(lang); ---- - - -
-

- {t.enjoyMoodist}{' '} - - {t.supportWithDonation} - -

-
-
- - diff --git a/src/components/toolbar/menu/menu.module.css b/src/components/toolbar/menu/menu.module.css index 6f1f399..11fd840 100644 --- a/src/components/toolbar/menu/menu.module.css +++ b/src/components/toolbar/menu/menu.module.css @@ -9,19 +9,19 @@ color: var(--color-foreground); pointer-events: auto; cursor: pointer; - background-color: var(--color-neutral-100); - border: 1px solid var(--color-neutral-300); + background-color: var(--bg-secondary); + border: 1px solid var(--color-border); border-radius: 50%; transition: 0.2s; &:focus-visible { - outline: 2px solid var(--color-neutral-400); + outline: 2px solid var(--color-muted); outline-offset: 2px; } &:hover, &:focus-visible { - background-color: var(--color-neutral-200); + background-color: var(--bg-tertiary); } } } @@ -36,8 +36,8 @@ max-height: var(--radix-dropdown-menu-content-available-height); padding: 4px; overflow: auto; - background-color: var(--color-neutral-100); - border: 1px solid var(--color-neutral-300); + background-color: var(--component-bg); + border: 1px solid var(--color-border); border-radius: 8px; } diff --git a/src/components/toolbar/menu/menu.tsx b/src/components/toolbar/menu/menu.tsx index d7f39b5..c931cd3 100644 --- a/src/components/toolbar/menu/menu.tsx +++ b/src/components/toolbar/menu/menu.tsx @@ -11,26 +11,11 @@ import { SourceItem, PresetsItem, ShortcutsItem, - SleepTimerItem, - BreathingExerciseItem, - PomodoroItem, - NotepadItem, - TodoItem, - CountdownItem, - BinauralItem, - IsochronicItem, - LofiItem, } from './items'; import { Divider } from './divider'; import { ShareLinkModal } from '@/components/modals/share-link'; import { PresetsModal } from '@/components/modals/presets'; import { ShortcutsModal } from '@/components/modals/shortcuts'; -import { SleepTimerModal } from '@/components/modals/sleep-timer'; -import { BreathingExerciseModal } from '@/components/modals/breathing'; -import { BinauralModal } from '@/components/modals/binaural'; -import { IsochronicModal } from '@/components/modals/isochronic'; -import { LofiModal } from '@/components/modals/lofi'; -import { Pomodoro, Notepad, Todo, Countdown } from '@/components/toolbox'; import { Slider } from '@/components/slider'; import { useTranslation } from '@/hooks/useTranslation'; @@ -51,18 +36,9 @@ export function Menu() { const initial = useMemo( () => ({ - binaural: false, - breathing: false, - countdown: false, - isochronic: false, - lofi: false, - notepad: false, - pomodoro: false, presets: false, shareLink: false, shortcuts: false, - sleepTimer: false, - todo: false, }), [], ); @@ -88,13 +64,7 @@ export function Menu() { useHotkeys('shift+m', () => setIsOpen(prev => !prev)); useHotkeys('shift+alt+p', () => open('presets')); useHotkeys('shift+h', () => open('shortcuts')); - useHotkeys('shift+b', () => open('breathing')); - useHotkeys('shift+n', () => open('notepad')); - useHotkeys('shift+p', () => open('pomodoro')); - useHotkeys('shift+t', () => open('todo')); - useHotkeys('shift+c', () => open('countdown')); useHotkeys('shift+s', () => open('shareLink'), { enabled: !noSelected }); - useHotkeys('shift+alt+t', () => open('sleepTimer')); useCloseListener(closeAll); @@ -130,19 +100,6 @@ export function Menu() { open('presets')} /> open('shareLink')} /> - open('sleepTimer')} /> - - - open('countdown')} /> - open('pomodoro')} /> - open('notepad')} /> - open('todo')} /> - open('breathing')} /> - - - open('binaural')} /> - open('isochronic')} /> - open('lofi')} /> open('shortcuts')} /> @@ -173,33 +130,11 @@ export function Menu() { show={modals.shareLink} onClose={() => close('shareLink')} /> - close('breathing')} - /> close('shortcuts')} /> - open('pomodoro')} - show={modals.pomodoro} - onClose={() => close('pomodoro')} - /> - close('notepad')} /> - close('todo')} /> - close('countdown')} /> close('presets')} /> - close('sleepTimer')} - /> - close('binaural')} /> - close('isochronic')} - /> - close('lofi')} /> ); } diff --git a/src/pages/index.astro b/src/pages/index.astro index 4ab7c08..ef603d1 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,7 +1,6 @@ --- import Layout from '@/layouts/layout.astro'; -import Donate from '@/components/donate.astro'; import Hero from '@/components/hero.astro'; import About from '@/components/about-unified.astro'; @@ -21,7 +20,6 @@ const pageDesc = lang === 'zh-CN' --- - diff --git a/src/pages/zh.astro b/src/pages/zh.astro index a714605..954cdc9 100644 --- a/src/pages/zh.astro +++ b/src/pages/zh.astro @@ -1,7 +1,6 @@ --- import Layout from '@/layouts/layout.astro'; -import Donate from '@/components/donate.astro'; import Hero from '@/components/hero.astro'; import About from '@/components/about-unified.astro'; @@ -14,7 +13,6 @@ const pageDesc = 'Moodist 是一个免费开源的环境音生成器,提供精 --- -