+
)
}
\ No newline at end of file
diff --git a/src/app/daily-report/page.tsx b/src/app/daily-report/page.tsx
index 94a2794..1a50f52 100644
--- a/src/app/daily-report/page.tsx
+++ b/src/app/daily-report/page.tsx
@@ -6,14 +6,14 @@ import { persianToGregorian, getCurrentPersianDay, getCurrentPersianYear, getCur
import { formatPersianDate, ensureDateFormat } from '@/lib/format/persian-date'
import { TABS, TabType } from '@/features/daily-report'
import { detectDataGaps } from '@/features/daily-report/utils'
-import { BarChart3, Bell, CalendarIcon, ChevronRight } from 'lucide-react'
-import Link from 'next/link'
+import { BarChart3, CalendarIcon, ChevronRight } from 'lucide-react'
import Loading from '@/components/Loading'
import { SummaryTab } from '@/components/daily-report'
import { fetchForecastWeather, isToday as checkIsToday, WeatherData } from '@/features/weather'
-import { Tabs, PageHeader, Button } from '@/components/common'
+import { Tabs, Button } from '@/components/common'
import { DateNavigation } from '@/components/navigation'
import { usePullToRefresh } from '@/hooks/usePullToRefresh'
+import { AppShell } from '@/components/layout'
// Lazy load heavy components
const ChartsTab = lazy(() => import('@/components/daily-report/ChartsTab').then(m => ({ default: m.ChartsTab })))
@@ -201,50 +201,43 @@ function DailyReportContent() {
if (!selectedDate) {
return (
-
-
-
-
تاریخ انتخاب نشده است
-
+
+
+
+
+
تاریخ انتخاب نشده است
+
+
+
)
}
return (
-
-
- {/* Header */}
-
-
- تنظیمات هشدار
-
- }
- />
-
+
+
{/* Date Navigation Buttons */}
- {selectedDate && (
-
- )}
+
{/* Tabs */}
-
+
)
}
diff --git a/src/app/day-details/page.tsx b/src/app/day-details/page.tsx
index 1f36c53..66bd0a9 100644
--- a/src/app/day-details/page.tsx
+++ b/src/app/day-details/page.tsx
@@ -5,9 +5,10 @@ import { api } from '@/lib/api'
import { getCurrentPersianYear, getCurrentPersianMonth, getPersianMonthStartWeekday, getPersianMonthDays } from '@/lib/date/persian-date'
import { Calendar as CalendarIcon, Database } from 'lucide-react'
import Loading from '@/components/Loading'
-import { PageHeader, BackLink, Card } from '@/components/common'
+import { Card } from '@/components/common'
import { WeekdayHeaders } from '@/components/calendar'
import { CalendarDayCell, StatsCard } from '@/components/cards'
+import { AppShell } from '@/components/layout'
const monthNames = ['فروردین', 'اردیبهشت', 'خرداد', 'تیر', 'مرداد', 'شهریور', 'مهر', 'آبان', 'آذر', 'دی', 'بهمن', 'اسفند']
@@ -71,16 +72,12 @@ function DayDetailsContent() {
}
return (
-
+
- {/* Header */}
-
-
-
{/* Calendar Grid */}
{/* Weekday Headers */}
@@ -138,7 +135,7 @@ function DayDetailsContent() {
/>
-
+
)
}
diff --git a/src/app/device-settings/page.tsx b/src/app/device-settings/page.tsx
index 5f03479..d423b63 100644
--- a/src/app/device-settings/page.tsx
+++ b/src/app/device-settings/page.tsx
@@ -1,11 +1,11 @@
"use client"
import { useEffect, useState, useCallback } from 'react'
import { api, DeviceSettingsDto } from '@/lib/api'
-import { Settings, Thermometer, Wind, Sun, Droplets, Save, Loader2, AlertCircle, Bell } from 'lucide-react'
-import Link from 'next/link'
+import { Settings, Thermometer, Wind, Sun, Droplets, Save, Loader2, AlertCircle } from 'lucide-react'
import Loading from '@/components/Loading'
-import { PageHeader, BackLink, ErrorMessage, SuccessMessage, EmptyState, Card } from '@/components/common'
+import { ErrorMessage, SuccessMessage, EmptyState, Card } from '@/components/common'
import { SettingsSection, SettingsInputGroup } from '@/components/settings'
+import { AppShell } from '@/components/layout'
function useQueryParam(name: string) {
if (typeof window === 'undefined') return null as string | null
@@ -95,36 +95,25 @@ export default function DeviceSettingsPage() {
if (!deviceId) {
return (
-
- }
- />
+
+
+
)
}
return (
-
+
- {/* Header */}
-
-
-
- تنظیمات هشدار
-
- }
- />
-
{/* Messages */}
{error && }
{success && }
@@ -252,7 +241,7 @@ export default function DeviceSettingsPage() {
)}
+
)
}
diff --git a/src/app/devices/page.tsx b/src/app/devices/page.tsx
index 1c18fdf..f46389a 100644
--- a/src/app/devices/page.tsx
+++ b/src/app/devices/page.tsx
@@ -5,13 +5,15 @@ import { api, DeviceDto, PagedResult } from '@/lib/api'
import { Settings, LogOut } from 'lucide-react'
import Loading from '@/components/Loading'
import { getCurrentPersianYear, getCurrentPersianMonth, getCurrentPersianDay } from '@/lib/date/persian-date'
-import { PageHeader, ErrorMessage, EmptyState, BackLink } from '@/components/common'
+import { ErrorMessage, EmptyState } from '@/components/common'
import { SearchInput } from '@/components/forms'
import { DeviceCard } from '@/components/cards'
import { Pagination } from '@/components/navigation'
+import { useDevice } from '@/components/layout'
export default function DevicesPage() {
const router = useRouter()
+ const { setDevice } = useDevice()
const [pagedResult, setPagedResult] = useState
| null>(null)
const [loading, setLoading] = useState(true)
const [error, setError] = useState(null)
@@ -22,6 +24,12 @@ export default function DevicesPage() {
const pageSize = 10
+ const handleDeviceSelect = useCallback((device: DeviceDto) => {
+ setDevice(device.id, device.deviceName)
+ const today = `${getCurrentPersianYear()}/${String(getCurrentPersianMonth()).padStart(2, '0')}/${String(getCurrentPersianDay()).padStart(2, '0')}`
+ router.push(`/daily-report?deviceId=${device.id}&date=${encodeURIComponent(today)}`)
+ }, [setDevice, router])
+
const fetchDevices = useCallback(async (page: number, search?: string) => {
if (!user) return
@@ -39,9 +47,8 @@ export default function DevicesPage() {
if (result.items.length === 0 && page === 1) {
setError('شما هیچ دستگاهی ندارید. لطفاً با پشتیبانی تماس بگیرید.')
} else if (result.items.length === 1 && result.totalCount === 1 && !search) {
- // Single device - redirect to today's daily report
- const today = `${getCurrentPersianYear()}/${String(getCurrentPersianMonth()).padStart(2, '0')}/${String(getCurrentPersianDay()).padStart(2, '0')}`
- router.push(`/daily-report?deviceId=${result.items[0].id}&date=${encodeURIComponent(today)}`)
+ // Single device - set context and redirect to today's daily report
+ handleDeviceSelect(result.items[0])
return
} else {
setPagedResult(result)
@@ -52,7 +59,7 @@ export default function DevicesPage() {
} finally {
setLoading(false)
}
- }, [user, router])
+ }, [user, router, handleDeviceSelect])
useEffect(() => {
// Check authentication
@@ -120,21 +127,34 @@ export default function DevicesPage() {
{/* Header */}
-
-
- خروج
-
- }
- iconGradient="from-green-500 to-green-600"
- />
+
+
+
+
+
+
+
+
+ انتخاب دستگاه
+
+ {user && (
+
+ {user.name} {user.family} ({user.mobile})
+
+ )}
+
+
+
+
+
+
+
@@ -174,16 +194,13 @@ export default function DevicesPage() {
{pagedResult && pagedResult.items.length > 0 ? (
<>
- {pagedResult.items.map((device) => {
- const today = `${getCurrentPersianYear()}/${String(getCurrentPersianMonth()).padStart(2, '0')}/${String(getCurrentPersianDay()).padStart(2, '0')}`
- return (
-
- )
- })}
+ {pagedResult.items.map((device) => (
+ handleDeviceSelect(device)}
+ />
+ ))}
{/* Pagination */}
@@ -203,11 +220,6 @@ export default function DevicesPage() {
/>
)
)}
-
- {/* Back to Home */}
-
-
-
)
diff --git a/src/app/globals.css b/src/app/globals.css
index 5172000..b9d0f19 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -156,4 +156,24 @@ button, a, [role="button"] {
);
background-size: 2000px 100%;
animation: shimmer 2s infinite;
+}
+
+/* Bottom Navigation Safe Area */
+@supports (padding-bottom: env(safe-area-inset-bottom)) {
+ .pb-safe {
+ padding-bottom: env(safe-area-inset-bottom);
+ }
+ .h-safe-bottom {
+ height: env(safe-area-inset-bottom);
+ }
+}
+
+/* Prevent content from being hidden behind bottom nav */
+.has-bottom-nav {
+ padding-bottom: 5rem;
+}
+@media (max-width: 768px) {
+ .has-bottom-nav {
+ padding-bottom: 4.5rem;
+ }
}
\ No newline at end of file
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index f479197..d29c9b4 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -2,6 +2,7 @@ import type { Metadata } from 'next'
import './globals.css'
import ServiceWorkerRegistration from '@/components/ServiceWorkerRegistration'
import UpdateNotification from '@/components/UpdateNotification'
+import { DeviceProvider } from '@/components/layout'
export const metadata: Metadata = {
title: 'GreenHome',
@@ -42,7 +43,9 @@ export default function RootLayout({ children }: Readonly<{ children: React.Reac
- {children}
+
+ {children}
+