From 0d212ed5eac37aa4ea2917536c483282320aac58 Mon Sep 17 00:00:00 2001 From: mrlemaire Date: Thu, 20 Jun 2024 18:06:19 +0000 Subject: [PATCH] ajout du composant tpe --- package-lock.json | 488 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/app/_helpers/auth.guard.ts | 2 +- src/app/_helpers/services/auth.service.ts | 20 +++++++------------- src/app/_helpers/services/storage.service.spec.ts | 16 ++++++++++++++++ src/app/_helpers/services/storage.service.ts | 37 +++++++++++++++++++++++++++++++++++++ src/app/account/auth/login-standard-user/login-standard-user.component.ts | 32 +++++++++++++------------------- src/app/app.routes.ts | 43 ++++++++++++++++++++++++++++++------------- src/app/assistances/assistance/view-service/view-service.component.html | 2 +- src/app/core/layout/main-layout/main-layout.component.html | 6 ++---- src/app/core/layout/navbar/navbar-user/navbar-user.component.scss | 3 +++ src/app/core/layout/navbar/navbar.component.html | 21 +++++++++++++-------- src/app/core/layout/navbar/navbar.component.scss | 11 +++++++++++ src/app/core/layout/navbar/navbar.component.ts | 30 ++++++++++++++++++++++++++++++ src/app/core/layout/sidebar/nav-data.ts | 45 ++++++++++++++++++++++++++++++--------------- src/app/ecommerce/ecommerce.component.html | 1 + src/app/ecommerce/ecommerce.component.scss | 0 src/app/ecommerce/ecommerce.component.spec.ts | 23 +++++++++++++++++++++++ src/app/ecommerce/ecommerce.component.ts | 12 ++++++++++++ src/app/etablissement/etablissement.component.html | 1 + src/app/etablissement/etablissement.component.scss | 0 src/app/etablissement/etablissement.component.spec.ts | 23 +++++++++++++++++++++++ src/app/etablissement/etablissement.component.ts | 12 ++++++++++++ src/app/reversements/reversements.component.ts | 8 +++----- src/app/tpe/create-tpe/create-tpe.component.html | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/create-tpe/create-tpe.component.scss | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/create-tpe/create-tpe.component.spec.ts | 23 +++++++++++++++++++++++ src/app/tpe/create-tpe/create-tpe.component.ts | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/edit-tpe/edit-tpe.component.html | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/edit-tpe/edit-tpe.component.scss | 0 src/app/tpe/edit-tpe/edit-tpe.component.spec.ts | 23 +++++++++++++++++++++++ src/app/tpe/edit-tpe/edit-tpe.component.ts | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.html | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.scss | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.spec.ts | 23 +++++++++++++++++++++++ src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.ts | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/groupe-tpe/groupe-tpe.component.html | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/groupe-tpe/groupe-tpe.component.scss | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/groupe-tpe/groupe-tpe.component.spec.ts | 23 +++++++++++++++++++++++ src/app/tpe/groupe-tpe/groupe-tpe.component.ts | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/tpe.component.html | 21 +++++++++++++++++++++ src/app/tpe/tpe.component.scss | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/tpe.component.spec.ts | 23 +++++++++++++++++++++++ src/app/tpe/tpe.component.ts | 24 ++++++++++++++++++++++++ src/app/tpe/tpe.routes.ts | 42 ++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/tpe/view-tpe.component.html | 276 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/tpe/view-tpe.component.scss | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/tpe/view-tpe.component.spec.ts | 22 ++++++++++++++++++++++ src/app/tpe/tpe/view-tpe.component.ts | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/tpe/transaction-tpe/transaction-tpe.component.html | 1 + src/app/tpe/transaction-tpe/transaction-tpe.component.scss | 0 src/app/tpe/transaction-tpe/transaction-tpe.component.spec.ts | 23 +++++++++++++++++++++++ src/app/tpe/transaction-tpe/transaction-tpe.component.ts | 12 ++++++++++++ src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html | 73 +------------------------------------------------------------------------ src/app/utilisateurs/create-users/create-users.component.html | 165 --------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/app/utilisateurs/utilisateurs.component.ts | 12 ------------ src/app/utilisateurs/view-user/view-user.component.html | 2 +- src/assets/scss/core/layouts/_header.scss | 3 ++- src/styles.scss | 6 +++--- 58 files changed, 2474 insertions(+), 821 deletions(-) create mode 100644 src/app/_helpers/services/storage.service.spec.ts create mode 100644 src/app/_helpers/services/storage.service.ts create mode 100644 src/app/ecommerce/ecommerce.component.html create mode 100644 src/app/ecommerce/ecommerce.component.scss create mode 100644 src/app/ecommerce/ecommerce.component.spec.ts create mode 100644 src/app/ecommerce/ecommerce.component.ts create mode 100644 src/app/etablissement/etablissement.component.html create mode 100644 src/app/etablissement/etablissement.component.scss create mode 100644 src/app/etablissement/etablissement.component.spec.ts create mode 100644 src/app/etablissement/etablissement.component.ts create mode 100644 src/app/tpe/create-tpe/create-tpe.component.html create mode 100644 src/app/tpe/create-tpe/create-tpe.component.scss create mode 100644 src/app/tpe/create-tpe/create-tpe.component.spec.ts create mode 100644 src/app/tpe/create-tpe/create-tpe.component.ts create mode 100644 src/app/tpe/edit-tpe/edit-tpe.component.html create mode 100644 src/app/tpe/edit-tpe/edit-tpe.component.scss create mode 100644 src/app/tpe/edit-tpe/edit-tpe.component.spec.ts create mode 100644 src/app/tpe/edit-tpe/edit-tpe.component.ts create mode 100644 src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.html create mode 100644 src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.scss create mode 100644 src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.spec.ts create mode 100644 src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.ts create mode 100644 src/app/tpe/groupe-tpe/groupe-tpe.component.html create mode 100644 src/app/tpe/groupe-tpe/groupe-tpe.component.scss create mode 100644 src/app/tpe/groupe-tpe/groupe-tpe.component.spec.ts create mode 100644 src/app/tpe/groupe-tpe/groupe-tpe.component.ts create mode 100644 src/app/tpe/tpe.component.html create mode 100644 src/app/tpe/tpe.component.scss create mode 100644 src/app/tpe/tpe.component.spec.ts create mode 100644 src/app/tpe/tpe.component.ts create mode 100644 src/app/tpe/tpe.routes.ts create mode 100644 src/app/tpe/tpe/view-tpe.component.html create mode 100644 src/app/tpe/tpe/view-tpe.component.scss create mode 100644 src/app/tpe/tpe/view-tpe.component.spec.ts create mode 100644 src/app/tpe/tpe/view-tpe.component.ts create mode 100644 src/app/tpe/transaction-tpe/transaction-tpe.component.html create mode 100644 src/app/tpe/transaction-tpe/transaction-tpe.component.scss create mode 100644 src/app/tpe/transaction-tpe/transaction-tpe.component.spec.ts create mode 100644 src/app/tpe/transaction-tpe/transaction-tpe.component.ts diff --git a/package-lock.json b/package-lock.json index 09a1ae7..95e4bba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,8 +68,6 @@ "@biomejs/biome": "^1.6.4", "@types/express": "^4.17.21", "@types/jasmine": "~4.3.5", - "@types/jest": "^29.5.12", - "@types/mocha": "^10.0.6", "@types/node": "^18.19.34", "@typescript-eslint/eslint-plugin": "6.15.0", "@typescript-eslint/parser": "6.15.0", @@ -3494,18 +3492,6 @@ "node": ">=8" } }, - "node_modules/@jest/expect-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", - "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", - "dev": true, - "dependencies": { - "jest-get-type": "^29.6.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, "node_modules/@jest/schemas": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", @@ -3518,93 +3504,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/types/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==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/types/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@jest/types/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==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@jest/types/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==", - "dev": true - }, - "node_modules/@jest/types/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/types/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", @@ -5479,46 +5378,12 @@ "@types/node": "*" } }, - "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", - "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", - "dev": true - }, - "node_modules/@types/istanbul-lib-report": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", - "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-coverage": "*" - } - }, - "node_modules/@types/istanbul-reports": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", - "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-report": "*" - } - }, "node_modules/@types/jasmine": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.3.6.tgz", "integrity": "sha512-3N0FpQTeiWjm+Oo1WUYWguUS7E6JLceiGTriFrG8k5PU7zRLJCzLcWURU3wjMbZGS//a2/LgjsnO3QxIlwxt9g==", "dev": true }, - "node_modules/@types/jest": { - "version": "29.5.12", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz", - "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==", - "dev": true, - "dependencies": { - "expect": "^29.0.0", - "pretty-format": "^29.0.0" - } - }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -5544,12 +5409,6 @@ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", "dev": true }, - "node_modules/@types/mocha": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz", - "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", - "dev": true - }, "node_modules/@types/node": { "version": "18.19.34", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.34.tgz", @@ -5631,12 +5490,6 @@ "@types/node": "*" } }, - "node_modules/@types/stack-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", - "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", - "dev": true - }, "node_modules/@types/w3c-web-usb": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/@types/w3c-web-usb/-/w3c-web-usb-1.0.10.tgz", @@ -5651,21 +5504,6 @@ "@types/node": "*" } }, - "node_modules/@types/yargs": { - "version": "17.0.32", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", - "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/@types/yargs-parser": { - "version": "21.0.3", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", - "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true - }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "6.15.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.15.0.tgz", @@ -7709,21 +7547,6 @@ "node": ">=6.0" } }, - "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "engines": { - "node": ">=8" - } - }, "node_modules/cidr-regex": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/cidr-regex/-/cidr-regex-4.0.3.tgz", @@ -9582,22 +9405,6 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", - "dev": true, - "dependencies": { - "@jest/expect-utils": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, "node_modules/exponential-backoff": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", @@ -11414,280 +11221,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-matcher-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", - "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-matcher-utils/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==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-matcher-utils/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jest-matcher-utils/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==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/jest-matcher-utils/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==", - "dev": true - }, - "node_modules/jest-matcher-utils/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-matcher-utils/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-message-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", - "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^29.6.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-message-util/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==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-message-util/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jest-message-util/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==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/jest-message-util/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==", - "dev": true - }, - "node_modules/jest-message-util/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-message-util/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-util/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==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-util/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jest-util/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==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/jest-util/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==", - "dev": true - }, - "node_modules/jest-util/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-util/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/jest-util/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/jest-worker": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", @@ -15985,27 +15518,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/stack-utils": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", - "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/stack-utils/node_modules/escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", diff --git a/src/app/_helpers/auth.guard.ts b/src/app/_helpers/auth.guard.ts index 8ff802a..5df8f31 100644 --- a/src/app/_helpers/auth.guard.ts +++ b/src/app/_helpers/auth.guard.ts @@ -30,7 +30,7 @@ export class AuthGuard implements CanActivate { if (isAuthenticated) { return true; } else { - this.router.navigate(['/auth']); + this.router.navigate(['/login']); return false; } } diff --git a/src/app/_helpers/services/auth.service.ts b/src/app/_helpers/services/auth.service.ts index 7792af0..68e6290 100644 --- a/src/app/_helpers/services/auth.service.ts +++ b/src/app/_helpers/services/auth.service.ts @@ -8,6 +8,9 @@ import { environment } from 'src/environments/environment'; providedIn: 'root', }) export class AuthService { + isAuthenticated(): boolean { + return !!sessionStorage.getItem('username'); + } private ApiVerifAuthUrl = `${environment.apiBaseUrl}/api/token/verify/`; private apiURL = `${environment.apiBaseUrl}/user-info/`; @@ -34,13 +37,7 @@ export class AuthService { public errors: any[] = []; constructor(private http: HttpClient) {} - - isAuthenticated(): boolean { - // implémenter la logique pour vérifier si l'utilisateur est authentifié - // cela peut impliquer de vérifier un token dans le localStorage ou sessionStorage - return !!sessionStorage.getItem('username'); - } public verifyToken( token: string // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -72,9 +69,6 @@ export class AuthService { ) ); } - - // Utilise http.post() pour obtenir un jeton d'authentification à partir de l'endpoint djangorestframework-jwt - // eslint-disable-next-line @typescript-eslint/no-explicit-any public login(username: string, password: string): Observable { const headers = new HttpHeaders({ Accept: 'application/json', @@ -124,13 +118,13 @@ export class AuthService { // Déconnexion de l'utilisateur public logout() { - this.token = ''; - this.token_expires; - this.username = ''; + // sessionStorage.removeItem('username'); + + console.log('deconnxion en cours.................') } // Met à jour les données utilisateur après une connexion réussie ou un rafraîchissement de jeton - public updateData(token: string) { + private updateData(token: string) { this.token = token; this.errors = []; diff --git a/src/app/_helpers/services/storage.service.spec.ts b/src/app/_helpers/services/storage.service.spec.ts new file mode 100644 index 0000000..e7fe5b5 --- /dev/null +++ b/src/app/_helpers/services/storage.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { StorageService } from './storage.service'; + +describe('StorageService', () => { + let service: StorageService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(StorageService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/_helpers/services/storage.service.ts b/src/app/_helpers/services/storage.service.ts new file mode 100644 index 0000000..3357611 --- /dev/null +++ b/src/app/_helpers/services/storage.service.ts @@ -0,0 +1,37 @@ +import { Injectable } from '@angular/core'; + +const USER_KEY = 'auth'; + +@Injectable({ + providedIn: 'root' +}) +export class StorageService { + constructor() {} + + clean(): void { + window.sessionStorage.clear(); + } + + public saveUser(user: any): void { + window.sessionStorage.removeItem(USER_KEY); + window.sessionStorage.setItem(USER_KEY, JSON.stringify(user)); + } + + public getUser(): any { + const user = window.sessionStorage.getItem(USER_KEY); + if (user) { + return JSON.parse(user); + } + + return {}; + } + + public isLoggedIn(): boolean { + const user = window.sessionStorage.getItem(USER_KEY); + if (user) { + return true; + } + + return false; + } +} \ No newline at end of file diff --git a/src/app/account/auth/login-standard-user/login-standard-user.component.ts b/src/app/account/auth/login-standard-user/login-standard-user.component.ts index 5e89fcf..78f3bbb 100644 --- a/src/app/account/auth/login-standard-user/login-standard-user.component.ts +++ b/src/app/account/auth/login-standard-user/login-standard-user.component.ts @@ -12,7 +12,7 @@ import { MatInputModule } from '@angular/material/input'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatCheckboxModule } from '@angular/material/checkbox'; -import { Router, RouterLink, RouterOutlet } from '@angular/router'; +import { Router } from '@angular/router'; import { AuthService } from 'src/app/_helpers/services/auth.service'; @Component({ @@ -31,14 +31,16 @@ import { AuthService } from 'src/app/_helpers/services/auth.service'; ], templateUrl: './login-standard-user.component.html', styleUrls: ['./login-standard-user.component.scss'], - providers: [AuthService, RouterLink, RouterOutlet], + providers: [AuthService], }) export class LoginStandardUserComponent implements OnInit { - router = inject(Router); // eslint-disable-next-line @typescript-eslint/no-explicit-any //authService: any; - constructor(private authService: AuthService) {} + constructor( + private authService: AuthService, + private router: Router + ) {} images = [ { @@ -83,37 +85,29 @@ export class LoginStandardUserComponent implements OnInit { password: '', }; } - login() { console.log('Username:', this.user.username); console.log('Password:', this.user.password); this.authService.login(this.user.username, this.user.password).subscribe( - (response: { status: boolean; data?: any; error?: string }) => { - console.log('currentUser =>', response.data); - console.log('response.status', response.status); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (response: any) => { + console.log('currentUser=>', response.data); if (response.status) { console.log('Connexion réussie'); - - // Stocker l'username dans une variable ou dans le sessionStorage si nécessaire + // Stocker l'username dans une variable ou dans le localStorage si nécessaire const username = response.data; console.log('userInfos', username); - - try { - sessionStorage.setItem('username', username); - } catch (error) { - console.warn('Could not store username in sessionStorage', error); - } - + sessionStorage.setItem('username', username); // Redirection vers la page admin - console.log('Redirection vers la page admin'); + // this.router.navigate(['/admin']); this.router.navigateByUrl('/admin'); } else { console.error('Échec de la connexion :', response.error); } }, - (error: any) => { + error => { console.error('Erreur lors de la connexion :', error); // Gérer l'erreur de connexion ici } diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 36596fe..2bc3aed 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -16,16 +16,20 @@ export const routes: Routes = [ { path: '', component: MainLayoutComponent, - + children: [ - { path: 'admin', component: AdminTestComponent }, + { + path: 'admin', + component: AdminTestComponent, + // canActivate: [AuthGuard], + }, { path: 'transactions', loadChildren: () => import('./trafics/transactions/transaction.routes').then( c => c.transactionsRoutes ), - + // canActivate: [AuthGuard], }, { path: 'integrations', @@ -33,19 +37,21 @@ export const routes: Routes = [ import('./integrations/integration/integration.routes').then( c => c.integrationRoutes ), - }, { path: 'utilisateurs', loadChildren: () => import('./utilisateurs/user.routes').then(c => c.userRoutes), - }, { path: 'assistances', loadChildren: () => import('./assistances/service.routes').then(c => c.userRoutes), - + }, + { + path: 'tpe', + loadChildren: () => + import('./tpe/tpe.routes').then(c => c.tpeRoutes), }, { path: 'reversements', @@ -53,7 +59,6 @@ export const routes: Routes = [ import('./reversements/reversement/reversement.routes').then( c => c.reversementRoutes ), - }, { path: 'dash', @@ -61,7 +66,6 @@ export const routes: Routes = [ import( './admin/dashboards/beasy-dashboard/beasy-dashboard.component' ).then(c => c.BeasyDashboardComponent), - }, { path: 'application-android', @@ -69,7 +73,6 @@ export const routes: Routes = [ import('./application-android/application-android.component').then( c => c.ApplicationAndroidComponent ), - }, { path: 'compte-associe', @@ -77,7 +80,6 @@ export const routes: Routes = [ import('./compte-associe/compte-associe.component').then( c => c.CompteAssocieComponent ), - }, { path: 'utilisateurs', @@ -85,7 +87,6 @@ export const routes: Routes = [ import('./utilisateurs/utilisateurs.component').then( c => c.UtilisateursComponent ), - }, { path: 'facturation', @@ -93,9 +94,25 @@ export const routes: Routes = [ import('./facturation/facturation.component').then( c => c.FacturationComponent ), - // + // canActivate: [AuthGuard], + }, + + { + path: 'etablissement', + loadComponent: () => + import('./etablissement/etablissement.component').then( + c => c.EtablissementComponent + ), + }, + { + path: 'ecommerce', + loadComponent: () => + import('./ecommerce/ecommerce.component').then( + c => c.EcommerceComponent + ), }, - ],canActivate: [AuthGuard], + ], + canActivate: [AuthGuard], }, { path: '**', diff --git a/src/app/assistances/assistance/view-service/view-service.component.html b/src/app/assistances/assistance/view-service/view-service.component.html index 773eb0a..f8117c7 100644 --- a/src/app/assistances/assistance/view-service/view-service.component.html +++ b/src/app/assistances/assistance/view-service/view-service.component.html @@ -25,7 +25,7 @@
- + Filter
- + -
+
diff --git a/src/app/core/layout/navbar/navbar-user/navbar-user.component.scss b/src/app/core/layout/navbar/navbar-user/navbar-user.component.scss index f3e7753..48ab103 100644 --- a/src/app/core/layout/navbar/navbar-user/navbar-user.component.scss +++ b/src/app/core/layout/navbar/navbar-user/navbar-user.component.scss @@ -159,3 +159,6 @@ nav .wrapper ul li:hover a{ pointer-events: none; } + + + diff --git a/src/app/core/layout/navbar/navbar.component.html b/src/app/core/layout/navbar/navbar.component.html index afbf0b4..644ea51 100644 --- a/src/app/core/layout/navbar/navbar.component.html +++ b/src/app/core/layout/navbar/navbar.component.html @@ -1,5 +1,15 @@
+ +
+
+ + + +
    +
    +
    +
    -
    - -
    -
    - +
    +
    -
    +
    @@ -79,5 +85,4 @@
    -
    diff --git a/src/app/core/layout/navbar/navbar.component.scss b/src/app/core/layout/navbar/navbar.component.scss index e69de29..bdcc5ef 100644 --- a/src/app/core/layout/navbar/navbar.component.scss +++ b/src/app/core/layout/navbar/navbar.component.scss @@ -0,0 +1,11 @@ + +#day_and_time{ + display: flex !important; + color: white; + align-content:space-between !important; +} + + +p#clock.hidden-xs{ +margin-right: 5px; +} \ No newline at end of file diff --git a/src/app/core/layout/navbar/navbar.component.ts b/src/app/core/layout/navbar/navbar.component.ts index 63650f8..e7e3063 100644 --- a/src/app/core/layout/navbar/navbar.component.ts +++ b/src/app/core/layout/navbar/navbar.component.ts @@ -15,6 +15,8 @@ import { AuthService } from 'src/app/_helpers/services/auth.service'; }) export class NavbarComponent { userEmail: string | null | undefined; + private clockInterval: any; + public date = new Date(); private router = inject(Router); @@ -23,14 +25,42 @@ export class NavbarComponent { ngOnInit() { this.userEmail = localStorage.getItem('username'); console.log(this.userEmail); + this.startClock(); } deconnxionlogin() { localStorage.setItem('isLoggedIn', 'false'); localStorage.removeItem('token'); + sessionStorage.removeItem('username'); // // Remplacez 'page-accueil' par l'URL de la page à laquelle vous souhaitez rediriger // console.log("Redirection vers 'dash'"); this.router.navigate(['/auth']); // //window.location.href = '/'; } + + ngOnDestroy() { + if (this.clockInterval) { + clearInterval(this.clockInterval); + } + } + + private startClock() { + this.updateClock(); // Initial call to display clock immediately + this.clockInterval = setInterval(() => this.updateClock(), 1000); + } + + private updateClock() { + const now = new Date(); + const hours = String(now.getHours()).padStart(2, '0'); + const minutes = String(now.getMinutes()).padStart(2, '0'); + const seconds = String(now.getSeconds()).padStart(2, '0'); + const timeString = `${hours}:${minutes}:${seconds}`; + + const clockElement = document.getElementById('clock'); + if (clockElement) { + clockElement.textContent = timeString; + } + } + + } diff --git a/src/app/core/layout/sidebar/nav-data.ts b/src/app/core/layout/sidebar/nav-data.ts index 12a6164..d4d6103 100644 --- a/src/app/core/layout/sidebar/nav-data.ts +++ b/src/app/core/layout/sidebar/nav-data.ts @@ -100,6 +100,35 @@ export const navbarData: MenuItem[] = [ label: 'Application android', }, { + routeLink: 'ecommerce', + icon: 'group_add', + label: 'E-commerce', + }, + { + routeLink: 'etablissement', + icon: 'group_add', + label: 'Etablissements', + }, + { + icon: 'group_add', + routeLink: 'tpe', + label: 'Tpe', + items: [ + { + routeLink: 'tpe/gerer-mes-tpe', + label: 'Mes TPE', + }, + { + routeLink: 'tpe/groupe-tpe', + label: 'Groupe TPE ', + }, + { + routeLink: 'tpe/transaction-tpe', + label: 'Transaction TPE', + }, + ], + }, + { icon: 'group_add', routeLink: 'compte-associe', label: 'Compte associé', @@ -129,21 +158,6 @@ export const navbarData: MenuItem[] = [ // }, // { - // routeLink: '', - // icon: 'dashboard', - // label: 'Ajustement', - // }, - // { - // routeLink: '', - // icon: 'dashboard', - // label: 'Achats', - // }, - // { - // routeLink: '', - // icon: 'dashboard', - // label: 'Transferts', - // }, - // { // icon: 'assignment', // label: 'R Utilisateur', // items: [ @@ -161,6 +175,7 @@ export const navbarData: MenuItem[] = [ // }, // ], // }, + // { // icon: 'assignment', // label: 'UI', diff --git a/src/app/ecommerce/ecommerce.component.html b/src/app/ecommerce/ecommerce.component.html new file mode 100644 index 0000000..969fb49 --- /dev/null +++ b/src/app/ecommerce/ecommerce.component.html @@ -0,0 +1 @@ +

    ecommerce works!

    diff --git a/src/app/ecommerce/ecommerce.component.scss b/src/app/ecommerce/ecommerce.component.scss new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/app/ecommerce/ecommerce.component.scss diff --git a/src/app/ecommerce/ecommerce.component.spec.ts b/src/app/ecommerce/ecommerce.component.spec.ts new file mode 100644 index 0000000..143bda3 --- /dev/null +++ b/src/app/ecommerce/ecommerce.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EcommerceComponent } from './ecommerce.component'; + +describe('EcommerceComponent', () => { + let component: EcommerceComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [EcommerceComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(EcommerceComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/ecommerce/ecommerce.component.ts b/src/app/ecommerce/ecommerce.component.ts new file mode 100644 index 0000000..57fc280 --- /dev/null +++ b/src/app/ecommerce/ecommerce.component.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'bgui-ecommerce', + standalone: true, + imports: [], + templateUrl: './ecommerce.component.html', + styleUrl: './ecommerce.component.scss' +}) +export class EcommerceComponent { + +} diff --git a/src/app/etablissement/etablissement.component.html b/src/app/etablissement/etablissement.component.html new file mode 100644 index 0000000..0bdb782 --- /dev/null +++ b/src/app/etablissement/etablissement.component.html @@ -0,0 +1 @@ +

    etablissement works!

    diff --git a/src/app/etablissement/etablissement.component.scss b/src/app/etablissement/etablissement.component.scss new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/app/etablissement/etablissement.component.scss diff --git a/src/app/etablissement/etablissement.component.spec.ts b/src/app/etablissement/etablissement.component.spec.ts new file mode 100644 index 0000000..0986df2 --- /dev/null +++ b/src/app/etablissement/etablissement.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EtablissementComponent } from './etablissement.component'; + +describe('EtablissementComponent', () => { + let component: EtablissementComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [EtablissementComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(EtablissementComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/etablissement/etablissement.component.ts b/src/app/etablissement/etablissement.component.ts new file mode 100644 index 0000000..037e283 --- /dev/null +++ b/src/app/etablissement/etablissement.component.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'bgui-etablissement', + standalone: true, + imports: [], + templateUrl: './etablissement.component.html', + styleUrl: './etablissement.component.scss' +}) +export class EtablissementComponent { + +} diff --git a/src/app/reversements/reversements.component.ts b/src/app/reversements/reversements.component.ts index f1c0767..b326e36 100644 --- a/src/app/reversements/reversements.component.ts +++ b/src/app/reversements/reversements.component.ts @@ -6,10 +6,8 @@ import { RouterOutlet } from '@angular/router'; @Component({ selector: 'bgui-reversements', standalone: true, - imports: [DemandeComponent, ReversementComponent,RouterOutlet,], + imports: [DemandeComponent, ReversementComponent, RouterOutlet], templateUrl: './reversements.component.html', - styleUrl: './reversements.component.scss' + styleUrl: './reversements.component.scss', }) -export class ReversementsComponent { - -} +export class ReversementsComponent {} diff --git a/src/app/tpe/create-tpe/create-tpe.component.html b/src/app/tpe/create-tpe/create-tpe.component.html new file mode 100644 index 0000000..102d990 --- /dev/null +++ b/src/app/tpe/create-tpe/create-tpe.component.html @@ -0,0 +1,179 @@ +
    +
    +

    Ajouter un Tpe

    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    diff --git a/src/app/tpe/create-tpe/create-tpe.component.scss b/src/app/tpe/create-tpe/create-tpe.component.scss new file mode 100644 index 0000000..711ebe3 --- /dev/null +++ b/src/app/tpe/create-tpe/create-tpe.component.scss @@ -0,0 +1,44 @@ +// + +.login-container { + width: 100%; + max-width: 600px; + margin: 0 auto; +} + +.example-form { + display: flex; + flex-direction: column; + gap: 16px; +} + +.form-row { + display: flex; + gap: 16px; +} + +.form-row mat-form-field { + flex: 1; +} + +// .form-actions { +// display: flex; +// justify-content: flex-end; +// } + + + +.form-actions { + display: flex; + justify-content: space-between; + align-items: center; +} + +// .right-button { +// margin-left: auto; +// } + +// .left-buttons { +// display: flex; +// /* Espace entre les boutons */ +// } \ No newline at end of file diff --git a/src/app/tpe/create-tpe/create-tpe.component.spec.ts b/src/app/tpe/create-tpe/create-tpe.component.spec.ts new file mode 100644 index 0000000..36564f9 --- /dev/null +++ b/src/app/tpe/create-tpe/create-tpe.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreateTpeComponent } from './create-tpe.component'; + +describe('CreateTpeComponent', () => { + let component: CreateTpeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [CreateTpeComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(CreateTpeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/tpe/create-tpe/create-tpe.component.ts b/src/app/tpe/create-tpe/create-tpe.component.ts new file mode 100644 index 0000000..4a89f26 --- /dev/null +++ b/src/app/tpe/create-tpe/create-tpe.component.ts @@ -0,0 +1,94 @@ +import { CommonModule } from '@angular/common'; +import { Component } from '@angular/core'; +import { + FormBuilder, + FormControl, + FormGroup, + FormsModule, + ReactiveFormsModule, + Validators, +} from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatTableModule } from '@angular/material/table'; +import { MatTabsModule } from '@angular/material/tabs'; +import { Router, RouterLink } from '@angular/router'; +import { AuthService } from 'src/app/_helpers/services/auth.service'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { provideNativeDateAdapter } from '@angular/material/core'; + +@Component({ + selector: 'bgui-create-tpe', + standalone: true, + imports: [ + CommonModule, + MatButtonModule, + MatIconModule, + MatTabsModule, + MatTableModule, + MatInputModule, + MatIconModule, + RouterLink, + FormsModule, + MatCardModule, + MatPaginatorModule, + MatDialogModule, + ReactiveFormsModule, + MatFormFieldModule, + MatSelectModule, + MatDatepickerModule, + ], + providers: [provideNativeDateAdapter()], + templateUrl: './create-tpe.component.html', + styleUrl: './create-tpe.component.scss', +}) +export class CreateTpeComponent { + showAlert: any; + selectFormControl!: FormControl; + status: any; +minDate: any; +maxDate: any; + onSubmit() { + throw new Error('Method not implemented.'); + } + login() { + throw new Error('Method not implemented.'); + } + hide = true; + + public tpeForm!: FormGroup; + + constructor( + private fb: FormBuilder, + private authservice: AuthService, + private router: Router + ) { + this.tpeForm = this.fb.group({ + date: ['', Validators.required], + transaction: ['', Validators.required], + tpe: ['', Validators.required], + groupe: ['', Validators.required], + montant: ['', Validators.required], + telephone: ['', Validators.required], + status: ['', Validators.required], + }); + } + + ngOnInit() { + this.tpeForm = this.fb.group({ + date: this.fb.control(''), + transaction: this.fb.control(''), + tpe: this.fb.control(''), + groupe: this.fb.control(''), + montant: this.fb.control(''), + telephone: this.fb.control(''), + status: this.fb.control(''), + }); + } +} diff --git a/src/app/tpe/edit-tpe/edit-tpe.component.html b/src/app/tpe/edit-tpe/edit-tpe.component.html new file mode 100644 index 0000000..102d990 --- /dev/null +++ b/src/app/tpe/edit-tpe/edit-tpe.component.html @@ -0,0 +1,179 @@ +
    +
    +

    Ajouter un Tpe

    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    diff --git a/src/app/tpe/edit-tpe/edit-tpe.component.scss b/src/app/tpe/edit-tpe/edit-tpe.component.scss new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/app/tpe/edit-tpe/edit-tpe.component.scss diff --git a/src/app/tpe/edit-tpe/edit-tpe.component.spec.ts b/src/app/tpe/edit-tpe/edit-tpe.component.spec.ts new file mode 100644 index 0000000..2fd1c3f --- /dev/null +++ b/src/app/tpe/edit-tpe/edit-tpe.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EditTpeComponent } from './edit-tpe.component'; + +describe('EditTpeComponent', () => { + let component: EditTpeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [EditTpeComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(EditTpeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/tpe/edit-tpe/edit-tpe.component.ts b/src/app/tpe/edit-tpe/edit-tpe.component.ts new file mode 100644 index 0000000..c34e63a --- /dev/null +++ b/src/app/tpe/edit-tpe/edit-tpe.component.ts @@ -0,0 +1,89 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ +import { CommonModule } from '@angular/common'; +import { Component } from '@angular/core'; +import { FormsModule, ReactiveFormsModule, FormControl, FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { provideNativeDateAdapter } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatSelectModule } from '@angular/material/select'; +import { MatTableModule } from '@angular/material/table'; +import { MatTabsModule } from '@angular/material/tabs'; +import { RouterLink } from '@angular/router'; +import { Router } from 'express'; +import { AuthService } from 'src/app/_helpers/services/auth.service'; + +@Component({ + selector: 'bgui-edit-tpe', + standalone: true, + imports: [ + CommonModule, + MatButtonModule, + MatIconModule, + MatTabsModule, + MatTableModule, + MatInputModule, + MatIconModule, + RouterLink, + FormsModule, + MatCardModule, + MatPaginatorModule, + MatDialogModule, + ReactiveFormsModule, + MatFormFieldModule, + MatSelectModule, + MatDatepickerModule, + ], + providers: [provideNativeDateAdapter()], + templateUrl: './edit-tpe.component.html', + styleUrl: './edit-tpe.component.scss', +}) +export class EditTpeComponent { + showAlert: any; + selectFormControl!: FormControl; + status: any; + minDate: any; + maxDate: any; + onSubmit() { + throw new Error('Method not implemented.'); + } + login() { + throw new Error('Method not implemented.'); + } + hide = true; + + public tpeForm!: FormGroup; + + constructor( + private fb: FormBuilder, + // private authservice: AuthService, + // private router: Router + ) { + this.tpeForm = this.fb.group({ + date: ['', Validators.required], + transaction: ['', Validators.required], + tpe: ['', Validators.required], + groupe: ['', Validators.required], + montant: ['', Validators.required], + telephone: ['', Validators.required], + status: ['', Validators.required], + }); + } + + ngOnInit() { + this.tpeForm = this.fb.group({ + date: this.fb.control(''), + transaction: this.fb.control(''), + tpe: this.fb.control(''), + groupe: this.fb.control(''), + montant: this.fb.control(''), + telephone: this.fb.control(''), + status: this.fb.control(''), + }); + } +} diff --git a/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.html b/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.html new file mode 100644 index 0000000..553793f --- /dev/null +++ b/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.html @@ -0,0 +1,232 @@ +
    +

    Gérer mes TPE

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    + +
    + + Filtrer + + + + + + + + Groupe + + {{ + element.groupe + }} + + + + + + Nom + + {{ + element.nom + }} + + + + + + Service + + {{ + element.service + }} + + + + + + Solde + + {{ + element.solde + }} + + + + + + Fonction + + {{ + element.fonction + }} + + + + + + Statut + + {{ + element.statut + }} + + + + + + Activité + + {{ + element.activite + }} + + + + + + Actions + + +
    + + +
    +     +     + + + +
    + +
    +
    +
    +
    +
    +
    +
    diff --git a/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.scss b/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.scss new file mode 100644 index 0000000..1bca74a --- /dev/null +++ b/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.scss @@ -0,0 +1,56 @@ +.card { + + border-radius:0 !important; + background-color: #ffffff61; + +} + + .text { + color:black; + font-weight: bold; + font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ +} + + + +.bold-text { + color:rgb(0, 0, 0); + font-weight: bold; + font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ +} + + + + .col-md-2 { + flex: 0 0 auto; + width: 33% !important; + } + + + button ,a { + border-radius: 0px !important; +} + + +.example-form { + width: 500%; + max-width: 1000px; + margin: auto; +} + +.example-full-width { + width: 100%; +} + +.form-group-width { + max-width: 800px; +} + + +.group-width{ + max-width: 400px; + +} + + + diff --git a/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.spec.ts b/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.spec.ts new file mode 100644 index 0000000..f8a40a6 --- /dev/null +++ b/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { GererMesTpeComponent } from './gerer-mes-tpe.component'; + +describe('GererMesTpeComponent', () => { + let component: GererMesTpeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [GererMesTpeComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(GererMesTpeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.ts b/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.ts new file mode 100644 index 0000000..3a5a288 --- /dev/null +++ b/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.ts @@ -0,0 +1,122 @@ +import { CommonModule } from '@angular/common'; +import { Component, ViewChild } from '@angular/core'; +import { MatTableDataSource, MatTableModule } from '@angular/material/table'; +import { RouterLink } from '@angular/router'; +import { MatInputModule } from '@angular/material/input'; +import { FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator'; +import { MatTabsModule } from '@angular/material/tabs'; + +export interface Element { + groupe: string; + nom: string; + service: string; + solde: number; + fonction: string; + statut: string; + activite: string; +} + +const ELEMENT_DATA: Element[] = [ + { + groupe: 'A', + nom: 'John Doe', + service: 'Service A', + solde: 1000, + fonction: 'Fonction 1', + statut: 'Actif', + activite: 'Activité 1', + }, + { + groupe: 'B', + nom: 'Jane Doe', + service: 'Service B', + solde: 2000, + fonction: 'Fonction 2', + statut: 'Inactif', + activite: 'Activité 2', + }, + { + groupe: 'C', + nom: 'Bob Smith', + service: 'Service C', + solde: 3000, + fonction: 'Fonction 3', + statut: 'Actif', + activite: 'Activité 3', + }, + { + groupe: 'C', + nom: 'John Doe', + service: 'Service A', + solde: 1000, + fonction: 'Fonction 1', + statut: 'Actif', + activite: 'Activité 1', + }, + { + groupe: 'B', + nom: 'Jane Doe', + service: 'Service B', + solde: 2000, + fonction: 'Fonction 2', + statut: 'Inactif', + activite: 'Activité 2', + }, + { + groupe: 'A', + nom: 'Bob Smith', + service: 'Service A', + solde: 3500, + fonction: 'Fonction 3', + statut: 'Actif', + activite: 'Activité 3', + }, +]; + +@Component({ + selector: 'bgui-gerer-mes-tpe', + standalone: true, + imports: [ + CommonModule, + MatButtonModule, + MatIconModule, + MatTabsModule, + MatTableModule, + MatInputModule, + MatIconModule, + RouterLink, + FormsModule, + MatPaginatorModule, + ], + templateUrl: './gerer-mes-tpe.component.html', + styleUrl: './gerer-mes-tpe.component.scss', +}) +export class GererMesTpeComponent { + onSearch() { + throw new Error('Method not implemented.'); + } + displayedColumns: string[] = [ + 'groupe', + 'nom', + 'service', + 'solde', + 'fonction', + 'statut', + 'activite', + 'action', + ]; + dataSource = new MatTableDataSource(ELEMENT_DATA); + @ViewChild(MatPaginator) paginator!: MatPaginator; + element: any; + applyFilter(event: Event) { + const filterValue = (event.target as HTMLInputElement).value; + this.dataSource.filter = filterValue.trim().toLowerCase(); + } + + ngAfterViewInit() { + this.dataSource.paginator = this.paginator; + } +} \ No newline at end of file diff --git a/src/app/tpe/groupe-tpe/groupe-tpe.component.html b/src/app/tpe/groupe-tpe/groupe-tpe.component.html new file mode 100644 index 0000000..d34e6a5 --- /dev/null +++ b/src/app/tpe/groupe-tpe/groupe-tpe.component.html @@ -0,0 +1,180 @@ +
    +

    Gérer mes TPE

    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    + +
    + + Filtrer + + + + + + + + Date Creation + + {{ + element.date + }} + + + + + + Nom + + {{ + element.nom + }} + + + + + + Description + + {{ + element.description + }} + + + + + + Actions + + +
    + + +
    +     +     + + + +
    + +
    +
    +
    +
    +
    +
    +
    diff --git a/src/app/tpe/groupe-tpe/groupe-tpe.component.scss b/src/app/tpe/groupe-tpe/groupe-tpe.component.scss new file mode 100644 index 0000000..1bca74a --- /dev/null +++ b/src/app/tpe/groupe-tpe/groupe-tpe.component.scss @@ -0,0 +1,56 @@ +.card { + + border-radius:0 !important; + background-color: #ffffff61; + +} + + .text { + color:black; + font-weight: bold; + font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ +} + + + +.bold-text { + color:rgb(0, 0, 0); + font-weight: bold; + font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ +} + + + + .col-md-2 { + flex: 0 0 auto; + width: 33% !important; + } + + + button ,a { + border-radius: 0px !important; +} + + +.example-form { + width: 500%; + max-width: 1000px; + margin: auto; +} + +.example-full-width { + width: 100%; +} + +.form-group-width { + max-width: 800px; +} + + +.group-width{ + max-width: 400px; + +} + + + diff --git a/src/app/tpe/groupe-tpe/groupe-tpe.component.spec.ts b/src/app/tpe/groupe-tpe/groupe-tpe.component.spec.ts new file mode 100644 index 0000000..160acc1 --- /dev/null +++ b/src/app/tpe/groupe-tpe/groupe-tpe.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { GroupeTpeComponent } from './groupe-tpe.component'; + +describe('GroupeTpeComponent', () => { + let component: GroupeTpeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [GroupeTpeComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(GroupeTpeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/tpe/groupe-tpe/groupe-tpe.component.ts b/src/app/tpe/groupe-tpe/groupe-tpe.component.ts new file mode 100644 index 0000000..ca28ca2 --- /dev/null +++ b/src/app/tpe/groupe-tpe/groupe-tpe.component.ts @@ -0,0 +1,84 @@ +import { CommonModule } from '@angular/common'; +import { Component, ViewChild } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator'; +import { MatTableDataSource, MatTableModule } from '@angular/material/table'; +import { MatTabsModule } from '@angular/material/tabs'; +import { RouterLink } from '@angular/router'; + +export interface Element { + date: string; + nom: string; + description: string; +} + +const ELEMENT_DATA: Element[] = [ + { + date: '10-10-2024', + nom: 'John Doe', + description: 'description A', + }, + { + date: '10-10-2024', + nom: 'Jane Doe', + description: 'description B', + }, + { + date: '17-10-2024', + nom: 'Bob Smith', + description: 'description C', + }, + { + date: '10-10-2024', + nom: 'John Doe', + description: 'description A', + }, + { + date: '19-10-2024', + nom: 'Jane Doe', + description: 'description B', + }, + { + date: '10-10-2024', + nom: 'Bob Smith', + description: 'description A', + }, +]; +@Component({ + selector: 'bgui-groupe-tpe', + standalone: true, + imports: [ + CommonModule, + MatButtonModule, + MatIconModule, + MatTabsModule, + MatTableModule, + MatInputModule, + MatIconModule, + RouterLink, + FormsModule, + MatPaginatorModule, + ], + templateUrl: './groupe-tpe.component.html', + styleUrl: './groupe-tpe.component.scss', +}) +export class GroupeTpeComponent { +onSearch() { +throw new Error('Method not implemented.'); +} + displayedColumns: string[] = ['date', 'nom', 'description']; + dataSource = new MatTableDataSource(ELEMENT_DATA); + @ViewChild(MatPaginator) paginator!: MatPaginator; + element: any; + applyFilter(event: Event) { + const filterValue = (event.target as HTMLInputElement).value; + this.dataSource.filter = filterValue.trim().toLowerCase(); + } + + ngAfterViewInit() { + this.dataSource.paginator = this.paginator; + } +} diff --git a/src/app/tpe/tpe.component.html b/src/app/tpe/tpe.component.html new file mode 100644 index 0000000..202a425 --- /dev/null +++ b/src/app/tpe/tpe.component.html @@ -0,0 +1,21 @@ +
    +
    +
    +
    + +
    +
    +
    + + + + + diff --git a/src/app/tpe/tpe.component.scss b/src/app/tpe/tpe.component.scss new file mode 100644 index 0000000..8d489c0 --- /dev/null +++ b/src/app/tpe/tpe.component.scss @@ -0,0 +1,61 @@ +.card { + + border-radius:0 !important; + background-color: #ffffff61; + +} + + .text { + color:black; + font-weight: bold; + font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ +} + + + +.bold-text { + color:rgb(0, 0, 0); + font-weight: bold; + font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ +} + + + + .col-md-2 { + flex: 0 0 auto; + width: 33% !important; + } + + + button ,a { + border-radius: 0px !important; +} + + +.example-form { + width: 500%; + max-width: 1000px; + margin: auto; +} + +.example-full-width { + width: 100%; +} + +.form-group-width { + max-width: 800px; +} + + +.group-width{ + max-width: 400px; + +} + + +.card-body{ + background-color: #edeff7; + height: 50px; + align-content: center; + margin-right: 10px !important; +} \ No newline at end of file diff --git a/src/app/tpe/tpe.component.spec.ts b/src/app/tpe/tpe.component.spec.ts new file mode 100644 index 0000000..77b33be --- /dev/null +++ b/src/app/tpe/tpe.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TpeComponent } from './tpe.component'; + +describe('TpeComponent', () => { + let component: TpeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [TpeComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(TpeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/tpe/tpe.component.ts b/src/app/tpe/tpe.component.ts new file mode 100644 index 0000000..d8b4c5a --- /dev/null +++ b/src/app/tpe/tpe.component.ts @@ -0,0 +1,24 @@ +import { CommonModule } from '@angular/common'; +import { Component } from '@angular/core'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatCardModule } from '@angular/material/card'; +import { MatInputModule } from '@angular/material/input'; +import { RouterLink, RouterOutlet } from '@angular/router'; +import { UserService } from '../_services/utilisateur/user.service'; + +@Component({ + selector: 'bgui-tpe', + standalone: true, + imports: [ + CommonModule, + MatInputModule, + MatCardModule, + // ReactiveFormsModule, + RouterOutlet, + RouterLink, + ], + providers: [UserService], + templateUrl: './tpe.component.html', + styleUrls: ['./tpe.component.scss'], +}) +export class TpeComponent {} diff --git a/src/app/tpe/tpe.routes.ts b/src/app/tpe/tpe.routes.ts new file mode 100644 index 0000000..bb8d6bd --- /dev/null +++ b/src/app/tpe/tpe.routes.ts @@ -0,0 +1,42 @@ +import { Routes } from '@angular/router'; +import { CreateTpeComponent } from './create-tpe/create-tpe.component'; +import { EditTpeComponent } from './edit-tpe/edit-tpe.component'; +import { TpeComponent } from './tpe.component'; +import { ViewTpeComponent } from './tpe/view-tpe.component'; +import { GererMesTpeComponent } from './gerer-mes-tpe/gerer-mes-tpe.component'; +import { GroupeTpeComponent } from './groupe-tpe/groupe-tpe.component'; +import { TransactionTpeComponent } from './transaction-tpe/transaction-tpe.component'; + +export const tpeRoutes: Routes = [ + { + path: '', + component: TpeComponent, + children: [ + { path: '', redirectTo: 'view-tpe', pathMatch: 'full' }, + { + path: 'view-tpe', + component: ViewTpeComponent, + }, + { + path: 'create-tpe', + component: CreateTpeComponent, + }, + { + path: 'edit-tep/:id', + component: EditTpeComponent, + }, + { + path: 'gerer-mes-tpe', + component: GererMesTpeComponent, + }, + { + path: 'groupe-tpe', + component: GroupeTpeComponent, + }, + { + path: 'transaction-tpe', + component: TransactionTpeComponent, + }, + ], + }, +]; diff --git a/src/app/tpe/tpe/view-tpe.component.html b/src/app/tpe/tpe/view-tpe.component.html new file mode 100644 index 0000000..2b5bde7 --- /dev/null +++ b/src/app/tpe/tpe/view-tpe.component.html @@ -0,0 +1,276 @@ + +
    +

    TPE

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    + +
    + + Filter + + + + + + Date + {{ tpe.date }} + + + + Transaction + {{ + tpe.transaction + }} + + + + TPE + {{ tpe.tpe }} + + + + Groupe + {{ tpe.groupe }} + + + + Montant + {{ tpe.montant }} + + + Téléphone + {{ tpe.telephone }} + + + + Status + {{ tpe.status }} + + + + Actions + +
    + + +
    +     +     + + + +     + +
    +
    +
    +
    +
    +
    +
    + + + + diff --git a/src/app/tpe/tpe/view-tpe.component.scss b/src/app/tpe/tpe/view-tpe.component.scss new file mode 100644 index 0000000..1bca74a --- /dev/null +++ b/src/app/tpe/tpe/view-tpe.component.scss @@ -0,0 +1,56 @@ +.card { + + border-radius:0 !important; + background-color: #ffffff61; + +} + + .text { + color:black; + font-weight: bold; + font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ +} + + + +.bold-text { + color:rgb(0, 0, 0); + font-weight: bold; + font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ +} + + + + .col-md-2 { + flex: 0 0 auto; + width: 33% !important; + } + + + button ,a { + border-radius: 0px !important; +} + + +.example-form { + width: 500%; + max-width: 1000px; + margin: auto; +} + +.example-full-width { + width: 100%; +} + +.form-group-width { + max-width: 800px; +} + + +.group-width{ + max-width: 400px; + +} + + + diff --git a/src/app/tpe/tpe/view-tpe.component.spec.ts b/src/app/tpe/tpe/view-tpe.component.spec.ts new file mode 100644 index 0000000..7d0c125 --- /dev/null +++ b/src/app/tpe/tpe/view-tpe.component.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ViewTpeComponent } from './view-tpe.component'; + +describe('ViewTpeComponent', () => { + let component: ViewTpeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ViewTpeComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(ViewTpeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/tpe/tpe/view-tpe.component.ts b/src/app/tpe/tpe/view-tpe.component.ts new file mode 100644 index 0000000..8d6c2d3 --- /dev/null +++ b/src/app/tpe/tpe/view-tpe.component.ts @@ -0,0 +1,230 @@ +import { CommonModule } from '@angular/common'; +import { HttpClient } from '@angular/common/http'; +import { Component, ViewChild } from '@angular/core'; +import { + FormGroup, + FormBuilder, + Validators, + FormsModule, +} from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDialog } from '@angular/material/dialog'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatTableDataSource, MatTableModule } from '@angular/material/table'; +import { MatTabsModule } from '@angular/material/tabs'; +import { RouterLink } from '@angular/router'; +import { UserService } from 'src/app/_services/utilisateur/user.service'; + +@Component({ + selector: 'bgui-view-tpe', + standalone: true, + imports: [ + CommonModule, + MatButtonModule, + MatIconModule, + MatTabsModule, + MatTableModule, + MatInputModule, + MatIconModule, + RouterLink, + FormsModule, + MatPaginatorModule, + ], + templateUrl: './view-tpe.component.html', + styleUrl: './view-tpe.component.scss', +}) +export class ViewTpeComponent { +services: any; +operateurs: any; + onExport() { + throw new Error('Method not implemented.'); + } + onSearch() { + throw new Error('Method not implemented.'); + } + // eslint-disable-next-line @typescript-eslint/no-unused-vars + onDelete(arg0: any) { + throw new Error('Method not implemented.'); + } + + tpeForm: FormGroup; + + constructor( + private http: HttpClient, + // private router: Router, + private snackBar: MatSnackBar, + private dialog: MatDialog, + private userService: UserService, + private fb: FormBuilder, + private matdialog: MatDialog + ) { + this.tpeForm = this.fb.group({ + date: ['', Validators.required], + transaction: ['', Validators.required], + tpe: ['', Validators.required], + groupe: ['', Validators.required], + montant: ['', Validators.required], + telephone: ['', Validators.required], + status: ['', Validators.required], + }); + } + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + tpe: any[] = [ + { + date: '2023-06-18', + transaction: 'Transaction 1', + tpe: 'TPE 1', + groupe: 'Groupe 1', + montant: 100, + telephone: '1234567890', + status: 'INVALIDE', + }, + { + date: '2023-06-19', + transaction: 'Transaction 2', + tpe: 'TPE 2', + groupe: 'Groupe 2', + montant: 200, + telephone: '0987654321', + status: 'VALIDE', + }, + // Ajout de 30 lignes supplémentaires + { + date: '2023-06-20', + transaction: 'Transaction 3', + tpe: 'TPE 3', + groupe: 'Groupe 3', + montant: 150, + telephone: '0123456789', + status: 'INVALIDE', + }, + { + date: '2023-06-21', + transaction: 'Transaction 4', + tpe: 'TPE 4', + groupe: 'Groupe 4', + montant: 180, + telephone: '9876543210', + status: 'VALIDE', + }, + { + date: '2023-06-18', + transaction: 'Transaction 1', + tpe: 'TPE 1', + groupe: 'Groupe 1', + montant: 100, + telephone: '1234567890', + status: 'INVALIDE', + }, + { + date: '2023-06-19', + transaction: 'Transaction 2', + tpe: 'TPE 2', + groupe: 'Groupe 2', + montant: 200, + telephone: '0987654321', + status: 'VALIDE', + }, + // Ajout de 30 lignes supplémentaires + { + date: '2023-06-20', + transaction: 'Transaction 3', + tpe: 'TPE 3', + groupe: 'Groupe 3', + montant: 150, + telephone: '0123456789', + status: 'INVALIDE', + }, + { + date: '2023-06-21', + transaction: 'Transaction 4', + tpe: 'TPE 4', + groupe: 'Groupe 4', + montant: 180, + telephone: '9876543210', + status: 'VALIDE', + }, + // Ajout de 5 lignes supplémentaires + { + date: '2023-06-22', + transaction: 'Transaction 5', + tpe: 'TPE 5', + groupe: 'Groupe 5', + montant: 120, + telephone: '5555555555', + status: 'VALIDE', + }, + { + date: '2023-06-23', + transaction: 'Transaction 6', + tpe: 'TPE 6', + groupe: 'Groupe 6', + montant: 250, + telephone: '6666666666', + status: 'INVALIDE', + }, + { + date: '2023-06-24', + transaction: 'Transaction 7', + tpe: 'TPE 7', + groupe: 'Groupe 7', + montant: 300, + telephone: '7777777777', + status: 'VALIDE', + }, + { + date: '2023-06-25', + transaction: 'Transaction 8', + tpe: 'TPE 8', + groupe: 'Groupe 8', + montant: 280, + telephone: '8888888888', + status: 'INVALIDE', + }, + { + date: '2023-06-26', + transaction: 'Transaction 9', + tpe: 'TPE 9', + groupe: 'Groupe 9', + montant: 150, + telephone: '9999999999', + status: 'VALIDE', + }, + ]; + + dataSource = new MatTableDataSource(this.tpe); + @ViewChild(MatPaginator) paginator!: MatPaginator; + + displayedColumns: string[] = [ + 'date', + 'transaction', + 'tpe', + 'groupe', + 'montant', + 'telephone', + 'status', + 'action', + ]; + + ngAfterViewInit() { + this.dataSource.paginator = this.paginator; + } + + applyFilter(event: Event) { + const filterValue = (event.target as HTMLInputElement).value; + this.dataSource.filter = filterValue.trim().toLowerCase(); + } + + onSubmit() { + if (this.tpeForm.valid) { + console.log('Form submitted:', this.tpeForm.value); + // Add logic here to save or process the form data + } else { + console.error('Form is invalid'); + } + } +} diff --git a/src/app/tpe/transaction-tpe/transaction-tpe.component.html b/src/app/tpe/transaction-tpe/transaction-tpe.component.html new file mode 100644 index 0000000..47cb0cf --- /dev/null +++ b/src/app/tpe/transaction-tpe/transaction-tpe.component.html @@ -0,0 +1 @@ +

    transaction-tpe works!

    diff --git a/src/app/tpe/transaction-tpe/transaction-tpe.component.scss b/src/app/tpe/transaction-tpe/transaction-tpe.component.scss new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/app/tpe/transaction-tpe/transaction-tpe.component.scss diff --git a/src/app/tpe/transaction-tpe/transaction-tpe.component.spec.ts b/src/app/tpe/transaction-tpe/transaction-tpe.component.spec.ts new file mode 100644 index 0000000..8a03940 --- /dev/null +++ b/src/app/tpe/transaction-tpe/transaction-tpe.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TransactionTpeComponent } from './transaction-tpe.component'; + +describe('TransactionTpeComponent', () => { + let component: TransactionTpeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [TransactionTpeComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(TransactionTpeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/tpe/transaction-tpe/transaction-tpe.component.ts b/src/app/tpe/transaction-tpe/transaction-tpe.component.ts new file mode 100644 index 0000000..5956ebe --- /dev/null +++ b/src/app/tpe/transaction-tpe/transaction-tpe.component.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'bgui-transaction-tpe', + standalone: true, + imports: [], + templateUrl: './transaction-tpe.component.html', + styleUrl: './transaction-tpe.component.scss' +}) +export class TransactionTpeComponent { + +} diff --git a/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html b/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html index fd8f08f..3cca5af 100644 --- a/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html +++ b/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html @@ -20,77 +20,6 @@
    -
    @@ -179,7 +108,7 @@
    - + Filter diff --git a/src/app/utilisateurs/create-users/create-users.component.html b/src/app/utilisateurs/create-users/create-users.component.html index 8d64ea3..73b300e 100644 --- a/src/app/utilisateurs/create-users/create-users.component.html +++ b/src/app/utilisateurs/create-users/create-users.component.html @@ -2,7 +2,6 @@
    Ajouter Utilisateur
    -
    -
    -
    -
    diff --git a/src/app/utilisateurs/utilisateurs.component.ts b/src/app/utilisateurs/utilisateurs.component.ts index 54812c9..2d5f18f 100644 --- a/src/app/utilisateurs/utilisateurs.component.ts +++ b/src/app/utilisateurs/utilisateurs.component.ts @@ -5,7 +5,6 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatCardModule } from '@angular/material/card'; import { RouterOutlet } from '@angular/router'; import { UserService } from '../_services/utilisateur/user.service'; -import { IUtilisateur } from '../_interfaces/utilisateur/user'; @Component({ selector: 'bgui-utilisateurs', @@ -23,15 +22,4 @@ import { IUtilisateur } from '../_interfaces/utilisateur/user'; }) export class UtilisateursComponent { date = new Date(); - users: IUtilisateur[] = []; - displayedColumns: string[] = [ - 'id', - 'first_name', - 'last_name', - 'password', - 'email', - 'password', - 'role', - 'profile_photo', - ]; } diff --git a/src/app/utilisateurs/view-user/view-user.component.html b/src/app/utilisateurs/view-user/view-user.component.html index 7de3339..4d2f53e 100644 --- a/src/app/utilisateurs/view-user/view-user.component.html +++ b/src/app/utilisateurs/view-user/view-user.component.html @@ -30,7 +30,7 @@
    - + Filter