diff --git a/docs/screenshots/frontend-add-tool-qr.png b/docs/screenshots/frontend-add-tool-qr.png new file mode 100644 index 0000000..86e4ef9 Binary files /dev/null and b/docs/screenshots/frontend-add-tool-qr.png differ diff --git a/docs/screenshots/frontend-edit-tool-qr.png b/docs/screenshots/frontend-edit-tool-qr.png new file mode 100644 index 0000000..a00e83a Binary files /dev/null and b/docs/screenshots/frontend-edit-tool-qr.png differ diff --git a/frontend/tool-inventory-app/package-lock.json b/frontend/tool-inventory-app/package-lock.json index d7e22a9..fd721e9 100644 --- a/frontend/tool-inventory-app/package-lock.json +++ b/frontend/tool-inventory-app/package-lock.json @@ -18,6 +18,7 @@ "@angular/platform-browser": "^21.2.0", "@angular/router": "^21.2.0", "@zxing/ngx-scanner": "^21.0.0", + "qrcode": "^1.5.4", "rxjs": "~7.8.0", "tslib": "^2.3.0" }, @@ -25,6 +26,7 @@ "@angular/build": "^21.2.13", "@angular/cli": "^21.2.13", "@angular/compiler-cli": "^21.2.0", + "@types/qrcode": "^1.5.5", "jsdom": "^28.0.0", "prettier": "^3.8.1", "typescript": "~5.9.2", @@ -4059,6 +4061,26 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/node": { + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-26.0.0.tgz", + "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~8.3.0" + } + }, + "node_modules/@types/qrcode": { + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/@types/qrcode/-/qrcode-1.5.6.tgz", + "integrity": "sha512-te7NQcV2BOvdj2b1hCAHzAoMNuj65kNBMz0KBaxM6c3VGBOhU0dURQKOtH8CFNI/dsKkwlv32p26qYQTWoB5bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@vitejs/plugin-basic-ssl": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-2.1.4.tgz", @@ -4614,6 +4636,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/caniuse-lite": { "version": "1.0.30001793", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz", @@ -4802,7 +4833,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -4815,7 +4845,6 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, "license": "MIT" }, "node_modules/colorette": { @@ -5011,6 +5040,15 @@ } } }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/decimal.js": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz", @@ -5039,6 +5077,12 @@ "node": ">=8" } }, + "node_modules/dijkstrajs": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz", + "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==", + "license": "MIT" + }, "node_modules/dom-serializer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", @@ -5480,6 +5524,19 @@ "url": "https://opencollective.com/express" } }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -5552,7 +5609,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" @@ -6213,6 +6269,18 @@ "@lmdb/lmdb-win32-x64": "3.5.1" } }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/log-symbols": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-7.0.1.tgz", @@ -6996,6 +7064,33 @@ "license": "MIT", "optional": true }, + "node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/p-map": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", @@ -7009,6 +7104,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/pacote": { "version": "21.3.1", "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.3.1.tgz", @@ -7116,6 +7220,15 @@ "node": ">= 0.8" } }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -7214,6 +7327,15 @@ "node": ">=16.20.0" } }, + "node_modules/pngjs": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", + "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==", + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/postcss": { "version": "8.5.15", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz", @@ -7341,6 +7463,125 @@ "node": ">=6" } }, + "node_modules/qrcode": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz", + "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==", + "license": "MIT", + "dependencies": { + "dijkstrajs": "^1.0.1", + "pngjs": "^5.0.0", + "yargs": "^15.3.1" + }, + "bin": { + "qrcode": "bin/qrcode" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/qrcode/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/qrcode/node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "node_modules/qrcode/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/qrcode/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/qrcode/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/qrcode/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/qrcode/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "license": "ISC" + }, + "node_modules/qrcode/node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "license": "MIT", + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/qrcode/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "license": "ISC", + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/qs": { "version": "6.15.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz", @@ -7404,6 +7645,15 @@ "dev": true, "license": "Apache-2.0" }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -7414,6 +7664,12 @@ "node": ">=0.10.0" } }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "license": "ISC" + }, "node_modules/restore-cursor": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", @@ -7682,6 +7938,12 @@ "url": "https://opencollective.com/express" } }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "license": "ISC" + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -8254,6 +8516,13 @@ "node": ">=20.18.1" } }, + "node_modules/undici-types": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz", + "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==", + "dev": true, + "license": "MIT" + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -8566,6 +8835,12 @@ "node": ">= 8" } }, + "node_modules/which-module": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", + "license": "ISC" + }, "node_modules/why-is-node-running": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", @@ -8587,7 +8862,6 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", @@ -8602,7 +8876,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -8612,7 +8885,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -8628,14 +8900,12 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, "license": "MIT" }, "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -8645,7 +8915,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -8660,7 +8929,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" diff --git a/frontend/tool-inventory-app/package.json b/frontend/tool-inventory-app/package.json index 26c79f1..4be3d9c 100644 --- a/frontend/tool-inventory-app/package.json +++ b/frontend/tool-inventory-app/package.json @@ -20,6 +20,7 @@ "@angular/material": "^21.2.13", "@angular/platform-browser": "^21.2.0", "@angular/router": "^21.2.0", + "qrcode": "^1.5.4", "@zxing/ngx-scanner": "^21.0.0", "rxjs": "~7.8.0", "tslib": "^2.3.0" @@ -28,6 +29,7 @@ "@angular/build": "^21.2.13", "@angular/cli": "^21.2.13", "@angular/compiler-cli": "^21.2.0", + "@types/qrcode": "^1.5.5", "jsdom": "^28.0.0", "prettier": "^3.8.1", "typescript": "~5.9.2", diff --git a/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.html b/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.html index 178a85e..026c7e2 100644 --- a/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.html +++ b/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.html @@ -11,12 +11,41 @@

