diff --git a/package-lock.json b/package-lock.json index 64fd4a5..9c84c15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "better-sqlite3": "^9.4.3", "express": "^4.18.3", + "multer": "^1.4.5-lts.1", "pdfkit": "^0.15.0" }, "devDependencies": { @@ -55,6 +56,12 @@ "node": ">= 8" } }, + "node_modules/append-field": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz", + "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==", + "license": "MIT" + }, "node_modules/array-buffer-byte-length": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", @@ -249,6 +256,23 @@ "ieee754": "^1.1.13" } }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "license": "MIT" + }, + "node_modules/busboy": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", + "dependencies": { + "streamsearch": "^1.1.0" + }, + "engines": { + "node": ">=10.16.0" + } + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -345,6 +369,57 @@ "node": ">=0.8" } }, + "node_modules/concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "engines": [ + "node >= 0.8" + ], + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "node_modules/concat-stream/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "license": "MIT" + }, + "node_modules/concat-stream/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/concat-stream/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" + }, + "node_modules/concat-stream/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -381,6 +456,12 @@ "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", "license": "MIT" }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "license": "MIT" + }, "node_modules/crypto-js": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", @@ -1449,6 +1530,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "license": "MIT", + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", @@ -1461,6 +1554,25 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "license": "MIT" }, + "node_modules/multer": { + "version": "1.4.5-lts.2", + "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.2.tgz", + "integrity": "sha512-VzGiVigcG9zUAoCNU+xShztrlr1auZOlurXynNvO9GiWD1/mTBbUljOKY+qMeazBqXgRnjzeEgJI/wyjJUHg9A==", + "deprecated": "Multer 1.x is impacted by a number of vulnerabilities, which have been patched in 2.x. You should upgrade to the latest 2.x version.", + "license": "MIT", + "dependencies": { + "append-field": "^1.0.0", + "busboy": "^1.0.0", + "concat-stream": "^1.5.2", + "mkdirp": "^0.5.4", + "object-assign": "^4.1.1", + "type-is": "^1.6.4", + "xtend": "^4.0.0" + }, + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/napi-build-utils": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", @@ -1552,6 +1664,15 @@ "node": ">=0.10.0" } }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", @@ -1718,6 +1839,12 @@ "node": ">=10" } }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "license": "MIT" + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -2145,6 +2272,14 @@ "node": ">= 0.4" } }, + "node_modules/streamsearch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -2273,6 +2408,12 @@ "node": ">= 0.6" } }, + "node_modules/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", + "license": "MIT" + }, "node_modules/undefsafe": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", @@ -2396,6 +2537,15 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "license": "ISC" + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "license": "MIT", + "engines": { + "node": ">=0.4" + } } } } diff --git a/package.json b/package.json index 232b154..cb3003b 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "dependencies": { "better-sqlite3": "^9.4.3", "express": "^4.18.3", + "multer": "^1.4.5-lts.1", "pdfkit": "^0.15.0" }, "devDependencies": { diff --git a/public/css/style.css b/public/css/style.css index 4ad414c..d9434d4 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -311,3 +311,103 @@ td { margin-top: auto; } .form-actions .btn-primary { flex: 1; padding: 8px; } + +/* ── Import modal ── */ +.modal-overlay { + position: fixed; + inset: 0; + background: rgba(0,0,0,0.4); + z-index: 200; + opacity: 0; + pointer-events: none; + transition: opacity 0.15s; +} +.modal-overlay.open { opacity: 1; pointer-events: auto; } + +.modal { + position: fixed; + top: 50%; + left: 50%; + transform: translate(-50%, -48%); + width: 480px; + max-width: calc(100vw - 2rem); + background: var(--surface); + border-radius: 6px; + box-shadow: 0 8px 32px rgba(0,0,0,0.2); + z-index: 201; + display: flex; + flex-direction: column; + opacity: 0; + pointer-events: none; + transition: opacity 0.15s, transform 0.15s; +} +.modal.open { + opacity: 1; + pointer-events: auto; + transform: translate(-50%, -50%); +} + +.modal-header { + display: flex; + align-items: center; + justify-content: space-between; + padding: 10px 16px; + background: var(--header-bg); + color: var(--header-fg); + border-radius: 6px 6px 0 0; + flex-shrink: 0; +} +.modal-header h2 { font-size: 14px; font-weight: 600; } + +.modal-body { + padding: 16px; + display: flex; + flex-direction: column; + gap: 12px; +} + +.modal-desc { + font-size: 12px; + color: var(--text-muted); + line-height: 1.5; +} +.modal-desc code { + font-family: monospace; + background: var(--bg); + padding: 1px 4px; + border-radius: 3px; +} + +input[type="file"] { + border: 1px solid var(--border); + border-radius: 4px; + padding: 6px 8px; + font-size: 13px; + font-family: var(--font); + width: 100%; + background: var(--surface); + cursor: pointer; +} + +.import-log { + font-family: monospace; + font-size: 11px; + background: #0f172a; + color: #94a3b8; + border-radius: 4px; + padding: 10px 12px; + max-height: 200px; + overflow-y: auto; + white-space: pre-wrap; + word-break: break-all; + line-height: 1.5; +} +.import-log.success { color: #86efac; } +.import-log.error { color: #fca5a5; } + +.modal-footer { + display: flex; + gap: 8px; + padding: 12px 16px; + border-top: 1px solid var(--border); +} diff --git a/public/index.html b/public/index.html index 65947db..1e78e53 100644 --- a/public/index.html +++ b/public/index.html @@ -30,6 +30,7 @@ Generate PDF 0 + @@ -117,6 +118,27 @@ + + + + diff --git a/public/js/app.js b/public/js/app.js index a1d56fd..7eb2182 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -337,6 +337,65 @@ async function reprintCheck(id) { } } +// ── Import modal ───────────────────────────────────────────────────────────── + +function openImportModal() { + document.getElementById('import-file').value = ''; + const log = document.getElementById('import-log'); + log.hidden = true; + log.textContent = ''; + log.className = 'import-log'; + document.getElementById('btn-run-import').disabled = false; + document.getElementById('btn-run-import').textContent = 'Import'; + document.getElementById('import-modal-overlay').classList.add('open'); + document.getElementById('import-modal').classList.add('open'); +} + +function closeImportModal() { + document.getElementById('import-modal-overlay').classList.remove('open'); + document.getElementById('import-modal').classList.remove('open'); +} + +async function runImport() { + const fileInput = document.getElementById('import-file'); + if (!fileInput.files.length) { + alert('Select an .mdb file first.'); + return; + } + + const btn = document.getElementById('btn-run-import'); + btn.disabled = true; + btn.textContent = 'Importing…'; + + const log = document.getElementById('import-log'); + log.hidden = false; + log.className = 'import-log'; + log.textContent = 'Running import…'; + + const form = new FormData(); + form.append('mdbfile', fileInput.files[0]); + + try { + const res = await fetch('/api/import', { method: 'POST', body: form }); + const data = await res.json(); + log.textContent = data.log || ''; + if (res.ok) { + log.classList.add('success'); + btn.textContent = 'Done'; + await Promise.all([loadAccount(), loadChecks()]); + } else { + log.classList.add('error'); + btn.disabled = false; + btn.textContent = 'Retry'; + } + } catch (err) { + log.classList.add('error'); + log.textContent = err.message; + btn.disabled = false; + btn.textContent = 'Retry'; + } +} + // ── Utilities ──────────────────────────────────────────────────────────────── function escHtml(str) { @@ -383,6 +442,13 @@ function init() { // Generate PDF document.getElementById('btn-generate-pdf').addEventListener('click', generatePdf); + // Import modal + document.getElementById('btn-import').addEventListener('click', openImportModal); + document.getElementById('btn-close-import').addEventListener('click', closeImportModal); + document.getElementById('btn-cancel-import').addEventListener('click', closeImportModal); + document.getElementById('import-modal-overlay').addEventListener('click', closeImportModal); + document.getElementById('btn-run-import').addEventListener('click', runImport); + // Initial data load loadAccount(); loadChecks(); diff --git a/src/app.js b/src/app.js index 29eb999..09e1539 100644 --- a/src/app.js +++ b/src/app.js @@ -2,8 +2,13 @@ const express = require('express'); const path = require('path'); +const fs = require('fs'); +const os = require('os'); +const { execFileSync } = require('child_process'); +const multer = require('multer'); const app = express(); +const upload = multer({ dest: os.tmpdir() }); app.use(express.json()); app.use(express.static(path.join(__dirname, '../public'))); @@ -12,6 +17,27 @@ app.use(express.static(path.join(__dirname, '../public'))); app.use('/api/checks', require('./routes/checks')); app.use('/api/pdf', require('./routes/pdf')); +// .mdb import endpoint +app.post('/api/import', upload.single('mdbfile'), (req, res) => { + if (!req.file) return res.status(400).json({ error: 'No file uploaded.' }); + const tmpPath = req.file.path; + try { + const output = execFileSync( + process.execPath, + [path.join(__dirname, '../migrations/import-mdb.js'), '--file', tmpPath], + { encoding: 'utf8', timeout: 120000, env: process.env } + ); + res.json({ success: true, log: output }); + } catch (err) { + res.status(500).json({ + error: 'Import failed.', + log: [err.stdout, err.stderr, err.message].filter(Boolean).join('\n'), + }); + } finally { + fs.unlink(tmpPath, () => {}); + } +}); + // Account info endpoint (read-only for Phase 1) app.get('/api/account', (req, res) => { const db = require('./db/database');