added support for manual sleep logging #26
@@ -119,6 +119,12 @@ def serve_sleep() -> FileResponse:
|
||||
return FileResponse(static_path / "sleep.html")
|
||||
|
||||
|
||||
@app.get("/log-sleep.html", include_in_schema=False)
|
||||
def serve_log_sleep() -> FileResponse:
|
||||
"""Serve the log sleep page."""
|
||||
return FileResponse(static_path / "log-sleep.html")
|
||||
|
||||
|
||||
@app.get("/settings.html", include_in_schema=False)
|
||||
def serve_settings() -> FileResponse:
|
||||
"""Serve the settings page."""
|
||||
|
||||
@@ -9,6 +9,7 @@ class CreateSleepRequest(BaseModel):
|
||||
|
||||
child_id: int = Field(..., gt=0)
|
||||
start_time: datetime
|
||||
end_time: datetime | None = None
|
||||
|
||||
|
||||
class UpdateSleepRequest(BaseModel):
|
||||
|
||||
@@ -12,6 +12,7 @@ class SleepRepositoryInterface(ABC):
|
||||
self,
|
||||
child_id: int,
|
||||
start_time: datetime,
|
||||
end_time: datetime | None = None,
|
||||
) -> dict:
|
||||
"""Create a new sleep log entry."""
|
||||
|
||||
|
||||
@@ -27,12 +27,13 @@ class DatabaseSleepRepository(SleepRepositoryInterface):
|
||||
self,
|
||||
child_id: int,
|
||||
start_time: datetime,
|
||||
end_time: datetime | None = None,
|
||||
) -> dict:
|
||||
"""Create a new sleep log entry."""
|
||||
sleep = Sleep(
|
||||
child_id=child_id,
|
||||
start_time=start_time,
|
||||
end_time=None,
|
||||
end_time=end_time,
|
||||
)
|
||||
self.db.add(sleep)
|
||||
self.db.commit()
|
||||
|
||||
@@ -36,6 +36,7 @@ def create_sleep(
|
||||
sleep = sleep_repo.create(
|
||||
child_id=request.child_id,
|
||||
start_time=request.start_time,
|
||||
end_time=request.end_time,
|
||||
)
|
||||
|
||||
return SleepResponse(**sleep)
|
||||
|
||||
@@ -0,0 +1,385 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Log Sleep - Baby Monitor</title>
|
||||
<style>
|
||||
* {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family:
|
||||
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
|
||||
Cantarell, sans-serif;
|
||||
background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.container {
|
||||
background: white;
|
||||
border-radius: 12px;
|
||||
box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2);
|
||||
padding: 40px;
|
||||
max-width: 500px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
h1 {
|
||||
color: #333;
|
||||
margin-bottom: 10px;
|
||||
font-size: 28px;
|
||||
}
|
||||
|
||||
.subtitle {
|
||||
color: #666;
|
||||
margin-bottom: 30px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
label {
|
||||
display: block;
|
||||
margin-bottom: 8px;
|
||||
color: #333;
|
||||
font-weight: 600;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
input,
|
||||
select {
|
||||
width: 100%;
|
||||
padding: 12px;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 6px;
|
||||
font-size: 14px;
|
||||
transition: border-color 0.2s;
|
||||
}
|
||||
|
||||
input:focus,
|
||||
select:focus {
|
||||
outline: none;
|
||||
border-color: #4facfe;
|
||||
}
|
||||
|
||||
.button {
|
||||
background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 12px 24px;
|
||||
border-radius: 6px;
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
transition:
|
||||
transform 0.2s,
|
||||
box-shadow 0.2s;
|
||||
width: 100%;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.button:hover {
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 4px 12px rgba(79, 172, 254, 0.4);
|
||||
}
|
||||
|
||||
.button:active {
|
||||
transform: translateY(0);
|
||||
}
|
||||
|
||||
.button:disabled {
|
||||
opacity: 0.6;
|
||||
cursor: not-allowed;
|
||||
transform: none;
|
||||
}
|
||||
|
||||
.button.secondary {
|
||||
background: #6c757d;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.button.secondary:hover {
|
||||
box-shadow: 0 4px 12px rgba(108, 117, 125, 0.4);
|
||||
}
|
||||
|
||||
.message {
|
||||
padding: 12px;
|
||||
border-radius: 6px;
|
||||
margin-bottom: 20px;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.message.show {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.message.error {
|
||||
background: #ffebee;
|
||||
border-left: 4px solid #f44336;
|
||||
color: #c62828;
|
||||
}
|
||||
|
||||
.message.success {
|
||||
background: #e8f5e9;
|
||||
border-left: 4px solid #4caf50;
|
||||
color: #2e7d32;
|
||||
}
|
||||
|
||||
.help-text {
|
||||
font-size: 12px;
|
||||
color: #666;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.loading {
|
||||
text-align: center;
|
||||
padding: 20px;
|
||||
color: #666;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<h1>😴 Log Sleep</h1>
|
||||
<p class="subtitle">Record a sleep session</p>
|
||||
|
||||
<div id="message" class="message"></div>
|
||||
|
||||
<div id="loadingChildren" class="loading">Loading children...</div>
|
||||
|
||||
<form id="logSleepForm" style="display: none">
|
||||
<div class="form-group">
|
||||
<label for="childId">Child *</label>
|
||||
<select id="childId" name="childId" required>
|
||||
<option value="">Select a child</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="startTime">Start Time *</label>
|
||||
<input
|
||||
type="datetime-local"
|
||||
id="startTime"
|
||||
name="startTime"
|
||||
required
|
||||
/>
|
||||
<p class="help-text">Defaults to current time</p>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="endTime">End Time</label>
|
||||
<input type="datetime-local" id="endTime" name="endTime" />
|
||||
<p class="help-text">Leave empty if sleep is ongoing</p>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="button" id="submitBtn">Log Sleep</button>
|
||||
<button type="button" class="button secondary" onclick="goBack()">
|
||||
Cancel
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// Check if user is authenticated
|
||||
const token = localStorage.getItem("access_token");
|
||||
if (!token) {
|
||||
window.location.href = "/login.html";
|
||||
}
|
||||
|
||||
const form = document.getElementById("logSleepForm");
|
||||
const messageDiv = document.getElementById("message");
|
||||
const submitBtn = document.getElementById("submitBtn");
|
||||
const loadingDiv = document.getElementById("loadingChildren");
|
||||
const childSelect = document.getElementById("childId");
|
||||
|
||||
// Check if we're editing an existing sleep session
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
const sleepId = urlParams.get("id");
|
||||
const isEditMode = !!sleepId;
|
||||
|
||||
// Set default start time to now (only for new sleep sessions)
|
||||
if (!isEditMode) {
|
||||
const now = new Date();
|
||||
const localDateTime = new Date(
|
||||
now.getTime() - now.getTimezoneOffset() * 60000,
|
||||
)
|
||||
.toISOString()
|
||||
.slice(0, 16);
|
||||
document.getElementById("startTime").value = localDateTime;
|
||||
}
|
||||
|
||||
// Update title and button text if editing
|
||||
if (isEditMode) {
|
||||
document.querySelector("h1").textContent = "😴 Edit Sleep";
|
||||
document.querySelector(".subtitle").textContent =
|
||||
"Update sleep session details";
|
||||
submitBtn.textContent = "Update Sleep";
|
||||
}
|
||||
|
||||
// Load user's children
|
||||
async function loadChildren() {
|
||||
try {
|
||||
const response = await fetch("/api/children", {
|
||||
headers: {
|
||||
Authorization: `Bearer ${token}`,
|
||||
},
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
const children = await response.json();
|
||||
|
||||
if (children.length === 0) {
|
||||
showMessage(
|
||||
"No children found. Please add a child first.",
|
||||
"error",
|
||||
);
|
||||
setTimeout(() => {
|
||||
window.location.href = "/add-child.html";
|
||||
}, 2000);
|
||||
return;
|
||||
}
|
||||
|
||||
// Populate select dropdown
|
||||
children.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
childSelect.appendChild(option);
|
||||
});
|
||||
|
||||
// Show form, hide loading
|
||||
loadingDiv.style.display = "none";
|
||||
form.style.display = "block";
|
||||
|
||||
// If editing, load the sleep data
|
||||
if (isEditMode) {
|
||||
loadSleepData();
|
||||
}
|
||||
} else {
|
||||
showMessage("Failed to load children", "error");
|
||||
}
|
||||
} catch (error) {
|
||||
showMessage("Network error loading children", "error");
|
||||
}
|
||||
}
|
||||
|
||||
async function loadSleepData() {
|
||||
try {
|
||||
const response = await fetch(`/api/sleep/${sleepId}`, {
|
||||
headers: {
|
||||
Authorization: `Bearer ${token}`,
|
||||
},
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
const sleep = await response.json();
|
||||
|
||||
// Populate form with existing data
|
||||
document.getElementById("childId").value = sleep.child_id;
|
||||
|
||||
// Format datetime for datetime-local input
|
||||
const startTime = new Date(sleep.start_time);
|
||||
const startLocalDateTime = new Date(
|
||||
startTime.getTime() - startTime.getTimezoneOffset() * 60000,
|
||||
)
|
||||
.toISOString()
|
||||
.slice(0, 16);
|
||||
document.getElementById("startTime").value = startLocalDateTime;
|
||||
|
||||
if (sleep.end_time) {
|
||||
const endTime = new Date(sleep.end_time);
|
||||
const endLocalDateTime = new Date(
|
||||
endTime.getTime() - endTime.getTimezoneOffset() * 60000,
|
||||
)
|
||||
.toISOString()
|
||||
.slice(0, 16);
|
||||
document.getElementById("endTime").value = endLocalDateTime;
|
||||
}
|
||||
} else {
|
||||
showMessage("Failed to load sleep data", "error");
|
||||
}
|
||||
} catch (error) {
|
||||
showMessage("Network error loading sleep", "error");
|
||||
}
|
||||
}
|
||||
|
||||
loadChildren();
|
||||
|
||||
form.addEventListener("submit", async (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
const childId = parseInt(document.getElementById("childId").value);
|
||||
const startTime = document.getElementById("startTime").value;
|
||||
const endTimeValue = document.getElementById("endTime").value;
|
||||
|
||||
// Disable button during request
|
||||
submitBtn.disabled = true;
|
||||
submitBtn.textContent = isEditMode ? "Updating..." : "Logging...";
|
||||
messageDiv.classList.remove("show");
|
||||
|
||||
try {
|
||||
const url = isEditMode ? `/api/sleep/${sleepId}` : "/api/sleep";
|
||||
const method = isEditMode ? "PUT" : "POST";
|
||||
|
||||
const response = await fetch(url, {
|
||||
method: method,
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
Authorization: `Bearer ${token}`,
|
||||
},
|
||||
body: JSON.stringify({
|
||||
child_id: childId,
|
||||
start_time: startTime,
|
||||
end_time: endTimeValue || null,
|
||||
}),
|
||||
});
|
||||
|
||||
const data = await response.json();
|
||||
|
||||
if (response.ok) {
|
||||
showMessage(
|
||||
isEditMode
|
||||
? "Sleep updated successfully!"
|
||||
: "Sleep logged successfully!",
|
||||
"success",
|
||||
);
|
||||
// Redirect to sleep page after 1 second
|
||||
setTimeout(() => {
|
||||
window.location.href = "/sleep.html";
|
||||
}, 1000);
|
||||
} else {
|
||||
showMessage(
|
||||
data.detail ||
|
||||
`Failed to ${isEditMode ? "update" : "log"} sleep. Please try again.`,
|
||||
"error",
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
showMessage("Network error. Please try again.", "error");
|
||||
} finally {
|
||||
submitBtn.disabled = false;
|
||||
submitBtn.textContent = isEditMode ? "Update Sleep" : "Log Sleep";
|
||||
}
|
||||
});
|
||||
|
||||
function showMessage(text, type) {
|
||||
messageDiv.textContent = text;
|
||||
messageDiv.className = `message ${type} show`;
|
||||
}
|
||||
|
||||
function goBack() {
|
||||
window.location.href = "/";
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -517,7 +517,10 @@
|
||||
</div>
|
||||
|
||||
<div class="list-container">
|
||||
<h2>Recent Sleep Sessions</h2>
|
||||
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px;">
|
||||
<h2 style="margin: 0;">Recent Sleep Sessions</h2>
|
||||
<button class="button" onclick="addManualSleep()" style="padding: 8px 16px; font-size: 14px;">➕ Add Manual Entry</button>
|
||||
</div>
|
||||
<div class="sleep-list">
|
||||
${filteredSleeps
|
||||
.slice(0, 50)
|
||||
@@ -1058,6 +1061,10 @@
|
||||
`;
|
||||
}
|
||||
|
||||
function addManualSleep() {
|
||||
window.location.href = `/log-sleep.html`;
|
||||
}
|
||||
|
||||
async function logout() {
|
||||
try {
|
||||
await fetch("/api/logout", {
|
||||
|
||||
Reference in New Issue
Block a user