Compare commits
58 Commits
feature/ca
...
feature/co
| Author | SHA1 | Date | |
|---|---|---|---|
| 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,9 +1,11 @@
|
|||||||
import { provideHttpClient, withFetch } from '@angular/common/http';
|
import { 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 } 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';
|
||||||
|
|
||||||
export const appConfig: ApplicationConfig = {
|
export const appConfig: ApplicationConfig = {
|
||||||
@@ -11,7 +13,8 @@ export const appConfig: ApplicationConfig = {
|
|||||||
provideBrowserGlobalErrorListeners(),
|
provideBrowserGlobalErrorListeners(),
|
||||||
provideRouter(routes),
|
provideRouter(routes),
|
||||||
provideClientHydration(),
|
provideClientHydration(),
|
||||||
provideHttpClient(withFetch()),
|
provideHttpClient(withFetch(), withInterceptors([authInterceptor])),
|
||||||
|
provideAppInitializer(authBootstrap),
|
||||||
provideAppInitializer(tenantBootstrap)
|
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',
|
||||||
|
'Contrasena',
|
||||||
|
'Repetir Contrasena'
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
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 {
|
||||||
@@ -79,4 +89,3 @@ export class App {
|
|||||||
DEFAULT_TENANT_BRANDING.footerBgColor
|
DEFAULT_TENANT_BRANDING.footerBgColor
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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()"
|
||||||
/>
|
/>
|
||||||
|
<div class="store-layout__user-menu">
|
||||||
<app-icon-button
|
<app-icon-button
|
||||||
variant="user"
|
variant="user"
|
||||||
ariaLabel="Mi cuenta"
|
ariaLabel="Mi cuenta"
|
||||||
|
ariaControls="store-user-dropdown"
|
||||||
|
[ariaExpanded]="isUserDropdownOpen()"
|
||||||
title="Mi cuenta"
|
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>
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.store-layout__search {
|
.store-layout__search {
|
||||||
width: min(100%, 24rem);
|
width: min(100%, 260px);
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,8 +56,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 +83,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>
|
||||||
|
|
||||||
|
<button type="button" class="user-dropdown__item" role="menuitem" data-testid="user-dropdown-account">
|
||||||
|
Mi cuenta
|
||||||
|
</button>
|
||||||
|
<button type="button" class="user-dropdown__item" role="menuitem" data-testid="user-dropdown-purchases">
|
||||||
|
Mis compras
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="user-dropdown__item"
|
||||||
|
role="menuitem"
|
||||||
|
data-testid="user-dropdown-logout"
|
||||||
|
(click)="logoutClick.emit()"
|
||||||
|
>
|
||||||
|
Cerrar sesion
|
||||||
|
</button>
|
||||||
|
</section>
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
: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 {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
.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,14 @@
|
|||||||
|
import { Component, computed, input, output } from '@angular/core';
|
||||||
|
import { AuthUser } from '../../../../services/auth/auth.interfaces';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-user-dropdown',
|
||||||
|
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,8 +21,8 @@
|
|||||||
[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>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,5 +1,5 @@
|
|||||||
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';
|
||||||
@@ -7,6 +7,7 @@ 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',
|
||||||
@@ -17,6 +18,8 @@ import { CartItem } from '../../services/cart/cart.interface';
|
|||||||
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);
|
||||||
|
|
||||||
@@ -67,6 +70,8 @@ export class StoreLayoutComponent implements OnInit {
|
|||||||
|
|
||||||
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();
|
||||||
@@ -80,6 +85,22 @@ export class StoreLayoutComponent implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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[] = [
|
||||||
{
|
{
|
||||||
|
|||||||
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;
|
||||||
|
};
|
||||||
96
src/app/core/services/auth/auth.interceptor.spec.ts
Normal file
96
src/app/core/services/auth/auth.interceptor.spec.ts
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
import { HttpClient } 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('clears the local session when an authenticated request returns 401', () => {
|
||||||
|
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);
|
||||||
|
|
||||||
|
client.get(`${environment.url}me`).subscribe({
|
||||||
|
error: () => undefined
|
||||||
|
});
|
||||||
|
|
||||||
|
const request = httpController.expectOne(`${environment.url}me`);
|
||||||
|
request.flush({ message: 'Unauthorized' }, { status: 401, statusText: 'Unauthorized' });
|
||||||
|
|
||||||
|
expect(authService.clearSession).toHaveBeenCalledTimes(1);
|
||||||
|
httpController.verify();
|
||||||
|
});
|
||||||
|
});
|
||||||
37
src/app/core/services/auth/auth.interceptor.ts
Normal file
37
src/app/core/services/auth/auth.interceptor.ts
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import {
|
||||||
|
HttpErrorResponse,
|
||||||
|
HttpEvent,
|
||||||
|
HttpHandlerFn,
|
||||||
|
HttpInterceptorFn,
|
||||||
|
HttpRequest
|
||||||
|
} from '@angular/common/http';
|
||||||
|
import { inject } from '@angular/core';
|
||||||
|
import { Observable, catchError, throwError } 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).pipe(
|
||||||
|
catchError((error: unknown) => {
|
||||||
|
if (error instanceof HttpErrorResponse && error.status === 401 && token) {
|
||||||
|
authService.clearSession();
|
||||||
|
}
|
||||||
|
|
||||||
|
return throwError(() => error);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
};
|
||||||
31
src/app/core/services/auth/auth.interfaces.ts
Normal file
31
src/app/core/services/auth/auth.interfaces.ts
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
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 LoginResponse {
|
||||||
|
message: string;
|
||||||
|
token: string;
|
||||||
|
token_type: 'Bearer';
|
||||||
|
user: AuthUser;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface RegisterResponse {
|
||||||
|
message: string;
|
||||||
|
data: AuthUser;
|
||||||
|
}
|
||||||
211
src/app/core/services/auth/auth.service.spec.ts
Normal file
211
src/app/core/services/auth/auth.service.spec.ts
Normal file
@@ -0,0 +1,211 @@
|
|||||||
|
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';
|
||||||
|
|
||||||
|
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 the session when bootstrap receives 401 from /me', 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() },
|
||||||
|
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');
|
||||||
|
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('clears local session even when logout request fails', () => {
|
||||||
|
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()).toBeNull();
|
||||||
|
expect(service.user()).toBeNull();
|
||||||
|
expect(cookieStore['shopit.auth.token']).toBeUndefined();
|
||||||
|
|
||||||
|
httpController.verify();
|
||||||
|
});
|
||||||
|
});
|
||||||
115
src/app/core/services/auth/auth.service.ts
Normal file
115
src/app/core/services/auth/auth.service.ts
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
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
|
||||||
|
} from './auth.interfaces';
|
||||||
|
import { CookieService } from '../cookie/cookie.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 platformId = inject(PLATFORM_ID);
|
||||||
|
private readonly cookieService = inject(CookieService);
|
||||||
|
private readonly transferState = inject(TransferState);
|
||||||
|
|
||||||
|
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> {
|
||||||
|
return this.http.post<RegisterResponse>(`${environment.url}register`, payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
logout(): Observable<void> {
|
||||||
|
if (!this.tokenState()) {
|
||||||
|
this.clearSession();
|
||||||
|
return of(void 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.http.post<void>(`${environment.url}logout`, {}).pipe(
|
||||||
|
tap({
|
||||||
|
next: () => this.clearSession(),
|
||||||
|
error: () => 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) {
|
||||||
|
if (this.isUnauthorizedError(error)) {
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
private isUnauthorizedError(error: unknown): error is HttpErrorResponse {
|
||||||
|
return error instanceof HttpErrorResponse && error.status === 401;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -34,7 +34,8 @@ describe('CartService', () => {
|
|||||||
|
|
||||||
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({
|
||||||
@@ -74,6 +75,18 @@ 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(10, 2).subscribe((res) => {
|
||||||
expect(res.data).toEqual(mockCart);
|
expect(res.data).toEqual(mockCart);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
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';
|
||||||
@@ -16,10 +16,23 @@ 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`, {
|
||||||
@@ -32,6 +45,7 @@ export class CartService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
addItem(productVariantId: number, cantidad: number): Observable<ApiResponse<Cart>> {
|
addItem(productVariantId: number, cantidad: number): Observable<ApiResponse<Cart>> {
|
||||||
|
this.isUpdatingState.set(true);
|
||||||
return this.http
|
return this.http
|
||||||
.post<ApiResponse<Cart>>(
|
.post<ApiResponse<Cart>>(
|
||||||
`${this.tenantApiUrl}/cart/items`,
|
`${this.tenantApiUrl}/cart/items`,
|
||||||
@@ -39,11 +53,19 @@ export class CartService {
|
|||||||
{ 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(productVariantId: number, cantidad: number): Observable<ApiResponse<Cart>> {
|
||||||
|
this.isUpdatingState.set(true);
|
||||||
return this.http
|
return this.http
|
||||||
.patch<ApiResponse<Cart>>(
|
.patch<ApiResponse<Cart>>(
|
||||||
`${this.tenantApiUrl}/cart/items/${productVariantId}`,
|
`${this.tenantApiUrl}/cart/items/${productVariantId}`,
|
||||||
@@ -51,18 +73,33 @@ export class CartService {
|
|||||||
{ 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(productVariantId: number): Observable<ApiResponse<Cart>> {
|
||||||
|
this.isUpdatingState.set(true);
|
||||||
return this.http
|
return this.http
|
||||||
.delete<ApiResponse<Cart>>(
|
.delete<ApiResponse<Cart>>(
|
||||||
`${this.tenantApiUrl}/cart/items/${productVariantId}`,
|
`${this.tenantApiUrl}/cart/items/${productVariantId}`,
|
||||||
{ 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;
|
||||||
|
})
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
92
src/app/core/services/checkout.service.ts
Normal file
92
src/app/core/services/checkout.service.ts
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
@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'): Promise<any> {
|
||||||
|
const response = await firstValueFrom(
|
||||||
|
this.http.post<any>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/payment-intent`, { method })
|
||||||
|
);
|
||||||
|
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 getPurchase(tenantCode: string, purchaseId: string | number): Promise<PurchaseStatusResponse> {
|
||||||
|
const response = await firstValueFrom(
|
||||||
|
this.http.get<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}`)
|
||||||
|
);
|
||||||
|
|
||||||
|
const purchase = this.extractResponseData<PurchaseStatusResponse>(response);
|
||||||
|
|
||||||
|
if (!purchase) {
|
||||||
|
throw new Error('Error al obtener la compra.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
status: purchase.status ?? null
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
59
src/app/core/services/cookie/cookie.service.ts
Normal file
59
src/app/core/services/cookie/cookie.service.ts
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
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, days = 7): void {
|
||||||
|
if (isPlatformBrowser(this.platformId)) {
|
||||||
|
const date = new Date();
|
||||||
|
date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
|
||||||
|
const expires = `expires=${date.toUTCString()}`;
|
||||||
|
this.document.cookie = `${name}=${value};${expires};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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,6 +18,7 @@ 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 { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
||||||
import {
|
import {
|
||||||
MODAL_DATA,
|
MODAL_DATA,
|
||||||
ModalRef,
|
ModalRef,
|
||||||
@@ -212,6 +213,41 @@ describe('ModalService', () => {
|
|||||||
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();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ 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 { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
||||||
|
|
||||||
export type ModalSize = 'sm' | 'md' | 'lg' | 'xl' | 'full';
|
export type ModalSize = 'sm' | 'md' | 'lg' | 'xl' | 'full';
|
||||||
export type ModalDismissReason =
|
export type ModalDismissReason =
|
||||||
@@ -43,6 +44,17 @@ export interface ConfirmModalConfig
|
|||||||
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 ActiveModalState<TResult = unknown, TData = unknown> {
|
export interface ActiveModalState<TResult = unknown, TData = unknown> {
|
||||||
component: Type<unknown>;
|
component: Type<unknown>;
|
||||||
config: NormalizedModalConfig<TData>;
|
config: NormalizedModalConfig<TData>;
|
||||||
@@ -158,6 +170,19 @@ export class ModalService {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
private close<TResult>(ref: ModalRef<TResult>, result?: TResult): void {
|
private close<TResult>(ref: ModalRef<TResult>, result?: TResult): void {
|
||||||
if (this.activeModalState()?.ref !== ref) {
|
if (this.activeModalState()?.ref !== ref) {
|
||||||
return;
|
return;
|
||||||
@@ -207,4 +232,22 @@ export class ModalService {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private buildSimpleModalConfig(
|
||||||
|
config: SimpleModalConfig
|
||||||
|
): ModalConfig<SimpleModalData> {
|
||||||
|
const {
|
||||||
|
content,
|
||||||
|
buttonLabel = 'Entendido',
|
||||||
|
...modalConfig
|
||||||
|
} = config;
|
||||||
|
|
||||||
|
return {
|
||||||
|
...modalConfig,
|
||||||
|
data: {
|
||||||
|
content,
|
||||||
|
buttonLabel
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,14 @@
|
|||||||
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 Tenant {
|
export interface Tenant {
|
||||||
id: number;
|
id: number;
|
||||||
codigo: string;
|
codigo: string;
|
||||||
@@ -13,6 +22,8 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type TenantBootstrapResponse = ApiResponse<Tenant>;
|
export type TenantBootstrapResponse = ApiResponse<Tenant>;
|
||||||
|
|||||||
@@ -91,6 +91,9 @@
|
|||||||
<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 }}
|
||||||
@@ -333,6 +336,94 @@
|
|||||||
|
|
||||||
<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>
|
||||||
@@ -363,6 +454,7 @@
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -561,3 +653,4 @@
|
|||||||
</div>
|
</div>
|
||||||
</app-store-section>
|
</app-store-section>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ import { StoreSectionComponent } from '../../../../shared/components/store-secti
|
|||||||
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',
|
||||||
@@ -24,7 +26,9 @@ import { ToastService } from '../../../../core/services/toast.service';
|
|||||||
ProductCardComponent,
|
ProductCardComponent,
|
||||||
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'
|
||||||
@@ -33,6 +37,9 @@ 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';
|
||||||
@@ -198,14 +205,11 @@ export class ReutilizablesTestPageComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
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}`;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -229,9 +233,29 @@ export class ReutilizablesTestPageComponent {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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,99 @@
|
|||||||
|
<form
|
||||||
|
class="checkout-form"
|
||||||
|
novalidate
|
||||||
|
[formGroup]="form()"
|
||||||
|
(ngSubmit)="submit()"
|
||||||
|
>
|
||||||
|
<div class="checkout-form__fields">
|
||||||
|
<div class="form-field">
|
||||||
|
<label class="form-field__label" for="checkout-nombre">
|
||||||
|
Nombre y Apellido <span class="form-field__required" aria-hidden="true">*</span>
|
||||||
|
</label>
|
||||||
|
<app-input
|
||||||
|
id="checkout-nombre"
|
||||||
|
type="text"
|
||||||
|
placeholder="Descripcion"
|
||||||
|
[value]="form().controls.nombre.value"
|
||||||
|
[invalid]="showControlError('nombre')"
|
||||||
|
[disabled]="form().controls.nombre.disabled"
|
||||||
|
(valueChange)="updateField('nombre', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('nombre'); as errorMessage) {
|
||||||
|
<small class="form-field__error">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-field">
|
||||||
|
<label class="form-field__label" for="checkout-email">
|
||||||
|
Email <span class="form-field__required" aria-hidden="true">*</span>
|
||||||
|
</label>
|
||||||
|
<app-input
|
||||||
|
id="checkout-email"
|
||||||
|
type="email"
|
||||||
|
placeholder="Descripcion"
|
||||||
|
[value]="form().controls.email.value"
|
||||||
|
[invalid]="showControlError('email')"
|
||||||
|
[disabled]="form().controls.email.disabled"
|
||||||
|
(valueChange)="updateField('email', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('email'); as errorMessage) {
|
||||||
|
<small class="form-field__error">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-field">
|
||||||
|
<label class="form-field__label" for="checkout-dni">
|
||||||
|
DNI <span class="form-field__required" aria-hidden="true">*</span>
|
||||||
|
</label>
|
||||||
|
<app-input
|
||||||
|
id="checkout-dni"
|
||||||
|
type="text"
|
||||||
|
placeholder="Descripcion"
|
||||||
|
[value]="form().controls.dni.value"
|
||||||
|
[invalid]="showControlError('dni')"
|
||||||
|
[disabled]="form().controls.dni.disabled"
|
||||||
|
(valueChange)="updateField('dni', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('dni'); as errorMessage) {
|
||||||
|
<small class="form-field__error">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-field">
|
||||||
|
<label class="form-field__label" for="checkout-telefono">
|
||||||
|
Telefono <span class="form-field__required" aria-hidden="true">*</span>
|
||||||
|
</label>
|
||||||
|
<app-input
|
||||||
|
id="checkout-telefono"
|
||||||
|
type="text"
|
||||||
|
placeholder="Descripcion"
|
||||||
|
[value]="form().controls.telefono.value"
|
||||||
|
[invalid]="showControlError('telefono')"
|
||||||
|
[disabled]="form().controls.telefono.disabled"
|
||||||
|
(valueChange)="updateField('telefono', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('telefono'); as errorMessage) {
|
||||||
|
<small class="form-field__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,48 @@
|
|||||||
|
.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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-field {
|
||||||
|
display: grid;
|
||||||
|
gap: 0.35rem;
|
||||||
|
|
||||||
|
&__label {
|
||||||
|
font-size: 0.8rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--bs-secondary, #6c757d);
|
||||||
|
letter-spacing: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__required {
|
||||||
|
color: var(--bs-danger, #dc3545);
|
||||||
|
margin-left: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__error {
|
||||||
|
font-size: 0.75rem;
|
||||||
|
color: var(--bs-danger, #dc3545);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -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,40 @@
|
|||||||
|
<div class="container-xl px-3 px-md-4 py-4">
|
||||||
|
<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()"
|
||||||
|
[isGeneratingIntent]="isPaymentLoading()"
|
||||||
|
[qrData]="qrData()"
|
||||||
|
(paymentMethodChange)="selectPaymentMethod($event)"
|
||||||
|
(copyTransferValue)="copyTransferValue($event.field, $event.value)"
|
||||||
|
(cancelStep)="onCancel()"
|
||||||
|
(complete)="onComplete()"
|
||||||
|
/>
|
||||||
|
</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>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
.checkout-page {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr) 420px;
|
||||||
|
gap: 4rem;
|
||||||
|
align-items: start;
|
||||||
|
padding: 2rem 0;
|
||||||
|
|
||||||
|
@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,260 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, computed, effect, inject, 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, TransferAccount, TransferField } 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 {
|
||||||
|
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);
|
||||||
|
|
||||||
|
@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>({
|
||||||
|
titular: 'Nombre y Apellido',
|
||||||
|
entidad: 'TelePagos',
|
||||||
|
cvu: '0000000000000000000000',
|
||||||
|
alias: 'telepagos.ar'
|
||||||
|
});
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
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) {
|
||||||
|
// 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();
|
||||||
|
}
|
||||||
|
|
||||||
|
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 {
|
||||||
|
productVariantId: item.product_variant_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 {
|
||||||
|
void this.router.navigate(['/']);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected async selectPaymentMethod(method: PaymentMethod): Promise<void> {
|
||||||
|
this.selectedPaymentMethod.set(method);
|
||||||
|
|
||||||
|
const purchaseId = this.createdPurchaseId();
|
||||||
|
const tenant = this.tenantService.tenant();
|
||||||
|
|
||||||
|
if (!purchaseId || !tenant || method === 'telepagos') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isGeneratingIntent.set(true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await this.checkoutService.generatePaymentIntent(tenant.codigo, purchaseId, method);
|
||||||
|
|
||||||
|
if (method === 'qr' && response.qr_data?.qr_code) {
|
||||||
|
this.qrData.set(response.qr_data.qr_code);
|
||||||
|
} else if (method === 'transfer' && 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 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) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await this.checkoutService.completePurchase(tenant.codigo, purchaseId);
|
||||||
|
this.cartService.clearCart();
|
||||||
|
void this.router.navigate(['/checkout/status', purchaseId]);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to complete purchase:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { FormControl, FormGroup } from '@angular/forms';
|
||||||
|
|
||||||
|
export type PaymentMethod = 'qr' | 'transfer' | 'telepagos';
|
||||||
|
export type TransferField = 'cvu' | 'alias';
|
||||||
|
|
||||||
|
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,153 @@
|
|||||||
|
<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') {
|
||||||
|
<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>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
} @else if (selectedPaymentMethod() === 'transfer') {
|
||||||
|
<div class="payment-panel__card">
|
||||||
|
<h3 class="payment-panel__title">Transferi a la siguiente cuenta desde cualquier billetera</h3>
|
||||||
|
<div class="payment-panel__divider"></div>
|
||||||
|
|
||||||
|
<div class="payment-panel__account">
|
||||||
|
<p class="payment-panel__eyebrow">DATOS DE CUENTA:</p>
|
||||||
|
|
||||||
|
<div class="payment-detail">
|
||||||
|
<span class="payment-detail__label">Titular:</span>
|
||||||
|
<strong class="payment-detail__value">{{ transferAccount().titular }}</strong>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="payment-detail">
|
||||||
|
<span class="payment-detail__label">Entidad:</span>
|
||||||
|
<strong class="payment-detail__value">{{ transferAccount().entidad }}</strong>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="payment-detail payment-detail--copy">
|
||||||
|
<span class="payment-detail__label">CVU:</span>
|
||||||
|
<strong class="payment-detail__value">{{ transferAccount().cvu }}</strong>
|
||||||
|
<app-icon-button
|
||||||
|
variant="copy"
|
||||||
|
ariaLabel="Copiar CVU"
|
||||||
|
(click)="requestCopy('cvu', transferAccount().cvu)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (copiedTransferField() === 'cvu') {
|
||||||
|
<small class="payment-detail__feedback">CVU copiado</small>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="payment-detail payment-detail--copy">
|
||||||
|
<span class="payment-detail__label">Alias:</span>
|
||||||
|
<strong class="payment-detail__value">{{ transferAccount().alias }}</strong>
|
||||||
|
<app-icon-button
|
||||||
|
variant="copy"
|
||||||
|
ariaLabel="Copiar alias"
|
||||||
|
(click)="requestCopy('alias', transferAccount().alias)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (copiedTransferField() === 'alias') {
|
||||||
|
<small class="payment-detail__feedback">Alias copiado</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
} @else {
|
||||||
|
<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>
|
||||||
|
}
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="checkout-payment__actions">
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="cancel"
|
||||||
|
hostClass="checkout-payment__action-btn"
|
||||||
|
buttonClass="w-100"
|
||||||
|
[disabled]="true"
|
||||||
|
>
|
||||||
|
Cancelar
|
||||||
|
</app-button>
|
||||||
|
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
hostClass="checkout-payment__action-btn"
|
||||||
|
buttonClass="w-100"
|
||||||
|
[disabled]="isGeneratingIntent()"
|
||||||
|
(click)="complete.emit()"
|
||||||
|
>
|
||||||
|
Finalizar compra
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
@@ -0,0 +1,306 @@
|
|||||||
|
.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 290px;
|
||||||
|
max-width: 290px;
|
||||||
|
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: 290px;
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__divider {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 220px;
|
||||||
|
height: 1px;
|
||||||
|
margin: 1.2rem 0 1.45rem;
|
||||||
|
background: #dddddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__account {
|
||||||
|
width: 100%;
|
||||||
|
display: grid;
|
||||||
|
gap: 0.75rem;
|
||||||
|
color: #7a7a7a;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__eyebrow {
|
||||||
|
margin: 0;
|
||||||
|
color: #838383;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 325;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-detail {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto auto;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0.35rem;
|
||||||
|
align-items: center;
|
||||||
|
font-size: 12px;
|
||||||
|
|
||||||
|
&--copy {
|
||||||
|
grid-template-columns: auto auto auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__label {
|
||||||
|
color: #8a8a8a;
|
||||||
|
font-weight: 325;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__value {
|
||||||
|
color: #5e5e5e;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__feedback {
|
||||||
|
display: block;
|
||||||
|
margin-top: -0.25rem;
|
||||||
|
color: var(--tenant-primary, #6376f3);
|
||||||
|
font-size: 0.78rem;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.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,36 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
|
||||||
|
|
||||||
|
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||||
|
import { IconButtonComponent } from '../../../../shared/components/icon-button/icon-button.component';
|
||||||
|
import { QRCodeComponent } from '../../../../shared/components/qrcode/qrcode.component';
|
||||||
|
import { PaymentMethod, PaymentMethodOption, TransferAccount, TransferField } from './checkout-page.models';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-checkout-payment-step',
|
||||||
|
standalone: true,
|
||||||
|
imports: [ButtonComponent, IconButtonComponent, QRCodeComponent],
|
||||||
|
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.required<TransferAccount>();
|
||||||
|
readonly isGeneratingIntent = input<boolean>(false);
|
||||||
|
readonly qrData = input<string | null>(null);
|
||||||
|
|
||||||
|
readonly paymentMethodChange = output<PaymentMethod>();
|
||||||
|
readonly copyTransferValue = output<{ field: TransferField; value: string }>();
|
||||||
|
readonly cancelStep = output<void>();
|
||||||
|
readonly complete = 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,111 @@
|
|||||||
|
<header class="login-page__header text-center mb-2">
|
||||||
|
<h1 id="login-title" class="auth-title mb-3">Iniciar sesion</h1>
|
||||||
|
@if (serverError(); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<form
|
||||||
|
class="login-page__form d-grid gap-3"
|
||||||
|
novalidate
|
||||||
|
aria-labelledby="login-title"
|
||||||
|
[formGroup]="form"
|
||||||
|
(ngSubmit)="onSubmit()"
|
||||||
|
>
|
||||||
|
<div class="d-grid gap-3">
|
||||||
|
<label class="visually-hidden" for="login-email">Email</label>
|
||||||
|
<app-input
|
||||||
|
id="login-email"
|
||||||
|
type="email"
|
||||||
|
placeholder="Email"
|
||||||
|
[value]="form.controls.email.value"
|
||||||
|
[invalid]="showControlError('email')"
|
||||||
|
(valueChange)="updateEmail($event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('email'); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="d-grid gap-1">
|
||||||
|
<label class="visually-hidden" for="login-password">Contrasena</label>
|
||||||
|
<app-input
|
||||||
|
id="login-password"
|
||||||
|
type="password"
|
||||||
|
placeholder="Contrasena"
|
||||||
|
[value]="form.controls.password.value"
|
||||||
|
[invalid]="showControlError('password')"
|
||||||
|
(valueChange)="updatePassword($event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('password'); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
<div class="text-end">
|
||||||
|
<button type="button" class="login-page__forgot-password btn btn-link p-0 border-0 text-decoration-none">
|
||||||
|
Olvide mi contrasena
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="d-grid gap-2 text-center">
|
||||||
|
<app-button
|
||||||
|
type="submit"
|
||||||
|
hostClass="w-100 d-block"
|
||||||
|
buttonClass="w-100"
|
||||||
|
[disabled]="isSubmitting()"
|
||||||
|
>
|
||||||
|
{{ isSubmitting() ? 'Ingresando...' : 'Ingresar' }}
|
||||||
|
</app-button>
|
||||||
|
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="borderless"
|
||||||
|
hostClass="w-100 d-block text-center"
|
||||||
|
buttonClass="login-page__create-account px-3 py-2"
|
||||||
|
[disabled]="isSubmitting()"
|
||||||
|
(click)="goToRegister()"
|
||||||
|
>
|
||||||
|
Crear cuenta
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<div class="login-page__divider d-flex align-items-center justify-content-center gap-3 my-4" aria-hidden="true">
|
||||||
|
<span class="login-page__divider-line flex-grow-1"></span>
|
||||||
|
<span class="login-page__divider-dot rounded-circle border flex-shrink-0"></span>
|
||||||
|
<span class="login-page__divider-line flex-grow-1"></span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="neutral-outline"
|
||||||
|
hostClass="w-100 d-block"
|
||||||
|
buttonClass="w-100 d-inline-flex align-items-center justify-content-center gap-2 py-2 fw-semibold"
|
||||||
|
[disabled]="true"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
width="18"
|
||||||
|
height="18"
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
fill="#FFC107"
|
||||||
|
d="M43.61 20.08H42V20H24v8h11.3C33.65 32.66 29.19 36 24 36c-6.63 0-12-5.37-12-12s5.37-12 12-12c3.06 0 5.84 1.15 7.96 3.04l5.66-5.66C34.09 6.05 29.3 4 24 4C12.95 4 4 12.95 4 24s8.95 20 20 20s20-8.95 20-20c0-1.34-.14-2.65-.39-3.92z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
fill="#FF3D00"
|
||||||
|
d="M6.31 14.69l6.57 4.82C14.66 15.1 18.96 12 24 12c3.06 0 5.84 1.15 7.96 3.04l5.66-5.66C34.09 6.05 29.3 4 24 4C16.32 4 9.66 8.34 6.31 14.69z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
fill="#4CAF50"
|
||||||
|
d="M24 44c5.2 0 9.9-1.99 13.47-5.23l-6.19-5.24C29.2 35.11 26.72 36 24 36c-5.17 0-9.62-3.32-11.28-7.95l-6.52 5.02C9.51 39.56 16.24 44 24 44z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
fill="#1976D2"
|
||||||
|
d="M43.61 20.08H42V20H24v8h11.3c-.79 2.37-2.31 4.38-4.28 5.53l.01-.01l6.19 5.24C36.78 39.13 44 34 44 24c0-1.34-.14-2.65-.39-3.92z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
<span>Continuar con Google</span>
|
||||||
|
</app-button>
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
:host {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-page__header {
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-page__form {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-page__forgot-password {
|
||||||
|
color: #a0a0a0;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 325;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-page__create-account {
|
||||||
|
min-height: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-page__divider {
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-page__divider-line {
|
||||||
|
max-width: 18rem;
|
||||||
|
height: 1px;
|
||||||
|
background-color: #d9d9d9;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-page__divider-dot {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
border-color: #d9d9d9 !important;
|
||||||
|
background-color: #ffffff;
|
||||||
|
}
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { provideRouter, Router } from '@angular/router';
|
||||||
|
import { of, throwError } from 'rxjs';
|
||||||
|
|
||||||
|
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||||
|
import { LoginPageComponent } from './login-page.component';
|
||||||
|
|
||||||
|
describe('LoginPageComponent', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.resetTestingModule();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('submits credentials and redirects to home with a full page reload on success', async () => {
|
||||||
|
const authService = {
|
||||||
|
login: vi.fn().mockReturnValue(
|
||||||
|
of({
|
||||||
|
id: 1,
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com'
|
||||||
|
})
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [LoginPageComponent],
|
||||||
|
providers: [provideRouter([]), { provide: AuthService, useValue: authService }]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(LoginPageComponent);
|
||||||
|
const component = fixture.componentInstance as any;
|
||||||
|
const router = TestBed.inject(Router);
|
||||||
|
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||||
|
const redirectSpy = vi.spyOn(component, 'redirectToHome').mockImplementation(() => undefined);
|
||||||
|
|
||||||
|
component.form.setValue({
|
||||||
|
email: 'ada@example.com',
|
||||||
|
password: 'secret123'
|
||||||
|
});
|
||||||
|
|
||||||
|
component.onSubmit();
|
||||||
|
|
||||||
|
expect(authService.login).toHaveBeenCalledWith({
|
||||||
|
email: 'ada@example.com',
|
||||||
|
password: 'secret123'
|
||||||
|
});
|
||||||
|
expect(redirectSpy).toHaveBeenCalled();
|
||||||
|
expect(navigateSpy).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('surfaces backend login errors', async () => {
|
||||||
|
const authService = {
|
||||||
|
login: vi.fn().mockReturnValue(
|
||||||
|
throwError(() => ({
|
||||||
|
error: {
|
||||||
|
errors: {
|
||||||
|
email: ['Las credenciales son invalidas.']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [LoginPageComponent],
|
||||||
|
providers: [provideRouter([]), { provide: AuthService, useValue: authService }]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(LoginPageComponent);
|
||||||
|
const component = fixture.componentInstance as any;
|
||||||
|
|
||||||
|
component.form.setValue({
|
||||||
|
email: 'ada@example.com',
|
||||||
|
password: 'wrong-password'
|
||||||
|
});
|
||||||
|
|
||||||
|
component.onSubmit();
|
||||||
|
|
||||||
|
expect(component.serverError()).toBe('Las credenciales son invalidas.');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('validates email length and password minimum length before submit', async () => {
|
||||||
|
const authService = {
|
||||||
|
login: vi.fn()
|
||||||
|
};
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [LoginPageComponent],
|
||||||
|
providers: [provideRouter([]), { provide: AuthService, useValue: authService }]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(LoginPageComponent);
|
||||||
|
const component = fixture.componentInstance as any;
|
||||||
|
|
||||||
|
component.form.setValue({
|
||||||
|
email: `${'a'.repeat(250)}@example.com`,
|
||||||
|
password: '1234567'
|
||||||
|
});
|
||||||
|
component.onSubmit();
|
||||||
|
|
||||||
|
expect(authService.login).not.toHaveBeenCalled();
|
||||||
|
expect(component.getControlError('email')).toBe('No puede superar los 255 caracteres.');
|
||||||
|
expect(component.getControlError('password')).toBe('Debe tener al menos 8 caracteres.');
|
||||||
|
});
|
||||||
|
});
|
||||||
129
src/app/features/store/pages/login-page/login-page.component.ts
Normal file
129
src/app/features/store/pages/login-page/login-page.component.ts
Normal file
@@ -0,0 +1,129 @@
|
|||||||
|
import { DOCUMENT } from '@angular/common';
|
||||||
|
import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core';
|
||||||
|
import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
|
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||||
|
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||||
|
import { InputComponent } from '../../../../shared/components/input/input.component';
|
||||||
|
|
||||||
|
const PASSWORD_MIN_LENGTH = 8;
|
||||||
|
const EMAIL_MAX_LENGTH = 255;
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-login-page',
|
||||||
|
imports: [ReactiveFormsModule, InputComponent, ButtonComponent],
|
||||||
|
templateUrl: './login-page.component.html',
|
||||||
|
styleUrl: './login-page.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
|
})
|
||||||
|
export class LoginPageComponent {
|
||||||
|
private readonly formBuilder = inject(FormBuilder);
|
||||||
|
private readonly router = inject(Router);
|
||||||
|
private readonly authService = inject(AuthService);
|
||||||
|
private readonly document = inject(DOCUMENT);
|
||||||
|
|
||||||
|
private readonly submittedState = signal(false);
|
||||||
|
private readonly serverErrorState = signal<string | null>(null);
|
||||||
|
private readonly isSubmittingState = signal(false);
|
||||||
|
|
||||||
|
protected readonly form = this.formBuilder.nonNullable.group({
|
||||||
|
email: ['', [Validators.required, Validators.email, Validators.maxLength(EMAIL_MAX_LENGTH)]],
|
||||||
|
password: ['', [Validators.required, Validators.minLength(PASSWORD_MIN_LENGTH)]]
|
||||||
|
});
|
||||||
|
protected readonly submitted = this.submittedState.asReadonly();
|
||||||
|
protected readonly serverError = this.serverErrorState.asReadonly();
|
||||||
|
protected readonly isSubmitting = this.isSubmittingState.asReadonly();
|
||||||
|
|
||||||
|
goToRegister(): void {
|
||||||
|
void this.router.navigate(['/register']);
|
||||||
|
}
|
||||||
|
|
||||||
|
onSubmit(): void {
|
||||||
|
this.submittedState.set(true);
|
||||||
|
this.serverErrorState.set(null);
|
||||||
|
|
||||||
|
if (this.form.invalid) {
|
||||||
|
this.form.markAllAsTouched();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isSubmittingState.set(true);
|
||||||
|
|
||||||
|
this.authService.login(this.form.getRawValue()).subscribe({
|
||||||
|
next: () => {
|
||||||
|
this.isSubmittingState.set(false);
|
||||||
|
this.redirectToHome();
|
||||||
|
},
|
||||||
|
error: (error: unknown) => {
|
||||||
|
this.isSubmittingState.set(false);
|
||||||
|
this.serverErrorState.set(this.resolveErrorMessage(error));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected updateEmail(value: string | number): void {
|
||||||
|
this.form.controls.email.setValue(String(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected updatePassword(value: string | number): void {
|
||||||
|
this.form.controls.password.setValue(String(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected showControlError(controlName: 'email' | 'password'): boolean {
|
||||||
|
const control = this.form.controls[controlName];
|
||||||
|
|
||||||
|
return control.invalid && (control.touched || this.submitted());
|
||||||
|
}
|
||||||
|
|
||||||
|
protected getControlError(controlName: 'email' | 'password'): 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('maxlength')) {
|
||||||
|
return `No puede superar los ${EMAIL_MAX_LENGTH} caracteres.`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (control.hasError('email')) {
|
||||||
|
return 'Ingresa un email valido.';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (control.hasError('minlength')) {
|
||||||
|
return `Debe tener al menos ${PASSWORD_MIN_LENGTH} caracteres.`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'El valor ingresado no es valido.';
|
||||||
|
}
|
||||||
|
|
||||||
|
protected redirectToHome(): void {
|
||||||
|
const homeUrl = this.router.serializeUrl(this.router.createUrlTree(['/']));
|
||||||
|
this.document.location.assign(homeUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveErrorMessage(error: unknown): string {
|
||||||
|
const errorPayload =
|
||||||
|
typeof error === 'object' && error !== null && 'error' in error
|
||||||
|
? (error as { error?: { errors?: Record<string, string[]>; message?: string } }).error
|
||||||
|
: undefined;
|
||||||
|
const apiErrors = errorPayload?.errors;
|
||||||
|
const emailMessages = apiErrors?.['email'];
|
||||||
|
const emailError = Array.isArray(emailMessages) ? emailMessages[0] : null;
|
||||||
|
|
||||||
|
if (typeof emailError === 'string' && emailError.trim()) {
|
||||||
|
return emailError;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof errorPayload?.message === 'string' && errorPayload.message.trim()) {
|
||||||
|
return errorPayload.message;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'No se pudo iniciar sesion. Intenta nuevamente.';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
<div class="status-content">
|
||||||
|
@if (isLoading()) {
|
||||||
|
<div class="status-content__icon status-content__icon--loading">
|
||||||
|
<i class="fa-solid fa-spinner fa-spin"></i>
|
||||||
|
</div>
|
||||||
|
<h2 class="status-content__title">Cargando estado...</h2>
|
||||||
|
} @else if (status() === 'approved') {
|
||||||
|
<div class="status-content__section status-content__section--primary">
|
||||||
|
<div class="status-content__icon status-content__icon--success">
|
||||||
|
<i class="fa-solid fa-check"></i>
|
||||||
|
</div>
|
||||||
|
<h2 class="status-content__title">COMPRA REALIZADA!</h2>
|
||||||
|
<p class="status-content__subtitle">Tu compra fue realizada con éxito</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr class="status-content__divider" />
|
||||||
|
|
||||||
|
<div class="status-content__section status-content__section--secondary">
|
||||||
|
<p class="status-content__message">Comunicate con nosotros para coordinar el envío.</p>
|
||||||
|
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="secondary"
|
||||||
|
hostClass="status-content__button d-block"
|
||||||
|
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center gap-2 py-2"
|
||||||
|
(click)="openWhatsApp()"
|
||||||
|
>
|
||||||
|
<i class="fa-brands fa-whatsapp status-content__button-icon"></i>
|
||||||
|
<span>WhatsApp</span>
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
} @else if (status() === 'pending') {
|
||||||
|
<div class="status-content__section status-content__section--primary">
|
||||||
|
<div class="status-content__icon status-content__icon--warning">
|
||||||
|
<i class="fa-solid fa-clock"></i>
|
||||||
|
</div>
|
||||||
|
<h2 class="status-content__title">ESTAMOS VERIFICANDO TU PAGO</h2>
|
||||||
|
<p class="status-content__subtitle">Tu compra ya fue registrada y estamos esperando la confirmación del pago.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr class="status-content__divider" />
|
||||||
|
|
||||||
|
<div class="status-content__section status-content__section--secondary">
|
||||||
|
<p class="status-content__message">Esta pantalla se actualiza automáticamente cuando el pago impacta.</p>
|
||||||
|
@if (isRefreshing()) {
|
||||||
|
<p class="status-content__hint">Actualizando estado...</p>
|
||||||
|
}
|
||||||
|
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="secondary"
|
||||||
|
hostClass="status-content__button d-block"
|
||||||
|
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center py-2"
|
||||||
|
[disabled]="isRefreshing()"
|
||||||
|
(click)="retryStatusCheck()"
|
||||||
|
>
|
||||||
|
Actualizar estado
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
} @else if (status() === 'rejected') {
|
||||||
|
<div class="status-content__section status-content__section--primary">
|
||||||
|
<div class="status-content__icon status-content__icon--error">
|
||||||
|
<i class="fa-solid fa-triangle-exclamation"></i>
|
||||||
|
</div>
|
||||||
|
<h2 class="status-content__title">NO PUDIMOS CONFIRMAR EL PAGO</h2>
|
||||||
|
<p class="status-content__subtitle">Revisá el medio de pago o comunicate con nosotros para continuar.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr class="status-content__divider" />
|
||||||
|
|
||||||
|
<div class="status-content__section status-content__section--secondary">
|
||||||
|
<p class="status-content__message">Si ya pagaste, podés reintentar la consulta o escribirnos para revisarlo.</p>
|
||||||
|
|
||||||
|
<div class="status-content__actions">
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="secondary"
|
||||||
|
hostClass="status-content__button d-block"
|
||||||
|
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center py-2"
|
||||||
|
(click)="retryStatusCheck()"
|
||||||
|
>
|
||||||
|
Reintentar
|
||||||
|
</app-button>
|
||||||
|
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="secondary"
|
||||||
|
hostClass="status-content__button d-block"
|
||||||
|
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center gap-2 py-2"
|
||||||
|
(click)="openWhatsApp()"
|
||||||
|
>
|
||||||
|
<i class="fa-brands fa-whatsapp status-content__button-icon"></i>
|
||||||
|
<span>WhatsApp</span>
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
} @else {
|
||||||
|
<div class="status-content__section status-content__section--primary">
|
||||||
|
<div class="status-content__icon status-content__icon--error">
|
||||||
|
<i class="fa-solid fa-triangle-exclamation"></i>
|
||||||
|
</div>
|
||||||
|
<h2 class="status-content__title">NO PUDIMOS OBTENER EL ESTADO</h2>
|
||||||
|
<p class="status-content__subtitle">Hubo un problema al consultar tu compra.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr class="status-content__divider" />
|
||||||
|
|
||||||
|
<div class="status-content__section status-content__section--secondary">
|
||||||
|
<p class="status-content__message">Reintentá en unos segundos. Si el problema sigue, comunicate con nosotros.</p>
|
||||||
|
|
||||||
|
<div class="status-content__actions">
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="secondary"
|
||||||
|
hostClass="status-content__button d-block"
|
||||||
|
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center py-2"
|
||||||
|
(click)="retryStatusCheck()"
|
||||||
|
>
|
||||||
|
Reintentar
|
||||||
|
</app-button>
|
||||||
|
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="secondary"
|
||||||
|
hostClass="status-content__button d-block"
|
||||||
|
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center gap-2 py-2"
|
||||||
|
(click)="openWhatsApp()"
|
||||||
|
>
|
||||||
|
<i class="fa-brands fa-whatsapp status-content__button-icon"></i>
|
||||||
|
<span>WhatsApp</span>
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,136 @@
|
|||||||
|
:host {
|
||||||
|
--color-primary: var(--tenant-primary, #6376f3);
|
||||||
|
--color-primary-rgb: var(--tenant-primary-rgb, 99, 118, 243);
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
padding: 2rem 1rem;
|
||||||
|
|
||||||
|
&__section {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__section--primary {
|
||||||
|
gap: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__section--secondary {
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__icon {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
width: 92px;
|
||||||
|
height: 92px;
|
||||||
|
border-radius: 50%;
|
||||||
|
font-size: 2rem;
|
||||||
|
margin-bottom: 0.25rem;
|
||||||
|
|
||||||
|
i {
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
&--success {
|
||||||
|
background-color: color-mix(in srgb, white 92%, var(--color-primary));
|
||||||
|
color: var(--color-primary) !important;
|
||||||
|
border: 1.5px solid color-mix(in srgb, white 20%, var(--color-primary));
|
||||||
|
}
|
||||||
|
|
||||||
|
&--warning {
|
||||||
|
background-color: color-mix(in srgb, white 92%, var(--color-primary));
|
||||||
|
color: var(--color-primary) !important;
|
||||||
|
border: 1.5px solid color-mix(in srgb, white 20%, var(--color-primary));
|
||||||
|
}
|
||||||
|
|
||||||
|
&--error {
|
||||||
|
background-color: color-mix(in srgb, white 92%, var(--color-primary));
|
||||||
|
color: var(--color-primary) !important;
|
||||||
|
border: 1.5px solid color-mix(in srgb, white 20%, var(--color-primary));
|
||||||
|
}
|
||||||
|
|
||||||
|
&--loading {
|
||||||
|
background-color: color-mix(in srgb, white 90%, var(--color-primary));
|
||||||
|
color: var(--color-primary);
|
||||||
|
border: 2px solid var(--color-primary);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__title {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.25;
|
||||||
|
color: var(--color-primary) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__subtitle {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.35;
|
||||||
|
color: #8a8a8a;
|
||||||
|
max-width: 320px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__divider {
|
||||||
|
display: block;
|
||||||
|
width: min(100%, 410px);
|
||||||
|
height: 1px;
|
||||||
|
background-color: #d9d9d9 !important;
|
||||||
|
border: 0;
|
||||||
|
opacity: 1;
|
||||||
|
margin: 1.75rem 0 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__message {
|
||||||
|
max-width: 320px;
|
||||||
|
margin: 0;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 325;
|
||||||
|
line-height: 1.45;
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
&__hint {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.4;
|
||||||
|
color: #8a8a8a;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__actions {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__button {
|
||||||
|
width: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__button-control {
|
||||||
|
min-width: 180px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__button-icon {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
font-size: 20px;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,128 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, inject, signal } from '@angular/core';
|
||||||
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
|
||||||
|
import { CheckoutService, PurchaseStatusResponse } from '../../../../core/services/checkout.service';
|
||||||
|
import { TenantService } from '../../../../core/services/tenant.service';
|
||||||
|
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||||
|
|
||||||
|
type PurchaseStatusView = 'approved' | 'pending' | 'rejected' | 'error';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-purchase-status-page',
|
||||||
|
standalone: true,
|
||||||
|
imports: [ButtonComponent],
|
||||||
|
templateUrl: './purchase-status-page.component.html',
|
||||||
|
styleUrl: './purchase-status-page.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
|
})
|
||||||
|
export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
|
||||||
|
private readonly route = inject(ActivatedRoute);
|
||||||
|
private readonly router = inject(Router);
|
||||||
|
private readonly checkoutService = inject(CheckoutService);
|
||||||
|
private readonly tenantService = inject(TenantService);
|
||||||
|
|
||||||
|
private readonly pollIntervalMs = 5000;
|
||||||
|
private purchaseId: string | null = null;
|
||||||
|
private tenantCode: string | null = null;
|
||||||
|
private pollTimeoutId: ReturnType<typeof setTimeout> | null = null;
|
||||||
|
|
||||||
|
protected readonly isLoading = signal(true);
|
||||||
|
protected readonly isRefreshing = signal(false);
|
||||||
|
protected readonly status = signal<PurchaseStatusView>('pending');
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
const purchaseId = this.route.snapshot.paramMap.get('id');
|
||||||
|
const tenant = this.tenantService.tenant();
|
||||||
|
|
||||||
|
if (!purchaseId || !tenant) {
|
||||||
|
void this.router.navigate(['/']);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.purchaseId = purchaseId;
|
||||||
|
this.tenantCode = tenant.codigo;
|
||||||
|
|
||||||
|
void this.refreshStatus(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
this.clearScheduledPoll();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected retryStatusCheck(): void {
|
||||||
|
void this.refreshStatus(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async refreshStatus(showLoader: boolean): Promise<void> {
|
||||||
|
if (!this.purchaseId || !this.tenantCode) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.clearScheduledPoll();
|
||||||
|
|
||||||
|
if (showLoader) {
|
||||||
|
this.isLoading.set(true);
|
||||||
|
} else {
|
||||||
|
this.isRefreshing.set(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const purchase = await this.checkoutService.getPurchase(this.tenantCode, this.purchaseId);
|
||||||
|
const resolvedStatus = this.resolveStatus(purchase);
|
||||||
|
|
||||||
|
this.status.set(resolvedStatus);
|
||||||
|
|
||||||
|
if (resolvedStatus === 'pending') {
|
||||||
|
this.scheduleNextPoll();
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to fetch purchase status:', error);
|
||||||
|
this.status.set('error');
|
||||||
|
} finally {
|
||||||
|
this.isLoading.set(false);
|
||||||
|
this.isRefreshing.set(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveStatus(purchase: PurchaseStatusResponse): PurchaseStatusView {
|
||||||
|
if (purchase.status === 'paid') {
|
||||||
|
return 'approved';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (purchase.status === 'rejected' || purchase.status === 'cancelled') {
|
||||||
|
return 'rejected';
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'pending';
|
||||||
|
}
|
||||||
|
|
||||||
|
private scheduleNextPoll(): void {
|
||||||
|
if (this.pollTimeoutId !== null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.pollTimeoutId = setTimeout(() => {
|
||||||
|
this.pollTimeoutId = null;
|
||||||
|
void this.refreshStatus(false);
|
||||||
|
}, this.pollIntervalMs);
|
||||||
|
}
|
||||||
|
|
||||||
|
private clearScheduledPoll(): void {
|
||||||
|
if (this.pollTimeoutId === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
clearTimeout(this.pollTimeoutId);
|
||||||
|
this.pollTimeoutId = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected getWhatsAppLink(): string {
|
||||||
|
const phone = '5493416658247';
|
||||||
|
const message = encodeURIComponent('Hola! Mi compra fue realizada con \u00E9xito.');
|
||||||
|
return `https://wa.me/${phone}?text=${message}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected openWhatsApp(): void {
|
||||||
|
window.open(this.getWhatsAppLink(), '_blank', 'noopener,noreferrer');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
<header class="register-page__header text-center mb-4">
|
||||||
|
<h1 id="register-title" class="auth-title">CREAR CUENTA</h1>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<form
|
||||||
|
class="register-page__form d-grid gap-3"
|
||||||
|
novalidate
|
||||||
|
aria-labelledby="register-title"
|
||||||
|
[formGroup]="form"
|
||||||
|
(ngSubmit)="onSubmit()"
|
||||||
|
>
|
||||||
|
<div class="d-grid gap-3">
|
||||||
|
<label class="visually-hidden" for="register-full-name">Nombre y Apellido</label>
|
||||||
|
<app-input
|
||||||
|
id="register-full-name"
|
||||||
|
placeholder="Nombre y Apellido"
|
||||||
|
[value]="form.controls.nombre_apellido.value"
|
||||||
|
[invalid]="showControlError('nombre_apellido')"
|
||||||
|
(valueChange)="updateField('nombre_apellido', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('nombre_apellido'); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
|
||||||
|
<label class="visually-hidden" for="register-email">Email</label>
|
||||||
|
<app-input
|
||||||
|
id="register-email"
|
||||||
|
type="email"
|
||||||
|
placeholder="Email"
|
||||||
|
[value]="form.controls.email.value"
|
||||||
|
[invalid]="showControlError('email')"
|
||||||
|
(valueChange)="updateField('email', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('email'); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
|
||||||
|
<label class="visually-hidden" for="register-password">Contrasena</label>
|
||||||
|
<app-input
|
||||||
|
id="register-password"
|
||||||
|
type="password"
|
||||||
|
placeholder="Contrasena"
|
||||||
|
[value]="form.controls.password.value"
|
||||||
|
[invalid]="showControlError('password')"
|
||||||
|
(valueChange)="updateField('password', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('password'); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
|
||||||
|
<label class="visually-hidden" for="register-password-repeat">Repetir Contrasena</label>
|
||||||
|
<app-input
|
||||||
|
id="register-password-repeat"
|
||||||
|
type="password"
|
||||||
|
placeholder="Repetir Contrasena"
|
||||||
|
[value]="form.controls.password_confirmation.value"
|
||||||
|
[invalid]="showControlError('password_confirmation')"
|
||||||
|
(valueChange)="updateField('password_confirmation', $event)"
|
||||||
|
/>
|
||||||
|
@if (getControlError('password_confirmation'); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="d-grid gap-2 text-center">
|
||||||
|
@if (serverError(); as errorMessage) {
|
||||||
|
<small class="text-danger">{{ errorMessage }}</small>
|
||||||
|
}
|
||||||
|
<app-button
|
||||||
|
type="submit"
|
||||||
|
hostClass="w-100 d-block"
|
||||||
|
buttonClass="w-100"
|
||||||
|
[disabled]="isSubmitting()"
|
||||||
|
>
|
||||||
|
{{ isSubmitting() ? 'Creando cuenta...' : 'Crear Cuenta' }}
|
||||||
|
</app-button>
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="borderless"
|
||||||
|
hostClass="w-100 d-block text-center"
|
||||||
|
buttonClass="register-page__back-action px-3 py-2"
|
||||||
|
[disabled]="isSubmitting()"
|
||||||
|
(click)="goToLogin()"
|
||||||
|
>
|
||||||
|
Volver
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
:host {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.register-page__header {
|
||||||
|
}
|
||||||
|
|
||||||
|
.register-page__form {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.register-page__back-action {
|
||||||
|
min-height: 40px;
|
||||||
|
}
|
||||||
@@ -0,0 +1,189 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { provideRouter, Router } from '@angular/router';
|
||||||
|
import { of, throwError } from 'rxjs';
|
||||||
|
|
||||||
|
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||||
|
import { ModalService } from '../../../../core/services/modal.service';
|
||||||
|
import { ToastService } from '../../../../core/services/toast.service';
|
||||||
|
import { RegisterPageComponent } from './register-page.component';
|
||||||
|
|
||||||
|
describe('RegisterPageComponent', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.resetTestingModule();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('submits registration data and redirects to /login on success', async () => {
|
||||||
|
const authService = {
|
||||||
|
register: vi.fn().mockReturnValue(
|
||||||
|
of({
|
||||||
|
message: 'Usuario registrado correctamente.',
|
||||||
|
data: {
|
||||||
|
id: 1,
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
)
|
||||||
|
};
|
||||||
|
const modalService = {
|
||||||
|
openSimple: vi.fn().mockReturnValue(of(undefined))
|
||||||
|
};
|
||||||
|
const toastService = {
|
||||||
|
danger: vi.fn()
|
||||||
|
};
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [RegisterPageComponent],
|
||||||
|
providers: [
|
||||||
|
provideRouter([]),
|
||||||
|
{ provide: AuthService, useValue: authService },
|
||||||
|
{ provide: ModalService, useValue: modalService },
|
||||||
|
{ provide: ToastService, useValue: toastService }
|
||||||
|
]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(RegisterPageComponent);
|
||||||
|
const component = fixture.componentInstance as any;
|
||||||
|
const router = TestBed.inject(Router);
|
||||||
|
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||||
|
|
||||||
|
component.form.setValue({
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com',
|
||||||
|
password: 'secret123',
|
||||||
|
password_confirmation: 'secret123'
|
||||||
|
});
|
||||||
|
|
||||||
|
component.onSubmit();
|
||||||
|
|
||||||
|
expect(authService.register).toHaveBeenCalledWith({
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com',
|
||||||
|
password: 'secret123',
|
||||||
|
password_confirmation: 'secret123'
|
||||||
|
});
|
||||||
|
expect(modalService.openSimple).toHaveBeenCalledWith({
|
||||||
|
content: 'Tu cuenta fue creada correctamente',
|
||||||
|
buttonLabel: 'Cerrar'
|
||||||
|
});
|
||||||
|
expect(navigateSpy).toHaveBeenCalledWith(['/login']);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows a mismatch message when passwords do not match', async () => {
|
||||||
|
const authService = {
|
||||||
|
register: vi.fn()
|
||||||
|
};
|
||||||
|
const modalService = {
|
||||||
|
openSimple: vi.fn()
|
||||||
|
};
|
||||||
|
const toastService = {
|
||||||
|
danger: vi.fn()
|
||||||
|
};
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [RegisterPageComponent],
|
||||||
|
providers: [
|
||||||
|
provideRouter([]),
|
||||||
|
{ provide: AuthService, useValue: authService },
|
||||||
|
{ provide: ModalService, useValue: modalService },
|
||||||
|
{ provide: ToastService, useValue: toastService }
|
||||||
|
]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(RegisterPageComponent);
|
||||||
|
const component = fixture.componentInstance as any;
|
||||||
|
|
||||||
|
component.form.setValue({
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com',
|
||||||
|
password: 'secret123',
|
||||||
|
password_confirmation: 'different'
|
||||||
|
});
|
||||||
|
component.onSubmit();
|
||||||
|
|
||||||
|
expect(authService.register).not.toHaveBeenCalled();
|
||||||
|
expect(component.getControlError('password_confirmation')).toBe('Las contrasenas no coinciden.');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('validates max length and password minimum length before submit', async () => {
|
||||||
|
const authService = {
|
||||||
|
register: vi.fn()
|
||||||
|
};
|
||||||
|
const modalService = {
|
||||||
|
openSimple: vi.fn()
|
||||||
|
};
|
||||||
|
const toastService = {
|
||||||
|
danger: vi.fn()
|
||||||
|
};
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [RegisterPageComponent],
|
||||||
|
providers: [
|
||||||
|
provideRouter([]),
|
||||||
|
{ provide: AuthService, useValue: authService },
|
||||||
|
{ provide: ModalService, useValue: modalService },
|
||||||
|
{ provide: ToastService, useValue: toastService }
|
||||||
|
]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(RegisterPageComponent);
|
||||||
|
const component = fixture.componentInstance as any;
|
||||||
|
|
||||||
|
component.form.setValue({
|
||||||
|
nombre_apellido: 'A'.repeat(256),
|
||||||
|
email: `${'a'.repeat(250)}@example.com`,
|
||||||
|
password: '1234567',
|
||||||
|
password_confirmation: '1234567'
|
||||||
|
});
|
||||||
|
component.onSubmit();
|
||||||
|
|
||||||
|
expect(authService.register).not.toHaveBeenCalled();
|
||||||
|
expect(component.getControlError('nombre_apellido')).toBe('No puede superar los 255 caracteres.');
|
||||||
|
expect(component.getControlError('email')).toBe('No puede superar los 255 caracteres.');
|
||||||
|
expect(component.getControlError('password')).toBe('Debe tener al menos 8 caracteres.');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('surfaces backend register errors', async () => {
|
||||||
|
const authService = {
|
||||||
|
register: vi.fn().mockReturnValue(
|
||||||
|
throwError(() => ({
|
||||||
|
error: {
|
||||||
|
errors: {
|
||||||
|
email: ['El email ya esta en uso.']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
)
|
||||||
|
};
|
||||||
|
const modalService = {
|
||||||
|
openSimple: vi.fn()
|
||||||
|
};
|
||||||
|
const toastService = {
|
||||||
|
danger: vi.fn()
|
||||||
|
};
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [RegisterPageComponent],
|
||||||
|
providers: [
|
||||||
|
provideRouter([]),
|
||||||
|
{ provide: AuthService, useValue: authService },
|
||||||
|
{ provide: ModalService, useValue: modalService },
|
||||||
|
{ provide: ToastService, useValue: toastService }
|
||||||
|
]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(RegisterPageComponent);
|
||||||
|
const component = fixture.componentInstance as any;
|
||||||
|
|
||||||
|
component.form.setValue({
|
||||||
|
nombre_apellido: 'Ada Lovelace',
|
||||||
|
email: 'ada@example.com',
|
||||||
|
password: 'secret123',
|
||||||
|
password_confirmation: 'secret123'
|
||||||
|
});
|
||||||
|
component.onSubmit();
|
||||||
|
|
||||||
|
expect(component.serverError()).toBe('El email ya esta en uso.');
|
||||||
|
expect(toastService.danger).toHaveBeenCalledWith('El email ya esta en uso.');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,175 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core';
|
||||||
|
import {
|
||||||
|
AbstractControl,
|
||||||
|
FormBuilder,
|
||||||
|
ReactiveFormsModule,
|
||||||
|
ValidationErrors,
|
||||||
|
ValidatorFn,
|
||||||
|
Validators
|
||||||
|
} from '@angular/forms';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
|
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||||
|
import { ModalService } from '../../../../core/services/modal.service';
|
||||||
|
import { ToastService } from '../../../../core/services/toast.service';
|
||||||
|
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||||
|
import { InputComponent } from '../../../../shared/components/input/input.component';
|
||||||
|
|
||||||
|
const PASSWORD_MIN_LENGTH = 8;
|
||||||
|
const TEXT_MAX_LENGTH = 255;
|
||||||
|
|
||||||
|
const passwordsMatchValidator: ValidatorFn = (
|
||||||
|
control: AbstractControl
|
||||||
|
): ValidationErrors | null => {
|
||||||
|
const password = control.get('password')?.value;
|
||||||
|
const passwordConfirmation = control.get('password_confirmation')?.value;
|
||||||
|
|
||||||
|
if (!password || !passwordConfirmation) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return password === passwordConfirmation ? null : { passwordMismatch: true };
|
||||||
|
};
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-register-page',
|
||||||
|
imports: [ReactiveFormsModule, InputComponent, ButtonComponent],
|
||||||
|
templateUrl: './register-page.component.html',
|
||||||
|
styleUrl: './register-page.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
|
})
|
||||||
|
export class RegisterPageComponent {
|
||||||
|
private readonly formBuilder = inject(FormBuilder);
|
||||||
|
private readonly router = inject(Router);
|
||||||
|
private readonly authService = inject(AuthService);
|
||||||
|
private readonly modalService = inject(ModalService);
|
||||||
|
private readonly toastService = inject(ToastService);
|
||||||
|
|
||||||
|
private readonly submittedState = signal(false);
|
||||||
|
private readonly serverErrorState = signal<string | null>(null);
|
||||||
|
private readonly isSubmittingState = signal(false);
|
||||||
|
|
||||||
|
protected readonly form = this.formBuilder.nonNullable.group({
|
||||||
|
nombre_apellido: ['', [Validators.required, Validators.maxLength(TEXT_MAX_LENGTH)]],
|
||||||
|
email: [
|
||||||
|
'',
|
||||||
|
[Validators.required, Validators.email, Validators.maxLength(TEXT_MAX_LENGTH)]
|
||||||
|
],
|
||||||
|
password: ['', [Validators.required, Validators.minLength(PASSWORD_MIN_LENGTH)]],
|
||||||
|
password_confirmation: ['', [Validators.required]]
|
||||||
|
}, {
|
||||||
|
validators: [passwordsMatchValidator]
|
||||||
|
});
|
||||||
|
protected readonly submitted = this.submittedState.asReadonly();
|
||||||
|
protected readonly serverError = this.serverErrorState.asReadonly();
|
||||||
|
protected readonly isSubmitting = this.isSubmittingState.asReadonly();
|
||||||
|
|
||||||
|
goToLogin(): void {
|
||||||
|
void this.router.navigate(['/login']);
|
||||||
|
}
|
||||||
|
|
||||||
|
onSubmit(): void {
|
||||||
|
this.submittedState.set(true);
|
||||||
|
this.serverErrorState.set(null);
|
||||||
|
|
||||||
|
if (this.form.invalid) {
|
||||||
|
this.form.markAllAsTouched();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isSubmittingState.set(true);
|
||||||
|
|
||||||
|
this.authService.register(this.form.getRawValue()).subscribe({
|
||||||
|
next: () => {
|
||||||
|
this.isSubmittingState.set(false);
|
||||||
|
this.modalService.openSimple({
|
||||||
|
content: 'Tu cuenta fue creada correctamente',
|
||||||
|
buttonLabel: 'Cerrar'
|
||||||
|
}).subscribe(() => {
|
||||||
|
void this.router.navigate(['/login']);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
error: (error: unknown) => {
|
||||||
|
this.isSubmittingState.set(false);
|
||||||
|
const errorMessage = this.resolveErrorMessage(error);
|
||||||
|
this.serverErrorState.set(errorMessage);
|
||||||
|
this.toastService.danger(errorMessage);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected updateField(
|
||||||
|
controlName: 'nombre_apellido' | 'email' | 'password' | 'password_confirmation',
|
||||||
|
value: string | number
|
||||||
|
): void {
|
||||||
|
this.form.controls[controlName].setValue(String(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected showControlError(
|
||||||
|
controlName: 'nombre_apellido' | 'email' | 'password' | 'password_confirmation'
|
||||||
|
): boolean {
|
||||||
|
const control = this.form.controls[controlName];
|
||||||
|
const hasPasswordMismatch =
|
||||||
|
controlName === 'password_confirmation' &&
|
||||||
|
this.form.hasError('passwordMismatch') &&
|
||||||
|
(control.touched || this.submitted());
|
||||||
|
|
||||||
|
return (control.invalid && (control.touched || this.submitted())) || hasPasswordMismatch;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected getControlError(
|
||||||
|
controlName: 'nombre_apellido' | 'email' | 'password' | 'password_confirmation'
|
||||||
|
): 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('maxlength')) {
|
||||||
|
return `No puede superar los ${TEXT_MAX_LENGTH} caracteres.`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (control.hasError('email')) {
|
||||||
|
return 'Ingresa un email valido.';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (control.hasError('minlength')) {
|
||||||
|
return `Debe tener al menos ${PASSWORD_MIN_LENGTH} caracteres.`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (controlName === 'password_confirmation' && this.form.hasError('passwordMismatch')) {
|
||||||
|
return 'Las contrasenas no coinciden.';
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'El valor ingresado no es valido.';
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveErrorMessage(error: unknown): string {
|
||||||
|
const errorPayload =
|
||||||
|
typeof error === 'object' && error !== null && 'error' in error
|
||||||
|
? (error as { error?: { errors?: Record<string, string[]>; message?: string } }).error
|
||||||
|
: undefined;
|
||||||
|
const apiErrors = errorPayload?.errors;
|
||||||
|
|
||||||
|
if (apiErrors && typeof apiErrors === 'object') {
|
||||||
|
for (const field of ['nombre_apellido', 'email', 'password'] as const) {
|
||||||
|
const messages = apiErrors[field];
|
||||||
|
|
||||||
|
if (Array.isArray(messages) && typeof messages[0] === 'string' && messages[0].trim()) {
|
||||||
|
return messages[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof errorPayload?.message === 'string' && errorPayload.message.trim()) {
|
||||||
|
return errorPayload.message;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'No se pudo crear la cuenta. Intenta nuevamente.';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,10 @@
|
|||||||
import { Routes } from '@angular/router';
|
import { Routes } from '@angular/router';
|
||||||
|
|
||||||
|
import { SimpleLayoutComponent } from '../../core/layout/simple-layout/simple-layout.component';
|
||||||
import { StoreLayoutComponent } from '../../core/layout/store-layout/store-layout.component';
|
import { StoreLayoutComponent } from '../../core/layout/store-layout/store-layout.component';
|
||||||
|
import { authGuard, guestOnlyGuard } from '../../core/services/auth/auth.guards';
|
||||||
|
import { LoginPageComponent } from './pages/login-page/login-page.component';
|
||||||
|
import { RegisterPageComponent } from './pages/register-page/register-page.component';
|
||||||
import { StoreHomePageComponent } from './pages/store-home-page/store-home-page.component';
|
import { StoreHomePageComponent } from './pages/store-home-page/store-home-page.component';
|
||||||
|
|
||||||
export const routes: Routes = [
|
export const routes: Routes = [
|
||||||
@@ -12,12 +16,55 @@ export const routes: Routes = [
|
|||||||
path: '',
|
path: '',
|
||||||
component: StoreHomePageComponent
|
component: StoreHomePageComponent
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'login',
|
||||||
|
canActivate: [guestOnlyGuard],
|
||||||
|
component: SimpleLayoutComponent,
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: LoginPageComponent
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'register',
|
||||||
|
canActivate: [guestOnlyGuard],
|
||||||
|
component: SimpleLayoutComponent,
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: RegisterPageComponent
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: 'producto/:id',
|
path: 'producto/:id',
|
||||||
loadComponent: () =>
|
loadComponent: () =>
|
||||||
import('./pages/product-detail-page/product-detail-page.component').then(
|
import('./pages/product-detail-page/product-detail-page.component').then(
|
||||||
(m) => m.ProductDetailPageComponent
|
(m) => m.ProductDetailPageComponent
|
||||||
)
|
)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'checkout',
|
||||||
|
canActivate: [authGuard],
|
||||||
|
loadComponent: () =>
|
||||||
|
import('./pages/checkout-page/checkout-page.component').then(
|
||||||
|
(m) => m.CheckoutPageComponent
|
||||||
|
)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'checkout/status',
|
||||||
|
component: SimpleLayoutComponent,
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
path: ':id',
|
||||||
|
loadComponent: () =>
|
||||||
|
import('./pages/purchase-status-page/purchase-status-page.component').then(
|
||||||
|
(m) => m.PurchaseStatusPageComponent
|
||||||
|
)
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.btn-outline-primary,
|
.btn-outline-primary,
|
||||||
.btn-outline-danger {
|
.btn-outline-neutral,
|
||||||
|
.btn-outline-danger,
|
||||||
|
.btn-borderless {
|
||||||
--bs-btn-bg: transparent;
|
--bs-btn-bg: transparent;
|
||||||
--bs-btn-hover-color: #fff;
|
--bs-btn-hover-color: #fff;
|
||||||
--bs-btn-active-color: #fff;
|
--bs-btn-active-color: #fff;
|
||||||
@@ -85,6 +87,17 @@
|
|||||||
--bs-btn-disabled-border-color: color-mix(in srgb, transparent 35%, var(--tenant-primary));
|
--bs-btn-disabled-border-color: color-mix(in srgb, transparent 35%, var(--tenant-primary));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.btn-outline-neutral {
|
||||||
|
--bs-btn-color: #666666;
|
||||||
|
--bs-btn-border-color: #a0a0a0;
|
||||||
|
--bs-btn-hover-bg: #a0a0a0;
|
||||||
|
--bs-btn-hover-border-color: #a0a0a0;
|
||||||
|
--bs-btn-active-bg: #8a8a8a;
|
||||||
|
--bs-btn-active-border-color: #8a8a8a;
|
||||||
|
--bs-btn-disabled-color: rgba(102, 102, 102, 0.55);
|
||||||
|
--bs-btn-disabled-border-color: rgba(160, 160, 160, 0.55);
|
||||||
|
}
|
||||||
|
|
||||||
.btn-outline-danger {
|
.btn-outline-danger {
|
||||||
--bs-btn-color: var(--tenant-danger);
|
--bs-btn-color: var(--tenant-danger);
|
||||||
--bs-btn-border-color: var(--tenant-danger);
|
--bs-btn-border-color: var(--tenant-danger);
|
||||||
@@ -95,3 +108,22 @@
|
|||||||
--bs-btn-disabled-color: color-mix(in srgb, transparent 35%, var(--tenant-danger));
|
--bs-btn-disabled-color: color-mix(in srgb, transparent 35%, var(--tenant-danger));
|
||||||
--bs-btn-disabled-border-color: color-mix(in srgb, transparent 35%, var(--tenant-danger));
|
--bs-btn-disabled-border-color: color-mix(in srgb, transparent 35%, var(--tenant-danger));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.btn-borderless {
|
||||||
|
min-width: auto;
|
||||||
|
padding-inline: 0;
|
||||||
|
border: 0;
|
||||||
|
color: var(--tenant-primary);
|
||||||
|
font-weight: 700;
|
||||||
|
--bs-btn-border-color: transparent;
|
||||||
|
--bs-btn-hover-color: color-mix(in srgb, black 18%, var(--tenant-primary));
|
||||||
|
--bs-btn-hover-bg: transparent;
|
||||||
|
--bs-btn-hover-border-color: transparent;
|
||||||
|
--bs-btn-active-color: color-mix(in srgb, black 24%, var(--tenant-primary));
|
||||||
|
--bs-btn-active-bg: transparent;
|
||||||
|
--bs-btn-active-border-color: transparent;
|
||||||
|
--bs-btn-disabled-color: color-mix(in srgb, transparent 35%, var(--tenant-primary));
|
||||||
|
--bs-btn-disabled-bg: transparent;
|
||||||
|
--bs-btn-disabled-border-color: transparent;
|
||||||
|
--bs-btn-disabled-opacity: 1;
|
||||||
|
}
|
||||||
|
|||||||
19
src/app/shared/components/button/button.component.spec.ts
Normal file
19
src/app/shared/components/button/button.component.spec.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ButtonComponent } from './button.component';
|
||||||
|
|
||||||
|
describe('ButtonComponent', () => {
|
||||||
|
it('applies the borderless variant class', async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [ButtonComponent]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(ButtonComponent);
|
||||||
|
fixture.componentRef.setInput('variant', 'borderless');
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const button = fixture.nativeElement.querySelector('button') as HTMLButtonElement;
|
||||||
|
|
||||||
|
expect(button.classList.contains('btn-borderless')).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -4,6 +4,8 @@ import { NgClass } from '@angular/common';
|
|||||||
export type ButtonVariant =
|
export type ButtonVariant =
|
||||||
| 'primary'
|
| 'primary'
|
||||||
| 'secondary'
|
| 'secondary'
|
||||||
|
| 'neutral-outline'
|
||||||
|
| 'borderless'
|
||||||
| 'danger'
|
| 'danger'
|
||||||
| 'danger-secondary'
|
| 'danger-secondary'
|
||||||
| 'cancel';
|
| 'cancel';
|
||||||
@@ -13,22 +15,44 @@ export type ButtonVariant =
|
|||||||
imports: [NgClass],
|
imports: [NgClass],
|
||||||
templateUrl: './button.component.html',
|
templateUrl: './button.component.html',
|
||||||
styleUrl: './button.component.scss',
|
styleUrl: './button.component.scss',
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
host: {
|
||||||
|
'[class]': 'hostClasses()',
|
||||||
|
'[attr.aria-disabled]': 'disabled()',
|
||||||
|
'(click)': 'onHostClick($event)'
|
||||||
|
}
|
||||||
})
|
})
|
||||||
export class ButtonComponent {
|
export class ButtonComponent {
|
||||||
readonly variant = input<ButtonVariant>('primary');
|
readonly variant = input<ButtonVariant>('primary');
|
||||||
readonly type = input<'button' | 'submit' | 'reset'>('button');
|
readonly type = input<'button' | 'submit' | 'reset'>('button');
|
||||||
readonly disabled = input(false);
|
readonly disabled = input(false);
|
||||||
|
readonly hostClass = input<string>('');
|
||||||
|
readonly buttonClass = input<string>('');
|
||||||
|
protected readonly hostClasses = computed(() =>
|
||||||
|
[this.hostClass(), this.disabled() ? 'app-button--disabled' : ''].filter(Boolean).join(' ')
|
||||||
|
);
|
||||||
|
|
||||||
protected readonly buttonClasses = computed(() => {
|
protected readonly buttonClasses = computed(() => {
|
||||||
const variants: Record<ButtonVariant, string> = {
|
const variants: Record<ButtonVariant, string> = {
|
||||||
primary: 'btn-primary',
|
primary: 'btn-primary',
|
||||||
secondary: 'btn-outline-primary',
|
secondary: 'btn-outline-primary',
|
||||||
|
'neutral-outline': 'btn-outline-neutral',
|
||||||
|
borderless: 'btn-borderless',
|
||||||
danger: 'btn-danger',
|
danger: 'btn-danger',
|
||||||
'danger-secondary': 'btn-outline-danger',
|
'danger-secondary': 'btn-outline-danger',
|
||||||
cancel: 'btn-secondary'
|
cancel: 'btn-secondary'
|
||||||
};
|
};
|
||||||
|
|
||||||
return ['btn', variants[this.variant()]];
|
return ['btn', variants[this.variant()], this.buttonClass()];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
protected onHostClick(event: Event): void {
|
||||||
|
if (!this.disabled()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
|
event.stopImmediatePropagation();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<article class="w-100 rounded-0 cart-item">
|
<article class="w-100 p-3 rounded-0 cart-item">
|
||||||
<div class="position-relative overflow-hidden cart-item-media">
|
<div class="position-relative overflow-hidden cart-item-media">
|
||||||
@if (discountPercentage() && discountPercentage()! > 0) {
|
@if (discountPercentage() && discountPercentage()! > 0) {
|
||||||
<span class="position-absolute top-0 start-0 z-1 rounded-0 cart-item-discount-badge">-{{ discountPercentage() }}%</span>
|
<span class="position-absolute top-0 start-0 z-1 rounded-0 cart-item-discount-badge">-{{ discountPercentage() }}%</span>
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
|
|
||||||
<div class="text-nowrap cart-item-prices">
|
<div class="text-nowrap cart-item-prices">
|
||||||
@if (formattedOriginalPrice(); as originalPrice) {
|
@if (formattedOriginalPrice(); as originalPrice) {
|
||||||
<span class="text-decoration-line-through fw-light cart-item-original-price">{{ originalPrice }}</span>
|
<span class="text-decoration-line-through mb-1 fw-light cart-item-original-price">{{ originalPrice }}</span>
|
||||||
}
|
}
|
||||||
|
|
||||||
<span class="fw-normal cart-item-discounted-price">{{ formattedDiscountedPrice() }}</span>
|
<span class="fw-bold cart-item-discounted-price">{{ formattedDiscountedPrice() }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -1,28 +1,43 @@
|
|||||||
:host {
|
:host {
|
||||||
display: block;
|
display: block;
|
||||||
--item-media-width: 64px;
|
--item-media-size: 90px;
|
||||||
--item-media-height: 72px;
|
--item-divider-inset: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 420px) {
|
:host(:first-child) .cart-item,
|
||||||
:host {
|
:host .cart-item {
|
||||||
--item-media-width: 56px;
|
position: relative;
|
||||||
--item-media-height: 64px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:host(:first-child) .cart-item::before,
|
||||||
|
:host .cart-item::after {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
right: var(--item-divider-inset);
|
||||||
|
left: var(--item-divider-inset);
|
||||||
|
height: 1px;
|
||||||
|
background-color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
:host(:first-child) .cart-item::before {
|
||||||
|
top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
:host .cart-item::after {
|
||||||
|
bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cart-item {
|
.cart-item {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: var(--item-media-width) minmax(0, 1fr);
|
grid-template-columns: var(--item-media-size) minmax(0, 1fr);
|
||||||
gap: 0.75rem;
|
gap: 0.75rem;
|
||||||
padding: 10px 12px;
|
|
||||||
background-color: #f5f5f5;
|
background-color: #f5f5f5;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cart-item-media {
|
.cart-item-media {
|
||||||
width: var(--item-media-width);
|
width: var(--item-media-size);
|
||||||
height: var(--item-media-height);
|
aspect-ratio: 1 / 1;
|
||||||
border-radius: 6px;
|
border-radius: 5px 0 0 5px;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
border: 1px solid #eaeaea;
|
border: 1px solid #eaeaea;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
@@ -30,14 +45,14 @@
|
|||||||
img {
|
img {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
object-fit: contain;
|
object-fit: cover;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.cart-item-discount-badge {
|
.cart-item-discount-badge {
|
||||||
padding: 2px 5px;
|
padding: 2px 5px;
|
||||||
border-bottom-right-radius: 4px;
|
border-bottom-right-radius: 4px;
|
||||||
background-color: #6173ff;
|
background-color: var(--bs-primary);
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
font-size: 8px;
|
font-size: 8px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
@@ -45,6 +60,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.cart-item-placeholder {
|
.cart-item-placeholder {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
background: linear-gradient(135deg, #d2d2d2, #ececec);
|
background: linear-gradient(135deg, #d2d2d2, #ececec);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,9 +117,6 @@
|
|||||||
gap: 0.125rem;
|
gap: 0.125rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.cart-item-remove-btn {
|
.cart-item-remove-btn {
|
||||||
margin-left: 0.35rem;
|
margin-left: 0.35rem;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<section class="d-flex flex-column h-100 overflow-hidden text-secondary" [style.background-color]="backgroundColor()">
|
<section class="d-flex flex-column h-100 overflow-hidden text-secondary" [style.background-color]="backgroundColor()">
|
||||||
<header class="d-flex align-items-center justify-content-between bg-transparent cart-header">
|
<header class="d-flex align-items-center p-3 justify-content-between bg-transparent cart-header">
|
||||||
<h2 class="m-0 text-uppercase fw-bold cart-title">{{ title() }}</h2>
|
<h2 class="m-0 text-uppercase fw-bold cart-title">{{ title() }}</h2>
|
||||||
|
|
||||||
@if (showClose()) {
|
@if (showClose()) {
|
||||||
@@ -9,8 +9,8 @@
|
|||||||
}
|
}
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<div class="d-grid gap-2 flex-grow-1 overflow-y-auto cart-items-container">
|
<div class="d-grid w-100 flex-grow-1 overflow-y-auto cart-items-container">
|
||||||
@for (item of items(); track item.product + item.discountedPrice + resetKey(); let idx = $index) {
|
@for (item of items(); track item.productVariantId || item.product + item.discountedPrice; let idx = $index) {
|
||||||
<app-cart-item
|
<app-cart-item
|
||||||
[imageUrl]="item.imageUrl"
|
[imageUrl]="item.imageUrl"
|
||||||
[product]="item.product"
|
[product]="item.product"
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
[discountedPrice]="item.discountedPrice"
|
[discountedPrice]="item.discountedPrice"
|
||||||
[discountPercentage]="item.discountPercentage"
|
[discountPercentage]="item.discountPercentage"
|
||||||
[attributes]="item.attributes"
|
[attributes]="item.attributes"
|
||||||
[quantity]="item.quantity"
|
[quantity]="getItemQuantity(item)"
|
||||||
(quantityChange)="onItemQuantityChange(idx, $event)"
|
(quantityChange)="onItemQuantityChange(idx, $event)"
|
||||||
(remove)="onItemRemove(idx)"
|
(remove)="onItemRemove(idx)"
|
||||||
/>
|
/>
|
||||||
@@ -48,3 +48,4 @@
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -23,10 +23,16 @@
|
|||||||
|
|
||||||
.cart-items-container {
|
.cart-items-container {
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
padding: 0 0 0 24px;
|
gap: 0;
|
||||||
scrollbar-color: #d5d5d5 transparent;
|
scrollbar-color: #d5d5d5 transparent;
|
||||||
scrollbar-width: thin;
|
scrollbar-width: thin;
|
||||||
|
|
||||||
|
app-cart-item {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
width: 6px;
|
width: 6px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import {
|
|||||||
BrowserTestingModule,
|
BrowserTestingModule,
|
||||||
platformBrowserTesting
|
platformBrowserTesting
|
||||||
} from '@angular/platform-browser/testing';
|
} from '@angular/platform-browser/testing';
|
||||||
import { of } from 'rxjs';
|
import { of, throwError } from 'rxjs';
|
||||||
import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
|
import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
import { CartService } from '../../../core/services/cart/cart.service';
|
import { CartService } from '../../../core/services/cart/cart.service';
|
||||||
@@ -141,4 +141,136 @@ describe('CartComponent', () => {
|
|||||||
expect(openConfirmDelete).toHaveBeenCalled();
|
expect(openConfirmDelete).toHaveBeenCalled();
|
||||||
expect(removeItem).not.toHaveBeenCalled();
|
expect(removeItem).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('optimistically updates quantity and rolls back on error', async () => {
|
||||||
|
vi.useFakeTimers();
|
||||||
|
const updateItemQuantity = vi.fn().mockReturnValue(throwError(() => new Error('Error')));
|
||||||
|
const danger = vi.fn();
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [CartComponent],
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: CartService,
|
||||||
|
useValue: {
|
||||||
|
cart: signal(null).asReadonly(),
|
||||||
|
updateItemQuantity,
|
||||||
|
removeItem: vi.fn()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: ModalService,
|
||||||
|
useValue: {}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: ToastService,
|
||||||
|
useValue: {
|
||||||
|
success: vi.fn(),
|
||||||
|
info: vi.fn(),
|
||||||
|
danger
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(CartComponent);
|
||||||
|
const component = fixture.componentInstance;
|
||||||
|
|
||||||
|
const item = {
|
||||||
|
productVariantId: 10,
|
||||||
|
imageUrl: null,
|
||||||
|
product: 'Producto de prueba',
|
||||||
|
originalPrice: null,
|
||||||
|
discountedPrice: 1000,
|
||||||
|
discountPercentage: null,
|
||||||
|
attributes: [],
|
||||||
|
quantity: 1
|
||||||
|
};
|
||||||
|
|
||||||
|
fixture.componentRef.setInput('items', [item]);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
// Trigger quantity change to 3
|
||||||
|
fixture.debugElement.query(By.css('app-cart-item')).triggerEventHandler('quantityChange', 3);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
// Optimistic update should be active immediately in local getter
|
||||||
|
expect((component as any).getItemQuantity(item)).toBe(3);
|
||||||
|
|
||||||
|
// Wait for the debounce time (1000ms)
|
||||||
|
vi.advanceTimersByTime(1000);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
// After failure, it should roll back to original quantity (1)
|
||||||
|
expect((component as any).getItemQuantity(item)).toBe(1);
|
||||||
|
expect(danger).toHaveBeenCalled();
|
||||||
|
|
||||||
|
vi.useRealTimers();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('optimistically updates quantity and clears override on success', async () => {
|
||||||
|
vi.useFakeTimers();
|
||||||
|
const updateItemQuantity = vi.fn().mockReturnValue(of({ message: 'Success', data: {} }));
|
||||||
|
const success = vi.fn();
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [CartComponent],
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: CartService,
|
||||||
|
useValue: {
|
||||||
|
cart: signal(null).asReadonly(),
|
||||||
|
updateItemQuantity,
|
||||||
|
removeItem: vi.fn()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: ModalService,
|
||||||
|
useValue: {}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: ToastService,
|
||||||
|
useValue: {
|
||||||
|
success,
|
||||||
|
info: vi.fn(),
|
||||||
|
danger: vi.fn()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(CartComponent);
|
||||||
|
const component = fixture.componentInstance;
|
||||||
|
|
||||||
|
const item = {
|
||||||
|
productVariantId: 10,
|
||||||
|
imageUrl: null,
|
||||||
|
product: 'Producto de prueba',
|
||||||
|
originalPrice: null,
|
||||||
|
discountedPrice: 1000,
|
||||||
|
discountPercentage: null,
|
||||||
|
attributes: [],
|
||||||
|
quantity: 1
|
||||||
|
};
|
||||||
|
|
||||||
|
fixture.componentRef.setInput('items', [item]);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
// Trigger quantity change to 3
|
||||||
|
fixture.debugElement.query(By.css('app-cart-item')).triggerEventHandler('quantityChange', 3);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
// Optimistic update should be active immediately in local getter
|
||||||
|
expect((component as any).getItemQuantity(item)).toBe(3);
|
||||||
|
|
||||||
|
// Wait for the debounce time (1000ms)
|
||||||
|
vi.advanceTimersByTime(1000);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
// After success, it should clear override and use input quantity (which is 1 since we didn't update items input here)
|
||||||
|
expect((component as any).getItemQuantity(item)).toBe(1);
|
||||||
|
expect(success).toHaveBeenCalled();
|
||||||
|
|
||||||
|
vi.useRealTimers();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ export class CartComponent {
|
|||||||
|
|
||||||
readonly closed = output<void>();
|
readonly closed = output<void>();
|
||||||
|
|
||||||
protected readonly resetKey = signal(0);
|
protected readonly quantityOverrides = signal<Record<number, number>>({});
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.quantityUpdates$.pipe(
|
this.quantityUpdates$.pipe(
|
||||||
@@ -55,12 +55,13 @@ export class CartComponent {
|
|||||||
next: (res) => {
|
next: (res) => {
|
||||||
const msg = res.message || 'Cantidad de producto actualizada.';
|
const msg = res.message || 'Cantidad de producto actualizada.';
|
||||||
this.toastService.success(msg);
|
this.toastService.success(msg);
|
||||||
|
this.clearOverride(update.productVariantId);
|
||||||
},
|
},
|
||||||
error: (err: HttpErrorResponse) => {
|
error: (err: HttpErrorResponse) => {
|
||||||
console.error('Error updating cart quantity', err);
|
console.error('Error updating cart quantity', err);
|
||||||
const msg = err.error?.message || 'Error al actualizar la cantidad del producto.';
|
const msg = err.error?.message || 'Error al actualizar la cantidad del producto.';
|
||||||
this.toastService.danger(msg);
|
this.toastService.danger(msg);
|
||||||
this.resetKey.update(k => k + 1);
|
this.clearOverride(update.productVariantId);
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
catchError(() => EMPTY)
|
catchError(() => EMPTY)
|
||||||
@@ -70,10 +71,29 @@ export class CartComponent {
|
|||||||
).subscribe();
|
).subscribe();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected getItemQuantity(item: CartItemMock): number {
|
||||||
|
if (item.productVariantId !== undefined && this.quantityOverrides()[item.productVariantId] !== undefined) {
|
||||||
|
return this.quantityOverrides()[item.productVariantId];
|
||||||
|
}
|
||||||
|
return item.quantity;
|
||||||
|
}
|
||||||
|
|
||||||
|
private clearOverride(productVariantId: number): void {
|
||||||
|
this.quantityOverrides.update((overrides) => {
|
||||||
|
const copy = { ...overrides };
|
||||||
|
delete copy[productVariantId];
|
||||||
|
return copy;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
protected onItemQuantityChange(index: number, newQuantity: number): void {
|
protected onItemQuantityChange(index: number, newQuantity: number): void {
|
||||||
const mockItem = this.items()[index];
|
const mockItem = this.items()[index];
|
||||||
const productVariantId = mockItem?.productVariantId;
|
const productVariantId = mockItem?.productVariantId;
|
||||||
if (productVariantId) {
|
if (productVariantId) {
|
||||||
|
this.quantityOverrides.update((overrides) => ({
|
||||||
|
...overrides,
|
||||||
|
[productVariantId]: newQuantity
|
||||||
|
}));
|
||||||
this.quantityUpdates$.next({
|
this.quantityUpdates$.next({
|
||||||
productVariantId,
|
productVariantId,
|
||||||
quantity: newQuantity
|
quantity: newQuantity
|
||||||
@@ -81,6 +101,10 @@ export class CartComponent {
|
|||||||
} else {
|
} else {
|
||||||
const item = this.cartService.cart()?.items[index];
|
const item = this.cartService.cart()?.items[index];
|
||||||
if (item) {
|
if (item) {
|
||||||
|
this.quantityOverrides.update((overrides) => ({
|
||||||
|
...overrides,
|
||||||
|
[item.product_variant_id]: newQuantity
|
||||||
|
}));
|
||||||
this.quantityUpdates$.next({
|
this.quantityUpdates$.next({
|
||||||
productVariantId: item.product_variant_id,
|
productVariantId: item.product_variant_id,
|
||||||
quantity: newQuantity
|
quantity: newQuantity
|
||||||
|
|||||||
@@ -3,6 +3,9 @@
|
|||||||
[disabled]="disabled()"
|
[disabled]="disabled()"
|
||||||
[ngClass]="buttonClasses()"
|
[ngClass]="buttonClasses()"
|
||||||
[attr.aria-label]="ariaLabel() || variant()"
|
[attr.aria-label]="ariaLabel() || variant()"
|
||||||
|
[attr.aria-expanded]="ariaExpanded()"
|
||||||
|
[attr.aria-controls]="ariaControls()"
|
||||||
|
(click)="clicked.emit($event)"
|
||||||
>
|
>
|
||||||
<i [ngClass]="iconClass()"></i>
|
<i [ngClass]="iconClass()"></i>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
|
||||||
import { NgClass } from '@angular/common';
|
import { NgClass } from '@angular/common';
|
||||||
|
|
||||||
export type IconButtonVariant =
|
export type IconButtonVariant =
|
||||||
@@ -21,6 +21,9 @@ export class IconButtonComponent {
|
|||||||
readonly variant = input.required<IconButtonVariant>();
|
readonly variant = input.required<IconButtonVariant>();
|
||||||
readonly disabled = input(false);
|
readonly disabled = input(false);
|
||||||
readonly ariaLabel = input<string>('');
|
readonly ariaLabel = input<string>('');
|
||||||
|
readonly ariaExpanded = input<boolean | null>(null);
|
||||||
|
readonly ariaControls = input<string | null>(null);
|
||||||
|
readonly clicked = output<MouseEvent>();
|
||||||
|
|
||||||
protected readonly iconClass = computed(() => {
|
protected readonly iconClass = computed(() => {
|
||||||
const classes: Record<IconButtonVariant, string> = {
|
const classes: Record<IconButtonVariant, string> = {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
.form-control {
|
.form-control {
|
||||||
min-height: 40px;
|
min-height: 40px;
|
||||||
padding: 0.625rem 1rem;
|
padding: 0.625rem 1rem;
|
||||||
border-radius: 0.5rem;
|
border-radius: 5px;
|
||||||
border-color: #cccccc;
|
border-color: #cccccc;
|
||||||
color: #666666;
|
color: #666666;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
|
|||||||
@@ -37,6 +37,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.modal-shell__content {
|
.modal-shell__content {
|
||||||
|
min-height: 180px;
|
||||||
max-height: calc(100dvh - 2rem);
|
max-height: calc(100dvh - 2rem);
|
||||||
border-radius: 1.25rem;
|
border-radius: 1.25rem;
|
||||||
background:
|
background:
|
||||||
@@ -72,6 +73,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.modal-shell__body {
|
.modal-shell__body {
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
padding: 0 1.25rem 1.25rem;
|
padding: 0 1.25rem 1.25rem;
|
||||||
color: #303030;
|
color: #303030;
|
||||||
}
|
}
|
||||||
|
|||||||
68
src/app/shared/components/qrcode/qrcode.component.ts
Normal file
68
src/app/shared/components/qrcode/qrcode.component.ts
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
import {
|
||||||
|
AfterViewInit,
|
||||||
|
ChangeDetectionStrategy,
|
||||||
|
Component,
|
||||||
|
ElementRef,
|
||||||
|
Input,
|
||||||
|
OnChanges,
|
||||||
|
ViewChild
|
||||||
|
} from '@angular/core';
|
||||||
|
|
||||||
|
import * as QRCode from 'qrcode';
|
||||||
|
|
||||||
|
type QRCodeErrorCorrectionLevel = 'L' | 'M' | 'Q' | 'H';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'qrcode',
|
||||||
|
standalone: true,
|
||||||
|
template: '<canvas #canvas [attr.aria-label]="ariaLabel" role="img"></canvas>',
|
||||||
|
styles: [
|
||||||
|
`
|
||||||
|
:host {
|
||||||
|
display: inline-block;
|
||||||
|
line-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
canvas {
|
||||||
|
display: block;
|
||||||
|
height: auto;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
`
|
||||||
|
],
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
|
})
|
||||||
|
export class QRCodeComponent implements AfterViewInit, OnChanges {
|
||||||
|
@Input({ required: true }) qrdata = '';
|
||||||
|
@Input() width = 200;
|
||||||
|
@Input() errorCorrectionLevel: QRCodeErrorCorrectionLevel = 'M';
|
||||||
|
@Input() ariaLabel = 'Codigo QR';
|
||||||
|
|
||||||
|
@ViewChild('canvas', { static: true }) private readonly canvas!: ElementRef<HTMLCanvasElement>;
|
||||||
|
|
||||||
|
private viewReady = false;
|
||||||
|
|
||||||
|
ngAfterViewInit(): void {
|
||||||
|
this.viewReady = true;
|
||||||
|
this.render();
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnChanges(): void {
|
||||||
|
this.render();
|
||||||
|
}
|
||||||
|
|
||||||
|
private render(): void {
|
||||||
|
if (!this.viewReady || !this.qrdata) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
void QRCode.toCanvas(this.canvas.nativeElement, this.qrdata, {
|
||||||
|
errorCorrectionLevel: this.errorCorrectionLevel,
|
||||||
|
margin: 2,
|
||||||
|
width: this.width
|
||||||
|
}).catch(() => {
|
||||||
|
const context = this.canvas.nativeElement.getContext('2d');
|
||||||
|
context?.clearRect(0, 0, this.canvas.nativeElement.width, this.canvas.nativeElement.height);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<div class="simple-modal">
|
||||||
|
<p class="simple-modal__content">{{ data.content }}</p>
|
||||||
|
|
||||||
|
<div class="simple-modal__actions">
|
||||||
|
<app-button (click)="close()">
|
||||||
|
{{ data.buttonLabel }}
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
.simple-modal {
|
||||||
|
display: grid;
|
||||||
|
gap: 1.5rem;
|
||||||
|
justify-items: center;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.simple-modal__content {
|
||||||
|
margin: 0;
|
||||||
|
color: #666666;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.simple-modal__actions {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
import '@angular/compiler';
|
||||||
|
import { TestBed, getTestBed } from '@angular/core/testing';
|
||||||
|
import {
|
||||||
|
BrowserTestingModule,
|
||||||
|
platformBrowserTesting
|
||||||
|
} from '@angular/platform-browser/testing';
|
||||||
|
import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import {
|
||||||
|
SimpleModalData,
|
||||||
|
MODAL_DATA,
|
||||||
|
ModalRef
|
||||||
|
} from '../../../core/services/modal.service';
|
||||||
|
import { SimpleModalComponent } from './simple-modal.component';
|
||||||
|
|
||||||
|
describe('SimpleModalComponent', () => {
|
||||||
|
const data: SimpleModalData = {
|
||||||
|
content: 'Este es un mensaje simple.',
|
||||||
|
buttonLabel: 'Entendido'
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
try {
|
||||||
|
getTestBed().initTestEnvironment(
|
||||||
|
BrowserTestingModule,
|
||||||
|
platformBrowserTesting()
|
||||||
|
);
|
||||||
|
} catch {
|
||||||
|
// Test environment may already be initialized by another setup entrypoint.
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
TestBed.resetTestingModule();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders the configured content and button label', async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [SimpleModalComponent],
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: MODAL_DATA,
|
||||||
|
useValue: data
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: ModalRef,
|
||||||
|
useValue: {
|
||||||
|
close: vi.fn()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(SimpleModalComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
|
|
||||||
|
expect(element.textContent).toContain(data.content);
|
||||||
|
expect(element.textContent).toContain(data.buttonLabel);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('closes when clicking the primary button', async () => {
|
||||||
|
const closeSpy = vi.fn();
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [SimpleModalComponent],
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: MODAL_DATA,
|
||||||
|
useValue: data
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: ModalRef,
|
||||||
|
useValue: {
|
||||||
|
close: closeSpy
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(SimpleModalComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const button = fixture.nativeElement.querySelector('button');
|
||||||
|
button.click();
|
||||||
|
|
||||||
|
expect(closeSpy).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
|
||||||
|
|
||||||
|
import {
|
||||||
|
SimpleModalData,
|
||||||
|
MODAL_DATA,
|
||||||
|
ModalRef
|
||||||
|
} from '../../../core/services/modal.service';
|
||||||
|
import { ButtonComponent } from '../button/button.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-simple-modal',
|
||||||
|
imports: [ButtonComponent],
|
||||||
|
templateUrl: './simple-modal.component.html',
|
||||||
|
styleUrl: './simple-modal.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
|
})
|
||||||
|
export class SimpleModalComponent {
|
||||||
|
protected readonly data = inject<SimpleModalData>(MODAL_DATA);
|
||||||
|
private readonly modalRef = inject<ModalRef<void>>(ModalRef);
|
||||||
|
|
||||||
|
protected close(): void {
|
||||||
|
this.modalRef.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
5
src/app/shared/components/stepper/step.component.html
Normal file
5
src/app/shared/components/stepper/step.component.html
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
@if (isActive()) {
|
||||||
|
<div class="step-body">
|
||||||
|
<ng-content></ng-content>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
14
src/app/shared/components/stepper/step.component.scss
Normal file
14
src/app/shared/components/stepper/step.component.scss
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
.step-body {
|
||||||
|
animation: fadeIn 0.25s ease-out forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fadeIn {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateY(8px);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
26
src/app/shared/components/stepper/step.component.ts
Normal file
26
src/app/shared/components/stepper/step.component.ts
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, computed, forwardRef, inject, input } from '@angular/core';
|
||||||
|
import { StepperComponent } from './stepper.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-step',
|
||||||
|
imports: [],
|
||||||
|
templateUrl: './step.component.html',
|
||||||
|
styleUrl: './step.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class StepComponent {
|
||||||
|
stepper = inject(forwardRef(() => StepperComponent));
|
||||||
|
|
||||||
|
readonly label = input.required<string>();
|
||||||
|
readonly isValid = input(true);
|
||||||
|
|
||||||
|
// We compute the index by looking at the parent's steps array
|
||||||
|
index = computed(() => {
|
||||||
|
const steps = this.stepper.steps();
|
||||||
|
return steps.findIndex((step: StepComponent) => step === this);
|
||||||
|
});
|
||||||
|
|
||||||
|
isActive = computed(() => this.stepper.currentStepIndex() === this.index());
|
||||||
|
isCompleted = computed(() => this.stepper.currentStepIndex() > this.index());
|
||||||
|
isLast = computed(() => this.stepper.steps().length - 1 === this.index());
|
||||||
|
}
|
||||||
37
src/app/shared/components/stepper/stepper.component.html
Normal file
37
src/app/shared/components/stepper/stepper.component.html
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
<div class="stepper-container">
|
||||||
|
|
||||||
|
<!-- Horizontal indicator bar -->
|
||||||
|
<div class="stepper-header">
|
||||||
|
@for (step of steps(); track step; let i = $index; let last = $last) {
|
||||||
|
<div
|
||||||
|
class="stepper-header__item"
|
||||||
|
[ngClass]="{
|
||||||
|
'is-active': currentStepIndex() === i,
|
||||||
|
'is-completed': currentStepIndex() > i
|
||||||
|
}"
|
||||||
|
>
|
||||||
|
<!-- Connecting line before (except first) -->
|
||||||
|
@if (i > 0) {
|
||||||
|
<div class="stepper-header__line" [ngClass]="{ 'is-completed': currentStepIndex() > i - 1 }"></div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<!-- Circle indicator -->
|
||||||
|
<div
|
||||||
|
class="stepper-header__circle"
|
||||||
|
[attr.aria-label]="step.label()"
|
||||||
|
[class.is-clickable]="currentStepIndex() > i"
|
||||||
|
(click)="goToStep(i)"
|
||||||
|
></div>
|
||||||
|
|
||||||
|
<!-- Label -->
|
||||||
|
<span class="stepper-header__label">{{ step.label() }}</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Step content panel: only renders the active step's projected content -->
|
||||||
|
<div class="stepper-body">
|
||||||
|
<ng-content></ng-content>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
96
src/app/shared/components/stepper/stepper.component.scss
Normal file
96
src/app/shared/components/stepper/stepper.component.scss
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
.stepper-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ─── Header (indicator bar) ─── */
|
||||||
|
.stepper-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-start;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0;
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
&__item {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
flex: 0 1 190px;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 190px;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__line {
|
||||||
|
position: absolute;
|
||||||
|
top: 5px; // center of the 10px dot
|
||||||
|
right: 50%;
|
||||||
|
left: -50%;
|
||||||
|
height: 2px;
|
||||||
|
background-color: #d9d9d9;
|
||||||
|
transition: background-color 0.35s ease;
|
||||||
|
z-index: 0;
|
||||||
|
|
||||||
|
&.is-completed {
|
||||||
|
background-color: var(--bs-primary);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__circle {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
width: 10px;
|
||||||
|
height: 10px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background-color: #d9d9d9; // default: inactive future
|
||||||
|
border: none;
|
||||||
|
cursor: default;
|
||||||
|
transition: background-color 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
|
padding: 0;
|
||||||
|
|
||||||
|
&.is-clickable {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__label {
|
||||||
|
margin-top: 10px;
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: 700;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: #d9d9d9; // default: inactive future
|
||||||
|
text-align: center;
|
||||||
|
transition: color 0.3s ease;
|
||||||
|
max-width: 120px;
|
||||||
|
line-height: 1.3;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Active step
|
||||||
|
&__item.is-active {
|
||||||
|
.stepper-header__circle {
|
||||||
|
background-color: #666666;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stepper-header__label {
|
||||||
|
color: #666666;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Completed past step
|
||||||
|
&__item.is-completed {
|
||||||
|
.stepper-header__circle {
|
||||||
|
background-color: var(--bs-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.stepper-header__label {
|
||||||
|
color: var(--bs-primary);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ─── Body (content area) ─── */
|
||||||
|
.stepper-body {
|
||||||
|
// step.component.html controls visibility via @if (isActive())
|
||||||
|
}
|
||||||
128
src/app/shared/components/stepper/stepper.component.spec.ts
Normal file
128
src/app/shared/components/stepper/stepper.component.spec.ts
Normal file
@@ -0,0 +1,128 @@
|
|||||||
|
import { Component, signal, ViewChild } from '@angular/core';
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { StepperComponent } from './stepper.component';
|
||||||
|
import { StepComponent } from './step.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
imports: [StepperComponent, StepComponent],
|
||||||
|
template: `
|
||||||
|
<app-stepper #stepper>
|
||||||
|
<app-step label="Step 1" [isValid]="step1Valid()">
|
||||||
|
<div id="content-1">Content 1</div>
|
||||||
|
</app-step>
|
||||||
|
<app-step label="Step 2" [isValid]="step2Valid()">
|
||||||
|
<div id="content-2">Content 2</div>
|
||||||
|
</app-step>
|
||||||
|
</app-stepper>
|
||||||
|
`
|
||||||
|
})
|
||||||
|
class TestHostComponent {
|
||||||
|
@ViewChild('stepper') stepper!: StepperComponent;
|
||||||
|
step1Valid = signal(true);
|
||||||
|
step2Valid = signal(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('StepperComponent & StepComponent', () => {
|
||||||
|
async function setup() {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [TestHostComponent, StepperComponent, StepComponent]
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(TestHostComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
return { fixture, component: fixture.componentInstance };
|
||||||
|
}
|
||||||
|
|
||||||
|
it('renders step labels in the indicator bar', async () => {
|
||||||
|
const { fixture } = await setup();
|
||||||
|
const labels = fixture.nativeElement.querySelectorAll('.stepper-header__label');
|
||||||
|
expect(labels.length).toBe(2);
|
||||||
|
expect(labels[0].textContent.trim()).toBe('Step 1');
|
||||||
|
expect(labels[1].textContent.trim()).toBe('Step 2');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('activates the first step by default and shows its content', async () => {
|
||||||
|
const { fixture } = await setup();
|
||||||
|
const content1 = fixture.nativeElement.querySelector('#content-1');
|
||||||
|
const content2 = fixture.nativeElement.querySelector('#content-2');
|
||||||
|
|
||||||
|
expect(content1).not.toBeNull();
|
||||||
|
expect(content2).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('advances to step 2 when next() is called and current step is valid', async () => {
|
||||||
|
const { fixture, component } = await setup();
|
||||||
|
|
||||||
|
component.stepper.next();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const content1 = fixture.nativeElement.querySelector('#content-1');
|
||||||
|
const content2 = fixture.nativeElement.querySelector('#content-2');
|
||||||
|
|
||||||
|
expect(content1).toBeNull();
|
||||||
|
expect(content2).not.toBeNull();
|
||||||
|
expect(component.stepper.currentStepIndex()).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not advance to step 2 when next() is called if current step is invalid', async () => {
|
||||||
|
const { fixture, component } = await setup();
|
||||||
|
component.step1Valid.set(false);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
component.stepper.next();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const content1 = fixture.nativeElement.querySelector('#content-1');
|
||||||
|
const content2 = fixture.nativeElement.querySelector('#content-2');
|
||||||
|
|
||||||
|
expect(content1).not.toBeNull();
|
||||||
|
expect(content2).toBeNull();
|
||||||
|
expect(component.stepper.currentStepIndex()).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('goes back to step 1 when previous() is called', async () => {
|
||||||
|
const { fixture, component } = await setup();
|
||||||
|
|
||||||
|
component.stepper.next();
|
||||||
|
fixture.detectChanges();
|
||||||
|
expect(component.stepper.currentStepIndex()).toBe(1);
|
||||||
|
|
||||||
|
component.stepper.previous();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
expect(component.stepper.currentStepIndex()).toBe(0);
|
||||||
|
expect(fixture.nativeElement.querySelector('#content-1')).not.toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('marks the first circle as active by default', async () => {
|
||||||
|
const { fixture } = await setup();
|
||||||
|
const items = fixture.nativeElement.querySelectorAll('.stepper-header__item');
|
||||||
|
expect(items[0].classList.contains('is-active')).toBe(true);
|
||||||
|
expect(items[1].classList.contains('is-active')).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('marks step 1 as completed and step 2 as active after advancing', async () => {
|
||||||
|
const { fixture, component } = await setup();
|
||||||
|
|
||||||
|
component.stepper.next();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const items = fixture.nativeElement.querySelectorAll('.stepper-header__item');
|
||||||
|
expect(items[0].classList.contains('is-completed')).toBe(true);
|
||||||
|
expect(items[1].classList.contains('is-active')).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('allows navigating back to a completed step via goToStep()', async () => {
|
||||||
|
const { fixture, component } = await setup();
|
||||||
|
|
||||||
|
component.stepper.next();
|
||||||
|
fixture.detectChanges();
|
||||||
|
expect(component.stepper.currentStepIndex()).toBe(1);
|
||||||
|
|
||||||
|
component.stepper.goToStep(0);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
expect(component.stepper.currentStepIndex()).toBe(0);
|
||||||
|
expect(fixture.nativeElement.querySelector('#content-1')).not.toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
41
src/app/shared/components/stepper/stepper.component.ts
Normal file
41
src/app/shared/components/stepper/stepper.component.ts
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, contentChildren, signal } from '@angular/core';
|
||||||
|
import { StepComponent } from './step.component';
|
||||||
|
import { NgClass } from '@angular/common';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-stepper',
|
||||||
|
imports: [NgClass],
|
||||||
|
templateUrl: './stepper.component.html',
|
||||||
|
styleUrl: './stepper.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class StepperComponent {
|
||||||
|
readonly steps = contentChildren(StepComponent);
|
||||||
|
readonly currentStepIndex = signal(0);
|
||||||
|
|
||||||
|
next() {
|
||||||
|
const currentSteps = this.steps();
|
||||||
|
const currentIndex = this.currentStepIndex();
|
||||||
|
if (currentIndex < currentSteps.length - 1) {
|
||||||
|
const currentStep = currentSteps[currentIndex];
|
||||||
|
if (currentStep.isValid()) {
|
||||||
|
this.currentStepIndex.set(currentIndex + 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
previous() {
|
||||||
|
const currentIndex = this.currentStepIndex();
|
||||||
|
if (currentIndex > 0) {
|
||||||
|
this.currentStepIndex.set(currentIndex - 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
goToStep(index: number) {
|
||||||
|
const targetIndex = index;
|
||||||
|
// Only allow navigating to completed steps or the current one
|
||||||
|
if (targetIndex < this.currentStepIndex()) {
|
||||||
|
this.currentStepIndex.set(targetIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
@use "./fonts";
|
@use "./fonts";
|
||||||
|
|
||||||
@import "@fortawesome/fontawesome-free/css/all.min.css";
|
@import "@fortawesome/fontawesome-free/css/all.min.css";
|
||||||
@@ -7,16 +6,26 @@
|
|||||||
|
|
||||||
@import "../node_modules/bootstrap/scss/bootstrap";
|
@import "../node_modules/bootstrap/scss/bootstrap";
|
||||||
|
|
||||||
:root {
|
:root, app-root {
|
||||||
--bs-body-font-family: "Gotham", sans-serif;
|
--bs-body-font-family: "Gotham", sans-serif;
|
||||||
--bs-primary: var(--tenant-primary);
|
--color-primary: var(--tenant-primary);
|
||||||
--bs-primary-rgb: var(--tenant-primary-rgb);
|
--color-primary-rgb: var(--tenant-primary-rgb);
|
||||||
--bs-secondary: var(--tenant-secondary);
|
--color-secondary: var(--tenant-secondary);
|
||||||
--bs-secondary-rgb: var(--tenant-secondary-rgb);
|
--color-secondary-rgb: var(--tenant-secondary-rgb);
|
||||||
--bs-danger: var(--tenant-danger);
|
--color-danger: var(--tenant-danger);
|
||||||
--bs-danger-rgb: var(--tenant-danger-rgb);
|
--color-danger-rgb: var(--tenant-danger-rgb);
|
||||||
--bs-success: var(--tenant-success);
|
--color-success: var(--tenant-success);
|
||||||
--bs-success-rgb: var(--tenant-success-rgb);
|
--color-success-rgb: var(--tenant-success-rgb);
|
||||||
|
--color-header-bg: var(--tenant-header-bg);
|
||||||
|
--color-footer-bg: var(--tenant-footer-bg);
|
||||||
|
--bs-primary: var(--color-primary);
|
||||||
|
--bs-primary-rgb: var(--color-primary-rgb);
|
||||||
|
--bs-secondary: var(--color-secondary);
|
||||||
|
--bs-secondary-rgb: var(--color-secondary-rgb);
|
||||||
|
--bs-danger: var(--color-danger);
|
||||||
|
--bs-danger-rgb: var(--color-danger-rgb);
|
||||||
|
--bs-success: var(--color-success);
|
||||||
|
--bs-success-rgb: var(--color-success-rgb);
|
||||||
}
|
}
|
||||||
|
|
||||||
label {
|
label {
|
||||||
|
|||||||
15
src/types/qrcode.d.ts
vendored
Normal file
15
src/types/qrcode.d.ts
vendored
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
declare module 'qrcode' {
|
||||||
|
export type QRCodeErrorCorrectionLevel = 'L' | 'M' | 'Q' | 'H';
|
||||||
|
|
||||||
|
export interface QRCodeToCanvasOptions {
|
||||||
|
errorCorrectionLevel?: QRCodeErrorCorrectionLevel;
|
||||||
|
margin?: number;
|
||||||
|
width?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toCanvas(
|
||||||
|
canvasElement: HTMLCanvasElement,
|
||||||
|
text: string,
|
||||||
|
options?: QRCodeToCanvasOptions
|
||||||
|
): Promise<void>;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user