Skip to content

feat: improve mobile scheduler UX #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noahwilde wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: improve mobile scheduler UX #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions server/state_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,20 @@ def do_POST(self):
except (KeyError, ValueError, TypeError):
pass
self.send_error(400, "Bad Request")
elif self.path == "/schedule/delete":
try:
chip = int(data["chip"])
pin = int(data["pin"])
for s in list(SCHEDULES):
if s["chip"] == chip and s["pin"] == pin:
SCHEDULES.remove(s)
save_schedules()
self._set_json_headers()
self.wfile.write(b"{}")
return
except (KeyError, ValueError, TypeError):
pass
self.send_error(400, "Bad Request")
else:
self.send_error(404, "Not Found")

Expand Down
191 changes: 180 additions & 11 deletions server/web/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,58 @@
const API_BASE = `${window.location.protocol}//${window.location.hostname}:5000`;

function fillSelect(select, max) {
for (let i = 0; i < max; i++) {
const opt = document.createElement('option');
opt.value = i;
opt.textContent = i;
select.appendChild(opt);
const PIN_LAYOUT = [
[ [0,1], [0,0], [1,1], [1,0], [2,1], [2,0] ],
[ [0,3], [0,2], [1,3], [1,2], [2,3], [2,2] ],
[ [0,5], [0,4], [1,5], [1,4], [2,5], [2,4] ],
];

const PIN_LABELS = [
'1','2','3','4','5','6',
'7','8','9','10','11','12',
'13','14','15','16','17','18'
];

const scheduleMap = {};

function initTheme() {
const stored = localStorage.getItem('theme');
const preferDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
const useDark = stored ? stored === 'dark' : preferDark;
document.body.classList.toggle('dark', useDark);
}

function buildGrid() {
const grid = document.getElementById('pin-grid');
PIN_LAYOUT.flat().forEach(([chip, pin], idx) => {
const btn = document.createElement('button');
btn.type = 'button';
btn.textContent = PIN_LABELS[idx];
btn.dataset.chip = chip;
btn.dataset.pin = pin;
btn.addEventListener('click', () => handlePinClick(chip, pin));
grid.appendChild(btn);
});
}

function selectPin(chip, pin) {
document.getElementById('chip').value = chip;
document.getElementById('pin').value = pin;
document.querySelectorAll('#pin-grid button').forEach(b => b.classList.remove('selected'));
const btn = document.querySelector(`#pin-grid button[data-chip="${chip}"][data-pin="${pin}"]`);
if (btn) btn.classList.add('selected');
}

function handlePinClick(chip, pin) {
selectPin(chip, pin);
const sched = scheduleMap[`${chip}-${pin}`];
if (sched) {
populateForm(sched);
} else {
document.getElementById('form').reset();
document.querySelectorAll('.repeat-presets button, .overdue-presets button').forEach(b => b.classList.remove('active'));
document.getElementById('repeat-advanced').classList.add('hidden');
selectPin(chip, pin);
document.getElementById('delete').classList.add('hidden');
}
}

Expand All @@ -14,33 +61,122 @@ async function fetchSchedules() {
const data = await res.json();
const tbody = document.querySelector('#schedule-list tbody');
tbody.innerHTML = '';
Object.keys(scheduleMap).forEach(k => delete scheduleMap[k]);
document.querySelectorAll('#pin-grid button').forEach(b => b.classList.remove('scheduled'));
const schedules = data.schedules.slice().reverse();
schedules.forEach(s => {
scheduleMap[`${s.chip}-${s.pin}`] = s;
const tr = document.createElement('tr');
const due = new Date(s.due).toLocaleString();
tr.innerHTML = `<td>${s.name}</td><td>${s.chip}</td><td>${s.pin}</td>` +
tr.innerHTML = `<td>${s.name}</td><td>${labelFor(s.chip, s.pin)}</td>` +
`<td>${due}</td>` +
`<td>${formatInterval(s.repeat)}</td><td>${formatInterval(s.overdue)}</td>`;
tr.addEventListener('click', () => populateForm(s));
tbody.appendChild(tr);
const btn = document.querySelector(`#pin-grid button[data-chip="${s.chip}"][data-pin="${s.pin}"]`);
if (btn) btn.classList.add('scheduled');
});
}

function labelFor(chip, pin) {
const idx = PIN_LAYOUT.flat().findIndex(([c,p]) => c === chip && p === pin);
return PIN_LABELS[idx] || `${chip}/${pin}`;
}

function formatInterval(obj) {
return Object.entries(obj || {}).map(([k, v]) => `${v} ${k}`).join(' ');
}

function populateForm(s) {
document.getElementById('chip').value = s.chip;
document.getElementById('pin').value = s.pin;
selectPin(s.chip, s.pin);
document.getElementById('name').value = s.name || '';
const dueDate = new Date(s.due);
dueDate.setMinutes(dueDate.getMinutes() - dueDate.getTimezoneOffset());
document.getElementById('due').value = dueDate.toISOString().slice(0,16);
const adv = document.getElementById('repeat-advanced');
adv.classList.add('hidden');
document.getElementById('repeat-days').value = s.repeat?.days || '';
document.getElementById('repeat-hours').value = s.repeat?.hours || '';
document.querySelectorAll('.repeat-presets button').forEach(b => b.classList.remove('active'));
if (s.repeat) {
if ((s.repeat.days === 1 || s.repeat.days === 7) && !s.repeat.hours) {
const type = s.repeat.days === 1 ? 'daily' : 'weekly';
const btn = document.querySelector(`.repeat-presets button[data-repeat="${type}"]`);
if (btn) btn.classList.add('active');
} else {
adv.classList.remove('hidden');
}
}
document.getElementById('overdue-days').value = s.overdue?.days || '';
document.getElementById('overdue-hours').value = s.overdue?.hours || '';
document.querySelectorAll('.overdue-presets button').forEach(b => b.classList.remove('active'));
if (s.overdue) {
if (s.overdue.days === 1 && !s.overdue.hours) {
const btn = document.querySelector('.overdue-presets button[data-overdue="1d"]');
if (btn) btn.classList.add('active');
} else if (s.overdue.days === 3 && !s.overdue.hours) {
const btn = document.querySelector('.overdue-presets button[data-overdue="3d"]');
if (btn) btn.classList.add('active');
}
}
document.getElementById('delete').classList.remove('hidden');
}

function applyDuePreset(type) {
const input = document.getElementById('due');
const now = new Date();
let target = new Date(now);
switch(type) {
case 'morning':
target.setHours(8,0,0,0);
if (target <= now) target.setDate(target.getDate()+1);
break;
case 'evening':
target.setHours(18,0,0,0);
if (target <= now) target.setDate(target.getDate()+1);
break;
case 'plus1d':
target = new Date(now.getTime() + 24*60*60*1000);
break;
case 'plus3d':
target = new Date(now.getTime() + 3*24*60*60*1000);
break;
case 'nextweek':
target = new Date(now.getTime() + 7*24*60*60*1000);
break;
default:
return;
}
target.setMinutes(target.getMinutes() - target.getTimezoneOffset());
input.value = target.toISOString().slice(0,16);
}

function toggleRepeatPreset(btn) {
const type = btn.dataset.repeat;
const active = btn.classList.contains('active');
document.querySelectorAll('.repeat-presets button[data-repeat]').forEach(b => b.classList.remove('active'));
const adv = document.getElementById('repeat-advanced');
adv.classList.add('hidden');
document.getElementById('repeat-days').value = '';
document.getElementById('repeat-hours').value = '';
if (!active) {
btn.classList.add('active');
if (type === 'daily') document.getElementById('repeat-days').value = 1;
if (type === 'weekly') document.getElementById('repeat-days').value = 7;
}
}

function toggleOverduePreset(btn) {
const type = btn.dataset.overdue;
const active = btn.classList.contains('active');
document.querySelectorAll('.overdue-presets button').forEach(b => b.classList.remove('active'));
document.getElementById('overdue-days').value = '';
document.getElementById('overdue-hours').value = '';
if (!active) {
btn.classList.add('active');
if (type === '1d') document.getElementById('overdue-days').value = 1;
if (type === '3d') document.getElementById('overdue-days').value = 3;
}
}

async function submitForm(e) {
Expand Down Expand Up @@ -69,10 +205,43 @@ async function submitForm(e) {
body: JSON.stringify(payload)
});
e.target.reset();
document.querySelectorAll('.repeat-presets button, .overdue-presets button').forEach(b => b.classList.remove('active'));
document.getElementById('repeat-advanced').classList.add('hidden');
fetchSchedules();
}

async function deleteSchedule() {
const chip = parseInt(document.getElementById('chip').value, 10);
const pin = parseInt(document.getElementById('pin').value, 10);
await fetch(`${API_BASE}/schedule/delete`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ chip, pin })
});
document.getElementById('form').reset();
document.querySelectorAll('.repeat-presets button, .overdue-presets button').forEach(b => b.classList.remove('active'));
document.getElementById('repeat-advanced').classList.add('hidden');
fetchSchedules();
}

