Merging conficts

Suivie-Physique · Jun 21, 2024 · cc05140 · cc05140
2 parents 548c69c + c14521b
commit cc05140
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 7 deletions.
diff --git a/backend/src/main/resources/outputs/output b/backend/src/main/resources/outputs/output
diff --git a/backend/src/main/resources/reports/report b/backend/src/main/resources/reports/report
diff --git a/frontend/src/app/modules/dashboard/traitement/pages/cheque/cheque.component.html b/frontend/src/app/modules/dashboard/traitement/pages/cheque/cheque.component.html
@@ -1,5 +1,3 @@
-
-
 <mat-stepper
     class="full-screen"
     [orientation]="(stepperOrientation | async)!">
@@ -63,4 +61,6 @@ <h2 class="mb-4 border-b-2 border-gray-200 py-2 text-2xl font-bold dark:border-g
         <mat-icon aria-hidden="false" aria-label="Example home icon" fontIcon="home"></mat-icon>
     </ng-template>
   </mat-stepper>
-
+
+
+  <!-- <div class="card flex justify-content-center"></div> -->
diff --git a/frontend/src/app/modules/dashboard/traitement/pages/cheque/cheque.component.ts b/frontend/src/app/modules/dashboard/traitement/pages/cheque/cheque.component.ts
@@ -51,3 +51,4 @@ export class ChequeComponent {
       .pipe(map(({matches}) => (matches ? 'horizontal' : 'vertical')));
   }
 }
+
diff --git a/frontend/src/app/modules/dashboard/traitement/pages/cheque/effet.component.html b/frontend/src/app/modules/dashboard/traitement/pages/cheque/effet.component.html
diff --git a/frontend/src/app/modules/dashboard/traitement/pages/cheque/effet.component.ts b/frontend/src/app/modules/dashboard/traitement/pages/cheque/effet.component.ts
diff --git a/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.html b/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <ng-container [ngSwitch]="stepperOrientation | async">
     <div *ngSwitchCase="'horizontal'">Make your screen smaller to see a vertical stepper</div>
     <div *ngSwitchCase="'vertical'">Make your screen larger to see a horizontal stepper</div>
@@ -50,4 +51,7 @@
       </div>
     </mat-step>
   </mat-stepper>
-
+
+=======
+<p>effet works!</p>
+>>>>>>> c14521bd719b24ef9bc1f001afce66bc65cbe1b4
diff --git a/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.ts b/frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.ts
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import {Component} from '@angular/core';
 import {FormBuilder, Validators, FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreakpointObserver} from '@angular/cdk/layout';
@@ -42,4 +43,14 @@ export class EffetComponent {
       .observe('(min-width: 800px)')
       .pipe(map(({matches}) => (matches ? 'horizontal' : 'vertical')));
   }
+=======
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-effet',
+  templateUrl: './effet.component.html'
+})
+export class EffetComponent {
+
+>>>>>>> c14521bd719b24ef9bc1f001afce66bc65cbe1b4
 }
diff --git a/frontend/src/app/modules/dashboard/traitement/traitement-routing.module.ts b/frontend/src/app/modules/dashboard/traitement/traitement-routing.module.ts
@@ -19,4 +19,4 @@ const routes: Routes = [
     imports: [RouterModule.forChild(routes)],
     exports: [RouterModule],
   })
-export class TraitementRoutingModule { }
+export class TraitementRoutingModule { }
diff --git a/frontend/src/app/modules/dashboard/traitement/traitement.module.ts b/frontend/src/app/modules/dashboard/traitement/traitement.module.ts
@@ -2,13 +2,21 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { TraitementRoutingModule } from './traitement-routing.module';
 import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { ChequeComponent } from './pages/cheque/cheque.component';
+import { EffetComponent } from './pages/effet/effet.component';
 
 
 @NgModule({
     imports: [
         HttpClientModule,
         CommonModule,
         TraitementRoutingModule
-    ]
+
+    ],
+    declarations: [
+    ChequeComponent,
+    EffetComponent
+  ]
+
 })
-export class TraitementModule { }
+export class TraitementModule { }