Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Dex
|
368d070174 |
Generated
+3
-331
@@ -25,11 +25,9 @@
|
|||||||
"eslint": "^9.15.0",
|
"eslint": "^9.15.0",
|
||||||
"eslint-plugin-react-hooks": "^5.0.0",
|
"eslint-plugin-react-hooks": "^5.0.0",
|
||||||
"eslint-plugin-react-refresh": "^0.4.14",
|
"eslint-plugin-react-refresh": "^0.4.14",
|
||||||
"globals": "^17.6.0",
|
|
||||||
"postcss": "^8.4.49",
|
"postcss": "^8.4.49",
|
||||||
"tailwindcss": "^4.0.0",
|
"tailwindcss": "^4.0.0",
|
||||||
"typescript": "~5.6.0",
|
"typescript": "~5.6.0",
|
||||||
"typescript-eslint": "^8.60.0",
|
|
||||||
"vite": "^6.0.0"
|
"vite": "^6.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -824,18 +822,6 @@
|
|||||||
"url": "https://opencollective.com/eslint"
|
"url": "https://opencollective.com/eslint"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/eslintrc/node_modules/globals": {
|
|
||||||
"version": "14.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
|
|
||||||
"integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@eslint/js": {
|
"node_modules/@eslint/js": {
|
||||||
"version": "9.39.4",
|
"version": "9.39.4",
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz",
|
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz",
|
||||||
@@ -1672,285 +1658,6 @@
|
|||||||
"@types/react": "^19.2.0"
|
"@types/react": "^19.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@typescript-eslint/eslint-plugin": {
|
|
||||||
"version": "8.60.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.60.0.tgz",
|
|
||||||
"integrity": "sha512-QYb/sa74/s7OKMbACMjrYnGspj9Hs5YI5aaffSL65UfeBUzVzBJfVo3oWSpbzPurvm7yaCCo2Lk7lVj610HqKw==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@eslint-community/regexpp": "^4.12.2",
|
|
||||||
"@typescript-eslint/scope-manager": "8.60.0",
|
|
||||||
"@typescript-eslint/type-utils": "8.60.0",
|
|
||||||
"@typescript-eslint/utils": "8.60.0",
|
|
||||||
"@typescript-eslint/visitor-keys": "8.60.0",
|
|
||||||
"ignore": "^7.0.5",
|
|
||||||
"natural-compare": "^1.4.0",
|
|
||||||
"ts-api-utils": "^2.5.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/typescript-eslint"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@typescript-eslint/parser": "^8.60.0",
|
|
||||||
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
|
|
||||||
"typescript": ">=4.8.4 <6.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
|
|
||||||
"version": "7.0.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
|
|
||||||
"integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/parser": {
|
|
||||||
"version": "8.60.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.60.0.tgz",
|
|
||||||
"integrity": "sha512-fcqpj/MyK4sxDPcbe7STNPbpQL4RLZOPWuaTmwZYuc+hJKzRf58yRxfhqGpc6PIq9ZyfSBpfHgmUHmHs0KwHwg==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@typescript-eslint/scope-manager": "8.60.0",
|
|
||||||
"@typescript-eslint/types": "8.60.0",
|
|
||||||
"@typescript-eslint/typescript-estree": "8.60.0",
|
|
||||||
"@typescript-eslint/visitor-keys": "8.60.0",
|
|
||||||
"debug": "^4.4.3"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/typescript-eslint"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
|
|
||||||
"typescript": ">=4.8.4 <6.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/project-service": {
|
|
||||||
"version": "8.60.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.0.tgz",
|
|
||||||
"integrity": "sha512-aZu74NNKJeUWqCjDddzdiKaS82dgYgV/vmf+Ui3ZdZejmgfXR/q+pRumgobnQ2cCJTgGTWp4ypiwsuofFubavg==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@typescript-eslint/tsconfig-utils": "^8.60.0",
|
|
||||||
"@typescript-eslint/types": "^8.60.0",
|
|
||||||
"debug": "^4.4.3"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/typescript-eslint"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"typescript": ">=4.8.4 <6.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/scope-manager": {
|
|
||||||
"version": "8.60.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.0.tgz",
|
|
||||||
"integrity": "sha512-pFzqhllJMs+jghLQWzV00ds39xLzuyqPSev5pd8f4Ir0rtKR3ZLUB4/4dhjOFighWb9larvtfJvqL+4yKDI3Xw==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@typescript-eslint/types": "8.60.0",
|
|
||||||
"@typescript-eslint/visitor-keys": "8.60.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/typescript-eslint"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/tsconfig-utils": {
|
|
||||||
"version": "8.60.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.0.tgz",
|
|
||||||
"integrity": "sha512-BZPR3RGYlAXnly6ymAxfkVn5rCbZzQNou0rxv3GfWZ8cTQp+hhVd73khbGLAd8k1TlAPLISH337M+tAgAnaJDQ==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/typescript-eslint"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"typescript": ">=4.8.4 <6.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/type-utils": {
|
|
||||||
"version": "8.60.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.60.0.tgz",
|
|
||||||
"integrity": "sha512-SX46wEUtitCpq7AN38HkUU/+zvUpdKf7ephtWAFgckH8O7PQIyL5gvrhQgBLuEYgLfuKWOVvWVskMbuFHAz5xg==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@typescript-eslint/types": "8.60.0",
|
|
||||||
"@typescript-eslint/typescript-estree": "8.60.0",
|
|
||||||
"@typescript-eslint/utils": "8.60.0",
|
|
||||||
"debug": "^4.4.3",
|
|
||||||
"ts-api-utils": "^2.5.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/typescript-eslint"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
|
|
||||||
"typescript": ">=4.8.4 <6.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/types": {
|
|
||||||
"version": "8.60.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.0.tgz",
|
|
||||||
"integrity": "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/typescript-eslint"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/typescript-estree": {
|
|
||||||
"version": "8.60.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.0.tgz",
|
|
||||||
"integrity": "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@typescript-eslint/project-service": "8.60.0",
|
|
||||||
"@typescript-eslint/tsconfig-utils": "8.60.0",
|
|
||||||
"@typescript-eslint/types": "8.60.0",
|
|
||||||
"@typescript-eslint/visitor-keys": "8.60.0",
|
|
||||||
"debug": "^4.4.3",
|
|
||||||
"minimatch": "^10.2.2",
|
|
||||||
"semver": "^7.7.3",
|
|
||||||
"tinyglobby": "^0.2.15",
|
|
||||||
"ts-api-utils": "^2.5.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/typescript-eslint"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"typescript": ">=4.8.4 <6.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": {
|
|
||||||
"version": "4.0.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
|
|
||||||
"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": "18 || 20 || >=22"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
|
|
||||||
"version": "5.0.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
|
|
||||||
"integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"balanced-match": "^4.0.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "18 || 20 || >=22"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
|
|
||||||
"version": "10.2.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
|
|
||||||
"integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"brace-expansion": "^5.0.5"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "18 || 20 || >=22"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
|
|
||||||
"version": "7.8.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.8.1.tgz",
|
|
||||||
"integrity": "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg==",
|
|
||||||
"dev": true,
|
|
||||||
"bin": {
|
|
||||||
"semver": "bin/semver.js"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/utils": {
|
|
||||||
"version": "8.60.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.0.tgz",
|
|
||||||
"integrity": "sha512-HtXuPfrHTyBDkameWpl+vJb1Uevu2tznAyahM1Oc4AENidCLTPiZDWIo4GfcxNdC/RcfGcadzzkqbRG87dUrQA==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@eslint-community/eslint-utils": "^4.9.1",
|
|
||||||
"@typescript-eslint/scope-manager": "8.60.0",
|
|
||||||
"@typescript-eslint/types": "8.60.0",
|
|
||||||
"@typescript-eslint/typescript-estree": "8.60.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/typescript-eslint"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
|
|
||||||
"typescript": ">=4.8.4 <6.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/visitor-keys": {
|
|
||||||
"version": "8.60.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.0.tgz",
|
|
||||||
"integrity": "sha512-9WI52t8ZGLVGrPMBet25yAftqY/n95+zmoUUtJBBQTKDSKUu7OsPTroT2op7U9JatkoRccL0YkWDNMFfC4Sjxg==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@typescript-eslint/types": "8.60.0",
|
|
||||||
"eslint-visitor-keys": "^5.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/typescript-eslint"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
|
|
||||||
"version": "5.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
|
|
||||||
"integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": "^20.19.0 || ^22.13.0 || >=24"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://opencollective.com/eslint"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@vitejs/plugin-react": {
|
"node_modules/@vitejs/plugin-react": {
|
||||||
"version": "4.7.0",
|
"version": "4.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz",
|
||||||
@@ -2821,9 +2528,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/globals": {
|
"node_modules/globals": {
|
||||||
"version": "17.6.0",
|
"version": "14.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/globals/-/globals-17.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
|
||||||
"integrity": "sha512-sepffkT8stwnIYbsMBpoCHJuJM5l98FUF2AnE07hfvE0m/qp3R586hw4jF4uadbhvg1ooIdzuu7CsfD2jzCaNA==",
|
"integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
@@ -3797,18 +3504,6 @@
|
|||||||
"url": "https://github.com/sponsors/SuperchupuDev"
|
"url": "https://github.com/sponsors/SuperchupuDev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/ts-api-utils": {
|
|
||||||
"version": "2.5.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
|
|
||||||
"integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==",
|
|
||||||
"dev": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18.12"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"typescript": ">=4.8.4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/type-check": {
|
"node_modules/type-check": {
|
||||||
"version": "0.4.0",
|
"version": "0.4.0",
|
||||||
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
|
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
|
||||||
@@ -3834,29 +3529,6 @@
|
|||||||
"node": ">=14.17"
|
"node": ">=14.17"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/typescript-eslint": {
|
|
||||||
"version": "8.60.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.60.0.tgz",
|
|
||||||
"integrity": "sha512-9f65qWLZdAW9m1JaxBDUHcqRUfL8bkxxXL7XxEfI+F09q56PkBvIfCjLF3yInsDM/BBmwkqmCQdCZe/RYlIWEw==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@typescript-eslint/eslint-plugin": "8.60.0",
|
|
||||||
"@typescript-eslint/parser": "8.60.0",
|
|
||||||
"@typescript-eslint/typescript-estree": "8.60.0",
|
|
||||||
"@typescript-eslint/utils": "8.60.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/typescript-eslint"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
|
|
||||||
"typescript": ">=4.8.4 <6.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/update-browserslist-db": {
|
"node_modules/update-browserslist-db": {
|
||||||
"version": "1.2.3",
|
"version": "1.2.3",
|
||||||
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
|
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
|
||||||
|
|||||||
@@ -27,11 +27,9 @@
|
|||||||
"eslint": "^9.15.0",
|
"eslint": "^9.15.0",
|
||||||
"eslint-plugin-react-hooks": "^5.0.0",
|
"eslint-plugin-react-hooks": "^5.0.0",
|
||||||
"eslint-plugin-react-refresh": "^0.4.14",
|
"eslint-plugin-react-refresh": "^0.4.14",
|
||||||
"globals": "^17.6.0",
|
|
||||||
"postcss": "^8.4.49",
|
"postcss": "^8.4.49",
|
||||||
"tailwindcss": "^4.0.0",
|
"tailwindcss": "^4.0.0",
|
||||||
"typescript": "~5.6.0",
|
"typescript": "~5.6.0",
|
||||||
"typescript-eslint": "^8.60.0",
|
|
||||||
"vite": "^6.0.0"
|
"vite": "^6.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+20
-23
@@ -2,37 +2,34 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
|||||||
import { BrowserRouter, Routes, Route } from 'react-router-dom'
|
import { BrowserRouter, Routes, Route } from 'react-router-dom'
|
||||||
import Dashboard from './pages/Dashboard'
|
import Dashboard from './pages/Dashboard'
|
||||||
import InventoryPage from './pages/InventoryPage'
|
import InventoryPage from './pages/InventoryPage'
|
||||||
import FilamentDetailPage from './pages/FilamentDetailPage'
|
import PrintersPage from './pages/PrintersPage'
|
||||||
import ToastContainer from './components/ToastContainer'
|
|
||||||
import { useSSE } from './hooks/useSSE'
|
|
||||||
|
|
||||||
const queryClient = new QueryClient()
|
const queryClient = new QueryClient()
|
||||||
|
|
||||||
function SSEProvider({ children }: { children: React.ReactNode }) {
|
|
||||||
useSSE()
|
|
||||||
return <>{children}</>
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function App() {
|
export default function App() {
|
||||||
return (
|
return (
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<SSEProvider>
|
<div className="min-h-screen bg-slate-900 text-slate-50">
|
||||||
<div className="min-h-screen bg-slate-900 text-slate-50">
|
<header className="bg-slate-800 border-b border-slate-700 px-4 py-3 flex items-center gap-4 sticky top-0 z-20">
|
||||||
<header className="bg-slate-800 border-b border-slate-700 px-4 py-3 flex items-center gap-3 sticky top-0 z-20">
|
<a href="/" className="flex items-center gap-3 no-underline">
|
||||||
<div className="w-8 h-8 rounded bg-emerald-500 flex items-center justify-center text-slate-900 font-bold text-lg">E</div>
|
<div className="w-8 h-8 rounded bg-emerald-500 flex items-center justify-center text-slate-900 font-bold text-lg">E</div>
|
||||||
<h1 className="text-lg font-semibold">Extrudex</h1>
|
<h1 className="text-lg font-semibold text-slate-50">Extrudex</h1>
|
||||||
</header>
|
</a>
|
||||||
<main className="p-4">
|
<nav className="flex items-center gap-1 ml-2">
|
||||||
<Routes>
|
<a href="/" className="px-3 py-1.5 rounded-md text-sm text-slate-300 hover:text-slate-100 hover:bg-slate-700 transition-colors">Dashboard</a>
|
||||||
<Route path="/" element={<Dashboard />} />
|
<a href="/inventory" className="px-3 py-1.5 rounded-md text-sm text-slate-300 hover:text-slate-100 hover:bg-slate-700 transition-colors">Inventory</a>
|
||||||
<Route path="/inventory" element={<InventoryPage />} />
|
<a href="/printers" className="px-3 py-1.5 rounded-md text-sm text-slate-300 hover:text-slate-100 hover:bg-slate-700 transition-colors">Printers</a>
|
||||||
<Route path="/filament/:id" element={<FilamentDetailPage />} />
|
</nav>
|
||||||
</Routes>
|
</header>
|
||||||
</main>
|
<main className="p-4">
|
||||||
</div>
|
<Routes>
|
||||||
<ToastContainer />
|
<Route path="/" element={<Dashboard />} />
|
||||||
</SSEProvider>
|
<Route path="/inventory" element={<InventoryPage />} />
|
||||||
|
<Route path="/printers" element={<PrintersPage />} />
|
||||||
|
</Routes>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</QueryClientProvider>
|
</QueryClientProvider>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
import { Printer } from 'lucide-react'
|
|
||||||
|
|
||||||
const STYLES = {
|
|
||||||
online: 'bg-emerald-600 text-white',
|
|
||||||
offline: 'bg-slate-600 text-slate-200',
|
|
||||||
printing: 'bg-blue-600 text-white animate-pulse',
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function PrinterStatusBadge({ status, name }: { status: string; name?: string }) {
|
|
||||||
const style = STYLES[status as keyof typeof STYLES] ?? STYLES.offline
|
|
||||||
return (
|
|
||||||
<span className={`inline-flex items-center gap-1.5 rounded-full px-2.5 py-1 text-xs font-medium ${style}`}>
|
|
||||||
<Printer size={12} />
|
|
||||||
{name ? `${name} · ${status}` : status}
|
|
||||||
</span>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
import { useEffect, useState, useCallback } from 'react'
|
|
||||||
import { X, CheckCircle, AlertTriangle, Info } from 'lucide-react'
|
|
||||||
import { addToastListener, type ToastMessage } from '../hooks/useSSE'
|
|
||||||
|
|
||||||
const ICONS = {
|
|
||||||
info: Info,
|
|
||||||
success: CheckCircle,
|
|
||||||
warning: AlertTriangle,
|
|
||||||
}
|
|
||||||
|
|
||||||
const STYLES = {
|
|
||||||
info: 'border-blue-600 bg-blue-900/40 text-blue-100',
|
|
||||||
success: 'border-emerald-600 bg-emerald-900/40 text-emerald-100',
|
|
||||||
warning: 'border-amber-600 bg-amber-900/40 text-amber-100',
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function ToastContainer() {
|
|
||||||
const [toasts, setToasts] = useState<ToastMessage[]>([])
|
|
||||||
|
|
||||||
const remove = useCallback((id: string) => {
|
|
||||||
setToasts(prev => prev.filter(t => t.id !== id))
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
return addToastListener((toast) => {
|
|
||||||
setToasts(prev => {
|
|
||||||
// Prevent duplicate identical toasts within 3 seconds
|
|
||||||
const now = Date.now()
|
|
||||||
const recent = prev.filter(
|
|
||||||
t => t.title === toast.title && now - parseInt(t.id.split('-').pop() || '0', 10) < 3000
|
|
||||||
)
|
|
||||||
if (recent.length > 0) return prev
|
|
||||||
return [...prev.slice(-4), toast]
|
|
||||||
})
|
|
||||||
// Auto-dismiss after 5 seconds
|
|
||||||
setTimeout(() => remove(toast.id), 5000)
|
|
||||||
})
|
|
||||||
}, [remove])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="fixed bottom-4 right-4 z-50 flex flex-col gap-2 max-w-sm w-full pointer-events-none">
|
|
||||||
{toasts.map((toast) => {
|
|
||||||
const Icon = ICONS[toast.type]
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
key={toast.id}
|
|
||||||
className={`pointer-events-auto rounded-lg border px-4 py-3 shadow-lg backdrop-blur-sm transition-all ${STYLES[toast.type]}`}
|
|
||||||
>
|
|
||||||
<div className="flex items-start gap-3">
|
|
||||||
<Icon size={18} className="mt-0.5 shrink-0" />
|
|
||||||
<div className="flex-1 min-w-0">
|
|
||||||
<p className="text-sm font-semibold leading-snug">{toast.title}</p>
|
|
||||||
{toast.body && (
|
|
||||||
<p className="text-xs opacity-80 mt-0.5">{toast.body}</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
onClick={() => remove(toast.id)}
|
|
||||||
className="shrink-0 -mr-1 -mt-1 p-1 rounded hover:bg-white/10 text-current opacity-70 hover:opacity-100 transition-opacity"
|
|
||||||
aria-label="Dismiss"
|
|
||||||
>
|
|
||||||
<X size={14} />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,193 +0,0 @@
|
|||||||
import { useEffect, useRef, useCallback } from 'react'
|
|
||||||
import { useQueryClient } from '@tanstack/react-query'
|
|
||||||
|
|
||||||
export type SSEEventType =
|
|
||||||
| 'printer.status'
|
|
||||||
| 'job.started'
|
|
||||||
| 'job.completed'
|
|
||||||
| 'filament.low'
|
|
||||||
|
|
||||||
export interface SSEEvent {
|
|
||||||
type: SSEEventType
|
|
||||||
payload: unknown
|
|
||||||
timestamp: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface ToastMessage {
|
|
||||||
id: string
|
|
||||||
type: 'info' | 'success' | 'warning'
|
|
||||||
title: string
|
|
||||||
body?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
let toastListeners: Array<(toast: ToastMessage) => void> = []
|
|
||||||
|
|
||||||
export function addToastListener(cb: (toast: ToastMessage) => void) {
|
|
||||||
toastListeners.push(cb)
|
|
||||||
return () => {
|
|
||||||
toastListeners = toastListeners.filter(l => l !== cb)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function emitToast(toast: ToastMessage) {
|
|
||||||
toastListeners.forEach(cb => cb(toast))
|
|
||||||
}
|
|
||||||
|
|
||||||
const RECONNECT_BASE_MS = 1000
|
|
||||||
const RECONNECT_MAX_MS = 30000
|
|
||||||
|
|
||||||
export function useSSE(enabled = true) {
|
|
||||||
const queryClient = useQueryClient()
|
|
||||||
const esRef = useRef<EventSource | null>(null)
|
|
||||||
const reconnectTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
|
|
||||||
const attemptRef = useRef(0)
|
|
||||||
|
|
||||||
const connect = useCallback(() => {
|
|
||||||
if (!enabled) return
|
|
||||||
if (esRef.current) {
|
|
||||||
esRef.current.close()
|
|
||||||
}
|
|
||||||
|
|
||||||
const es = new EventSource('/api/events')
|
|
||||||
esRef.current = es
|
|
||||||
|
|
||||||
es.onopen = () => {
|
|
||||||
attemptRef.current = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
es.addEventListener('printer.status', (e) => {
|
|
||||||
try {
|
|
||||||
const data = JSON.parse(e.data) as SSEEvent
|
|
||||||
const payload = data.payload as {
|
|
||||||
printer_id: number
|
|
||||||
printer_name: string
|
|
||||||
status: string
|
|
||||||
}
|
|
||||||
// Update printer list cache if it exists
|
|
||||||
queryClient.setQueryData(['printers'], (old: unknown) => {
|
|
||||||
if (!Array.isArray(old)) return old
|
|
||||||
return old.map((p: Record<string, unknown>) =>
|
|
||||||
p.id === payload.printer_id
|
|
||||||
? { ...p, status: payload.status, name: payload.printer_name }
|
|
||||||
: p
|
|
||||||
)
|
|
||||||
})
|
|
||||||
} catch {
|
|
||||||
// ignore malformed event
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
es.addEventListener('job.started', (e) => {
|
|
||||||
try {
|
|
||||||
const data = JSON.parse(e.data) as SSEEvent
|
|
||||||
const payload = data.payload as {
|
|
||||||
job_id: number
|
|
||||||
job_name: string
|
|
||||||
printer_id: number
|
|
||||||
spool_id?: number
|
|
||||||
}
|
|
||||||
emitToast({
|
|
||||||
id: `job-started-${payload.job_id}-${Date.now()}`,
|
|
||||||
type: 'info',
|
|
||||||
title: `Job started: ${payload.job_name}`,
|
|
||||||
body: `Printer #${payload.printer_id}`,
|
|
||||||
})
|
|
||||||
// Invalidate print jobs list
|
|
||||||
queryClient.invalidateQueries({ queryKey: ['print-jobs'] })
|
|
||||||
} catch {
|
|
||||||
// ignore malformed event
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
es.addEventListener('job.completed', (e) => {
|
|
||||||
try {
|
|
||||||
const data = JSON.parse(e.data) as SSEEvent
|
|
||||||
const payload = data.payload as {
|
|
||||||
job_id: number
|
|
||||||
job_name: string
|
|
||||||
printer_id: number
|
|
||||||
duration_seconds?: number
|
|
||||||
total_grams_used?: number
|
|
||||||
total_cost_usd?: number
|
|
||||||
}
|
|
||||||
const parts: string[] = []
|
|
||||||
if (payload.duration_seconds != null) {
|
|
||||||
const mins = Math.round(payload.duration_seconds / 60)
|
|
||||||
parts.push(`${mins} min`)
|
|
||||||
}
|
|
||||||
if (payload.total_grams_used != null) {
|
|
||||||
parts.push(`${payload.total_grams_used.toFixed(1)} g used`)
|
|
||||||
}
|
|
||||||
emitToast({
|
|
||||||
id: `job-completed-${payload.job_id}-${Date.now()}`,
|
|
||||||
type: 'success',
|
|
||||||
title: `Job completed: ${payload.job_name}`,
|
|
||||||
body: parts.join(' · ') || `Printer #${payload.printer_id}`,
|
|
||||||
})
|
|
||||||
queryClient.invalidateQueries({ queryKey: ['print-jobs'] })
|
|
||||||
queryClient.invalidateQueries({ queryKey: ['filaments'] })
|
|
||||||
} catch {
|
|
||||||
// ignore malformed event
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
es.addEventListener('filament.low', (e) => {
|
|
||||||
try {
|
|
||||||
const data = JSON.parse(e.data) as SSEEvent
|
|
||||||
const payload = data.payload as {
|
|
||||||
spool_id: number
|
|
||||||
spool_name: string
|
|
||||||
remaining_grams: number
|
|
||||||
threshold_grams: number
|
|
||||||
}
|
|
||||||
emitToast({
|
|
||||||
id: `filament-low-${payload.spool_id}-${Date.now()}`,
|
|
||||||
type: 'warning',
|
|
||||||
title: `Low filament: ${payload.spool_name}`,
|
|
||||||
body: `${payload.remaining_grams} g remaining (threshold ${payload.threshold_grams} g)`,
|
|
||||||
})
|
|
||||||
// Update filament inventory cache in place for instant UI feedback
|
|
||||||
queryClient.setQueryData(['filaments'], (old: unknown) => {
|
|
||||||
if (!old || typeof old !== 'object') return old
|
|
||||||
const o = old as { data?: Array<Record<string, unknown>>; total?: number }
|
|
||||||
if (!Array.isArray(o.data)) return old
|
|
||||||
return {
|
|
||||||
...o,
|
|
||||||
data: o.data.map((f) =>
|
|
||||||
(f.id as number) === payload.spool_id
|
|
||||||
? { ...f, remaining_grams: payload.remaining_grams }
|
|
||||||
: f
|
|
||||||
),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} catch {
|
|
||||||
// ignore malformed event
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
es.onerror = () => {
|
|
||||||
es.close()
|
|
||||||
// Exponential backoff with jitter
|
|
||||||
const base = Math.min(RECONNECT_MAX_MS, RECONNECT_BASE_MS * 2 ** attemptRef.current)
|
|
||||||
const jitter = Math.random() * 1000
|
|
||||||
const delay = base + jitter
|
|
||||||
attemptRef.current += 1
|
|
||||||
reconnectTimerRef.current = setTimeout(() => {
|
|
||||||
connect()
|
|
||||||
}, delay)
|
|
||||||
}
|
|
||||||
}, [enabled, queryClient])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
connect()
|
|
||||||
return () => {
|
|
||||||
if (reconnectTimerRef.current) {
|
|
||||||
clearTimeout(reconnectTimerRef.current)
|
|
||||||
}
|
|
||||||
if (esRef.current) {
|
|
||||||
esRef.current.close()
|
|
||||||
esRef.current = null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, [connect])
|
|
||||||
}
|
|
||||||
@@ -1,391 +0,0 @@
|
|||||||
import { useState } from 'react'
|
|
||||||
import { useParams, useNavigate } from 'react-router-dom'
|
|
||||||
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
|
||||||
import { ArrowLeft, Pencil, Trash2, AlertTriangle, Loader2, Archive } from 'lucide-react'
|
|
||||||
import ColorSwatch from '../components/ColorSwatch'
|
|
||||||
import { fetchFilamentById, fetchUsageLogs, deleteFilament } from '../services/filamentService'
|
|
||||||
import type { UsageLog } from '../types/filament'
|
|
||||||
|
|
||||||
export default function FilamentDetailPage() {
|
|
||||||
const { id } = useParams<{ id: string }>()
|
|
||||||
const spoolId = Number(id)
|
|
||||||
const navigate = useNavigate()
|
|
||||||
const queryClient = useQueryClient()
|
|
||||||
const [deleteConfirm, setDeleteConfirm] = useState(false)
|
|
||||||
const [deleting, setDeleting] = useState(false)
|
|
||||||
|
|
||||||
const {
|
|
||||||
data: spool,
|
|
||||||
isLoading: spoolLoading,
|
|
||||||
error: spoolError,
|
|
||||||
refetch: refetchSpool,
|
|
||||||
} = useQuery({
|
|
||||||
queryKey: ['filament', spoolId],
|
|
||||||
queryFn: () => fetchFilamentById(spoolId),
|
|
||||||
enabled: !isNaN(spoolId),
|
|
||||||
})
|
|
||||||
|
|
||||||
const {
|
|
||||||
data: usageLogs,
|
|
||||||
isLoading: usageLoading,
|
|
||||||
error: usageError,
|
|
||||||
refetch: refetchUsage,
|
|
||||||
} = useQuery({
|
|
||||||
queryKey: ['usage-logs', spoolId],
|
|
||||||
queryFn: () => fetchUsageLogs(spoolId),
|
|
||||||
enabled: !isNaN(spoolId),
|
|
||||||
})
|
|
||||||
|
|
||||||
const handleDelete = async () => {
|
|
||||||
setDeleting(true)
|
|
||||||
try {
|
|
||||||
await deleteFilament(spoolId)
|
|
||||||
queryClient.invalidateQueries({ queryKey: ['filaments'] })
|
|
||||||
navigate('/')
|
|
||||||
} catch {
|
|
||||||
setDeleting(false)
|
|
||||||
setDeleteConfirm(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Loading state ──
|
|
||||||
if (spoolLoading) {
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col items-center justify-center py-24 gap-3 text-slate-400">
|
|
||||||
<Loader2 size={32} className="animate-spin text-emerald-400" />
|
|
||||||
<span>Loading spool details…</span>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Error state ──
|
|
||||||
if (spoolError || !spool) {
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col items-center justify-center py-24 gap-4">
|
|
||||||
<div className="flex h-14 w-14 items-center justify-center rounded-full bg-red-900/30">
|
|
||||||
<AlertTriangle size={28} className="text-red-400" />
|
|
||||||
</div>
|
|
||||||
<p className="text-red-400 font-medium">Failed to load spool details.</p>
|
|
||||||
<div className="flex gap-3">
|
|
||||||
<button
|
|
||||||
onClick={() => refetchSpool()}
|
|
||||||
className="rounded-lg bg-slate-700 px-4 py-2 text-sm font-medium text-slate-200 hover:bg-slate-600 transition-colors"
|
|
||||||
>
|
|
||||||
Retry
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => navigate('/')}
|
|
||||||
className="rounded-lg bg-slate-800 border border-slate-700 px-4 py-2 text-sm font-medium text-slate-300 hover:bg-slate-700 transition-colors"
|
|
||||||
>
|
|
||||||
Back to Inventory
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
const pctRemaining = spool.initial_grams > 0
|
|
||||||
? (spool.remaining_grams / spool.initial_grams) * 100
|
|
||||||
: 0
|
|
||||||
const isLow = spool.remaining_grams <= (spool.low_stock_threshold_grams || 0)
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="space-y-6">
|
|
||||||
{/* ── Header Bar ── */}
|
|
||||||
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
|
||||||
<button
|
|
||||||
onClick={() => navigate('/')}
|
|
||||||
className="inline-flex items-center gap-2 rounded-lg bg-slate-800 border border-slate-700 px-3 py-2 text-sm font-medium text-slate-200 hover:bg-slate-700 active:bg-slate-600 transition-colors w-fit"
|
|
||||||
>
|
|
||||||
<ArrowLeft size={16} />
|
|
||||||
Back to Inventory
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<button className="inline-flex items-center gap-2 rounded-lg bg-slate-700 px-4 py-2 text-sm font-semibold text-slate-200 hover:bg-slate-600 active:bg-slate-500 transition-colors">
|
|
||||||
<Pencil size={16} />
|
|
||||||
Edit
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => setDeleteConfirm(true)}
|
|
||||||
className="inline-flex items-center gap-2 rounded-lg bg-red-900/30 border border-red-700 px-4 py-2 text-sm font-semibold text-red-300 hover:bg-red-900/50 active:bg-red-900/70 transition-colors"
|
|
||||||
>
|
|
||||||
<Trash2 size={16} />
|
|
||||||
Delete
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* ── Spool Info Card ── */}
|
|
||||||
<div className="rounded-xl border border-slate-700 bg-slate-800 overflow-hidden">
|
|
||||||
{/* Card header */}
|
|
||||||
<div className="px-6 py-5 border-b border-slate-700 flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
|
||||||
<div className="flex items-center gap-3">
|
|
||||||
<ColorSwatch colorHex={spool.color_hex} size={36} />
|
|
||||||
<div>
|
|
||||||
<h1 className="text-xl font-bold text-slate-100">{spool.name}</h1>
|
|
||||||
<p className="text-sm text-slate-400">
|
|
||||||
{spool.brand && <span>{spool.brand} · </span>}
|
|
||||||
{spool.diameter_mm}mm
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
{isLow ? (
|
|
||||||
<span className="inline-flex items-center gap-1.5 rounded-full bg-red-900/40 border border-red-700 px-3 py-1 text-sm font-medium text-red-300">
|
|
||||||
<AlertTriangle size={14} /> Low Stock
|
|
||||||
</span>
|
|
||||||
) : (
|
|
||||||
<span className="inline-flex items-center gap-1.5 rounded-full bg-emerald-900/30 border border-emerald-700 px-3 py-1 text-sm font-medium text-emerald-300">
|
|
||||||
In Stock
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Card body — 2-column grid */}
|
|
||||||
<div className="px-6 py-5 grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-x-8 gap-y-4">
|
|
||||||
<DetailItem label="Material" value={spool.material_base?.name ?? '—'} />
|
|
||||||
<DetailItem label="Finish" value={spool.material_finish?.name ?? '—'} />
|
|
||||||
<DetailItem
|
|
||||||
label="Modifier"
|
|
||||||
value={spool.material_modifier?.name ?? 'None'}
|
|
||||||
/>
|
|
||||||
<DetailItem label="Color" value={spool.color_hex.toUpperCase()} />
|
|
||||||
<DetailItem label="Brand" value={spool.brand || '—'} />
|
|
||||||
<DetailItem label="Diameter" value={`${spool.diameter_mm}mm`} />
|
|
||||||
<DetailItem
|
|
||||||
label="Remaining"
|
|
||||||
value={
|
|
||||||
<span className="font-semibold tabular-nums">
|
|
||||||
{spool.remaining_grams.toLocaleString()} g
|
|
||||||
</span>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<DetailItem
|
|
||||||
label="Initial"
|
|
||||||
value={`${spool.initial_grams.toLocaleString()} g`}
|
|
||||||
/>
|
|
||||||
<DetailItem
|
|
||||||
label="Cost"
|
|
||||||
value={
|
|
||||||
spool.cost_usd != null
|
|
||||||
? `$${spool.cost_usd.toFixed(2)}`
|
|
||||||
: '—'
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Progress Bar */}
|
|
||||||
<div className="px-6 pb-5 pt-1">
|
|
||||||
<div className="flex items-center justify-between text-sm mb-1.5">
|
|
||||||
<span className="text-slate-400">
|
|
||||||
<span className="text-slate-200 font-semibold tabular-nums">
|
|
||||||
{spool.remaining_grams.toLocaleString()}g
|
|
||||||
</span>{' '}
|
|
||||||
of {spool.initial_grams.toLocaleString()}g
|
|
||||||
</span>
|
|
||||||
<span className="text-slate-400 font-medium tabular-nums">
|
|
||||||
{pctRemaining.toFixed(1)}%
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="w-full h-3 rounded-full bg-slate-700 overflow-hidden">
|
|
||||||
<div
|
|
||||||
className={`h-full rounded-full transition-all duration-500 ${
|
|
||||||
pctRemaining <= 10
|
|
||||||
? 'bg-red-500'
|
|
||||||
: pctRemaining <= 25
|
|
||||||
? 'bg-amber-500'
|
|
||||||
: 'bg-emerald-500'
|
|
||||||
}`}
|
|
||||||
style={{ width: `${Math.min(100, pctRemaining)}%` }}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* ── Usage History ── */}
|
|
||||||
<div className="rounded-xl border border-slate-700 bg-slate-800 overflow-hidden">
|
|
||||||
<div className="px-6 py-4 border-b border-slate-700">
|
|
||||||
<h2 className="text-lg font-semibold text-slate-100">Usage History</h2>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Loading sub-state */}
|
|
||||||
{usageLoading && (
|
|
||||||
<div className="px-6 py-8 text-center text-slate-400">
|
|
||||||
<Loader2 size={20} className="animate-spin inline mr-2" />
|
|
||||||
Loading usage history…
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Usage error sub-state */}
|
|
||||||
{usageError && !usageLoading && (
|
|
||||||
<div className="px-6 py-8 text-center">
|
|
||||||
<p className="text-red-400 text-sm">
|
|
||||||
Failed to load usage history.
|
|
||||||
</p>
|
|
||||||
<button
|
|
||||||
onClick={() => refetchUsage()}
|
|
||||||
className="mt-2 text-sm text-emerald-400 hover:text-emerald-300 underline"
|
|
||||||
>
|
|
||||||
Retry
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Empty state */}
|
|
||||||
{!usageLoading && !usageError && usageLogs && usageLogs.length === 0 && (
|
|
||||||
<div className="px-6 py-10 text-center">
|
|
||||||
<Archive size={32} className="mx-auto text-slate-600 mb-2" />
|
|
||||||
<p className="text-slate-400 text-sm">No usage recorded yet.</p>
|
|
||||||
<p className="text-slate-500 text-xs mt-1">
|
|
||||||
Usage data will appear here when this spool is used in print jobs.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Table — desktop */}
|
|
||||||
{!usageLoading && !usageError && usageLogs && usageLogs.length > 0 && (
|
|
||||||
<>
|
|
||||||
<div className="hidden md:block overflow-x-auto">
|
|
||||||
<table className="w-full text-sm">
|
|
||||||
<thead className="bg-slate-800/50 text-slate-300">
|
|
||||||
<tr>
|
|
||||||
<th className="px-6 py-3 text-left font-semibold">Date</th>
|
|
||||||
<th className="px-6 py-3 text-left font-semibold">Print Job</th>
|
|
||||||
<th className="px-6 py-3 text-right font-semibold">mm Extruded</th>
|
|
||||||
<th className="px-6 py-3 text-right font-semibold">Grams Used</th>
|
|
||||||
<th className="px-6 py-3 text-right font-semibold">Cost</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody className="divide-y divide-slate-700">
|
|
||||||
{usageLogs.map((log: UsageLog) => (
|
|
||||||
<tr
|
|
||||||
key={log.id}
|
|
||||||
className="hover:bg-slate-700/30 transition-colors"
|
|
||||||
>
|
|
||||||
<td className="px-6 py-3 text-slate-200 tabular-nums">
|
|
||||||
{new Date(log.logged_at).toLocaleDateString('en-US', {
|
|
||||||
year: 'numeric',
|
|
||||||
month: 'short',
|
|
||||||
day: 'numeric',
|
|
||||||
})}
|
|
||||||
</td>
|
|
||||||
<td className="px-6 py-3 text-slate-300">
|
|
||||||
{log.print_job_name || `Job #${log.print_job_id ?? log.id}`}
|
|
||||||
</td>
|
|
||||||
<td className="px-6 py-3 text-right text-slate-200 tabular-nums">
|
|
||||||
{log.mm_extruded.toLocaleString()}
|
|
||||||
</td>
|
|
||||||
<td className="px-6 py-3 text-right text-slate-200 tabular-nums">
|
|
||||||
{log.grams_used.toFixed(2)} g
|
|
||||||
</td>
|
|
||||||
<td className="px-6 py-3 text-right text-slate-200 tabular-nums">
|
|
||||||
{log.cost_usd != null ? `$${log.cost_usd.toFixed(3)}` : '—'}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
))}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Mobile cards */}
|
|
||||||
<div className="md:hidden divide-y divide-slate-700">
|
|
||||||
{usageLogs.map((log: UsageLog) => (
|
|
||||||
<div key={log.id} className="px-4 py-4 space-y-2">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<span className="text-sm font-medium text-slate-200">
|
|
||||||
{log.print_job_name || `Job #${log.print_job_id ?? log.id}`}
|
|
||||||
</span>
|
|
||||||
<span className="text-xs text-slate-400 tabular-nums">
|
|
||||||
{new Date(log.logged_at).toLocaleDateString('en-US', {
|
|
||||||
month: 'short',
|
|
||||||
day: 'numeric',
|
|
||||||
})}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center justify-between text-sm">
|
|
||||||
<span className="text-slate-400">
|
|
||||||
Extruded:{' '}
|
|
||||||
<span className="text-slate-300 tabular-nums">
|
|
||||||
{log.mm_extruded.toLocaleString()} mm
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
<span className="text-slate-400">
|
|
||||||
Used:{' '}
|
|
||||||
<span className="text-slate-300 tabular-nums">
|
|
||||||
{log.grams_used.toFixed(2)} g
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
<span className="text-slate-400">
|
|
||||||
{log.cost_usd != null ? (
|
|
||||||
<>
|
|
||||||
Cost:{' '}
|
|
||||||
<span className="text-slate-300 tabular-nums">
|
|
||||||
${log.cost_usd.toFixed(3)}
|
|
||||||
</span>
|
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
'—'
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* ── Delete Confirmation Modal ── */}
|
|
||||||
{deleteConfirm && (
|
|
||||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
|
|
||||||
<div className="w-full max-w-sm rounded-xl bg-slate-800 border border-slate-700 p-6 shadow-2xl space-y-4">
|
|
||||||
<div className="flex items-center gap-3">
|
|
||||||
<div className="flex h-10 w-10 items-center justify-center rounded-full bg-red-900/30 flex-shrink-0">
|
|
||||||
<AlertTriangle size={20} className="text-red-400" />
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3 className="text-lg font-semibold text-slate-100">
|
|
||||||
Delete “{spool.name}”?
|
|
||||||
</h3>
|
|
||||||
<p className="text-sm text-slate-400">
|
|
||||||
This permanently removes the spool and all usage history. This cannot be undone.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-end gap-3">
|
|
||||||
<button
|
|
||||||
onClick={() => setDeleteConfirm(false)}
|
|
||||||
disabled={deleting}
|
|
||||||
className="rounded-lg bg-slate-700 px-4 py-2 text-sm font-medium text-slate-200 hover:bg-slate-600 transition-colors disabled:opacity-50"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={handleDelete}
|
|
||||||
disabled={deleting}
|
|
||||||
className="inline-flex items-center gap-2 rounded-lg bg-red-600 px-4 py-2 text-sm font-medium text-white hover:bg-red-500 transition-colors disabled:opacity-50"
|
|
||||||
>
|
|
||||||
{deleting && <Loader2 size={16} className="animate-spin" />}
|
|
||||||
{deleting ? 'Deleting…' : 'Delete'}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Small detail row for the info card grid */
|
|
||||||
function DetailItem({ label, value }: { label: string; value: React.ReactNode }) {
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<dt className="text-xs font-medium uppercase tracking-wider text-slate-500 mb-0.5">
|
|
||||||
{label}
|
|
||||||
</dt>
|
|
||||||
<dd className="text-sm text-slate-200">{value}</dd>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -35,7 +35,7 @@ export default function InventoryPage() {
|
|||||||
queryFn: () => fetchFilaments(filter),
|
queryFn: () => fetchFilaments(filter),
|
||||||
})
|
})
|
||||||
|
|
||||||
const filaments = useMemo(() => data?.data ?? [], [data?.data])
|
const filaments = data?.data ?? []
|
||||||
const total = data?.total ?? 0
|
const total = data?.total ?? 0
|
||||||
const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
|
const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,262 @@
|
|||||||
|
import { useQuery } from '@tanstack/react-query'
|
||||||
|
import { Printer, Wifi, WifiOff, HelpCircle, Plus, Globe, Radio } from 'lucide-react'
|
||||||
|
import { fetchPrinters } from '../services/printerService'
|
||||||
|
import LoadingSpinner from '../components/LoadingSpinner'
|
||||||
|
import type { Printer as PrinterType, ConnectionStatus } from '../types/printer'
|
||||||
|
|
||||||
|
function getConnectionStatus(printer: PrinterType): ConnectionStatus {
|
||||||
|
if (!printer.is_active) return 'offline'
|
||||||
|
if (printer.moonraker_url || printer.mqtt_broker_host) return 'online'
|
||||||
|
return 'unknown'
|
||||||
|
}
|
||||||
|
|
||||||
|
const statusConfig: Record<ConnectionStatus, { icon: typeof Wifi; label: string; className: string }> = {
|
||||||
|
online: {
|
||||||
|
icon: Wifi,
|
||||||
|
label: 'Online',
|
||||||
|
className: 'bg-emerald-900/30 border-emerald-700 text-emerald-300',
|
||||||
|
},
|
||||||
|
offline: {
|
||||||
|
icon: WifiOff,
|
||||||
|
label: 'Offline',
|
||||||
|
className: 'bg-red-900/30 border-red-700 text-red-300',
|
||||||
|
},
|
||||||
|
unknown: {
|
||||||
|
icon: HelpCircle,
|
||||||
|
label: 'Unknown',
|
||||||
|
className: 'bg-slate-700/50 border-slate-600 text-slate-400',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function PrintersPage() {
|
||||||
|
const { data: printers, isLoading, error, refetch } = useQuery({
|
||||||
|
queryKey: ['printers'],
|
||||||
|
queryFn: fetchPrinters,
|
||||||
|
})
|
||||||
|
|
||||||
|
const count = printers?.length ?? 0
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-4">
|
||||||
|
{/* Header */}
|
||||||
|
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
||||||
|
<div>
|
||||||
|
<h2 className="text-xl font-bold text-slate-100">Printers</h2>
|
||||||
|
<p className="text-sm text-slate-400">{count} printer(s) in fleet</p>
|
||||||
|
</div>
|
||||||
|
<button className="inline-flex items-center gap-2 rounded-lg bg-emerald-600 px-4 py-2 text-sm font-semibold text-white hover:bg-emerald-500 active:bg-emerald-700 transition-colors">
|
||||||
|
<Plus size={16} /> Add Printer
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Loading */}
|
||||||
|
{isLoading && (
|
||||||
|
<div className="flex items-center justify-center py-16">
|
||||||
|
<LoadingSpinner />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Error */}
|
||||||
|
{error && (
|
||||||
|
<div className="rounded-lg border border-red-700 bg-red-900/20 p-6 text-center">
|
||||||
|
<p className="text-red-400 mb-2">Failed to load printers.</p>
|
||||||
|
<button
|
||||||
|
onClick={() => refetch()}
|
||||||
|
className="text-sm text-red-300 underline hover:text-red-200"
|
||||||
|
>
|
||||||
|
Retry
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Empty */}
|
||||||
|
{!isLoading && !error && printers?.length === 0 && (
|
||||||
|
<div className="rounded-lg border border-slate-700 bg-slate-800 p-12 text-center">
|
||||||
|
<Printer size={40} className="mx-auto mb-3 text-slate-500" />
|
||||||
|
<p className="text-slate-400">No printers found.</p>
|
||||||
|
<p className="text-sm text-slate-500 mt-1">
|
||||||
|
Add a printer to start monitoring your fleet.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Desktop Table */}
|
||||||
|
{!isLoading && !error && (printers?.length ?? 0) > 0 && (
|
||||||
|
<>
|
||||||
|
<div className="hidden lg:block overflow-x-auto rounded-lg border border-slate-700">
|
||||||
|
<table className="w-full text-sm">
|
||||||
|
<thead className="bg-slate-800 text-slate-300">
|
||||||
|
<tr>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold">Name</th>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold">Type</th>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold">Manufacturer</th>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold">Model</th>
|
||||||
|
<th className="px-4 py-3 text-center font-semibold">Status</th>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold">Moonraker</th>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold">MQTT</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody className="divide-y divide-slate-700">
|
||||||
|
{printers!.map((printer) => {
|
||||||
|
const status = getConnectionStatus(printer)
|
||||||
|
const StatusIcon = statusConfig[status].icon
|
||||||
|
return (
|
||||||
|
<tr
|
||||||
|
key={printer.id}
|
||||||
|
className="bg-slate-800/50 hover:bg-slate-700/50 transition-colors"
|
||||||
|
>
|
||||||
|
<td className="px-4 py-3 font-medium text-slate-100">
|
||||||
|
{printer.name}
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-slate-300">
|
||||||
|
{printer.printer_type?.name ?? '—'}
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-slate-300">
|
||||||
|
{printer.manufacturer || '—'}
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-slate-300">
|
||||||
|
{printer.model || '—'}
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-center">
|
||||||
|
<span
|
||||||
|
className={`inline-flex items-center gap-1.5 rounded-full border px-2.5 py-0.5 text-xs font-medium ${statusConfig[status].className}`}
|
||||||
|
>
|
||||||
|
<StatusIcon size={12} />
|
||||||
|
{statusConfig[status].label}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3">
|
||||||
|
{printer.moonraker_url ? (
|
||||||
|
<a
|
||||||
|
href={printer.moonraker_url}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
className="inline-flex items-center gap-1.5 text-sky-400 hover:text-sky-300 text-xs truncate max-w-[180px]"
|
||||||
|
title={printer.moonraker_url}
|
||||||
|
>
|
||||||
|
<Globe size={12} className="shrink-0" />
|
||||||
|
{printer.moonraker_url}
|
||||||
|
</a>
|
||||||
|
) : (
|
||||||
|
<span className="text-slate-500 text-xs">—</span>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3">
|
||||||
|
{printer.mqtt_broker_host ? (
|
||||||
|
<div className="space-y-0.5">
|
||||||
|
<div className="inline-flex items-center gap-1.5 text-xs text-slate-300">
|
||||||
|
<Radio size={12} className="shrink-0 text-amber-400" />
|
||||||
|
<span className="truncate max-w-[140px]" title={printer.mqtt_broker_host}>
|
||||||
|
{printer.mqtt_broker_host}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
{printer.mqtt_topic_prefix && (
|
||||||
|
<div className="text-xs text-slate-500 ml-[20px] truncate max-w-[140px]" title={printer.mqtt_topic_prefix}>
|
||||||
|
topic: {printer.mqtt_topic_prefix}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="text-xs text-slate-500 ml-[20px]">
|
||||||
|
TLS: {printer.mqtt_tls_enabled ? 'on' : 'off'}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<span className="text-slate-500 text-xs">—</span>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Mobile / Tablet Cards */}
|
||||||
|
<div className="lg:hidden space-y-3">
|
||||||
|
{printers!.map((printer) => {
|
||||||
|
const status = getConnectionStatus(printer)
|
||||||
|
const StatusIcon = statusConfig[status].icon
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={printer.id}
|
||||||
|
className="rounded-lg border border-slate-700 bg-slate-800 p-4 space-y-3"
|
||||||
|
>
|
||||||
|
{/* Top row: name + status */}
|
||||||
|
<div className="flex items-start justify-between gap-3">
|
||||||
|
<div className="min-w-0">
|
||||||
|
<div className="font-semibold text-slate-100 truncate">
|
||||||
|
{printer.name}
|
||||||
|
</div>
|
||||||
|
<div className="text-xs text-slate-400 mt-0.5">
|
||||||
|
{[
|
||||||
|
printer.printer_type?.name,
|
||||||
|
printer.manufacturer,
|
||||||
|
printer.model,
|
||||||
|
]
|
||||||
|
.filter(Boolean)
|
||||||
|
.join(' · ') || 'No details'}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
className={`inline-flex items-center gap-1.5 rounded-full border px-2.5 py-0.5 text-xs font-medium shrink-0 ${statusConfig[status].className}`}
|
||||||
|
>
|
||||||
|
<StatusIcon size={12} />
|
||||||
|
{statusConfig[status].label}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Connection details */}
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
|
||||||
|
{/* Moonraker */}
|
||||||
|
<div className="rounded-md bg-slate-900/50 p-3 min-w-0">
|
||||||
|
<div className="flex items-center gap-1.5 text-xs text-slate-400 mb-1">
|
||||||
|
<Globe size={12} />
|
||||||
|
Moonraker
|
||||||
|
</div>
|
||||||
|
{printer.moonraker_url ? (
|
||||||
|
<a
|
||||||
|
href={printer.moonraker_url}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
className="text-xs text-sky-400 hover:text-sky-300 break-all"
|
||||||
|
>
|
||||||
|
{printer.moonraker_url}
|
||||||
|
</a>
|
||||||
|
) : (
|
||||||
|
<span className="text-xs text-slate-500">Not configured</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* MQTT */}
|
||||||
|
<div className="rounded-md bg-slate-900/50 p-3 min-w-0">
|
||||||
|
<div className="flex items-center gap-1.5 text-xs text-slate-400 mb-1">
|
||||||
|
<Radio size={12} />
|
||||||
|
MQTT
|
||||||
|
</div>
|
||||||
|
{printer.mqtt_broker_host ? (
|
||||||
|
<div className="space-y-0.5 text-xs text-slate-300">
|
||||||
|
<div className="truncate" title={printer.mqtt_broker_host}>
|
||||||
|
{printer.mqtt_broker_host}
|
||||||
|
</div>
|
||||||
|
{printer.mqtt_topic_prefix && (
|
||||||
|
<div className="text-slate-500 truncate" title={printer.mqtt_topic_prefix}>
|
||||||
|
topic: {printer.mqtt_topic_prefix}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="text-slate-500">
|
||||||
|
TLS: {printer.mqtt_tls_enabled ? 'on' : 'off'}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<span className="text-xs text-slate-500">Not configured</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import type { FilamentSpool, ListResponse, UsageLog, FilamentFilter } from '../types/filament'
|
import type { FilamentSpool, ListResponse, FilamentFilter } from '../types/filament'
|
||||||
|
|
||||||
const API_BASE = '/api'
|
const API_BASE = '/api'
|
||||||
|
|
||||||
@@ -19,16 +19,6 @@ export async function fetchFilaments(filter: FilamentFilter): Promise<ListRespon
|
|||||||
return res.data
|
return res.data
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function fetchFilamentById(id: number): Promise<FilamentSpool> {
|
|
||||||
const res = await axios.get<FilamentSpool>(`${API_BASE}/filaments/${id}`)
|
|
||||||
return res.data
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function fetchUsageLogs(spoolId: number): Promise<UsageLog[]> {
|
|
||||||
const res = await axios.get<UsageLog[]>(`${API_BASE}/usage-logs?spool_id=${spoolId}`)
|
|
||||||
return res.data
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function deleteFilament(id: number): Promise<void> {
|
export async function deleteFilament(id: number): Promise<void> {
|
||||||
await axios.delete(`${API_BASE}/filaments/${id}`)
|
await axios.delete(`${API_BASE}/filaments/${id}`)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import axios from 'axios'
|
||||||
|
import type { Printer, PrinterResponse } from '../types/printer'
|
||||||
|
|
||||||
|
const API_BASE = '/api'
|
||||||
|
|
||||||
|
export async function fetchPrinters(): Promise<Printer[]> {
|
||||||
|
const res = await axios.get<PrinterResponse>(`${API_BASE}/printers`)
|
||||||
|
return res.data.data
|
||||||
|
}
|
||||||
@@ -59,19 +59,6 @@ export interface ListResponse<T> {
|
|||||||
offset: number
|
offset: number
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UsageLog {
|
|
||||||
id: number
|
|
||||||
spool_id: number
|
|
||||||
print_job_id?: number
|
|
||||||
print_job_name?: string
|
|
||||||
mm_extruded: number
|
|
||||||
grams_used: number
|
|
||||||
cost_usd?: number
|
|
||||||
logged_at: string
|
|
||||||
notes?: string
|
|
||||||
created_at: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface FilamentFilter {
|
export interface FilamentFilter {
|
||||||
material?: string
|
material?: string
|
||||||
finish?: string
|
finish?: string
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
export interface PrinterType {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Printer {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
printer_type_id: number
|
||||||
|
printer_type?: PrinterType
|
||||||
|
manufacturer?: string
|
||||||
|
model?: string
|
||||||
|
moonraker_url?: string
|
||||||
|
moonraker_api_key?: string
|
||||||
|
mqtt_broker_host?: string
|
||||||
|
mqtt_topic_prefix?: string
|
||||||
|
mqtt_tls_enabled: boolean
|
||||||
|
is_active: boolean
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export type ConnectionStatus = 'online' | 'offline' | 'unknown'
|
||||||
|
|
||||||
|
export interface PrinterResponse {
|
||||||
|
data: Printer[]
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user