fillSelect(document.getElementById('chip'), 3);
fillSelect(document.getElementById('pin'), 6);
initTheme();
buildGrid();
fetchSchedules();
document.getElementById('form').addEventListener('submit', submitForm);
document.getElementById('delete').addEventListener('click', deleteSchedule);
document.getElementById('show-advanced').addEventListener('click', () => {
document.getElementById('repeat-advanced').classList.remove('hidden');
});
document.getElementById('theme-toggle').addEventListener('click', () => {
document.body.classList.toggle('dark');
localStorage.setItem('theme', document.body.classList.contains('dark') ? 'dark' : 'light');
});
document.querySelectorAll('.quick-due button').forEach(btn => {
btn.addEventListener('click', () => applyDuePreset(btn.dataset.due));
});
document.querySelectorAll('.repeat-presets button[data-repeat]').forEach(btn => {
btn.addEventListener('click', () => toggleRepeatPreset(btn));
});
document.querySelectorAll('.overdue-presets button').forEach(btn => {
btn.addEventListener('click', () => toggleOverduePreset(btn));
});
32 changes: 25 additions & 7 deletions server/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Chore Schedules</title>
<link rel="stylesheet" href="style.css" />
</head>
<body>
<div class="container">
<button id="theme-toggle" type="button" class="theme-toggle">🌓</button>
<h1>Chore Schedules</h1>
<section id="schedule-list">
<table>
<thead>
<tr><th>Name</th><th>Chip</th><th>Pin</th><th>Due</th><th>Repeat</th><th>Overdue</th></tr>
<tr><th>Name</th><th>Slot</th><th>Due</th><th>Repeat</th><th>Overdue</th></tr>
</thead>
<tbody></tbody>
</table>
Expand All @@ -22,26 +24,41 @@ <h2>Create / Update Schedule</h2>
<label>Name
<input type="text" id="name" />
</label>
<label>Chip
<select id="chip"></select>
</label>
<label>Pin
<select id="pin"></select>
</label>
<div id="pin-grid" class="pin-grid"></div>
<input type="hidden" id="chip" />
<input type="hidden" id="pin" />
<label>Due
<input type="datetime-local" id="due" required />
</label>
<div class="quick-due">
<button type="button" data-due="morning">Morning</button>
<button type="button" data-due="evening">Evening</button>
<button type="button" data-due="plus1d">+1 day</button>
<button type="button" data-due="plus3d">+3 days</button>
<button type="button" data-due="nextweek">Next week</button>
</div>
<fieldset>
<legend>Repeat (optional)</legend>
<div class="repeat-presets">
<button type="button" data-repeat="daily">Every day</button>
<button type="button" data-repeat="weekly">Every week</button>
<button type="button" id="show-advanced">Advanced</button>
</div>
<div id="repeat-advanced" class="hidden">
<label>Days
<input type="number" id="repeat-days" min="0" />
</label>
<label>Hours
<input type="number" id="repeat-hours" min="0" />
</label>
</div>
</fieldset>
<fieldset>
<legend>Overdue after (optional)</legend>
<div class="overdue-presets">
<button type="button" data-overdue="1d">1 day</button>
<button type="button" data-overdue="3d">3 days</button>
</div>
<label>Days
<input type="number" id="overdue-days" min="0" />
</label>
Expand All @@ -50,6 +67,7 @@ <h2>Create / Update Schedule</h2>
</label>
</fieldset>
<button type="submit">Save</button>
<button type="button" id="delete" class="danger hidden">Delete</button>
</form>
</section>
</div>
Expand Down
Loading