Patedam/Calendink
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separating users from tasks + fixing weird ota bug

Browse Source
This commit is contained in:
Patedam
2026-03-07 23:41:26 -05:00
parent 3fa879d007
commit ac95358561
14 changed files with 657 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Provider/frontend/src/App.svelte
View File

@@ -3,6 +3,7 @@
import OTAUpdate from "./lib/OTAUpdate.svelte"; import OTAUpdate from "./lib/OTAUpdate.svelte";
import Sidebar from "./lib/Sidebar.svelte"; import Sidebar from "./lib/Sidebar.svelte";
import TaskManager from "./lib/TaskManager.svelte"; import TaskManager from "./lib/TaskManager.svelte";
import UserManager from "./lib/UserManager.svelte";
/** @type {'loading' | 'ok' | 'error' | 'rebooting'} */ /** @type {'loading' | 'ok' | 'error' | 'rebooting'} */
let status = $state("loading"); let status = $state("loading");
@@ -10,7 +11,7 @@
let showRebootConfirm = $state(false); let showRebootConfirm = $state(false);
let isRecovering = $state(false); let isRecovering = $state(false);
/** @type {'dashboard' | 'tasks'} */ /** @type {'dashboard' | 'tasks' | 'users'} */
let currentView = $state("dashboard"); let currentView = $state("dashboard");
let systemInfo = $state({ let systemInfo = $state({
@@ -144,7 +145,7 @@
<div class="w-full max-w-6xl mx-auto space-y-8"> <div class="w-full max-w-6xl mx-auto space-y-8">
<!-- Header --> <!-- Header -->
<div class="text-center"> <div class="text-center">
<h1 class="text-2xl font-bold text-accent">Calendink Provider 🚀👑🥸</h1> <h1 class="text-2xl font-bold text-accent">Calendink Provider 📅📅🚀🚀</h1>
<p class="text-text-secondary text-sm">ESP32-S3 System Dashboard v{__APP_VERSION__}</p> <p class="text-text-secondary text-sm">ESP32-S3 System Dashboard v{__APP_VERSION__}</p>
<!-- Status Badge --> <!-- Status Badge -->
@@ -323,6 +324,11 @@
<div class="bg-bg-card border border-border rounded-xl p-6 shadow-xl"> <div class="bg-bg-card border border-border rounded-xl p-6 shadow-xl">
<TaskManager /> <TaskManager />
</div> </div>
{:else if currentView === 'users'}
<!-- User Management View -->
<div class="bg-bg-card border border-border rounded-xl p-8 shadow-xl">
<UserManager mode="manager" />
</div>
{/if} {/if}
<!-- Reboot Confirmation Modal --> <!-- Reboot Confirmation Modal -->

1
Provider/frontend/src/lib/Sidebar.svelte
View File

@@ -5,6 +5,7 @@
const navItems = [ const navItems = [
{ id: 'dashboard', label: 'Dashboard', icon: '🏠' }, { id: 'dashboard', label: 'Dashboard', icon: '🏠' },
{ id: 'tasks', label: 'Tasks', icon: '📋' }, { id: 'tasks', label: 'Tasks', icon: '📋' },
{ id: 'users', label: 'Users', icon: '👥' },
]; ];
</script> </script>

706
Provider/frontend/src/lib/UserManager.svelte
View File

@@ -1,274 +1,436 @@
<script> <script>
import { getUsers, addUser, removeUser } from './api.js'; import { getUsers, addUser, removeUser, updateUser } from './api.js';
let {
selectedUserId = $bindable(null),
onUsersChanged = () => {},
mode = 'selector' // 'selector' | 'manager'
} = $props();
let users = $state([]);
let newUserName = $state('');
let showAddForm = $state(false);
let error = $state('');
let confirmDeleteId = $state(null);
// Edit state
let editingUserId = $state(null);
let editName = $state('');
async function fetchUsers() {
try {
users = await getUsers();
if (users.length > 0 && !selectedUserId && mode === 'selector') {
selectedUserId = users[0].id;
}
// If selected user was deleted, select first available
if (selectedUserId && !users.find(u => u.id === selectedUserId)) {
selectedUserId = users.length > 0 ? users[0].id : null;
}
error = '';
} catch (e) {
error = e.message;
}
}
async function handleAddUser() {
if (!newUserName.trim()) return;
try {
const user = await addUser(newUserName.trim());
newUserName = '';
showAddForm = false;
await fetchUsers();
if (mode === 'selector') selectedUserId = user.id;
onUsersChanged();
} catch (e) {
error = e.message;
}
}
async function handleRemoveUser(id) {
try {
await removeUser(id);
confirmDeleteId = null;
await fetchUsers();
onUsersChanged();
} catch (e) {
error = e.message;
}
}
function startEditing(user) {
editingUserId = user.id;
editName = user.name;
}
async function handleUpdateUser() {
if (!editName.trim()) return;
try {
await updateUser(editingUserId, editName.trim());
editingUserId = null;
await fetchUsers();
onUsersChanged();
} catch (e) {
error = e.message;
}
}
$effect(() => {
fetchUsers();
});
</script>
<div class="user-manager mode-{mode}">
{#if mode === 'selector'}
<div class="user-bar">
<div class="user-chips">
{#each users as user}
<!-- svelte-ignore node_invalid_placement_ssr -->
<div
class="user-chip {selectedUserId === user.id ? 'selected' : ''}"
onclick={() => selectedUserId = user.id}
role="button"
tabindex="0"
onkeydown={(e) => { if (e.key === 'Enter') selectedUserId = user.id; }}
>
<span class="user-name">{user.name}</span>
</div>
{/each}
</div>
</div>
{:else}
<!-- Manager Mode -->
<header class="manager-header">
<h1 class="text-xl font-bold text-text-primary">User Management</h1>
<button class="add-user-btn-large" onclick={() => showAddForm = true}>
+ New User
</button>
</header>
{#if showAddForm}
<div class="modal-overlay">
<form class="add-user-modal" onsubmit={(e) => { e.preventDefault(); handleAddUser(); }}>
<h3 class="text-lg font-semibold">Add User</h3>
<!-- svelte-ignore a11y_autofocus -->
<input
type="text"
bind:value={newUserName}
placeholder="Name..."
class="modal-input"
autofocus
/>
<div class="modal-actions">
<button type="button" class="btn-secondary" onclick={() => { showAddForm = false; newUserName = ''; }}>Cancel</button>
<button type="submit" class="btn-primary" disabled={!newUserName.trim()}>Add User</button>
</div>
</form>
</div>
{/if}
<div class="user-list">
{#each users as user}
<div class="user-item">
{#if editingUserId === user.id}
<form class="edit-row" onsubmit={(e) => { e.preventDefault(); handleUpdateUser(); }}>
<!-- svelte-ignore a11y_autofocus -->
<input type="text" bind:value={editName} class="edit-input" autofocus />
<div class="edit-actions">
<button type="submit" class="save-btn" title="Save">✓</button>
<button type="button" class="cancel-btn" onclick={() => editingUserId = null} title="Cancel">✕</button>
</div>
</form>
{:else}
<div class="user-info">
<span class="user-name-large">{user.name}</span>
<span class="user-id">ID: {user.id}</span>
</div>
<div class="user-actions">
<button class="action-btn" onclick={() => startEditing(user)} title="Rename">✏️</button>
{#if confirmDeleteId === user.id}
<button class="action-btn danger" onclick={() => handleRemoveUser(user.id)}>Delete!</button>
<button class="action-btn" onclick={() => confirmDeleteId = null}>Cancel</button>
{:else}
<button class="action-btn" onclick={() => confirmDeleteId = user.id} title="Delete">🗑️</button>
{/if}
</div>
{/if}
</div>
{:else}
<div class="empty-state">No users found. Create one to get started!</div>
{/each}
</div>
{/if}
{#if error}
<div class="user-error">{error}</div>
{/if}
</div>
let { selectedUserId = $bindable(null), onUsersChanged = () => {} } = $props(); <style>
.user-manager {
let users = $state([]); margin-bottom: 16px;
let newUserName = $state(''); }
let showAddForm = $state(false);
let error = $state(''); /* Selector Mode Styles */
let confirmDeleteId = $state(null); .user-bar {
display: flex;
async function fetchUsers() { align-items: center;
try { gap: 8px;
users = await getUsers(); }
if (users.length > 0 && !selectedUserId) {
selectedUserId = users[0].id; .user-chips {
} display: flex;
// If selected user was deleted, select first available flex-wrap: wrap;
if (selectedUserId && !users.find(u => u.id === selectedUserId)) { gap: 6px;
selectedUserId = users.length > 0 ? users[0].id : null; align-items: center;
} }
error = '';
} catch (e) { .user-chip {
error = e.message; display: flex;
} align-items: center;
} gap: 6px;
padding: 6px 16px;
async function handleAddUser() { border-radius: 20px;
if (!newUserName.trim()) return; border: 1px solid var(--color-border);
try { background: var(--color-bg-card);
const user = await addUser(newUserName.trim()); color: var(--color-text-secondary);
newUserName = ''; cursor: pointer;
showAddForm = false; font-size: 13px;
await fetchUsers(); font-weight: 600;
selectedUserId = user.id; transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
onUsersChanged(); }
} catch (e) {
error = e.message; .user-chip:hover {
} border-color: var(--color-accent);
} color: var(--color-text-primary);
transform: translateY(-1px);
async function handleRemoveUser(id) { box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
try { }
await removeUser(id);
confirmDeleteId = null; .user-chip.selected {
await fetchUsers(); background: color-mix(in srgb, var(--color-accent) 20%, transparent);
onUsersChanged(); border-color: var(--color-accent);
} catch (e) { color: var(--color-accent);
error = e.message; box-shadow: 0 0 0 1px var(--color-accent);
} }
}
/* Manager Mode Styles */
$effect(() => { .manager-header {
fetchUsers(); display: flex;
}); justify-content: space-between;
</script> align-items: center;
margin-bottom: 24px;
<div class="user-manager"> }
<div class="user-bar">
<div class="user-chips"> .add-user-btn-large {
{#each users as user} padding: 10px 20px;
<!-- svelte-ignore node_invalid_placement_ssr --> border-radius: 12px;
<div background: var(--color-accent);
class="user-chip {selectedUserId === user.id ? 'selected' : ''}" color: white;
onclick={() => selectedUserId = user.id} border: none;
role="button" font-weight: 600;
tabindex="0" cursor: pointer;
onkeydown={(e) => { if (e.key === 'Enter') selectedUserId = user.id; }} transition: all 0.2s;
> box-shadow: 0 4px 14px color-mix(in srgb, var(--color-accent) 40%, transparent);
<span class="user-name">{user.name}</span> }
{#if confirmDeleteId === user.id}
<span class="confirm-delete"> .add-user-btn-large:hover {
<button class="confirm-yes" onclick={(e) => { e.stopPropagation(); handleRemoveUser(user.id); }} title="Confirm delete">✓</button> filter: brightness(1.1);
<button class="confirm-no" onclick={(e) => { e.stopPropagation(); confirmDeleteId = null; }} title="Cancel">✕</button> transform: translateY(-1px);
</span> }
{:else}
<button .user-list {
class="remove-btn" display: grid;
onclick={(e) => { e.stopPropagation(); confirmDeleteId = user.id; }} gap: 12px;
title="Remove user" }
>✕</button>
{/if} .user-item {
</div> display: flex;
{/each} justify-content: space-between;
align-items: center;
{#if showAddForm} padding: 16px 20px;
<form class="add-user-form" onsubmit={(e) => { e.preventDefault(); handleAddUser(); }}> border-radius: 16px;
<!-- svelte-ignore a11y_autofocus --> background: var(--color-bg-card);
<input border: 1px solid var(--color-border);
type="text" transition: all 0.2s;
bind:value={newUserName} }
placeholder="Name..."
class="add-user-input" .user-item:hover {
autofocus border-color: var(--color-accent);
/> background: var(--color-bg-card-hover);
<button type="submit" class="add-user-submit" disabled={!newUserName.trim()}>+</button> }
<button type="button" class="add-user-cancel" onclick={() => { showAddForm = false; newUserName = ''; }}>✕</button>
</form> .user-info {
{:else} display: flex;
<button class="add-user-btn" onclick={() => showAddForm = true}> flex-direction: column;
+ User gap: 4px;
</button> }
{/if}
</div> .user-name-large {
</div> font-size: 16px;
font-weight: 600;
{#if error} color: var(--color-text-primary);
<div class="user-error">{error}</div> }
{/if}
</div> .user-id {
font-size: 11px;
<style> color: var(--color-text-secondary);
.user-manager { font-family: var(--font-mono);
margin-bottom: 16px; text-transform: uppercase;
} letter-spacing: 0.05em;
}
.user-bar {
display: flex; .user-actions {
align-items: center; display: flex;
gap: 8px; gap: 8px;
} }
.user-chips { .action-btn {
display: flex; background: var(--color-bg-primary);
flex-wrap: wrap; border: 1px solid var(--color-border);
gap: 6px; color: var(--color-text-secondary);
align-items: center; padding: 8px;
} border-radius: 8px;
cursor: pointer;
.user-chip { font-size: 14px;
display: flex; transition: all 0.2s;
align-items: center; }
gap: 6px;
padding: 6px 12px; .action-btn:hover {
border-radius: 20px; border-color: var(--color-accent);
border: 1px solid var(--color-border); color: var(--color-accent);
background: var(--color-bg-card); background: var(--color-bg-card);
color: var(--color-text-secondary); }
cursor: pointer;
font-size: 12px; .action-btn.danger:hover {
font-weight: 500; border-color: var(--color-danger);
transition: all 0.15s; color: var(--color-danger);
} background: color-mix(in srgb, var(--color-danger) 10%, transparent);
}
.user-chip:hover {
border-color: var(--color-accent); /* Modal Styles */
color: var(--color-text-primary); .modal-overlay {
} position: fixed;
inset: 0;
.user-chip.selected { background: rgba(0, 0, 0, 0.7);
background: color-mix(in srgb, var(--color-accent) 15%, transparent); backdrop-filter: blur(4px);
border-color: var(--color-accent); display: flex;
color: var(--color-accent); align-items: center;
} justify-content: center;
z-index: 100;
.user-name { }
white-space: nowrap;
} .add-user-modal {
background: var(--color-bg-card);
.remove-btn { padding: 24px;
background: none; border-radius: 20px;
border: none; border: 1px solid var(--color-border);
color: var(--color-text-secondary); width: 100%;
cursor: pointer; max-width: 400px;
font-size: 10px; display: flex;
padding: 0 2px; flex-direction: column;
opacity: 0.5; gap: 20px;
transition: opacity 0.15s, color 0.15s; box-shadow: 0 20px 40px rgba(0, 0, 0, 0.4);
line-height: 1; }
}
.modal-input {
.remove-btn:hover { padding: 12px 16px;
opacity: 1; border-radius: 12px;
color: var(--color-danger); border: 1px solid var(--color-border);
} background: var(--color-bg-primary);
color: var(--color-text-primary);
.confirm-delete { font-size: 14px;
display: flex; }
gap: 4px;
} .modal-actions {
display: flex;
.confirm-yes, .confirm-no { gap: 12px;
background: none; justify-content: flex-end;
border: none; }
cursor: pointer;
font-size: 11px; /* Edit Inline Row */
padding: 0 2px; .edit-row {
line-height: 1; display: flex;
} gap: 12px;
width: 100%;
.confirm-yes { }
color: var(--color-danger);
} .edit-input {
flex: 1;
.confirm-no { padding: 8px 12px;
color: var(--color-text-secondary); border-radius: 8px;
} border: 1px solid var(--color-accent);
background: var(--color-bg-primary);
.add-user-btn { color: var(--color-text-primary);
padding: 6px 12px; outline: none;
border-radius: 20px; }
border: 1px dashed var(--color-border);
background: transparent; .edit-actions {
color: var(--color-text-secondary); display: flex;
cursor: pointer; gap: 6px;
font-size: 12px; }
font-weight: 500;
transition: all 0.15s; .save-btn, .cancel-btn {
} padding: 4px 12px;
border-radius: 6px;
.add-user-btn:hover { border: 1px solid var(--color-border);
border-color: var(--color-accent); cursor: pointer;
color: var(--color-accent); transition: all 0.2s;
} }
.add-user-form { .save-btn {
display: flex; background: var(--color-success);
align-items: center; color: white;
gap: 4px; border-color: var(--color-success);
} }
.add-user-input { .cancel-btn {
padding: 5px 10px; background: var(--color-bg-primary);
border-radius: 16px; color: var(--color-text-secondary);
border: 1px solid var(--color-border); }
background: var(--color-bg-primary);
color: var(--color-text-primary); /* Common UI items */
font-size: 12px; .btn-primary {
width: 100px; padding: 8px 16px;
outline: none; border-radius: 8px;
} background: var(--color-accent);
color: white;
.add-user-input:focus { border: none;
border-color: var(--color-accent); font-weight: 600;
} cursor: pointer;
}
.add-user-submit {
background: var(--color-accent); .btn-secondary {
color: white; padding: 8px 16px;
border: none; border-radius: 8px;
border-radius: 50%; background: var(--color-bg-primary);
width: 24px; color: var(--color-text-secondary);
height: 24px; border: 1px solid var(--color-border);
font-size: 14px; cursor: pointer;
cursor: pointer; }
display: flex;
align-items: center; .btn-primary:disabled {
justify-content: center; opacity: 0.5;
line-height: 1; cursor: not-allowed;
} }
.add-user-submit:disabled { .user-error {
opacity: 0.4; margin-top: 16px;
cursor: not-allowed; padding: 12px;
} border-radius: 12px;
background: color-mix(in srgb, var(--color-danger) 10%, transparent);
.add-user-cancel { border: 1px solid color-mix(in srgb, var(--color-danger) 20%, transparent);
background: none; color: var(--color-danger);
border: none; font-size: 13px;
color: var(--color-text-secondary); text-align: center;
cursor: pointer; }
font-size: 12px;
} .empty-state {
text-align: center;
.user-error { padding: 48px;
margin-top: 8px; background: var(--color-bg-card);
padding: 6px 10px; border: 1px dashed var(--color-border);
border-radius: 6px; border-radius: 16px;
background: color-mix(in srgb, var(--color-danger) 10%, transparent); color: var(--color-text-secondary);
border: 1px solid color-mix(in srgb, var(--color-danger) 20%, transparent); }
color: var(--color-danger); </style>
font-size: 11px;
}
</style>

19
Provider/frontend/src/lib/api.js
View File

@@ -163,6 +163,25 @@ export async function removeUser(id) {
return res.json(); return res.json();
} }
/**
* Update a user's name.
* @param {number} id
* @param {string} name
* @returns {Promise<{status: string}>}
*/
export async function updateUser(id, name) {
const res = await fetch(`${API_BASE}/api/users/update`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ id, name })
});
if (!res.ok) {
const errorText = await res.text();
throw new Error(`Failed (${res.status}): ${errorText || res.statusText}`);
}
return res.json();
}
// ─── Task Management ───────────────────────────────────────────────────────── // ─── Task Management ─────────────────────────────────────────────────────────
/** /**

2
Provider/frontend/version.json
View File

@@ -1,5 +1,5 @@
{ {
"major": 0, "major": 0,
"minor": 1, "minor": 1,
"revision": 4 "revision": 13
} }

12
Provider/main/api/tasks/store.cpp
View File

@@ -6,7 +6,7 @@
#include "api/users/store.hpp" #include "api/users/store.hpp"
// Find a task by ID, returns nullptr if not found // Find a task by ID, returns nullptr if not found
internal task_t *find_task(uint16 id) task_t *find_task(uint16 id)
{ {
for (int i = 0; i < MAX_TASKS; i++) for (int i = 0; i < MAX_TASKS; i++)
{ {
@@ -19,7 +19,7 @@ internal task_t *find_task(uint16 id)
} }
// Add a task, returns pointer to new task or nullptr if full // Add a task, returns pointer to new task or nullptr if full
internal task_t *add_task(uint8 user_id, const char *title, int64 due_date) task_t *add_task(uint8 user_id, const char *title, int64 due_date)
{ {
// Verify user exists // Verify user exists
if (find_user(user_id) == nullptr) if (find_user(user_id) == nullptr)
@@ -44,7 +44,7 @@ internal task_t *add_task(uint8 user_id, const char *title, int64 due_date)
} }
// Remove a task by ID, returns true if found and removed // Remove a task by ID, returns true if found and removed
internal bool remove_task(uint16 id) bool remove_task(uint16 id)
{ {
for (int i = 0; i < MAX_TASKS; i++) for (int i = 0; i < MAX_TASKS; i++)
{ {
@@ -59,7 +59,7 @@ internal bool remove_task(uint16 id)
} }
// Remove all tasks belonging to a user // Remove all tasks belonging to a user
internal void remove_tasks_for_user(uint8 user_id) void remove_tasks_for_user(uint8 user_id)
{ {
for (int i = 0; i < MAX_TASKS; i++) for (int i = 0; i < MAX_TASKS; i++)
{ {
@@ -73,7 +73,7 @@ internal void remove_tasks_for_user(uint8 user_id)
// Simple insertion sort for small arrays — sort task pointers by due_date // Simple insertion sort for small arrays — sort task pointers by due_date
// ascending // ascending
internal void sort_tasks_by_due_date(task_t **arr, int count) void sort_tasks_by_due_date(task_t **arr, int count)
{ {
for (int i = 1; i < count; i++) for (int i = 1; i < count; i++)
{ {
@@ -90,7 +90,7 @@ internal void sort_tasks_by_due_date(task_t **arr, int count)
// Populate dummy tasks on boot for development iteration. // Populate dummy tasks on boot for development iteration.
// Uses relative offsets from current time so due dates always make sense. // Uses relative offsets from current time so due dates always make sense.
internal void seed_tasks() void seed_tasks()
{ {
int64 now = (int64)(esp_timer_get_time() / 1000000); int64 now = (int64)(esp_timer_get_time() / 1000000);

12
Provider/main/api/tasks/store.hpp
View File

@@ -4,9 +4,9 @@
#include "types.hpp" #include "types.hpp"
// Data store operations for tasks // Data store operations for tasks
internal task_t *find_task(uint16 id); task_t *find_task(uint16 id);
internal task_t *add_task(uint8 user_id, const char *title, int64 due_date); task_t *add_task(uint8 user_id, const char *title, int64 due_date);
internal bool remove_task(uint16 id); bool remove_task(uint16 id);
internal void remove_tasks_for_user(uint8 user_id); void remove_tasks_for_user(uint8 user_id);
internal void sort_tasks_by_due_date(task_t **arr, int count); void sort_tasks_by_due_date(task_t **arr, int count);
internal void seed_tasks(); void seed_tasks();

19
Provider/main/api/users/store.cpp
View File

@@ -3,7 +3,7 @@
#include "api/users/store.hpp" #include "api/users/store.hpp"
// Find a user by ID, returns nullptr if not found // Find a user by ID, returns nullptr if not found
internal user_t *find_user(uint8 id) user_t *find_user(uint8 id)
{ {
for (int i = 0; i < MAX_USERS; i++) for (int i = 0; i < MAX_USERS; i++)
{ {
@@ -16,7 +16,7 @@ internal user_t *find_user(uint8 id)
} }
// Add a user, returns pointer to new user or nullptr if full // Add a user, returns pointer to new user or nullptr if full
internal user_t *add_user(const char *name) user_t *add_user(const char *name)
{ {
for (int i = 0; i < MAX_USERS; i++) for (int i = 0; i < MAX_USERS; i++)
{ {
@@ -32,7 +32,7 @@ internal user_t *add_user(const char *name)
} }
// Remove a user by ID, returns true if found and removed // Remove a user by ID, returns true if found and removed
internal bool remove_user(uint8 id) bool remove_user(uint8 id)
{ {
for (int i = 0; i < MAX_USERS; i++) for (int i = 0; i < MAX_USERS; i++)
{ {
@@ -47,8 +47,19 @@ internal bool remove_user(uint8 id)
return false; return false;
} }
// Update a user's name, returns pointer to user or nullptr if not found
user_t *update_user(uint8 id, const char *name)
{
user_t *user = find_user(id);
if (user)
{
strlcpy(user->name, name, sizeof(user->name));
}
return user;
}
// Populate dummy users on boot for development iteration // Populate dummy users on boot for development iteration
internal void seed_users() void seed_users()
{ {
add_user("Alice"); add_user("Alice");
add_user("Bob"); add_user("Bob");

10
Provider/main/api/users/store.hpp
View File

@@ -3,9 +3,9 @@
#include "types.hpp" #include "types.hpp"
#include "user.hpp" #include "user.hpp"
// Data store operations for users // Data store operations for users
internal user_t *find_user(uint8 id); user_t *find_user(uint8 id);
internal user_t *add_user(const char *name); user_t *add_user(const char *name);
internal bool remove_user(uint8 id); bool remove_user(uint8 id);
internal void seed_users(); user_t *update_user(uint8 id, const char *name);
void seed_users();

1
Provider/main/api/users/unity.cpp
View File

@@ -3,4 +3,5 @@
#include "api/users/list.cpp" #include "api/users/list.cpp"
#include "api/users/add.cpp" #include "api/users/add.cpp"
#include "api/users/remove.cpp" #include "api/users/remove.cpp"
#include "api/users/update.cpp"
// clang-format on // clang-format on

68
Provider/main/api/users/update.cpp Normal file
View File

@@ -0,0 +1,68 @@
// POST /api/users/update — Update an existing user's name
// Body: {"id": 1, "name": "Bob"}
#include "cJSON.h"
#include "esp_http_server.h"
#include "api/users/store.hpp"
#include "types.hpp"
#include "user.hpp"
internal esp_err_t api_users_update_handler(httpd_req_t *req)
{
httpd_resp_set_type(req, "application/json");
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
char buf[128];
int received = httpd_req_recv(req, buf, sizeof(buf) - 1);
if (received <= 0)
{
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "Empty body");
return ESP_FAIL;
}
buf[received] = '\0';
cJSON *body = cJSON_Parse(buf);
if (!body)
{
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "Invalid JSON");
return ESP_FAIL;
}
cJSON *id_item = cJSON_GetObjectItem(body, "id");
cJSON *name_item = cJSON_GetObjectItem(body, "name");
if (!cJSON_IsNumber(id_item) || !cJSON_IsString(name_item) ||
strlen(name_item->valuestring) == 0)
{
cJSON_Delete(body);
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "Missing 'id' or 'name'");
return ESP_FAIL;
}
user_t *user = update_user((uint8)id_item->valueint, name_item->valuestring);
cJSON_Delete(body);
if (!user)
{
httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, "User not found");
return ESP_FAIL;
}
cJSON *resp = cJSON_CreateObject();
cJSON_AddStringToObject(resp, "status", "ok");
const char *json = cJSON_PrintUnformatted(resp);
httpd_resp_sendstr(req, json);
free((void *)json);
cJSON_Delete(resp);
return ESP_OK;
}
internal const httpd_uri_t api_users_update_uri = {.uri = "/api/users/update",
.method = HTTP_POST,
.handler =
api_users_update_handler,
.user_ctx = NULL};

8
Provider/main/appstate.hpp
View File

@@ -2,7 +2,7 @@
#include "types.hpp" #include "types.hpp"
// Shared Application State (Unity Build) // Shared Application State
internal bool g_Ethernet_Initialized = false; extern bool g_Ethernet_Initialized;
internal bool g_Wifi_Initialized = false; extern bool g_Wifi_Initialized;
internal uint8_t g_Active_WWW_Partition = 0; extern uint8_t g_Active_WWW_Partition;

7
Provider/main/http_server.cpp
View File

@@ -186,6 +186,7 @@ internal httpd_handle_t start_webserver(void)
esp_vfs_littlefs_conf_t conf = {}; esp_vfs_littlefs_conf_t conf = {};
conf.base_path = "/www"; conf.base_path = "/www";
conf.partition_label = g_Active_WWW_Partition == 0 ? "www_0" : "www_1"; conf.partition_label = g_Active_WWW_Partition == 0 ? "www_0" : "www_1";
ESP_LOGI(TAG, "Mounting LittleFS partition: %s", conf.partition_label);
conf.format_if_mount_failed = false; conf.format_if_mount_failed = false;
conf.dont_mount = false; conf.dont_mount = false;
esp_err_t ret = esp_vfs_littlefs_register(&conf); esp_err_t ret = esp_vfs_littlefs_register(&conf);
@@ -244,6 +245,7 @@ internal httpd_handle_t start_webserver(void)
// Register todo list API routes // Register todo list API routes
httpd_register_uri_handler(server, &api_users_get_uri); httpd_register_uri_handler(server, &api_users_get_uri);
httpd_register_uri_handler(server, &api_users_post_uri); httpd_register_uri_handler(server, &api_users_post_uri);
httpd_register_uri_handler(server, &api_users_update_uri);
httpd_register_uri_handler(server, &api_users_delete_uri); httpd_register_uri_handler(server, &api_users_delete_uri);
httpd_register_uri_handler(server, &api_tasks_upcoming_uri); httpd_register_uri_handler(server, &api_tasks_upcoming_uri);
httpd_register_uri_handler(server, &api_tasks_get_uri); httpd_register_uri_handler(server, &api_tasks_get_uri);
@@ -272,14 +274,13 @@ internal httpd_handle_t start_webserver(void)
return NULL; return NULL;
} }
internal void stop_webserver(httpd_handle_t server) internal void stop_webserver(httpd_handle_t server, uint8_t partition_index)
{ {
if (server) if (server)
{ {
httpd_stop(server); httpd_stop(server);
#ifdef CONFIG_CALENDINK_DEPLOY_WEB_PAGES #ifdef CONFIG_CALENDINK_DEPLOY_WEB_PAGES
esp_vfs_littlefs_unregister(g_Active_WWW_Partition == 0 ? "www_0" esp_vfs_littlefs_unregister(partition_index == 0 ? "www_0" : "www_1");
: "www_1");
#endif #endif
} }
} }

90
Provider/main/main.cpp
View File

@@ -1,5 +1,6 @@
// STD Lib // STD Lib
#include <stdio.h> #include <stdio.h>
#include <string.h>
// SDK // SDK
#include "esp_log.h" #include "esp_log.h"
@@ -23,7 +24,12 @@
#include "http_server.cpp" #include "http_server.cpp"
// clang-format on // clang-format on
internal constexpr bool kBlockUntilEthernetEstablished = false; // Global Application State Definitions
bool g_Ethernet_Initialized = false;
bool g_Wifi_Initialized = false;
uint8_t g_Active_WWW_Partition = 0;
constexpr bool kBlockUntilEthernetEstablished = false;
extern "C" void app_main() extern "C" void app_main()
{ {
@@ -46,6 +52,10 @@ extern "C" void app_main()
{ {
// Read active www partition from NVS // Read active www partition from NVS
err = nvs_get_u8(my_handle, "www_part", &g_Active_WWW_Partition); err = nvs_get_u8(my_handle, "www_part", &g_Active_WWW_Partition);
if (err == ESP_OK)
{
printf("NVS: Found active www partition: %d\n", g_Active_WWW_Partition);
}
if (err == ESP_ERR_NVS_NOT_FOUND) if (err == ESP_ERR_NVS_NOT_FOUND)
{ {
@@ -74,6 +84,76 @@ extern "C" void app_main()
printf("Error opening NVS handle!\n"); printf("Error opening NVS handle!\n");
} }
// Detect if this is the first boot after a new flash (Firmware or Frontend)
bool is_new_flash = false;
if (nvs_open("storage", NVS_READWRITE, &my_handle) == ESP_OK)
{
// 1. Check Firmware Compile Time
char last_time[64] = {0};
size_t time_size = sizeof(last_time);
const char *current_time = __DATE__ " " __TIME__;
if (nvs_get_str(my_handle, "last_fw_time", last_time, &time_size) !=
ESP_OK ||
strcmp(last_time, current_time) != 0)
{
printf("New firmware detected! (Last: %s, Current: %s)\n",
last_time[0] ? last_time : "None", current_time);
is_new_flash = true;
nvs_set_str(my_handle, "last_fw_time", current_time);
}
// 2. Check Frontend Partition Fingerprint (www_0)
const esp_partition_t *www0_p = esp_partition_find_first(
ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_LITTLEFS, "www_0");
if (www0_p)
{
uint8_t current_sha[32];
if (esp_partition_get_sha256(www0_p, current_sha) == ESP_OK)
{
uint8_t last_sha[32] = {0};
size_t sha_size = sizeof(last_sha);
if (nvs_get_blob(my_handle, "www0_sha", last_sha, &sha_size) !=
ESP_OK ||
memcmp(last_sha, current_sha, 32) != 0)
{
printf("New frontend partition detected via SHA256!\n");
is_new_flash = true;
nvs_set_blob(my_handle, "www0_sha", current_sha, 32);
}
}
}
if (is_new_flash)
{
nvs_commit(my_handle);
}
nvs_close(my_handle);
}
// If we are running from FACTORY and a new flash was detected, override to
// www_0
{
const esp_partition_t *running = esp_ota_get_running_partition();
if (running != NULL &&
running->subtype == ESP_PARTITION_SUBTYPE_APP_FACTORY)
{
if (is_new_flash && g_Active_WWW_Partition != 0)
{
printf("FACTORY APP + NEW FLASH: Overriding www_part to 0 (was %d)\n",
g_Active_WWW_Partition);
g_Active_WWW_Partition = 0;
// Persist the override
if (nvs_open("storage", NVS_READWRITE, &my_handle) == ESP_OK)
{
nvs_set_u8(my_handle, "www_part", 0);
nvs_commit(my_handle);
nvs_close(my_handle);
}
}
}
}
ESP_ERROR_CHECK(esp_event_loop_create_default()); ESP_ERROR_CHECK(esp_event_loop_create_default());
setup_led(); setup_led();
@@ -168,6 +248,9 @@ extern "C" void app_main()
printf("Connected!\n"); printf("Connected!\n");
// Start the webserver
web_server = start_webserver();
// Mark the current app as valid to cancel rollback, only if it's an OTA app // Mark the current app as valid to cancel rollback, only if it's an OTA app
{ {
const esp_partition_t *running = esp_ota_get_running_partition(); const esp_partition_t *running = esp_ota_get_running_partition();
@@ -179,9 +262,6 @@ extern "C" void app_main()
} }
} }
// Start the webserver
web_server = start_webserver();
// Keep the main task alive indefinitely // Keep the main task alive indefinitely
while (true) while (true)
{ {
@@ -193,7 +273,7 @@ shutdown:
if (web_server) if (web_server)
{ {
stop_webserver(web_server); stop_webserver(web_server, g_Active_WWW_Partition);
web_server = NULL; web_server = NULL;
} }