fix: 4 bugs — MSK today events, settings scroll, note dates, persistent notes volume
All checks were successful
Deploy / deploy (push) Successful in 4m35s
All checks were successful
Deploy / deploy (push) Successful in 4m35s
- calendar API: today/week ranges use Moscow time (UTC+3) instead of UTC — previously today events did not appear until 03:00 MSK - settings tab: add -webkit-overflow-scrolling: touch + touchAction pan-y for tablet scroll - NotesTab: add date picker (pinDate) in editor header + date badge in list - home: pinnedNotes now filters by pinDate (today or future), falls back to latest - notes/auth: storage moved from /tmp to /data (falls back to /tmp if /data missing) - deploy workflow: mount /opt/digital-home/smart-home-tablet-data:/data so notes survive redeploys
This commit is contained in:
@@ -4,7 +4,8 @@ import * as fs from 'fs'
|
||||
import * as path from 'path'
|
||||
|
||||
const SECRET = process.env.APP_SECRET || 'smart-home-default-secret-change-me'
|
||||
const CONFIG_PATH = '/tmp/tablet-config.json'
|
||||
const DATA_DIR = fs.existsSync('/data') ? '/data' : '/tmp'
|
||||
const CONFIG_PATH = `${DATA_DIR}/tablet-config.json`
|
||||
|
||||
function loadConfig(): { pin: string } {
|
||||
try {
|
||||
|
||||
@@ -43,12 +43,21 @@ export async function GET(req: Request) {
|
||||
let timeMin: string
|
||||
let timeMax: string
|
||||
|
||||
// Moscow boundaries (UTC+3, no DST). 00:00 MSK = 21:00 UTC previous day.
|
||||
const MSK_OFFSET_MS = 3 * 3600 * 1000
|
||||
const mskNow = new Date(now.getTime() + MSK_OFFSET_MS)
|
||||
const my = mskNow.getUTCFullYear()
|
||||
const mm = mskNow.getUTCMonth()
|
||||
const md = mskNow.getUTCDate()
|
||||
const mskMidnight = (y: number, m: number, d: number) =>
|
||||
new Date(Date.UTC(y, m, d) - MSK_OFFSET_MS).toISOString()
|
||||
|
||||
if (range === 'today') {
|
||||
timeMin = new Date(now.getFullYear(), now.getMonth(), now.getDate()).toISOString()
|
||||
timeMax = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1).toISOString()
|
||||
timeMin = mskMidnight(my, mm, md)
|
||||
timeMax = mskMidnight(my, mm, md + 1)
|
||||
} else if (range === 'week') {
|
||||
timeMin = new Date(now.getFullYear(), now.getMonth(), now.getDate()).toISOString()
|
||||
timeMax = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 7).toISOString()
|
||||
timeMin = mskMidnight(my, mm, md)
|
||||
timeMax = mskMidnight(my, mm, md + 7)
|
||||
} else {
|
||||
// month — support year/month query params
|
||||
const targetYear = parseInt(searchParams.get('year') || String(now.getFullYear()))
|
||||
|
||||
@@ -2,7 +2,8 @@ export const dynamic = 'force-dynamic'
|
||||
import { NextResponse } from 'next/server'
|
||||
import * as fs from 'fs'
|
||||
|
||||
const NOTES_PATH = '/tmp/tablet-notes.json'
|
||||
const DATA_DIR = fs.existsSync('/data') ? '/data' : '/tmp'
|
||||
const NOTES_PATH = `${DATA_DIR}/tablet-notes.json`
|
||||
|
||||
interface Note {
|
||||
id: string
|
||||
|
||||
15
app/page.tsx
15
app/page.tsx
@@ -394,10 +394,19 @@ function HomeTab({ weather, sensors }: { weather: WeatherData | null; sensors: S
|
||||
})
|
||||
.catch(() => {})
|
||||
|
||||
// Notes
|
||||
// Notes — pinned (pinDate today or future), fallback to latest
|
||||
fetch('/api/notes')
|
||||
.then(r => r.json())
|
||||
.then(d => setPinnedNotes((d.notes || []).slice(0, 3)))
|
||||
.then(d => {
|
||||
const all = d.notes || []
|
||||
const today = new Date(); today.setHours(0, 0, 0, 0)
|
||||
const pinned = all.filter((n: any) => {
|
||||
if (!n.pinDate) return false
|
||||
const pd = new Date(n.pinDate); pd.setHours(0, 0, 0, 0)
|
||||
return pd.getTime() >= today.getTime()
|
||||
})
|
||||
setPinnedNotes((pinned.length ? pinned : all).slice(0, 3))
|
||||
})
|
||||
.catch(() => {})
|
||||
}, [])
|
||||
|
||||
@@ -650,7 +659,7 @@ function SettingsTab({ city, onCityChange, onLogout, theme, onThemeChange }: { c
|
||||
const currentCity = CITIES.find(c => c.id === city) || CITIES[0]
|
||||
|
||||
return (
|
||||
<div style={{ flex: 1, overflowY: 'auto', padding: '24px', display: 'flex', flexDirection: 'column', gap: 16, maxWidth: 560, margin: '0 auto', width: '100%' }}>
|
||||
<div style={{ flex: 1, overflowY: 'auto', WebkitOverflowScrolling: 'touch' as any, touchAction: 'pan-y', padding: '24px', display: 'flex', flexDirection: 'column', gap: 16, maxWidth: 560, margin: '0 auto', width: '100%' }}>
|
||||
<h2 style={{ fontSize: 24, fontWeight: 800, color: 'var(--text-primary)', margin: '0 0 8px', letterSpacing: '-0.5px' }}>Настройки</h2>
|
||||
|
||||
{/* City selector */}
|
||||
|
||||
Reference in New Issue
Block a user