No authorization code received.
'; + return; + } + $clientId = env('GDRIVE_CLIENT_ID', ''); + $clientSecret = env('GDRIVE_CLIENT_SECRET', ''); + $redirectUri = _gdriveRedirectUri(); + $ch = curl_init('https://oauth2.googleapis.com/token'); + curl_setopt_array($ch, [ + CURLOPT_RETURNTRANSFER => true, + CURLOPT_POST => true, + CURLOPT_POSTFIELDS => http_build_query([ + 'client_id' => $clientId, + 'client_secret' => $clientSecret, + 'code' => $code, + 'redirect_uri' => $redirectUri, + 'grant_type' => 'authorization_code', + ]), + CURLOPT_TIMEOUT => 15, + CURLOPT_SSL_VERIFYPEER => true, + ]); + $response = curl_exec($ch); + curl_close($ch); + $data = json_decode($response, true); + header('Content-Type: text/html; charset=utf-8'); + if (!empty($data['refresh_token'])) { + _gdriveSetEnvVar('GDRIVE_REFRESH_TOKEN', $data['refresh_token']); + echo 'EverShelf can now back up to your Google Drive.
' + . 'This tab will close automatically.
' + . '' + . ''; + } else { + $err = htmlspecialchars($data['error_description'] ?? $data['error'] ?? 'Unknown error'); + http_response_code(400); + echo "$err
"; + } +} + +/** + * Obtain a short-lived Google API access token via OAuth 2.0 refresh token. + * Returns ['token' => string] on success, ['error' => string] on failure. + */ +function _gdriveGetToken(): ?string { return _gdriveGetTokenOAuth()['token'] ?? null; } +function _gdriveGetTokenEx(): array { return _gdriveGetTokenOAuth(); } + +/** + * Upload a file to Google Drive using multipart upload. + * Returns the Drive file ID on success, null on failure. + */ +/** Returns ['id' => string] on success or ['error' => string] on failure. */ +function _gdriveUploadFile(string $token, string $folderId, string $filePath, string $remoteName): array { + if (!file_exists($filePath)) return ['error' => 'Local backup file not found: ' . $filePath]; + $mimeType = 'application/x-sqlite3'; + $metadata = json_encode(['name' => $remoteName, 'parents' => [$folderId]]); + $fileContent = file_get_contents($filePath); + $boundary = 'es_backup_' . bin2hex(random_bytes(8)); + $body = "--$boundary\r\n" + . "Content-Type: application/json; charset=UTF-8\r\n\r\n" + . $metadata . "\r\n" + . "--$boundary\r\n" + . "Content-Type: $mimeType\r\n\r\n" + . $fileContent . "\r\n" + . "--$boundary--"; + + $ch = curl_init('https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart'); + curl_setopt_array($ch, [ + CURLOPT_RETURNTRANSFER => true, + CURLOPT_POST => true, + CURLOPT_POSTFIELDS => $body, + CURLOPT_HTTPHEADER => [ + "Authorization: Bearer $token", + "Content-Type: multipart/related; boundary=$boundary", + "Content-Length: " . strlen($body), + ], + CURLOPT_TIMEOUT => 120, + CURLOPT_SSL_VERIFYPEER => true, + ]); + $response = curl_exec($ch); + $curlErr = curl_error($ch); + curl_close($ch); + if (!$response) return ['error' => 'cURL upload failed: ' . $curlErr]; + $data = json_decode($response, true); + if (!empty($data['id'])) return ['id' => $data['id']]; + $apiErr = $data['error']['message'] ?? $data['error']['status'] ?? json_encode($data); + return ['error' => 'Drive API error: ' . $apiErr]; +} + +/** + * Delete Drive backups older than $retentionDays. + * Returns count of deleted files. + */ +function _gdrivePurgeOld(string $token, string $folderId, int $retentionDays): int { + if ($retentionDays <= 0) return 0; + $cutoff = date('c', strtotime("-{$retentionDays} days")); + $q = "'$folderId' in parents and name contains 'evershelf_' and trashed=false"; + $url = 'https://www.googleapis.com/drive/v3/files?' + . http_build_query(['q' => $q, 'fields' => 'files(id,name,createdTime)', 'pageSize' => '1000']); + + $ch = curl_init($url); + curl_setopt_array($ch, [ + CURLOPT_RETURNTRANSFER => true, + CURLOPT_HTTPHEADER => ["Authorization: Bearer $token"], + CURLOPT_TIMEOUT => 30, + ]); + $response = curl_exec($ch); + curl_close($ch); + if (!$response) return 0; + $data = json_decode($response, true); + $deleted = 0; + foreach ($data['files'] ?? [] as $file) { + if (!empty($file['createdTime']) && $file['createdTime'] < $cutoff) { + $ch = curl_init("https://www.googleapis.com/drive/v3/files/{$file['id']}"); + curl_setopt_array($ch, [ + CURLOPT_RETURNTRANSFER => true, + CURLOPT_CUSTOMREQUEST => 'DELETE', + CURLOPT_HTTPHEADER => ["Authorization: Bearer $token"], + CURLOPT_TIMEOUT => 15, + ]); + curl_exec($ch); + $code = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE); + curl_close($ch); + if ($code === 204) $deleted++; + } + } + return $deleted; +} + +/** + * Full backup flow: create local snapshot, upload to Google Drive, purge old Drive files. + */ +function backupToGDrive(?PDO $db = null): array { + EverLog::info('backupToGDrive'); + if (env('GDRIVE_ENABLED', 'false') !== 'true') { + return ['success' => false, 'error' => 'Google Drive backup is not enabled']; + } + $folderId = env('GDRIVE_FOLDER_ID', ''); + if (empty($folderId)) { + return ['success' => false, 'error' => 'GDRIVE_FOLDER_ID not configured']; + } + + // 1. Create (or reuse recent) local backup + $local = createLocalBackup($db); + if (!$local['success']) return $local; + + // 2. Authenticate with Google + $tokResult = _gdriveGetTokenEx(); + if (empty($tokResult['token'])) { + return ['success' => false, 'error' => $tokResult['error'] ?? 'Google Drive authentication failed']; + } + $token = $tokResult['token']; + + // 3. Upload + $uploadResult = _gdriveUploadFile($token, $folderId, $local['path'], $local['filename']); + if (empty($uploadResult['id'])) { + return ['success' => false, 'error' => $uploadResult['error'] ?? 'Upload to Google Drive failed']; + } + $driveFileId = $uploadResult['id']; + + // 4. Purge old files on Drive + $retentionDays = max(0, (int)env('GDRIVE_RETENTION_DAYS', '30')); + $purgedRemote = $retentionDays > 0 ? _gdrivePurgeOld($token, $folderId, $retentionDays) : 0; + + EverLog::info('backupToGDrive ok', ['file' => $local['filename'], 'drive_id' => $driveFileId, 'purged_remote' => $purgedRemote]); + return [ + 'success' => true, + 'filename' => $local['filename'], + 'size_kb' => $local['size_kb'], + 'drive_file_id' => $driveFileId, + 'purged_local' => $local['purged'], + 'purged_remote' => $purgedRemote, + 'created_at' => $local['created_at'], + ]; +} + /** * Server-side Bring! cleanup: remove items from Bring! that the app auto-added * but are no longer flagged by smart shopping (stock is now adequate). @@ -6290,7 +6962,7 @@ function bringGetList(): void { $auth = bringAuth(); if (!$auth) { EverLog::info('bringGetList'); - echo json_encode(['success' => false, 'error' => 'Credenziali Bring! non configurate. Aggiungi BRING_EMAIL e BRING_PASSWORD al file .env']); + echo json_encode(['success' => false, 'error' => 'Bring! credentials not configured. Add BRING_EMAIL and BRING_PASSWORD to .env']); return; } @@ -6301,14 +6973,14 @@ function bringGetList(): void { if ($lists && isset($lists['lists'][0]['listUuid'])) { $listUUID = $lists['lists'][0]['listUuid']; } else { - echo json_encode(['success' => false, 'error' => 'Nessuna lista Bring! trovata']); + echo json_encode(['success' => false, 'error' => 'No Bring! list found']); return; } } $data = bringRequest('GET', "https://api.getbring.com/rest/v2/bringlists/{$listUUID}"); if (!$data) { - echo json_encode(['success' => false, 'error' => 'Errore nel recupero della lista']); + echo json_encode(['success' => false, 'error' => 'Error fetching the list']); return; } @@ -6368,7 +7040,7 @@ function bringAddItems(): void { $auth = bringAuth(); if (!$auth) { EverLog::info('bringAddItems'); - echo json_encode(['success' => false, 'error' => 'Credenziali Bring! non configurate']); + echo json_encode(['success' => false, 'error' => 'Bring! credentials not configured']); return; } @@ -6377,7 +7049,7 @@ function bringAddItems(): void { $listUUID = $input['listUUID'] ?? $auth['bringListUUID']; if (empty($listUUID)) { - echo json_encode(['success' => false, 'error' => 'Lista non trovata']); + echo json_encode(['success' => false, 'error' => 'List not found']); return; } @@ -6446,7 +7118,7 @@ function bringRemoveItem(): void { $auth = bringAuth(); if (!$auth) { EverLog::info('bringRemoveItem'); - echo json_encode(['success' => false, 'error' => 'Credenziali Bring! non configurate']); + echo json_encode(['success' => false, 'error' => 'Bring! credentials not configured']); return; } @@ -6455,7 +7127,7 @@ function bringRemoveItem(): void { $listUUID = $input['listUUID'] ?? $auth['bringListUUID']; if (empty($name) || empty($listUUID)) { - echo json_encode(['success' => false, 'error' => 'Parametri mancanti']); + echo json_encode(['success' => false, 'error' => 'Missing parameters']); return; } @@ -6494,19 +7166,19 @@ function bringCleanSpecs(): void { $auth = bringAuth(); if (!$auth) { EverLog::info('bringCleanSpecs'); - echo json_encode(['success' => false, 'error' => 'Credenziali Bring! non configurate']); + echo json_encode(['success' => false, 'error' => 'Bring! credentials not configured']); return; } $listUUID = $auth['bringListUUID']; if (empty($listUUID)) { - echo json_encode(['success' => false, 'error' => 'Lista non trovata']); + echo json_encode(['success' => false, 'error' => 'List not found']); return; } $data = bringRequest('GET', "https://api.getbring.com/rest/v2/bringlists/{$listUUID}"); if (!$data || !isset($data['purchase'])) { - echo json_encode(['success' => false, 'error' => 'Errore nel recupero della lista']); + echo json_encode(['success' => false, 'error' => 'Error fetching the list']); return; } @@ -6605,17 +7277,17 @@ function bringMigrateNames(PDO $db): void { $auth = bringAuth(); if (!$auth) { EverLog::info('bringMigrateNames'); - echo json_encode(['success' => false, 'error' => 'Credenziali Bring! non configurate']); + echo json_encode(['success' => false, 'error' => 'Bring! credentials not configured']); return; } $listUUID = $auth['bringListUUID']; if (empty($listUUID)) { - echo json_encode(['success' => false, 'error' => 'Lista non trovata']); + echo json_encode(['success' => false, 'error' => 'List not found']); return; } $data = bringRequest('GET', "https://api.getbring.com/rest/v2/bringlists/{$listUUID}"); if (!$data || !isset($data['purchase'])) { - echo json_encode(['success' => false, 'error' => 'Errore nel recupero della lista']); + echo json_encode(['success' => false, 'error' => 'Error fetching the list']); return; } @@ -6969,36 +7641,25 @@ function smartShopping(PDO $db): void { } if ($coveredByEquivalent) continue; - if ($isFrequent && $isRecent && $buyCount >= 2) { - // Frequently used, recently active, AND bought multiple times → critical - $urgency = 'critical'; - $reasons[] = 'Esaurito'; - $score += 100; - if ($useCount >= 5) { $score += 20; $reasons[] = "Uso frequente ({$useCount}x)"; } - } elseif ($isFrequent && $isRecent && $buyCount == 1 && $useCount >= 3) { - // Bought once but used ≥3 times → proven consumption pattern → high - $urgency = 'high'; - $reasons[] = 'Esaurito'; - $score += 75; - if ($useCount >= 5) { $score += 10; $reasons[] = "Uso frequente ({$useCount}x)"; } - } elseif ($isFrequent && $isRecent && $buyCount == 1) { - // Frequent use, bought once, <3 uses — not yet proven → medium - $urgency = 'medium'; - $reasons[] = 'Esaurito'; - $score += 45; - } elseif ($isRegular && $isRecent && ($useCount >= 3 || $buyCount >= 2)) { - // Regularly used, recently active → high - $urgency = 'high'; - $reasons[] = 'Esaurito'; - $score += 70; - } elseif ($isRecent && $buyCount >= 2) { - // At least bought a couple times recently → low - $urgency = 'low'; - $reasons[] = 'Esaurito'; - $score += 30; + // For DEPLETED products: recency is misleading — the product may not have been + // "used recently" precisely because it ran out. Base urgency on usage rate only. + $reasons[] = 'Esaurito'; + if ($isFrequent && $useCount >= 5) { + $urgency = 'critical'; $score += 120; + $reasons[] = "Uso frequente ({$useCount}x)"; + } elseif ($isFrequent && $useCount >= 2) { + $urgency = 'critical'; $score += 100; + } elseif ($isFrequent) { + // usesPerMonth >= 1.5 but few recorded uses (new product) → high + $urgency = 'high'; $score += 75; + } elseif ($isRegular && ($useCount >= 3 || $buyCount >= 2)) { + $urgency = 'high'; $score += 65; + } elseif ($isRegular) { + $urgency = 'medium'; $score += 45; + } elseif ($useCount >= 2 || $buyCount >= 2) { + $urgency = 'low'; $score += 30; } else { - // Rarely used or not used recently — skip - continue; + $urgency = 'low'; $score += 10; } } @@ -7496,6 +8157,82 @@ function bringSuggestItems(PDO $db): void { ], JSON_UNESCAPED_UNICODE); } +// ===== SHOPPING ABSTRACTION (internal DB or Bring!) ===== + +function isShoppingBringMode(): bool { + return env('SHOPPING_MODE', 'internal') === 'bring' + && !empty(env('BRING_EMAIL')) + && !empty(env('BRING_PASSWORD')); +} + +function shoppingGetList(PDO $db): void { + if (isShoppingBringMode()) { + bringGetList(); + return; + } + $items = $db->query( + "SELECT name, raw_name, specification FROM shopping_list ORDER BY sort_order ASC, added_at ASC" + )->fetchAll(); + $purchase = array_map(fn($r) => [ + 'name' => $r['name'], + 'rawName' => $r['raw_name'] ?: $r['name'], + 'specification' => $r['specification'], + ], $items); + echo json_encode([ + 'success' => true, + 'listUUID' => 'internal-list', + 'purchase' => $purchase, + 'recently' => [], + ], JSON_UNESCAPED_UNICODE); +} + +function shoppingAdd(PDO $db): void { + if (isShoppingBringMode()) { + bringAddItems(); + return; + } + $input = json_decode(file_get_contents('php://input'), true) ?? []; + $items = $input['items'] ?? []; + $added = 0; $updated = 0; $skipped = 0; + foreach ($items as $item) { + $name = trim($item['name'] ?? ''); + if ($name === '') continue; + $rawName = trim($item['rawName'] ?? $item['raw_name'] ?? $name); + $spec = $item['specification'] ?? ''; + $updateSpec = !empty($item['update_spec']); + $stmt = $db->prepare("SELECT id, specification FROM shopping_list WHERE lower(name) = lower(?)"); + $stmt->execute([$name]); + $existing = $stmt->fetch(); + if ($existing) { + if ($updateSpec && $existing['specification'] !== $spec) { + $db->prepare("UPDATE shopping_list SET specification=?, raw_name=? WHERE id=?")->execute([$spec, $rawName, $existing['id']]); + $updated++; + } else { + $skipped++; + } + } else { + $db->prepare("INSERT INTO shopping_list (name, raw_name, specification) VALUES (?, ?, ?)")->execute([$name, $rawName, $spec]); + $added++; + } + } + echo json_encode(['success' => true, 'added' => $added, 'updated' => $updated, 'skipped' => $skipped, 'errors' => []]); +} + +function shoppingRemove(PDO $db): void { + if (isShoppingBringMode()) { + bringRemoveItem(); + return; + } + $input = json_decode(file_get_contents('php://input'), true) ?? []; + $name = trim($input['name'] ?? ''); + if ($name === '') { + echo json_encode(['success' => false, 'error' => 'Missing name']); + return; + } + $db->prepare("DELETE FROM shopping_list WHERE lower(name) = lower(?)")->execute([$name]); + echo json_encode(['success' => true]); +} + // ===== SHARED APP DATA FUNCTIONS ===== function appSettingsGet(PDO $db): void { diff --git a/assets/css/style.css b/assets/css/style.css index 528c815..e6a47e3 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -7133,6 +7133,7 @@ body.cooking-mode-active .app-header { --bg: #0f172a; --bg-card: #1e293b; --bg-dark: #020617; + --bg-secondary: #263448; --text: #e2e8f0; --text-light: #94a3b8; --text-muted: #64748b; @@ -7384,3 +7385,159 @@ body.cooking-mode-active .app-header { color: var(--primary-light); } /* @media prefers-color-scheme: auto handled in JS */ + +/* ===== DARK MODE — EXTENDED COMPONENT OVERRIDES ===== */ + +/* ── Inventory badges ── */ +[data-theme="dark"] .badge-location { background: #0c2a4e; color: #7dd3fc; } +[data-theme="dark"] .badge-category { background: #1e293b; color: #94a3b8; } +[data-theme="dark"] .badge-qty { background: #0f2a1a; color: #86efac; } +[data-theme="dark"] .badge-expiry { background: #2a1a00; color: #fcd34d; } +[data-theme="dark"] .badge-expired { background: #2a0808; color: #fca5a5; } + +/* ── Urgency / priority badges ── */ +[data-theme="dark"] .badge-critical { background: #2a0808; color: #fca5a5; } +[data-theme="dark"] .badge-high { background: #2a1200; color: #fdba74; } +[data-theme="dark"] .badge-medium { background: #2a1e00; color: #fde68a; } +[data-theme="dark"] .badge-low { background: #0f2a1a; color: #86efac; } +[data-theme="dark"] .badge-freq-high { background: #2e0d1a; color: #f9a8d4; } +[data-theme="dark"] .badge-tag-add { background: #1e293b; color: #94a3b8; } + +/* ── Smart shopping badges ── */ +[data-theme="dark"] .smart-freq-badge.freq-suggest { background: #0c2a4e; color: #7dd3fc; } +[data-theme="dark"] .smart-freq-badge.freq-suggest-approx { background: #0c1f3a; color: #93c5fd; font-style: italic; } +[data-theme="dark"] .smart-pred-badge { background: #2a1e00; color: #fde68a; } +[data-theme="dark"] .smart-pred-badge.pred-urgent { background: #2a0808; color: #fca5a5; } +[data-theme="dark"] .smart-pred-badge.pred-soon { background: #2a1200; color: #fdba74; } +[data-theme="dark"] .smart-bring-badge { background: #0c2a4e; color: #7dd3fc; } + +/* ── AW trend mini-cards ── */ +[data-theme="dark"] .aw-tcard-good { background: #0f2a1a; border-color: #166534; } +[data-theme="dark"] .aw-tcard-ok { background: #1c1300; border-color: #78350f; } +[data-theme="dark"] .aw-tcard-bad { background: #2a0808; border-color: #7f1d1d; } + +/* ── Alert sections ── */ +[data-theme="dark"] .alert-danger { background: #2a0808; border-color: var(--danger); } +[data-theme="dark"] .alert-item { background: rgba(255,255,255,0.04); } +[data-theme="dark"] .alert-item-qty { background: rgba(255,255,255,0.06); } +[data-theme="dark"] .alert-review { background: #1c1300; border-color: #78350f; } +[data-theme="dark"] .alert-review h3 { color: #fcd34d; } +[data-theme="dark"] .alert-opened { background: #0c1f3a; border-color: #1e3a8a; } +[data-theme="dark"] .alert-opened h3 { color: #7dd3fc; } +[data-theme="dark"] .alert-item-badge.opened { background: #1e40af; } + +/* ── Opened expiry badges ── */ +[data-theme="dark"] .opened-expiry-ok { background: #0f2a1a; color: #86efac; } +[data-theme="dark"] .opened-expiry-soon { background: #2a1e00; color: #fde68a; } +[data-theme="dark"] .opened-expiry-urgent { background: #2a0808; color: #fca5a5; } + +/* ── Alert banner: gradient overrides ── */ +[data-theme="dark"] .alert-banner.banner-expired { background: #2a0808; border-color: #7f1d1d; } +[data-theme="dark"] .banner-expired .alert-banner-title { color: #fca5a5; } +[data-theme="dark"] .banner-expired .alert-banner-counter { color: #f87171; } +[data-theme="dark"] .alert-banner.banner-expiring { background: #1c1300; border-color: #78350f; } +[data-theme="dark"] .banner-expiring .alert-banner-title { color: #fdba74; } +[data-theme="dark"] .banner-expiring .alert-banner-counter { color: #fb923c; } +[data-theme="dark"] .alert-banner.banner-expired-ok { background: #0f2a1a; border-color: #166534; } +[data-theme="dark"] .banner-expired-ok .alert-banner-title { color: #86efac; } +[data-theme="dark"] .banner-expired-ok .alert-banner-counter { color: #4ade80; } +[data-theme="dark"] .alert-banner.banner-expired-warning { background: #1c1300; border-color: #78350f; } +[data-theme="dark"] .banner-expired-warning .alert-banner-title { color: #fde68a; } +[data-theme="dark"] .banner-expired-warning .alert-banner-counter { color: #fcd34d; } +[data-theme="dark"] .alert-banner.banner-expired-danger { background: #2a0808; border-color: #7f1d1d; border-width: 2px; } +[data-theme="dark"] .banner-expired-danger .alert-banner-title { color: #fca5a5; } +[data-theme="dark"] .alert-banner.banner-prediction { background: #1a1040; border-color: #6d28d9; } +[data-theme="dark"] .banner-prediction .alert-banner-title { color: #c4b5fd; } +[data-theme="dark"] .banner-prediction .alert-banner-counter { color: #a78bfa; } +[data-theme="dark"] .alert-banner.banner-anomaly { background: #1a1200; border-color: #c2410c; } +[data-theme="dark"] .banner-anomaly .alert-banner-title { color: #fdba74; } +[data-theme="dark"] .alert-banner.banner-no-expiry { background: #0f2a1a; border-color: #166534; } +[data-theme="dark"] .banner-no-expiry .alert-banner-title { color: #86efac; } + +/* ── Alert banner: default text & close ── */ +[data-theme="dark"] .alert-banner-title { color: #e2e8f0; } +[data-theme="dark"] .alert-banner-detail { color: #94a3b8; } +[data-theme="dark"] .alert-banner-close { color: #94a3b8; background: rgba(255,255,255,0.06); } +[data-theme="dark"] .banner-safety-warning { color: #fdba74; } +[data-theme="dark"] .banner-safety-ok { color: #86efac; } +[data-theme="dark"] .banner-safety-danger { color: #fca5a5; } + +/* ── Banner action buttons ── */ +[data-theme="dark"] .btn-banner-ok { background: #0f2a1a; color: #86efac; } +[data-theme="dark"] .btn-banner-edit { background: #1a1040; color: #c4b5fd; } +[data-theme="dark"] .btn-banner-ai { background: #2e1a4a; color: #c4b5fd; } +[data-theme="dark"] .btn-banner-weigh { background: #2e1a4a; color: #c4b5fd; } +[data-theme="dark"] .btn-banner-confirm { background: #0f2a1a; color: #86efac; } +[data-theme="dark"] .btn-banner-use { background: #0c2a4e; color: #7dd3fc; } +[data-theme="dark"] .btn-banner-throw { background: #2a0808; color: #fca5a5; } +[data-theme="dark"] .btn-banner-throw-primary { background: #dc2626; color: #fff; } +[data-theme="dark"] .btn-banner-use-danger { background: #1e293b; color: #64748b; } +[data-theme="dark"] .btn-banner-vacuum { background: #2e1a4a; color: #c4b5fd; } +[data-theme="dark"] .btn-banner-edit2 { background: #0c2a4e; color: #7dd3fc; } + +/* ── Review items ── */ +[data-theme="dark"] .review-item { background: rgba(255,255,255,0.04); } +[data-theme="dark"] .review-item-meta { color: #94a3b8; } +[data-theme="dark"] .review-warn { color: #fca5a5; } +[data-theme="dark"] .review-qty-value { background: #2a0808; color: #fca5a5; } +[data-theme="dark"] .btn-review-ok { background: #0f2a1a; color: #86efac; } +[data-theme="dark"] .btn-review-ok:active { background: #0d2416; } +[data-theme="dark"] .btn-review-edit { background: #1a1040; color: #c4b5fd; } +[data-theme="dark"] .btn-review-edit:active { background: #140d36; } + +/* ── Chat UI ── */ +[data-theme="dark"] .chat-header-bar { background: var(--bg-card); border-color: var(--border); } +[data-theme="dark"] .chat-title { color: #818cf8; } +[data-theme="dark"] .chat-suggestion { background: #1a1040; border-color: #3730a3; color: #a5b4fc; } +[data-theme="dark"] .chat-suggestion:active { background: #2e1a4a; } +[data-theme="dark"] .chat-gemini { background: var(--bg-card); color: var(--text); box-shadow: 0 1px 3px rgba(0,0,0,0.3); } +[data-theme="dark"] .chat-gemini strong { color: #818cf8; } +[data-theme="dark"] .chat-input-bar { background: var(--bg-card); border-color: var(--border); } + +/* ── Settings status ── */ +[data-theme="dark"] .settings-status.success { background: #0f2a1a; color: #86efac; } +[data-theme="dark"] .settings-status.error { background: #2a0808; color: #fca5a5; } + +/* ── Inventory status bar ── */ +[data-theme="dark"] .inventory-status-bar { + background: linear-gradient(135deg, #0c2a4e 0%, #1a1040 100%); + border-color: #1e3a8a; +} +[data-theme="dark"] .inventory-status-bar .inv-status-title { color: #7dd3fc; } +[data-theme="dark"] .inventory-status-bar .inv-status-total { color: #e2e8f0; background: rgba(0,0,0,0.3); } +[data-theme="dark"] .inventory-status-bar .inv-status-item { color: #93c5fd; background: rgba(0,0,0,0.2); } + +/* ── Use inventory info ── */ +[data-theme="dark"] .use-inventory-info { background: #0c2a4e; color: #7dd3fc; } +[data-theme="dark"] #use-expiry-hint { background: #2a1e00; border-color: #78350f; color: #fde68a; } + +/* ── Recipe components ── */ +[data-theme="dark"] .recipe-expiry-note { background: #2a1e00; color: #fde68a; } +[data-theme="dark"] .recipe-tools-banner { background: #1a1040; border-color: #3730a3; color: #c4b5fd; } +[data-theme="dark"] .recipe-tool-chip { background: #2e1a4a; color: #c4b5fd; } +[data-theme="dark"] .recipe-subtype-chip { background: #1c1300; border-color: #78350f; color: var(--text); } +[data-theme="dark"] .recipe-subtype-chip:has(input:checked) { background: #2a1e00; border-color: #d97706; } + +/* ── Bug report pills ── */ +[data-theme="dark"] .bug-type-pill { background: var(--bg-card); border-color: var(--border); color: var(--text-light); } + +/* ── Shopping tag menu ── */ +[data-theme="dark"] .shopping-tag-menu-container { background: #1a2336; } + +/* ── Edit unknown card ── */ +[data-theme="dark"] .edit-unknown-card.highlight { background: #1c1300; border-color: var(--warning); } + +/* ── AI match image ── */ +[data-theme="dark"] .ai-match-img { background: var(--bg-card); } + +/* ── Inline edit button ── */ +[data-theme="dark"] .btn-edit-inline { background: rgba(30,41,59,0.92); border-color: var(--border); color: var(--text); } + +/* ── Setup wizard ── */ +[data-theme="dark"] .setup-body p { color: var(--text-muted); } +[data-theme="dark"] .setup-footer { border-color: var(--border); } +[data-theme="dark"] .setup-skip-link { color: var(--text-muted); } +[data-theme="dark"] .setup-skip-link:hover { color: var(--text-light); } + +/* ── Appliance remove active ── */ +[data-theme="dark"] .appliance-item .appliance-remove:active { background: #2a0808; } diff --git a/assets/js/app.js b/assets/js/app.js index 86dcd75..d7b4494 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -455,7 +455,11 @@ function _scaleAutoFillUse(msg) { // Determine target unit let unit; - if (_useConfMode && _useConfMode._activeUnit === 'sub') { + if (_useConfMode) { + // Scale always reads weight (g/ml) — auto-switch to sub-unit mode if still in conf mode + if (_useConfMode._activeUnit !== 'sub') { + switchUseUnit('sub'); + } unit = (_useConfMode.packageUnit || '').toLowerCase(); } else { unit = _useNormalUnit; @@ -944,7 +948,9 @@ function updateScaleReadButtons() { } const btnUse = document.getElementById('btn-scale-use'); if (btnUse) { - btnUse.style.display = (ready && (_useNormalUnit === 'g' || _useNormalUnit === 'ml')) ? '' : 'none'; + const canUseByWeight = _useNormalUnit === 'g' || _useNormalUnit === 'ml' || + (_useConfMode && (_useConfMode.packageUnit === 'g' || _useConfMode.packageUnit === 'ml')); + btnUse.style.display = (ready && canUseByWeight) ? '' : 'none'; } // Live box: visible when scale enabled + connected + on use page + compatible unit const liveBox = document.getElementById('scale-live-box'); @@ -1050,8 +1056,12 @@ if (!_SUPPORTED_LANGS[_currentLang]) _currentLang = 'en'; // Apply theme IMMEDIATELY to prevent flash of unstyled content (function _earlyTheme() { try { - const s = JSON.parse(localStorage.getItem('evershelf_settings') || '{}'); - const mode = s.dark_mode || 'auto'; + // Use dedicated key (server-synced); fall back to old full-settings object for back-compat + let mode = localStorage.getItem('evershelf_dark_mode'); + if (!mode) { + const s = JSON.parse(localStorage.getItem('evershelf_settings') || '{}'); + mode = s.dark_mode || 'auto'; + } const h = new Date().getHours(); const dark = mode === 'on' || (mode === 'auto' && (h >= 20 || h < 7)); document.documentElement.setAttribute('data-theme', dark ? 'dark' : 'light'); @@ -1887,7 +1897,8 @@ async function flipCamera() { const current = s.camera_facing || 'environment'; const next = current === 'environment' ? 'user' : 'environment'; s.camera_facing = next; - try { localStorage.setItem('evershelf_settings', JSON.stringify(s)); } catch(_) {} + _settingsCache = s; + _saveSettingToServer({ camera_facing: next }); showToast(next === 'user' ? t('scan.flip_front') : t('scan.flip_back'), 'info'); stopScanner(); setTimeout(() => initScanner(), 150); @@ -2060,9 +2071,9 @@ let _settingsDirty = false; function getSettings() { if (!_settingsCache) { - try { - _settingsCache = JSON.parse(localStorage.getItem('evershelf_settings') || '{}'); - } catch(e) { _settingsCache = {}; } + // Settings come from server — do NOT read from localStorage (per-device storage). + // _settingsCache is populated by _applySyncedSettings() on app init. + _settingsCache = {}; } const s = _settingsCache; // Build recipe_prefs array from individual booleans @@ -2079,12 +2090,19 @@ function getSettings() { function saveSettingsToStorage(settings) { _settingsCache = settings; - localStorage.setItem('evershelf_settings', JSON.stringify(settings)); - // Persist to DB + // Cache dark_mode in localStorage ONLY as a hint for the pre-render _earlyTheme() IIFE + // (prevents flash before server fetch). Authoritative value is in server .env. + try { localStorage.setItem('evershelf_dark_mode', settings.dark_mode || 'auto'); } catch(_) {} + // Persist user-prefs subset to DB _settingsDirty = true; _debouncedSyncSettings(); } +/** Save one or more settings directly to server .env (partial update). */ +async function _saveSettingToServer(data) { + try { await api('save_settings', {}, 'POST', data); } catch(e) { /* offline */ } +} + const _debouncedSyncSettings = debounce(function() { if (!_settingsDirty) return; _settingsDirty = false; @@ -2125,13 +2143,12 @@ async function syncSettingsFromDB() { const s = getSettings(); s.meal_plan = srv.meal_plan; _settingsCache = s; - localStorage.setItem('evershelf_settings', JSON.stringify(s)); if (document.getElementById('meal-plan-grid')) renderMealPlanEditor(); } // tts_voice preference (best-effort cross-device — falls back if voice unavailable) if (srv.tts_voice) { const s = getSettings(); - if (!s.tts_voice) { s.tts_voice = srv.tts_voice; _settingsCache = s; localStorage.setItem('evershelf_settings', JSON.stringify(s)); } + if (!s.tts_voice) { s.tts_voice = srv.tts_voice; _settingsCache = s; } } // ── User data previously stored in localStorage, now server-synced ── @@ -2174,7 +2191,7 @@ async function syncSettingsFromDB() { } /** - * Apply server settings object into localStorage cache. + * Apply server settings object into in-memory cache (_settingsCache). * Called both from _initApp (to reuse an already-fetched response) and syncSettingsFromDB. */ function _applySyncedSettings(serverSettings) { @@ -2192,7 +2209,10 @@ function _applySyncedSettings(serverSettings) { 'tts_engine','tts_rate','tts_pitch','tts_auth_header_name','tts_auth_header_value','tts_extra_fields', 'screensaver_enabled','screensaver_timeout', 'price_enabled','price_country','price_currency','price_update_months', - 'zerowaste_tips_enabled']; + 'zerowaste_tips_enabled', + 'shopping_enabled','shopping_mode','shopping_smart_suggestions', + 'shopping_forecast','shopping_auto_add_threshold', + 'dark_mode']; let changed = false; for (const key of serverKeys) { if (serverSettings[key] !== undefined && serverSettings[key] !== null && serverSettings[key] !== '') { @@ -2202,19 +2222,262 @@ function _applySyncedSettings(serverSettings) { } if (changed) { _settingsCache = s; - localStorage.setItem('evershelf_settings', JSON.stringify(s)); + // Update localStorage hint for _earlyTheme() IIFE on next load + try { localStorage.setItem('evershelf_dark_mode', s.dark_mode || 'auto'); } catch(_) {} } } -let _infoTabTimer = null; +let _infoTabTimer = null; +let _backupTabTimer = null; /** * Load the Info tab: Gemini token usage + cost, log size, DB size, log level. * Called on tab click; auto-refreshes every 30s while the tab is open. */ +// ── Backup Tab ──────────────────────────────────────────────────────────────── + +async function _loadBackupTab() { + if (_backupTabTimer) { clearInterval(_backupTabTimer); _backupTabTimer = null; } + await _renderBackupTab(); + // Pull server settings to populate inputs if not yet loaded + try { + const ss = await api('get_settings'); + if (ss) { + const bkRetEl = document.getElementById('setting-backup-retention-days'); + if (bkRetEl) { bkRetEl.value = ss.backup_retention_days || 3; bkRetEl.dataset.loaded = '1'; } + const gdriveEnEl = document.getElementById('setting-gdrive-enabled'); + if (gdriveEnEl) gdriveEnEl.checked = !!ss.gdrive_enabled; + const gdriveFolderEl = document.getElementById('setting-gdrive-folder-id'); + if (gdriveFolderEl) { gdriveFolderEl.value = ss.gdrive_folder_id || ''; gdriveFolderEl.dataset.loaded = '1'; } + const gdriveRetEl = document.getElementById('setting-gdrive-retention-days'); + if (gdriveRetEl) { gdriveRetEl.value = ss.gdrive_retention_days || 30; gdriveRetEl.dataset.loaded = '1'; } + // Pre-fill client_id (never show secret back) + if (ss.gdrive_client_id_set) { + const ciEl = document.getElementById('setting-gdrive-client-id'); + if (ciEl && !ciEl.value) ciEl.placeholder = '● ● ● already configured ● ● ●'; + } + // OAuth token status + const oauthStatusEl = document.getElementById('gdrive-oauth-token-status'); + if (oauthStatusEl) { + oauthStatusEl.textContent = ss.gdrive_refresh_token_set + ? ('✅ ' + (t('settings.backup.gdrive_oauth_authorized') || 'Authorized')) + : ('⚠️ ' + (t('settings.backup.gdrive_oauth_not_authorized') || 'Not authorized yet')); + oauthStatusEl.style.color = ss.gdrive_refresh_token_set ? '#15803d' : '#b45309'; + } + // Redirect URI for OAuth setup — always http://localhost for self-hosted compat + // (can be overridden server-side via GDRIVE_REDIRECT_URI env var) + const rdEl = document.getElementById('gdrive-redirect-uri-display'); + if (rdEl) rdEl.textContent = 'http://localhost'; + } + } catch(e) { /* non-critical */ } +} + +async function _renderBackupTab() { + const lastInfoEl = document.getElementById('backup-last-info'); + const listEl = document.getElementById('backup-list-container'); + try { + const data = await api('backup_list'); + if (!data || !data.success) { + if (lastInfoEl) lastInfoEl.innerHTML = 'Error loading backup info'; + return; + } + // Last backup info + if (lastInfoEl) { + if (data.last_backup_ts) { + const secsAgo = Math.floor(Date.now() / 1000) - data.last_backup_ts; + let ago; + if (secsAgo < 120) ago = secsAgo < 5 ? t('time.just_now') || 'adesso' : `${secsAgo}s fa`; + else if (secsAgo < 3600) ago = `${Math.floor(secsAgo / 60)} min fa`; + else if (secsAgo < 86400) ago = `${Math.floor(secsAgo / 3600)}h fa`; + else ago = `${Math.floor(secsAgo / 86400)}gg fa`; + const name = data.last_backup_file || ''; + lastInfoEl.innerHTML = `${t('settings.backup.last_backup') || 'Ultimo backup'}: ${ago} (${name})`; + } else { + lastInfoEl.innerHTML = `${t('settings.backup.no_backup_yet') || 'Nessun backup ancora'}`; + } + } + // Backup list + if (listEl) { + if (!data.backups || data.backups.length === 0) { + listEl.innerHTML = `${t('settings.backup.list_empty') || 'Nessun backup disponibile'}
`; + } else { + const rows = data.backups.map(b => { + const d = new Date(b.created_at); + const dateStr = d.toLocaleString(); + return `${t('settings.backup.retention_info') || ''} ${data.retention_days} ${t('settings.backup.retention_days') || 'gg'}
${rows}`; + } + } + } catch(e) { + if (lastInfoEl) lastInfoEl.innerHTML = 'Error: ' + e.message + ''; + } +} + +async function _backupNow() { + const btn = document.getElementById('btn-backup-now'); + const statusEl = document.getElementById('backup-status'); + if (btn) btn.disabled = true; + if (statusEl) { statusEl.className = 'settings-status'; statusEl.textContent = t('settings.backup.backing_up') || '⏳ Backup in corso…'; statusEl.style.display = 'block'; } + try { + const r = await api('backup_now'); + if (r && r.success) { + if (statusEl) { statusEl.className = 'settings-status success'; statusEl.textContent = `✅ ${r.filename} (${r.size_kb} KB)`; } + await _renderBackupTab(); + } else { + if (statusEl) { statusEl.className = 'settings-status error'; statusEl.textContent = `❌ ${r?.error || 'Error'}`; } + } + } catch(e) { + if (statusEl) { statusEl.className = 'settings-status error'; statusEl.textContent = `❌ ${e.message}`; } + } finally { + if (btn) btn.disabled = false; + if (statusEl) setTimeout(() => { statusEl.style.display = 'none'; }, 5000); + } +} + +async function _backupDelete(filename) { + if (!confirm(`${t('settings.backup.delete_confirm') || 'Eliminare il backup'} ${filename}?`)) return; + const r = await api('backup_delete', {}, 'POST', { filename }); + if (r && r.success) await _renderBackupTab(); + else alert(`❌ ${r?.error || 'Error deleting backup'}`); +} + +async function _backupRestore(filename) { + if (!confirm(`${t('settings.backup.restore_confirm') || 'Ripristinare il backup'} "${filename}"?\n\n⚠️ ATTENZIONE: tutti i dati attuali verranno SOSTITUITI. Questa azione è irreversibile.`)) return; + const statusEl = document.getElementById('backup-status'); + if (statusEl) { statusEl.className = 'settings-status'; statusEl.textContent = '⏳ Ripristino in corso…'; statusEl.style.display = 'block'; } + try { + const r = await api('backup_restore', {}, 'POST', { filename }); + if (r && r.success) { + alert(`✅ ${r.message || 'Ripristino completato!'}\n\nLa pagina verrà ricaricata.`); + location.reload(); + } else { + if (statusEl) { statusEl.className = 'settings-status error'; statusEl.textContent = `❌ ${r?.error || 'Error'}`; } + } + } catch(e) { + if (statusEl) { statusEl.className = 'settings-status error'; statusEl.textContent = `❌ ${e.message}`; } + } +} + +async function _gdriveTest() { + const btn = document.getElementById('btn-gdrive-test'); + const statusEl = document.getElementById('gdrive-test-status'); + if (btn) btn.disabled = true; + if (statusEl) { statusEl.className = 'settings-status'; statusEl.textContent = '⏳ Test connessione…'; statusEl.style.display = 'block'; } + try { + // Save current settings first so the server has the latest JSON/folder + await saveSettings(); + const r = await api('gdrive_test'); + if (r && r.success) { + if (statusEl) { statusEl.className = 'settings-status success'; statusEl.textContent = `✅ ${t('settings.backup.gdrive_ok') || 'Connessione riuscita!'}`; } + } else { + if (statusEl) { statusEl.className = 'settings-status error'; statusEl.textContent = `❌ ${r?.error || 'Error'}`; } + } + } catch(e) { + if (statusEl) { statusEl.className = 'settings-status error'; statusEl.textContent = `❌ ${e.message}`; } + } finally { + if (btn) btn.disabled = false; + if (statusEl) setTimeout(() => { statusEl.style.display = 'none'; }, 6000); + } +} + +async function _gdrivePushNow() { + const btn = document.getElementById('btn-gdrive-push'); + const statusEl = document.getElementById('gdrive-test-status'); + if (btn) btn.disabled = true; + if (statusEl) { statusEl.className = 'settings-status'; statusEl.textContent = t('settings.backup.gdrive_pushing') || '⏳ Upload in corso…'; statusEl.style.display = 'block'; } + try { + await saveSettings(); + const r = await api('gdrive_push'); + if (r && r.success) { + if (statusEl) { statusEl.className = 'settings-status success'; statusEl.textContent = `✅ ${r.filename} → Drive (purged: ${r.purged_remote || 0})`; } + } else { + if (statusEl) { statusEl.className = 'settings-status error'; statusEl.textContent = `❌ ${r?.error || 'Error'}`; } + } + } catch(e) { + if (statusEl) { statusEl.className = 'settings-status error'; statusEl.textContent = `❌ ${e.message}`; } + } finally { + if (btn) btn.disabled = false; + if (statusEl) setTimeout(() => { statusEl.style.display = 'none'; }, 6000); + } +} + +async function _gdriveAuthorize() { + const btn = document.getElementById('btn-gdrive-authorize'); + if (btn) btn.disabled = true; + try { + await saveSettings(); + const r = await api('gdrive_oauth_url'); + if (r && r.success) { + window.open(r.url, '_blank', 'width=600,height=700,noopener'); + // Store redirect_uri used so gdrive_oauth_exchange can match it + window._gdriveLastRedirectUri = r.redirect_uri || 'http://localhost'; + // Show manual code input section + const codeSection = document.getElementById('gdrive-code-section'); + if (codeSection) codeSection.style.display = ''; + const statusEl = document.getElementById('gdrive-oauth-token-status'); + if (statusEl) { + statusEl.textContent = t('settings.backup.gdrive_oauth_window_opened') || '🔑 Authorization page opened — authorize and paste the URL below'; + statusEl.style.color = '#2563eb'; + } + } else { + alert('❌ ' + (r?.error || 'Failed to get OAuth URL')); + } + } catch(e) { + alert('❌ ' + e.message); + } finally { + if (btn) btn.disabled = false; + } +} + +async function _gdriveSubmitCode() { + const inputEl = document.getElementById('gdrive-code-input'); + const btn = document.getElementById('btn-gdrive-submit-code'); + const raw = (inputEl?.value || '').trim(); + if (!raw) { alert(t('settings.backup.gdrive_code_empty') || 'Paste the URL or code first'); return; } + + // Accept either a full URL (extract code param) or just the bare code + let code = raw; + try { + const u = new URL(raw); + const c = u.searchParams.get('code'); + if (c) code = c; + } catch(e) { /* not a URL, use as-is */ } + + if (btn) btn.disabled = true; + try { + const r = await api('gdrive_oauth_exchange', null, 'POST', { + code, + redirect_uri: window._gdriveLastRedirectUri || 'http://localhost' + }); + if (r && r.success) { + const statusEl = document.getElementById('gdrive-oauth-token-status'); + if (statusEl) { + statusEl.textContent = '✅ ' + (t('settings.backup.gdrive_oauth_authorized') || 'Authorized'); + statusEl.style.color = '#15803d'; + } + const codeSection = document.getElementById('gdrive-code-section'); + if (codeSection) codeSection.style.display = 'none'; + if (inputEl) inputEl.value = ''; + } else { + alert('❌ ' + (r?.error || 'Code exchange failed')); + } + } catch(e) { + alert('❌ ' + e.message); + } finally { + if (btn) btn.disabled = false; + } +} + async function _loadInfoTab() { // Cancel any previous auto-refresh - if (_infoTabTimer) { clearInterval(_infoTabTimer); _infoTabTimer = null; } + if (_infoTabTimer) { clearInterval(_infoTabTimer); _infoTabTimer = null; } + if (_backupTabTimer) { clearInterval(_backupTabTimer); _backupTabTimer = null; } await _renderInfoTab(); // Auto-refresh every 30s while Info tab is visible _infoTabTimer = setInterval(_renderInfoTab, 30_000); @@ -2610,7 +2873,9 @@ async function loadSettingsUI() { 'meal_plan_enabled', 'tts_enabled','tts_url','tts_token','tts_method','tts_auth_type', 'tts_content_type','tts_payload_key', - 'price_enabled','price_country','price_currency','price_update_months']; + 'price_enabled','price_country','price_currency','price_update_months', + 'shopping_enabled','shopping_mode','shopping_smart_suggestions', + 'shopping_forecast','shopping_auto_add_threshold']; // Note: gemini_key is never sent from server; settings_token_set is metadata only const settingsTokenRequired = !!serverSettings.settings_token_set; const tokenHintEl = document.getElementById('settings-token-status-hint'); @@ -2624,7 +2889,6 @@ async function loadSettingsUI() { } if (changed) { _settingsCache = s; - localStorage.setItem('evershelf_settings', JSON.stringify(s)); // Re-populate UI with merged values document.getElementById('setting-gemini-key').value = s.gemini_key || ''; document.getElementById('setting-bring-email').value = s.bring_email || ''; @@ -2661,6 +2925,8 @@ async function loadSettingsUI() { if (priceCountryEl) priceCountryEl.value = s.price_country || 'Italia'; if (priceCurrencyEl) priceCurrencyEl.value = s.price_currency || 'EUR'; if (priceMonthsEl) priceMonthsEl.value = s.price_update_months || 3; + // Shopping settings (server merge) + _applyShoppingSettingsUI(s); } } catch(e) { /* offline, use local */ } // Price settings @@ -2685,6 +2951,17 @@ async function loadSettingsUI() { if (scaleEnabledUiEl) scaleEnabledUiEl.checked = !!s.scale_enabled; const scaleUrlUiEl = document.getElementById('setting-scale-url'); if (scaleUrlUiEl) scaleUrlUiEl.value = s.scale_gateway_url || ''; + // Backup settings pre-fill (populated fully when _loadBackupTab() is called) + const bkRetEl = document.getElementById('setting-backup-retention-days'); + if (bkRetEl && !bkRetEl.dataset.loaded) bkRetEl.value = s.backup_retention_days || 3; + const gdriveEnUiEl = document.getElementById('setting-gdrive-enabled'); + if (gdriveEnUiEl) gdriveEnUiEl.checked = !!s.gdrive_enabled; + const gdriveFolderUiEl = document.getElementById('setting-gdrive-folder-id'); + if (gdriveFolderUiEl && !gdriveFolderUiEl.dataset.loaded) gdriveFolderUiEl.value = s.gdrive_folder_id || ''; + const gdriveRetUiEl = document.getElementById('setting-gdrive-retention-days'); + if (gdriveRetUiEl && !gdriveRetUiEl.dataset.loaded) gdriveRetUiEl.value = s.gdrive_retention_days || 30; + // Shopping settings + _applyShoppingSettingsUI(s); // Hide kiosk download banner if running inside Android WebView (kiosk mode) const kioskBanner = document.getElementById('kiosk-download-banner'); if (kioskBanner && /; wv\)/.test(navigator.userAgent)) { @@ -2744,7 +3021,7 @@ function _openKioskNativeSettings() { _kioskBridge.openNativeSettings(); } catch(e) { // Older APK without openNativeSettings bridge — inform user to update - showToast(t('settings.kiosk.native_update_hint') || 'Aggiorna l\'app kiosk per usare questa funzione', 'warning', 4000); + showToast(t('settings.kiosk.native_update_hint'), 'warning', 4000); } } @@ -2853,16 +3130,31 @@ https://github.com/dadaloop82/EverShelf/releases/download/kiosk-latest/evershelf function _injectKioskOverlay() { if (typeof _kioskBridge === 'undefined') return; - // Always mark header as kiosk-mode (idempotent) — must happen even if buttons - // were already injected by the native onPageFinished Kotlin callback. + // Always mark header as kiosk-mode (idempotent). const appHeader = document.querySelector('.app-header'); if (appHeader) appHeader.classList.add('kiosk-mode'); + // Permanently hide the native Android settings button. + // Kiosk configuration is accessible ONLY through the web settings page (⚙️ below). + try { _kioskBridge.setNativeSettingsVisible(false); } catch (_) {} + const btnStyle = 'background:rgba(255,255,255,0.2);border:none;color:#fff;width:34px;height:34px;border-radius:50%;font-size:15px;cursor:pointer;display:flex;align-items:center;justify-content:center;-webkit-tap-highlight-color:transparent;touch-action:manipulation;'; - // If the Kotlin onPageFinished already injected #_kiosk_overlay (with only ✕ and ↻), - // nothing more to do — the native Android btnSettings (top-right) opens SettingsActivity. - if (document.getElementById('_kiosk_overlay')) return; + // If the Kotlin onPageFinished already injected #_kiosk_overlay (with ✕ and ↻), + // just add the ⚙️ button if missing (do not duplicate the other buttons). + const existing = document.getElementById('_kiosk_overlay'); + if (existing) { + if (!document.getElementById('_kiosk_settings_btn')) { + const sBtn = document.createElement('button'); + sBtn.id = '_kiosk_settings_btn'; + sBtn.textContent = '⚙️'; + sBtn.title = t('settings.title') || 'Impostazioni'; + sBtn.style.cssText = btnStyle; + sBtn.addEventListener('click', (e) => { e.stopPropagation(); showPage('settings'); }); + existing.appendChild(sBtn); + } + return; + } const headerLeft = document.getElementById('header-left'); if (!headerLeft) return; @@ -2893,12 +3185,17 @@ function _injectKioskOverlay() { _kioskBridge.hardReload(); }); - // NOTE: No ⚙️ button here — the native Android settings button (top-right, injected by - // Kotlin) opens SettingsActivity (server URL, BLE scale, screensaver). Do NOT call - // setNativeSettingsVisible(false) — that would hide the only way to reconfigure the kiosk. + // Settings button — only web settings, native button is permanently hidden + const settingsBtn = document.createElement('button'); + settingsBtn.id = '_kiosk_settings_btn'; + settingsBtn.textContent = '⚙️'; + settingsBtn.title = t('settings.title') || 'Impostazioni'; + settingsBtn.style.cssText = btnStyle; + settingsBtn.addEventListener('click', (e) => { e.stopPropagation(); showPage('settings'); }); wrap.appendChild(exitBtn); wrap.appendChild(refBtn); + wrap.appendChild(settingsBtn); headerLeft.appendChild(wrap); } @@ -3018,6 +3315,37 @@ function removeAppliance(idx) { renderAppliances(s.appliances); } +function _applyShoppingSettingsUI(s) { + const enabledEl = document.getElementById('setting-shopping-enabled'); + if (enabledEl) enabledEl.checked = s.shopping_enabled !== false; + const mode = s.shopping_mode || 'internal'; + document.querySelectorAll('input[name="shopping-mode"]').forEach(r => { r.checked = (r.value === mode); }); + const bringSection = document.getElementById('bring-subsection'); + if (bringSection) bringSection.style.display = mode === 'bring' ? '' : 'none'; + const suggestEl = document.getElementById('setting-shopping-smart-suggestions'); + if (suggestEl) suggestEl.checked = s.shopping_smart_suggestions !== false; + const forecastEl = document.getElementById('setting-shopping-forecast'); + if (forecastEl) forecastEl.checked = s.shopping_forecast !== false; + const autoAddEl = document.getElementById('setting-shopping-auto-add'); + if (autoAddEl) autoAddEl.value = s.shopping_auto_add_threshold || 0; +} + +function onShoppingEnabledChange() { + const s = getSettings(); + s.shopping_enabled = document.getElementById('setting-shopping-enabled').checked; + saveSettingsToStorage(s); + _saveSettingToServer({ shopping_enabled: s.shopping_enabled }); +} + +function onShoppingModeChange(value) { + const bringSection = document.getElementById('bring-subsection'); + if (bringSection) bringSection.style.display = value === 'bring' ? '' : 'none'; + const s = getSettings(); + s.shopping_mode = value; + saveSettingsToStorage(s); + _saveSettingToServer({ shopping_mode: value }); +} + async function saveSettings() { const s = getSettings(); // Only update gemini_key if user actually typed something; preserve existing key otherwise @@ -3092,6 +3420,33 @@ async function saveSettings() { if (priceCurrencySaveEl) s.price_currency = priceCurrencySaveEl.value; const priceMonthsSaveEl = document.getElementById('setting-price-update-months'); if (priceMonthsSaveEl) s.price_update_months = parseInt(priceMonthsSaveEl.value, 10) || 3; + // Backup settings + const backupEnabledEl = document.getElementById('setting-backup-enabled'); + if (backupEnabledEl) s.backup_enabled = backupEnabledEl.checked; + const backupRetentionEl = document.getElementById('setting-backup-retention-days'); + if (backupRetentionEl) s.backup_retention_days = parseInt(backupRetentionEl.value, 10) || 3; + const gdriveEnabledEl = document.getElementById('setting-gdrive-enabled'); + if (gdriveEnabledEl) s.gdrive_enabled = gdriveEnabledEl.checked; + const gdriveFolderEl = document.getElementById('setting-gdrive-folder-id'); + if (gdriveFolderEl) s.gdrive_folder_id = gdriveFolderEl.value.trim(); + const gdriveRetentionEl = document.getElementById('setting-gdrive-retention-days'); + if (gdriveRetentionEl) s.gdrive_retention_days = parseInt(gdriveRetentionEl.value, 10) || 30; + // Shopping settings + const shoppingEnabledEl = document.getElementById('setting-shopping-enabled'); + if (shoppingEnabledEl) s.shopping_enabled = shoppingEnabledEl.checked; + const shoppingModeEl = document.querySelector('input[name="shopping-mode"]:checked'); + if (shoppingModeEl) s.shopping_mode = shoppingModeEl.value; + const shoppingSuggestEl = document.getElementById('setting-shopping-smart-suggestions'); + if (shoppingSuggestEl) s.shopping_smart_suggestions = shoppingSuggestEl.checked; + const shoppingForecastEl = document.getElementById('setting-shopping-forecast'); + if (shoppingForecastEl) s.shopping_forecast = shoppingForecastEl.checked; + const shoppingAutoAddEl = document.getElementById('setting-shopping-auto-add'); + if (shoppingAutoAddEl) s.shopping_auto_add_threshold = parseInt(shoppingAutoAddEl.value, 10) || 0; + // OAuth fields + const gdriveClientIdEl = document.getElementById('setting-gdrive-client-id'); + if (gdriveClientIdEl && gdriveClientIdEl.value.trim()) s.gdrive_client_id = gdriveClientIdEl.value.trim(); + const gdriveClientSecretEl = document.getElementById('setting-gdrive-client-secret'); + if (gdriveClientSecretEl && gdriveClientSecretEl.value.trim()) s.gdrive_client_secret = gdriveClientSecretEl.value.trim(); saveSettingsToStorage(s); // Save ALL settings to server .env @@ -3136,8 +3491,20 @@ async function saveSettings() { price_currency: s.price_currency, price_update_months: s.price_update_months, recipe_retention_days: s.recipe_retention_days || 7, - transaction_retention_days: s.transaction_retention_days || 7, + transaction_retention_days: s.transaction_retention_days || 90, vacuum_expiry_extension_days: s.vacuum_expiry_extension_days || 30, + backup_enabled: s.backup_enabled !== false, + backup_retention_days: s.backup_retention_days || 3, + gdrive_enabled: !!s.gdrive_enabled, + gdrive_folder_id: s.gdrive_folder_id || '', + gdrive_retention_days: s.gdrive_retention_days || 30, + ...(s.gdrive_client_id ? { gdrive_client_id: s.gdrive_client_id } : {}), + ...(s.gdrive_client_secret ? { gdrive_client_secret: s.gdrive_client_secret } : {}), + shopping_enabled: s.shopping_enabled !== false, + shopping_mode: s.shopping_mode || 'internal', + shopping_smart_suggestions: s.shopping_smart_suggestions !== false, + shopping_forecast: s.shopping_forecast !== false, + shopping_auto_add_threshold: s.shopping_auto_add_threshold || 0, }, tokenHeader); const statusEl = document.getElementById('settings-status'); if (result.success) { @@ -3197,14 +3564,15 @@ function togglePasswordVisibility(inputId) { // ===== API HELPER ===== async function api(action, params = {}, method = 'GET', body = null, extraHeaders = {}) { - // In demo mode, all Bring! write operations are no-ops + // In demo mode, all shopping write operations are no-ops if (_demoMode) { - const BRING_WRITE_ACTIONS = ['bring_add', 'bring_remove', 'bring_migrate_names', 'bring_set_spec']; + const BRING_WRITE_ACTIONS = ['bring_add', 'bring_remove', 'bring_migrate_names', 'bring_set_spec', + 'shopping_add', 'shopping_remove']; if (BRING_WRITE_ACTIONS.includes(action)) { return { success: true, added: 0, removed: 0, skipped: 0, _demo: true }; } - // bring_list returns the in-memory demo list - if (action === 'bring_list') { + // shopping_list / bring_list return the in-memory demo list + if (action === 'shopping_list' || action === 'bring_list') { return { success: true, purchase: shoppingItems, listUUID: 'demo-list', _demo: true }; } } @@ -5451,8 +5819,6 @@ function showItemDetail(inventoryId, productId) { function closeModal() { document.getElementById('modal-overlay').style.display = 'none'; clearMoveModalTimer(); - // Restore the native kiosk settings button when the modal closes. - try { if (typeof _kioskBridge !== 'undefined') _kioskBridge.setNativeSettingsVisible(true); } catch (_) {} _cancelScaleAutoConfirm(false); _scaleRecipeAutoFillPaused = false; _scaleUserDismissed = false; @@ -7972,7 +8338,7 @@ async function submitAdd(e) { // try a client-side fuzzy remove using the already-loaded shoppingItems const match = _findSimilarItem(currentProduct.name, shoppingItems); if (match) { - api('bring_remove', {}, 'POST', { + api('shopping_remove', {}, 'POST', { name: match.name, rawName: match.rawName || '', listUUID: shoppingListUUID @@ -8230,9 +8596,29 @@ async function loadUseInventoryInfo() { // Show unit switch unitSwitch.style.display = 'flex'; document.getElementById('use-unit-sub').textContent = subLabel; - - // Default to sub-unit mode - switchUseUnit('sub'); + + // If scale is active, start in sub-unit (g/ml) mode — scale always reads weight. + // Otherwise default to conf so the user thinks in packages. + const _scaleActiveNow = getSettings().scale_enabled && getSettings().scale_gateway_url && _scaleConnected; + switchUseUnit(_scaleActiveNow ? 'sub' : 'conf'); + + // Fraction shortcut buttons for conf mode (½, 1, 2 packages) + const existingConfFrac = document.getElementById('conf-fraction-btns'); + if (existingConfFrac) existingConfFrac.remove(); + const confFracDiv = document.createElement('div'); + confFracDiv.id = 'conf-fraction-btns'; + confFracDiv.className = 'pz-fraction-btns'; + const maxConf = Math.min(4, Math.ceil(_useConfMode.totalConf)); + const confFracs = [0.25, 0.5, 1]; + if (maxConf >= 2) confFracs.push(2); + confFracDiv.innerHTML = `✅ Data trovata: ${formatDate(result.expiry_date)}
`; + statusDiv.innerHTML = `✅ ${t('scanner.expiry_found')}: ${formatDate(result.expiry_date)}
`; // Close modal after delay setTimeout(() => closeExpiryScanner(), 1500); } else if (result.error === 'no_api_key') { statusDiv.innerHTML = `${t('ai.no_api_key').replace(/\n/g, '
')}
❌ Non riesco a leggere la data. ${result.raw_text ? '
Letto: ' + escapeHtml(result.raw_text) + '' : ''}
❌ ${t('scanner.expiry_read_fail')} ${result.raw_text ? '
' + t('scanner.expiry_raw_label') + ': ' + escapeHtml(result.raw_text) + '' : ''}
${t('move.question_short').replace('{thing}', openedId ? t('move.thing_opened') : t('move.thing_rest'))}
${t('settings.backup.gdrive_redirect_uri_label') || 'Redirect URI:'} http://localhost
Credenziali per l'integrazione con la lista della spesa Bring!
+Configura la lista della spesa integrata o collega Bring!.
+rimasto in magazzino (0 = solo quando esaurito)
+Snapshot giornaliero automatico del database. Massimo 3 giorni di storico (configurabile).
+Caricamento…
+Carica automaticamente il backup su Google Drive usando un Service Account.
+Copia l'ID dalla URL della cartella Drive: …/folders/ID
+http://localhost
+ Registra questo URI in Google Cloud Console come "URI di reindirizzamento autorizzato". Per le installazioni senza dominio pubblico usa http://localhost.
+http://localhost/?code=4%2F0A...) und füge sie hier ein.",
+ "gdrive_code_submit": "Bestätigen",
+ "gdrive_code_empty": "Bitte zuerst die URL oder den Autorisierungscode einfügen",
+ "gdrive_redirect_uri_label": "Redirect-URI (in Google Cloud Console eintragen):",
+ "gdrive_oauth_authorize": "Mit Google autorisieren",
+ "gdrive_oauth_authorized": "Autorisiert",
+ "gdrive_oauth_not_authorized": "Noch nicht autorisiert",
+ "gdrive_oauth_window_opened": "Browserfenster geöffnet — autorisieren und zurückkehren",
+ "gdrive_oauth_how_to": "OAuth 2.0 einrichten (Schritt für Schritt)",
+ "gdrive_oauth_steps": "http://localhost/?code=4%2F0A...) and paste it here.",
+ "gdrive_code_submit": "Submit",
+ "gdrive_code_empty": "Paste the URL or authorization code first",
+ "gdrive_redirect_uri_label": "Redirect URI (add this in Google Cloud Console):",
+ "gdrive_oauth_authorize": "Authorize with Google",
+ "gdrive_oauth_authorized": "Authorized",
+ "gdrive_oauth_not_authorized": "Not authorized yet",
+ "gdrive_oauth_window_opened": "Browser window opened — authorize and come back",
+ "gdrive_oauth_how_to": "How to set up OAuth 2.0 (step by step)",
+ "gdrive_oauth_steps": "http://localhost (a connection error is expected): copy the URL from the address bar and paste it in the field that appears belowhttp://localhost/?code=4%2F0A...) y pégala aquí.",
+ "gdrive_code_submit": "Confirmar",
+ "gdrive_code_empty": "Pega primero la URL o el código de autorización",
+ "gdrive_redirect_uri_label": "URI de redirección (agregar en Google Cloud Console):",
+ "gdrive_oauth_authorize": "Autorizar con Google",
+ "gdrive_oauth_authorized": "Autorizado",
+ "gdrive_oauth_not_authorized": "Aún no autorizado",
+ "gdrive_oauth_window_opened": "Ventana abierta — autoriza y regresa aquí",
+ "gdrive_oauth_how_to": "Cómo configurar OAuth 2.0 (paso a paso)",
+ "gdrive_oauth_steps": "http://localhost/?code=4%2F0A...) et colle-la ici.",
+ "gdrive_code_submit": "Confirmer",
+ "gdrive_code_empty": "Coller d'abord l'URL ou le code d'autorisation",
+ "gdrive_redirect_uri_label": "URI de redirection (ajouter dans Google Cloud Console) :",
+ "gdrive_oauth_authorize": "Autoriser avec Google",
+ "gdrive_oauth_authorized": "Autorisé",
+ "gdrive_oauth_not_authorized": "Pas encore autorisé",
+ "gdrive_oauth_window_opened": "Fenêtre ouverte — autorisez et revenez ici",
+ "gdrive_oauth_how_to": "Configurer OAuth 2.0 (étape par étape)",
+ "gdrive_oauth_steps": "http://localhost (possibile errore di connessione è normale): copia l'URL dalla barra degli indirizzi e incollalo nel campo che appare qui sottohttp://localhost/?code=4%2F0A...) e incollalo qui.",
+ "gdrive_code_submit": "Conferma",
+ "gdrive_code_empty": "Incolla prima l'URL o il codice di autorizzazione"
+ },
"info": {
"tab": "Info",
"ai_title": "Gemini AI — Utilizzo Token",
@@ -802,7 +849,22 @@
"currency_title": "Valuta",
"currency_hint": "La valuta usata per tutti i costi e i prezzi nell'app."
},
- "tab_general": "Generali"
+ "tab_general": "Generali",
+ "shopping": {
+ "tab": "Lista spesa",
+ "title": "Lista della spesa",
+ "hint": "Configura la lista della spesa integrata o collega Bring!.",
+ "enable_label": "Abilita lista della spesa",
+ "mode_label": "Provider",
+ "mode_internal": "Interno (senza Bring!)",
+ "mode_bring": "Bring! (app esterna)",
+ "bring_section_title": "Configurazione Bring!",
+ "ai_section_title": "Assistenza AI",
+ "smart_suggestions_label": "Suggerimenti AI",
+ "forecast_label": "Previsione prodotti in esaurimento",
+ "auto_add_label": "Aggiungi automaticamente quando",
+ "auto_add_suffix": "rimasto in magazzino (0 = solo quando esaurito)"
+ }
},
"expiry": {
"today": "OGGI",
@@ -1034,7 +1096,10 @@
"retake_btn": "🔄 Riscatta",
"camera_error_hint": "Assicurati di usare HTTPS e di aver concesso i permessi della fotocamera.