reformatage du code

abarhub · Jun 19, 2022 · 4347f26 · 4347f26
1 parent 7755127
commit 4347f26
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 55 deletions.
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -1,10 +1,11 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {RouterModule, Routes} from '@angular/router';
 
 const routes: Routes = [];
 
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
   exports: [RouterModule]
 })
-export class AppRoutingModule { }
+export class AppRoutingModule {
+}
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -31,8 +31,4 @@ <h1>Tic Tac Toe</h1>
   </div>
 
 
-
-
-
-
 </div>
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
@@ -1,6 +1,6 @@
-import { TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { AppComponent } from './app.component';
+import {TestBed} from '@angular/core/testing';
+import {RouterTestingModule} from '@angular/router/testing';
+import {AppComponent} from './app.component';
 import {Store, StoreModule} from '@ngrx/store';
 
 describe('AppComponent', () => {

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -5,8 +5,6 @@ import {nouveauJeaux, selectionneCase} from './store/jeux.actions';
 import {Observable} from 'rxjs';
 import {AppState} from './store/app.state';
 import {CaseModel} from './model/case.model';
-import {FormBuilder, FormGroup} from '@angular/forms';
-import {ThemeModel} from './model/theme.model';
 
 @Component({
   selector: 'app-root',

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,15 +1,15 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
+import {BrowserModule} from '@angular/platform-browser';
+import {NgModule} from '@angular/core';
 
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { StoreModule } from '@ngrx/store';
+import {AppRoutingModule} from './app-routing.module';
+import {AppComponent} from './app.component';
+import {StoreModule} from '@ngrx/store';
 import {jeuxReducer} from './store/jeux.reducer';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { GridComponent } from './grid/grid.component';
-import { GameStateComponent } from './game-state/game-state.component';
+import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+import {GridComponent} from './grid/grid.component';
+import {GameStateComponent} from './game-state/game-state.component';
 import {ReactiveFormsModule} from '@angular/forms';
-import { ThemeManagerComponent } from './theme-manager/theme-manager.component';
+import {ThemeManagerComponent} from './theme-manager/theme-manager.component';
 
 @NgModule({
   declarations: [
@@ -18,14 +18,15 @@ import { ThemeManagerComponent } from './theme-manager/theme-manager.component';
     GameStateComponent,
     ThemeManagerComponent
   ],
-    imports: [
-        BrowserModule,
-        AppRoutingModule,
-        StoreModule.forRoot({jeux: jeuxReducer}, {}),
-        NgbModule,
-        ReactiveFormsModule
-    ],
+  imports: [
+    BrowserModule,
+    AppRoutingModule,
+    StoreModule.forRoot({jeux: jeuxReducer}, {}),
+    NgbModule,
+    ReactiveFormsModule
+  ],
   providers: [],
   bootstrap: [AppComponent]
 })
-export class AppModule { }
+export class AppModule {
+}
diff --git a/src/app/game-state/game-state.component.html b/src/app/game-state/game-state.component.html
@@ -1,7 +1,12 @@
-
 <div class="m-2">
-  <div [ngClass]="{'joueurSelectionne': joueurCourant===joueurEnum.JOUEUR1&&!jeuxTermine, 'joueurGagnant': joueurGagnant===joueurEnum.JOUEUR1&&jeuxTermine}" class="joueur m-2 p-2 border rounded">Joueur 1 ({{joueursConstantes.JOUEUR1_AFFICHAGE}})</div>
-  <div [ngClass]="{'joueurSelectionne': joueurCourant===joueurEnum.JOUEUR2&&!jeuxTermine, 'joueurGagnant': joueurGagnant===joueurEnum.JOUEUR2&&jeuxTermine}" class="joueur m-2 p-2 border rounded">Joueur 2 ({{joueursConstantes.JOUEUR2_AFFICHAGE}})</div>
+  <div
+    [ngClass]="{'joueurSelectionne': joueurCourant===joueurEnum.JOUEUR1&&!jeuxTermine, 'joueurGagnant': joueurGagnant===joueurEnum.JOUEUR1&&jeuxTermine}"
+    class="joueur m-2 p-2 border rounded">Joueur 1 ({{joueursConstantes.JOUEUR1_AFFICHAGE}})
+  </div>
+  <div
+    [ngClass]="{'joueurSelectionne': joueurCourant===joueurEnum.JOUEUR2&&!jeuxTermine, 'joueurGagnant': joueurGagnant===joueurEnum.JOUEUR2&&jeuxTermine}"
+    class="joueur m-2 p-2 border rounded">Joueur 2 ({{joueursConstantes.JOUEUR2_AFFICHAGE}})
+  </div>
 </div>
 
 <div *ngIf="jeuxTermine" class="border border-success rounded mp-2 m-3">

diff --git a/src/app/game-state/game-state.component.scss b/src/app/game-state/game-state.component.scss
@@ -1,5 +1,3 @@
-
-
 $couleur-formes2: var(--secondary-color);
 
 .joueurSelectionne {
@@ -13,6 +11,6 @@ $couleur-formes2: var(--secondary-color);
 }
 
 .joueur {
-  border: 1px ;
+  border: 1px;
   border-color: black;
 }
diff --git a/src/app/game-state/game-state.component.spec.ts b/src/app/game-state/game-state.component.spec.ts
@@ -1,6 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { GameStateComponent } from './game-state.component';
+import {GameStateComponent} from './game-state.component';
 import {Store, StoreModule} from '@ngrx/store';
 
 describe('GameStateComponent', () => {
@@ -10,10 +10,10 @@ describe('GameStateComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ GameStateComponent ],
+      declarations: [GameStateComponent],
       imports: [StoreModule.forRoot({})]
     })
-    .compileComponents();
+      .compileComponents();
     store = TestBed.inject(Store);
   });
 

diff --git a/src/app/grid/grid.component.html b/src/app/grid/grid.component.html
@@ -1,18 +1,17 @@
-
 <table>
   <tr>
-    <td (click)="selection(1,1)" class="border">{{get(0,0)}}</td>
-    <td (click)="selection(1,2)" class="border">{{get(0,1)}}</td>
-    <td (click)="selection(1,3)" class="border">{{get(0,2)}}</td>
+    <td (click)="selection(1,1)" class="border">{{get(0, 0)}}</td>
+    <td (click)="selection(1,2)" class="border">{{get(0, 1)}}</td>
+    <td (click)="selection(1,3)" class="border">{{get(0, 2)}}</td>
   </tr>
   <tr>
-    <td (click)="selection(2,1)" class="border">{{get(1,0)}}</td>
-    <td (click)="selection(2,2)" class="border">{{get(1,1)}}</td>
-    <td (click)="selection(2,3)" class="border">{{get(1,2)}}</td>
+    <td (click)="selection(2,1)" class="border">{{get(1, 0)}}</td>
+    <td (click)="selection(2,2)" class="border">{{get(1, 1)}}</td>
+    <td (click)="selection(2,3)" class="border">{{get(1, 2)}}</td>
   </tr>
   <tr>
-    <td (click)="selection(3,1)" class="border">{{get(2,0)}}</td>
-    <td (click)="selection(3,2)" class="border">{{get(2,1)}}</td>
-    <td (click)="selection(3,3)" class="border">{{get(2,2)}}</td>
+    <td (click)="selection(3,1)" class="border">{{get(2, 0)}}</td>
+    <td (click)="selection(3,2)" class="border">{{get(2, 1)}}</td>
+    <td (click)="selection(3,3)" class="border">{{get(2, 2)}}</td>
   </tr>
 </table>
diff --git a/src/app/grid/grid.component.scss b/src/app/grid/grid.component.scss
@@ -2,6 +2,7 @@
 table {
   width: 12.75rem;
   height: 12.75rem;
+
   td {
     width: 1.25rem;
     height: 1.25rem;

diff --git a/src/app/grid/grid.component.spec.ts b/src/app/grid/grid.component.spec.ts
@@ -1,6 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { GridComponent } from './grid.component';
+import {GridComponent} from './grid.component';
 import {Store, StoreModule} from '@ngrx/store';
 
 describe('GridComponent', () => {
@@ -10,10 +10,10 @@ describe('GridComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ GridComponent ],
+      declarations: [GridComponent],
       imports: [StoreModule.forRoot({})]
     })
-    .compileComponents();
+      .compileComponents();
     store = TestBed.inject(Store);
   });
 

diff --git a/src/app/theme-manager/theme-manager.component.spec.ts b/src/app/theme-manager/theme-manager.component.spec.ts
@@ -2,7 +2,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {ThemeManagerComponent} from './theme-manager.component';
 import {Store, StoreModule} from '@ngrx/store';
-import {FormsModule, ReactiveFormsModule, UntypedFormBuilder} from '@angular/forms';
+import {ReactiveFormsModule, UntypedFormBuilder} from '@angular/forms';
 
 describe('ThemeManagerComponent', () => {
   let component: ThemeManagerComponent;

diff --git a/src/app/theme-manager/theme-manager.component.ts b/src/app/theme-manager/theme-manager.component.ts
@@ -1,7 +1,6 @@
 import {Component, OnInit} from '@angular/core';
 import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 import {ThemeModel} from '../model/theme.model';
-import {Store} from '@ngrx/store';
 
 @Component({
   selector: 'app-theme-manager',