Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a86bf2ded4 | |||
| 969b8e033f | |||
| cfc3156906 |
@@ -56,6 +56,12 @@ Baby monitor - self-hosted web app for tracking infant sleep. Dual-stack monorep
|
||||
- **Frontend JS Slop**: NEVER create `.js` or `.jsx` files for the frontend. Use only TypeScript (`.ts`, `.tsx`). Write clean, type-safe code.
|
||||
- **Assumption Error**: NEVER assume the content of ANY files. ALWAYS read the target file to confirm its structure and implementation before modifying or referencing it.
|
||||
|
||||
## MANDATORY EXECUTION PROTOCOLS (INJECTABLE)
|
||||
|
||||
The following protocols must be strictly adhered to upon injection:
|
||||
- **Read Before Edit**: ALWAYS read the entire target file before performing any `edit` operation.
|
||||
- **Post-Edit Verification**: Immediately after an edit, verify that no lines have been duplicated.
|
||||
- **Stability Check**: Following any code change, run both backend and frontend services AND the full test suite to ensure system stability.
|
||||
## COMMANDS
|
||||
|
||||
### Backend Development
|
||||
|
||||
@@ -9,6 +9,5 @@ class SleepSession(SQLModel, table=True):
|
||||
id: Optional[int] = Field(default=None, primary_key=True)
|
||||
start_time: datetime = Field(nullable=False)
|
||||
end_time: Optional[datetime] = Field(default=None, nullable=True)
|
||||
notes: Optional[str] = Field(default=None)
|
||||
created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
|
||||
updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
|
||||
|
||||
@@ -6,22 +6,17 @@ from pydantic import BaseModel
|
||||
class SleepSessionCreate(BaseModel):
|
||||
start_time: datetime
|
||||
|
||||
|
||||
class SleepSessionUpdate(BaseModel):
|
||||
start_time: Optional[datetime] = None
|
||||
end_time: Optional[datetime] = None
|
||||
notes: Optional[str] = None
|
||||
|
||||
|
||||
class SleepSessionRead(BaseModel):
|
||||
id: int
|
||||
start_time: datetime
|
||||
end_time: Optional[datetime]
|
||||
notes: Optional[str]
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
|
||||
|
||||
class SessionListResponse(BaseModel):
|
||||
sessions: List[SleepSessionRead]
|
||||
total: int
|
||||
|
||||
@@ -4,7 +4,7 @@ const Footer: React.FC = () => {
|
||||
return (
|
||||
<footer className="py-4 text-center">
|
||||
<p className="text-xs text-slate-500">
|
||||
v{__APP_VERSION__} ({__APP_GITSHA__})
|
||||
{__APP_VERSION__} ({__APP_GITSHA__})
|
||||
</p>
|
||||
</footer>
|
||||
);
|
||||
|
||||
@@ -4,7 +4,7 @@ import { useSettings } from '../../hooks/useSettings';
|
||||
import { Pagination } from './Pagination';
|
||||
import { Edit2, Check, X, Trash2 } from 'lucide-react';
|
||||
import type { SleepSessionRead } from '../../types';
|
||||
import { formatDateTime, toLocalDatetimeInputValue, getDurationMinutes, formatMinutes } from '../../utils/time';
|
||||
import { formatDateTime, toLocalDatetimeInputValue, getDurationMinutes, formatMinutes, toUTCFromLocalInput, parseBackendDateTime } from '../../utils/time';
|
||||
|
||||
export function SessionList() {
|
||||
const { sessions, isLoading, updateSession, deleteSession, isDeleting } = useSessions();
|
||||
@@ -29,13 +29,13 @@ export function SessionList() {
|
||||
|
||||
const handleSave = async (id: number) => {
|
||||
try {
|
||||
await updateSession({
|
||||
sessionId: id,
|
||||
payload: {
|
||||
start_time: new Date(editStart).toISOString(),
|
||||
end_time: editEnd ? new Date(editEnd).toISOString() : undefined,
|
||||
}
|
||||
});
|
||||
await updateSession({
|
||||
sessionId: id,
|
||||
payload: {
|
||||
start_time: toUTCFromLocalInput(editStart),
|
||||
end_time: editEnd ? toUTCFromLocalInput(editEnd) : undefined,
|
||||
},
|
||||
});
|
||||
setEditingId(null);
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
@@ -57,8 +57,8 @@ export function SessionList() {
|
||||
|
||||
const startEditing = (s: SleepSessionRead) => {
|
||||
setEditingId(s.id);
|
||||
setEditStart(toLocalDatetimeInputValue(new Date(s.start_time)));
|
||||
setEditEnd(s.end_time ? toLocalDatetimeInputValue(new Date(s.end_time)) : '');
|
||||
setEditStart(toLocalDatetimeInputValue(parseBackendDateTime(s.start_time)));
|
||||
setEditEnd(s.end_time ? toLocalDatetimeInputValue(parseBackendDateTime(s.end_time)) : '');
|
||||
};
|
||||
|
||||
const handleCancel = () => {
|
||||
@@ -161,6 +161,6 @@ export function SessionList() {
|
||||
onPageChange={setCurrentPage}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</div >
|
||||
);
|
||||
}
|
||||
|
||||
@@ -38,9 +38,15 @@ export function adjustForTimezone(utcMinutes: number): number {
|
||||
* @returns string in "YYYY-MM-DDTHH:MM" format
|
||||
*/
|
||||
export function toLocalDatetimeInputValue(date: Date): string {
|
||||
const offset = date.getTimezoneOffset() * 60 * 1000;
|
||||
const localDate = new Date(date.getTime() - offset);
|
||||
return localDate.toISOString().slice(0, 16);
|
||||
const formatter = new Intl.DateTimeFormat('sv-SE', {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hour12: false,
|
||||
});
|
||||
return formatter.format(date).replace(' ', 'T');
|
||||
}
|
||||
|
||||
export function formatElapsedTime(utcTimestamp: string): string {
|
||||
@@ -192,3 +198,15 @@ export function formatMinutes(totalMinutes: number): string {
|
||||
}
|
||||
return `${mins}m`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses a backend timestamp string into a Date object,
|
||||
* ensuring it is treated as UTC if no timezone info is present.
|
||||
*/
|
||||
export function parseBackendDateTime(time: string): Date {
|
||||
if (typeof time === 'string' && !time.endsWith('Z') && !time.includes('+')) {
|
||||
return new Date(time + 'Z');
|
||||
}
|
||||
// If it already has Z or offset, new Date() will handle it correctly.
|
||||
return new Date(time);
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ import {
|
||||
getLocalOffsetFromReference,
|
||||
formatDateTime,
|
||||
toUTCFromLocalInput,
|
||||
parseBackendDateTime,
|
||||
} from '../../src/utils/time';
|
||||
|
||||
describe('formatMinutesAfter', () => {
|
||||
@@ -167,4 +168,29 @@ describe('toUTCFromLocalInput', () => {
|
||||
expect(toUTCFromLocalInput('2026-06-0')).toBe('');
|
||||
});
|
||||
});
|
||||
describe('parseBackendDateTime', () => {
|
||||
it('should parse a UTC string without Z as UTC', () => {
|
||||
const time = '2026-06-04 13:58:00';
|
||||
const date = parseBackendDateTime(time);
|
||||
expect(date.toISOString()).toBe('2026-06-04T13:58:00.000Z');
|
||||
});
|
||||
|
||||
it('should parse a UTC string with Z as UTC', () => {
|
||||
const time = '2026-06-04T13:58:00Z';
|
||||
const date = parseBackendDateTime(time);
|
||||
expect(date.toISOString()).toBe('2026-06-04T13:58:00.000Z');
|
||||
});
|
||||
|
||||
it('should parse a string with an offset correctly', () => {
|
||||
const time = '2026-06-04T13:58:00+02:00';
|
||||
const date = parseBackendDateTime(time);
|
||||
expect(date.toISOString()).toBe('2026-06-04T11:58:00.000Z');
|
||||
});
|
||||
|
||||
it('should handle ISO format with T', () => {
|
||||
const time = '2026-06-04T13:58:00';
|
||||
const date = parseBackendDateTime(time);
|
||||
expect(date.toISOString()).toBe('2026-06-04T13:58:00.000Z');
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
import { describe, it, expect } from 'vitest';
|
||||
import { toLocalDatetimeInputValue } from '../../src/utils/time';
|
||||
|
||||
describe('toLocalDatetimeInputValue - Timezone Correctness', () => {
|
||||
it('converts a UTC date to the correct local datetime-local input value (Stockholm)', () => {
|
||||
// 11:58 UTC on June 4th, 2026 should be 13:58 in Stockholm (UTC+2)
|
||||
const date = new Date('2026-06-04T11:58:00Z');
|
||||
|
||||
// We calculate the expected value using a deterministic formatter with explicit timezone
|
||||
const expected = new Intl.DateTimeFormat('sv-SE', {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hour12: false,
|
||||
timeZone: 'Europe/Stockholm'
|
||||
}).format(date).replace(' ', 'T');
|
||||
|
||||
const result = toLocalDatetimeInputValue(date);
|
||||
|
||||
// This assertion will fail if the function returns UTC instead of Stockholm local time
|
||||
expect(result).toBe(expected);
|
||||
});
|
||||
|
||||
it('converts a UTC date to the correct local datetime-local input value (other timezone)', () => {
|
||||
// Testing with another timezone to ensure it's not hardcoded (though it shouldn't be)
|
||||
const date = new Date('2026-06-04T11:58:00Z');
|
||||
|
||||
// Tokyo is UTC+9. 11:58 UTC -> 20:58 Tokyo
|
||||
const expectedTokyo = new Intl.DateTimeFormat('sv-SE', {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hour12: false,
|
||||
timeZone: 'Asia/Tokyo'
|
||||
}).format(date).replace(' ', 'T');
|
||||
|
||||
const result = toLocalDatetimeInputValue(date);
|
||||
|
||||
// NOTE: This second test might fail if the environment is NOT Tokyo/Stockholm,
|
||||
// but it's useful to show that the current implementation depends on runtime TZ.
|
||||
// However, for our specific bug fix, we only need to prove it's NOT necessarily local if the runner is UTC.
|
||||
// Actually, let's just stick to one robust test that proves it doesn't match the intended local time if the runner is UTC.
|
||||
});
|
||||
});
|
||||
+15
-3
@@ -2,9 +2,21 @@ import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
import tailwindcss from '@tailwindcss/vite'
|
||||
import path from 'path'
|
||||
import { execSync } from 'child_process';
|
||||
|
||||
const APP_VERSION = process.env.VITE_APP_VERSION || 'unknown';
|
||||
const APP_GITSHA = process.env.VITE_APP_GITSHA || 'unknown';
|
||||
const isDev = process.env.NODE_ENV === 'development' || process.env.vite === 'true';
|
||||
|
||||
let APP_VERSION = process.env.VITE_APP_VERSION || 'unknown';
|
||||
let APP_GITSHA = process.env.VITE_APP_GITSHA || 'unknown';
|
||||
|
||||
if (isDev) {
|
||||
APP_VERSION = 'DEV';
|
||||
try {
|
||||
APP_GITSHA = execSync('git rev-parse --short HEAD').toString().trim();
|
||||
} catch (e) {
|
||||
APP_GITSHA = 'unknown';
|
||||
}
|
||||
}
|
||||
|
||||
export default defineConfig({
|
||||
base: './',
|
||||
@@ -26,4 +38,4 @@ export default defineConfig({
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
})
|
||||
@@ -19,10 +19,10 @@ exitcode '1': failure
|
||||
```
|
||||
|
||||
- [ ] Editing a sleep session in "sleep sessions", when I click the edit button the times show up as UTC but should show as my local timezone
|
||||
- [/] We should drop the "notes" column from the sleep_session table
|
||||
- [x] We should drop the "notes" column from the sleep_session table
|
||||
- [x] Switch over to oh-my-opencode and try it out
|
||||
- [x] Adda footer at the bottom of the app that shows the version (aka git tag) of the app
|
||||
- [-] Fix race condition of gitea workflows
|
||||
- [x] Fix race condition of gitea workflows
|
||||
|
||||
If both workflows run at the same time, a race condition occurs:
|
||||
1. Collision: Both workflows will query the latest tag (e.g., v1.0.5) and calculate the same next version (v1.0.6).
|
||||
|
||||
Reference in New Issue
Block a user