From 0e9b53ccb5ea7fccf5944a1d836809099fe24d72 Mon Sep 17 00:00:00 2001 From: zadi francice Date: Thu, 16 May 2024 17:42:58 +0000 Subject: [PATCH] 16/05/2024 --- src/app/_helpers/services/auth.service.ts | 6 +++--- src/app/_interfaces/trafics/operateur/operateur.ts | 10 ++++++++++ src/app/_interfaces/trafics/paiement/paiement.ts | 2 ++ src/app/_interfaces/trafics/transaction/transaction.ts | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/app/_services/trafics/operateur/operateur.service.spec.ts | 16 ++++++++++++++++ src/app/_services/trafics/operateur/operateur.service.ts | 21 +++++++++++++++++++++ src/app/_services/trafics/paiement/paiement.service.spec.ts | 16 ++++++++++++++++ src/app/_services/trafics/paiement/paiement.service.ts | 8 ++++++++ src/app/_services/trafics/transaction/transaction.service.spec.ts | 16 ++++++++++++++++ src/app/_services/trafics/transaction/transaction.service.ts | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/account/auth/login-standard-user/login-standard-user.component.html | 31 ++++++++++++++++++------------- src/app/account/auth/login-standard-user/login-standard-user.component.ts | 234 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------- src/app/admin-test/admin-test.component.html | 558 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/app/admin-test/admin-test.component.ts | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------- src/app/trafics/transactions/suivi-paiement/suivi-paiement.component.ts | 2 +- src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html | 11 +---------- src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.ts | 2 +- src/app/utilisateurs/create-users/create-users.component.html | 401 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- src/app/utilisateurs/create-users/create-users.component.ts | 44 ++++++++++++++++++++++++++++++++++++++++++-- src/app/utilisateurs/delete-user/delete-user.component.html | 0 src/app/utilisateurs/delete-user/delete-user.component.scss | 0 src/app/utilisateurs/delete-user/delete-user.component.spec.ts | 23 +++++++++++++++++++++++ src/app/utilisateurs/delete-user/delete-user.component.ts | 11 +++++++++++ src/app/utilisateurs/edit-user/edit-user.component.html | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/utilisateurs/edit-user/edit-user.component.scss | 0 src/app/utilisateurs/edit-user/edit-user.component.spec.ts | 23 +++++++++++++++++++++++ src/app/utilisateurs/edit-user/edit-user.component.ts | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/utilisateurs/user.routes.ts | 33 +++++++++++++++++++++++++++++++++ src/app/utilisateurs/utilisateurs.component.html | 56 +++++++++++++++++++------------------------------------- src/app/utilisateurs/utilisateurs.component.ts | 8 +++----- src/app/utilisateurs/view-user/view-user.component.html | 461 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/utilisateurs/view-user/view-user.component.scss | 0 src/app/utilisateurs/view-user/view-user.component.spec.ts | 23 +++++++++++++++++++++++ src/app/utilisateurs/view-user/view-user.component.ts | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/environments/environment.api.ts | 2 +- src/environments/environment.ts | 2 +- 36 files changed, 2195 insertions(+), 438 deletions(-) create mode 100644 src/app/_interfaces/trafics/operateur/operateur.ts create mode 100644 src/app/_interfaces/trafics/paiement/paiement.ts create mode 100644 src/app/_interfaces/trafics/transaction/transaction.ts create mode 100644 src/app/_services/trafics/operateur/operateur.service.spec.ts create mode 100644 src/app/_services/trafics/operateur/operateur.service.ts create mode 100644 src/app/_services/trafics/paiement/paiement.service.spec.ts create mode 100644 src/app/_services/trafics/paiement/paiement.service.ts create mode 100644 src/app/_services/trafics/transaction/transaction.service.spec.ts create mode 100644 src/app/_services/trafics/transaction/transaction.service.ts create mode 100644 src/app/utilisateurs/delete-user/delete-user.component.html create mode 100644 src/app/utilisateurs/delete-user/delete-user.component.scss create mode 100644 src/app/utilisateurs/delete-user/delete-user.component.spec.ts create mode 100644 src/app/utilisateurs/delete-user/delete-user.component.ts create mode 100644 src/app/utilisateurs/edit-user/edit-user.component.html create mode 100644 src/app/utilisateurs/edit-user/edit-user.component.scss create mode 100644 src/app/utilisateurs/edit-user/edit-user.component.spec.ts create mode 100644 src/app/utilisateurs/edit-user/edit-user.component.ts create mode 100644 src/app/utilisateurs/user.routes.ts create mode 100644 src/app/utilisateurs/view-user/view-user.component.html create mode 100644 src/app/utilisateurs/view-user/view-user.component.scss create mode 100644 src/app/utilisateurs/view-user/view-user.component.spec.ts create mode 100644 src/app/utilisateurs/view-user/view-user.component.ts diff --git a/src/app/_helpers/services/auth.service.ts b/src/app/_helpers/services/auth.service.ts index d91dd64..4f8d3cf 100644 --- a/src/app/_helpers/services/auth.service.ts +++ b/src/app/_helpers/services/auth.service.ts @@ -41,7 +41,7 @@ export class AuthService { return ( this.http // eslint-disable-next-line @typescript-eslint/no-explicit-any - .post('http://192.168.1.223:8000/api/token/verify/', body, { + .post('http://192.168.1.223:8001/api/token/verify/', body, { headers, observe: 'response', }) @@ -64,7 +64,7 @@ export class AuthService { this.http // eslint-disable-next-line @typescript-eslint/no-explicit-any .post( - 'http://192.168.1.223:8000/api/token/', + 'http://192.168.1.223:8001/api/token/', user, this.httpOptions ) @@ -89,7 +89,7 @@ export class AuthService { this.http // eslint-disable-next-line @typescript-eslint/no-explicit-any .post( - 'http://192.168.1.223:8000/api-token-refresh/', + 'http://192.168.1.223:8001/api-token-refresh/', { token: this.token }, this.httpOptions ) diff --git a/src/app/_interfaces/trafics/operateur/operateur.ts b/src/app/_interfaces/trafics/operateur/operateur.ts new file mode 100644 index 0000000..590e488 --- /dev/null +++ b/src/app/_interfaces/trafics/operateur/operateur.ts @@ -0,0 +1,10 @@ +export interface IOperateur { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + name: any; + id: number; + code: string; + liens: string; + etat: true; + status: number; + information: string; +} diff --git a/src/app/_interfaces/trafics/paiement/paiement.ts b/src/app/_interfaces/trafics/paiement/paiement.ts new file mode 100644 index 0000000..27f4987 --- /dev/null +++ b/src/app/_interfaces/trafics/paiement/paiement.ts @@ -0,0 +1,2 @@ +export interface Paiement { +} diff --git a/src/app/_interfaces/trafics/transaction/transaction.ts b/src/app/_interfaces/trafics/transaction/transaction.ts new file mode 100644 index 0000000..43c6273 --- /dev/null +++ b/src/app/_interfaces/trafics/transaction/transaction.ts @@ -0,0 +1,46 @@ +export interface ITransaction { + transaction_id: number; + type_paiement: number; + type_paiement_label: string; + marchand: string; + service: string; + montant: number; + date: Date; + commentaire: string; + etat: boolean; + status: number; + reference: string; +} + + + + +// interface ITypeOperateur { +// id_type_paiement: number; +// label: string; +// total_montant: number; +// } + +// interface ITransaction { +// type_paiement: number; +// type_paiement_label: string; +// marchand: string; +// service: string; +// montant: number; +// date: string; +// commentaire: string; +// etat: boolean; +// status: number; +// reference: string; +// transaction_id: number; +// } + +// interface IMerchantData { +// merchant_key: string; +// solde: number; +// total_transaction: number; +// total_journee: number; +// revesement: number; +// type_operateur: ITypeOperateur[]; +// last_five_transactions: ITransaction[]; +// } diff --git a/src/app/_services/trafics/operateur/operateur.service.spec.ts b/src/app/_services/trafics/operateur/operateur.service.spec.ts new file mode 100644 index 0000000..e521617 --- /dev/null +++ b/src/app/_services/trafics/operateur/operateur.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { OperateurService } from './operateur.service'; + +describe('OperateurService', () => { + let service: OperateurService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(OperateurService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/_services/trafics/operateur/operateur.service.ts b/src/app/_services/trafics/operateur/operateur.service.ts new file mode 100644 index 0000000..4d1f1de --- /dev/null +++ b/src/app/_services/trafics/operateur/operateur.service.ts @@ -0,0 +1,21 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/internal/Observable'; +import { IOperateur } from 'src/app/_interfaces/trafics/operateur/operateur'; + +@Injectable({ + providedIn: 'root', +}) +export class OperateurService { + private OpUrl = 'http://192.168.1.223:8001/operateur/'; + + constructor( + private http: HttpClient + // public operateur: IOperateur + ) {} + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + getOperator(): Observable { + return this.http.get(this.OpUrl); + } +} diff --git a/src/app/_services/trafics/paiement/paiement.service.spec.ts b/src/app/_services/trafics/paiement/paiement.service.spec.ts new file mode 100644 index 0000000..fa6273b --- /dev/null +++ b/src/app/_services/trafics/paiement/paiement.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { PaiementService } from './paiement.service'; + +describe('PaiementService', () => { + let service: PaiementService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(PaiementService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/_services/trafics/paiement/paiement.service.ts b/src/app/_services/trafics/paiement/paiement.service.ts new file mode 100644 index 0000000..e8309ed --- /dev/null +++ b/src/app/_services/trafics/paiement/paiement.service.ts @@ -0,0 +1,8 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root', +}) +export class PaiementService { + constructor() {} +} diff --git a/src/app/_services/trafics/transaction/transaction.service.spec.ts b/src/app/_services/trafics/transaction/transaction.service.spec.ts new file mode 100644 index 0000000..82b19f8 --- /dev/null +++ b/src/app/_services/trafics/transaction/transaction.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { TransactionService } from './transaction.service'; + +describe('TransactionService', () => { + let service: TransactionService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(TransactionService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/_services/trafics/transaction/transaction.service.ts b/src/app/_services/trafics/transaction/transaction.service.ts new file mode 100644 index 0000000..3d2da4d --- /dev/null +++ b/src/app/_services/trafics/transaction/transaction.service.ts @@ -0,0 +1,75 @@ +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Observable, catchError, throwError } from 'rxjs'; +import { ITransaction } from 'src/app/_interfaces/trafics/transaction/transaction'; + +@Injectable({ + providedIn: 'root', +}) +export class TransactionService { + //private HtUrl = 'http://192.168.1.223:8001/transactions/'; + private HtUrl = 'http://192.168.1.223:8001/api/tableau_bord/1/'; + + httpOptions = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json', + }), + }; + + constructor(private httpClient: HttpClient) {} + + getAll(): Observable { + return this.httpClient + .get(this.HtUrl) + .pipe(catchError(this.errorHandler)); + } + + create(transaction: ITransaction): Observable { + return this.httpClient + .post( + this.HtUrl, + JSON.stringify(transaction), + this.httpOptions + ) + .pipe(catchError(this.errorHandler)); + } + + find(transaction_id: number): Observable { + return this.httpClient + .get(`${this.HtUrl}/${transaction_id}`) + .pipe(catchError(this.errorHandler)); + } + + update( + transaction_id: number, + transaction: ITransaction + ): Observable { + const url = `${this.HtUrl}/${transaction_id}`; + return this.httpClient + .put(url, transaction, this.httpOptions) + .pipe(catchError(this.errorHandler)); + } + + // update(transaction_id: number, transaction: ITransaction): Observable { + // return this.httpClient; + // transaction.pipe(catchError(this.errorHandler)); + // } + + delete(transaction_id: number) { + return this.httpClient + .delete(`${this.HtUrl}/${transaction_id}`, this.httpOptions) + + .pipe(catchError(this.errorHandler)); + } + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + errorHandler(error: any) { + let errorMessage = ''; + if (error.error instanceof ErrorEvent) { + errorMessage = error.error.message; + } else { + errorMessage = `Error Code: ${error.status}\nMessage: ${error.message}`; + } + return throwError(errorMessage); + } +} diff --git a/src/app/account/auth/login-standard-user/login-standard-user.component.html b/src/app/account/auth/login-standard-user/login-standard-user.component.html index 6a44766..cd751d1 100644 --- a/src/app/account/auth/login-standard-user/login-standard-user.component.html +++ b/src/app/account/auth/login-standard-user/login-standard-user.component.html @@ -21,7 +21,10 @@
    -
    +
    @@ -31,7 +34,7 @@ matInput placeholder="pat@example.com" name="email" - [(ngModel)]="user.username" + [(ngModel)]="form.email" required /> +
    +
    SOLDE
    -
    +
    -
    1200 FCFA
    -
    - +
    +

    87845000 FCFA

    -
    - 4.63% vs. semaine dernière -
    @@ -41,29 +31,23 @@
    -
    -
    +
    -
    -
    Montant Total Transactions
    +
    +
    + Montant Total Transactions +
    -
    -
    -
    0
    -
    - +
    +
    +
    +

    87845000 FCFA

    -
    -
    - 4.63% vs. semaine dernière +
    @@ -75,27 +59,20 @@
    -
    +
    -
    -
    Reversement
    +
    +
    Reversement
    -
    +
    -
    0
    -
    - +
    +

    87845000 FCFA

    -
    -
    - 2.34% vs. semaine dernière +
    @@ -107,288 +84,289 @@
    -
    +
    -
    -
    Montant Journalier
    +
    +
    Montant Journalier
    -
    +
    -
    0%
    +
    +

    87845000 FCFA

    +
    -
    - 4.63% vs. semaine dernière -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    Statistiques Des Transactions
    -
    -
    -
    - Semaine -
    - -
    -
    -
      -
    • -
      - - Transaction -
      -
      • -
    • -
      - - Transaction Annulé -
      -
      • -
    -
    - -
    -
    -
    01 Septembre, 2023
    -
    30 Septembre, 2023
    -
    - -
    -
    -
    -
    -
    -
    -
    Analyse Des Modes de Paiement
    -
    -
    -
    - 30 Jours -
    - +
    +
    +
    +
    +
    +
    +
    +
    Statistiques Des Transactions
    +
    +
    +
    + Semaine +
    + +
    -
    -
    -
    - -
    -
      -
    • -
      - - UBA (United Bank for Africa) -
      -
      0 XOF
      -
      • +
      • - - Orange Money + + Transaction
        -
        0 XOF
      • - - MTN MoMo + + Transaction Annulé
        -
        0 XOF
        -
        • -
      • -
        - - Moov Money -
        -
        0 XOF
      +
      + +
      +
      +
      01 Septembre, 2023
      +
      30 Septembre, 2023
      +
    -
    -
    -
    - -
    -
    -
    -
    -

    Vos 5 dernières transactions

    -
    - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    N°FACTURENOM & PRÉNOMCONTACTARTICLEMONTANTN°TRANSACTIONMODE DE PAIEMENTDATE PAIEMENT
    12345John Doe123456789Product 1100.00TXN123Carte bancaire2024-04-10
    54321Jane Doe987654321Product 275.00TXN456PayPal2024-04-09
    22345Koffi123400089Product 310000.00TXN123UBA2024-04-10
    22345Koffi123400089Product 310000.00TXN123UBA2024-04-10
    54321zadi Doe98777654321Product 42500000.00TXN456PayPal2024-04-09
    +
    +
    +
    +
    +
    +
    +
    Montant Disponible
    +
    +
    +
    + 30 Jours +
    + +
    +
    +
    +
    +
    +
    + +
    +
      +
    • +
      + + UBA (United Bank for Africa) +
      +
      1.247.500 FCFA
      +
      • +
    • +
      + + Orange Money +
      +
      78.758.000 FCFA
      +
      • +
    • +
      + + MTN MoMo +
      +
      4.851.000 FCFA
      +
      • +
    • +
      + + Moov Money +
      +
      9.500.000 FCFA
      +
      • +
    +
    -
    - -
    -
    -
    -
    -
    -
    - +
    + + +
    +
    +
    Vos 5 dernières Transactions
    +
    + + + ID + + {{ transaction.transaction_id }} + + + + + - + + + type paiement + + {{ transaction.type_paiement_label }} + + + + + + Marchand + + {{ transaction.marchand }} + + + + + Service + + {{ transaction.service }} + + + + + + Montant + + {{ transaction.montant | currency: ' FCFA' }} + + + + + + Date + + {{ transaction.date | date: 'dd/mm/yyyy' }} + + + + + + Commentaire + + {{ transaction.commentaire }} + + + + + Etat + + {{ transaction.etat }} + + + + + Status + + {{ transaction.status }} + + + + + Réference + + {{ transaction.reference }} + + + + + + + + +
    +
    +
    +
    + +
    +
    +
    diff --git a/src/app/admin-test/admin-test.component.ts b/src/app/admin-test/admin-test.component.ts index edf85f3..2e945af 100644 --- a/src/app/admin-test/admin-test.component.ts +++ b/src/app/admin-test/admin-test.component.ts @@ -1,27 +1,81 @@ import { Component, type OnInit } from '@angular/core'; import { CommonModule } from '@angular/common'; import { PagetitleComponent } from '../shared/ui/pagetitle/pagetitle.component'; -import {RouterOutlet} from "@angular/router"; +import { RouterLink, RouterOutlet } from '@angular/router'; +import { HttpClient, HttpClientModule } from '@angular/common/http'; +import { FormsModule } from '@angular/forms'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatTableModule } from '@angular/material/table'; +import { IOperateur } from '../_interfaces/trafics/operateur/operateur'; +import { ITransaction } from '../_interfaces/trafics/transaction/transaction'; +import { TransactionService } from '../_services/trafics/transaction/transaction.service'; @Component({ selector: 'bgui-admin-test', standalone: true, - imports: [CommonModule, PagetitleComponent, RouterOutlet], + imports: [ + MatFormFieldModule, + MatInputModule, + MatTableModule, + MatPaginatorModule, + CommonModule, + HttpClientModule, + RouterLink, + FormsModule, + CommonModule, + PagetitleComponent, + RouterOutlet, + ], templateUrl: './admin-test.component.html', styleUrls: ['./admin-test.component.scss'], }) export class AdminTestComponent implements OnInit { - // biome-ignore lint/complexity/noBannedTypes: + //private url = 'http://192.168.1.223:8001/operateur/'; + breadCrumbItems: Array<{}> | undefined; -// biome-ignore lint/suspicious/noExplicitAny: -dataSource: any; - - // biome-ignore lint/complexity/noUselessConstructor: - constructor() {} - ngOnInit() { - this.breadCrumbItems = [ - { label: 'Résumé Des Transactions.' }, - /* { label: 'Invoice List', active: true },*/ - ]; + + transactions: ITransaction[] = []; + operateurs: IOperateur[] = []; + selectedOperateur: string = ''; + + constructor( + private httpClient: HttpClient, + public transactionService: TransactionService + //public operateur: IOperateur + ) {} + + ngOnInit(): void { + this.transactionService.getAll().subscribe((data: ITransaction[]) => { + this.transactions = data; + console.log('transactions===>', this.transactions); + + //this.fetchOperateurs(); + }); } + + displayedColumns: string[] = [ + 'transaction_id', + //'type_paiement', + 'type_paiement_label', + 'marchand', + 'service', + 'montant', + 'date', + 'commentaire', + 'etat', + 'status', + 'reference', + ]; + + // dataSource = new MatTableDataSource(this.transactions); + // @ViewChild(MatPaginator) paginator!: MatPaginator | undefined; + // constructor() {} + // ngOnInit() { + // this.breadCrumbItems = [ + // { label: 'Résumé Des Transactions.' }, + // /* { label: 'Invoice List', active: true },*/ + // ]; + // } } diff --git a/src/app/trafics/transactions/suivi-paiement/suivi-paiement.component.ts b/src/app/trafics/transactions/suivi-paiement/suivi-paiement.component.ts index 35d462b..0c07ea0 100644 --- a/src/app/trafics/transactions/suivi-paiement/suivi-paiement.component.ts +++ b/src/app/trafics/transactions/suivi-paiement/suivi-paiement.component.ts @@ -162,7 +162,7 @@ const ELEMENT_DATA: PElement[] = [ styleUrl: './suivi-paiement.component.scss', }) export class SuiviPaiementComponent { - private url = 'http://192.168.1.223:8000/operateur/'; + private url = 'http://192.168.1.223:8001/operateur/'; operateurs: IOperateur[] = []; selectedOperateur: string = ''; 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 50d3d15..6a93884 100644 --- a/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html +++ b/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html @@ -109,7 +109,7 @@ Date - {{ transaction.date }} + {{ transaction.date | date: 'dd/mm/yyyy' }} @@ -153,12 +153,3 @@ [showFirstLastButtons]="true">
    - - diff --git a/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.ts b/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.ts index e956986..310d567 100644 --- a/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.ts +++ b/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.ts @@ -30,7 +30,7 @@ import { FormsModule } from '@angular/forms'; export class SuiviTransactionComponent { //private HtUrl = 'http://192.168.1.223:8000/transaction-history/'; - private url = 'http://192.168.1.223:8000/operateur/'; + private url = 'http://192.168.1.223:8001/operateur/'; transactions: ITransaction[] = []; operateurs: IOperateur[] = []; diff --git a/src/app/utilisateurs/create-users/create-users.component.html b/src/app/utilisateurs/create-users/create-users.component.html index b5c2385..e7a2084 100644 --- a/src/app/utilisateurs/create-users/create-users.component.html +++ b/src/app/utilisateurs/create-users/create-users.component.html @@ -1,3 +1,400 @@ -
    -

    Create Users

    + + +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    Ajouter Utilisateur
    + +
    +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + + + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + + diff --git a/src/app/utilisateurs/create-users/create-users.component.ts b/src/app/utilisateurs/create-users/create-users.component.ts index 84d4f4f..ad8faed 100644 --- a/src/app/utilisateurs/create-users/create-users.component.ts +++ b/src/app/utilisateurs/create-users/create-users.component.ts @@ -1,10 +1,50 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { RouterLink } from '@angular/router'; +import { CarouselComponent } from 'src/app/shared/carousel/carousel.component'; @Component({ selector: 'bgui-create-users', standalone: true, - imports: [], + imports: [ + CommonModule, + CarouselComponent, + MatFormFieldModule, + ReactiveFormsModule, + MatInputModule, + MatButtonModule, + MatIconModule, + MatCheckboxModule, + RouterLink, + FormsModule, + ], templateUrl: './create-users.component.html', styleUrl: './create-users.component.scss', }) -export class CreateUsersComponent {} +export class CreateUsersComponent { + name!: string; + lastName!: string; + email!: string; + password!: string; + ffPassword!: string; + images = [ + { + imageSrc: './assets/images/carousel-auth/orange-with-variant.png', + imageAlt: 'nature1', + }, + { + imageSrc: './assets/images/carousel-auth/silver-modern-with-variant.png', + imageAlt: 'nature1', + }, + ]; + + isActive = false; + + register() {} +} diff --git a/src/app/utilisateurs/delete-user/delete-user.component.html b/src/app/utilisateurs/delete-user/delete-user.component.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/app/utilisateurs/delete-user/delete-user.component.html diff --git a/src/app/utilisateurs/delete-user/delete-user.component.scss b/src/app/utilisateurs/delete-user/delete-user.component.scss new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/app/utilisateurs/delete-user/delete-user.component.scss diff --git a/src/app/utilisateurs/delete-user/delete-user.component.spec.ts b/src/app/utilisateurs/delete-user/delete-user.component.spec.ts new file mode 100644 index 0000000..cf8010a --- /dev/null +++ b/src/app/utilisateurs/delete-user/delete-user.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DeleteUserComponent } from './delete-user.component'; + +describe('DeleteUserComponent', () => { + let component: DeleteUserComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [DeleteUserComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(DeleteUserComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/utilisateurs/delete-user/delete-user.component.ts b/src/app/utilisateurs/delete-user/delete-user.component.ts new file mode 100644 index 0000000..e196808 --- /dev/null +++ b/src/app/utilisateurs/delete-user/delete-user.component.ts @@ -0,0 +1,11 @@ +import { CommonModule } from '@angular/common'; +import { Component } from '@angular/core'; + +@Component({ + selector: 'bgui-delete-user', + standalone: true, + imports: [CommonModule], + templateUrl: './delete-user.component.html', + styleUrl: './delete-user.component.scss', +}) +export class DeleteUserComponent {} diff --git a/src/app/utilisateurs/edit-user/edit-user.component.html b/src/app/utilisateurs/edit-user/edit-user.component.html new file mode 100644 index 0000000..7d6e8cb --- /dev/null +++ b/src/app/utilisateurs/edit-user/edit-user.component.html @@ -0,0 +1,191 @@ +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    Modifer Utilisateur
    +
    +
    +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + + + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    diff --git a/src/app/utilisateurs/edit-user/edit-user.component.scss b/src/app/utilisateurs/edit-user/edit-user.component.scss new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/app/utilisateurs/edit-user/edit-user.component.scss diff --git a/src/app/utilisateurs/edit-user/edit-user.component.spec.ts b/src/app/utilisateurs/edit-user/edit-user.component.spec.ts new file mode 100644 index 0000000..d38a16c --- /dev/null +++ b/src/app/utilisateurs/edit-user/edit-user.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EditUserComponent } from './edit-user.component'; + +describe('EditUserComponent', () => { + let component: EditUserComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [EditUserComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(EditUserComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/utilisateurs/edit-user/edit-user.component.ts b/src/app/utilisateurs/edit-user/edit-user.component.ts new file mode 100644 index 0000000..0766015 --- /dev/null +++ b/src/app/utilisateurs/edit-user/edit-user.component.ts @@ -0,0 +1,116 @@ +import { CommonModule } from '@angular/common'; +import { Component } from '@angular/core'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule, MatCardTitle } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator'; +import { MatTableModule } from '@angular/material/table'; +import { RouterOutlet, RouterLink } from '@angular/router'; +import { CarouselComponent } from 'src/app/shared/carousel/carousel.component'; + +@Component({ + selector: 'bgui-edit-user', + standalone: true, + imports: [ + CommonModule, + MatPaginator, + MatTableModule, + MatFormFieldModule, + MatInputModule, + CarouselComponent, + MatCardModule, + MatCardTitle, + ReactiveFormsModule, + MatButtonModule, + MatIconModule, + MatCheckboxModule, + RouterOutlet, + MatPaginatorModule, + RouterLink, + FormsModule, + MatMenuModule, + ], + templateUrl: './edit-user.component.html', + styleUrl: './edit-user.component.scss', +}) +export class EditUserComponent { + name!: string; + lastName!: string; + email!: string; + password!: string; + ffPassword!: string; + images = [ + { + imageSrc: './assets/images/carousel-auth/orange-with-variant.png', + imageAlt: 'nature1', + }, + { + imageSrc: './assets/images/carousel-auth/silver-modern-with-variant.png', + imageAlt: 'nature1', + }, + ]; + + // email = new FormControl('', [Validators.required, Validators.email]); + // password = new FormControl('', [Validators.required]); + + // form: any = { + // email: '', + // password: '', + // }; + + // getErrorMessage() { + // if (this.email.hasError('required')) { + // return 'Impossible de trouver votre compte Beasy'; + // } + + // return this.email.hasError('email') ? 'Adresse e-mail non valide' : ''; + // } + + // getErrorAuth() { + // this.msgAuth = ''; + // } + + // hide = true; + isActive = false; + + // msgAuth = ''; + + // private router = inject(Router); + + // constructor(private router:Router) { + // //... + // } + + // ngOnInit(): void { + // //... + // } + + // onSubmit(): void { + // console.log(this.form); + // this.connexionlogin(); + // } + // connexionlogin() { + // //console.log("Nous sommes ici"); + // if ( + // this.form.email === 'mrfrancice@gmail.com' && + // this.form.password === 'p@ssw0rd' + // ) { + // localStorage.setItem('isLoggedIn', 'true'); + // localStorage.setItem('token', this.form.email); + // // Remplacez 'page-accueil' par l'URL de la page à laquelle vous souhaitez rediriger + // console.log("Redirection vers 'dash'"); + // this.router.navigate(['/admin']); + // //window.location.href = '/'; + // } else { + // this.router.navigate(['/auth']); + // this.msgAuth = 'Login ou PassWord incorrect...'; + // } + // } + + register() {} +} diff --git a/src/app/utilisateurs/user.routes.ts b/src/app/utilisateurs/user.routes.ts new file mode 100644 index 0000000..0edbe1b --- /dev/null +++ b/src/app/utilisateurs/user.routes.ts @@ -0,0 +1,33 @@ +import type { Routes } from '@angular/router'; +import { UtilisateursComponent } from './utilisateurs.component'; +import { CreateUsersComponent } from './create-users/create-users.component'; +import { EditUserComponent } from './edit-user/edit-user.component'; +import { DeleteUserComponent } from './delete-user/delete-user.component'; +import { ViewUserComponent } from './view-user/view-user.component'; + +export const userRoutes: Routes = [ + { + path: '', + component: UtilisateursComponent, + children: [ + { path: '', redirectTo: 'utilisateurs', pathMatch: 'full' }, + { + path: 'create-users', + component: CreateUsersComponent, + }, + { + path: 'edit-user/id', + component: EditUserComponent, + }, + + { + path: 'delete-user/id', + component: DeleteUserComponent, + }, + { + path: 'view-user', + component: ViewUserComponent, + }, + ], + }, +]; diff --git a/src/app/utilisateurs/utilisateurs.component.html b/src/app/utilisateurs/utilisateurs.component.html index 41fb158..76358f7 100644 --- a/src/app/utilisateurs/utilisateurs.component.html +++ b/src/app/utilisateurs/utilisateurs.component.html @@ -1,6 +1,11 @@ +

    Utilisateurs

    + +
    + +
    +
    -

    Utilisateurs

    - + Ajouter un utilisateur
    @@ -42,16 +47,19 @@ Actions - Voir - Editerremove_red_eye + edit + delete_sweep - @@ -65,29 +73,3 @@ [showFirstLastButtons]="true">
    - - diff --git a/src/app/utilisateurs/utilisateurs.component.ts b/src/app/utilisateurs/utilisateurs.component.ts index 8f29a49..21eef9a 100644 --- a/src/app/utilisateurs/utilisateurs.component.ts +++ b/src/app/utilisateurs/utilisateurs.component.ts @@ -10,7 +10,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatCardModule, MatCardTitle } from '@angular/material/card'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatIconModule } from '@angular/material/icon'; -import { RouterLink } from '@angular/router'; +import { RouterLink, RouterOutlet } from '@angular/router'; import { CarouselComponent } from '../shared/carousel/carousel.component'; import { MatMenuModule } from '@angular/material/menu'; import { HttpClient } from '@angular/common/http'; @@ -78,21 +78,19 @@ const ELEMENT_DATA: IUsers[] = [ MatFormFieldModule, MatInputModule, CarouselComponent, - MatFormFieldModule, MatCardModule, MatCardTitle, ReactiveFormsModule, - MatInputModule, - MatInputModule, MatButtonModule, MatIconModule, MatCheckboxModule, - MatTableModule, + RouterOutlet, MatPaginatorModule, RouterLink, FormsModule, MatMenuModule, ], + providers: [], templateUrl: './utilisateurs.component.html', styleUrl: './utilisateurs.component.scss', }) diff --git a/src/app/utilisateurs/view-user/view-user.component.html b/src/app/utilisateurs/view-user/view-user.component.html new file mode 100644 index 0000000..6941281 --- /dev/null +++ b/src/app/utilisateurs/view-user/view-user.component.html @@ -0,0 +1,461 @@ + + + + +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    Informations Utilisateur
    +
    +
    +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + + + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    diff --git a/src/app/utilisateurs/view-user/view-user.component.scss b/src/app/utilisateurs/view-user/view-user.component.scss new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/app/utilisateurs/view-user/view-user.component.scss diff --git a/src/app/utilisateurs/view-user/view-user.component.spec.ts b/src/app/utilisateurs/view-user/view-user.component.spec.ts new file mode 100644 index 0000000..f829ce7 --- /dev/null +++ b/src/app/utilisateurs/view-user/view-user.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ViewUserComponent } from './view-user.component'; + +describe('ViewUserComponent', () => { + let component: ViewUserComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ViewUserComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ViewUserComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/utilisateurs/view-user/view-user.component.ts b/src/app/utilisateurs/view-user/view-user.component.ts new file mode 100644 index 0000000..16bb1bd --- /dev/null +++ b/src/app/utilisateurs/view-user/view-user.component.ts @@ -0,0 +1,105 @@ +import { CommonModule } from '@angular/common'; +import { Component } from '@angular/core'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { RouterLink } from '@angular/router'; +import { CarouselComponent } from 'src/app/shared/carousel/carousel.component'; + +@Component({ + selector: 'bgui-view-user', + standalone: true, + imports: [ + CommonModule, + CarouselComponent, + MatFormFieldModule, + ReactiveFormsModule, + MatInputModule, + MatButtonModule, + MatIconModule, + MatCheckboxModule, + RouterLink, + FormsModule, + ], + templateUrl: './view-user.component.html', + styleUrl: './view-user.component.scss', +}) +export class ViewUserComponent { + name!: string; + lastName!: string; + email!: string; + password!: string; + ffPassword!: string; + images = [ + { + imageSrc: './assets/images/carousel-auth/orange-with-variant.png', + imageAlt: 'nature1', + }, + { + imageSrc: './assets/images/carousel-auth/silver-modern-with-variant.png', + imageAlt: 'nature1', + }, + ]; + + // email = new FormControl('', [Validators.required, Validators.email]); + // password = new FormControl('', [Validators.required]); + + // form: any = { + // email: '', + // password: '', + // }; + + // getErrorMessage() { + // if (this.email.hasError('required')) { + // return 'Impossible de trouver votre compte Beasy'; + // } + + // return this.email.hasError('email') ? 'Adresse e-mail non valide' : ''; + // } + + // getErrorAuth() { + // this.msgAuth = ''; + // } + + // hide = true; + isActive = false; + + // msgAuth = ''; + + // private router = inject(Router); + + // constructor(private router:Router) { + // //... + // } + + // ngOnInit(): void { + // //... + // } + + // onSubmit(): void { + // console.log(this.form); + // this.connexionlogin(); + // } + // connexionlogin() { + // //console.log("Nous sommes ici"); + // if ( + // this.form.email === 'mrfrancice@gmail.com' && + // this.form.password === 'p@ssw0rd' + // ) { + // localStorage.setItem('isLoggedIn', 'true'); + // localStorage.setItem('token', this.form.email); + // // Remplacez 'page-accueil' par l'URL de la page à laquelle vous souhaitez rediriger + // console.log("Redirection vers 'dash'"); + // this.router.navigate(['/admin']); + // //window.location.href = '/'; + // } else { + // this.router.navigate(['/auth']); + // this.msgAuth = 'Login ou PassWord incorrect...'; + // } + // } + + register() {} +} diff --git a/src/environments/environment.api.ts b/src/environments/environment.api.ts index bc3b42d..5e07547 100644 --- a/src/environments/environment.api.ts +++ b/src/environments/environment.api.ts @@ -1,5 +1,5 @@ export const environment = { production: false, - apiBaseUrl: 'http://192.168.1.223:8000', + apiBaseUrl: 'http://192.168.1.223:8001', env: 'local', }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index f0966e8..1531e0f 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -19,6 +19,6 @@ export const environment = { production: false, - apiBaseUrl: 'http://192.168.1.223:8000', + apiBaseUrl: 'http://192.168.1.223:8001', env: 'local', }; -- libgit2 0.27.1