{{ isEdit ? 'Edit Tool' : 'Add Tool' }}

+
+ + Make (Manufacturer) + + + + + Model + + +
+ + + Serial number + + + + + Owner + + + Barcode / QR Code - + + @if (qrCodeDataUrl) { +
+

QR payload preview

+ Tool QR code preview +
+ } +
Location @@ -62,4 +91,3 @@

{{ isEdit ? 'Edit Tool' : 'Add Tool' }}

{{ isEdit ? 'Update' : 'Create' }} - diff --git a/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.scss b/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.scss index ce36882..2a0ba81 100644 --- a/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.scss +++ b/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.scss @@ -16,3 +16,24 @@ .half-width { flex: 1; } + +.qr-preview { + margin-bottom: 16px; + padding: 12px; + border: 1px solid #e0e0e0; + border-radius: 8px; + text-align: center; + background-color: #fafafa; +} + +.qr-preview h3 { + margin: 0 0 8px; + font-size: 14px; + font-weight: 600; +} + +.qr-preview img { + width: 220px; + height: 220px; + max-width: 100%; +} diff --git a/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.ts b/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.ts index 7716656..f7a9ba4 100644 --- a/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.ts +++ b/frontend/tool-inventory-app/src/app/features/tools/tool-form-dialog/tool-form-dialog.component.ts @@ -1,5 +1,6 @@ -import { Component, OnInit, inject } from '@angular/core'; +import { Component, DestroyRef, OnInit, inject } from '@angular/core'; import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms'; +import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatButtonModule } from '@angular/material/button'; import { MatFormFieldModule } from '@angular/material/form-field'; @@ -7,6 +8,7 @@ import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar'; +import * as QRCode from 'qrcode'; import { Category } from '../../../models/category.model'; import { Tool, ToolStatus } from '../../../models/tool.model'; import { CategoryService } from '../../../services/category.service'; @@ -33,6 +35,7 @@ export class ToolFormDialogComponent implements OnInit { private readonly categoryService = inject(CategoryService); private readonly dialogRef = inject(MatDialogRef); private readonly snackBar = inject(MatSnackBar); + private readonly destroyRef = inject(DestroyRef); readonly data: Tool | null = inject(MAT_DIALOG_DATA, { optional: true }) ?? null; readonly categories: Category[] = []; @@ -40,14 +43,19 @@ export class ToolFormDialogComponent implements OnInit { readonly form = this.fb.group({ name: ['', Validators.required], + make: [''], + model: [''], + serialNumber: [''], + owner: [''], description: [''], - barcode: [''], + barcode: [{ value: '', disabled: true }], location: [''], systainer: [''], imageUrl: [''], categoryId: [null as number | null], status: ['Available' as ToolStatus, Validators.required] }); + qrCodeDataUrl = ''; get isEdit(): boolean { return !!this.data; @@ -61,6 +69,10 @@ export class ToolFormDialogComponent implements OnInit { if (this.data) { this.form.patchValue({ name: this.data.name, + make: this.data.make ?? '', + model: this.data.model ?? '', + serialNumber: this.data.serialNumber ?? '', + owner: this.data.owner ?? '', description: this.data.description ?? '', barcode: this.data.barcode ?? '', location: this.data.location ?? '', @@ -69,7 +81,14 @@ export class ToolFormDialogComponent implements OnInit { categoryId: this.data.categoryId ?? null, status: this.data.status }); + } else { + this.form.patchValue({ barcode: this.generateBarcode() }); } + + this.form.valueChanges + .pipe(takeUntilDestroyed(this.destroyRef)) + .subscribe(() => void this.refreshQrCode()); + void this.refreshQrCode(); } save(): void { @@ -86,8 +105,11 @@ export class ToolFormDialogComponent implements OnInit { if (this.isEdit && this.data) { this.toolService.update(this.data.id, { name, + make: value.make || undefined, + model: value.model || undefined, + serialNumber: value.serialNumber || undefined, + owner: value.owner || undefined, description: value.description || undefined, - barcode: value.barcode || undefined, location: value.location || undefined, systainer: value.systainer || undefined, imageUrl: value.imageUrl || undefined, @@ -103,6 +125,10 @@ export class ToolFormDialogComponent implements OnInit { } else { this.toolService.create({ name, + make: value.make || undefined, + model: value.model || undefined, + serialNumber: value.serialNumber || undefined, + owner: value.owner || undefined, description: value.description || undefined, barcode: value.barcode || undefined, location: value.location || undefined, @@ -122,4 +148,31 @@ export class ToolFormDialogComponent implements OnInit { cancel(): void { this.dialogRef.close(false); } + + private async refreshQrCode(): Promise { + const value = this.form.getRawValue(); + const barcode = (value.barcode ?? '').trim(); + if (!barcode) { + this.qrCodeDataUrl = ''; + return; + } + + const payload = JSON.stringify({ + id: barcode, + make: (value.make ?? '').trim(), + model: (value.model ?? '').trim(), + owner: (value.owner ?? '').trim() + }); + this.qrCodeDataUrl = await QRCode.toDataURL(payload, { width: 220, margin: 1 }); + } + + private generateBarcode(): string { + if (globalThis.crypto?.randomUUID) { + return globalThis.crypto.randomUUID().toUpperCase(); + } + + return '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, c => + (Number(c) ^ (Math.random() * 16 >> (Number(c) / 4))).toString(16) + ).toUpperCase(); + } } diff --git a/frontend/tool-inventory-app/src/app/features/tools/tools-list/tools-list.component.ts b/frontend/tool-inventory-app/src/app/features/tools/tools-list/tools-list.component.ts index f39a8fc..5329078 100644 --- a/frontend/tool-inventory-app/src/app/features/tools/tools-list/tools-list.component.ts +++ b/frontend/tool-inventory-app/src/app/features/tools/tools-list/tools-list.component.ts @@ -372,11 +372,13 @@ export class ToolsListComponent implements OnInit, AfterViewInit { } toolMeta(tool: Tool): string { - return [tool.systainer, tool.barcode].filter(Boolean).join(' · ') || 'No barcode or systainer assigned'; + const modelInfo = [tool.make, tool.model].filter(Boolean).join(' '); + return [modelInfo, tool.serialNumber, tool.owner, tool.systainer, tool.barcode].filter(Boolean).join(' | ') + || 'No make, model, serial number, owner, barcode, or systainer assigned'; } locationMeta(tool: Tool): string { - return [tool.location, tool.description].filter(Boolean).join(' · ') || 'No location details'; + return [tool.location, tool.description].filter(Boolean).join(' � ') || 'No location details'; } private performCheckIn(tool: Tool): void { @@ -417,6 +419,10 @@ export class ToolsListComponent implements OnInit, AfterViewInit { return [ tool.name, + tool.make, + tool.model, + tool.serialNumber, + tool.owner, tool.categoryName, tool.location, tool.systainer, @@ -515,5 +521,3 @@ export class ToolsListComponent implements OnInit, AfterViewInit { && date.getDate() === compareDate.getDate(); } } - - diff --git a/frontend/tool-inventory-app/src/app/models/tool.model.ts b/frontend/tool-inventory-app/src/app/models/tool.model.ts index 9e050a6..eb959f8 100644 --- a/frontend/tool-inventory-app/src/app/models/tool.model.ts +++ b/frontend/tool-inventory-app/src/app/models/tool.model.ts @@ -3,6 +3,10 @@ export type ToolStatus = 'Available' | 'CheckedOut' | 'UnderMaintenance' | 'Reti export interface Tool { id: number; name: string; + make?: string; + model?: string; + serialNumber?: string; + owner?: string; description?: string; barcode?: string; location?: string; @@ -15,6 +19,10 @@ export interface Tool { export interface CreateTool { name: string; + make?: string; + model?: string; + serialNumber?: string; + owner?: string; description?: string; barcode?: string; location?: string; diff --git a/frontend/tool-inventory-app/src/app/shared/scanner-dialog/scanner-dialog.component.ts b/frontend/tool-inventory-app/src/app/shared/scanner-dialog/scanner-dialog.component.ts index 9a0c0cd..b44f8a5 100644 --- a/frontend/tool-inventory-app/src/app/shared/scanner-dialog/scanner-dialog.component.ts +++ b/frontend/tool-inventory-app/src/app/shared/scanner-dialog/scanner-dialog.component.ts @@ -56,13 +56,14 @@ export class ScannerDialogComponent implements OnDestroy { return; } + const toolId = this.extractToolId(code); this.lastScannedCode.set(code); this.scanning.set(false); this.loading.set(true); this.foundTool.set(null); this.errorMessage.set(null); - this.toolService.getByBarcode(code).subscribe({ + this.toolService.getByBarcode(toolId).subscribe({ next: tool => { this.loading.set(false); this.foundTool.set(tool); @@ -71,7 +72,7 @@ export class ScannerDialogComponent implements OnDestroy { this.loading.set(false); this.errorMessage.set( err.status === 404 - ? `No tool found for barcode: ${code}` + ? `No tool found for barcode: ${toolId}` : 'Error looking up barcode. Please try again.' ); } @@ -118,4 +119,22 @@ export class ScannerDialogComponent implements OnDestroy { ngOnDestroy(): void { this.scanning.set(false); } + + private extractToolId(code: string): string { + const scanned = code.trim(); + if (!scanned.startsWith('{')) { + return scanned; + } + + try { + const parsed = JSON.parse(scanned) as { id?: unknown }; + if (typeof parsed.id === 'string' && parsed.id.trim()) { + return parsed.id.trim(); + } + } catch { + // Keep backwards compatibility with plain barcode values. + } + + return scanned; + } } diff --git a/mobile/ToolInventory.MAUI/ToolInventory.MAUI.csproj b/mobile/ToolInventory.MAUI/ToolInventory.MAUI.csproj index cb33ee6..ea0ef24 100644 --- a/mobile/ToolInventory.MAUI/ToolInventory.MAUI.csproj +++ b/mobile/ToolInventory.MAUI/ToolInventory.MAUI.csproj @@ -70,6 +70,7 @@ + diff --git a/mobile/ToolInventory.MAUI/ViewModels/ScannerViewModel.cs b/mobile/ToolInventory.MAUI/ViewModels/ScannerViewModel.cs index afd7a27..b9aebab 100644 --- a/mobile/ToolInventory.MAUI/ViewModels/ScannerViewModel.cs +++ b/mobile/ToolInventory.MAUI/ViewModels/ScannerViewModel.cs @@ -1,5 +1,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using System.Text.Json; using ToolInventory.MAUI.Navigation; using ToolInventory.MAUI.Services; using ToolInventory.Shared.DTOs; @@ -18,17 +19,18 @@ public partial class ScannerViewModel(IToolApiService apiService, IUserDialogSer public async Task OnBarcodeDetectedAsync(string code) { - if (!IsScanning || code == _lastCode) + var toolId = ExtractToolId(code); + if (!IsScanning || toolId == _lastCode) { return; } var currentScanVersion = Interlocked.Increment(ref _scanVersion); - _lastCode = code; + _lastCode = toolId; IsScanning = false; - StatusMessage = $"Looking up: {code}"; + StatusMessage = $"Looking up: {toolId}"; - var result = await apiService.GetToolByBarcodeAsync(code); + var result = await apiService.GetToolByBarcodeAsync(toolId); if (currentScanVersion != _scanVersion) { return; @@ -42,7 +44,7 @@ public async Task OnBarcodeDetectedAsync(string code) else { StatusMessage = result.StatusCode == 404 - ? $"No tool found for: {code}" + ? $"No tool found for: {toolId}" : result.ErrorMessage ?? "Failed to look up barcode."; } } @@ -124,4 +126,34 @@ private async Task CheckInAsync() await dialogService.ShowAlertAsync("Info", result.ErrorMessage ?? "No active checkout found."); } } + + private static string ExtractToolId(string code) + { + var scanned = code.Trim(); + if (!scanned.StartsWith('{')) + { + return scanned; + } + + try + { + using var document = JsonDocument.Parse(scanned); + if (document.RootElement.ValueKind == JsonValueKind.Object + && document.RootElement.TryGetProperty("id", out var idProperty) + && idProperty.ValueKind == JsonValueKind.String) + { + var id = idProperty.GetString()?.Trim(); + if (!string.IsNullOrWhiteSpace(id)) + { + return id; + } + } + } + catch + { + // Keep backwards compatibility with plain barcode values. + } + + return scanned; + } } diff --git a/mobile/ToolInventory.MAUI/ViewModels/ToolDetailViewModel.cs b/mobile/ToolInventory.MAUI/ViewModels/ToolDetailViewModel.cs index 8953d13..494e634 100644 --- a/mobile/ToolInventory.MAUI/ViewModels/ToolDetailViewModel.cs +++ b/mobile/ToolInventory.MAUI/ViewModels/ToolDetailViewModel.cs @@ -1,5 +1,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using QRCoder; +using System.Text.Json; using ToolInventory.MAUI.Navigation; using ToolInventory.MAUI.Services; using ToolInventory.Shared.DTOs; @@ -9,6 +11,7 @@ namespace ToolInventory.MAUI.ViewModels; public partial class ToolDetailViewModel(IToolApiService apiService, IUserDialogService dialogService) : ObservableObject, IQueryAttributable { [ObservableProperty] public partial ToolDto? Tool { get; set; } + [ObservableProperty] public partial ImageSource? QrCodeImage { get; set; } [ObservableProperty] public partial bool IsLoading { get; set; } public void ApplyQueryAttributes(IDictionary query) @@ -16,6 +19,7 @@ public void ApplyQueryAttributes(IDictionary query) if (query.TryGetValue("Tool", out var toolValue) && toolValue is ToolDto toolDto) { Tool = toolDto; + QrCodeImage = GenerateQrCode(toolDto); } } @@ -54,4 +58,26 @@ private async Task DeleteAsync() [RelayCommand] private Task GoBackAsync() => dialogService.NavigateAsync(AppRoutes.Back); + + private static ImageSource? GenerateQrCode(ToolDto tool) + { + if (string.IsNullOrWhiteSpace(tool.Barcode)) + { + return null; + } + + var payload = JsonSerializer.Serialize(new + { + id = tool.Barcode, + make = tool.Make ?? string.Empty, + model = tool.Model ?? string.Empty, + owner = tool.Owner ?? string.Empty + }); + + using var generator = new QRCodeGenerator(); + using var data = generator.CreateQrCode(payload, QRCodeGenerator.ECCLevel.M); + var png = new PngByteQRCode(data); + var bytes = png.GetGraphic(20); + return ImageSource.FromStream(() => new MemoryStream(bytes)); + } } diff --git a/mobile/ToolInventory.MAUI/ViewModels/ToolsViewModel.cs b/mobile/ToolInventory.MAUI/ViewModels/ToolsViewModel.cs index a813720..adb7b64 100644 --- a/mobile/ToolInventory.MAUI/ViewModels/ToolsViewModel.cs +++ b/mobile/ToolInventory.MAUI/ViewModels/ToolsViewModel.cs @@ -52,6 +52,10 @@ private void ApplyFilter() ? _allTools : _allTools.Where(t => t.Name.Contains(SearchText, StringComparison.OrdinalIgnoreCase) + || (t.Make?.Contains(SearchText, StringComparison.OrdinalIgnoreCase) ?? false) + || (t.Model?.Contains(SearchText, StringComparison.OrdinalIgnoreCase) ?? false) + || (t.SerialNumber?.Contains(SearchText, StringComparison.OrdinalIgnoreCase) ?? false) + || (t.Owner?.Contains(SearchText, StringComparison.OrdinalIgnoreCase) ?? false) || (t.Location?.Contains(SearchText, StringComparison.OrdinalIgnoreCase) ?? false) || (t.Systainer?.Contains(SearchText, StringComparison.OrdinalIgnoreCase) ?? false) || (t.Barcode?.Contains(SearchText, StringComparison.OrdinalIgnoreCase) ?? false)) diff --git a/mobile/ToolInventory.MAUI/Views/ScannerPage.xaml b/mobile/ToolInventory.MAUI/Views/ScannerPage.xaml index 68a21ca..76ad11c 100644 --- a/mobile/ToolInventory.MAUI/Views/ScannerPage.xaml +++ b/mobile/ToolInventory.MAUI/Views/ScannerPage.xaml @@ -28,6 +28,20 @@