diff --git a/client/src/components/Layout/BottomNav.tsx b/client/src/components/Layout/BottomNav.tsx index 95c552ef..16aa9ffd 100644 --- a/client/src/components/Layout/BottomNav.tsx +++ b/client/src/components/Layout/BottomNav.tsx @@ -2,6 +2,7 @@ import { useState } from 'react' import { NavLink, useNavigate } from 'react-router-dom' import { useAddonStore } from '../../store/addonStore' import { useAuthStore } from '../../store/authStore' +import { useSettingsStore } from '../../store/settingsStore' import { useTranslation } from '../../i18n' import { Plane, CalendarDays, Globe, Compass, User, Settings, Shield, LogOut, X } from 'lucide-react' import type { LucideIcon } from 'lucide-react' @@ -18,6 +19,8 @@ const ADDON_NAV: Record export default function BottomNav() { const { t } = useTranslation() + const darkMode = useSettingsStore(s => s.settings.dark_mode) + const dark = darkMode === true || darkMode === 'dark' || (darkMode === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches) const addons = useAddonStore(s => s.addons) const globalAddons = addons.filter(a => a.type === 'global' && a.enabled) const [showProfile, setShowProfile] = useState(false) @@ -35,7 +38,7 @@ export default function BottomNav() { style={{ height: 'calc(84px + env(safe-area-inset-bottom, 0px))', paddingBottom: 'env(safe-area-inset-bottom, 0px)', - background: 'rgba(255,255,255,0.96)', + background: dark ? 'rgba(9,9,11,0.96)' : 'rgba(255,255,255,0.96)', backdropFilter: 'blur(20px)', WebkitBackdropFilter: 'blur(20px)', }} diff --git a/client/src/pages/AtlasPage.tsx b/client/src/pages/AtlasPage.tsx index 76f40690..0195da71 100644 --- a/client/src/pages/AtlasPage.tsx +++ b/client/src/pages/AtlasPage.tsx @@ -759,7 +759,7 @@ export default function AtlasPage(): React.ReactElement { } return ( -
+
{/* Map */} diff --git a/client/src/pages/DashboardPage.tsx b/client/src/pages/DashboardPage.tsx index ebcf53b3..9b02b285 100644 --- a/client/src/pages/DashboardPage.tsx +++ b/client/src/pages/DashboardPage.tsx @@ -240,19 +240,11 @@ function SpotlightCard({ trip, onEdit, onCopy, onDelete, onArchive, onClick, t, )} {/* Stats */} -
- {trip.start_date && !isLive && ( -
-

{formatDateShort(trip.start_date, locale)}

-

{t('dashboard.mobile.starts')}

-
- )} - {isLive && ( -
-

{totalDays}

-

{t('dashboard.mobile.duration')}

-
- )} +
+
+

{trip.day_count || totalDays}

+

{t('dashboard.mobile.days')}

+

{trip.place_count || 0}

{t('dashboard.mobile.places')}

@@ -261,12 +253,6 @@ function SpotlightCard({ trip, onEdit, onCopy, onDelete, onArchive, onClick, t,

{trip.shared_count || 0}

{t('dashboard.mobile.buddies')}

- {!isLive && ( -
-

{trip.day_count || totalDays}

-

{t('dashboard.mobile.days')}

-
- )}
@@ -883,30 +869,26 @@ export default function DashboardPage(): React.ReactElement { {t('dashboard.mobile.newTrip')} )} - {showCurrency && ( - - )} - {showTimezone && ( - - )} + +
{/* Desktop header */} @@ -1161,8 +1143,8 @@ export default function DashboardPage(): React.ReactElement {
- {(showWidgetSettings === 'mobile' || showWidgetSettings === 'mobile-currency') && showCurrency && } - {(showWidgetSettings === 'mobile' || showWidgetSettings === 'mobile-timezone') && showTimezone && } + {(showWidgetSettings === 'mobile' || showWidgetSettings === 'mobile-currency') && } + {(showWidgetSettings === 'mobile' || showWidgetSettings === 'mobile-timezone') && }