Compare commits
120 Commits
feature/ca
...
auth/googl
| Author | SHA1 | Date | |
|---|---|---|---|
| 20c8b04638 | |||
| c662c27fc7 | |||
| 3cefaf85d9 | |||
| 472dead0ff | |||
| fa8032c557 | |||
| 6c5e10feb2 | |||
| 63541a3593 | |||
| bc37a91c7f | |||
| 54826a7f8a | |||
| 8f57af3cf5 | |||
| da6614a9f8 | |||
| 8e44fa5a46 | |||
| 938d15bf83 | |||
| dafaa85480 | |||
| 98e899c5bf | |||
| 0c0d2b559d | |||
| a233a93d16 | |||
| b0e97fc577 | |||
| 5165ea0716 | |||
| c0eb3369c5 | |||
| 625990f594 | |||
| d4c671dc7a | |||
| 944c12a7f3 | |||
| 9a4e2a03e9 | |||
| 40cc2b840d | |||
| 45c2ee7a2f | |||
| b64c627702 | |||
| fc425543ee | |||
| 36045656e7 | |||
| ada832cbba | |||
| 524eea38f4 | |||
| f163e8a353 | |||
| 8b785fd631 | |||
| e4195a8567 | |||
| 25085f6f85 | |||
| 257e4fbeb8 | |||
| cc87169c1c | |||
| e383a8f159 | |||
| 993aa5823a | |||
| 6c00a3e2bb | |||
| efa0d48a40 | |||
| 9fcbf34573 | |||
| 451dc58cd7 | |||
| 26466f57db | |||
| a9dc55c274 | |||
| 5e9a5917fd | |||
| e06edaaa42 | |||
| 1f2ca09b81 | |||
| 56355569f2 | |||
| 036b2a950f | |||
| 7507580c2c | |||
| b016569b10 | |||
| 23f48ccec0 | |||
| 6a5683f6b7 | |||
| b7ed16966c | |||
| baf5e2d4e7 | |||
| 64ade4d595 | |||
| b9b8a70ca1 | |||
| 28ffe3c788 | |||
| 4969026fe9 | |||
| 09d88e6324 | |||
| 1a2d303b4e | |||
| 3579abdecb | |||
| f6ac1b8727 | |||
| eb73398397 | |||
| 1af478d65e | |||
| 7e8a638d01 | |||
| 639004c8c6 | |||
| 17ef39e9a8 | |||
| fff18e05c0 | |||
| c9d0e5ad01 | |||
| 4885d39284 | |||
| 9d42de9fa8 | |||
| bdb7f5e907 | |||
| e8d71bfd03 | |||
| 05ada5f613 | |||
| 5969818478 | |||
| c54eb105cb | |||
| e2605116c5 | |||
| d1e20460ac | |||
| 910f367851 | |||
| cb0d1e4d77 | |||
| 850f93e2ba | |||
| 53278719a8 | |||
| 8ceef31785 | |||
| a642ae84d5 | |||
| 09fa876da3 | |||
| 69fee4e20a | |||
| 1df6964859 | |||
| 3971970975 | |||
| 0a2d999c00 | |||
| 37d94159aa | |||
| 361596bbbc | |||
| 97a359d65c | |||
| 811f127deb | |||
| bfbbfb9c09 | |||
| 41bb5e7c9e | |||
| be041f6e88 | |||
| 45f0618ae9 | |||
| 2b3713f6a8 | |||
| 510c72624b | |||
| 625e2fea6c | |||
| 3697c4b97c | |||
| bedb74ebd5 | |||
| 6bab2e9ab2 | |||
| bd4b86fe85 | |||
| 6ffffc6ea8 | |||
| 57f58c92be | |||
| 5365811a50 | |||
| 3c98600193 | |||
| ff3c3233c1 | |||
| 20e8578440 | |||
| 193ba7472b | |||
| bc9390394a | |||
| 4393280fd9 | |||
| 956411254e | |||
| 4cbf87feb1 | |||
| 93d49fc7e6 | |||
| 85465ce7e1 | |||
| ee83e7ab32 |
298
package-lock.json
generated
298
package-lock.json
generated
@@ -19,6 +19,7 @@
|
|||||||
"@fortawesome/fontawesome-free": "^7.2.0",
|
"@fortawesome/fontawesome-free": "^7.2.0",
|
||||||
"bootstrap": "^5.3.8",
|
"bootstrap": "^5.3.8",
|
||||||
"express": "^5.1.0",
|
"express": "^5.1.0",
|
||||||
|
"qrcode": "1.5.4",
|
||||||
"rxjs": "~7.8.0",
|
"rxjs": "~7.8.0",
|
||||||
"tslib": "^2.3.0"
|
"tslib": "^2.3.0"
|
||||||
},
|
},
|
||||||
@@ -4394,6 +4395,15 @@
|
|||||||
"url": "https://github.com/sponsors/ljharb"
|
"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": {
|
"node_modules/caniuse-lite": {
|
||||||
"version": "1.0.30001799",
|
"version": "1.0.30001799",
|
||||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz",
|
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz",
|
||||||
@@ -4578,6 +4588,24 @@
|
|||||||
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
|
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/color-convert": {
|
||||||
|
"version": "2.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
|
||||||
|
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"color-name": "~1.1.4"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=7.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/color-name": {
|
||||||
|
"version": "1.1.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
|
||||||
|
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/content-disposition": {
|
"node_modules/content-disposition": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz",
|
||||||
@@ -4759,6 +4787,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": {
|
"node_modules/decimal.js": {
|
||||||
"version": "10.6.0",
|
"version": "10.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
|
||||||
@@ -4786,6 +4823,12 @@
|
|||||||
"node": ">=8"
|
"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": {
|
"node_modules/dom-serializer": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
|
||||||
@@ -5237,6 +5280,19 @@
|
|||||||
"url": "https://opencollective.com/express"
|
"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": {
|
"node_modules/forwarded": {
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
|
||||||
@@ -5306,7 +5362,6 @@
|
|||||||
"version": "2.0.5",
|
"version": "2.0.5",
|
||||||
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
|
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
|
||||||
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
|
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
|
||||||
"dev": true,
|
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "6.* || 8.* || >= 10.*"
|
"node": "6.* || 8.* || >= 10.*"
|
||||||
@@ -5927,6 +5982,18 @@
|
|||||||
"@lmdb/lmdb-win32-x64": "3.5.4"
|
"@lmdb/lmdb-win32-x64": "3.5.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"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": {
|
"node_modules/log-symbols": {
|
||||||
"version": "7.0.1",
|
"version": "7.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-7.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-7.0.1.tgz",
|
||||||
@@ -6703,6 +6770,33 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true
|
"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": {
|
"node_modules/p-map": {
|
||||||
"version": "7.0.4",
|
"version": "7.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
|
||||||
@@ -6716,6 +6810,15 @@
|
|||||||
"url": "https://github.com/sponsors/sindresorhus"
|
"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": {
|
"node_modules/pacote": {
|
||||||
"version": "21.5.1",
|
"version": "21.5.1",
|
||||||
"resolved": "https://registry.npmjs.org/pacote/-/pacote-21.5.1.tgz",
|
"resolved": "https://registry.npmjs.org/pacote/-/pacote-21.5.1.tgz",
|
||||||
@@ -6824,6 +6927,15 @@
|
|||||||
"node": ">= 0.8"
|
"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": {
|
"node_modules/path-key": {
|
||||||
"version": "3.1.1",
|
"version": "3.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
|
||||||
@@ -6921,6 +7033,15 @@
|
|||||||
"node": ">=16.20.0"
|
"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": {
|
"node_modules/postcss": {
|
||||||
"version": "8.5.15",
|
"version": "8.5.15",
|
||||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
|
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
|
||||||
@@ -7033,6 +7154,154 @@
|
|||||||
"node": ">=6"
|
"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/ansi-styles": {
|
||||||
|
"version": "4.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
|
||||||
|
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"color-convert": "^2.0.1"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"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/wrap-ansi": {
|
||||||
|
"version": "6.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
|
||||||
|
"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"ansi-styles": "^4.0.0",
|
||||||
|
"string-width": "^4.1.0",
|
||||||
|
"strip-ansi": "^6.0.0"
|
||||||
|
},
|
||||||
|
"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": {
|
"node_modules/qs": {
|
||||||
"version": "6.15.2",
|
"version": "6.15.2",
|
||||||
"resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz",
|
"resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz",
|
||||||
@@ -7093,6 +7362,15 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0"
|
"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": {
|
"node_modules/require-from-string": {
|
||||||
"version": "2.0.2",
|
"version": "2.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
|
||||||
@@ -7103,6 +7381,12 @@
|
|||||||
"node": ">=0.10.0"
|
"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": {
|
"node_modules/restore-cursor": {
|
||||||
"version": "5.1.0",
|
"version": "5.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
|
||||||
@@ -7325,6 +7609,12 @@
|
|||||||
"url": "https://opencollective.com/express"
|
"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": {
|
"node_modules/setprototypeof": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
|
||||||
@@ -8690,6 +8980,12 @@
|
|||||||
"node": ">= 8"
|
"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": {
|
"node_modules/why-is-node-running": {
|
||||||
"version": "2.3.0",
|
"version": "2.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
"@fortawesome/fontawesome-free": "^7.2.0",
|
"@fortawesome/fontawesome-free": "^7.2.0",
|
||||||
"bootstrap": "^5.3.8",
|
"bootstrap": "^5.3.8",
|
||||||
"express": "^5.1.0",
|
"express": "^5.1.0",
|
||||||
|
"qrcode": "1.5.4",
|
||||||
"rxjs": "~7.8.0",
|
"rxjs": "~7.8.0",
|
||||||
"tslib": "^2.3.0"
|
"tslib": "^2.3.0"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,17 +1,36 @@
|
|||||||
import { provideHttpClient, withFetch } from '@angular/common/http';
|
import { HttpRequest, provideHttpClient, withFetch, withInterceptors } from '@angular/common/http';
|
||||||
import { ApplicationConfig, provideAppInitializer, provideBrowserGlobalErrorListeners } from '@angular/core';
|
import {
|
||||||
|
ApplicationConfig,
|
||||||
|
provideAppInitializer,
|
||||||
|
provideBrowserGlobalErrorListeners,
|
||||||
|
} from '@angular/core';
|
||||||
import { provideRouter } from '@angular/router';
|
import { provideRouter } from '@angular/router';
|
||||||
import { provideClientHydration } from '@angular/platform-browser';
|
import { provideClientHydration, withHttpTransferCacheOptions } from '@angular/platform-browser';
|
||||||
|
|
||||||
import { routes } from './app.routes';
|
import { routes } from './app.routes';
|
||||||
|
import { authBootstrap } from './core/services/auth/auth-bootstrap';
|
||||||
|
import { authInterceptor } from './core/services/auth/auth.interceptor';
|
||||||
import { tenantBootstrap } from './core/services/tenant-bootstrap';
|
import { tenantBootstrap } from './core/services/tenant-bootstrap';
|
||||||
|
|
||||||
|
function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean {
|
||||||
|
return (
|
||||||
|
request.method === 'GET' &&
|
||||||
|
/\/api\/tenants\/[^/]+\/productos(?:\/\d+)?(?:\?|$)/.test(request.urlWithParams)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export const appConfig: ApplicationConfig = {
|
export const appConfig: ApplicationConfig = {
|
||||||
providers: [
|
providers: [
|
||||||
provideBrowserGlobalErrorListeners(),
|
provideBrowserGlobalErrorListeners(),
|
||||||
provideRouter(routes),
|
provideRouter(routes),
|
||||||
provideClientHydration(),
|
provideClientHydration(
|
||||||
provideHttpClient(withFetch()),
|
withHttpTransferCacheOptions({
|
||||||
provideAppInitializer(tenantBootstrap)
|
includeRequestsWithAuthHeaders: true,
|
||||||
]
|
filter: isStoreCatalogRequest,
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
provideHttpClient(withFetch(), withInterceptors([authInterceptor])),
|
||||||
|
provideAppInitializer(authBootstrap),
|
||||||
|
provideAppInitializer(tenantBootstrap),
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,14 +1,15 @@
|
|||||||
import { signal } from '@angular/core';
|
import { computed, signal } from '@angular/core';
|
||||||
import { TestBed } from '@angular/core/testing';
|
import { TestBed } from '@angular/core/testing';
|
||||||
import { provideRouter, Router } from '@angular/router';
|
import { provideRouter, Router } from '@angular/router';
|
||||||
|
|
||||||
import { of } from 'rxjs';
|
import { of } from 'rxjs';
|
||||||
|
|
||||||
import { App } from './app';
|
import { App } from './app';
|
||||||
import { routes } from './app.routes';
|
import { AuthService } from './core/services/auth/auth.service';
|
||||||
|
import { CartService } from './core/services/cart/cart.service';
|
||||||
import { Tenant } from './core/services/tenant.interface';
|
import { Tenant } from './core/services/tenant.interface';
|
||||||
import { TenantService } from './core/services/tenant.service';
|
import { TenantService } from './core/services/tenant.service';
|
||||||
import { CartService } from './core/services/cart/cart.service';
|
import { routes } from './app.routes';
|
||||||
|
|
||||||
const tenant: Tenant = {
|
const tenant: Tenant = {
|
||||||
id: 1,
|
id: 1,
|
||||||
@@ -47,9 +48,33 @@ function createTenantServiceStub(
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function createAuthServiceStub(isAuthenticated = false) {
|
||||||
|
const tokenState = signal<string | null>(isAuthenticated ? 'test-token' : null);
|
||||||
|
const userState = signal(
|
||||||
|
isAuthenticated ? { id: 1, nombre_apellido: 'Ada Lovelace', email: 'ada@example.com' } : null
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
user: userState.asReadonly(),
|
||||||
|
token: tokenState.asReadonly(),
|
||||||
|
isAuthenticated: computed(() => tokenState() !== null),
|
||||||
|
login: vi.fn(),
|
||||||
|
register: vi.fn(),
|
||||||
|
logout: vi.fn(),
|
||||||
|
loadCurrentUser: vi.fn(),
|
||||||
|
hydrateSession: vi.fn(),
|
||||||
|
bootstrap: vi.fn().mockResolvedValue(undefined),
|
||||||
|
clearSession: vi.fn(() => {
|
||||||
|
userState.set(null);
|
||||||
|
tokenState.set(null);
|
||||||
|
})
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
async function renderAppAt(
|
async function renderAppAt(
|
||||||
url: string,
|
url: string,
|
||||||
tenantService: ReturnType<typeof createTenantServiceStub> = createTenantServiceStub()
|
tenantService: ReturnType<typeof createTenantServiceStub> = createTenantServiceStub(),
|
||||||
|
authService: ReturnType<typeof createAuthServiceStub> = createAuthServiceStub()
|
||||||
) {
|
) {
|
||||||
TestBed.resetTestingModule();
|
TestBed.resetTestingModule();
|
||||||
|
|
||||||
@@ -67,6 +92,10 @@ async function renderAppAt(
|
|||||||
cart: signal(null).asReadonly(),
|
cart: signal(null).asReadonly(),
|
||||||
loadCart: () => of({ id: 1, items: [], subtotal: '0' })
|
loadCart: () => of({ id: 1, items: [], subtotal: '0' })
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: AuthService,
|
||||||
|
useValue: authService
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
@@ -106,14 +135,63 @@ describe('app routes', () => {
|
|||||||
expect(compiled.textContent).toContain('Componentes reutilizables');
|
expect(compiled.textContent).toContain('Componentes reutilizables');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('loads the login page at /login and shows the create account CTA', async () => {
|
||||||
|
const { fixture, router } = await renderAppAt('/login');
|
||||||
|
const compiled = fixture.nativeElement as HTMLElement;
|
||||||
|
|
||||||
|
expect(router.url).toBe('/login');
|
||||||
|
expect(compiled.querySelector('app-login-page')).not.toBeNull();
|
||||||
|
expect(compiled.textContent).toContain('Iniciar sesion');
|
||||||
|
expect(compiled.textContent).toContain('Crear cuenta');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('loads the register page at /register and renders the shared auth fields', async () => {
|
||||||
|
const { fixture, router } = await renderAppAt('/register');
|
||||||
|
const compiled = fixture.nativeElement as HTMLElement;
|
||||||
|
const registerPage = compiled.querySelector('app-register-page');
|
||||||
|
const placeholders = Array.from(registerPage?.querySelectorAll('input') ?? []).map((input) =>
|
||||||
|
input.getAttribute('placeholder')
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(router.url).toBe('/register');
|
||||||
|
expect(registerPage).not.toBeNull();
|
||||||
|
expect(compiled.textContent).toContain('CREAR CUENTA');
|
||||||
|
expect(compiled.textContent).toContain('Volver');
|
||||||
|
expect(placeholders).toEqual([
|
||||||
|
'Nombre y Apellido',
|
||||||
|
'Email',
|
||||||
|
'Contraseña',
|
||||||
|
'Repetir Contraseña'
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('redirects authenticated users away from /login', async () => {
|
||||||
|
const { router } = await renderAppAt('/login', createTenantServiceStub(), createAuthServiceStub(true));
|
||||||
|
|
||||||
|
expect(router.url).toBe('/');
|
||||||
|
});
|
||||||
|
|
||||||
it('renders the tenant not found screen for any route when the tenant is missing', async () => {
|
it('renders the tenant not found screen for any route when the tenant is missing', async () => {
|
||||||
const { fixture } = await renderAppAt(
|
const { fixture } = await renderAppAt(
|
||||||
'/componentes-test/reutilizables',
|
'/componentes-test/reutilizables',
|
||||||
createTenantServiceStub('not-found', null)
|
createTenantServiceStub('not-found', null),
|
||||||
|
createAuthServiceStub()
|
||||||
);
|
);
|
||||||
const compiled = fixture.nativeElement as HTMLElement;
|
const compiled = fixture.nativeElement as HTMLElement;
|
||||||
|
|
||||||
expect(compiled.querySelector('.tenant-status')).not.toBeNull();
|
expect(compiled.querySelector('.tenant-status')).not.toBeNull();
|
||||||
expect(compiled.textContent).toContain('No encontramos una tienda para este dominio');
|
expect(compiled.textContent).toContain('No encontramos una tienda para este dominio');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('redirects unauthenticated users from /checkout to /login', async () => {
|
||||||
|
const { router } = await renderAppAt('/checkout', createTenantServiceStub(), createAuthServiceStub(false));
|
||||||
|
|
||||||
|
expect(router.url).toBe('/login');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('allows authenticated users to access /checkout', async () => {
|
||||||
|
const { router } = await renderAppAt('/checkout', createTenantServiceStub(), createAuthServiceStub(true));
|
||||||
|
|
||||||
|
expect(router.url).toBe('/checkout');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -31,12 +31,22 @@ function hexToRgb(hex: string): string {
|
|||||||
'[style.--tenant-secondary]': 'tenantSecondaryColor()',
|
'[style.--tenant-secondary]': 'tenantSecondaryColor()',
|
||||||
'[style.--tenant-danger]': 'tenantDangerColor()',
|
'[style.--tenant-danger]': 'tenantDangerColor()',
|
||||||
'[style.--tenant-success]': 'tenantSuccessColor()',
|
'[style.--tenant-success]': 'tenantSuccessColor()',
|
||||||
|
'[style.--color-primary]': 'tenantPrimaryColor()',
|
||||||
|
'[style.--color-secondary]': 'tenantSecondaryColor()',
|
||||||
|
'[style.--color-danger]': 'tenantDangerColor()',
|
||||||
|
'[style.--color-success]': 'tenantSuccessColor()',
|
||||||
'[style.--tenant-primary-rgb]': 'tenantPrimaryColorRgb()',
|
'[style.--tenant-primary-rgb]': 'tenantPrimaryColorRgb()',
|
||||||
'[style.--tenant-secondary-rgb]': 'tenantSecondaryColorRgb()',
|
'[style.--tenant-secondary-rgb]': 'tenantSecondaryColorRgb()',
|
||||||
'[style.--tenant-danger-rgb]': 'tenantDangerColorRgb()',
|
'[style.--tenant-danger-rgb]': 'tenantDangerColorRgb()',
|
||||||
'[style.--tenant-success-rgb]': 'tenantSuccessColorRgb()',
|
'[style.--tenant-success-rgb]': 'tenantSuccessColorRgb()',
|
||||||
|
'[style.--color-primary-rgb]': 'tenantPrimaryColorRgb()',
|
||||||
|
'[style.--color-secondary-rgb]': 'tenantSecondaryColorRgb()',
|
||||||
|
'[style.--color-danger-rgb]': 'tenantDangerColorRgb()',
|
||||||
|
'[style.--color-success-rgb]': 'tenantSuccessColorRgb()',
|
||||||
'[style.--tenant-header-bg]': 'tenantHeaderBgColor()',
|
'[style.--tenant-header-bg]': 'tenantHeaderBgColor()',
|
||||||
'[style.--tenant-footer-bg]': 'tenantFooterBgColor()'
|
'[style.--tenant-footer-bg]': 'tenantFooterBgColor()',
|
||||||
|
'[style.--color-header-bg]': 'tenantHeaderBgColor()',
|
||||||
|
'[style.--color-footer-bg]': 'tenantFooterBgColor()'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
export class App {
|
export class App {
|
||||||
@@ -78,5 +88,4 @@ export class App {
|
|||||||
this.tenantService.tenant()?.footer_bg_color ??
|
this.tenantService.tenant()?.footer_bg_color ??
|
||||||
DEFAULT_TENANT_BRANDING.footerBgColor
|
DEFAULT_TENANT_BRANDING.footerBgColor
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
24
src/app/core/guards/menu.guard.ts
Normal file
24
src/app/core/guards/menu.guard.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import { inject } from '@angular/core';
|
||||||
|
import { CanActivateFn, Router } from '@angular/router';
|
||||||
|
import { TenantService } from '../services/tenant.service';
|
||||||
|
|
||||||
|
export const hasMenuGuard = (menuCode: string): CanActivateFn => {
|
||||||
|
return () => {
|
||||||
|
const tenantService = inject(TenantService);
|
||||||
|
const router = inject(Router);
|
||||||
|
|
||||||
|
const tenant = tenantService.tenant();
|
||||||
|
|
||||||
|
if (!tenant) {
|
||||||
|
return router.createUrlTree(['/']);
|
||||||
|
}
|
||||||
|
|
||||||
|
const hasMenu = tenant.menues?.some(menu => menu.code === menuCode) ?? false;
|
||||||
|
|
||||||
|
if (hasMenu) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return router.createUrlTree(['/']);
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<section class="simple-layout">
|
||||||
|
<div class="simple-layout__container container-xl">
|
||||||
|
<div class="simple-layout__row row justify-content-center">
|
||||||
|
<div class="simple-layout__column col-12 col-md-9 col-lg-7 col-xl-5">
|
||||||
|
<article class="simple-layout__card card border-0 shadow-lg">
|
||||||
|
<div class="simple-layout__body card-body">
|
||||||
|
<router-outlet />
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
:host {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.simple-layout {
|
||||||
|
padding: 1.5rem 0 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.simple-layout__container {
|
||||||
|
padding-inline: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.simple-layout__row {
|
||||||
|
padding-block: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.simple-layout__card {
|
||||||
|
border-radius: 5px;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.simple-layout__body {
|
||||||
|
padding: 2rem 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
:host ::ng-deep .auth-title {
|
||||||
|
margin: 0;
|
||||||
|
color: #666666;
|
||||||
|
font-size: 17px;
|
||||||
|
font-weight: 700;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 768px) {
|
||||||
|
.simple-layout {
|
||||||
|
padding: 3rem 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.simple-layout__container {
|
||||||
|
padding-inline: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.simple-layout__row {
|
||||||
|
padding-block: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.simple-layout__body {
|
||||||
|
padding: 3rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
11
src/app/core/layout/simple-layout/simple-layout.component.ts
Normal file
11
src/app/core/layout/simple-layout/simple-layout.component.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component } from '@angular/core';
|
||||||
|
import { RouterOutlet } from '@angular/router';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-simple-layout',
|
||||||
|
imports: [RouterOutlet],
|
||||||
|
templateUrl: './simple-layout.component.html',
|
||||||
|
styleUrl: './simple-layout.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
|
})
|
||||||
|
export class SimpleLayoutComponent {}
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
<header class="store-layout__header">
|
<header class="store-layout__header">
|
||||||
<div class="store-layout__header-main">
|
<div class="store-layout__header-main">
|
||||||
<div class="container-xl px-3 px-md-4 py-3 py-lg-4 d-flex flex-row flex-wrap align-items-center justify-content-between gap-3">
|
<div class="container-xl px-3 px-md-4 py-3 py-lg-4 d-flex flex-row flex-wrap align-items-center justify-content-between gap-3">
|
||||||
<div
|
<a
|
||||||
class="store-layout__brand-slot d-inline-flex align-items-center gap-3 flex-shrink-0"
|
routerLink="/"
|
||||||
|
class="store-layout__brand-slot d-inline-flex align-items-center gap-3 flex-shrink-0 text-decoration-none"
|
||||||
data-testid="store-header-brand-slot"
|
data-testid="store-header-brand-slot"
|
||||||
aria-label="Logo del comercio"
|
aria-label="Logo del comercio"
|
||||||
>
|
>
|
||||||
@@ -13,16 +14,15 @@
|
|||||||
<span class="store-layout__brand-logo-skeleton"></span>
|
<span class="store-layout__brand-logo-skeleton"></span>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</a>
|
||||||
|
|
||||||
<div class="d-flex flex-row align-items-center gap-3 ms-auto flex-nowrap w-100 justify-content-between justify-content-md-end">
|
<div class="d-flex flex-row align-items-center gap-3 ms-auto flex-nowrap flex-grow-1 justify-content-between justify-content-md-end">
|
||||||
<div class="input-group store-layout__search flex-grow-1" role="search">
|
<div class="input-group store-layout__search" role="search">
|
||||||
<label class="visually-hidden" for="store-search-input">Buscar productos</label>
|
<label class="visually-hidden" for="store-search-input">Buscar productos</label>
|
||||||
<input
|
<input
|
||||||
id="store-search-input"
|
id="store-search-input"
|
||||||
type="search"
|
type="search"
|
||||||
class="form-control store-layout__search-input border-end-0 rounded-start"
|
class="form-control store-layout__search-input border-end-0 rounded-start"
|
||||||
placeholder="Buscar productos"
|
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -40,11 +40,24 @@
|
|||||||
title="Carrito"
|
title="Carrito"
|
||||||
(click)="cartClick.emit()"
|
(click)="cartClick.emit()"
|
||||||
/>
|
/>
|
||||||
<app-icon-button
|
<div class="store-layout__user-menu">
|
||||||
variant="user"
|
<app-icon-button
|
||||||
ariaLabel="Mi cuenta"
|
variant="user"
|
||||||
title="Mi cuenta"
|
ariaLabel="Mi cuenta"
|
||||||
/>
|
ariaControls="store-user-dropdown"
|
||||||
|
[ariaExpanded]="isUserDropdownOpen()"
|
||||||
|
title="Mi cuenta"
|
||||||
|
(clicked)="toggleUserDropdown()"
|
||||||
|
/>
|
||||||
|
|
||||||
|
@if (isUserDropdownOpen()) {
|
||||||
|
<app-user-dropdown
|
||||||
|
id="store-user-dropdown"
|
||||||
|
[user]="user()"
|
||||||
|
(logoutClick)="onLogoutClick()"
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -9,7 +9,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.store-layout__brand-slot {
|
.store-layout__brand-slot {
|
||||||
min-width: 10rem;
|
min-width: 150px;
|
||||||
|
max-width:40px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.store-layout__brand-logo-shell {
|
.store-layout__brand-logo-shell {
|
||||||
@@ -41,7 +42,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.store-layout__search {
|
.store-layout__search {
|
||||||
width: min(100%, 24rem);
|
width: min(100%, 260px);
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,8 +57,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.store-layout__search-input:focus {
|
.store-layout__search-input:focus {
|
||||||
border-color: var(--tenant-primary);
|
border-color: #cccccc;
|
||||||
box-shadow: 0 0 0 0.25rem color-mix(in srgb, white 70%, var(--tenant-primary));
|
box-shadow: none;
|
||||||
|
outline: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.store-layout__search-button {
|
.store-layout__search-button {
|
||||||
@@ -82,6 +84,11 @@
|
|||||||
color: #8a8a8a;
|
color: #8a8a8a;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.store-layout__user-menu {
|
||||||
|
position: relative;
|
||||||
|
display: inline-flex;
|
||||||
|
}
|
||||||
|
|
||||||
.store-layout__category-trigger {
|
.store-layout__category-trigger {
|
||||||
font-size: 0.8rem;
|
font-size: 0.8rem;
|
||||||
letter-spacing: 0.02em;
|
letter-spacing: 0.02em;
|
||||||
|
|||||||
@@ -1,15 +1,62 @@
|
|||||||
import { Component, input, output } from '@angular/core';
|
import { Component, ElementRef, HostListener, inject, input, output, signal } from '@angular/core';
|
||||||
|
import { RouterLink } from '@angular/router';
|
||||||
|
import { AuthUser } from '../../../services/auth/auth.interfaces';
|
||||||
import { CartIconComponent } from '../../../../shared/components/cart-icon/cart-icon.component';
|
import { CartIconComponent } from '../../../../shared/components/cart-icon/cart-icon.component';
|
||||||
import { IconButtonComponent } from '../../../../shared/components/icon-button/icon-button.component';
|
import { IconButtonComponent } from '../../../../shared/components/icon-button/icon-button.component';
|
||||||
|
import { UserDropdownComponent } from './user-dropdown/user-dropdown.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-store-header',
|
selector: 'app-store-header',
|
||||||
imports: [CartIconComponent, IconButtonComponent],
|
imports: [CartIconComponent, IconButtonComponent, RouterLink, UserDropdownComponent],
|
||||||
templateUrl: './store-header.component.html',
|
templateUrl: './store-header.component.html',
|
||||||
styleUrl: './store-header.component.scss'
|
styleUrl: './store-header.component.scss'
|
||||||
})
|
})
|
||||||
export class StoreHeaderComponent {
|
export class StoreHeaderComponent {
|
||||||
|
private readonly elementRef = inject(ElementRef<HTMLElement>);
|
||||||
|
|
||||||
readonly logoUrl = input<string | null>(null);
|
readonly logoUrl = input<string | null>(null);
|
||||||
readonly cartQuantity = input<number>(0);
|
readonly cartQuantity = input<number>(0);
|
||||||
|
readonly user = input<AuthUser | null>(null);
|
||||||
|
readonly isAuthenticated = input<boolean>(false);
|
||||||
readonly cartClick = output<void>();
|
readonly cartClick = output<void>();
|
||||||
|
readonly loginClick = output<void>();
|
||||||
|
readonly logoutClick = output<void>();
|
||||||
|
|
||||||
|
protected readonly isUserDropdownOpen = signal(false);
|
||||||
|
|
||||||
|
@HostListener('document:click', ['$event'])
|
||||||
|
protected onDocumentClick(event: MouseEvent): void {
|
||||||
|
if (!this.isUserDropdownOpen()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const target = event.target;
|
||||||
|
if (target instanceof Node && !this.elementRef.nativeElement.contains(target)) {
|
||||||
|
this.isUserDropdownOpen.set(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@HostListener('document:keydown.escape')
|
||||||
|
protected onEscapeKey(): void {
|
||||||
|
this.isUserDropdownOpen.set(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected toggleUserDropdown(): void {
|
||||||
|
if (!this.isAuthenticated()) {
|
||||||
|
this.loginClick.emit();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isUserDropdownOpen.update((isOpen) => !isOpen);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onLoginClick(): void {
|
||||||
|
this.isUserDropdownOpen.set(false);
|
||||||
|
this.loginClick.emit();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onLogoutClick(): void {
|
||||||
|
this.isUserDropdownOpen.set(false);
|
||||||
|
this.logoutClick.emit();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<section class="user-dropdown" role="menu" aria-label="Menu de usuario">
|
||||||
|
<div class="user-dropdown__profile">
|
||||||
|
<span class="user-dropdown__name">{{ displayName() }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="user-dropdown__divider"></div>
|
||||||
|
|
||||||
|
<a routerLink="/mi-cuenta/datos-personales" class="user-dropdown__item" role="menuitem" data-testid="user-dropdown-account">
|
||||||
|
Mi cuenta
|
||||||
|
</a>
|
||||||
|
<a routerLink="/mi-cuenta/compras" class="user-dropdown__item" role="menuitem" data-testid="user-dropdown-purchases">
|
||||||
|
Mis compras
|
||||||
|
</a>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="user-dropdown__item"
|
||||||
|
role="menuitem"
|
||||||
|
data-testid="user-dropdown-logout"
|
||||||
|
(click)="logoutClick.emit()"
|
||||||
|
>
|
||||||
|
Cerrar sesion
|
||||||
|
</button>
|
||||||
|
</section>
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
:host {
|
||||||
|
position: absolute;
|
||||||
|
top: calc(100% + 0.75rem);
|
||||||
|
right: 0;
|
||||||
|
z-index: 1060;
|
||||||
|
display: block;
|
||||||
|
width: min(18rem, calc(100vw - 2rem));
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-dropdown {
|
||||||
|
display: grid;
|
||||||
|
background: #ffffff;
|
||||||
|
border: 1px solid rgba(32, 32, 32, 0.1);
|
||||||
|
border-radius: 8px;
|
||||||
|
box-shadow: 0 18px 44px rgba(0, 0, 0, 0.16);
|
||||||
|
padding: 0.75rem;
|
||||||
|
animation: user-dropdown-enter 0.16s ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-dropdown__profile {
|
||||||
|
padding: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-dropdown__name {
|
||||||
|
color: #a0a0a0;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 325;
|
||||||
|
line-height: 1.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-dropdown__divider {
|
||||||
|
height: 1px;
|
||||||
|
margin: 0.6rem 0;
|
||||||
|
background: rgba(32, 32, 32, 0.08);
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-dropdown__item {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
border: 0;
|
||||||
|
border-radius: 6px;
|
||||||
|
padding: 0.65rem 0.6rem;
|
||||||
|
color: #8a8a8a;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 700;
|
||||||
|
text-align: left;
|
||||||
|
background: transparent;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: color 0.15s ease;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-dropdown__item:active,
|
||||||
|
.user-dropdown__item:hover,
|
||||||
|
.user-dropdown__item:focus-visible {
|
||||||
|
color: var(--tenant-primary);
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes user-dropdown-enter {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateY(-0.35rem);
|
||||||
|
}
|
||||||
|
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 575.98px) {
|
||||||
|
:host {
|
||||||
|
right: -0.5rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { Component, computed, input, output } from '@angular/core';
|
||||||
|
import { RouterLink } from '@angular/router';
|
||||||
|
import { AuthUser } from '../../../../services/auth/auth.interfaces';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-user-dropdown',
|
||||||
|
standalone: true,
|
||||||
|
imports: [RouterLink],
|
||||||
|
templateUrl: './user-dropdown.component.html',
|
||||||
|
styleUrl: './user-dropdown.component.scss'
|
||||||
|
})
|
||||||
|
export class UserDropdownComponent {
|
||||||
|
readonly user = input<AuthUser | null>(null);
|
||||||
|
readonly logoutClick = output<void>();
|
||||||
|
|
||||||
|
protected readonly displayName = computed(() => this.user()?.nombre_apellido || 'Mi cuenta');
|
||||||
|
}
|
||||||
@@ -2,7 +2,11 @@
|
|||||||
<app-store-header
|
<app-store-header
|
||||||
[cartQuantity]="cartQuantity()"
|
[cartQuantity]="cartQuantity()"
|
||||||
[logoUrl]="tenant()?.header_logo ?? null"
|
[logoUrl]="tenant()?.header_logo ?? null"
|
||||||
|
[user]="user()"
|
||||||
|
[isAuthenticated]="isAuthenticated()"
|
||||||
(cartClick)="isCartOpen.set(!isCartOpen())"
|
(cartClick)="isCartOpen.set(!isCartOpen())"
|
||||||
|
(loginClick)="onLoginClick()"
|
||||||
|
(logoutClick)="onLogoutClick()"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@if (isCartOpen()) {
|
@if (isCartOpen()) {
|
||||||
@@ -17,14 +21,18 @@
|
|||||||
[backgroundColor]="'#ffffff'"
|
[backgroundColor]="'#ffffff'"
|
||||||
(closed)="isCartOpen.set(false)"
|
(closed)="isCartOpen.set(false)"
|
||||||
>
|
>
|
||||||
<app-button variant="secondary" class="flex-grow-1">Seguir comprando</app-button>
|
<app-button variant="secondary" class="flex-grow-1" (click)="isCartOpen.set(false)">Seguir comprando</app-button>
|
||||||
<app-button variant="primary" class="flex-grow-1">Comprar</app-button>
|
<app-button variant="primary" class="flex-grow-1" (click)="onCheckoutClick()">Comprar</app-button>
|
||||||
</app-cart>
|
</app-cart>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
<main class="flex-grow-1 d-block">
|
<main class="flex-grow-1 d-block">
|
||||||
<router-outlet />
|
<section class="py-5">
|
||||||
|
<div class="container-xl px-3 px-md-4">
|
||||||
|
<router-outlet />
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<app-store-footer
|
<app-store-footer
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
:host {
|
:host {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 100dvh;
|
min-height: 100dvh;
|
||||||
background:
|
background: #f5f5f5;
|
||||||
radial-gradient(
|
|
||||||
circle at top,
|
|
||||||
color-mix(in srgb, white 88%, var(--tenant-primary)) 0%,
|
|
||||||
transparent 58%
|
|
||||||
),
|
|
||||||
#f6f6f6;
|
|
||||||
color: #202020;
|
color: #202020;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,7 +24,6 @@
|
|||||||
top: 76px;
|
top: 76px;
|
||||||
right: calc((100% - 1320px) / 2 + 1.5rem);
|
right: calc((100% - 1320px) / 2 + 1.5rem);
|
||||||
|
|
||||||
height: 520px;
|
|
||||||
max-height: calc(100vh - 120px);
|
max-height: calc(100vh - 120px);
|
||||||
z-index: 1050;
|
z-index: 1050;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
|
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
||||||
import { signal } from '@angular/core';
|
import { signal } from '@angular/core';
|
||||||
import { TestBed } from '@angular/core/testing';
|
import { TestBed } from '@angular/core/testing';
|
||||||
import { provideRouter } from '@angular/router';
|
import { provideRouter, Router } from '@angular/router';
|
||||||
|
|
||||||
import { of } from 'rxjs';
|
import { of } from 'rxjs';
|
||||||
|
|
||||||
@@ -8,6 +9,8 @@ import { Tenant } from '../../services/tenant.interface';
|
|||||||
import { TenantService } from '../../services/tenant.service';
|
import { TenantService } from '../../services/tenant.service';
|
||||||
import { CartService } from '../../services/cart/cart.service';
|
import { CartService } from '../../services/cart/cart.service';
|
||||||
import { ToastService } from '../../services/toast.service';
|
import { ToastService } from '../../services/toast.service';
|
||||||
|
import { AuthService } from '../../services/auth/auth.service';
|
||||||
|
import { AuthUser } from '../../services/auth/auth.interfaces';
|
||||||
import { StoreLayoutComponent } from './store-layout.component';
|
import { StoreLayoutComponent } from './store-layout.component';
|
||||||
|
|
||||||
const tenant: Tenant = {
|
const tenant: Tenant = {
|
||||||
@@ -28,6 +31,8 @@ const tenant: Tenant = {
|
|||||||
describe('StoreLayoutComponent', () => {
|
describe('StoreLayoutComponent', () => {
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
const tenantState = signal(tenant);
|
const tenantState = signal(tenant);
|
||||||
|
const authUserState = signal<AuthUser | null>(null);
|
||||||
|
const isAuthenticatedState = signal(false);
|
||||||
|
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
imports: [StoreLayoutComponent],
|
imports: [StoreLayoutComponent],
|
||||||
@@ -60,6 +65,14 @@ describe('StoreLayoutComponent', () => {
|
|||||||
success: vi.fn(),
|
success: vi.fn(),
|
||||||
dismiss: vi.fn()
|
dismiss: vi.fn()
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: AuthService,
|
||||||
|
useValue: {
|
||||||
|
user: authUserState,
|
||||||
|
isAuthenticated: isAuthenticatedState,
|
||||||
|
logout: vi.fn().mockReturnValue(of(void 0))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
@@ -98,4 +111,101 @@ describe('StoreLayoutComponent', () => {
|
|||||||
expect(compiled.querySelector('.fa-facebook')).not.toBeNull();
|
expect(compiled.querySelector('.fa-facebook')).not.toBeNull();
|
||||||
expect(compiled.querySelector('.fa-linkedin-in')).not.toBeNull();
|
expect(compiled.querySelector('.fa-linkedin-in')).not.toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('redirects to /login when user icon is clicked and user is not logged in', () => {
|
||||||
|
const authService = TestBed.inject(AuthService);
|
||||||
|
const router = TestBed.inject(Router);
|
||||||
|
vi.spyOn(router, 'navigate');
|
||||||
|
|
||||||
|
(authService.isAuthenticated as any).set(false);
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const compiled = fixture.nativeElement as HTMLElement;
|
||||||
|
const userButton = compiled.querySelector('app-icon-button[variant="user"] button') as HTMLButtonElement;
|
||||||
|
expect(userButton).not.toBeNull();
|
||||||
|
userButton.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
expect(compiled.querySelector('app-user-dropdown')).toBeNull();
|
||||||
|
expect(router.navigate).toHaveBeenCalledWith(['/login']);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('opens authenticated user dropdown without redirecting on icon click', () => {
|
||||||
|
const authService = TestBed.inject(AuthService);
|
||||||
|
const router = TestBed.inject(Router);
|
||||||
|
vi.spyOn(router, 'navigate');
|
||||||
|
|
||||||
|
(authService.isAuthenticated as any).set(true);
|
||||||
|
(authService.user as any).set({
|
||||||
|
id: 1,
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com'
|
||||||
|
});
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const compiled = fixture.nativeElement as HTMLElement;
|
||||||
|
const userButton = compiled.querySelector('app-icon-button[variant="user"] button') as HTMLButtonElement;
|
||||||
|
expect(userButton).not.toBeNull();
|
||||||
|
userButton.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
expect(compiled.querySelector('app-user-dropdown')).not.toBeNull();
|
||||||
|
expect(compiled.textContent).toContain('Ada Lovelace');
|
||||||
|
expect(router.navigate).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('logs out from the authenticated user dropdown', () => {
|
||||||
|
const authService = TestBed.inject(AuthService);
|
||||||
|
const router = TestBed.inject(Router);
|
||||||
|
vi.spyOn(router, 'navigate');
|
||||||
|
|
||||||
|
(authService.isAuthenticated as any).set(true);
|
||||||
|
(authService.user as any).set({
|
||||||
|
id: 1,
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com'
|
||||||
|
});
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const compiled = fixture.nativeElement as HTMLElement;
|
||||||
|
const userButton = compiled.querySelector('app-icon-button[variant="user"] button') as HTMLButtonElement;
|
||||||
|
userButton.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const logoutButton = compiled.querySelector('[data-testid="user-dropdown-logout"]') as HTMLButtonElement;
|
||||||
|
expect(logoutButton).not.toBeNull();
|
||||||
|
logoutButton.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
expect(authService.logout).toHaveBeenCalled();
|
||||||
|
expect(router.navigate).toHaveBeenCalledWith(['/login']);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('redirects to /checkout when cart buy button is clicked', () => {
|
||||||
|
const router = TestBed.inject(Router);
|
||||||
|
vi.spyOn(router, 'navigate');
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
(fixture.componentInstance as any).isCartOpen.set(true);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const compiled = fixture.nativeElement as HTMLElement;
|
||||||
|
const buyButton = Array.from(compiled.querySelectorAll('app-button button'))
|
||||||
|
.find((button) => button.textContent?.trim() === 'Comprar') as HTMLButtonElement | undefined;
|
||||||
|
|
||||||
|
expect(buyButton).toBeDefined();
|
||||||
|
buyButton!.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
expect(router.navigate).toHaveBeenCalledWith(['/checkout']);
|
||||||
|
expect((fixture.componentInstance as any).isCartOpen()).toBe(false);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,22 +1,35 @@
|
|||||||
import { Component, computed, inject, OnInit, signal } from '@angular/core';
|
import { Component, computed, inject, OnInit, signal } from '@angular/core';
|
||||||
import { RouterOutlet } from '@angular/router';
|
import { Router, RouterOutlet } from '@angular/router';
|
||||||
import { TenantService } from '../../services/tenant.service';
|
import { TenantService } from '../../services/tenant.service';
|
||||||
import { CartService } from '../../services/cart/cart.service';
|
import { CartService } from '../../services/cart/cart.service';
|
||||||
import { StoreFooterComponent, StoreFooterSection, StoreSocialLink } from './store-footer/store-footer.component';
|
import {
|
||||||
|
StoreFooterComponent,
|
||||||
|
StoreFooterSection,
|
||||||
|
StoreSocialLink,
|
||||||
|
} from './store-footer/store-footer.component';
|
||||||
import { StoreHeaderComponent } from './store-header/store-header.component';
|
import { StoreHeaderComponent } from './store-header/store-header.component';
|
||||||
import { CartComponent, CartItemMock } from '../../../shared/components/cart/cart.component';
|
import { CartComponent, CartItemMock } from '../../../shared/components/cart/cart.component';
|
||||||
import { ButtonComponent } from '../../../shared/components/button/button.component';
|
import { ButtonComponent } from '../../../shared/components/button/button.component';
|
||||||
import { CartItem } from '../../services/cart/cart.interface';
|
import { CartItem } from '../../services/cart/cart.interface';
|
||||||
|
import { AuthService } from '../../services/auth/auth.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-store-layout',
|
selector: 'app-store-layout',
|
||||||
imports: [RouterOutlet, StoreHeaderComponent, StoreFooterComponent, CartComponent, ButtonComponent],
|
imports: [
|
||||||
|
RouterOutlet,
|
||||||
|
StoreHeaderComponent,
|
||||||
|
StoreFooterComponent,
|
||||||
|
CartComponent,
|
||||||
|
ButtonComponent,
|
||||||
|
],
|
||||||
templateUrl: './store-layout.component.html',
|
templateUrl: './store-layout.component.html',
|
||||||
styleUrl: './store-layout.component.scss'
|
styleUrl: './store-layout.component.scss',
|
||||||
})
|
})
|
||||||
export class StoreLayoutComponent implements OnInit {
|
export class StoreLayoutComponent implements OnInit {
|
||||||
private readonly tenantService = inject(TenantService);
|
private readonly tenantService = inject(TenantService);
|
||||||
private readonly cartService = inject(CartService);
|
private readonly cartService = inject(CartService);
|
||||||
|
private readonly authService = inject(AuthService);
|
||||||
|
private readonly router = inject(Router);
|
||||||
|
|
||||||
protected readonly isCartOpen = signal(false);
|
protected readonly isCartOpen = signal(false);
|
||||||
|
|
||||||
@@ -54,19 +67,21 @@ export class StoreLayoutComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
productVariantId: item.product_variant_id,
|
cartItemId: item.id,
|
||||||
imageUrl: item.product?.imagen ?? null,
|
imageUrl: item.product?.imagen ?? null,
|
||||||
product,
|
product,
|
||||||
originalPrice: null,
|
originalPrice: null,
|
||||||
discountedPrice: parseFloat(item.precio_unitario),
|
discountedPrice: parseFloat(item.precio_unitario),
|
||||||
discountPercentage: null,
|
discountPercentage: null,
|
||||||
attributes,
|
attributes,
|
||||||
quantity: item.cantidad
|
quantity: item.cantidad,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
protected readonly currentYear = new Date().getFullYear();
|
protected readonly currentYear = new Date().getFullYear();
|
||||||
protected readonly tenant = this.tenantService.tenant;
|
protected readonly tenant = this.tenantService.tenant;
|
||||||
|
protected readonly user = this.authService.user;
|
||||||
|
protected readonly isAuthenticated = this.authService.isAuthenticated;
|
||||||
|
|
||||||
protected readonly cartQuantity = computed(() => {
|
protected readonly cartQuantity = computed(() => {
|
||||||
const cart = this.cartService.cart();
|
const cart = this.cartService.cart();
|
||||||
@@ -76,38 +91,53 @@ export class StoreLayoutComponent implements OnInit {
|
|||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.cartService.loadCart().subscribe({
|
this.cartService.loadCart().subscribe({
|
||||||
error: (err) => console.error('Error loading cart', err)
|
error: (err) => console.error('Error loading cart', err),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected onLoginClick(): void {
|
||||||
|
void this.router.navigate(['/login']);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onLogoutClick(): void {
|
||||||
|
this.authService.logout().subscribe({
|
||||||
|
next: () => void this.router.navigate(['/login']),
|
||||||
|
error: (err) => console.error('Error logging out', err),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onCheckoutClick(): void {
|
||||||
|
this.isCartOpen.set(false);
|
||||||
|
void this.router.navigate(['/checkout']);
|
||||||
|
}
|
||||||
|
|
||||||
protected readonly footerSections: StoreFooterSection[] = [
|
protected readonly footerSections: StoreFooterSection[] = [
|
||||||
{
|
{
|
||||||
heading: 'Cuenta',
|
heading: 'Cuenta',
|
||||||
links: ['Mi cuenta', 'Mis compras', 'Cerrar sesion']
|
links: ['Mi cuenta', 'Mis compras', 'Cerrar sesion'],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
heading: 'Ayuda',
|
heading: 'Ayuda',
|
||||||
links: ['Contacto', 'Ayuda', 'Preguntas frecuentes']
|
links: ['Contacto', 'Ayuda', 'Preguntas frecuentes'],
|
||||||
}
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
protected readonly socialLinks: StoreSocialLink[] = [
|
protected readonly socialLinks: StoreSocialLink[] = [
|
||||||
{
|
{
|
||||||
label: 'Instagram',
|
label: 'Instagram',
|
||||||
iconClass: 'fa-brands fa-instagram'
|
iconClass: 'fa-brands fa-instagram',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'WhatsApp',
|
label: 'WhatsApp',
|
||||||
iconClass: 'fa-brands fa-whatsapp'
|
iconClass: 'fa-brands fa-whatsapp',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Facebook',
|
label: 'Facebook',
|
||||||
iconClass: 'fa-brands fa-facebook'
|
iconClass: 'fa-brands fa-facebook',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'LinkedIn',
|
label: 'LinkedIn',
|
||||||
iconClass: 'fa-brands fa-linkedin-in'
|
iconClass: 'fa-brands fa-linkedin-in',
|
||||||
}
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
9
src/app/core/services/auth/auth-bootstrap.ts
Normal file
9
src/app/core/services/auth/auth-bootstrap.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
import { inject } from '@angular/core';
|
||||||
|
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
|
||||||
|
export function authBootstrap(): Promise<void> {
|
||||||
|
const authService = inject(AuthService);
|
||||||
|
|
||||||
|
return authService.bootstrap();
|
||||||
|
}
|
||||||
62
src/app/core/services/auth/auth.guards.spec.ts
Normal file
62
src/app/core/services/auth/auth.guards.spec.ts
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
import { computed, signal } from '@angular/core';
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { provideRouter, Router, UrlTree } from '@angular/router';
|
||||||
|
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
import { authGuard, guestOnlyGuard } from './auth.guards';
|
||||||
|
|
||||||
|
function createAuthServiceStub(isAuthenticated = false) {
|
||||||
|
const tokenState = signal<string | null>(isAuthenticated ? 'jwt-token' : null);
|
||||||
|
|
||||||
|
return {
|
||||||
|
isAuthenticated: computed(() => tokenState() !== null)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('auth guards', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.resetTestingModule();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('redirects unauthenticated users to /login', () => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [provideRouter([]), { provide: AuthService, useValue: createAuthServiceStub() }]
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = TestBed.runInInjectionContext(() => authGuard(null as never, null as never));
|
||||||
|
|
||||||
|
expect(result instanceof UrlTree).toBe(true);
|
||||||
|
expect(TestBed.inject(Router).serializeUrl(result as UrlTree)).toBe('/login');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('allows authenticated users through authGuard', () => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [provideRouter([]), { provide: AuthService, useValue: createAuthServiceStub(true) }]
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = TestBed.runInInjectionContext(() => authGuard(null as never, null as never));
|
||||||
|
|
||||||
|
expect(result).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('redirects authenticated users away from guest routes', () => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [provideRouter([]), { provide: AuthService, useValue: createAuthServiceStub(true) }]
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = TestBed.runInInjectionContext(() => guestOnlyGuard(null as never, null as never));
|
||||||
|
|
||||||
|
expect(result instanceof UrlTree).toBe(true);
|
||||||
|
expect(TestBed.inject(Router).serializeUrl(result as UrlTree)).toBe('/');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('allows guests into login/register routes', () => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [provideRouter([]), { provide: AuthService, useValue: createAuthServiceStub() }]
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = TestBed.runInInjectionContext(() => guestOnlyGuard(null as never, null as never));
|
||||||
|
|
||||||
|
expect(result).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
18
src/app/core/services/auth/auth.guards.ts
Normal file
18
src/app/core/services/auth/auth.guards.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { inject } from '@angular/core';
|
||||||
|
import { CanActivateFn, Router } from '@angular/router';
|
||||||
|
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
|
||||||
|
export const authGuard: CanActivateFn = () => {
|
||||||
|
const authService = inject(AuthService);
|
||||||
|
const router = inject(Router);
|
||||||
|
|
||||||
|
return authService.isAuthenticated() ? true : router.createUrlTree(['/login']);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const guestOnlyGuard: CanActivateFn = () => {
|
||||||
|
const authService = inject(AuthService);
|
||||||
|
const router = inject(Router);
|
||||||
|
|
||||||
|
return authService.isAuthenticated() ? router.createUrlTree(['/']) : true;
|
||||||
|
};
|
||||||
103
src/app/core/services/auth/auth.interceptor.spec.ts
Normal file
103
src/app/core/services/auth/auth.interceptor.spec.ts
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
import { HttpClient, HttpErrorResponse } from '@angular/common/http';
|
||||||
|
import { provideHttpClient, withInterceptors } from '@angular/common/http';
|
||||||
|
import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
|
||||||
|
import { computed, signal } from '@angular/core';
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { environment } from '../../../../environments/environment';
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
import { authInterceptor } from './auth.interceptor';
|
||||||
|
|
||||||
|
function createAuthServiceStub(token: string | null = null) {
|
||||||
|
const tokenState = signal(token);
|
||||||
|
|
||||||
|
return {
|
||||||
|
token: tokenState.asReadonly(),
|
||||||
|
isAuthenticated: computed(() => tokenState() !== null),
|
||||||
|
clearSession: vi.fn(() => tokenState.set(null))
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('authInterceptor', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.resetTestingModule();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('adds the bearer token when a session exists', () => {
|
||||||
|
const authService = createAuthServiceStub('jwt-token');
|
||||||
|
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [
|
||||||
|
provideHttpClient(withInterceptors([authInterceptor])),
|
||||||
|
provideHttpClientTesting(),
|
||||||
|
{ provide: AuthService, useValue: authService }
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
const client = TestBed.inject(HttpClient);
|
||||||
|
const httpController = TestBed.inject(HttpTestingController);
|
||||||
|
|
||||||
|
client.get(`${environment.url}me`).subscribe();
|
||||||
|
|
||||||
|
const request = httpController.expectOne(`${environment.url}me`);
|
||||||
|
expect(request.request.headers.get('Authorization')).toBe('Bearer jwt-token');
|
||||||
|
request.flush({ id: 1 });
|
||||||
|
|
||||||
|
httpController.verify();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not add the authorization header when no token exists', () => {
|
||||||
|
const authService = createAuthServiceStub();
|
||||||
|
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [
|
||||||
|
provideHttpClient(withInterceptors([authInterceptor])),
|
||||||
|
provideHttpClientTesting(),
|
||||||
|
{ provide: AuthService, useValue: authService }
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
const client = TestBed.inject(HttpClient);
|
||||||
|
const httpController = TestBed.inject(HttpTestingController);
|
||||||
|
|
||||||
|
client.get(`${environment.url}productos`).subscribe();
|
||||||
|
|
||||||
|
const request = httpController.expectOne(`${environment.url}productos`);
|
||||||
|
expect(request.request.headers.has('Authorization')).toBe(false);
|
||||||
|
request.flush([]);
|
||||||
|
|
||||||
|
httpController.verify();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('propagates a 401 without clearing the local session', () => {
|
||||||
|
const authService = createAuthServiceStub('expired-token');
|
||||||
|
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [
|
||||||
|
provideHttpClient(withInterceptors([authInterceptor])),
|
||||||
|
provideHttpClientTesting(),
|
||||||
|
{ provide: AuthService, useValue: authService }
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
const client = TestBed.inject(HttpClient);
|
||||||
|
const httpController = TestBed.inject(HttpTestingController);
|
||||||
|
|
||||||
|
let receivedError: unknown;
|
||||||
|
let receivedStatus: number | null = null;
|
||||||
|
client.get(`${environment.url}me`).subscribe({
|
||||||
|
error: (error: HttpErrorResponse) => {
|
||||||
|
receivedError = error;
|
||||||
|
receivedStatus = error.status;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const request = httpController.expectOne(`${environment.url}me`);
|
||||||
|
request.flush({ message: 'Unauthorized' }, { status: 401, statusText: 'Unauthorized' });
|
||||||
|
|
||||||
|
expect(receivedError).toBeInstanceOf(HttpErrorResponse);
|
||||||
|
expect(receivedStatus).toBe(401);
|
||||||
|
expect(authService.clearSession).not.toHaveBeenCalled();
|
||||||
|
httpController.verify();
|
||||||
|
});
|
||||||
|
});
|
||||||
23
src/app/core/services/auth/auth.interceptor.ts
Normal file
23
src/app/core/services/auth/auth.interceptor.ts
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import { HttpEvent, HttpHandlerFn, HttpInterceptorFn, HttpRequest } from '@angular/common/http';
|
||||||
|
import { inject } from '@angular/core';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
|
||||||
|
export const authInterceptor: HttpInterceptorFn = (
|
||||||
|
request: HttpRequest<unknown>,
|
||||||
|
next: HttpHandlerFn
|
||||||
|
): Observable<HttpEvent<unknown>> => {
|
||||||
|
const authService = inject(AuthService);
|
||||||
|
const token = authService.token();
|
||||||
|
|
||||||
|
const authenticatedRequest = token
|
||||||
|
? request.clone({
|
||||||
|
setHeaders: {
|
||||||
|
Authorization: `Bearer ${token}`
|
||||||
|
}
|
||||||
|
})
|
||||||
|
: request;
|
||||||
|
|
||||||
|
return next(authenticatedRequest);
|
||||||
|
};
|
||||||
39
src/app/core/services/auth/auth.interfaces.ts
Normal file
39
src/app/core/services/auth/auth.interfaces.ts
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
export interface AuthUser {
|
||||||
|
id: number;
|
||||||
|
nombre_apellido: string;
|
||||||
|
email: string;
|
||||||
|
dni?: string;
|
||||||
|
telefono?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface LoginPayload {
|
||||||
|
email: string;
|
||||||
|
password: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface RegisterPayload {
|
||||||
|
nombre_apellido: string;
|
||||||
|
email: string;
|
||||||
|
password: string;
|
||||||
|
password_confirmation: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UpdateProfilePayload {
|
||||||
|
nombre_apellido: string;
|
||||||
|
email: string;
|
||||||
|
dni?: string;
|
||||||
|
telefono?: string;
|
||||||
|
password?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface LoginResponse {
|
||||||
|
message: string;
|
||||||
|
token: string;
|
||||||
|
token_type: 'Bearer';
|
||||||
|
user: AuthUser;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface RegisterResponse {
|
||||||
|
message: string;
|
||||||
|
data: AuthUser;
|
||||||
|
}
|
||||||
217
src/app/core/services/auth/auth.service.spec.ts
Normal file
217
src/app/core/services/auth/auth.service.spec.ts
Normal file
@@ -0,0 +1,217 @@
|
|||||||
|
import { PLATFORM_ID, TransferState } from '@angular/core';
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { provideHttpClient } from '@angular/common/http';
|
||||||
|
import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
|
||||||
|
|
||||||
|
import { environment } from '../../../../environments/environment';
|
||||||
|
import { AuthService } from './auth.service';
|
||||||
|
import { CookieService } from '../cookie/cookie.service';
|
||||||
|
import { TenantService } from '../tenant.service';
|
||||||
|
|
||||||
|
describe('AuthService', () => {
|
||||||
|
let cookieStore: Record<string, string> = {};
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
cookieStore = {};
|
||||||
|
TestBed.resetTestingModule();
|
||||||
|
});
|
||||||
|
|
||||||
|
function createCookieServiceStub() {
|
||||||
|
return {
|
||||||
|
get: (name: string) => cookieStore[name] || null,
|
||||||
|
set: (name: string, value: string) => { cookieStore[name] = value; },
|
||||||
|
delete: (name: string) => { delete cookieStore[name]; }
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
it('stores token and user on successful login', () => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [
|
||||||
|
provideHttpClient(),
|
||||||
|
provideHttpClientTesting(),
|
||||||
|
AuthService,
|
||||||
|
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||||
|
TransferState
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
const service = TestBed.inject(AuthService);
|
||||||
|
const httpController = TestBed.inject(HttpTestingController);
|
||||||
|
|
||||||
|
service.login({ email: 'ada@example.com', password: 'secret123' }).subscribe((user) => {
|
||||||
|
expect(user.email).toBe('ada@example.com');
|
||||||
|
});
|
||||||
|
|
||||||
|
const request = httpController.expectOne(`${environment.url}login`);
|
||||||
|
expect(request.request.method).toBe('POST');
|
||||||
|
request.flush({
|
||||||
|
message: 'Sesion iniciada correctamente.',
|
||||||
|
token: 'plain-text-token',
|
||||||
|
token_type: 'Bearer',
|
||||||
|
user: {
|
||||||
|
id: 1,
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(service.token()).toBe('plain-text-token');
|
||||||
|
expect(service.user()?.email).toBe('ada@example.com');
|
||||||
|
expect(service.isAuthenticated()).toBe(true);
|
||||||
|
expect(cookieStore['shopit.auth.token']).toBe('plain-text-token');
|
||||||
|
|
||||||
|
httpController.verify();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('hydrates token from cookies and loads the current user during bootstrap', async () => {
|
||||||
|
cookieStore['shopit.auth.token'] = 'persisted-token';
|
||||||
|
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [
|
||||||
|
provideHttpClient(),
|
||||||
|
provideHttpClientTesting(),
|
||||||
|
AuthService,
|
||||||
|
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||||
|
TransferState
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
const service = TestBed.inject(AuthService);
|
||||||
|
const httpController = TestBed.inject(HttpTestingController);
|
||||||
|
|
||||||
|
const bootstrapPromise = service.bootstrap();
|
||||||
|
const request = httpController.expectOne(`${environment.url}me`);
|
||||||
|
|
||||||
|
expect(request.request.method).toBe('GET');
|
||||||
|
request.flush({
|
||||||
|
id: 9,
|
||||||
|
nombre_apellido: 'Grace Hopper',
|
||||||
|
email: 'grace@example.com'
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(bootstrapPromise).resolves.toBeUndefined();
|
||||||
|
expect(service.user()?.email).toBe('grace@example.com');
|
||||||
|
expect(service.isAuthenticated()).toBe(true);
|
||||||
|
|
||||||
|
httpController.verify();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('clears an expired session when /me returns 401', async () => {
|
||||||
|
cookieStore['shopit.auth.token'] = 'expired-token';
|
||||||
|
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [
|
||||||
|
provideHttpClient(),
|
||||||
|
provideHttpClientTesting(),
|
||||||
|
AuthService,
|
||||||
|
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||||
|
TransferState
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
const service = TestBed.inject(AuthService);
|
||||||
|
const httpController = TestBed.inject(HttpTestingController);
|
||||||
|
|
||||||
|
const bootstrapPromise = service.bootstrap();
|
||||||
|
const request = httpController.expectOne(`${environment.url}me`);
|
||||||
|
|
||||||
|
request.flush({ message: 'Unauthorized' }, { status: 401, statusText: 'Unauthorized' });
|
||||||
|
|
||||||
|
await expect(bootstrapPromise).resolves.toBeUndefined();
|
||||||
|
expect(service.user()).toBeNull();
|
||||||
|
expect(service.token()).toBeNull();
|
||||||
|
expect(service.isAuthenticated()).toBe(false);
|
||||||
|
expect(cookieStore['shopit.auth.token']).toBeUndefined();
|
||||||
|
|
||||||
|
httpController.verify();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registers without creating a session', () => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [
|
||||||
|
provideHttpClient(),
|
||||||
|
provideHttpClientTesting(),
|
||||||
|
AuthService,
|
||||||
|
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||||
|
{
|
||||||
|
provide: TenantService,
|
||||||
|
useValue: { getTenant: () => ({ codigo: 'tenant-test' }) }
|
||||||
|
},
|
||||||
|
TransferState
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
const service = TestBed.inject(AuthService);
|
||||||
|
const httpController = TestBed.inject(HttpTestingController);
|
||||||
|
|
||||||
|
service
|
||||||
|
.register({
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com',
|
||||||
|
password: 'secret123',
|
||||||
|
password_confirmation: 'secret123'
|
||||||
|
})
|
||||||
|
.subscribe((response) => {
|
||||||
|
expect(response.data.email).toBe('ada@example.com');
|
||||||
|
});
|
||||||
|
|
||||||
|
const request = httpController.expectOne(`${environment.url}register`);
|
||||||
|
expect(request.request.method).toBe('POST');
|
||||||
|
expect(request.request.body.tenant_codigo).toBe('tenant-test');
|
||||||
|
request.flush({
|
||||||
|
message: 'Usuario registrado correctamente.',
|
||||||
|
data: {
|
||||||
|
id: 1,
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(service.token()).toBeNull();
|
||||||
|
expect(service.user()).toBeNull();
|
||||||
|
expect(service.isAuthenticated()).toBe(false);
|
||||||
|
|
||||||
|
httpController.verify();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('propagates logout errors without clearing the local session', () => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
providers: [
|
||||||
|
provideHttpClient(),
|
||||||
|
provideHttpClientTesting(),
|
||||||
|
AuthService,
|
||||||
|
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||||
|
TransferState
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
const service = TestBed.inject(AuthService);
|
||||||
|
const httpController = TestBed.inject(HttpTestingController);
|
||||||
|
|
||||||
|
service.login({ email: 'ada@example.com', password: 'secret123' }).subscribe();
|
||||||
|
httpController.expectOne(`${environment.url}login`).flush({
|
||||||
|
message: 'Sesion iniciada correctamente.',
|
||||||
|
token: 'plain-text-token',
|
||||||
|
token_type: 'Bearer',
|
||||||
|
user: {
|
||||||
|
id: 1,
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
service.logout().subscribe({
|
||||||
|
error: () => undefined
|
||||||
|
});
|
||||||
|
|
||||||
|
const logoutRequest = httpController.expectOne(`${environment.url}logout`);
|
||||||
|
expect(logoutRequest.request.method).toBe('POST');
|
||||||
|
logoutRequest.flush({ message: 'Unauthorized' }, { status: 401, statusText: 'Unauthorized' });
|
||||||
|
|
||||||
|
expect(service.token()).toBe('plain-text-token');
|
||||||
|
expect(service.user()?.email).toBe('ada@example.com');
|
||||||
|
expect(cookieStore['shopit.auth.token']).toBe('plain-text-token');
|
||||||
|
|
||||||
|
httpController.verify();
|
||||||
|
});
|
||||||
|
});
|
||||||
151
src/app/core/services/auth/auth.service.ts
Normal file
151
src/app/core/services/auth/auth.service.ts
Normal file
@@ -0,0 +1,151 @@
|
|||||||
|
import { DOCUMENT } from '@angular/common';
|
||||||
|
import { HttpClient, HttpErrorResponse } from '@angular/common/http';
|
||||||
|
import { isPlatformBrowser, isPlatformServer } from '@angular/common';
|
||||||
|
import { computed, inject, Injectable, PLATFORM_ID, signal, TransferState, makeStateKey } from '@angular/core';
|
||||||
|
import { firstValueFrom, map, Observable, of, tap } from 'rxjs';
|
||||||
|
|
||||||
|
import { environment } from '../../../../environments/environment';
|
||||||
|
import {
|
||||||
|
AuthUser,
|
||||||
|
LoginPayload,
|
||||||
|
LoginResponse,
|
||||||
|
RegisterPayload,
|
||||||
|
RegisterResponse,
|
||||||
|
UpdateProfilePayload
|
||||||
|
} from './auth.interfaces';
|
||||||
|
import { CookieService } from '../cookie/cookie.service';
|
||||||
|
import { TenantService } from '../tenant.service';
|
||||||
|
|
||||||
|
const AUTH_TOKEN_COOKIE_KEY = 'shopit.auth.token';
|
||||||
|
const AUTH_USER_SSR_STATE_KEY = makeStateKey<AuthUser>('shopit.auth.user');
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class AuthService {
|
||||||
|
private readonly http = inject(HttpClient);
|
||||||
|
private readonly document = inject(DOCUMENT);
|
||||||
|
private readonly platformId = inject(PLATFORM_ID);
|
||||||
|
private readonly cookieService = inject(CookieService);
|
||||||
|
private readonly transferState = inject(TransferState);
|
||||||
|
private readonly tenantService = inject(TenantService);
|
||||||
|
|
||||||
|
private readonly userState = signal<AuthUser | null>(null);
|
||||||
|
private readonly tokenState = signal<string | null>(null);
|
||||||
|
|
||||||
|
readonly user = this.userState.asReadonly();
|
||||||
|
readonly token = this.tokenState.asReadonly();
|
||||||
|
readonly isAuthenticated = computed(() => this.tokenState() !== null);
|
||||||
|
|
||||||
|
login(payload: LoginPayload): Observable<AuthUser> {
|
||||||
|
return this.http.post<LoginResponse>(`${environment.url}login`, payload).pipe(
|
||||||
|
tap((response) => this.applyAuthenticatedState(response.token, response.user)),
|
||||||
|
map((response) => response.user)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
register(payload: RegisterPayload): Observable<RegisterResponse> {
|
||||||
|
const tenantCode = this.tenantService.getTenant()?.codigo;
|
||||||
|
|
||||||
|
return this.http.post<RegisterResponse>(`${environment.url}register`, {
|
||||||
|
...payload,
|
||||||
|
...(tenantCode ? { tenant_codigo: tenantCode } : {})
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
loginWithGoogle(): void {
|
||||||
|
const tenant = this.tenantService.getTenant();
|
||||||
|
if (!tenant) {
|
||||||
|
throw new Error('No se pudo resolver el tenant activo.');
|
||||||
|
}
|
||||||
|
|
||||||
|
const apiUrl = new URL(environment.url);
|
||||||
|
const authorizationUrl = new URL('/auth/google/redirect', apiUrl.origin);
|
||||||
|
authorizationUrl.searchParams.set('tenant', tenant.codigo);
|
||||||
|
authorizationUrl.searchParams.set('return_url', this.document.location.origin);
|
||||||
|
|
||||||
|
this.document.location.assign(authorizationUrl.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
completeGoogleLogin(oauthCode: string): Observable<AuthUser> {
|
||||||
|
return this.http.post<LoginResponse>(`${environment.url}auth/google/exchange`, { oauth_code: oauthCode }).pipe(
|
||||||
|
tap((response) => this.applyAuthenticatedState(response.token, response.user)),
|
||||||
|
map((response) => response.user)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
updateProfile(payload: UpdateProfilePayload): Observable<AuthUser> {
|
||||||
|
return this.http.put<AuthUser>(`${environment.url}me`, payload).pipe(
|
||||||
|
tap((user) => this.userState.set(user))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
logout(): Observable<void> {
|
||||||
|
if (!this.tokenState()) {
|
||||||
|
this.clearSession();
|
||||||
|
return of(void 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.http.post<void>(`${environment.url}logout`, {}).pipe(
|
||||||
|
tap(() => this.clearSession())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async bootstrap(): Promise<void> {
|
||||||
|
this.hydrateSession();
|
||||||
|
|
||||||
|
if (!this.tokenState() || this.userState()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const transferredUser = this.transferState.get(AUTH_USER_SSR_STATE_KEY, null);
|
||||||
|
if (transferredUser) {
|
||||||
|
this.transferState.remove(AUTH_USER_SSR_STATE_KEY);
|
||||||
|
this.userState.set(transferredUser);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const user = await firstValueFrom(this.loadCurrentUser());
|
||||||
|
|
||||||
|
if (isPlatformServer(this.platformId)) {
|
||||||
|
this.transferState.set(AUTH_USER_SSR_STATE_KEY, user);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
// An expired token is an expected state, including while rendering on the
|
||||||
|
// server. Do not let it reject the application initializer: Angular's SSR
|
||||||
|
// pipeline can otherwise attempt to serialize HttpErrorResponse internals
|
||||||
|
// as HTTP headers.
|
||||||
|
if (error instanceof HttpErrorResponse && error.status === 401) {
|
||||||
|
this.clearSession();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
loadCurrentUser(): Observable<AuthUser> {
|
||||||
|
return this.http.get<AuthUser>(`${environment.url}me`).pipe(
|
||||||
|
tap((user) => this.userState.set(user))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
hydrateSession(): void {
|
||||||
|
const token = this.cookieService.get(AUTH_TOKEN_COOKIE_KEY);
|
||||||
|
this.tokenState.set(token);
|
||||||
|
}
|
||||||
|
|
||||||
|
clearSession(): void {
|
||||||
|
this.userState.set(null);
|
||||||
|
this.tokenState.set(null);
|
||||||
|
this.cookieService.delete(AUTH_TOKEN_COOKIE_KEY);
|
||||||
|
}
|
||||||
|
|
||||||
|
private applyAuthenticatedState(token: string, user: AuthUser): void {
|
||||||
|
this.tokenState.set(token);
|
||||||
|
this.userState.set(user);
|
||||||
|
this.cookieService.set(AUTH_TOKEN_COOKIE_KEY, token);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,8 +7,8 @@ export interface CartItem {
|
|||||||
id: number;
|
id: number;
|
||||||
cantidad: number;
|
cantidad: number;
|
||||||
precio_unitario: string;
|
precio_unitario: string;
|
||||||
product_id: number;
|
catalog_item_id: number;
|
||||||
product_variant_id: number;
|
variant_id: number | null;
|
||||||
product: CartItemProduct | null;
|
product: CartItemProduct | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,20 +21,21 @@ describe('CartService', () => {
|
|||||||
id: 1,
|
id: 1,
|
||||||
cantidad: 2,
|
cantidad: 2,
|
||||||
precio_unitario: '10.00',
|
precio_unitario: '10.00',
|
||||||
product_id: 5,
|
catalog_item_id: 5,
|
||||||
product_variant_id: 10,
|
variant_id: 10,
|
||||||
product: {
|
product: {
|
||||||
nombre: 'Test Product (Size: M)',
|
nombre: 'Test Product (Size: M)',
|
||||||
imagen: null
|
imagen: null,
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
],
|
],
|
||||||
subtotal: '20.00'
|
subtotal: '20.00',
|
||||||
};
|
};
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
tenantServiceMock = {
|
tenantServiceMock = {
|
||||||
getTenantApiUrl: vi.fn().mockReturnValue('http://api.test/tenants/acme')
|
getTenantApiUrl: vi.fn().mockReturnValue('http://api.test/tenants/acme'),
|
||||||
|
tenant: vi.fn().mockReturnValue({ codigo: 'acme' }),
|
||||||
};
|
};
|
||||||
|
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
@@ -42,8 +43,8 @@ describe('CartService', () => {
|
|||||||
CartService,
|
CartService,
|
||||||
provideHttpClient(),
|
provideHttpClient(),
|
||||||
provideHttpClientTesting(),
|
provideHttpClientTesting(),
|
||||||
{ provide: TenantService, useValue: tenantServiceMock }
|
{ provide: TenantService, useValue: tenantServiceMock },
|
||||||
]
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
service = TestBed.inject(CartService);
|
service = TestBed.inject(CartService);
|
||||||
@@ -74,15 +75,31 @@ describe('CartService', () => {
|
|||||||
req.flush({ data: mockCart });
|
req.flush({ data: mockCart });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should clear cart state locally', () => {
|
||||||
|
service.clearCart();
|
||||||
|
|
||||||
|
expect(service.cart()).toEqual({
|
||||||
|
id: null,
|
||||||
|
tenant_codigo: 'acme',
|
||||||
|
status: 'active',
|
||||||
|
items: [],
|
||||||
|
subtotal: '0.00',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('should add item and update signal', () => {
|
it('should add item and update signal', () => {
|
||||||
service.addItem(10, 2).subscribe((res) => {
|
service.addItem(5, 10, 2).subscribe((res) => {
|
||||||
expect(res.data).toEqual(mockCart);
|
expect(res.data).toEqual(mockCart);
|
||||||
expect(service.cart()).toEqual(mockCart);
|
expect(service.cart()).toEqual(mockCart);
|
||||||
});
|
});
|
||||||
|
|
||||||
const req = httpMock.expectOne('http://api.test/tenants/acme/cart/items');
|
const req = httpMock.expectOne('http://api.test/tenants/acme/cart/items');
|
||||||
expect(req.request.method).toBe('POST');
|
expect(req.request.method).toBe('POST');
|
||||||
expect(req.request.body).toEqual({ product_variant_id: 10, cantidad: 2 });
|
expect(req.request.body).toEqual({
|
||||||
|
catalog_item_id: 5,
|
||||||
|
variant_id: 10,
|
||||||
|
cantidad: 2,
|
||||||
|
});
|
||||||
expect(req.request.withCredentials).toBe(true);
|
expect(req.request.withCredentials).toBe(true);
|
||||||
req.flush({ data: mockCart });
|
req.flush({ data: mockCart });
|
||||||
});
|
});
|
||||||
@@ -109,7 +126,7 @@ describe('CartService', () => {
|
|||||||
tenant_codigo: 'acme',
|
tenant_codigo: 'acme',
|
||||||
status: 'active',
|
status: 'active',
|
||||||
items: [],
|
items: [],
|
||||||
subtotal: '0.00'
|
subtotal: '0.00',
|
||||||
};
|
};
|
||||||
|
|
||||||
service.removeItem(10).subscribe((res) => {
|
service.removeItem(10).subscribe((res) => {
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
import { inject, Injectable, signal } from '@angular/core';
|
import { inject, Injectable, signal } from '@angular/core';
|
||||||
import { HttpClient } from '@angular/common/http';
|
import { HttpClient } from '@angular/common/http';
|
||||||
import { map, Observable, tap } from 'rxjs';
|
import { catchError, map, Observable, tap } from 'rxjs';
|
||||||
|
|
||||||
import { ApiResponse } from '../api-response.interface';
|
import { ApiResponse } from '../api-response.interface';
|
||||||
import { TenantService } from '../tenant.service';
|
import { TenantService } from '../tenant.service';
|
||||||
import { Cart } from './cart.interface';
|
import { Cart } from './cart.interface';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class CartService {
|
export class CartService {
|
||||||
private readonly http = inject(HttpClient);
|
private readonly http = inject(HttpClient);
|
||||||
@@ -16,53 +16,89 @@ export class CartService {
|
|||||||
private readonly cartState = signal<Cart | null>(null);
|
private readonly cartState = signal<Cart | null>(null);
|
||||||
readonly cart = this.cartState.asReadonly();
|
readonly cart = this.cartState.asReadonly();
|
||||||
|
|
||||||
|
private readonly isUpdatingState = signal<boolean>(false);
|
||||||
|
readonly isUpdating = this.isUpdatingState.asReadonly();
|
||||||
|
|
||||||
private get tenantApiUrl(): string {
|
private get tenantApiUrl(): string {
|
||||||
return this.tenantService.getTenantApiUrl();
|
return this.tenantService.getTenantApiUrl();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clearCart(): void {
|
||||||
|
this.cartState.set({
|
||||||
|
id: null,
|
||||||
|
tenant_codigo: this.tenantService.tenant()?.codigo ?? '',
|
||||||
|
status: 'active',
|
||||||
|
items: [],
|
||||||
|
subtotal: '0.00',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
loadCart(): Observable<Cart> {
|
loadCart(): Observable<Cart> {
|
||||||
return this.http
|
return this.http
|
||||||
.get<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart`, {
|
.get<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart`, {
|
||||||
withCredentials: true
|
withCredentials: true,
|
||||||
})
|
})
|
||||||
.pipe(
|
.pipe(
|
||||||
map((response) => response.data),
|
map((response) => response.data),
|
||||||
tap((cart) => this.cartState.set(cart))
|
tap((cart) => this.cartState.set(cart)),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
addItem(productVariantId: number, cantidad: number): Observable<ApiResponse<Cart>> {
|
addItem(
|
||||||
|
catalogItemId: number,
|
||||||
|
variantId: number | null,
|
||||||
|
cantidad: number,
|
||||||
|
): Observable<ApiResponse<Cart>> {
|
||||||
|
this.isUpdatingState.set(true);
|
||||||
return this.http
|
return this.http
|
||||||
.post<ApiResponse<Cart>>(
|
.post<
|
||||||
`${this.tenantApiUrl}/cart/items`,
|
ApiResponse<Cart>
|
||||||
{ product_variant_id: productVariantId, cantidad },
|
>(`${this.tenantApiUrl}/cart/items`, { catalog_item_id: catalogItemId, variant_id: variantId, cantidad }, { withCredentials: true })
|
||||||
{ withCredentials: true }
|
|
||||||
)
|
|
||||||
.pipe(
|
.pipe(
|
||||||
tap((response) => this.cartState.set(response.data))
|
tap((response) => {
|
||||||
|
this.cartState.set(response.data);
|
||||||
|
this.isUpdatingState.set(false);
|
||||||
|
}),
|
||||||
|
catchError((error) => {
|
||||||
|
this.isUpdatingState.set(false);
|
||||||
|
throw error;
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
updateItemQuantity(productVariantId: number, cantidad: number): Observable<ApiResponse<Cart>> {
|
updateItemQuantity(cartItemId: number, cantidad: number): Observable<ApiResponse<Cart>> {
|
||||||
|
this.isUpdatingState.set(true);
|
||||||
return this.http
|
return this.http
|
||||||
.patch<ApiResponse<Cart>>(
|
.patch<
|
||||||
`${this.tenantApiUrl}/cart/items/${productVariantId}`,
|
ApiResponse<Cart>
|
||||||
{ cantidad },
|
>(`${this.tenantApiUrl}/cart/items/${cartItemId}`, { cantidad }, { withCredentials: true })
|
||||||
{ withCredentials: true }
|
|
||||||
)
|
|
||||||
.pipe(
|
.pipe(
|
||||||
tap((response) => this.cartState.set(response.data))
|
tap((response) => {
|
||||||
|
this.cartState.set(response.data);
|
||||||
|
this.isUpdatingState.set(false);
|
||||||
|
}),
|
||||||
|
catchError((error) => {
|
||||||
|
this.isUpdatingState.set(false);
|
||||||
|
throw error;
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
removeItem(productVariantId: number): Observable<ApiResponse<Cart>> {
|
removeItem(cartItemId: number): Observable<ApiResponse<Cart>> {
|
||||||
|
this.isUpdatingState.set(true);
|
||||||
return this.http
|
return this.http
|
||||||
.delete<ApiResponse<Cart>>(
|
.delete<
|
||||||
`${this.tenantApiUrl}/cart/items/${productVariantId}`,
|
ApiResponse<Cart>
|
||||||
{ withCredentials: true }
|
>(`${this.tenantApiUrl}/cart/items/${cartItemId}`, { withCredentials: true })
|
||||||
)
|
|
||||||
.pipe(
|
.pipe(
|
||||||
tap((response) => this.cartState.set(response.data))
|
tap((response) => {
|
||||||
|
this.cartState.set(response.data);
|
||||||
|
this.isUpdatingState.set(false);
|
||||||
|
}),
|
||||||
|
catchError((error) => {
|
||||||
|
this.isUpdatingState.set(false);
|
||||||
|
throw error;
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { ApiPaginatedResponse } from '../api-paginated-response.interface';
|
||||||
|
|
||||||
export interface Product {
|
export interface Product {
|
||||||
id: number;
|
id: number;
|
||||||
category_id: number;
|
category_id: number;
|
||||||
@@ -29,22 +31,61 @@ export interface ProductAttribute {
|
|||||||
options: ProductAttributeOption[];
|
options: ProductAttributeOption[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ProductVariant {
|
export type InventoryPolicy = 'tracked' | 'unlimited';
|
||||||
|
|
||||||
|
export interface CatalogItemVariant {
|
||||||
id: number;
|
id: number;
|
||||||
cantidad_maxima: number;
|
stock_tecnico: number | null;
|
||||||
definitions: Record<string, string>;
|
values: Record<string, string>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SelectedCatalogItemVariant extends CatalogItemVariant {
|
||||||
images: string[];
|
images: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ProductVariantMap {
|
export interface CatalogItemDetail {
|
||||||
variant_id: number;
|
id: number;
|
||||||
cantidad_maxima: number;
|
category_id: number | null;
|
||||||
attributes: Record<string, string>;
|
brand_id: number | null;
|
||||||
}
|
slug: string;
|
||||||
|
nombre: string;
|
||||||
export interface ProductDetail extends Product {
|
descripcion: string | null;
|
||||||
|
precio: string;
|
||||||
|
category: string | null;
|
||||||
|
brand: string | null;
|
||||||
|
inventory_policy: InventoryPolicy;
|
||||||
|
has_tickets: boolean;
|
||||||
|
minimum_use_date: string | null;
|
||||||
|
maximum_use_date: string | null;
|
||||||
attributes: ProductAttribute[];
|
attributes: ProductAttribute[];
|
||||||
variants_map: ProductVariantMap[];
|
variants: CatalogItemVariant[];
|
||||||
variant: ProductVariant | null;
|
selected_variant?: SelectedCatalogItemVariant;
|
||||||
|
stock_tecnico?: number | null;
|
||||||
|
images?: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type CatalogProductLayout = 'row' | 'column_with_image' | 'column_with_cart';
|
||||||
|
|
||||||
|
export interface CatalogFeaturedItemVariant {
|
||||||
|
id: number;
|
||||||
|
stock_tecnico: number | null;
|
||||||
|
values: Record<string, string>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CatalogFeaturedItem {
|
||||||
|
id: number;
|
||||||
|
nombre: string;
|
||||||
|
descripcion?: string | null;
|
||||||
|
precio: number | string;
|
||||||
|
image?: string | null;
|
||||||
|
stock_tecnico?: number | null;
|
||||||
|
variants?: CatalogFeaturedItemVariant[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CatalogFeaturedGroup {
|
||||||
|
id: number;
|
||||||
|
title: string;
|
||||||
|
layout: CatalogProductLayout;
|
||||||
|
group_order: number;
|
||||||
|
items: ApiPaginatedResponse<CatalogFeaturedItem[]>;
|
||||||
|
}
|
||||||
|
|||||||
@@ -6,16 +6,17 @@ import { ApiPaginationQueryParams } from '../api-pagination-query-params.interfa
|
|||||||
import { ApiPaginatedResponse } from '../api-paginated-response.interface';
|
import { ApiPaginatedResponse } from '../api-paginated-response.interface';
|
||||||
import { ApiResponse } from '../api-response.interface';
|
import { ApiResponse } from '../api-response.interface';
|
||||||
import { TenantService } from '../tenant.service';
|
import { TenantService } from '../tenant.service';
|
||||||
import { Product, ProductDetail } from './catalog.interface';
|
import {
|
||||||
|
CatalogFeaturedGroup,
|
||||||
|
CatalogFeaturedItem,
|
||||||
|
CatalogItemDetail,
|
||||||
|
Product,
|
||||||
|
} from './catalog.interface';
|
||||||
|
|
||||||
type HttpParamValue =
|
type HttpParamValue = string | number | boolean | readonly (string | number | boolean)[];
|
||||||
| string
|
|
||||||
| number
|
|
||||||
| boolean
|
|
||||||
| readonly (string | number | boolean)[];
|
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class CatalogService {
|
export class CatalogService {
|
||||||
private readonly http = inject(HttpClient);
|
private readonly http = inject(HttpClient);
|
||||||
@@ -25,24 +26,34 @@ export class CatalogService {
|
|||||||
return this.tenantService.getTenantApiUrl();
|
return this.tenantService.getTenantApiUrl();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getProductos(params?: ApiPaginationQueryParams): Observable<ApiPaginatedResponse<Product[]>> {
|
||||||
|
return this.http.get<ApiPaginatedResponse<Product[]>>(`${this.tenantApiUrl}/productos`, {
|
||||||
|
params: this.buildHttpParams(params),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
getProductos(
|
getCatalog(): Observable<CatalogFeaturedGroup[]> {
|
||||||
params?: ApiPaginationQueryParams
|
return this.http.get<CatalogFeaturedGroup[]>(`${this.tenantApiUrl}/catalog`);
|
||||||
): Observable<ApiPaginatedResponse<Product[]>> {
|
}
|
||||||
return this.http.get<ApiPaginatedResponse<Product[]>>(
|
|
||||||
`${this.tenantApiUrl}/productos`,
|
getFeaturedGroupItems(
|
||||||
{ params: this.buildHttpParams(params) }
|
featuredGroupId: number,
|
||||||
|
params?: ApiPaginationQueryParams,
|
||||||
|
): Observable<ApiPaginatedResponse<CatalogFeaturedItem[]>> {
|
||||||
|
return this.http.get<ApiPaginatedResponse<CatalogFeaturedItem[]>>(
|
||||||
|
`${this.tenantApiUrl}/catalog/featured-groups/${featuredGroupId}/items`,
|
||||||
|
{ params: this.buildHttpParams(params) },
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
getProducto(id: number, variantId?: number): Observable<ProductDetail> {
|
getCatalogItem(id: number, variantId?: number): Observable<CatalogItemDetail> {
|
||||||
let params = new HttpParams();
|
let params = new HttpParams();
|
||||||
if (variantId) {
|
if (variantId) {
|
||||||
params = params.set('variant_id', variantId);
|
params = params.set('variant_id', variantId);
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.http
|
return this.http
|
||||||
.get<ApiResponse<ProductDetail>>(`${this.tenantApiUrl}/productos/${id}`, { params })
|
.get<ApiResponse<CatalogItemDetail>>(`${this.tenantApiUrl}/catalog-items/${id}`, { params })
|
||||||
.pipe(map((response) => response.data));
|
.pipe(map((response) => response.data));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,7 +70,7 @@ export class CatalogService {
|
|||||||
|
|
||||||
return acc;
|
return acc;
|
||||||
},
|
},
|
||||||
{}
|
{},
|
||||||
);
|
);
|
||||||
|
|
||||||
return new HttpParams({ fromObject });
|
return new HttpParams({ fromObject });
|
||||||
|
|||||||
153
src/app/core/services/checkout.service.ts
Normal file
153
src/app/core/services/checkout.service.ts
Normal file
@@ -0,0 +1,153 @@
|
|||||||
|
import { inject, Injectable } from '@angular/core';
|
||||||
|
import { HttpClient } from '@angular/common/http';
|
||||||
|
import { firstValueFrom } from 'rxjs';
|
||||||
|
|
||||||
|
import { environment } from '../../../environments/environment';
|
||||||
|
|
||||||
|
export interface CreatePurchasePayload {
|
||||||
|
cart_id: number;
|
||||||
|
dni: string;
|
||||||
|
telefono: string;
|
||||||
|
nombre_apellido: string;
|
||||||
|
email: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PurchaseStatusResponse {
|
||||||
|
status: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PurchaseSummaryResponse extends PurchaseStatusResponse {
|
||||||
|
id: number;
|
||||||
|
created_at: string | null;
|
||||||
|
total: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PurchaseDetailAttributeResponse {
|
||||||
|
name: string;
|
||||||
|
value: string | number | boolean | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PurchaseDetailItemResponse {
|
||||||
|
id: number;
|
||||||
|
quantity: number;
|
||||||
|
unit_price: string;
|
||||||
|
line_total: string;
|
||||||
|
source_catalog_item_id: number | null;
|
||||||
|
source_variant_id: number | null;
|
||||||
|
item_details: {
|
||||||
|
nombre: string;
|
||||||
|
descripcion: string | null;
|
||||||
|
slug: string;
|
||||||
|
imagen: string | null;
|
||||||
|
attributes: PurchaseDetailAttributeResponse[];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PurchaseDetailResponse extends PurchaseStatusResponse {
|
||||||
|
id: number;
|
||||||
|
cart_id: number | null;
|
||||||
|
tenant_codigo: string;
|
||||||
|
user_id: number;
|
||||||
|
created_at: string | null;
|
||||||
|
payment_method: string | null;
|
||||||
|
dni: string | null;
|
||||||
|
transfer_payer_dni: string | null;
|
||||||
|
telefono: string | null;
|
||||||
|
nombre_apellido: string | null;
|
||||||
|
email: string | null;
|
||||||
|
items_source: 'purchase';
|
||||||
|
items: PurchaseDetailItemResponse[];
|
||||||
|
subtotal: string;
|
||||||
|
total: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class CheckoutService {
|
||||||
|
private readonly http = inject(HttpClient);
|
||||||
|
|
||||||
|
async createPurchase(tenantCode: string, payload: CreatePurchasePayload): Promise<{ id: number }> {
|
||||||
|
const response = await firstValueFrom(
|
||||||
|
this.http.post<{ data?: { id: number }; id?: number }>(`${environment.url}tenants/${tenantCode}/compras`, payload)
|
||||||
|
);
|
||||||
|
|
||||||
|
const purchase = this.extractResponseData<{ id: number }>(response);
|
||||||
|
|
||||||
|
if (!purchase?.id) {
|
||||||
|
throw new Error('Error al crear la compra.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return purchase;
|
||||||
|
}
|
||||||
|
|
||||||
|
async generatePaymentIntent(tenantCode: string, purchaseId: number, method: 'qr' | 'transfer' | 'telepagos', payerDni?: string): Promise<any> {
|
||||||
|
const payload: any = { method };
|
||||||
|
if (payerDni) {
|
||||||
|
payload.transfer_payer_dni = payerDni;
|
||||||
|
}
|
||||||
|
const response = await firstValueFrom(
|
||||||
|
this.http.post<any>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/payment-intent`, payload)
|
||||||
|
);
|
||||||
|
if (!response) {
|
||||||
|
throw new Error('Error al generar la intención de pago.');
|
||||||
|
}
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
async completePurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
|
||||||
|
const response = await firstValueFrom(
|
||||||
|
this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/complete`, {})
|
||||||
|
);
|
||||||
|
|
||||||
|
const purchase = this.extractResponseData<PurchaseStatusResponse>(response);
|
||||||
|
|
||||||
|
if (!purchase) {
|
||||||
|
throw new Error('Error al finalizar la compra.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
status: purchase.status ?? null
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async getPurchases(tenantCode: string, status?: string): Promise<{ data: PurchaseSummaryResponse[] }> {
|
||||||
|
let url = `${environment.url}tenants/${tenantCode}/compras`;
|
||||||
|
if (status) {
|
||||||
|
url += `?status=${status}`;
|
||||||
|
}
|
||||||
|
const response = await firstValueFrom(
|
||||||
|
this.http.get<{ data: PurchaseSummaryResponse[] }>(url)
|
||||||
|
);
|
||||||
|
if (!response) {
|
||||||
|
throw new Error('Error al obtener las compras.');
|
||||||
|
}
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getPurchase(tenantCode: string, purchaseId: string | number): Promise<PurchaseDetailResponse> {
|
||||||
|
const response = await firstValueFrom(
|
||||||
|
this.http.get<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}`)
|
||||||
|
);
|
||||||
|
|
||||||
|
const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
|
||||||
|
|
||||||
|
if (!purchase) {
|
||||||
|
throw new Error('Error al obtener la compra.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return purchase;
|
||||||
|
}
|
||||||
|
|
||||||
|
private extractResponseData<T>(response: T | { data?: T } | null | undefined): T | null {
|
||||||
|
if (!response) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof response === 'object' && 'data' in response && response.data) {
|
||||||
|
return response.data;
|
||||||
|
}
|
||||||
|
|
||||||
|
return response as T;
|
||||||
|
}
|
||||||
|
}
|
||||||
56
src/app/core/services/cookie/cookie.service.ts
Normal file
56
src/app/core/services/cookie/cookie.service.ts
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
import { isPlatformBrowser } from '@angular/common';
|
||||||
|
import { inject, Injectable, PLATFORM_ID, REQUEST } from '@angular/core';
|
||||||
|
import { DOCUMENT } from '@angular/common';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class CookieService {
|
||||||
|
private readonly platformId = inject(PLATFORM_ID);
|
||||||
|
private readonly document = inject(DOCUMENT);
|
||||||
|
private readonly request = inject(REQUEST, { optional: true });
|
||||||
|
|
||||||
|
get(name: string): string | null {
|
||||||
|
if (isPlatformBrowser(this.platformId)) {
|
||||||
|
return this.getCookieFromString(name, this.document.cookie);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.request) {
|
||||||
|
const cookieHeader = this.request.headers.get('cookie') || '';
|
||||||
|
return this.getCookieFromString(name, cookieHeader);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
set(name: string, value: string): void {
|
||||||
|
if (isPlatformBrowser(this.platformId)) {
|
||||||
|
this.document.cookie = `${name}=${value};path=/;SameSite=Lax`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
delete(name: string): void {
|
||||||
|
if (isPlatformBrowser(this.platformId)) {
|
||||||
|
this.document.cookie = `${name}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/;SameSite=Lax`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private getCookieFromString(name: string, cookieString: string): string | null {
|
||||||
|
if (!cookieString) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const nameEQ = `${name}=`;
|
||||||
|
const ca = cookieString.split(';');
|
||||||
|
for (let i = 0; i < ca.length; i++) {
|
||||||
|
let c = ca[i];
|
||||||
|
while (c.charAt(0) === ' ') {
|
||||||
|
c = c.substring(1, c.length);
|
||||||
|
}
|
||||||
|
if (c.indexOf(nameEQ) === 0) {
|
||||||
|
return c.substring(nameEQ.length, c.length);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,36 +1,23 @@
|
|||||||
import '@angular/compiler';
|
import '@angular/compiler';
|
||||||
import { Component, inject } from '@angular/core';
|
import { Component, inject } from '@angular/core';
|
||||||
import { TestBed, getTestBed } from '@angular/core/testing';
|
import { TestBed, getTestBed } from '@angular/core/testing';
|
||||||
import {
|
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
||||||
BrowserTestingModule,
|
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||||
platformBrowserTesting
|
|
||||||
} from '@angular/platform-browser/testing';
|
|
||||||
import {
|
|
||||||
afterEach,
|
|
||||||
beforeAll,
|
|
||||||
beforeEach,
|
|
||||||
describe,
|
|
||||||
expect,
|
|
||||||
it,
|
|
||||||
vi
|
|
||||||
} from 'vitest';
|
|
||||||
import { firstValueFrom } from 'rxjs';
|
import { firstValueFrom } from 'rxjs';
|
||||||
|
|
||||||
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
||||||
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
||||||
import {
|
import { QrModalComponent } from '../../shared/components/qr-modal/qr-modal.component';
|
||||||
MODAL_DATA,
|
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
||||||
ModalRef,
|
import { MODAL_DATA, ModalRef, ModalService } from './modal.service';
|
||||||
ModalService
|
|
||||||
} from './modal.service';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
template: ''
|
template: '',
|
||||||
})
|
})
|
||||||
class FirstTestModalComponent {}
|
class FirstTestModalComponent {}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
template: ''
|
template: '',
|
||||||
})
|
})
|
||||||
class SecondTestModalComponent {}
|
class SecondTestModalComponent {}
|
||||||
|
|
||||||
@@ -39,10 +26,7 @@ describe('ModalService', () => {
|
|||||||
|
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
try {
|
try {
|
||||||
getTestBed().initTestEnvironment(
|
getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
|
||||||
BrowserTestingModule,
|
|
||||||
platformBrowserTesting()
|
|
||||||
);
|
|
||||||
} catch {
|
} catch {
|
||||||
// Test environment may already be initialized by another setup entrypoint.
|
// Test environment may already be initialized by another setup entrypoint.
|
||||||
}
|
}
|
||||||
@@ -54,7 +38,7 @@ describe('ModalService', () => {
|
|||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
providers: [ModalService]
|
providers: [ModalService],
|
||||||
});
|
});
|
||||||
|
|
||||||
service = TestBed.inject(ModalService);
|
service = TestBed.inject(ModalService);
|
||||||
@@ -65,7 +49,7 @@ describe('ModalService', () => {
|
|||||||
title: 'Confirmar compra',
|
title: 'Confirmar compra',
|
||||||
data: { productId: 10 },
|
data: { productId: 10 },
|
||||||
size: 'lg',
|
size: 'lg',
|
||||||
closeOnBackdrop: false
|
closeOnBackdrop: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
@@ -79,7 +63,7 @@ describe('ModalService', () => {
|
|||||||
size: 'lg',
|
size: 'lg',
|
||||||
closeOnBackdrop: false,
|
closeOnBackdrop: false,
|
||||||
closeOnEscape: true,
|
closeOnEscape: true,
|
||||||
showCloseButton: true
|
showCloseButton: true,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -114,7 +98,7 @@ describe('ModalService', () => {
|
|||||||
firstRef.afterClosed$.subscribe(firstClosedSpy);
|
firstRef.afterClosed$.subscribe(firstClosedSpy);
|
||||||
|
|
||||||
const secondRef = service.open(SecondTestModalComponent, {
|
const secondRef = service.open(SecondTestModalComponent, {
|
||||||
title: 'Segundo modal'
|
title: 'Segundo modal',
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(firstClosedSpy).toHaveBeenCalledWith(undefined);
|
expect(firstClosedSpy).toHaveBeenCalledWith(undefined);
|
||||||
@@ -125,7 +109,7 @@ describe('ModalService', () => {
|
|||||||
|
|
||||||
it('injects MODAL_DATA and ModalRef into opened components through the host injector contract', () => {
|
it('injects MODAL_DATA and ModalRef into opened components through the host injector contract', () => {
|
||||||
const ref = service.open(DataTestModalComponent, {
|
const ref = service.open(DataTestModalComponent, {
|
||||||
data: { amount: 3 }
|
data: { amount: 3 },
|
||||||
});
|
});
|
||||||
|
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
@@ -137,7 +121,7 @@ describe('ModalService', () => {
|
|||||||
it('opens the standard confirm modal with default labels', () => {
|
it('opens the standard confirm modal with default labels', () => {
|
||||||
const result$ = service.openConfirm({
|
const result$ = service.openConfirm({
|
||||||
title: 'Confirmar compra',
|
title: 'Confirmar compra',
|
||||||
content: 'Esto confirmara la compra actual.'
|
content: 'Esto confirmara la compra actual.',
|
||||||
});
|
});
|
||||||
|
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
@@ -149,19 +133,19 @@ describe('ModalService', () => {
|
|||||||
data: {
|
data: {
|
||||||
content: 'Esto confirmara la compra actual.',
|
content: 'Esto confirmara la compra actual.',
|
||||||
confirmLabel: 'Confirmar',
|
confirmLabel: 'Confirmar',
|
||||||
cancelLabel: 'Cancelar'
|
cancelLabel: 'Cancelar',
|
||||||
},
|
},
|
||||||
size: 'md',
|
size: 'md',
|
||||||
closeOnBackdrop: true,
|
closeOnBackdrop: true,
|
||||||
closeOnEscape: true,
|
closeOnEscape: true,
|
||||||
showCloseButton: true
|
showCloseButton: true,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('maps the confirm modal close result to true', async () => {
|
it('maps the confirm modal close result to true', async () => {
|
||||||
const result$ = service.openConfirm({
|
const result$ = service.openConfirm({
|
||||||
title: 'Confirmar compra',
|
title: 'Confirmar compra',
|
||||||
content: 'Esto confirmara la compra actual.'
|
content: 'Esto confirmara la compra actual.',
|
||||||
});
|
});
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
const resultPromise = firstValueFrom(result$);
|
const resultPromise = firstValueFrom(result$);
|
||||||
@@ -174,7 +158,7 @@ describe('ModalService', () => {
|
|||||||
it('maps dismissing a confirm modal to false', async () => {
|
it('maps dismissing a confirm modal to false', async () => {
|
||||||
const result$ = service.openConfirmDelete({
|
const result$ = service.openConfirmDelete({
|
||||||
title: 'Eliminar producto',
|
title: 'Eliminar producto',
|
||||||
content: 'Se eliminara el producto.'
|
content: 'Se eliminara el producto.',
|
||||||
});
|
});
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
const resultPromise = firstValueFrom(result$);
|
const resultPromise = firstValueFrom(result$);
|
||||||
@@ -193,7 +177,7 @@ describe('ModalService', () => {
|
|||||||
size: 'lg',
|
size: 'lg',
|
||||||
closeOnBackdrop: false,
|
closeOnBackdrop: false,
|
||||||
closeOnEscape: false,
|
closeOnEscape: false,
|
||||||
showCloseButton: false
|
showCloseButton: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
const activeModal = service.activeModal();
|
const activeModal = service.activeModal();
|
||||||
@@ -204,18 +188,78 @@ describe('ModalService', () => {
|
|||||||
data: {
|
data: {
|
||||||
content: 'Se eliminara el producto.',
|
content: 'Se eliminara el producto.',
|
||||||
confirmLabel: 'Eliminar',
|
confirmLabel: 'Eliminar',
|
||||||
cancelLabel: 'Conservar'
|
cancelLabel: 'Conservar',
|
||||||
},
|
},
|
||||||
size: 'lg',
|
size: 'lg',
|
||||||
closeOnBackdrop: false,
|
closeOnBackdrop: false,
|
||||||
closeOnEscape: false,
|
closeOnEscape: false,
|
||||||
showCloseButton: false
|
showCloseButton: false,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('opens the simple modal with default button label', () => {
|
||||||
|
service.openSimple({
|
||||||
|
title: 'Aviso',
|
||||||
|
content: 'Este es un aviso simple.',
|
||||||
|
});
|
||||||
|
|
||||||
|
const activeModal = service.activeModal();
|
||||||
|
|
||||||
|
expect(activeModal?.component).toBe(SimpleModalComponent);
|
||||||
|
expect(activeModal?.config).toEqual({
|
||||||
|
title: 'Aviso',
|
||||||
|
data: {
|
||||||
|
content: 'Este es un aviso simple.',
|
||||||
|
buttonLabel: 'Entendido',
|
||||||
|
},
|
||||||
|
size: 'md',
|
||||||
|
closeOnBackdrop: true,
|
||||||
|
closeOnEscape: true,
|
||||||
|
showCloseButton: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('maps the simple modal close result to undefined', async () => {
|
||||||
|
const result$ = service.openSimple({
|
||||||
|
title: 'Aviso',
|
||||||
|
content: 'Este es un aviso simple.',
|
||||||
|
});
|
||||||
|
const activeModal = service.activeModal();
|
||||||
|
const resultPromise = firstValueFrom(result$);
|
||||||
|
|
||||||
|
activeModal?.ref.close();
|
||||||
|
|
||||||
|
await expect(resultPromise).resolves.toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('opens the QR modal with the ticket information and compact size', () => {
|
||||||
|
service.openQr({
|
||||||
|
title: 'Entrada general',
|
||||||
|
id: 42,
|
||||||
|
date: '09 de octubre',
|
||||||
|
ticket: 'ticket-payload',
|
||||||
|
});
|
||||||
|
|
||||||
|
const activeModal = service.activeModal();
|
||||||
|
|
||||||
|
expect(activeModal?.component).toBe(QrModalComponent);
|
||||||
|
expect(activeModal?.config).toEqual({
|
||||||
|
title: 'Entrada general',
|
||||||
|
data: {
|
||||||
|
id: 42,
|
||||||
|
date: '09 de octubre',
|
||||||
|
ticket: 'ticket-payload',
|
||||||
|
},
|
||||||
|
size: 'qr',
|
||||||
|
closeOnBackdrop: true,
|
||||||
|
closeOnEscape: true,
|
||||||
|
showCloseButton: true,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
template: ''
|
template: '',
|
||||||
})
|
})
|
||||||
class DataTestModalComponent {
|
class DataTestModalComponent {
|
||||||
readonly data = inject(MODAL_DATA);
|
readonly data = inject(MODAL_DATA);
|
||||||
|
|||||||
@@ -2,13 +2,11 @@ import { InjectionToken, Injectable, Type, signal } from '@angular/core';
|
|||||||
import { Observable, Subject, map } from 'rxjs';
|
import { Observable, Subject, map } from 'rxjs';
|
||||||
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
||||||
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
||||||
|
import { QrModalComponent } from '../../shared/components/qr-modal/qr-modal.component';
|
||||||
|
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
||||||
|
|
||||||
export type ModalSize = 'sm' | 'md' | 'lg' | 'xl' | 'full';
|
export type ModalSize = 'qr' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
|
||||||
export type ModalDismissReason =
|
export type ModalDismissReason = 'backdrop' | 'escape' | 'programmatic' | 'replaced';
|
||||||
| 'backdrop'
|
|
||||||
| 'escape'
|
|
||||||
| 'programmatic'
|
|
||||||
| 'replaced';
|
|
||||||
|
|
||||||
export interface ModalConfig<TData = unknown> {
|
export interface ModalConfig<TData = unknown> {
|
||||||
title?: string;
|
title?: string;
|
||||||
@@ -19,11 +17,10 @@ export interface ModalConfig<TData = unknown> {
|
|||||||
showCloseButton?: boolean;
|
showCloseButton?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface NormalizedModalConfig<TData = unknown>
|
export interface NormalizedModalConfig<TData = unknown> extends Omit<
|
||||||
extends Omit<
|
ModalConfig<TData>,
|
||||||
ModalConfig<TData>,
|
'size' | 'closeOnBackdrop' | 'closeOnEscape' | 'showCloseButton'
|
||||||
'size' | 'closeOnBackdrop' | 'closeOnEscape' | 'showCloseButton'
|
> {
|
||||||
> {
|
|
||||||
size: ModalSize;
|
size: ModalSize;
|
||||||
closeOnBackdrop: boolean;
|
closeOnBackdrop: boolean;
|
||||||
closeOnEscape: boolean;
|
closeOnEscape: boolean;
|
||||||
@@ -36,13 +33,35 @@ export interface ConfirmModalData {
|
|||||||
cancelLabel: string;
|
cancelLabel: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ConfirmModalConfig
|
export interface ConfirmModalConfig extends Omit<ModalConfig<ConfirmModalData>, 'data'> {
|
||||||
extends Omit<ModalConfig<ConfirmModalData>, 'data'> {
|
|
||||||
content: string;
|
content: string;
|
||||||
confirmLabel?: string;
|
confirmLabel?: string;
|
||||||
cancelLabel?: string;
|
cancelLabel?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface SimpleModalData {
|
||||||
|
content: string;
|
||||||
|
buttonLabel: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SimpleModalConfig extends Omit<ModalConfig<SimpleModalData>, 'data'> {
|
||||||
|
content: string;
|
||||||
|
buttonLabel?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface QrModalData {
|
||||||
|
id: string | number;
|
||||||
|
date: string;
|
||||||
|
ticket: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface QrModalConfig extends Omit<ModalConfig<QrModalData>, 'data' | 'title'> {
|
||||||
|
title: string;
|
||||||
|
id: string | number;
|
||||||
|
date: string;
|
||||||
|
ticket: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface ActiveModalState<TResult = unknown, TData = unknown> {
|
export interface ActiveModalState<TResult = unknown, TData = unknown> {
|
||||||
component: Type<unknown>;
|
component: Type<unknown>;
|
||||||
config: NormalizedModalConfig<TData>;
|
config: NormalizedModalConfig<TData>;
|
||||||
@@ -58,25 +77,24 @@ const DEFAULT_MODAL_CONFIG: Pick<
|
|||||||
size: 'md',
|
size: 'md',
|
||||||
closeOnBackdrop: true,
|
closeOnBackdrop: true,
|
||||||
closeOnEscape: true,
|
closeOnEscape: true,
|
||||||
showCloseButton: true
|
showCloseButton: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
const DEFAULT_CONFIRM_MODAL_LABELS = {
|
const DEFAULT_CONFIRM_MODAL_LABELS = {
|
||||||
confirmLabel: 'Confirmar',
|
confirmLabel: 'Confirmar',
|
||||||
cancelLabel: 'Cancelar'
|
cancelLabel: 'Cancelar',
|
||||||
} satisfies Pick<ConfirmModalData, 'confirmLabel' | 'cancelLabel'>;
|
} satisfies Pick<ConfirmModalData, 'confirmLabel' | 'cancelLabel'>;
|
||||||
|
|
||||||
export class ModalRef<TResult = unknown> {
|
export class ModalRef<TResult = unknown> {
|
||||||
private readonly afterClosedSubject = new Subject<TResult | undefined>();
|
private readonly afterClosedSubject = new Subject<TResult | undefined>();
|
||||||
private closed = false;
|
private closed = false;
|
||||||
|
|
||||||
readonly afterClosed$: Observable<TResult | undefined> =
|
readonly afterClosed$: Observable<TResult | undefined> = this.afterClosedSubject.asObservable();
|
||||||
this.afterClosedSubject.asObservable();
|
|
||||||
readonly dismissReason = signal<ModalDismissReason | null>(null);
|
readonly dismissReason = signal<ModalDismissReason | null>(null);
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly closeHandler: (result?: TResult) => void,
|
private readonly closeHandler: (result?: TResult) => void,
|
||||||
private readonly dismissHandler: (reason: ModalDismissReason) => void
|
private readonly dismissHandler: (reason: ModalDismissReason) => void,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
close(result?: TResult): void {
|
close(result?: TResult): void {
|
||||||
@@ -108,7 +126,7 @@ export class ModalRef<TResult = unknown> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class ModalService {
|
export class ModalService {
|
||||||
private readonly activeModalState = signal<ActiveModalState | null>(null);
|
private readonly activeModalState = signal<ActiveModalState | null>(null);
|
||||||
@@ -116,35 +134,31 @@ export class ModalService {
|
|||||||
|
|
||||||
open<TComponent, TResult = unknown, TData = unknown>(
|
open<TComponent, TResult = unknown, TData = unknown>(
|
||||||
component: Type<TComponent>,
|
component: Type<TComponent>,
|
||||||
config: ModalConfig<TData> = {}
|
config: ModalConfig<TData> = {},
|
||||||
): ModalRef<TResult> {
|
): ModalRef<TResult> {
|
||||||
this.activeModalState()?.ref.dismiss('replaced');
|
this.activeModalState()?.ref.dismiss('replaced');
|
||||||
|
|
||||||
let ref!: ModalRef<TResult>;
|
let ref!: ModalRef<TResult>;
|
||||||
ref = new ModalRef<TResult>(
|
ref = new ModalRef<TResult>(
|
||||||
(result) => this.close(ref, result),
|
(result) => this.close(ref, result),
|
||||||
(reason) => this.dismiss(ref, reason)
|
(reason) => this.dismiss(ref, reason),
|
||||||
);
|
);
|
||||||
|
|
||||||
this.activeModalState.set({
|
this.activeModalState.set({
|
||||||
component,
|
component,
|
||||||
config: this.normalizeConfig(config),
|
config: this.normalizeConfig(config),
|
||||||
ref: ref as ModalRef<unknown>
|
ref: ref as ModalRef<unknown>,
|
||||||
});
|
});
|
||||||
|
|
||||||
return ref;
|
return ref;
|
||||||
}
|
}
|
||||||
|
|
||||||
openConfirm(config: ConfirmModalConfig): Observable<boolean> {
|
openConfirm(config: ConfirmModalConfig): Observable<boolean> {
|
||||||
return this.openConfirmRef(config).afterClosed$.pipe(
|
return this.openConfirmRef(config).afterClosed$.pipe(map((result) => result === true));
|
||||||
map((result) => result === true)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
openConfirmDelete(config: ConfirmModalConfig): Observable<boolean> {
|
openConfirmDelete(config: ConfirmModalConfig): Observable<boolean> {
|
||||||
return this.openConfirmDeleteRef(config).afterClosed$.pipe(
|
return this.openConfirmDeleteRef(config).afterClosed$.pipe(map((result) => result === true));
|
||||||
map((result) => result === true)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
openConfirmRef(config: ConfirmModalConfig): ModalRef<boolean> {
|
openConfirmRef(config: ConfirmModalConfig): ModalRef<boolean> {
|
||||||
@@ -152,10 +166,30 @@ export class ModalService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
openConfirmDeleteRef(config: ConfirmModalConfig): ModalRef<boolean> {
|
openConfirmDeleteRef(config: ConfirmModalConfig): ModalRef<boolean> {
|
||||||
return this.open(
|
return this.open(ConfirmDeleteModalComponent, this.buildConfirmModalConfig(config));
|
||||||
ConfirmDeleteModalComponent,
|
}
|
||||||
this.buildConfirmModalConfig(config)
|
|
||||||
);
|
openSimple(config: SimpleModalConfig): Observable<void> {
|
||||||
|
return this.openSimpleRef(config).afterClosed$.pipe(map(() => undefined));
|
||||||
|
}
|
||||||
|
|
||||||
|
openSimpleRef(config: SimpleModalConfig): ModalRef<void> {
|
||||||
|
return this.open(SimpleModalComponent, this.buildSimpleModalConfig(config));
|
||||||
|
}
|
||||||
|
|
||||||
|
openQr(config: QrModalConfig): Observable<void> {
|
||||||
|
return this.openQrRef(config).afterClosed$.pipe(map(() => undefined));
|
||||||
|
}
|
||||||
|
|
||||||
|
openQrRef(config: QrModalConfig): ModalRef<void> {
|
||||||
|
const { title, id, date, ticket, size = 'qr', ...modalConfig } = config;
|
||||||
|
|
||||||
|
return this.open(QrModalComponent, {
|
||||||
|
...modalConfig,
|
||||||
|
title,
|
||||||
|
size,
|
||||||
|
data: { id, date, ticket },
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private close<TResult>(ref: ModalRef<TResult>, result?: TResult): void {
|
private close<TResult>(ref: ModalRef<TResult>, result?: TResult): void {
|
||||||
@@ -169,7 +203,7 @@ export class ModalService {
|
|||||||
|
|
||||||
private dismiss<TResult>(
|
private dismiss<TResult>(
|
||||||
ref: ModalRef<TResult>,
|
ref: ModalRef<TResult>,
|
||||||
reason: ModalDismissReason = 'programmatic'
|
reason: ModalDismissReason = 'programmatic',
|
||||||
): void {
|
): void {
|
||||||
if (this.activeModalState()?.ref !== ref) {
|
if (this.activeModalState()?.ref !== ref) {
|
||||||
return;
|
return;
|
||||||
@@ -179,18 +213,14 @@ export class ModalService {
|
|||||||
this.activeModalState.set(null);
|
this.activeModalState.set(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private normalizeConfig<TData>(
|
private normalizeConfig<TData>(config: ModalConfig<TData>): NormalizedModalConfig<TData> {
|
||||||
config: ModalConfig<TData>
|
|
||||||
): NormalizedModalConfig<TData> {
|
|
||||||
return {
|
return {
|
||||||
...DEFAULT_MODAL_CONFIG,
|
...DEFAULT_MODAL_CONFIG,
|
||||||
...config
|
...config,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private buildConfirmModalConfig(
|
private buildConfirmModalConfig(config: ConfirmModalConfig): ModalConfig<ConfirmModalData> {
|
||||||
config: ConfirmModalConfig
|
|
||||||
): ModalConfig<ConfirmModalData> {
|
|
||||||
const {
|
const {
|
||||||
content,
|
content,
|
||||||
confirmLabel = DEFAULT_CONFIRM_MODAL_LABELS.confirmLabel,
|
confirmLabel = DEFAULT_CONFIRM_MODAL_LABELS.confirmLabel,
|
||||||
@@ -203,8 +233,20 @@ export class ModalService {
|
|||||||
data: {
|
data: {
|
||||||
content,
|
content,
|
||||||
confirmLabel,
|
confirmLabel,
|
||||||
cancelLabel
|
cancelLabel,
|
||||||
}
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private buildSimpleModalConfig(config: SimpleModalConfig): ModalConfig<SimpleModalData> {
|
||||||
|
const { content, buttonLabel = 'Entendido', ...modalConfig } = config;
|
||||||
|
|
||||||
|
return {
|
||||||
|
...modalConfig,
|
||||||
|
data: {
|
||||||
|
content,
|
||||||
|
buttonLabel,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,34 @@
|
|||||||
import { ApiResponse } from './api-response.interface';
|
import { ApiResponse } from './api-response.interface';
|
||||||
|
|
||||||
|
export interface BankAccount {
|
||||||
|
id: number;
|
||||||
|
tenant_code: string;
|
||||||
|
titular: string;
|
||||||
|
entidad: string;
|
||||||
|
alias: string;
|
||||||
|
cvu: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface HeroConfig {
|
||||||
|
background_image?: string | null;
|
||||||
|
title_html?: string | null;
|
||||||
|
description_html?: string | null;
|
||||||
|
button_text?: string | null;
|
||||||
|
button_href?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface EventConfig {
|
||||||
|
title?: string | null;
|
||||||
|
location?: string | null;
|
||||||
|
dates?: string[] | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Menu {
|
||||||
|
id: number;
|
||||||
|
code: string;
|
||||||
|
route: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface Tenant {
|
export interface Tenant {
|
||||||
id: number;
|
id: number;
|
||||||
codigo: string;
|
codigo: string;
|
||||||
@@ -13,6 +42,11 @@ export interface Tenant {
|
|||||||
footer_bg_color: string;
|
footer_bg_color: string;
|
||||||
header_logo: string;
|
header_logo: string;
|
||||||
footer_logo: string;
|
footer_logo: string;
|
||||||
|
selected_bank_account_id?: number | null;
|
||||||
|
selected_bank_account?: BankAccount | null;
|
||||||
|
hero_config?: HeroConfig | null;
|
||||||
|
event_config?: EventConfig | null;
|
||||||
|
menues?: Menu[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export type TenantBootstrapResponse = ApiResponse<Tenant>;
|
export type TenantBootstrapResponse = ApiResponse<Tenant>;
|
||||||
|
|||||||
@@ -3,9 +3,7 @@
|
|||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<span class="eyebrow">Componentes reutilizables</span>
|
<span class="eyebrow">Componentes reutilizables</span>
|
||||||
<h1>Button + Input</h1>
|
<h1>Button + Input</h1>
|
||||||
<p class="lead mb-4">
|
<p class="lead mb-4">Pagina dedicada a probar variantes de los componentes compartidos.</p>
|
||||||
Pagina dedicada a probar variantes de los componentes compartidos.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div class="button-showcase">
|
<div class="button-showcase">
|
||||||
<div class="button-group">
|
<div class="button-group">
|
||||||
@@ -26,9 +24,7 @@
|
|||||||
<app-button variant="secondary" [disabled]="true">Secondary</app-button>
|
<app-button variant="secondary" [disabled]="true">Secondary</app-button>
|
||||||
|
|
||||||
<app-button variant="danger" [disabled]="true">Danger</app-button>
|
<app-button variant="danger" [disabled]="true">Danger</app-button>
|
||||||
<app-button variant="danger-secondary" [disabled]="true">
|
<app-button variant="danger-secondary" [disabled]="true"> Danger secondary </app-button>
|
||||||
Danger secondary
|
|
||||||
</app-button>
|
|
||||||
<app-button variant="cancel" [disabled]="true">Cancel</app-button>
|
<app-button variant="cancel" [disabled]="true">Cancel</app-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -60,13 +56,8 @@
|
|||||||
<div class="button-group">
|
<div class="button-group">
|
||||||
<h2>Toasts Persistentes (No se van)</h2>
|
<h2>Toasts Persistentes (No se van)</h2>
|
||||||
<div class="button-grid">
|
<div class="button-grid">
|
||||||
<app-button (click)="triggerPersistentToast('info')">
|
<app-button (click)="triggerPersistentToast('info')"> Info Persistente </app-button>
|
||||||
Info Persistente
|
<app-button variant="secondary" (click)="triggerPersistentToast('success')">
|
||||||
</app-button>
|
|
||||||
<app-button
|
|
||||||
variant="secondary"
|
|
||||||
(click)="triggerPersistentToast('success')"
|
|
||||||
>
|
|
||||||
Success Persistente
|
Success Persistente
|
||||||
</app-button>
|
</app-button>
|
||||||
<app-button variant="danger" (click)="triggerPersistentToast('danger')">
|
<app-button variant="danger" (click)="triggerPersistentToast('danger')">
|
||||||
@@ -91,6 +82,7 @@
|
|||||||
<app-button variant="danger-secondary" (click)="openWideModal()">
|
<app-button variant="danger-secondary" (click)="openWideModal()">
|
||||||
Abrir modal ancho
|
Abrir modal ancho
|
||||||
</app-button>
|
</app-button>
|
||||||
|
<app-button (click)="openSimpleModal()"> Abrir simple modal </app-button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-showcase__result" data-testid="modal-last-result">
|
<div class="modal-showcase__result" data-testid="modal-last-result">
|
||||||
{{ lastModalResult }}
|
{{ lastModalResult }}
|
||||||
@@ -103,9 +95,9 @@
|
|||||||
<div class="icon-button-showcase">
|
<div class="icon-button-showcase">
|
||||||
<h2>Icon Buttons</h2>
|
<h2>Icon Buttons</h2>
|
||||||
<p class="text-muted mb-4">
|
<p class="text-muted mb-4">
|
||||||
Botones de icono pequenos con color base <code>#666666</code>,
|
Botones de icono pequenos con color base <code>#666666</code>, deshabilitados con
|
||||||
deshabilitados con <code>#A0A0A0</code> y estados hover/active con color
|
<code>#A0A0A0</code> y estados hover/active con color de marca (a excepcion de trash que
|
||||||
de marca (a excepcion de trash que usa danger).
|
usa danger).
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div class="icon-button-showcase__grid">
|
<div class="icon-button-showcase__grid">
|
||||||
@@ -152,9 +144,7 @@
|
|||||||
|
|
||||||
<div class="icon-button-showcase mt-4">
|
<div class="icon-button-showcase mt-4">
|
||||||
<h2>Cart Icons</h2>
|
<h2>Cart Icons</h2>
|
||||||
<p class="text-muted mb-4">
|
<p class="text-muted mb-4">Icono de carrito con badge opcional indicando cantidad.</p>
|
||||||
Icono de carrito con badge opcional indicando cantidad.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div class="icon-button-showcase__grid">
|
<div class="icon-button-showcase__grid">
|
||||||
<div class="icon-button-showcase__row">
|
<div class="icon-button-showcase__row">
|
||||||
@@ -197,12 +187,7 @@
|
|||||||
|
|
||||||
<div class="input-field">
|
<div class="input-field">
|
||||||
<label for="number-input">Numero</label>
|
<label for="number-input">Numero</label>
|
||||||
<app-input
|
<app-input id="number-input" type="number" placeholder="0" [(value)]="numberValue" />
|
||||||
id="number-input"
|
|
||||||
type="number"
|
|
||||||
placeholder="0"
|
|
||||||
[(value)]="numberValue"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="input-field">
|
<div class="input-field">
|
||||||
@@ -217,12 +202,7 @@
|
|||||||
|
|
||||||
<div class="input-field">
|
<div class="input-field">
|
||||||
<label for="user-input">Usuario</label>
|
<label for="user-input">Usuario</label>
|
||||||
<app-input
|
<app-input id="user-input" type="user" placeholder="Nombre de usuario" [(value)]="user" />
|
||||||
id="user-input"
|
|
||||||
type="user"
|
|
||||||
placeholder="Nombre de usuario"
|
|
||||||
[(value)]="user"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="input-field">
|
<div class="input-field">
|
||||||
@@ -247,22 +227,12 @@
|
|||||||
|
|
||||||
<div class="input-field">
|
<div class="input-field">
|
||||||
<label for="amount-input">Moneda</label>
|
<label for="amount-input">Moneda</label>
|
||||||
<app-input
|
<app-input id="amount-input" type="currency" placeholder="0" [(value)]="amount" />
|
||||||
id="amount-input"
|
|
||||||
type="currency"
|
|
||||||
placeholder="0"
|
|
||||||
[(value)]="amount"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="input-field">
|
<div class="input-field">
|
||||||
<label for="percent-input">Porcentaje</label>
|
<label for="percent-input">Porcentaje</label>
|
||||||
<app-input
|
<app-input id="percent-input" type="percent" placeholder="0" [(value)]="percent" />
|
||||||
id="percent-input"
|
|
||||||
type="percent"
|
|
||||||
placeholder="0"
|
|
||||||
[(value)]="percent"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="input-field">
|
<div class="input-field">
|
||||||
@@ -310,9 +280,7 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<app-button variant="secondary" (click)="clearFile()">
|
<app-button variant="secondary" (click)="clearFile()"> Limpiar archivo </app-button>
|
||||||
Limpiar archivo
|
|
||||||
</app-button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -321,8 +289,7 @@
|
|||||||
<div class="paginator-showcase">
|
<div class="paginator-showcase">
|
||||||
<h2>Paginator</h2>
|
<h2>Paginator</h2>
|
||||||
<p class="text-muted mb-0">
|
<p class="text-muted mb-0">
|
||||||
Componente shared para navegar por paginas con primera, anterior,
|
Componente shared para navegar por paginas con primera, anterior, siguiente y ultima.
|
||||||
siguiente y ultima.
|
|
||||||
</p>
|
</p>
|
||||||
<app-paginator
|
<app-paginator
|
||||||
[page]="currentPage"
|
[page]="currentPage"
|
||||||
@@ -333,6 +300,101 @@
|
|||||||
|
|
||||||
<hr class="section-divider" />
|
<hr class="section-divider" />
|
||||||
|
|
||||||
|
<div class="stepper-showcase">
|
||||||
|
<h2>Form Stepper</h2>
|
||||||
|
<p class="text-muted mb-4">
|
||||||
|
Stepper vertical reutilizable. Cada paso maneja sus propios botones de navegacion. No se
|
||||||
|
puede avanzar si el paso no es valido.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<app-stepper #demoStepper>
|
||||||
|
<!-- Paso 1: Siempre valido -->
|
||||||
|
<app-step label="Informacion Personal" [isValid]="true">
|
||||||
|
<div class="row g-3">
|
||||||
|
<div class="col-md-6 input-field">
|
||||||
|
<label for="stepper-name">Nombre</label>
|
||||||
|
<app-input id="stepper-name" placeholder="Juan Perez" [(value)]="user" />
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6 input-field">
|
||||||
|
<label for="stepper-email">Email</label>
|
||||||
|
<app-input
|
||||||
|
id="stepper-email"
|
||||||
|
type="email"
|
||||||
|
placeholder="mail@empresa.com"
|
||||||
|
[(value)]="email"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="d-flex justify-content-end mt-4">
|
||||||
|
<app-button (click)="demoStepper.next()">
|
||||||
|
Siguiente <i class="fa-solid fa-arrow-right ms-1"></i>
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
</app-step>
|
||||||
|
|
||||||
|
<!-- Paso 2: Valido solo si testStep2Valid es true -->
|
||||||
|
<app-step label="Configuracion de Cuenta" [isValid]="testStep2Valid">
|
||||||
|
<div class="row g-3">
|
||||||
|
<div class="col-md-6 input-field">
|
||||||
|
<label for="stepper-password">Contraseña</label>
|
||||||
|
<app-input
|
||||||
|
id="stepper-password"
|
||||||
|
type="password-toggle"
|
||||||
|
placeholder="********"
|
||||||
|
[(value)]="password"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6 input-field">
|
||||||
|
<label for="stepper-amount">Presupuesto mensual</label>
|
||||||
|
<app-input id="stepper-amount" type="currency" placeholder="0" [(value)]="amount" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="stepper-validity-control mt-3 d-flex align-items-center gap-3">
|
||||||
|
<span class="text-muted small"> Simular validez del paso: </span>
|
||||||
|
<app-button
|
||||||
|
[variant]="testStep2Valid ? 'secondary' : 'primary'"
|
||||||
|
(click)="testStep2Valid = !testStep2Valid"
|
||||||
|
>
|
||||||
|
@if (testStep2Valid) {
|
||||||
|
<i class="fa-solid fa-check me-1"></i> Valido
|
||||||
|
} @else {
|
||||||
|
<i class="fa-solid fa-xmark me-1"></i> Invalido — Siguiente bloqueado
|
||||||
|
}
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="d-flex justify-content-between mt-4">
|
||||||
|
<app-button variant="secondary" (click)="demoStepper.previous()">
|
||||||
|
<i class="fa-solid fa-arrow-left me-1"></i> Volver
|
||||||
|
</app-button>
|
||||||
|
<app-button (click)="demoStepper.next()" [disabled]="!testStep2Valid">
|
||||||
|
Siguiente <i class="fa-solid fa-arrow-right ms-1"></i>
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
</app-step>
|
||||||
|
|
||||||
|
<!-- Paso 3: Revision final, siempre valido -->
|
||||||
|
<app-step label="Revision y Confirmacion" [isValid]="true">
|
||||||
|
<div class="p-3 rounded bg-light">
|
||||||
|
<p class="mb-1"><strong>Nombre:</strong> {{ user }}</p>
|
||||||
|
<p class="mb-1"><strong>Email:</strong> {{ email }}</p>
|
||||||
|
<p class="mb-0"><strong>Presupuesto:</strong> {{ amount }}</p>
|
||||||
|
</div>
|
||||||
|
<div class="d-flex justify-content-between mt-4">
|
||||||
|
<app-button variant="secondary" (click)="demoStepper.previous()">
|
||||||
|
<i class="fa-solid fa-arrow-left me-1"></i> Volver
|
||||||
|
</app-button>
|
||||||
|
<app-button (click)="triggerToast('success')">
|
||||||
|
<i class="fa-solid fa-check me-1"></i> Confirmar
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
</app-step>
|
||||||
|
</app-stepper>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr class="section-divider" />
|
||||||
|
|
||||||
<div class="cart-showcase">
|
<div class="cart-showcase">
|
||||||
<div class="cart-showcase__header">
|
<div class="cart-showcase__header">
|
||||||
<div>
|
<div>
|
||||||
@@ -515,17 +577,17 @@
|
|||||||
<section class="component-demo card shadow-sm mt-4">
|
<section class="component-demo card shadow-sm mt-4">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<span class="eyebrow">Reusable Component</span>
|
<span class="eyebrow">Reusable Component</span>
|
||||||
<h2 class="mb-4">Tarjetas de Producto (ProductCard)</h2>
|
<h2 class="mb-4">Tarjetas de Producto (Column With Image)</h2>
|
||||||
|
|
||||||
<p class="text-muted mb-4">
|
<p class="text-muted mb-4">
|
||||||
Las tarjetas se adaptan al tamano del contenedor padre. A continuacion se
|
Las tarjetas se adaptan al tamano del contenedor padre. A continuacion se presentan dentro
|
||||||
presentan dentro de una grilla de Bootstrap.
|
de una grilla de Bootstrap.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@for (product of testProducts; track product.title) {
|
@for (product of testProducts; track product.title) {
|
||||||
<div class="col-12 col-md-6 col-lg-4 mb-4 d-flex align-items-stretch">
|
<div class="col-12 col-md-6 col-lg-4 mb-4 d-flex align-items-stretch">
|
||||||
<app-product-card
|
<app-product-column-with-image
|
||||||
[imageUrl]="product.imageUrl"
|
[imageUrl]="product.imageUrl"
|
||||||
[title]="product.title"
|
[title]="product.title"
|
||||||
[originalPrice]="product.originalPrice"
|
[originalPrice]="product.originalPrice"
|
||||||
@@ -539,16 +601,58 @@
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<app-store-section
|
<section class="component-demo card shadow-sm mt-4">
|
||||||
title="PRODUCTOS"
|
<div class="card-body">
|
||||||
class="component-demo store-section-demo mt-5"
|
<span class="eyebrow">Reusable Component</span>
|
||||||
>
|
<h2 class="mb-4">Tarjetas de Producto (Row Layout)</h2>
|
||||||
|
|
||||||
|
<p class="text-muted mb-4">Diseño horizontal que ocupa el 100% del ancho disponible.</p>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-12 mb-4 d-flex align-items-stretch">
|
||||||
|
<app-product-row-card
|
||||||
|
[title]="testRowProduct.title"
|
||||||
|
[description]="testRowProduct.description"
|
||||||
|
[price]="testRowProduct.price"
|
||||||
|
[variants]="testRowProduct.variants"
|
||||||
|
(buy)="onProductBuy(testRowProduct.title)"
|
||||||
|
(addToCart)="triggerToast('success')"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="component-demo card shadow-sm mt-4">
|
||||||
|
<div class="card-body">
|
||||||
|
<span class="eyebrow">Reusable Component</span>
|
||||||
|
<h2 class="mb-4">Tarjetas de Producto (Vertical With Cart Layout)</h2>
|
||||||
|
|
||||||
|
<p class="text-muted mb-4">
|
||||||
|
Diseño vertical con selector de cantidad y acciones de compra y carrito.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div class="row justify-content-center justify-content-md-start">
|
||||||
|
<div class="col-12 col-sm-9 col-md-6 col-lg-5 col-xl-4 mb-4 d-flex align-items-stretch">
|
||||||
|
<app-product-vertical-with-cart-card
|
||||||
|
[title]="testVerticalWithCartProduct.title"
|
||||||
|
[description]="testVerticalWithCartProduct.description"
|
||||||
|
[price]="testVerticalWithCartProduct.price"
|
||||||
|
(buy)="onProductBuy(testVerticalWithCartProduct.title)"
|
||||||
|
(addToCart)="triggerToast('success')"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<app-store-section title="PRODUCTOS" class="component-demo store-section-demo mt-5">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@for (product of testProducts; track product.title) {
|
@for (product of testProducts; track product.title) {
|
||||||
<div
|
<div
|
||||||
class="col-12 col-md-6 col-lg-4 mb-4 d-flex align-items-stretch store-section-demo__item"
|
class="col-12 col-md-6 col-lg-4 mb-4 d-flex align-items-stretch store-section-demo__item"
|
||||||
>
|
>
|
||||||
<app-product-card
|
<app-product-column-with-image
|
||||||
[imageUrl]="product.imageUrl"
|
[imageUrl]="product.imageUrl"
|
||||||
[title]="product.title"
|
[title]="product.title"
|
||||||
[originalPrice]="product.originalPrice"
|
[originalPrice]="product.originalPrice"
|
||||||
|
|||||||
@@ -113,8 +113,8 @@ h1 {
|
|||||||
|
|
||||||
.cart-showcase__viewport {
|
.cart-showcase__viewport {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-width: 370px;
|
max-width: 504px;
|
||||||
height: 360px;
|
height: 640px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cart-showcase__header {
|
.cart-showcase__header {
|
||||||
@@ -130,7 +130,7 @@ h1 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.store-section-demo__item {
|
.store-section-demo__item {
|
||||||
app-product-card {
|
app-product-column-with-image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -186,9 +186,61 @@ describe('ReutilizablesTestPageComponent', () => {
|
|||||||
).toContain('Todavia no se abrio ningun modal.');
|
).toContain('Todavia no se abrio ningun modal.');
|
||||||
|
|
||||||
confirmButton.click();
|
confirmButton.click();
|
||||||
|
fixture.detectChanges();
|
||||||
deleteButton.click();
|
deleteButton.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
expect(modalServiceStub.openConfirm).toHaveBeenCalled();
|
expect(modalServiceStub.openConfirm).toHaveBeenCalledWith({
|
||||||
expect(modalServiceStub.openConfirmDelete).toHaveBeenCalled();
|
title: 'Confirmar accion',
|
||||||
|
content: 'Caso base para verificar apertura, cierre y devolucion de resultado.',
|
||||||
|
confirmLabel: 'Confirmar'
|
||||||
|
});
|
||||||
|
expect(modalServiceStub.openConfirmDelete).toHaveBeenCalledWith({
|
||||||
|
title: 'Eliminar producto',
|
||||||
|
content:
|
||||||
|
'Esta accion eliminara el producto del catalogo. Podras volver a crearlo manualmente.',
|
||||||
|
confirmLabel: 'Eliminar'
|
||||||
|
});
|
||||||
|
expect(
|
||||||
|
element.querySelector('[data-testid="modal-last-result"]')?.textContent
|
||||||
|
).toContain('Resultado: false');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('updates the visible result when the confirm modal resolves to true', async () => {
|
||||||
|
const modalServiceStub = createModalServiceStub();
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [ReutilizablesTestPageComponent],
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: TenantService,
|
||||||
|
useValue: createTenantServiceStub(tenant)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: ToastService,
|
||||||
|
useValue: createToastServiceStub()
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: ModalService,
|
||||||
|
useValue: modalServiceStub
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(ReutilizablesTestPageComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
|
const confirmButton = Array.from(
|
||||||
|
element.querySelectorAll('.button-group app-button button')
|
||||||
|
).find((button) =>
|
||||||
|
button.textContent?.includes('Abrir confirm modal')
|
||||||
|
) as HTMLButtonElement;
|
||||||
|
|
||||||
|
confirmButton.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
expect(
|
||||||
|
element.querySelector('[data-testid="modal-last-result"]')?.textContent
|
||||||
|
).toContain('Resultado: true');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,18 +1,19 @@
|
|||||||
import { Component, inject } from '@angular/core';
|
import { Component, inject } from '@angular/core';
|
||||||
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||||
import {
|
import { CartComponent, CartItemMock } from '../../../../shared/components/cart/cart.component';
|
||||||
CartComponent,
|
|
||||||
CartItemMock
|
|
||||||
} from '../../../../shared/components/cart/cart.component';
|
|
||||||
import { CartIconComponent } from '../../../../shared/components/cart-icon/cart-icon.component';
|
import { CartIconComponent } from '../../../../shared/components/cart-icon/cart-icon.component';
|
||||||
import { IconButtonComponent } from '../../../../shared/components/icon-button/icon-button.component';
|
import { IconButtonComponent } from '../../../../shared/components/icon-button/icon-button.component';
|
||||||
import { InputComponent } from '../../../../shared/components/input/input.component';
|
import { InputComponent } from '../../../../shared/components/input/input.component';
|
||||||
import { PaginatorComponent } from '../../../../shared/components/paginator/paginator.component';
|
import { PaginatorComponent } from '../../../../shared/components/paginator/paginator.component';
|
||||||
import { ProductCardComponent } from '../../../../shared/components/product-card/product-card.component';
|
import { ProductColumnWithImageComponent } from '../../../../shared/components/product-column-with-image/product-column-with-image.component';
|
||||||
|
import { ProductRowCardComponent } from '../../../../shared/components/product-row-card/product-row-card.component';
|
||||||
|
import { ProductVerticalWithCartCardComponent } from '../../../../shared/components/product-vertical-with-cart-card/product-vertical-with-cart-card.component';
|
||||||
import { StoreSectionComponent } from '../../../../shared/components/store-section/store-section.component';
|
import { StoreSectionComponent } from '../../../../shared/components/store-section/store-section.component';
|
||||||
import { ModalService } from '../../../../core/services/modal.service';
|
import { ModalService } from '../../../../core/services/modal.service';
|
||||||
import { TenantService } from '../../../../core/services/tenant.service';
|
import { TenantService } from '../../../../core/services/tenant.service';
|
||||||
import { ToastService } from '../../../../core/services/toast.service';
|
import { ToastService } from '../../../../core/services/toast.service';
|
||||||
|
import { StepperComponent } from '../../../../shared/components/stepper/stepper.component';
|
||||||
|
import { StepComponent } from '../../../../shared/components/stepper/step.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-reutilizables-test-page',
|
selector: 'app-reutilizables-test-page',
|
||||||
@@ -21,18 +22,25 @@ import { ToastService } from '../../../../core/services/toast.service';
|
|||||||
CartComponent,
|
CartComponent,
|
||||||
InputComponent,
|
InputComponent,
|
||||||
PaginatorComponent,
|
PaginatorComponent,
|
||||||
ProductCardComponent,
|
ProductColumnWithImageComponent,
|
||||||
|
ProductRowCardComponent,
|
||||||
|
ProductVerticalWithCartCardComponent,
|
||||||
StoreSectionComponent,
|
StoreSectionComponent,
|
||||||
IconButtonComponent,
|
IconButtonComponent,
|
||||||
CartIconComponent
|
CartIconComponent,
|
||||||
|
StepperComponent,
|
||||||
|
StepComponent,
|
||||||
],
|
],
|
||||||
templateUrl: './reutilizables-test-page.component.html',
|
templateUrl: './reutilizables-test-page.component.html',
|
||||||
styleUrl: './reutilizables-test-page.component.scss'
|
styleUrl: './reutilizables-test-page.component.scss',
|
||||||
})
|
})
|
||||||
export class ReutilizablesTestPageComponent {
|
export class ReutilizablesTestPageComponent {
|
||||||
private readonly tenantService = inject(TenantService);
|
private readonly tenantService = inject(TenantService);
|
||||||
private readonly toastService = inject(ToastService);
|
private readonly toastService = inject(ToastService);
|
||||||
private readonly modalService = inject(ModalService);
|
private readonly modalService = inject(ModalService);
|
||||||
|
|
||||||
|
protected testStep1Valid = true;
|
||||||
|
protected testStep2Valid = false;
|
||||||
protected readonly tenant = this.tenantService.tenant;
|
protected readonly tenant = this.tenantService.tenant;
|
||||||
protected textValue = 'Auriculares';
|
protected textValue = 'Auriculares';
|
||||||
protected numberValue = '24';
|
protected numberValue = '24';
|
||||||
@@ -61,24 +69,41 @@ export class ReutilizablesTestPageComponent {
|
|||||||
originalPrice: 95000,
|
originalPrice: 95000,
|
||||||
discount: 20,
|
discount: 20,
|
||||||
transferPrice: 74800,
|
transferPrice: 74800,
|
||||||
imageUrl: '/images/pantalon-scuba.png'
|
imageUrl: '/images/pantalon-scuba.png',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Zapatillas de running azul',
|
title: 'Zapatillas de running azul',
|
||||||
originalPrice: 120000,
|
originalPrice: 120000,
|
||||||
discount: 15,
|
discount: 15,
|
||||||
transferPrice: 98000,
|
transferPrice: 98000,
|
||||||
imageUrl: '/images/zapatillas-running.png'
|
imageUrl: '/images/zapatillas-running.png',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Remera basica blanca (Sin Descuento)',
|
title: 'Remera basica blanca (Sin Descuento)',
|
||||||
originalPrice: 32000,
|
originalPrice: 32000,
|
||||||
discount: null,
|
discount: null,
|
||||||
transferPrice: 30000,
|
transferPrice: 30000,
|
||||||
imageUrl: null
|
imageUrl: null,
|
||||||
}
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
protected readonly testRowProduct = {
|
||||||
|
title: 'ENTRADA GENERAL',
|
||||||
|
description:
|
||||||
|
'Acceso total al predio. No incluye acceso a estacionamiento. Niños menores de 5 años ingresan gratis.',
|
||||||
|
price: 10000,
|
||||||
|
variants: [
|
||||||
|
{ label: '10 de Octubre', value: '10-oct' },
|
||||||
|
{ label: '11 de Octubre', value: '11-oct' },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
protected readonly testVerticalWithCartProduct = {
|
||||||
|
title: 'PANCHO',
|
||||||
|
description: 'Pancho con aderezo a elección.',
|
||||||
|
price: 11500,
|
||||||
|
};
|
||||||
|
|
||||||
protected readonly cartMockItems: CartItemMock[] = [
|
protected readonly cartMockItems: CartItemMock[] = [
|
||||||
{
|
{
|
||||||
imageUrl: null,
|
imageUrl: null,
|
||||||
@@ -89,8 +114,8 @@ export class ReutilizablesTestPageComponent {
|
|||||||
quantity: 1,
|
quantity: 1,
|
||||||
attributes: [
|
attributes: [
|
||||||
{ label: 'Color', value: 'Beige' },
|
{ label: 'Color', value: 'Beige' },
|
||||||
{ label: 'Talle', value: 'S' }
|
{ label: 'Talle', value: 'S' },
|
||||||
]
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
imageUrl: null,
|
imageUrl: null,
|
||||||
@@ -101,8 +126,8 @@ export class ReutilizablesTestPageComponent {
|
|||||||
quantity: 1,
|
quantity: 1,
|
||||||
attributes: [
|
attributes: [
|
||||||
{ label: 'Color', value: 'Beige' },
|
{ label: 'Color', value: 'Beige' },
|
||||||
{ label: 'Talle', value: 'S' }
|
{ label: 'Talle', value: 'S' },
|
||||||
]
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
imageUrl: null,
|
imageUrl: null,
|
||||||
@@ -113,8 +138,8 @@ export class ReutilizablesTestPageComponent {
|
|||||||
quantity: 1,
|
quantity: 1,
|
||||||
attributes: [
|
attributes: [
|
||||||
{ label: 'Color', value: 'Negro' },
|
{ label: 'Color', value: 'Negro' },
|
||||||
{ label: 'Talle', value: 'XL' }
|
{ label: 'Talle', value: 'XL' },
|
||||||
]
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
imageUrl: null,
|
imageUrl: null,
|
||||||
@@ -125,9 +150,9 @@ export class ReutilizablesTestPageComponent {
|
|||||||
quantity: 2,
|
quantity: 2,
|
||||||
attributes: [
|
attributes: [
|
||||||
{ label: 'Color', value: 'Gris' },
|
{ label: 'Color', value: 'Gris' },
|
||||||
{ label: 'Talle', value: 'M' }
|
{ label: 'Talle', value: 'M' },
|
||||||
]
|
],
|
||||||
}
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
protected onProductBuy(productTitle: string): void {
|
protected onProductBuy(productTitle: string): void {
|
||||||
@@ -155,68 +180,51 @@ export class ReutilizablesTestPageComponent {
|
|||||||
|
|
||||||
protected triggerToast(type: 'success' | 'danger' | 'info'): void {
|
protected triggerToast(type: 'success' | 'danger' | 'info'): void {
|
||||||
if (type === 'success') {
|
if (type === 'success') {
|
||||||
this.toastService.success(
|
this.toastService.success('Operacion exitosa. El producto se ha guardado correctamente.');
|
||||||
'Operacion exitosa. El producto se ha guardado correctamente.'
|
|
||||||
);
|
|
||||||
} else if (type === 'danger') {
|
} else if (type === 'danger') {
|
||||||
this.toastService.danger(
|
this.toastService.danger('Alerta de error. Hubo un problema al procesar la solicitud.');
|
||||||
'Alerta de error. Hubo un problema al procesar la solicitud.'
|
|
||||||
);
|
|
||||||
} else if (type === 'info') {
|
} else if (type === 'info') {
|
||||||
this.toastService.info(
|
this.toastService.info('Informacion del sistema: Hay una nueva actualizacion disponible.');
|
||||||
'Informacion del sistema: Hay una nueva actualizacion disponible.'
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected triggerPersistentToast(type: 'success' | 'danger' | 'info'): void {
|
protected triggerPersistentToast(type: 'success' | 'danger' | 'info'): void {
|
||||||
if (type === 'success') {
|
if (type === 'success') {
|
||||||
this.toastService.success(
|
this.toastService.success('Exito persistente. Esta alerta no se cerrara sola.', 0);
|
||||||
'Exito persistente. Esta alerta no se cerrara sola.',
|
|
||||||
0
|
|
||||||
);
|
|
||||||
} else if (type === 'danger') {
|
} else if (type === 'danger') {
|
||||||
this.toastService.danger(
|
this.toastService.danger(
|
||||||
'Error persistente. Por favor, atienda este problema y cierrelo manualmente.',
|
'Error persistente. Por favor, atienda este problema y cierrelo manualmente.',
|
||||||
0
|
0,
|
||||||
);
|
);
|
||||||
} else if (type === 'info') {
|
} else if (type === 'info') {
|
||||||
this.toastService.info(
|
this.toastService.info('Informacion persistente: Mantendremos este aviso en pantalla.', 0);
|
||||||
'Informacion persistente: Mantendremos este aviso en pantalla.',
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected openBasicModal(): void {
|
protected openBasicModal(): void {
|
||||||
this.openConfirmModal({
|
this.openConfirmModal({
|
||||||
title: 'Confirmar accion',
|
title: 'Confirmar accion',
|
||||||
content:
|
content: 'Caso base para verificar apertura, cierre y devolucion de resultado.',
|
||||||
'Caso base para verificar apertura, cierre y devolucion de resultado.',
|
confirmLabel: 'Confirmar',
|
||||||
confirmLabel: 'Confirmar'
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
protected openConfirmDeleteModal(): void {
|
protected openConfirmDeleteModal(): void {
|
||||||
this.modalService.openConfirmDelete({
|
this.openConfirmDelete({
|
||||||
title: 'Eliminar producto',
|
title: 'Eliminar producto',
|
||||||
content:
|
content:
|
||||||
'Esta accion eliminara el producto del catalogo. Podras volver a crearlo manualmente.',
|
'Esta accion eliminara el producto del catalogo. Podras volver a crearlo manualmente.',
|
||||||
confirmLabel: 'Eliminar',
|
confirmLabel: 'Eliminar',
|
||||||
cancelLabel: 'Conservar'
|
|
||||||
}).subscribe((confirmed) => {
|
|
||||||
this.lastModalResult = `Resultado: ${confirmed}`;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
protected openLockedModal(): void {
|
protected openLockedModal(): void {
|
||||||
this.openConfirmModal({
|
this.openConfirmModal({
|
||||||
title: 'Modal bloqueado',
|
title: 'Modal bloqueado',
|
||||||
content:
|
content: 'Este modal no se cierra tocando el backdrop ni con la tecla Escape.',
|
||||||
'Este modal no se cierra tocando el backdrop ni con la tecla Escape.',
|
|
||||||
confirmLabel: 'Entendido',
|
confirmLabel: 'Entendido',
|
||||||
closeOnBackdrop: false,
|
closeOnBackdrop: false,
|
||||||
closeOnEscape: false
|
closeOnEscape: false,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -225,13 +233,31 @@ export class ReutilizablesTestPageComponent {
|
|||||||
title: 'Modal ancho',
|
title: 'Modal ancho',
|
||||||
content: 'Demuestra una variante visual mas amplia para contenido mas pesado.',
|
content: 'Demuestra una variante visual mas amplia para contenido mas pesado.',
|
||||||
confirmLabel: 'Seguir',
|
confirmLabel: 'Seguir',
|
||||||
size: 'xl'
|
size: 'xl',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected openSimpleModal(): void {
|
||||||
|
this.modalService
|
||||||
|
.openSimple({
|
||||||
|
title: 'Mensaje del sistema',
|
||||||
|
content: 'Este es un mensaje simple del sistema que no requiere confirmación.',
|
||||||
|
buttonLabel: 'Entendido',
|
||||||
|
})
|
||||||
|
.subscribe(() => {
|
||||||
|
this.lastModalResult = 'Simple modal cerrado';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
private openConfirmModal(config: Parameters<ModalService['openConfirm']>[0]): void {
|
private openConfirmModal(config: Parameters<ModalService['openConfirm']>[0]): void {
|
||||||
this.modalService.openConfirm(config).subscribe((confirmed) => {
|
this.modalService.openConfirm(config).subscribe((confirmed) => {
|
||||||
this.lastModalResult = `Resultado: ${confirmed}`;
|
this.lastModalResult = `Resultado: ${confirmed}`;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private openConfirmDelete(config: Parameters<ModalService['openConfirmDelete']>[0]): void {
|
||||||
|
this.modalService.openConfirmDelete(config).subscribe((confirmed) => {
|
||||||
|
this.lastModalResult = `Resultado: ${confirmed}`;
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { beforeEach, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import { ProductAttribute } from '../../../../core/services/catalog/catalog.interface';
|
||||||
|
import { ProductAttributeSelectorComponent } from './product-attribute-selector.component';
|
||||||
|
|
||||||
|
describe('ProductAttributeSelectorComponent', () => {
|
||||||
|
const sizeAttribute: ProductAttribute = {
|
||||||
|
id: 1,
|
||||||
|
codigo: 'size',
|
||||||
|
nombre: 'Size',
|
||||||
|
is_required: true,
|
||||||
|
metadata_schema: null,
|
||||||
|
type: 'select',
|
||||||
|
options: [
|
||||||
|
{ id: 10, value: 'S', label: 'S', sort_order: 0, metadata: null },
|
||||||
|
{ id: 20, value: 'M', label: 'M', sort_order: 1, metadata: null },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [ProductAttributeSelectorComponent],
|
||||||
|
}).compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps an unlimited option available when maximum quantity is null', () => {
|
||||||
|
const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
|
||||||
|
fixture.componentRef.setInput('attributes', [sizeAttribute]);
|
||||||
|
fixture.componentRef.setInput('inventoryPolicy', 'unlimited');
|
||||||
|
fixture.componentRef.setInput('variants', [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
stock_tecnico: null,
|
||||||
|
values: { size: 'S' },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const buttons = Array.from(
|
||||||
|
fixture.nativeElement.querySelectorAll('.attribute-selector__text-option'),
|
||||||
|
) as HTMLButtonElement[];
|
||||||
|
expect(buttons[0].disabled).toBe(false);
|
||||||
|
expect(buttons[1].disabled).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('disables tracked options without available stock', () => {
|
||||||
|
const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
|
||||||
|
fixture.componentRef.setInput('attributes', [sizeAttribute]);
|
||||||
|
fixture.componentRef.setInput('inventoryPolicy', 'tracked');
|
||||||
|
fixture.componentRef.setInput('variants', [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
stock_tecnico: 0,
|
||||||
|
values: { size: 'S' },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 2,
|
||||||
|
stock_tecnico: 2,
|
||||||
|
values: { size: 'M' },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const buttons = Array.from(
|
||||||
|
fixture.nativeElement.querySelectorAll('.attribute-selector__text-option'),
|
||||||
|
) as HTMLButtonElement[];
|
||||||
|
expect(buttons[0].disabled).toBe(true);
|
||||||
|
expect(buttons[1].disabled).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -6,14 +6,14 @@ import {
|
|||||||
input,
|
input,
|
||||||
output,
|
output,
|
||||||
signal,
|
signal,
|
||||||
untracked
|
untracked,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import {
|
import {
|
||||||
|
CatalogItemVariant,
|
||||||
|
InventoryPolicy,
|
||||||
ProductAttribute,
|
ProductAttribute,
|
||||||
ProductAttributeOption,
|
ProductAttributeOption,
|
||||||
ProductVariant,
|
|
||||||
ProductVariantMap
|
|
||||||
} from '../../../../core/services/catalog/catalog.interface';
|
} from '../../../../core/services/catalog/catalog.interface';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@@ -22,20 +22,21 @@ import {
|
|||||||
imports: [CommonModule],
|
imports: [CommonModule],
|
||||||
templateUrl: './product-attribute-selector.component.html',
|
templateUrl: './product-attribute-selector.component.html',
|
||||||
styleUrl: './product-attribute-selector.component.scss',
|
styleUrl: './product-attribute-selector.component.scss',
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class ProductAttributeSelectorComponent {
|
export class ProductAttributeSelectorComponent {
|
||||||
public attributes = input<ProductAttribute[]>([]);
|
public attributes = input<ProductAttribute[]>([]);
|
||||||
public variantsMap = input<ProductVariantMap[]>([]);
|
public variants = input<CatalogItemVariant[]>([]);
|
||||||
public defaultVariant = input<ProductVariant | null>(null);
|
public selectedVariant = input<CatalogItemVariant | null>(null);
|
||||||
|
public inventoryPolicy = input.required<InventoryPolicy>();
|
||||||
|
|
||||||
public variantChange = output<ProductVariantMap | null>();
|
public variantChange = output<CatalogItemVariant | null>();
|
||||||
|
|
||||||
protected readonly selectedAttributeOptions = signal<Record<number, number>>({});
|
protected readonly selectedAttributeOptions = signal<Record<number, number>>({});
|
||||||
|
|
||||||
protected readonly availableOptions = computed(() => {
|
protected readonly availableOptions = computed(() => {
|
||||||
const selections = this.selectedAttributeOptions();
|
const selections = this.selectedAttributeOptions();
|
||||||
const variants = this.variantsMap();
|
const variants = this.variants();
|
||||||
const attributes = this.attributes();
|
const attributes = this.attributes();
|
||||||
|
|
||||||
const availability: Record<number, Record<number, boolean>> = {};
|
const availability: Record<number, Record<number, boolean>> = {};
|
||||||
@@ -44,28 +45,30 @@ export class ProductAttributeSelectorComponent {
|
|||||||
availability[attribute.id] = {};
|
availability[attribute.id] = {};
|
||||||
for (const option of attribute.options) {
|
for (const option of attribute.options) {
|
||||||
const optionNormalized = this.normalizeText(option.value || option.label);
|
const optionNormalized = this.normalizeText(option.value || option.label);
|
||||||
|
|
||||||
const isAvailable = variants.some(variant => {
|
|
||||||
if (variant.cantidad_maxima <= 0) return false;
|
|
||||||
|
|
||||||
const variantAttrValue = this.getDefaultVariantAttributeValue(attribute, variant.attributes);
|
const isAvailable = variants.some((variant) => {
|
||||||
|
if (!this.isVariantAvailable(variant)) return false;
|
||||||
|
|
||||||
|
const variantAttrValue = this.getDefaultVariantAttributeValue(attribute, variant.values);
|
||||||
if (!variantAttrValue || this.normalizeText(variantAttrValue) !== optionNormalized) {
|
if (!variantAttrValue || this.normalizeText(variantAttrValue) !== optionNormalized) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const otherAttr of attributes) {
|
for (const otherAttr of attributes) {
|
||||||
if (otherAttr.id === attribute.id) continue;
|
if (otherAttr.id === attribute.id) continue;
|
||||||
const selectedOptionId = selections[otherAttr.id];
|
const selectedOptionId = selections[otherAttr.id];
|
||||||
if (selectedOptionId !== undefined) {
|
if (selectedOptionId !== undefined) {
|
||||||
const selectedOption = otherAttr.options.find(o => o.id === selectedOptionId);
|
const selectedOption = otherAttr.options.find((o) => o.id === selectedOptionId);
|
||||||
if (selectedOption) {
|
if (selectedOption) {
|
||||||
const selectedNormalized = this.normalizeText(selectedOption.value || selectedOption.label);
|
const selectedNormalized = this.normalizeText(
|
||||||
const vAttrValue = this.getDefaultVariantAttributeValue(otherAttr, variant.attributes);
|
selectedOption.value || selectedOption.label,
|
||||||
if (!vAttrValue || this.normalizeText(vAttrValue) !== selectedNormalized) {
|
);
|
||||||
return false;
|
const vAttrValue = this.getDefaultVariantAttributeValue(otherAttr, variant.values);
|
||||||
}
|
if (!vAttrValue || this.normalizeText(vAttrValue) !== selectedNormalized) {
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
@@ -78,14 +81,14 @@ export class ProductAttributeSelectorComponent {
|
|||||||
});
|
});
|
||||||
|
|
||||||
public reset(): void {
|
public reset(): void {
|
||||||
this.initializeSelections(this.attributes(), this.defaultVariant());
|
this.initializeSelections(this.attributes(), this.selectedVariant());
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
effect(() => {
|
effect(() => {
|
||||||
const attributes = this.attributes();
|
const attributes = this.attributes();
|
||||||
const defaultVariant = this.defaultVariant();
|
const defaultVariant = this.selectedVariant();
|
||||||
|
|
||||||
untracked(() => {
|
untracked(() => {
|
||||||
this.initializeSelections(attributes, defaultVariant);
|
this.initializeSelections(attributes, defaultVariant);
|
||||||
});
|
});
|
||||||
@@ -93,26 +96,29 @@ export class ProductAttributeSelectorComponent {
|
|||||||
|
|
||||||
effect(() => {
|
effect(() => {
|
||||||
const selections = this.selectedAttributeOptions();
|
const selections = this.selectedAttributeOptions();
|
||||||
const variantsMap = this.variantsMap();
|
const variants = this.variants();
|
||||||
const attributes = this.attributes();
|
const attributes = this.attributes();
|
||||||
|
|
||||||
untracked(() => {
|
untracked(() => {
|
||||||
this.emitMatchingVariant(selections, variantsMap, attributes);
|
this.emitMatchingVariant(selections, variants, attributes);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
protected hasSelectedOption(attribute: ProductAttribute, option: ProductAttributeOption): boolean {
|
protected hasSelectedOption(
|
||||||
|
attribute: ProductAttribute,
|
||||||
|
option: ProductAttributeOption,
|
||||||
|
): boolean {
|
||||||
return this.selectedAttributeOptions()[attribute.id] === option.id;
|
return this.selectedAttributeOptions()[attribute.id] === option.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected selectAttributeOption(
|
protected selectAttributeOption(
|
||||||
attribute: ProductAttribute,
|
attribute: ProductAttribute,
|
||||||
option: ProductAttributeOption
|
option: ProductAttributeOption,
|
||||||
): void {
|
): void {
|
||||||
this.selectedAttributeOptions.update((current) => ({
|
this.selectedAttributeOptions.update((current) => ({
|
||||||
...current,
|
...current,
|
||||||
[attribute.id]: option.id
|
[attribute.id]: option.id,
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,7 +130,10 @@ export class ProductAttributeSelectorComponent {
|
|||||||
return this.findFirstHexValue(option.metadata) ?? '#D9D9D9';
|
return this.findFirstHexValue(option.metadata) ?? '#D9D9D9';
|
||||||
}
|
}
|
||||||
|
|
||||||
private initializeSelections(attributes: ProductAttribute[], defaultVariant: ProductVariant | null): void {
|
private initializeSelections(
|
||||||
|
attributes: ProductAttribute[],
|
||||||
|
defaultVariant: CatalogItemVariant | null,
|
||||||
|
): void {
|
||||||
const selections: Record<number, number> = {};
|
const selections: Record<number, number> = {};
|
||||||
|
|
||||||
for (const attribute of attributes) {
|
for (const attribute of attributes) {
|
||||||
@@ -139,20 +148,20 @@ export class ProductAttributeSelectorComponent {
|
|||||||
|
|
||||||
private findDefaultOptionId(
|
private findDefaultOptionId(
|
||||||
attribute: ProductAttribute,
|
attribute: ProductAttribute,
|
||||||
variant: ProductVariant | null
|
variant: CatalogItemVariant | null,
|
||||||
): number | null {
|
): number | null {
|
||||||
if (!variant) {
|
if (!variant) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultValue = this.getDefaultVariantAttributeValue(attribute, variant.definitions);
|
const defaultValue = this.getDefaultVariantAttributeValue(attribute, variant.values);
|
||||||
if (!defaultValue) {
|
if (!defaultValue) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const normalizedValue = this.normalizeText(defaultValue);
|
const normalizedValue = this.normalizeText(defaultValue);
|
||||||
const matchByValue = attribute.options.find(
|
const matchByValue = attribute.options.find(
|
||||||
(option) => this.normalizeText(option.value) === normalizedValue
|
(option) => this.normalizeText(option.value) === normalizedValue,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (matchByValue) {
|
if (matchByValue) {
|
||||||
@@ -160,7 +169,7 @@ export class ProductAttributeSelectorComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const matchByLabel = attribute.options.find(
|
const matchByLabel = attribute.options.find(
|
||||||
(option) => this.normalizeText(option.label) === normalizedValue
|
(option) => this.normalizeText(option.label) === normalizedValue,
|
||||||
);
|
);
|
||||||
|
|
||||||
return matchByLabel?.id ?? null;
|
return matchByLabel?.id ?? null;
|
||||||
@@ -168,7 +177,7 @@ export class ProductAttributeSelectorComponent {
|
|||||||
|
|
||||||
private getDefaultVariantAttributeValue(
|
private getDefaultVariantAttributeValue(
|
||||||
attribute: ProductAttribute,
|
attribute: ProductAttribute,
|
||||||
variantAttributes: Record<string, string>
|
variantAttributes: Record<string, string>,
|
||||||
): string | null {
|
): string | null {
|
||||||
const normalizedCodigo = this.normalizeText(attribute.codigo);
|
const normalizedCodigo = this.normalizeText(attribute.codigo);
|
||||||
const normalizedNombre = this.normalizeText(attribute.nombre);
|
const normalizedNombre = this.normalizeText(attribute.nombre);
|
||||||
@@ -192,6 +201,10 @@ export class ProductAttributeSelectorComponent {
|
|||||||
.toLowerCase();
|
.toLowerCase();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private isVariantAvailable(variant: CatalogItemVariant): boolean {
|
||||||
|
return this.inventoryPolicy() === 'unlimited' || (variant.stock_tecnico ?? 0) > 0;
|
||||||
|
}
|
||||||
|
|
||||||
private findFirstHexValue(value: unknown): string | null {
|
private findFirstHexValue(value: unknown): string | null {
|
||||||
if (typeof value === 'string') {
|
if (typeof value === 'string') {
|
||||||
const match = value.match(/#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{6})\b/);
|
const match = value.match(/#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{6})\b/);
|
||||||
@@ -222,10 +235,10 @@ export class ProductAttributeSelectorComponent {
|
|||||||
|
|
||||||
private emitMatchingVariant(
|
private emitMatchingVariant(
|
||||||
selections: Record<number, number>,
|
selections: Record<number, number>,
|
||||||
variantsMap: ProductVariantMap[],
|
variants: CatalogItemVariant[],
|
||||||
attributes: ProductAttribute[]
|
attributes: ProductAttribute[],
|
||||||
): void {
|
): void {
|
||||||
if (attributes.length === 0 || variantsMap.length === 0) {
|
if (attributes.length === 0 || variants.length === 0) {
|
||||||
this.variantChange.emit(null);
|
this.variantChange.emit(null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -235,12 +248,12 @@ export class ProductAttributeSelectorComponent {
|
|||||||
for (const attr of attributes) {
|
for (const attr of attributes) {
|
||||||
const selectedOptionId = selections[attr.id];
|
const selectedOptionId = selections[attr.id];
|
||||||
if (selectedOptionId === undefined) {
|
if (selectedOptionId === undefined) {
|
||||||
allSelected = false;
|
allSelected = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
const option = attr.options.find(o => o.id === selectedOptionId);
|
const option = attr.options.find((o) => o.id === selectedOptionId);
|
||||||
if (option) {
|
if (option) {
|
||||||
selectedValuesById[attr.id] = this.normalizeText(option.value || option.label);
|
selectedValuesById[attr.id] = this.normalizeText(option.value || option.label);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -249,12 +262,12 @@ export class ProductAttributeSelectorComponent {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const matchingVariant = variantsMap.find(vMap => {
|
const matchingVariant = variants.find((variant) => {
|
||||||
return attributes.every(attr => {
|
return attributes.every((attr) => {
|
||||||
const selectedValue = selectedValuesById[attr.id];
|
const selectedValue = selectedValuesById[attr.id];
|
||||||
const vMapValue = this.getDefaultVariantAttributeValue(attr, vMap.attributes);
|
const variantValue = this.getDefaultVariantAttributeValue(attr, variant.values);
|
||||||
if (!vMapValue) return false;
|
if (!variantValue) return false;
|
||||||
return this.normalizeText(vMapValue) === selectedValue;
|
return this.normalizeText(variantValue) === selectedValue;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,51 +1,70 @@
|
|||||||
<div class="product-carousel d-flex flex-column gap-4">
|
<div class="product-carousel d-flex flex-column gap-4">
|
||||||
<!-- Active/Main Image Area -->
|
<!-- Active/Main Image Area -->
|
||||||
<div class="product-carousel__main position-relative bg-light overflow-hidden">
|
<div class="product-carousel__main position-relative bg-light overflow-hidden">
|
||||||
<!-- Main Image -->
|
<!-- Main Image -->
|
||||||
@if (images().length > 0) {
|
@if (images().length > 0) {
|
||||||
<img [src]="images()[activeIndex()]" alt="Product active image"
|
<img
|
||||||
class="product-carousel__main-image w-100 h-100 object-fit-cover" />
|
[ngSrc]="images()[activeIndex()]"
|
||||||
|
alt="Product active image"
|
||||||
|
fill
|
||||||
|
priority
|
||||||
|
sizes="(min-width: 992px) 42vw, 100vw"
|
||||||
|
class="product-carousel__main-image w-100 h-100 object-fit-cover"
|
||||||
|
/>
|
||||||
} @else {
|
} @else {
|
||||||
<!-- Placeholder -->
|
<!-- Placeholder -->
|
||||||
<div class="product-carousel__placeholder w-100 h-100 d-flex align-items-center justify-content-center text-muted">
|
<div
|
||||||
<i class="fa-solid fa-image fa-3x"></i>
|
class="product-carousel__placeholder w-100 h-100 d-flex align-items-center justify-content-center text-muted"
|
||||||
</div>
|
>
|
||||||
|
<i class="fa-solid fa-image fa-3x"></i>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
<!-- Discount Badge -->
|
<!-- Discount Badge -->
|
||||||
@if (discount() && discount()! > 0) {
|
@if (discount() && discount()! > 0) {
|
||||||
<span
|
<span
|
||||||
class="product-carousel__discount-badge position-absolute top-0 end-0 bg-primary text-white px-3 py-2 fw-semibold">
|
class="product-carousel__discount-badge position-absolute top-0 end-0 bg-primary text-white px-3 py-2 fw-semibold"
|
||||||
-{{ discount() }}%
|
>
|
||||||
</span>
|
-{{ discount() }}%
|
||||||
|
</span>
|
||||||
}
|
}
|
||||||
|
|
||||||
<!-- Navigation Arrows -->
|
<!-- Navigation Arrows -->
|
||||||
@if (images().length > 1) {
|
@if (images().length > 1) {
|
||||||
<button type="button"
|
<button
|
||||||
class="product-carousel__nav-btn product-carousel__nav-btn--prev position-absolute top-50 translate-middle-y border-0 p-0 d-flex align-items-center justify-content-center"
|
type="button"
|
||||||
(click)="prevImage()" aria-label="Previous image">
|
class="product-carousel__nav-btn product-carousel__nav-btn--prev position-absolute top-50 translate-middle-y border-0 p-0 d-flex align-items-center justify-content-center"
|
||||||
<i class="fa-solid fa-chevron-left"></i>
|
(click)="prevImage()"
|
||||||
</button>
|
aria-label="Previous image"
|
||||||
|
>
|
||||||
|
<i class="fa-solid fa-chevron-left"></i>
|
||||||
|
</button>
|
||||||
|
|
||||||
<button type="button"
|
<button
|
||||||
class="product-carousel__nav-btn product-carousel__nav-btn--next position-absolute top-50 translate-middle-y border-0 p-0 d-flex align-items-center justify-content-center"
|
type="button"
|
||||||
(click)="nextImage()" aria-label="Next image">
|
class="product-carousel__nav-btn product-carousel__nav-btn--next position-absolute top-50 translate-middle-y border-0 p-0 d-flex align-items-center justify-content-center"
|
||||||
<i class="fa-solid fa-chevron-right"></i>
|
(click)="nextImage()"
|
||||||
</button>
|
aria-label="Next image"
|
||||||
|
>
|
||||||
|
<i class="fa-solid fa-chevron-right"></i>
|
||||||
|
</button>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Thumbnails Row -->
|
<!-- Thumbnails Row -->
|
||||||
@if (images().length > 1) {
|
@if (images().length > 1) {
|
||||||
<div class="product-carousel__thumbnails">
|
<div class="product-carousel__thumbnails">
|
||||||
@for (image of images(); track image; let idx = $index) {
|
@for (image of images(); track image; let idx = $index) {
|
||||||
<button type="button" class="product-carousel__thumbnail border-0 p-0 overflow-hidden bg-light"
|
<button
|
||||||
[class.product-carousel__thumbnail--active]="idx === activeIndex()" (click)="selectImage(idx)"
|
type="button"
|
||||||
[attr.aria-label]="'Select image ' + (idx + 1)">
|
class="product-carousel__thumbnail border-0 p-0 overflow-hidden bg-light"
|
||||||
<img [src]="image" alt="Product thumbnail" class="w-100 h-100 object-fit-cover" />
|
[class.product-carousel__thumbnail--active]="idx === activeIndex()"
|
||||||
</button>
|
(click)="selectImage(idx)"
|
||||||
}
|
[attr.aria-label]="'Select image ' + (idx + 1)"
|
||||||
</div>
|
>
|
||||||
|
<img [src]="image" alt="Product thumbnail" class="w-100 h-100 object-fit-cover" />
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
import { ChangeDetectionStrategy, Component, input, signal } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, input, signal } from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule, NgOptimizedImage } from '@angular/common';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-product-carousel',
|
selector: 'app-product-carousel',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [CommonModule],
|
imports: [CommonModule, NgOptimizedImage],
|
||||||
templateUrl: './product-carousel.component.html',
|
templateUrl: './product-carousel.component.html',
|
||||||
styleUrl: './product-carousel.component.scss',
|
styleUrl: './product-carousel.component.scss',
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class ProductCarouselComponent {
|
export class ProductCarouselComponent {
|
||||||
readonly images = input<string[]>([]);
|
readonly images = input<string[]>([]);
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<div class="account-layout">
|
||||||
|
<app-account-sidebar class="account-sidebar"></app-account-sidebar>
|
||||||
|
<div class="account-content">
|
||||||
|
<router-outlet></router-outlet>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
.account-layout {
|
||||||
|
display: flex;
|
||||||
|
margin: 0 auto;
|
||||||
|
gap: 100px;
|
||||||
|
min-height: calc(100vh - 100px);
|
||||||
|
}
|
||||||
|
.account-sidebar {
|
||||||
|
width: 250px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.account-content {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
font-size: 13px !important;
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { RouterOutlet } from '@angular/router';
|
||||||
|
import { AccountSidebar } from '../components/account-sidebar/account-sidebar';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-account-layout',
|
||||||
|
standalone: true,
|
||||||
|
imports: [RouterOutlet, AccountSidebar],
|
||||||
|
templateUrl: './account-layout.html',
|
||||||
|
styleUrl: './account-layout.scss',
|
||||||
|
})
|
||||||
|
export class AccountLayout {}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<div class="sidebar-container">
|
||||||
|
<h2 class="sidebar-title">MI CUENTA</h2>
|
||||||
|
<div class="divider"></div>
|
||||||
|
<nav class="sidebar-nav">
|
||||||
|
<a routerLink="/mi-cuenta/datos-personales" routerLinkActive="active" class="nav-link"
|
||||||
|
>Datos Personales</a
|
||||||
|
>
|
||||||
|
<a routerLink="/mi-cuenta/compras" routerLinkActive="active" class="nav-link">Mis compras</a>
|
||||||
|
<a routerLink="/mi-cuenta/tickets" routerLinkActive="active" class="nav-link">Mis tickets</a>
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
.sidebar-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
.sidebar-title {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #1a1a1a;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
.divider {
|
||||||
|
height: 1px;
|
||||||
|
background-color: #e0e0e0;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
.sidebar-nav {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
.nav-link {
|
||||||
|
text-decoration: none;
|
||||||
|
color: #888;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
transition: color 0.2s;
|
||||||
|
}
|
||||||
|
.nav-link:hover {
|
||||||
|
color: #5a5a5a;
|
||||||
|
}
|
||||||
|
.nav-link.active {
|
||||||
|
color: var(--color-primary); /* Blue color matching the image */
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-account-sidebar',
|
||||||
|
standalone: true,
|
||||||
|
imports: [RouterLink, RouterLinkActive],
|
||||||
|
templateUrl: './account-sidebar.html',
|
||||||
|
styleUrl: './account-sidebar.scss',
|
||||||
|
})
|
||||||
|
export class AccountSidebar {}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
<form [formGroup]="profileForm" class="profile-form" (ngSubmit)="onSubmit()">
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Nombre y Apellido:</label>
|
||||||
|
<app-input
|
||||||
|
type="text"
|
||||||
|
[value]="profileForm.controls['fullName'].value"
|
||||||
|
(valueChange)="profileForm.controls['fullName'].setValue($event)"
|
||||||
|
></app-input>
|
||||||
|
@if (getControlError('fullName'); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Email:</label>
|
||||||
|
<app-input
|
||||||
|
type="email"
|
||||||
|
[value]="profileForm.controls['email'].value"
|
||||||
|
(valueChange)="profileForm.controls['email'].setValue($event)"
|
||||||
|
></app-input>
|
||||||
|
@if (getControlError('email'); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>DNI:</label>
|
||||||
|
<app-input
|
||||||
|
type="text"
|
||||||
|
[value]="profileForm.controls['dni'].value"
|
||||||
|
(valueChange)="profileForm.controls['dni'].setValue($event)"
|
||||||
|
></app-input>
|
||||||
|
@if (getControlError('dni'); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Teléfono:</label>
|
||||||
|
<app-input
|
||||||
|
type="text"
|
||||||
|
[value]="profileForm.controls['phone'].value"
|
||||||
|
(valueChange)="profileForm.controls['phone'].setValue($event)"
|
||||||
|
></app-input>
|
||||||
|
@if (getControlError('phone'); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Contraseña (dejar en blanco para no modificar):</label>
|
||||||
|
<app-input
|
||||||
|
type="password"
|
||||||
|
[value]="profileForm.controls['password'].value"
|
||||||
|
(valueChange)="profileForm.controls['password'].setValue($event)"
|
||||||
|
></app-input>
|
||||||
|
@if (getControlError('password'); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-actions mt-3">
|
||||||
|
<app-button type="button" variant="cancel" hostClass="action-btn" buttonClass="w-100" (click)="onCancel()">Cancelar</app-button>
|
||||||
|
<app-button type="submit" variant="primary" hostClass="action-btn" buttonClass="w-100" [disabled]="isSubmitting()">Guardar</app-button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
.profile-form {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 16px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
.form-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
margin-top: 16px;
|
||||||
|
}
|
||||||
|
.action-btn {
|
||||||
|
flex: 1;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
@@ -0,0 +1,105 @@
|
|||||||
|
import { Component, inject, effect, signal, OnInit } from '@angular/core';
|
||||||
|
import { ReactiveFormsModule, FormBuilder, FormGroup, Validators } from '@angular/forms';
|
||||||
|
import { InputComponent } from '../../../../../../shared/components/input/input.component';
|
||||||
|
import { ButtonComponent } from '../../../../../../shared/components/button/button.component';
|
||||||
|
import { AuthService } from '../../../../../../core/services/auth/auth.service';
|
||||||
|
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-profile-form',
|
||||||
|
standalone: true,
|
||||||
|
imports: [ReactiveFormsModule, InputComponent, ButtonComponent],
|
||||||
|
templateUrl: './profile-form.html',
|
||||||
|
styleUrl: './profile-form.scss',
|
||||||
|
})
|
||||||
|
export class ProfileForm implements OnInit {
|
||||||
|
profileForm: FormGroup;
|
||||||
|
private authService = inject(AuthService);
|
||||||
|
private toastService = inject(ToastService);
|
||||||
|
isSubmitting = signal(false);
|
||||||
|
|
||||||
|
constructor(private fb: FormBuilder) {
|
||||||
|
this.profileForm = this.fb.group({
|
||||||
|
fullName: ['', [Validators.required, Validators.maxLength(255)]],
|
||||||
|
email: ['', [Validators.required, Validators.email, Validators.maxLength(255)]],
|
||||||
|
dni: ['', [Validators.pattern(/^[0-9]{7,8}$/)]],
|
||||||
|
phone: ['', [Validators.pattern(/^\+?[0-9\s\-]{10,20}$/)]],
|
||||||
|
password: ['', [Validators.pattern(/^(?=.*[a-z])(?=.*[A-Z])(?=.*[\W_]).{8,}$/)]]
|
||||||
|
});
|
||||||
|
|
||||||
|
effect(() => {
|
||||||
|
const user = this.authService.user();
|
||||||
|
if (user) {
|
||||||
|
this.profileForm.patchValue({
|
||||||
|
fullName: user.nombre_apellido,
|
||||||
|
email: user.email,
|
||||||
|
dni: user.dni || '',
|
||||||
|
phone: user.telefono || ''
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
// Refresh user data directly from the API to ensure consistency
|
||||||
|
this.authService.loadCurrentUser().subscribe();
|
||||||
|
}
|
||||||
|
|
||||||
|
getControlError(controlName: string): string | null {
|
||||||
|
const control = this.profileForm.get(controlName);
|
||||||
|
if (!control || !control.errors || (!control.touched && !this.isSubmitting())) return null;
|
||||||
|
|
||||||
|
if (control.errors['required']) return 'Este campo es obligatorio.';
|
||||||
|
if (control.errors['email']) return 'Ingresa un email válido.';
|
||||||
|
if (control.errors['maxlength']) return 'Excede el largo máximo.';
|
||||||
|
if (controlName === 'dni' && control.errors['pattern']) return 'DNI inválido (7-8 números).';
|
||||||
|
if (controlName === 'phone' && control.errors['pattern']) return 'Teléfono inválido.';
|
||||||
|
if (controlName === 'password' && control.errors['pattern']) return 'Debe contener mayúscula, minúscula, carácter especial y mínimo 8 caracteres.';
|
||||||
|
|
||||||
|
return 'Valor inválido.';
|
||||||
|
}
|
||||||
|
|
||||||
|
onSubmit() {
|
||||||
|
if (this.profileForm.invalid) {
|
||||||
|
this.profileForm.markAllAsTouched();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isSubmitting.set(true);
|
||||||
|
const formValue = this.profileForm.value;
|
||||||
|
const payload: any = {
|
||||||
|
nombre_apellido: formValue.fullName,
|
||||||
|
email: formValue.email,
|
||||||
|
};
|
||||||
|
if (formValue.dni) payload.dni = formValue.dni;
|
||||||
|
if (formValue.phone) payload.telefono = formValue.phone;
|
||||||
|
if (formValue.password) payload.password = formValue.password;
|
||||||
|
|
||||||
|
this.authService.updateProfile(payload).subscribe({
|
||||||
|
next: () => {
|
||||||
|
this.isSubmitting.set(false);
|
||||||
|
this.toastService.success('Perfil actualizado correctamente.');
|
||||||
|
},
|
||||||
|
error: (error: any) => {
|
||||||
|
this.isSubmitting.set(false);
|
||||||
|
const errorMessage = error.error?.message || 'Error al actualizar el perfil.';
|
||||||
|
this.toastService.danger(errorMessage);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
onCancel() {
|
||||||
|
const user = this.authService.user();
|
||||||
|
if (user) {
|
||||||
|
this.profileForm.reset({
|
||||||
|
fullName: user.nombre_apellido,
|
||||||
|
email: user.email,
|
||||||
|
dni: user.dni || '',
|
||||||
|
phone: user.telefono || '',
|
||||||
|
password: ''
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.profileForm.reset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
<article class="w-100 py-3 rounded-0 cart-item" [class.cart-item--without-image]="!item.imageUrl">
|
||||||
|
@if (item.imageUrl) {
|
||||||
|
<div class="position-relative overflow-hidden cart-item-media">
|
||||||
|
@if (item.discountPercentage) {
|
||||||
|
<span class="position-absolute top-0 start-0 z-1 rounded-0 cart-item-discount-badge"
|
||||||
|
>-{{ item.discountPercentage }}%</span
|
||||||
|
>
|
||||||
|
}
|
||||||
|
|
||||||
|
<img class="w-100 h-100 object-fit-cover d-block" [src]="item.imageUrl" [alt]="item.title" />
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="d-flex flex-column justify-content-between w-100 h-100 py-1 cart-item-content">
|
||||||
|
<div class="d-grid cart-item-top-row align-items-start">
|
||||||
|
<h3 class="m-0 text-uppercase fw-bold cart-item-product">{{ item.title }}</h3>
|
||||||
|
|
||||||
|
<div class="cart-item-prices">
|
||||||
|
@if (item.originalPrice) {
|
||||||
|
<span class="text-decoration-line-through cart-item-original-price"
|
||||||
|
>$ {{ item.originalPrice }}</span
|
||||||
|
>
|
||||||
|
}
|
||||||
|
<span class="fw-bold cart-item-discounted-price">$ {{ item.price }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (item.imageUrl) {
|
||||||
|
<div
|
||||||
|
class="d-grid cart-item-attributes"
|
||||||
|
[class.cart-item-attributes--quantity-only]="item.attributes.length === 0"
|
||||||
|
>
|
||||||
|
<div class="cart-item-attribute">
|
||||||
|
<span class="cart-item-attribute-label">Cantidad: </span>
|
||||||
|
<span class="fw-bold"
|
||||||
|
>{{ item.quantity }} unidad{{ item.quantity === 1 ? '' : 'es' }}</span
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@for (attribute of item.attributes; track attribute.label + attribute.value) {
|
||||||
|
<div class="cart-item-attribute">
|
||||||
|
<span class="cart-item-attribute-label">{{ attribute.label }}: </span>
|
||||||
|
<span class="fw-bold">{{ attribute.value }}</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (item.transferPrice) {
|
||||||
|
<div class="cart-item-transfer-price">
|
||||||
|
<span class="cart-item-price-label">Precio por transferencia</span>
|
||||||
|
<span class="fw-bold">${{ item.transferPrice }}</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
} @else {
|
||||||
|
<p class="m-0 cart-item-description">{{ item.description }}</p>
|
||||||
|
|
||||||
|
<div class="d-grid cart-item-bottom-details">
|
||||||
|
@for (attribute of item.attributes; track attribute.label + attribute.value) {
|
||||||
|
<div class="cart-item-attribute">
|
||||||
|
<span class="cart-item-attribute-label">{{ attribute.label }}: </span>
|
||||||
|
<span class="fw-bold">{{ attribute.value }}</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="cart-item-attribute">
|
||||||
|
<span class="cart-item-attribute-label">Cantidad: </span>
|
||||||
|
<span class="fw-bold"
|
||||||
|
>{{ item.quantity }} unidad{{ item.quantity === 1 ? '' : 'es' }}</span
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
@@ -0,0 +1,129 @@
|
|||||||
|
:host {
|
||||||
|
display: block;
|
||||||
|
border-bottom: 1px solid #dddddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
:host(:last-child) {
|
||||||
|
border-bottom: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 120px minmax(0, 1fr);
|
||||||
|
gap: 0.75rem;
|
||||||
|
background-color: transparent;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
&--without-image {
|
||||||
|
grid-template-columns: minmax(0, 1fr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-media {
|
||||||
|
width: 120px;
|
||||||
|
aspect-ratio: 4 / 3;
|
||||||
|
border-radius: 5px 0 0 5px;
|
||||||
|
background-color: #ffffff;
|
||||||
|
border: 1px solid #eaeaea;
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
|
img {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
object-fit: cover;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-discount-badge {
|
||||||
|
width: 44px;
|
||||||
|
height: 22px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-bottom-right-radius: 4px;
|
||||||
|
background-color: var(--bs-primary, #5b75ff);
|
||||||
|
color: #ffffff;
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: 500;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-content {
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-top-row {
|
||||||
|
grid-template-columns: minmax(0, 1fr) auto;
|
||||||
|
gap: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-product {
|
||||||
|
color: #666666;
|
||||||
|
font-size: 10px;
|
||||||
|
line-height: 1.25;
|
||||||
|
font-weight: 325;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-prices {
|
||||||
|
display: grid;
|
||||||
|
justify-items: end;
|
||||||
|
line-height: 1.1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-original-price {
|
||||||
|
color: #a0a0a0;
|
||||||
|
font-size: 9px;
|
||||||
|
font-weight: 325;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-discounted-price {
|
||||||
|
color: var(--bs-primary, #5b75ff);
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-price-label {
|
||||||
|
color: #a0a0a0;
|
||||||
|
font-size: 9px;
|
||||||
|
font-weight: 325;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-attributes {
|
||||||
|
gap: 0.125rem;
|
||||||
|
|
||||||
|
&--quantity-only {
|
||||||
|
flex: 1;
|
||||||
|
align-content: center;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-attribute {
|
||||||
|
color: #666666;
|
||||||
|
font-size: 9px;
|
||||||
|
line-height: 1.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-attribute-label {
|
||||||
|
font-weight: 325;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-transfer-price {
|
||||||
|
color: #666666;
|
||||||
|
font-size: 9px;
|
||||||
|
line-height: 1.2;
|
||||||
|
display: grid;
|
||||||
|
justify-items: end;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-description {
|
||||||
|
color: #666666;
|
||||||
|
font-size: 9px;
|
||||||
|
font-weight: 325;
|
||||||
|
line-height: 1.35;
|
||||||
|
white-space: pre-line;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cart-item-bottom-details {
|
||||||
|
gap: 0.125rem;
|
||||||
|
justify-items: end;
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { beforeEach, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import { PurchaseItem, PurchaseItemViewModel } from './purchase-item';
|
||||||
|
|
||||||
|
describe('PurchaseItem', () => {
|
||||||
|
let fixture: ComponentFixture<PurchaseItem>;
|
||||||
|
|
||||||
|
const item: PurchaseItemViewModel = {
|
||||||
|
id: 1,
|
||||||
|
title: 'Entrada general',
|
||||||
|
description: 'Acceso al evento durante toda la jornada.',
|
||||||
|
imageUrl: null,
|
||||||
|
quantity: 2,
|
||||||
|
attributes: [{ label: 'Turno', value: 'Tarde' }],
|
||||||
|
price: '20000.00',
|
||||||
|
transferPrice: '18000.00',
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({ imports: [PurchaseItem] }).compileComponents();
|
||||||
|
fixture = TestBed.createComponent(PurchaseItem);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses the image-free layout and moves description and item details', () => {
|
||||||
|
fixture.componentInstance.item = item;
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
|
|
||||||
|
expect(
|
||||||
|
element.querySelector('.cart-item')?.classList.contains('cart-item--without-image'),
|
||||||
|
).toBe(true);
|
||||||
|
expect(element.querySelector('.cart-item-media')).toBeNull();
|
||||||
|
expect(element.querySelector('.cart-item-description')?.textContent?.trim()).toBe(
|
||||||
|
item.description,
|
||||||
|
);
|
||||||
|
expect(element.querySelector('.cart-item-bottom-details')?.textContent).toContain(
|
||||||
|
'Turno: Tarde',
|
||||||
|
);
|
||||||
|
expect(element.querySelector('.cart-item-bottom-details')?.textContent).toContain(
|
||||||
|
'Cantidad: 2 unidades',
|
||||||
|
);
|
||||||
|
expect(element.querySelector('.cart-item-transfer-price')).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the existing layout when the product has an image', () => {
|
||||||
|
fixture.componentInstance.item = {
|
||||||
|
...item,
|
||||||
|
imageUrl: 'https://example.com/product.png',
|
||||||
|
};
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
|
|
||||||
|
expect(
|
||||||
|
element.querySelector('.cart-item')?.classList.contains('cart-item--without-image'),
|
||||||
|
).toBe(false);
|
||||||
|
expect(element.querySelector('.cart-item-media img')).not.toBeNull();
|
||||||
|
expect(element.querySelector('.cart-item-description')).toBeNull();
|
||||||
|
expect(element.querySelector('.cart-item-attributes')?.textContent).toContain(
|
||||||
|
'Cantidad: 2 unidades',
|
||||||
|
);
|
||||||
|
expect(element.querySelector('.cart-item-transfer-price')?.textContent).toContain(
|
||||||
|
'Precio por transferencia',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import { Component, Input } from '@angular/core';
|
||||||
|
|
||||||
|
export type PurchaseItemViewModel = {
|
||||||
|
id: number;
|
||||||
|
title: string;
|
||||||
|
description: string | null;
|
||||||
|
imageUrl: string | null;
|
||||||
|
quantity: number;
|
||||||
|
attributes: Array<{
|
||||||
|
label: string;
|
||||||
|
value: string | null;
|
||||||
|
}>;
|
||||||
|
price: string;
|
||||||
|
originalPrice?: string | null;
|
||||||
|
transferPrice?: string | null;
|
||||||
|
discountPercentage?: string | number | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-purchase-item',
|
||||||
|
standalone: true,
|
||||||
|
imports: [],
|
||||||
|
templateUrl: './purchase-item.html',
|
||||||
|
styleUrl: './purchase-item.scss',
|
||||||
|
})
|
||||||
|
export class PurchaseItem {
|
||||||
|
@Input() item!: PurchaseItemViewModel;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<div class="purchase-item" [routerLink]="[purchase.id]" style="cursor: pointer;">
|
||||||
|
<div class="purchase-info">
|
||||||
|
<span class="purchase-id">Compra {{ purchase.id }}.</span>
|
||||||
|
<span class="purchase-date">Fecha de compra: {{ purchase.date }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="purchase-action">
|
||||||
|
<svg width="8" height="14" viewBox="0 0 8 14" fill="none" xmlns="http://www.w3.org/2000/svg" class="arrow-icon">
|
||||||
|
<path d="M1 1L7 7L1 13" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
.purchase-item {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
padding: 16px;
|
||||||
|
padding-left:0;
|
||||||
|
transition: box-shadow 0.2s, border-radius 0.2s;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
.purchase-item:hover {
|
||||||
|
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.07);
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
.purchase-item:hover .arrow-icon {
|
||||||
|
color: #5b75ff; /* Blue on hover */
|
||||||
|
}
|
||||||
|
.purchase-info {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 4px;
|
||||||
|
}
|
||||||
|
.purchase-id {
|
||||||
|
font-weight: bold;
|
||||||
|
color: #666666;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
.purchase-date {
|
||||||
|
font-weight: 325;
|
||||||
|
color: #666666;
|
||||||
|
font-size: 10px;
|
||||||
|
}
|
||||||
|
.arrow-icon {
|
||||||
|
width: 8px;
|
||||||
|
height: 14px;
|
||||||
|
color: #888;
|
||||||
|
transition: color 0.2s;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { Component, Input } from '@angular/core';
|
||||||
|
import { RouterLink } from '@angular/router';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-purchase-list-item',
|
||||||
|
standalone: true,
|
||||||
|
imports: [RouterLink],
|
||||||
|
templateUrl: './purchase-list-item.html',
|
||||||
|
styleUrl: './purchase-list-item.scss',
|
||||||
|
})
|
||||||
|
export class PurchaseListItem {
|
||||||
|
@Input() purchase!: { id: number; date: string };
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<div class="purchase-list-container">
|
||||||
|
<ng-container *ngIf="isLoading(); else contentTpl">
|
||||||
|
<!-- Skeleton -->
|
||||||
|
<div class="skeleton-item" *ngFor="let i of [1, 2, 3, 4]">
|
||||||
|
<div class="skeleton-info">
|
||||||
|
<div class="skeleton-id"></div>
|
||||||
|
<div class="skeleton-date"></div>
|
||||||
|
</div>
|
||||||
|
<div class="skeleton-action"></div>
|
||||||
|
</div>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-template #contentTpl>
|
||||||
|
<ng-container *ngIf="purchases().length > 0; else emptyTpl">
|
||||||
|
<ng-container *ngFor="let purchase of purchases(); let last = last">
|
||||||
|
<app-purchase-list-item
|
||||||
|
[purchase]="purchase">
|
||||||
|
</app-purchase-list-item>
|
||||||
|
<div class="purchase-divider" *ngIf="!last"></div>
|
||||||
|
</ng-container>
|
||||||
|
</ng-container>
|
||||||
|
</ng-template>
|
||||||
|
|
||||||
|
<ng-template #emptyTpl>
|
||||||
|
<div class="empty-state">
|
||||||
|
Aún no hay compras realizadas
|
||||||
|
</div>
|
||||||
|
</ng-template>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
.purchase-list-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.purchase-divider {
|
||||||
|
height: 1px;
|
||||||
|
background-color: #DDDDDD;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.empty-state {
|
||||||
|
padding: 2rem 0;
|
||||||
|
text-align: center;
|
||||||
|
color: #666;
|
||||||
|
font-size: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Skeleton */
|
||||||
|
.skeleton-item {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
padding: 1rem 0;
|
||||||
|
border-bottom: 1px solid #DDDDDD;
|
||||||
|
}
|
||||||
|
|
||||||
|
.skeleton-item:last-child {
|
||||||
|
border-bottom: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.skeleton-info {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.skeleton-id {
|
||||||
|
width: 100px;
|
||||||
|
height: 1rem;
|
||||||
|
background-color: #EEEEEE;
|
||||||
|
border-radius: 4px;
|
||||||
|
animation: pulse 1.5s infinite ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.skeleton-date {
|
||||||
|
width: 150px;
|
||||||
|
height: 0.8rem;
|
||||||
|
background-color: #EEEEEE;
|
||||||
|
border-radius: 4px;
|
||||||
|
animation: pulse 1.5s infinite ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.skeleton-action {
|
||||||
|
width: 24px;
|
||||||
|
height: 24px;
|
||||||
|
background-color: #EEEEEE;
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: pulse 1.5s infinite ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes pulse {
|
||||||
|
0% {
|
||||||
|
background-color: #EEEEEE;
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
background-color: #E0E0E0;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
background-color: #EEEEEE;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
import { Component, OnInit, inject, signal } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { PurchaseListItem } from '../purchase-list-item/purchase-list-item';
|
||||||
|
import { CheckoutService, PurchaseSummaryResponse } from '../../../../../../core/services/checkout.service';
|
||||||
|
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||||
|
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||||
|
|
||||||
|
type PurchaseListViewModel = {
|
||||||
|
id: number;
|
||||||
|
date: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-purchase-list',
|
||||||
|
standalone: true,
|
||||||
|
imports: [CommonModule, PurchaseListItem],
|
||||||
|
templateUrl: './purchase-list.html',
|
||||||
|
styleUrl: './purchase-list.scss',
|
||||||
|
})
|
||||||
|
export class PurchaseList implements OnInit {
|
||||||
|
private readonly checkoutService = inject(CheckoutService);
|
||||||
|
private readonly toastService = inject(ToastService);
|
||||||
|
private readonly tenantService = inject(TenantService);
|
||||||
|
|
||||||
|
purchases = signal<PurchaseListViewModel[]>([]);
|
||||||
|
isLoading = signal<boolean>(true);
|
||||||
|
|
||||||
|
async ngOnInit(): Promise<void> {
|
||||||
|
try {
|
||||||
|
const tenantCode = this.tenantService.tenant()?.codigo || '';
|
||||||
|
|
||||||
|
const response = await this.checkoutService.getPurchases(tenantCode, 'paid');
|
||||||
|
const mappedPurchases = response.data.map((purchase: PurchaseSummaryResponse) => ({
|
||||||
|
id: purchase.id,
|
||||||
|
date: this.formatDate(purchase.created_at),
|
||||||
|
}));
|
||||||
|
this.purchases.set(mappedPurchases);
|
||||||
|
} catch (error) {
|
||||||
|
this.toastService.danger('Hubo un error al cargar las compras');
|
||||||
|
} finally {
|
||||||
|
this.isLoading.set(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private formatDate(value: string | null): string {
|
||||||
|
if (!value) {
|
||||||
|
return '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
const date = new Date(value);
|
||||||
|
|
||||||
|
if (Number.isNaN(date.getTime())) {
|
||||||
|
return '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Intl.DateTimeFormat('es-AR', {
|
||||||
|
day: '2-digit',
|
||||||
|
month: '2-digit',
|
||||||
|
year: 'numeric',
|
||||||
|
}).format(date);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<div class="page-container">
|
||||||
|
<h2 class="page-title">DATOS PERSONALES</h2>
|
||||||
|
<app-profile-form></app-profile-form>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
.page-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 600px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.page-title {
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #A0A0A0;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { ProfileForm } from '../../components/profile-form/profile-form';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-profile-page',
|
||||||
|
standalone: true,
|
||||||
|
imports: [ProfileForm],
|
||||||
|
templateUrl: './profile-page.html',
|
||||||
|
styleUrl: './profile-page.scss',
|
||||||
|
})
|
||||||
|
export class ProfilePage {}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
<div class="page-container">
|
||||||
|
<div class="d-flex align-items-center mb-4">
|
||||||
|
<a routerLink="../" class="text-decoration-none " >
|
||||||
|
<i class="bi bi-arrow-left fs-5"></i>
|
||||||
|
</a>
|
||||||
|
<h2 class="page-title m-0">MIS COMPRAS</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (isLoading()) {
|
||||||
|
<p class="purchase-loading">Cargando detalle de compra...</p>
|
||||||
|
} @else if (purchase(); as purchase) {
|
||||||
|
<div class="d-flex justify-content-between align-items-center mb-4 pb-3" style="border-bottom: 1px solid #dddddd;">
|
||||||
|
<div class="purchase-info">
|
||||||
|
<span class="purchase-id">Compra {{ purchase.id }}.</span>
|
||||||
|
<span class="purchase-date">Fecha de compra: {{ purchase.date }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="purchase-total ">
|
||||||
|
<span class="purchase-total-label">Total:</span>
|
||||||
|
<span class="purchase-total-value">${{ purchase.total }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p style="font-size: 12px; color: #666666; margin:0;">Productos:</p>
|
||||||
|
|
||||||
|
<div class="d-flex flex-column">
|
||||||
|
@for (item of purchase.items; track item.id) {
|
||||||
|
<app-purchase-item [item]="item"></app-purchase-item>
|
||||||
|
} @empty {
|
||||||
|
<p class="purchase-empty">No hay productos para mostrar en esta compra.</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.page-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 600px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.page-title {
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #A0A0A0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.purchase-info {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 4px;
|
||||||
|
}
|
||||||
|
.purchase-id {
|
||||||
|
font-weight: bold;
|
||||||
|
color: #666666;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
.purchase-date {
|
||||||
|
font-weight: 325;
|
||||||
|
color: #666666;
|
||||||
|
font-size: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.purchase-total {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
.purchase-total-label {
|
||||||
|
font-size: 17px;
|
||||||
|
color: #666666;
|
||||||
|
font-weight: 325;
|
||||||
|
}
|
||||||
|
.purchase-total-value {
|
||||||
|
color: var(--bs-primary, #5b75ff);
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: 17px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.purchase-loading,
|
||||||
|
.purchase-empty {
|
||||||
|
color: #666666;
|
||||||
|
font-size: 12px;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { Component, OnInit, inject, signal } from '@angular/core';
|
||||||
|
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
|
||||||
|
|
||||||
|
import {
|
||||||
|
CheckoutService,
|
||||||
|
PurchaseDetailResponse,
|
||||||
|
} from '../../../../../../core/services/checkout.service';
|
||||||
|
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||||
|
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||||
|
import { PurchaseItem, PurchaseItemViewModel } from '../../components/purchase-item/purchase-item';
|
||||||
|
|
||||||
|
type PurchaseDetailViewModel = {
|
||||||
|
id: number;
|
||||||
|
date: string;
|
||||||
|
total: string;
|
||||||
|
items: PurchaseItemViewModel[];
|
||||||
|
};
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-purchase-detail-page',
|
||||||
|
standalone: true,
|
||||||
|
imports: [CommonModule, RouterLink, PurchaseItem],
|
||||||
|
templateUrl: './purchase-detail-page.html',
|
||||||
|
styleUrl: './purchase-detail-page.scss',
|
||||||
|
})
|
||||||
|
export class PurchaseDetailPage implements OnInit {
|
||||||
|
private readonly route = inject(ActivatedRoute);
|
||||||
|
private readonly router = inject(Router);
|
||||||
|
private readonly checkoutService = inject(CheckoutService);
|
||||||
|
private readonly tenantService = inject(TenantService);
|
||||||
|
private readonly toastService = inject(ToastService);
|
||||||
|
|
||||||
|
readonly isLoading = signal(true);
|
||||||
|
readonly purchase = signal<PurchaseDetailViewModel | null>(null);
|
||||||
|
|
||||||
|
async ngOnInit(): Promise<void> {
|
||||||
|
const purchaseId = this.route.snapshot.paramMap.get('id');
|
||||||
|
const tenant = this.tenantService.tenant();
|
||||||
|
|
||||||
|
if (!purchaseId || !tenant) {
|
||||||
|
void this.router.navigate(['/mi-cuenta/compras']);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
|
||||||
|
|
||||||
|
this.purchase.set({
|
||||||
|
id: response.id,
|
||||||
|
date: this.formatDate(response.created_at),
|
||||||
|
total: response.total,
|
||||||
|
items: this.mapItems(response),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to fetch purchase detail:', error);
|
||||||
|
this.toastService.danger('Hubo un error al cargar el detalle de la compra');
|
||||||
|
void this.router.navigate(['/mi-cuenta/compras']);
|
||||||
|
} finally {
|
||||||
|
this.isLoading.set(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private formatDate(value: string | null): string {
|
||||||
|
if (!value) {
|
||||||
|
return '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
const date = new Date(value);
|
||||||
|
|
||||||
|
if (Number.isNaN(date.getTime())) {
|
||||||
|
return '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Intl.DateTimeFormat('es-AR', {
|
||||||
|
day: '2-digit',
|
||||||
|
month: '2-digit',
|
||||||
|
year: 'numeric',
|
||||||
|
}).format(date);
|
||||||
|
}
|
||||||
|
|
||||||
|
private mapItems(purchase: PurchaseDetailResponse): PurchaseItemViewModel[] {
|
||||||
|
return purchase.items.map((item) => ({
|
||||||
|
id: item.id,
|
||||||
|
title: item.item_details.nombre || 'Producto sin nombre',
|
||||||
|
description: item.item_details.descripcion,
|
||||||
|
imageUrl: item.item_details.imagen,
|
||||||
|
quantity: item.quantity,
|
||||||
|
attributes: item.item_details.attributes.map((attribute) => ({
|
||||||
|
label: attribute.name,
|
||||||
|
value: attribute.value === null ? null : String(attribute.value),
|
||||||
|
})),
|
||||||
|
price: item.line_total,
|
||||||
|
originalPrice: null,
|
||||||
|
transferPrice: null,
|
||||||
|
discountPercentage: null,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<div class="page-container">
|
||||||
|
<h2 class="page-title">MIS COMPRAS</h2>
|
||||||
|
<app-purchase-list></app-purchase-list>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
.page-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 600px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.page-title {
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #A0A0A0;
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { PurchaseList } from '../../components/purchase-list/purchase-list';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-purchases-page',
|
||||||
|
standalone: true,
|
||||||
|
imports: [PurchaseList],
|
||||||
|
templateUrl: './purchases-page.html',
|
||||||
|
styleUrl: './purchases-page.scss',
|
||||||
|
})
|
||||||
|
export class PurchasesPage {}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
<article class="ticket" [class.ticket--disabled]="disabled()" [attr.aria-disabled]="disabled()">
|
||||||
|
@if (!disabled()) {
|
||||||
|
<label class="ticket__selection">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
[checked]="selected()"
|
||||||
|
(change)="selected.set($any($event.target).checked)"
|
||||||
|
/>
|
||||||
|
<span class="visually-hidden">Seleccionar ticket {{ title() }}</span>
|
||||||
|
</label>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="ticket__details">
|
||||||
|
<h3 class="ticket__title">{{ title() }}</h3>
|
||||||
|
<p class="ticket__id">ID: {{ ticketId() }}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (date() || expired()) {
|
||||||
|
<div class="ticket__status">
|
||||||
|
@if (expired()) {
|
||||||
|
<span class="ticket__expired">VENCIDO</span>
|
||||||
|
}
|
||||||
|
@if (date(); as ticketDate) {
|
||||||
|
<time class="ticket__date">{{ ticketDate }}</time>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="ticket__actions">
|
||||||
|
<app-button
|
||||||
|
variant="primary"
|
||||||
|
buttonClass="ticket__qr-button"
|
||||||
|
[disabled]="disabled()"
|
||||||
|
(click)="viewQr.emit()"
|
||||||
|
>
|
||||||
|
<i class="fa-solid fa-qrcode" aria-hidden="true"></i>
|
||||||
|
<span>Ver QR</span>
|
||||||
|
</app-button>
|
||||||
|
|
||||||
|
@if (!disabled()) {
|
||||||
|
<app-icon-button
|
||||||
|
variant="download"
|
||||||
|
ariaLabel="Descargar ticket"
|
||||||
|
(clicked)="download.emit()"
|
||||||
|
/>
|
||||||
|
<app-icon-button variant="share" ariaLabel="Compartir ticket" (clicked)="share.emit()" />
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
:host {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto minmax(0, 1fr) 78px auto;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
min-height: 76px;
|
||||||
|
gap: 16px;
|
||||||
|
padding: 16px 0;
|
||||||
|
color: #666666;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__selection {
|
||||||
|
display: flex;
|
||||||
|
margin: 0;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__selection input {
|
||||||
|
width: 21px;
|
||||||
|
height: 21px;
|
||||||
|
margin: 0;
|
||||||
|
accent-color: var(--tenant-primary, #009933);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__details {
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__title,
|
||||||
|
.ticket__id {
|
||||||
|
overflow: hidden;
|
||||||
|
margin: 0;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__title {
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.25;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__id {
|
||||||
|
margin-top: 3px;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__date {
|
||||||
|
display: block;
|
||||||
|
font-size: 10px;
|
||||||
|
line-height: 1.4;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__status {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__expired {
|
||||||
|
display: block;
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.4;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__actions {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:host ::ng-deep button.ticket__qr-button {
|
||||||
|
width: 115px;
|
||||||
|
min-width: 0;
|
||||||
|
max-width: 115px;
|
||||||
|
min-height: 36px;
|
||||||
|
padding-inline: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket--disabled {
|
||||||
|
grid-template-columns: minmax(0, 1fr) 78px auto;
|
||||||
|
color: #8a8a8a;
|
||||||
|
}
|
||||||
|
|
||||||
|
:host ::ng-deep .ticket--disabled button.ticket__qr-button:disabled {
|
||||||
|
--bs-btn-disabled-bg: #8a8a8a;
|
||||||
|
--bs-btn-disabled-border-color: #8a8a8a;
|
||||||
|
--bs-btn-disabled-color: #ffffff;
|
||||||
|
--bs-btn-disabled-opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__selection input:focus-visible {
|
||||||
|
outline: 2px solid var(--tenant-primary, #009933);
|
||||||
|
outline-offset: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 767.98px) {
|
||||||
|
.ticket {
|
||||||
|
grid-template-columns: auto minmax(0, 1fr) auto;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__status {
|
||||||
|
grid-column: 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket__actions {
|
||||||
|
grid-column: 3;
|
||||||
|
grid-row: 1 / span 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket--disabled {
|
||||||
|
grid-template-columns: minmax(0, 1fr) auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket--disabled .ticket__status {
|
||||||
|
grid-column: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ticket--disabled .ticket__actions {
|
||||||
|
grid-column: 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import { TicketComponent } from './ticket.component';
|
||||||
|
|
||||||
|
describe('TicketComponent', () => {
|
||||||
|
it('renders its data and emits its actions', async () => {
|
||||||
|
await TestBed.configureTestingModule({ imports: [TicketComponent] }).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(TicketComponent);
|
||||||
|
fixture.componentRef.setInput('title', 'ENTRADA GENERAL');
|
||||||
|
fixture.componentRef.setInput('ticketId', '0000000000');
|
||||||
|
fixture.componentRef.setInput('date', '09 de octubre');
|
||||||
|
|
||||||
|
const viewQr = vi.fn();
|
||||||
|
const download = vi.fn();
|
||||||
|
const share = vi.fn();
|
||||||
|
fixture.componentInstance.viewQr.subscribe(viewQr);
|
||||||
|
fixture.componentInstance.download.subscribe(download);
|
||||||
|
fixture.componentInstance.share.subscribe(share);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
|
expect(element.textContent).toContain('ENTRADA GENERAL');
|
||||||
|
expect(element.textContent).toContain('ID: 0000000000');
|
||||||
|
|
||||||
|
element.querySelector<HTMLButtonElement>('app-button button')?.click();
|
||||||
|
element.querySelector<HTMLButtonElement>('[aria-label="Descargar ticket"]')?.click();
|
||||||
|
element.querySelector<HTMLButtonElement>('[aria-label="Compartir ticket"]')?.click();
|
||||||
|
|
||||||
|
expect(viewQr).toHaveBeenCalledOnce();
|
||||||
|
expect(download).toHaveBeenCalledOnce();
|
||||||
|
expect(share).toHaveBeenCalledOnce();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders the expired disabled state without secondary actions', async () => {
|
||||||
|
await TestBed.configureTestingModule({ imports: [TicketComponent] }).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(TicketComponent);
|
||||||
|
fixture.componentRef.setInput('ticketId', '0000000000');
|
||||||
|
fixture.componentRef.setInput('date', '09 de octubre');
|
||||||
|
fixture.componentRef.setInput('disabled', true);
|
||||||
|
fixture.componentRef.setInput('expired', true);
|
||||||
|
|
||||||
|
const viewQr = vi.fn();
|
||||||
|
fixture.componentInstance.viewQr.subscribe(viewQr);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
|
const ticket = element.querySelector<HTMLElement>('.ticket');
|
||||||
|
const qrButton = element.querySelector<HTMLButtonElement>('app-button button');
|
||||||
|
|
||||||
|
expect(ticket?.classList.contains('ticket--disabled')).toBe(true);
|
||||||
|
expect(ticket?.getAttribute('aria-disabled')).toBe('true');
|
||||||
|
expect(element.textContent).toContain('VENCIDO');
|
||||||
|
expect(qrButton?.disabled).toBe(true);
|
||||||
|
expect(element.querySelector('[aria-label="Descargar ticket"]')).toBeNull();
|
||||||
|
expect(element.querySelector('[aria-label="Compartir ticket"]')).toBeNull();
|
||||||
|
expect(element.querySelector('input[type="checkbox"]')).toBeNull();
|
||||||
|
|
||||||
|
qrButton?.click();
|
||||||
|
expect(viewQr).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, input, model, output } from '@angular/core';
|
||||||
|
|
||||||
|
import { ButtonComponent } from '../../../../../../../../shared/components/button/button.component';
|
||||||
|
import { IconButtonComponent } from '../../../../../../../../shared/components/icon-button/icon-button.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-ticket',
|
||||||
|
imports: [ButtonComponent, IconButtonComponent],
|
||||||
|
templateUrl: './ticket.component.html',
|
||||||
|
styleUrl: './ticket.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class TicketComponent {
|
||||||
|
readonly title = input('ENTRADA GENERAL');
|
||||||
|
readonly ticketId = input.required<string | number>();
|
||||||
|
readonly date = input<string | null>(null);
|
||||||
|
readonly disabled = input(false);
|
||||||
|
readonly expired = input(false);
|
||||||
|
readonly selected = model(false);
|
||||||
|
|
||||||
|
readonly viewQr = output<void>();
|
||||||
|
readonly download = output<void>();
|
||||||
|
readonly share = output<void>();
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
import { HttpClient } from '@angular/common/http';
|
||||||
|
import { inject, Injectable } from '@angular/core';
|
||||||
|
import { firstValueFrom } from 'rxjs';
|
||||||
|
|
||||||
|
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||||
|
|
||||||
|
export interface TicketResponse {
|
||||||
|
id: number;
|
||||||
|
tenant_code: string;
|
||||||
|
ticket: string;
|
||||||
|
name: string;
|
||||||
|
description: string | null;
|
||||||
|
source_catalog_item_id: number | null;
|
||||||
|
source_variant_id: number | null;
|
||||||
|
starts_at: string | null;
|
||||||
|
expires_at: string | null;
|
||||||
|
used_at: string | null;
|
||||||
|
is_valid: boolean;
|
||||||
|
is_expired: boolean;
|
||||||
|
is_used: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class TicketService {
|
||||||
|
private readonly http = inject(HttpClient);
|
||||||
|
private readonly tenantService = inject(TenantService);
|
||||||
|
|
||||||
|
getTickets(): Promise<TicketResponse[]> {
|
||||||
|
return firstValueFrom(
|
||||||
|
this.http.get<{ data: TicketResponse[] }>(`${this.tenantService.getTenantApiUrl()}/tickets`),
|
||||||
|
).then((response) => response.data ?? []);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
<section class="tickets-page">
|
||||||
|
<h1 class="tickets-page__title">MIS TICKETS</h1>
|
||||||
|
|
||||||
|
<div class="tickets-list" aria-busy="{{ isLoading() }}">
|
||||||
|
<header class="tickets-list__header">
|
||||||
|
<label class="tickets-list__select-all">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
[checked]="allSelected()"
|
||||||
|
[disabled]="activeTickets().length === 0"
|
||||||
|
(change)="toggleAll($any($event.target).checked)"
|
||||||
|
/>
|
||||||
|
<span>TICKETS ACTIVOS</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="tickets-list__bulk-actions">
|
||||||
|
<span class="tickets-list__bulk-action">
|
||||||
|
<app-icon-button variant="download" ariaLabel="Descargar tickets seleccionados" />
|
||||||
|
<small>Descargar</small>
|
||||||
|
</span>
|
||||||
|
<span class="tickets-list__bulk-action">
|
||||||
|
<app-icon-button variant="share" ariaLabel="Compartir tickets seleccionados" />
|
||||||
|
<small>Compartir</small>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
@if (isLoading()) {
|
||||||
|
@for (item of [1, 2, 3, 4]; track item) {
|
||||||
|
<div class="tickets-list__skeleton" aria-hidden="true"></div>
|
||||||
|
}
|
||||||
|
} @else if (tickets().length) {
|
||||||
|
@for (ticket of activeTickets(); track ticket.id) {
|
||||||
|
<app-ticket
|
||||||
|
[title]="ticket.name"
|
||||||
|
[ticketId]="ticket.id"
|
||||||
|
[date]="formatDate(ticket)"
|
||||||
|
[selected]="isSelected(ticket.id)"
|
||||||
|
(selectedChange)="toggleTicket(ticket.id, $event)"
|
||||||
|
(viewQr)="viewQr(ticket)"
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (inactiveTickets().length) {
|
||||||
|
<section class="tickets-list__inactive" aria-labelledby="inactive-tickets-title">
|
||||||
|
<header class="tickets-list__header tickets-list__header--inactive">
|
||||||
|
<h2 id="inactive-tickets-title">TICKETS INACTIVOS</h2>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
@for (ticket of inactiveTickets(); track ticket.id) {
|
||||||
|
<app-ticket
|
||||||
|
[title]="ticket.name"
|
||||||
|
[ticketId]="ticket.id"
|
||||||
|
[date]="formatDate(ticket)"
|
||||||
|
[disabled]="true"
|
||||||
|
[expired]="ticket.is_expired"
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
</section>
|
||||||
|
}
|
||||||
|
} @else {
|
||||||
|
<p class="tickets-list__empty">Aún no tenés tickets disponibles.</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
.tickets-page {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 720px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-page__title {
|
||||||
|
margin: 0 0 20px;
|
||||||
|
color: #a0a0a0;
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__header {
|
||||||
|
display: flex;
|
||||||
|
min-height: 58px;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding-bottom: 12px;
|
||||||
|
border-bottom: 1px solid #dddddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__header--inactive {
|
||||||
|
justify-content: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__header--inactive h2 {
|
||||||
|
margin: 0;
|
||||||
|
color: #a0a0a0;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__inactive {
|
||||||
|
margin-top: 44px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__select-all {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 16px;
|
||||||
|
margin: 0;
|
||||||
|
color: #a0a0a0;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__select-all input {
|
||||||
|
width: 21px;
|
||||||
|
height: 21px;
|
||||||
|
margin: 0;
|
||||||
|
accent-color: var(--tenant-primary, #009933);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__bulk-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__bulk-action {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
color: #a0a0a0;
|
||||||
|
font-size: 11px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list app-ticket {
|
||||||
|
border-bottom: 1px solid #dddddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__empty {
|
||||||
|
padding: 32px 0;
|
||||||
|
color: #666666;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tickets-list__skeleton {
|
||||||
|
height: 77px;
|
||||||
|
border-bottom: 1px solid #dddddd;
|
||||||
|
background: linear-gradient(90deg, transparent, #f3f3f3, transparent);
|
||||||
|
background-size: 200% 100%;
|
||||||
|
animation: loading 1.4s infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes loading {
|
||||||
|
to {
|
||||||
|
background-position: -200% 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 767.98px) {
|
||||||
|
.tickets-page__title {
|
||||||
|
margin-top: 24px;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
import { By } from '@angular/platform-browser';
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||||
|
import { ModalService } from '../../../../../../core/services/modal.service';
|
||||||
|
import { TicketComponent } from './components/ticket/ticket.component';
|
||||||
|
import { TicketResponse, TicketService } from './ticket.service';
|
||||||
|
import { TicketsPage } from './tickets-page';
|
||||||
|
|
||||||
|
const ticket = (overrides: Partial<TicketResponse>): TicketResponse => ({
|
||||||
|
id: 1,
|
||||||
|
tenant_code: 'tenant',
|
||||||
|
ticket: 'ticket-1',
|
||||||
|
name: 'Entrada general',
|
||||||
|
description: null,
|
||||||
|
source_catalog_item_id: null,
|
||||||
|
source_variant_id: null,
|
||||||
|
starts_at: '2026-10-09T00:00:00.000Z',
|
||||||
|
expires_at: null,
|
||||||
|
used_at: null,
|
||||||
|
is_valid: true,
|
||||||
|
is_expired: false,
|
||||||
|
is_used: false,
|
||||||
|
...overrides,
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('TicketsPage', () => {
|
||||||
|
it('separates expired and used tickets into the disabled inactive list', async () => {
|
||||||
|
const tickets = [
|
||||||
|
ticket({ id: 1 }),
|
||||||
|
ticket({ id: 2, is_valid: false, is_expired: true }),
|
||||||
|
ticket({ id: 3, is_valid: false, is_used: true, used_at: '2026-10-10T00:00:00.000Z' }),
|
||||||
|
];
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [TicketsPage],
|
||||||
|
providers: [{ provide: ToastService, useValue: { danger: vi.fn() } }],
|
||||||
|
})
|
||||||
|
.overrideComponent(TicketsPage, {
|
||||||
|
set: {
|
||||||
|
providers: [
|
||||||
|
{ provide: TicketService, useValue: { getTickets: () => Promise.resolve(tickets) } },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(TicketsPage);
|
||||||
|
fixture.detectChanges();
|
||||||
|
await fixture.whenStable();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const ticketComponents = fixture.debugElement.queryAll(By.directive(TicketComponent));
|
||||||
|
const [activeTicket, expiredTicket, usedTicket] = ticketComponents.map(
|
||||||
|
(element) => element.componentInstance as TicketComponent,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(ticketComponents).toHaveLength(3);
|
||||||
|
expect(activeTicket.disabled()).toBe(false);
|
||||||
|
expect(expiredTicket.disabled()).toBe(true);
|
||||||
|
expect(expiredTicket.expired()).toBe(true);
|
||||||
|
expect(usedTicket.disabled()).toBe(true);
|
||||||
|
expect(usedTicket.expired()).toBe(false);
|
||||||
|
expect(fixture.nativeElement.textContent).toContain('TICKETS INACTIVOS');
|
||||||
|
|
||||||
|
const page = fixture.nativeElement as HTMLElement;
|
||||||
|
const inactiveElements = Array.from(
|
||||||
|
page.querySelectorAll<HTMLElement>('.tickets-list__inactive app-ticket'),
|
||||||
|
);
|
||||||
|
expect(inactiveElements).toHaveLength(2);
|
||||||
|
inactiveElements.forEach((element) => {
|
||||||
|
expect(element.querySelector('.ticket--disabled')).not.toBeNull();
|
||||||
|
expect(element.querySelector<HTMLButtonElement>('app-button button')?.disabled).toBe(true);
|
||||||
|
expect(element.querySelector('input[type="checkbox"]')).toBeNull();
|
||||||
|
expect(element.querySelector('[aria-label="Descargar ticket"]')).toBeNull();
|
||||||
|
expect(element.querySelector('[aria-label="Compartir ticket"]')).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('opens the QR modal with the selected ticket data', async () => {
|
||||||
|
const modalService = { openQr: vi.fn() };
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [TicketsPage],
|
||||||
|
providers: [
|
||||||
|
{ provide: ToastService, useValue: { danger: vi.fn() } },
|
||||||
|
{ provide: ModalService, useValue: modalService },
|
||||||
|
],
|
||||||
|
})
|
||||||
|
.overrideComponent(TicketsPage, {
|
||||||
|
set: {
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: TicketService,
|
||||||
|
useValue: { getTickets: () => Promise.resolve([ticket({})]) },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(TicketsPage);
|
||||||
|
fixture.detectChanges();
|
||||||
|
await fixture.whenStable();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const page = fixture.nativeElement as HTMLElement;
|
||||||
|
page.querySelector<HTMLButtonElement>('app-ticket app-button button')?.click();
|
||||||
|
|
||||||
|
expect(modalService.openQr).toHaveBeenCalledWith({
|
||||||
|
title: 'Entrada general',
|
||||||
|
id: 1,
|
||||||
|
date: '09-octubre',
|
||||||
|
ticket: 'ticket-1',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
import { Component, computed, inject, OnInit, signal } from '@angular/core';
|
||||||
|
|
||||||
|
import { ModalService } from '../../../../../../core/services/modal.service';
|
||||||
|
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||||
|
import { IconButtonComponent } from '../../../../../../shared/components/icon-button/icon-button.component';
|
||||||
|
import { TicketComponent } from './components/ticket/ticket.component';
|
||||||
|
import { TicketResponse, TicketService } from './ticket.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-tickets-page',
|
||||||
|
imports: [IconButtonComponent, TicketComponent],
|
||||||
|
providers: [TicketService],
|
||||||
|
templateUrl: './tickets-page.html',
|
||||||
|
styleUrl: './tickets-page.scss',
|
||||||
|
})
|
||||||
|
export class TicketsPage implements OnInit {
|
||||||
|
private readonly ticketService = inject(TicketService);
|
||||||
|
private readonly toastService = inject(ToastService);
|
||||||
|
private readonly modalService = inject(ModalService);
|
||||||
|
|
||||||
|
protected readonly tickets = signal<TicketResponse[]>([]);
|
||||||
|
protected readonly activeTickets = computed(() =>
|
||||||
|
this.tickets().filter((ticket) => !this.isInactive(ticket)),
|
||||||
|
);
|
||||||
|
protected readonly inactiveTickets = computed(() =>
|
||||||
|
this.tickets().filter((ticket) => this.isInactive(ticket)),
|
||||||
|
);
|
||||||
|
protected readonly selectedIds = signal<Set<number>>(new Set());
|
||||||
|
protected readonly isLoading = signal(true);
|
||||||
|
protected readonly allSelected = computed(
|
||||||
|
() =>
|
||||||
|
this.activeTickets().length > 0 && this.selectedIds().size === this.activeTickets().length,
|
||||||
|
);
|
||||||
|
|
||||||
|
async ngOnInit(): Promise<void> {
|
||||||
|
try {
|
||||||
|
this.tickets.set(await this.ticketService.getTickets());
|
||||||
|
} catch {
|
||||||
|
this.toastService.danger('Hubo un error al cargar los tickets');
|
||||||
|
} finally {
|
||||||
|
this.isLoading.set(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected toggleAll(selected: boolean): void {
|
||||||
|
this.selectedIds.set(
|
||||||
|
selected ? new Set(this.activeTickets().map((ticket) => ticket.id)) : new Set(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected toggleTicket(ticketId: number, selected: boolean): void {
|
||||||
|
this.selectedIds.update((current) => {
|
||||||
|
const next = new Set(current);
|
||||||
|
selected ? next.add(ticketId) : next.delete(ticketId);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected isSelected(ticketId: number): boolean {
|
||||||
|
return this.selectedIds().has(ticketId);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected isInactive(ticket: TicketResponse): boolean {
|
||||||
|
return ticket.is_expired || ticket.is_used;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected formatDate(ticket: TicketResponse): string | null {
|
||||||
|
const value = ticket.starts_at ?? ticket.expires_at;
|
||||||
|
if (!value) return null;
|
||||||
|
|
||||||
|
const date = new Date(value);
|
||||||
|
if (Number.isNaN(date.getTime())) return null;
|
||||||
|
|
||||||
|
return new Intl.DateTimeFormat('es-AR', {
|
||||||
|
day: '2-digit',
|
||||||
|
month: 'long',
|
||||||
|
timeZone: 'UTC',
|
||||||
|
}).format(date);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected viewQr(ticket: TicketResponse): void {
|
||||||
|
this.modalService.openQr({
|
||||||
|
title: ticket.name,
|
||||||
|
id: ticket.id,
|
||||||
|
date: this.formatDate(ticket) ?? '',
|
||||||
|
ticket: ticket.ticket,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
<form
|
||||||
|
class="checkout-form"
|
||||||
|
novalidate
|
||||||
|
[formGroup]="form()"
|
||||||
|
(ngSubmit)="submit()"
|
||||||
|
>
|
||||||
|
<div class="checkout-form__fields">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="checkout-nombre">
|
||||||
|
Nombre y Apellido <span class="required" aria-hidden="true">*</span>
|
||||||
|
</label>
|
||||||
|
<app-input
|
||||||
|
id="checkout-nombre"
|
||||||
|
type="text"
|
||||||
|
[value]="form().controls.nombre.value"
|
||||||
|
[invalid]="showControlError('nombre')"
|
||||||
|
[disabled]="form().controls.nombre.disabled"
|
||||||
|
(valueChange)="updateField('nombre', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('nombre'); as errorMessage) {
|
||||||
|
<small class="error">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="checkout-email">
|
||||||
|
Email <span class="required" aria-hidden="true">*</span>
|
||||||
|
</label>
|
||||||
|
<app-input
|
||||||
|
id="checkout-email"
|
||||||
|
type="email"
|
||||||
|
[value]="form().controls.email.value"
|
||||||
|
[invalid]="showControlError('email')"
|
||||||
|
[disabled]="form().controls.email.disabled"
|
||||||
|
(valueChange)="updateField('email', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('email'); as errorMessage) {
|
||||||
|
<small class="error">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="checkout-dni">
|
||||||
|
DNI <span class="required" aria-hidden="true">*</span>
|
||||||
|
</label>
|
||||||
|
<app-input
|
||||||
|
id="checkout-dni"
|
||||||
|
type="text"
|
||||||
|
[value]="form().controls.dni.value"
|
||||||
|
[invalid]="showControlError('dni')"
|
||||||
|
[disabled]="form().controls.dni.disabled"
|
||||||
|
(valueChange)="updateField('dni', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('dni'); as errorMessage) {
|
||||||
|
<small class="error">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="checkout-telefono">
|
||||||
|
Telefono <span class="required" aria-hidden="true">*</span>
|
||||||
|
</label>
|
||||||
|
<app-input
|
||||||
|
id="checkout-telefono"
|
||||||
|
type="text"
|
||||||
|
[value]="form().controls.telefono.value"
|
||||||
|
[invalid]="showControlError('telefono')"
|
||||||
|
[disabled]="form().controls.telefono.disabled"
|
||||||
|
(valueChange)="updateField('telefono', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('telefono'); as errorMessage) {
|
||||||
|
<small class="error">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="checkout-form__actions">
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="cancel"
|
||||||
|
hostClass="checkout-form__action-btn"
|
||||||
|
buttonClass="w-100"
|
||||||
|
(click)="cancelStep.emit()"
|
||||||
|
>
|
||||||
|
Cancelar
|
||||||
|
</app-button>
|
||||||
|
<app-button
|
||||||
|
type="submit"
|
||||||
|
hostClass="checkout-form__action-btn"
|
||||||
|
buttonClass="w-100"
|
||||||
|
>
|
||||||
|
Continuar
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
.checkout-form {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 1.5rem;
|
||||||
|
|
||||||
|
&__fields {
|
||||||
|
display: grid;
|
||||||
|
gap: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__actions {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 1rem;
|
||||||
|
margin-top: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__action-btn {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
flex: 1 1 290px;
|
||||||
|
max-width: 290px;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
|
||||||
|
import { ReactiveFormsModule } from '@angular/forms';
|
||||||
|
|
||||||
|
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||||
|
import { InputComponent } from '../../../../shared/components/input/input.component';
|
||||||
|
import { CheckoutForm } from './checkout-page.models';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-checkout-data-step',
|
||||||
|
standalone: true,
|
||||||
|
imports: [ReactiveFormsModule, InputComponent, ButtonComponent],
|
||||||
|
templateUrl: './checkout-data-step.component.html',
|
||||||
|
styleUrl: './checkout-data-step.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
|
})
|
||||||
|
export class CheckoutDataStepComponent {
|
||||||
|
readonly form = input.required<CheckoutForm>();
|
||||||
|
readonly cancelStep = output<void>();
|
||||||
|
readonly continueStep = output<void>();
|
||||||
|
|
||||||
|
protected updateField(field: keyof CheckoutForm['controls'], value: string | number): void {
|
||||||
|
this.form().controls[field].setValue(String(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected showControlError(controlName: keyof CheckoutForm['controls']): boolean {
|
||||||
|
const control = this.form().controls[controlName];
|
||||||
|
return control.invalid && control.touched;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected getControlError(controlName: keyof CheckoutForm['controls']): string | null {
|
||||||
|
const control = this.form().controls[controlName];
|
||||||
|
if (!this.showControlError(controlName)) return null;
|
||||||
|
if (control.hasError('required')) return 'Este campo es obligatorio.';
|
||||||
|
if (control.hasError('email')) return 'Ingresa un email valido.';
|
||||||
|
return 'El valor ingresado no es valido.';
|
||||||
|
}
|
||||||
|
|
||||||
|
protected submit(): void {
|
||||||
|
const form = this.form();
|
||||||
|
if (form.invalid) {
|
||||||
|
form.markAllAsTouched();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.continueStep.emit();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
|
||||||
|
<div class="checkout-page">
|
||||||
|
<div class="checkout-page__stepper-col ">
|
||||||
|
<app-stepper #stepper>
|
||||||
|
<app-step label="Datos" [isValid]="isStep1Valid()">
|
||||||
|
<app-checkout-data-step
|
||||||
|
[form]="form"
|
||||||
|
(cancelStep)="onCancel()"
|
||||||
|
(continueStep)="onStep1Continue()"
|
||||||
|
/>
|
||||||
|
</app-step>
|
||||||
|
|
||||||
|
<app-step label="Pago">
|
||||||
|
<app-checkout-payment-step
|
||||||
|
[paymentMethods]="paymentMethods"
|
||||||
|
[selectedPaymentMethod]="selectedPaymentMethod()"
|
||||||
|
[copiedTransferField]="copiedTransferField()"
|
||||||
|
[transferAccount]="transferAccount()"
|
||||||
|
[transferDni]="transferDni()"
|
||||||
|
[isGeneratingIntent]="isPaymentLoading()"
|
||||||
|
[qrData]="qrData()"
|
||||||
|
[qrPaymentStatus]="qrPaymentStatus()"
|
||||||
|
[isCheckingQrPayment]="isCheckingQrPayment()"
|
||||||
|
[transferValidationStatus]="transferValidationStatus()"
|
||||||
|
(paymentMethodChange)="selectPaymentMethod($event)"
|
||||||
|
(copyTransferValue)="copyTransferValue($event.field, $event.value)"
|
||||||
|
(cancelStep)="onCancel()"
|
||||||
|
(generateTransferIntent)="generateTransferIntent($event)"
|
||||||
|
(complete)="onComplete()"
|
||||||
|
(retryQrPolling)="retryQrPolling()"
|
||||||
|
/>
|
||||||
|
</app-step>
|
||||||
|
</app-stepper>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="checkout-page__cart-col">
|
||||||
|
<app-cart
|
||||||
|
[items]="mappedCartItems()"
|
||||||
|
[subtotal]="cartSubtotal()"
|
||||||
|
[discount]="cartDiscount()"
|
||||||
|
[total]="cartTotal()"
|
||||||
|
backgroundColor="transparent"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
.checkout-page {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr) 420px;
|
||||||
|
gap: 4rem;
|
||||||
|
align-items: start;
|
||||||
|
|
||||||
|
@media (max-width: 900px) {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__stepper-col {
|
||||||
|
min-width: 0;
|
||||||
|
border-radius: 4px;
|
||||||
|
min-height: 420px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__cart-col {
|
||||||
|
|
||||||
|
max-height: 80vh;
|
||||||
|
overflow: hidden;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,200 @@
|
|||||||
|
import { signal } from '@angular/core';
|
||||||
|
import { getTestBed, TestBed } from '@angular/core/testing';
|
||||||
|
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
import { of } from 'rxjs';
|
||||||
|
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||||
|
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||||
|
import { CheckoutService } from '../../../../core/services/checkout.service';
|
||||||
|
import { TenantService } from '../../../../core/services/tenant.service';
|
||||||
|
import { CheckoutPageComponent } from './checkout-page.component';
|
||||||
|
|
||||||
|
describe('CheckoutPageComponent payment validation', () => {
|
||||||
|
let checkoutServiceStub: {
|
||||||
|
generatePaymentIntent: ReturnType<typeof vi.fn>;
|
||||||
|
getPurchase: ReturnType<typeof vi.fn>;
|
||||||
|
};
|
||||||
|
let cartServiceStub: {
|
||||||
|
cart: ReturnType<typeof signal>;
|
||||||
|
isUpdating: ReturnType<typeof signal<boolean>>;
|
||||||
|
loadCart: ReturnType<typeof vi.fn>;
|
||||||
|
clearCart: ReturnType<typeof vi.fn>;
|
||||||
|
};
|
||||||
|
let routerStub: { navigate: ReturnType<typeof vi.fn> };
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
try {
|
||||||
|
getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
|
||||||
|
} catch {
|
||||||
|
// Test environment may already be initialized by another setup entrypoint.
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
vi.useFakeTimers();
|
||||||
|
|
||||||
|
checkoutServiceStub = {
|
||||||
|
generatePaymentIntent: vi.fn().mockResolvedValue({
|
||||||
|
qr_data: { qr_code: 'qr-value' },
|
||||||
|
}),
|
||||||
|
getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
|
||||||
|
};
|
||||||
|
cartServiceStub = {
|
||||||
|
cart: signal({
|
||||||
|
id: 10,
|
||||||
|
tenant_codigo: 'tenant-test',
|
||||||
|
status: 'active',
|
||||||
|
items: [],
|
||||||
|
subtotal: '0.00',
|
||||||
|
}),
|
||||||
|
isUpdating: signal(false),
|
||||||
|
loadCart: vi.fn().mockReturnValue(of({})),
|
||||||
|
clearCart: vi.fn(),
|
||||||
|
};
|
||||||
|
cartServiceStub.clearCart.mockImplementation(() => {
|
||||||
|
cartServiceStub.cart.set({
|
||||||
|
id: null,
|
||||||
|
tenant_codigo: 'tenant-test',
|
||||||
|
status: 'active',
|
||||||
|
items: [],
|
||||||
|
subtotal: '0.00',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
routerStub = { navigate: vi.fn() };
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [CheckoutPageComponent],
|
||||||
|
providers: [
|
||||||
|
{ provide: CheckoutService, useValue: checkoutServiceStub },
|
||||||
|
{ provide: CartService, useValue: cartServiceStub },
|
||||||
|
{ provide: TenantService, useValue: { tenant: signal({ codigo: 'tenant-test' }) } },
|
||||||
|
{ provide: AuthService, useValue: { user: signal(null) } },
|
||||||
|
{ provide: Router, useValue: routerStub },
|
||||||
|
],
|
||||||
|
})
|
||||||
|
.overrideComponent(CheckoutPageComponent, { set: { template: '' } })
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.useRealTimers();
|
||||||
|
TestBed.resetTestingModule();
|
||||||
|
});
|
||||||
|
|
||||||
|
function createComponent(): any {
|
||||||
|
const fixture = TestBed.createComponent(CheckoutPageComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
fixture.componentInstance['createdPurchaseId'].set(25);
|
||||||
|
return { fixture, component: fixture.componentInstance as any };
|
||||||
|
}
|
||||||
|
|
||||||
|
it('polls QR after five seconds and navigates only when payment is paid', async () => {
|
||||||
|
checkoutServiceStub.getPurchase
|
||||||
|
.mockResolvedValueOnce({ status: 'pending_payment' })
|
||||||
|
.mockResolvedValueOnce({ status: 'paid' });
|
||||||
|
const { component } = createComponent();
|
||||||
|
|
||||||
|
await component.selectPaymentMethod('qr');
|
||||||
|
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
|
||||||
|
|
||||||
|
await vi.advanceTimersByTimeAsync(5_000);
|
||||||
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
|
||||||
|
expect(routerStub.navigate).not.toHaveBeenCalled();
|
||||||
|
|
||||||
|
await vi.advanceTimersByTimeAsync(5_000);
|
||||||
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(2);
|
||||||
|
expect(cartServiceStub.clearCart).toHaveBeenCalledOnce();
|
||||||
|
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
|
||||||
|
expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows the QR verification state while each status request is in progress', async () => {
|
||||||
|
let resolvePurchase!: (purchase: { status: string }) => void;
|
||||||
|
checkoutServiceStub.getPurchase.mockReturnValue(
|
||||||
|
new Promise((resolve) => {
|
||||||
|
resolvePurchase = resolve;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const { fixture, component } = createComponent();
|
||||||
|
|
||||||
|
const statusRequest = component.checkQrPayment(component.qrPollingRunId);
|
||||||
|
expect(component.isCheckingQrPayment()).toBe(true);
|
||||||
|
|
||||||
|
resolvePurchase({ status: 'pending_payment' });
|
||||||
|
await statusRequest;
|
||||||
|
expect(component.isCheckingQrPayment()).toBe(false);
|
||||||
|
fixture.destroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('stops QR polling after five minutes and can restart it', async () => {
|
||||||
|
const { component } = createComponent();
|
||||||
|
|
||||||
|
await component.selectPaymentMethod('qr');
|
||||||
|
await vi.advanceTimersByTimeAsync(300_000);
|
||||||
|
|
||||||
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(60);
|
||||||
|
expect(component.qrPaymentStatus()).toBe('timed_out');
|
||||||
|
|
||||||
|
component.retryQrPolling();
|
||||||
|
expect(component.qrPaymentStatus()).toBe('waiting');
|
||||||
|
await vi.advanceTimersByTimeAsync(5_000);
|
||||||
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(61);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('cancels QR polling when payment method changes or component is destroyed', async () => {
|
||||||
|
const first = createComponent();
|
||||||
|
await first.component.selectPaymentMethod('qr');
|
||||||
|
await first.component.selectPaymentMethod('transfer');
|
||||||
|
await vi.advanceTimersByTimeAsync(10_000);
|
||||||
|
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
|
||||||
|
|
||||||
|
const second = createComponent();
|
||||||
|
await second.component.selectPaymentMethod('qr');
|
||||||
|
second.fixture.destroy();
|
||||||
|
await vi.advanceTimersByTimeAsync(10_000);
|
||||||
|
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('checks a transfer once and redirects to purchase status while pending', async () => {
|
||||||
|
const { component } = createComponent();
|
||||||
|
component.selectedPaymentMethod.set('transfer');
|
||||||
|
|
||||||
|
await component.onComplete();
|
||||||
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
|
||||||
|
expect(component.transferValidationStatus()).toBe('pending');
|
||||||
|
expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
|
||||||
|
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
|
||||||
|
|
||||||
|
await vi.advanceTimersByTimeAsync(30_000);
|
||||||
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
|
||||||
|
|
||||||
|
await component.onComplete();
|
||||||
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('navigates after a transfer is confirmed as paid', async () => {
|
||||||
|
checkoutServiceStub.getPurchase.mockResolvedValue({ status: 'paid' });
|
||||||
|
const { component } = createComponent();
|
||||||
|
component.selectedPaymentMethod.set('transfer');
|
||||||
|
|
||||||
|
await component.onComplete();
|
||||||
|
|
||||||
|
expect(cartServiceStub.clearCart).toHaveBeenCalledOnce();
|
||||||
|
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows a retryable state when transfer validation fails', async () => {
|
||||||
|
vi.spyOn(console, 'error').mockImplementation(() => undefined);
|
||||||
|
checkoutServiceStub.getPurchase.mockRejectedValue(new Error('network error'));
|
||||||
|
const { component } = createComponent();
|
||||||
|
component.selectedPaymentMethod.set('transfer');
|
||||||
|
|
||||||
|
await component.onComplete();
|
||||||
|
|
||||||
|
expect(component.transferValidationStatus()).toBe('error');
|
||||||
|
expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
|
||||||
|
expect(routerStub.navigate).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,469 @@
|
|||||||
|
import {
|
||||||
|
ChangeDetectionStrategy,
|
||||||
|
Component,
|
||||||
|
computed,
|
||||||
|
effect,
|
||||||
|
inject,
|
||||||
|
OnDestroy,
|
||||||
|
OnInit,
|
||||||
|
signal,
|
||||||
|
untracked,
|
||||||
|
ViewChild,
|
||||||
|
} from '@angular/core';
|
||||||
|
import { FormBuilder, Validators } from '@angular/forms';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
import { startWith } from 'rxjs';
|
||||||
|
|
||||||
|
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||||
|
import { TenantService } from '../../../../core/services/tenant.service';
|
||||||
|
import { CheckoutService, CreatePurchasePayload } from '../../../../core/services/checkout.service';
|
||||||
|
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||||
|
import { BankAccount } from '../../../../core/services/tenant.interface';
|
||||||
|
import { CartItem } from '../../../../core/services/cart/cart.interface';
|
||||||
|
import { CartComponent, CartItemMock } from '../../../../shared/components/cart/cart.component';
|
||||||
|
import { StepComponent } from '../../../../shared/components/stepper/step.component';
|
||||||
|
import { StepperComponent } from '../../../../shared/components/stepper/stepper.component';
|
||||||
|
import { CheckoutDataStepComponent } from './checkout-data-step.component';
|
||||||
|
import { CheckoutPaymentStepComponent } from './checkout-payment-step.component';
|
||||||
|
import {
|
||||||
|
CheckoutForm,
|
||||||
|
PaymentMethod,
|
||||||
|
PaymentMethodOption,
|
||||||
|
QrPaymentStatus,
|
||||||
|
TransferAccount,
|
||||||
|
TransferField,
|
||||||
|
TransferValidationStatus,
|
||||||
|
} from './checkout-page.models';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-checkout-page',
|
||||||
|
standalone: true,
|
||||||
|
imports: [
|
||||||
|
CartComponent,
|
||||||
|
StepperComponent,
|
||||||
|
StepComponent,
|
||||||
|
CheckoutDataStepComponent,
|
||||||
|
CheckoutPaymentStepComponent,
|
||||||
|
],
|
||||||
|
templateUrl: './checkout-page.component.html',
|
||||||
|
styleUrl: './checkout-page.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||||
|
private readonly formBuilder = inject(FormBuilder);
|
||||||
|
private readonly cartService = inject(CartService);
|
||||||
|
private readonly router = inject(Router);
|
||||||
|
private readonly tenantService = inject(TenantService);
|
||||||
|
private readonly checkoutService = inject(CheckoutService);
|
||||||
|
private readonly authService = inject(AuthService);
|
||||||
|
private readonly qrPollingIntervalMs = 5_000;
|
||||||
|
private readonly qrPollingMaxAttempts = 60;
|
||||||
|
|
||||||
|
private qrPollingTimeoutId: ReturnType<typeof setTimeout> | null = null;
|
||||||
|
private qrPollingAttempts = 0;
|
||||||
|
private qrPollingRunId = 0;
|
||||||
|
private paymentMethodRequestId = 0;
|
||||||
|
private navigationStarted = false;
|
||||||
|
|
||||||
|
@ViewChild(StepperComponent) stepper!: StepperComponent;
|
||||||
|
|
||||||
|
protected readonly form: CheckoutForm = this.formBuilder.nonNullable.group({
|
||||||
|
nombre: ['', [Validators.required]],
|
||||||
|
email: ['', [Validators.required, Validators.email]],
|
||||||
|
dni: ['', [Validators.required]],
|
||||||
|
telefono: ['', [Validators.required]],
|
||||||
|
});
|
||||||
|
|
||||||
|
protected readonly cartSubtotal = computed(() => {
|
||||||
|
const cart = this.cartService.cart();
|
||||||
|
return cart ? parseFloat(cart.subtotal) : 0;
|
||||||
|
});
|
||||||
|
|
||||||
|
protected readonly cartDiscount = computed(() => 0);
|
||||||
|
|
||||||
|
protected readonly cartTotal = computed(() => this.cartSubtotal() - this.cartDiscount());
|
||||||
|
|
||||||
|
protected readonly mappedCartItems = computed<CartItemMock[]>(() => {
|
||||||
|
const cart = this.cartService.cart();
|
||||||
|
if (!cart || !cart.items) return [];
|
||||||
|
return cart.items.map((item) => this.mapCartItemToMock(item));
|
||||||
|
});
|
||||||
|
|
||||||
|
protected readonly isStep1Valid = signal(this.form.valid);
|
||||||
|
protected readonly paymentMethods: ReadonlyArray<PaymentMethodOption> = [
|
||||||
|
{ id: 'qr', label: 'QR' },
|
||||||
|
{ id: 'transfer', label: 'Transferencia' },
|
||||||
|
{ id: 'telepagos', label: 'TelePagos' },
|
||||||
|
];
|
||||||
|
protected readonly selectedPaymentMethod = signal<PaymentMethod>('qr');
|
||||||
|
protected readonly copiedTransferField = signal<TransferField | null>(null);
|
||||||
|
protected readonly transferAccount = signal<TransferAccount | null>(null);
|
||||||
|
protected readonly transferDni = signal<string>('');
|
||||||
|
|
||||||
|
protected readonly isCreatingPurchase = signal(false);
|
||||||
|
protected readonly createdPurchaseId = signal<number | null>(null);
|
||||||
|
protected readonly isGeneratingIntent = signal(false);
|
||||||
|
protected readonly isPaymentLoading = computed(
|
||||||
|
() => this.isGeneratingIntent() || this.cartService.isUpdating(),
|
||||||
|
);
|
||||||
|
protected readonly qrData = signal<string | null>(null);
|
||||||
|
protected readonly qrPaymentStatus = signal<QrPaymentStatus>('idle');
|
||||||
|
protected readonly isCheckingQrPayment = signal(false);
|
||||||
|
protected readonly transferValidationStatus = signal<TransferValidationStatus>('idle');
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
effect(() => {
|
||||||
|
// We only want to trigger the intent generation when the cart changes.
|
||||||
|
// So we track the cart, but untrack the other signals to prevent duplicate calls.
|
||||||
|
const cart = this.cartService.cart();
|
||||||
|
|
||||||
|
untracked(() => {
|
||||||
|
const purchaseId = this.createdPurchaseId();
|
||||||
|
if (cart && purchaseId && !this.navigationStarted) {
|
||||||
|
// Trigger payment intent generation when cart changes and we are on the payment step
|
||||||
|
void this.selectPaymentMethod(this.selectedPaymentMethod());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
this.form.statusChanges
|
||||||
|
.pipe(startWith(this.form.status))
|
||||||
|
.subscribe(() => this.isStep1Valid.set(this.form.valid));
|
||||||
|
|
||||||
|
const user = this.authService.user();
|
||||||
|
if (user) {
|
||||||
|
this.form.patchValue({
|
||||||
|
nombre: user.nombre_apellido,
|
||||||
|
email: user.email,
|
||||||
|
dni: user.dni ?? '',
|
||||||
|
telefono: user.telefono ?? '',
|
||||||
|
});
|
||||||
|
this.form.controls.nombre.disable();
|
||||||
|
this.form.controls.email.disable();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.cartService.loadCart().subscribe();
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
this.stopQrPolling();
|
||||||
|
}
|
||||||
|
|
||||||
|
private mapCartItemToMock(item: CartItem): CartItemMock {
|
||||||
|
const fullName = item.product?.nombre ?? '';
|
||||||
|
let product = fullName;
|
||||||
|
let attributes: { label: string; value: string }[] = [];
|
||||||
|
|
||||||
|
const match = fullName.match(/^(.*?)\s*\((.*?)\)$/);
|
||||||
|
if (match) {
|
||||||
|
product = match[1];
|
||||||
|
const attributesString = match[2];
|
||||||
|
attributes = attributesString.split(',').map((attr) => {
|
||||||
|
const parts = attr.split(':');
|
||||||
|
if (parts.length === 2) {
|
||||||
|
return { label: parts[0].trim(), value: parts[1].trim() };
|
||||||
|
}
|
||||||
|
return { label: '', value: attr.trim() };
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
cartItemId: item.id,
|
||||||
|
imageUrl: item.product?.imagen ?? null,
|
||||||
|
product,
|
||||||
|
originalPrice: null,
|
||||||
|
discountedPrice: parseFloat(item.precio_unitario),
|
||||||
|
discountPercentage: null,
|
||||||
|
attributes,
|
||||||
|
quantity: item.cantidad,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
protected async onStep1Continue(): Promise<void> {
|
||||||
|
if (this.form.invalid) return;
|
||||||
|
|
||||||
|
const tenant = this.tenantService.tenant();
|
||||||
|
if (!tenant) return;
|
||||||
|
|
||||||
|
this.isCreatingPurchase.set(true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const cart = this.cartService.cart();
|
||||||
|
if (!cart?.id) {
|
||||||
|
throw new Error('No hay un carrito activo para finalizar la compra.');
|
||||||
|
}
|
||||||
|
|
||||||
|
const formValue = this.form.getRawValue();
|
||||||
|
const payload: CreatePurchasePayload = {
|
||||||
|
cart_id: cart.id,
|
||||||
|
dni: formValue.dni,
|
||||||
|
telefono: formValue.telefono,
|
||||||
|
email: formValue.email,
|
||||||
|
nombre_apellido: formValue.nombre,
|
||||||
|
};
|
||||||
|
|
||||||
|
const response = await this.checkoutService.createPurchase(tenant.codigo, payload);
|
||||||
|
this.createdPurchaseId.set(response.id);
|
||||||
|
|
||||||
|
this.stepper.next();
|
||||||
|
|
||||||
|
// Auto trigger intent for default option
|
||||||
|
void this.selectPaymentMethod(this.selectedPaymentMethod());
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to create purchase:', error);
|
||||||
|
// Here we could show an alert or toast
|
||||||
|
} finally {
|
||||||
|
this.isCreatingPurchase.set(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onCancel(): void {
|
||||||
|
this.stopQrPolling();
|
||||||
|
void this.router.navigate(['/']);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected async selectPaymentMethod(method: PaymentMethod): Promise<void> {
|
||||||
|
if (this.navigationStarted) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.stopQrPolling();
|
||||||
|
this.qrPaymentStatus.set('idle');
|
||||||
|
this.transferValidationStatus.set('idle');
|
||||||
|
this.selectedPaymentMethod.set(method);
|
||||||
|
const requestId = ++this.paymentMethodRequestId;
|
||||||
|
|
||||||
|
if (method === 'qr') {
|
||||||
|
this.qrData.set(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
const purchaseId = this.createdPurchaseId();
|
||||||
|
const tenant = this.tenantService.tenant();
|
||||||
|
|
||||||
|
if (!purchaseId || !tenant || method === 'telepagos') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (method === 'transfer') {
|
||||||
|
this.transferAccount.set(null);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isGeneratingIntent.set(true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await this.checkoutService.generatePaymentIntent(
|
||||||
|
tenant.codigo,
|
||||||
|
purchaseId,
|
||||||
|
method,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (method === 'qr' && response.qr_data?.qr_code) {
|
||||||
|
if (requestId !== this.paymentMethodRequestId || this.selectedPaymentMethod() !== 'qr') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.qrData.set(response.qr_data.qr_code);
|
||||||
|
this.startQrPolling();
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to generate payment intent:', error);
|
||||||
|
} finally {
|
||||||
|
this.isGeneratingIntent.set(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected async generateTransferIntent(dni: string): Promise<void> {
|
||||||
|
const purchaseId = this.createdPurchaseId();
|
||||||
|
const tenant = this.tenantService.tenant();
|
||||||
|
|
||||||
|
if (!purchaseId || !tenant) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.transferDni.set(dni);
|
||||||
|
this.transferValidationStatus.set('idle');
|
||||||
|
this.isGeneratingIntent.set(true);
|
||||||
|
try {
|
||||||
|
const response = await this.checkoutService.generatePaymentIntent(
|
||||||
|
tenant.codigo,
|
||||||
|
purchaseId,
|
||||||
|
'transfer',
|
||||||
|
dni
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.transfer_data) {
|
||||||
|
this.transferAccount.set({
|
||||||
|
titular: response.transfer_data.titular,
|
||||||
|
entidad: response.transfer_data.entidad,
|
||||||
|
cvu: response.transfer_data.cvu,
|
||||||
|
alias: response.transfer_data.alias,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to generate transfer payment intent:', error);
|
||||||
|
} finally {
|
||||||
|
this.isGeneratingIntent.set(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected async copyTransferValue(field: TransferField, value: string): Promise<void> {
|
||||||
|
if (!globalThis.navigator?.clipboard?.writeText) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await globalThis.navigator.clipboard.writeText(value);
|
||||||
|
this.copiedTransferField.set(field);
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
if (this.copiedTransferField() === field) {
|
||||||
|
this.copiedTransferField.set(null);
|
||||||
|
}
|
||||||
|
}, 1800);
|
||||||
|
} catch {
|
||||||
|
this.copiedTransferField.set(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected async onComplete(): Promise<void> {
|
||||||
|
const purchaseId = this.createdPurchaseId();
|
||||||
|
const tenant = this.tenantService.tenant();
|
||||||
|
|
||||||
|
if (
|
||||||
|
!purchaseId ||
|
||||||
|
!tenant ||
|
||||||
|
this.navigationStarted ||
|
||||||
|
this.transferValidationStatus() === 'checking'
|
||||||
|
) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.transferValidationStatus.set('checking');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
|
||||||
|
|
||||||
|
if (purchase.status === 'paid') {
|
||||||
|
this.handleConfirmedPayment(purchaseId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (purchase.status === 'pending_payment') {
|
||||||
|
this.transferValidationStatus.set('pending');
|
||||||
|
this.navigateToPurchaseStatus(purchaseId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.transferValidationStatus.set('pending');
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to validate transfer payment:', error);
|
||||||
|
this.transferValidationStatus.set('error');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected retryQrPolling(): void {
|
||||||
|
if (this.selectedPaymentMethod() === 'qr' && this.qrData()) {
|
||||||
|
this.startQrPolling();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private startQrPolling(): void {
|
||||||
|
this.stopQrPolling();
|
||||||
|
this.qrPollingAttempts = 0;
|
||||||
|
this.qrPaymentStatus.set('waiting');
|
||||||
|
|
||||||
|
const runId = this.qrPollingRunId;
|
||||||
|
this.scheduleQrPoll(runId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private scheduleQrPoll(runId: number): void {
|
||||||
|
this.qrPollingTimeoutId = setTimeout(() => {
|
||||||
|
this.qrPollingTimeoutId = null;
|
||||||
|
void this.checkQrPayment(runId);
|
||||||
|
}, this.qrPollingIntervalMs);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async checkQrPayment(runId: number): Promise<void> {
|
||||||
|
if (runId !== this.qrPollingRunId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const purchaseId = this.createdPurchaseId();
|
||||||
|
const tenant = this.tenantService.tenant();
|
||||||
|
|
||||||
|
if (!purchaseId || !tenant || this.selectedPaymentMethod() !== 'qr') {
|
||||||
|
this.stopQrPolling();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.qrPollingAttempts += 1;
|
||||||
|
this.isCheckingQrPayment.set(true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
|
||||||
|
|
||||||
|
if (runId !== this.qrPollingRunId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (purchase.status === 'paid') {
|
||||||
|
this.handleConfirmedPayment(purchaseId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (purchase.status === 'rejected' || purchase.status === 'cancelled') {
|
||||||
|
this.stopQrPolling();
|
||||||
|
this.qrPaymentStatus.set('failed');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to validate QR payment:', error);
|
||||||
|
} finally {
|
||||||
|
if (runId === this.qrPollingRunId) {
|
||||||
|
this.isCheckingQrPayment.set(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (runId !== this.qrPollingRunId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.qrPollingAttempts >= this.qrPollingMaxAttempts) {
|
||||||
|
this.stopQrPolling();
|
||||||
|
this.qrPaymentStatus.set('timed_out');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.scheduleQrPoll(runId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private stopQrPolling(): void {
|
||||||
|
this.qrPollingRunId += 1;
|
||||||
|
this.isCheckingQrPayment.set(false);
|
||||||
|
|
||||||
|
if (this.qrPollingTimeoutId !== null) {
|
||||||
|
clearTimeout(this.qrPollingTimeoutId);
|
||||||
|
this.qrPollingTimeoutId = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private handleConfirmedPayment(purchaseId: number): void {
|
||||||
|
this.navigateToPurchaseStatus(purchaseId, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private navigateToPurchaseStatus(purchaseId: number, clearCart = false): void {
|
||||||
|
if (this.navigationStarted) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.navigationStarted = true;
|
||||||
|
this.stopQrPolling();
|
||||||
|
|
||||||
|
if (clearCart) {
|
||||||
|
this.cartService.clearCart();
|
||||||
|
}
|
||||||
|
|
||||||
|
void this.router.navigate(['/checkout/status', purchaseId]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import { FormControl, FormGroup } from '@angular/forms';
|
||||||
|
|
||||||
|
export type PaymentMethod = 'qr' | 'transfer' | 'telepagos';
|
||||||
|
export type TransferField = 'cvu' | 'alias';
|
||||||
|
export type QrPaymentStatus = 'idle' | 'waiting' | 'timed_out' | 'failed';
|
||||||
|
export type TransferValidationStatus = 'idle' | 'checking' | 'pending' | 'error';
|
||||||
|
|
||||||
|
export interface PaymentMethodOption {
|
||||||
|
id: PaymentMethod;
|
||||||
|
label: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TransferAccount {
|
||||||
|
titular: string;
|
||||||
|
entidad: string;
|
||||||
|
cvu: string;
|
||||||
|
alias: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CheckoutForm = FormGroup<{
|
||||||
|
nombre: FormControl<string>;
|
||||||
|
email: FormControl<string>;
|
||||||
|
dni: FormControl<string>;
|
||||||
|
telefono: FormControl<string>;
|
||||||
|
}>;
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
<div class="checkout-payment">
|
||||||
|
<div class="checkout-payment__content">
|
||||||
|
<section class="payment-methods" aria-labelledby="payment-methods-title">
|
||||||
|
<h2 id="payment-methods-title" class="payment-methods__title">Selecciona el metodo de pago</h2>
|
||||||
|
|
||||||
|
<div class="payment-methods__list" role="radiogroup" aria-label="Metodo de pago">
|
||||||
|
@for (method of paymentMethods(); track method.id) {
|
||||||
|
<label
|
||||||
|
class="payment-method"
|
||||||
|
[class.is-selected]="selectedPaymentMethod() === method.id"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
class="payment-method__radio"
|
||||||
|
type="radio"
|
||||||
|
name="payment-method"
|
||||||
|
[value]="method.id"
|
||||||
|
[checked]="selectedPaymentMethod() === method.id"
|
||||||
|
(change)="selectPaymentMethod(method.id)"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<span class="payment-method__label">
|
||||||
|
@if (method.id === 'telepagos') {
|
||||||
|
<span class="telepagos-logo" aria-label="TelePagos">
|
||||||
|
<span class="telepagos-logo__tele">tele</span><span class="telepagos-logo__pagos">pagos</span>
|
||||||
|
</span>
|
||||||
|
} @else {
|
||||||
|
{{ method.label }}
|
||||||
|
}
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<i class="fa-solid fa-angle-right payment-method__chevron" aria-hidden="true"></i>
|
||||||
|
</label>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="payment-panel d-flex justify-content-end" aria-live="polite">
|
||||||
|
@if (isGeneratingIntent()) {
|
||||||
|
<div class="payment-panel__card" style="text-align: center; padding: 2rem;">
|
||||||
|
<h3 class="payment-panel__title">Cargando información de pago...</h3>
|
||||||
|
</div>
|
||||||
|
} @else if (selectedPaymentMethod() === 'qr') {
|
||||||
|
<app-checkout-payment-qr
|
||||||
|
[qrData]="qrData()"
|
||||||
|
[paymentStatus]="qrPaymentStatus()"
|
||||||
|
[isCheckingPayment]="isCheckingQrPayment()"
|
||||||
|
(retryPolling)="retryQrPolling.emit()"
|
||||||
|
/>
|
||||||
|
} @else if (selectedPaymentMethod() === 'transfer') {
|
||||||
|
<app-checkout-payment-transfer
|
||||||
|
[transferAccount]="transferAccount()"
|
||||||
|
[transferDni]="transferDni()"
|
||||||
|
[copiedTransferField]="copiedTransferField()"
|
||||||
|
[validationStatus]="transferValidationStatus()"
|
||||||
|
(copyTransferValue)="requestCopy($event.field, $event.value)"
|
||||||
|
(submitDni)="generateTransferIntent.emit($event)"
|
||||||
|
(completePurchase)="complete.emit()"
|
||||||
|
/>
|
||||||
|
} @else {
|
||||||
|
<app-checkout-payment-telepagos />
|
||||||
|
}
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
.checkout-payment {
|
||||||
|
display: grid;
|
||||||
|
gap: 1rem;
|
||||||
|
|
||||||
|
&__content {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr) minmax(280px, 330px);
|
||||||
|
gap: 2rem;
|
||||||
|
align-items: start;
|
||||||
|
|
||||||
|
@media (max-width: 760px) {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__actions {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 1rem;
|
||||||
|
margin-top: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__action-btn {
|
||||||
|
width: 100%;
|
||||||
|
flex: 1 1 320px;
|
||||||
|
max-width: 320px;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-methods {
|
||||||
|
min-width: 0;
|
||||||
|
|
||||||
|
&__title {
|
||||||
|
margin: 0 0 1.75rem;
|
||||||
|
color: #8a8a8a;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__list {
|
||||||
|
display: grid;
|
||||||
|
gap: 1.1rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-method {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto minmax(0, 1fr) auto;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.85rem;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 300px;
|
||||||
|
justify-self: start;
|
||||||
|
padding: 0.35rem 0;
|
||||||
|
color: #666666;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: color 0.2s ease;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: #4f4f4f;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.is-selected {
|
||||||
|
color: var(--tenant-primary, #6376f3);
|
||||||
|
}
|
||||||
|
|
||||||
|
&__radio {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
margin: 0;
|
||||||
|
accent-color: var(--tenant-primary, #6376f3);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__label {
|
||||||
|
min-width: 0;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__chevron {
|
||||||
|
color: #9f9f9f;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateX(-4px);
|
||||||
|
transition: opacity 0.2s ease, transform 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.is-selected &__chevron,
|
||||||
|
&:hover &__chevron {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateX(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.telepagos-logo {
|
||||||
|
display: inline-block;
|
||||||
|
font-size: 1.45rem;
|
||||||
|
font-weight: 800;
|
||||||
|
line-height: 1;
|
||||||
|
letter-spacing: -0.03em;
|
||||||
|
background: linear-gradient(90deg, #0a69d8 0 78%, #f6a11a 78% 100%);
|
||||||
|
-webkit-background-clip: text;
|
||||||
|
background-clip: text;
|
||||||
|
color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-panel {
|
||||||
|
min-width: 0;
|
||||||
|
&__card {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 320px;
|
||||||
|
min-height: 269px;
|
||||||
|
padding: 1.5rem 1.75rem;
|
||||||
|
border-radius: 5px;
|
||||||
|
background: #ffffff;
|
||||||
|
color: #666666;
|
||||||
|
box-shadow: 0 0 0 1px #f1f1f1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__title {
|
||||||
|
max-width: 18rem;
|
||||||
|
margin: 0;
|
||||||
|
color: #8a8a8a;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.35;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
|
||||||
|
|
||||||
|
import { CheckoutPaymentQrComponent } from './components/checkout-payment-qr/checkout-payment-qr.component';
|
||||||
|
import { CheckoutPaymentTelepagosComponent } from './components/checkout-payment-telepagos/checkout-payment-telepagos.component';
|
||||||
|
import { CheckoutPaymentTransferComponent } from './components/checkout-payment-transfer/checkout-payment-transfer.component';
|
||||||
|
import {
|
||||||
|
PaymentMethod,
|
||||||
|
PaymentMethodOption,
|
||||||
|
QrPaymentStatus,
|
||||||
|
TransferAccount,
|
||||||
|
TransferField,
|
||||||
|
TransferValidationStatus,
|
||||||
|
} from './checkout-page.models';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-checkout-payment-step',
|
||||||
|
standalone: true,
|
||||||
|
imports: [CheckoutPaymentQrComponent, CheckoutPaymentTelepagosComponent, CheckoutPaymentTransferComponent],
|
||||||
|
templateUrl: './checkout-payment-step.component.html',
|
||||||
|
styleUrl: './checkout-payment-step.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
|
})
|
||||||
|
export class CheckoutPaymentStepComponent {
|
||||||
|
readonly paymentMethods = input.required<ReadonlyArray<PaymentMethodOption>>();
|
||||||
|
readonly selectedPaymentMethod = input.required<PaymentMethod>();
|
||||||
|
readonly copiedTransferField = input<TransferField | null>(null);
|
||||||
|
readonly transferAccount = input<TransferAccount | null>(null);
|
||||||
|
readonly transferDni = input<string>('');
|
||||||
|
readonly isGeneratingIntent = input<boolean>(false);
|
||||||
|
readonly qrData = input<string | null>(null);
|
||||||
|
readonly qrPaymentStatus = input<QrPaymentStatus>('idle');
|
||||||
|
readonly isCheckingQrPayment = input<boolean>(false);
|
||||||
|
readonly transferValidationStatus = input<TransferValidationStatus>('idle');
|
||||||
|
|
||||||
|
readonly paymentMethodChange = output<PaymentMethod>();
|
||||||
|
readonly copyTransferValue = output<{ field: TransferField; value: string }>();
|
||||||
|
readonly cancelStep = output<void>();
|
||||||
|
readonly complete = output<void>();
|
||||||
|
readonly generateTransferIntent = output<string>();
|
||||||
|
readonly retryQrPolling = output<void>();
|
||||||
|
|
||||||
|
protected selectPaymentMethod(method: PaymentMethod): void {
|
||||||
|
this.paymentMethodChange.emit(method);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected requestCopy(field: TransferField, value: string): void {
|
||||||
|
this.copyTransferValue.emit({ field, value });
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
<div class="payment-panel__card">
|
||||||
|
<h3 class="payment-panel__title">Ingresa a tu billetera y escanea el siguiente QR</h3>
|
||||||
|
<div class="payment-panel__divider"></div>
|
||||||
|
|
||||||
|
<div class="qr-code" aria-label="QR de pago">
|
||||||
|
@if (qrData()) {
|
||||||
|
<qrcode [qrdata]="qrData()!" [width]="200" [errorCorrectionLevel]="'M'"></qrcode>
|
||||||
|
} @else {
|
||||||
|
<span class="qr-code__finder qr-code__finder--tl"></span>
|
||||||
|
<span class="qr-code__finder qr-code__finder--tr"></span>
|
||||||
|
<span class="qr-code__finder qr-code__finder--bl"></span>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (isCheckingPayment()) {
|
||||||
|
<div class="payment-verification" role="status" aria-live="polite">
|
||||||
|
<span class="payment-verification__spinner" aria-hidden="true"></span>
|
||||||
|
<span class="payment-verification__message">Verificando pago</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (paymentStatus() === 'timed_out') {
|
||||||
|
<p class="payment-status payment-status--warning" role="status">
|
||||||
|
Todavía no recibimos el pago.
|
||||||
|
</p>
|
||||||
|
<app-button type="button" variant="secondary" (click)="retryPolling.emit()">
|
||||||
|
Volver a verificar
|
||||||
|
</app-button>
|
||||||
|
} @else if (paymentStatus() === 'failed') {
|
||||||
|
<p class="payment-status payment-status--warning" role="alert">
|
||||||
|
El pago fue rechazado o cancelado.
|
||||||
|
</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
.payment-panel__card {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 320px;
|
||||||
|
min-height: 269px;
|
||||||
|
padding: 1.5rem 1.75rem;
|
||||||
|
border-radius: 5px;
|
||||||
|
background: #ffffff;
|
||||||
|
color: #666666;
|
||||||
|
box-shadow: 0 0 0 1px #f1f1f1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-panel__title {
|
||||||
|
max-width: 18rem;
|
||||||
|
margin: 0;
|
||||||
|
color: #8a8a8a;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.35;
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-panel__divider {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 220px;
|
||||||
|
height: 1px;
|
||||||
|
margin: 1.2rem 0 1.45rem;
|
||||||
|
background: #dddddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qr-code {
|
||||||
|
position: relative;
|
||||||
|
width: min(170px, 100%);
|
||||||
|
aspect-ratio: 1;
|
||||||
|
border: 8px solid #ffffff;
|
||||||
|
background-color: #ffffff;
|
||||||
|
background-image:
|
||||||
|
linear-gradient(
|
||||||
|
90deg,
|
||||||
|
rgba(17, 17, 17, 0.95) 0 14%,
|
||||||
|
transparent 14% 28%,
|
||||||
|
rgba(17, 17, 17, 0.95) 28% 42%,
|
||||||
|
transparent 42% 56%,
|
||||||
|
rgba(17, 17, 17, 0.95) 56% 70%,
|
||||||
|
transparent 70% 84%,
|
||||||
|
rgba(17, 17, 17, 0.95) 84% 100%
|
||||||
|
),
|
||||||
|
linear-gradient(
|
||||||
|
rgba(17, 17, 17, 0.95) 0 14%,
|
||||||
|
transparent 14% 28%,
|
||||||
|
rgba(17, 17, 17, 0.95) 28% 42%,
|
||||||
|
transparent 42% 56%,
|
||||||
|
rgba(17, 17, 17, 0.95) 56% 70%,
|
||||||
|
transparent 70% 84%,
|
||||||
|
rgba(17, 17, 17, 0.95) 84% 100%
|
||||||
|
);
|
||||||
|
background-size: 18px 18px;
|
||||||
|
background-position: 0 0, 9px 9px;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
qrcode {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
|
||||||
|
::ng-deep canvas,
|
||||||
|
::ng-deep img {
|
||||||
|
display: block !important;
|
||||||
|
width: 100% !important;
|
||||||
|
height: 100% !important;
|
||||||
|
max-width: 100%;
|
||||||
|
max-height: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.qr-code__finder {
|
||||||
|
position: absolute;
|
||||||
|
width: 38px;
|
||||||
|
height: 38px;
|
||||||
|
border: 5px solid #111111;
|
||||||
|
background: #ffffff;
|
||||||
|
box-shadow: inset 0 0 0 8px #ffffff, inset 0 0 0 14px #111111;
|
||||||
|
|
||||||
|
&--tl {
|
||||||
|
top: 10px;
|
||||||
|
left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&--tr {
|
||||||
|
top: 10px;
|
||||||
|
right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&--bl {
|
||||||
|
bottom: 10px;
|
||||||
|
left: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-status {
|
||||||
|
margin: 1rem 0 0;
|
||||||
|
color: #6f6f6f;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
font-weight: 500;
|
||||||
|
|
||||||
|
&--warning {
|
||||||
|
margin-bottom: 0.75rem;
|
||||||
|
color: #9a6a12;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-verification {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
z-index: 2;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0.45rem;
|
||||||
|
background: rgba(255, 255, 255, 0.82);
|
||||||
|
|
||||||
|
&__spinner {
|
||||||
|
width: 30px;
|
||||||
|
height: 30px;
|
||||||
|
border: 4px solid rgba(17, 17, 17, 0.2);
|
||||||
|
border-top-color: #111111;
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: payment-verification-spin 0.75s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__message {
|
||||||
|
color: #111111;
|
||||||
|
font-size: 0.72rem;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes payment-verification-spin {
|
||||||
|
to {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { getTestBed, TestBed } from '@angular/core/testing';
|
||||||
|
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
||||||
|
import { beforeAll, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import { CheckoutPaymentQrComponent } from './checkout-payment-qr.component';
|
||||||
|
|
||||||
|
describe('CheckoutPaymentQrComponent', () => {
|
||||||
|
beforeAll(() => {
|
||||||
|
try {
|
||||||
|
getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
|
||||||
|
} catch {
|
||||||
|
// Test environment may already be initialized by another setup entrypoint.
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders the animated payment verification overlay over the QR', async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [CheckoutPaymentQrComponent],
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(CheckoutPaymentQrComponent);
|
||||||
|
fixture.componentRef.setInput('isCheckingPayment', true);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const overlay = fixture.nativeElement.querySelector('.payment-verification') as HTMLElement;
|
||||||
|
expect(overlay).not.toBeNull();
|
||||||
|
expect(overlay.textContent).toContain('Verificando pago');
|
||||||
|
expect(overlay.querySelector('.payment-verification__spinner')).not.toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
|
||||||
|
import { QRCodeComponent } from '../../../../../../shared/components/qrcode/qrcode.component';
|
||||||
|
import { ButtonComponent } from '../../../../../../shared/components/button/button.component';
|
||||||
|
import { QrPaymentStatus } from '../../checkout-page.models';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-checkout-payment-qr',
|
||||||
|
standalone: true,
|
||||||
|
imports: [QRCodeComponent, ButtonComponent],
|
||||||
|
templateUrl: './checkout-payment-qr.component.html',
|
||||||
|
styleUrl: './checkout-payment-qr.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
|
})
|
||||||
|
export class CheckoutPaymentQrComponent {
|
||||||
|
readonly qrData = input<string | null>(null);
|
||||||
|
readonly paymentStatus = input<QrPaymentStatus>('idle');
|
||||||
|
readonly isCheckingPayment = input<boolean>(false);
|
||||||
|
readonly retryPolling = output<void>();
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<div class="payment-panel__card">
|
||||||
|
<h3 class="payment-panel__title">Descarga la app de TelePagos para finalizar la compra</h3>
|
||||||
|
<div class="payment-panel__divider"></div>
|
||||||
|
|
||||||
|
<div class="store-badges" aria-label="Tiendas disponibles">
|
||||||
|
<div class="store-badge">
|
||||||
|
<i class="fa-brands fa-google-play" aria-hidden="true"></i>
|
||||||
|
<span class="store-badge__text">
|
||||||
|
<small>Disponible en</small>
|
||||||
|
<strong>Google Play</strong>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="store-badge">
|
||||||
|
<i class="fa-brands fa-apple" aria-hidden="true"></i>
|
||||||
|
<span class="store-badge__text">
|
||||||
|
<small>Descargalo en</small>
|
||||||
|
<strong>App Store</strong>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
.payment-panel__card {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 320px;
|
||||||
|
min-height: 269px;
|
||||||
|
padding: 1.5rem 1.75rem;
|
||||||
|
border-radius: 5px;
|
||||||
|
background: #ffffff;
|
||||||
|
color: #666666;
|
||||||
|
box-shadow: 0 0 0 1px #f1f1f1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-panel__title {
|
||||||
|
max-width: 18rem;
|
||||||
|
margin: 0;
|
||||||
|
color: #8a8a8a;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.35;
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-panel__divider {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 220px;
|
||||||
|
height: 1px;
|
||||||
|
margin: 1.2rem 0 1.45rem;
|
||||||
|
background: #dddddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
.store-badges {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 210px;
|
||||||
|
display: grid;
|
||||||
|
gap: 0.8rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.store-badge {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
padding: 0.75rem 0.95rem;
|
||||||
|
border-radius: 0.85rem;
|
||||||
|
background: #111111;
|
||||||
|
color: #ffffff;
|
||||||
|
box-shadow: 0 10px 24px rgba(17, 17, 17, 0.16);
|
||||||
|
|
||||||
|
i {
|
||||||
|
font-size: 1.35rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__text {
|
||||||
|
display: grid;
|
||||||
|
text-align: left;
|
||||||
|
line-height: 1.1;
|
||||||
|
|
||||||
|
small {
|
||||||
|
font-size: 0.62rem;
|
||||||
|
letter-spacing: 0.05em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
|
||||||
|
strong {
|
||||||
|
font-size: 1rem;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-checkout-payment-telepagos',
|
||||||
|
standalone: true,
|
||||||
|
imports: [],
|
||||||
|
templateUrl: './checkout-payment-telepagos.component.html',
|
||||||
|
styleUrl: './checkout-payment-telepagos.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
|
})
|
||||||
|
export class CheckoutPaymentTelepagosComponent {}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user