Correction filenames (#16)

* Corrections

* Suppression code mort et console log

---------

Co-authored-by: Baptiste LYET <[email protected]>

Author: Babali42

src/app/app.component.html

@@ -20,7 +20,7 @@ <h2>Sous-genre</h2>
       <a class="item" *ngFor="let genre of musicGenres; let i = index" (click)="selectGenre(i)">{{ genre.label }}</a>
     </div>
     <div class="flex mobile-menu">
-      <a class="item" [routerLink]="subGenre.link"
+      <a class="item" [routerLink]="subGenre.fileName"
          *ngFor="let subGenre of musicGenres[selectedGenreIndex].subGenres">{{ subGenre.label }}</a>
     </div>
   </div>

src/app/app.component.ts

@@ -17,26 +17,26 @@ export class AppComponent implements OnInit {
   musicGenres: Genre[] = [
     new Genre('Metal',
       [
-        new Subgenre('Metal', '/metal'),
-        new Subgenre('Rock', '/rock'),
-        new Subgenre('Rock variation', '/rock-variation'),
-        new Subgenre('Half time groove', '/half-time-groove'),
+        new Subgenre('Metal', 'metal'),
+        new Subgenre('Rock', 'rock-beat'),
+        new Subgenre('Rock variation', 'rock-beat-variation'),
+        new Subgenre('Half time groove', 'half-time-groove'),
       ]),
     new Genre('Techno', [
-      new Subgenre('Basique', '/techno'),
+      new Subgenre('Basique', 'techno'),
     ]),
     new Genre('Garage', [
-      new Subgenre('Drum & Bass', '/drum-n-bass'),
-      new Subgenre('Garage - 2 step', '/garage'),
+      new Subgenre('Drum & Bass', 'drum-n-bass'),
+      new Subgenre('Garage - 2 step', 'garage'),
     ]),
     new Genre('Trance', [
-      new Subgenre('Psytrance', '/psytrance'),
+      new Subgenre('Psytrance', 'psytrance'),
     ])
   ];
   fileNameBehaviourSubject: BehaviorSubject<string>;
 
   constructor(private responsive: BreakpointObserver, private router: Router) {
-    this.fileNameBehaviourSubject = new BehaviorSubject<string>("metal");
+    this.fileNameBehaviourSubject = new BehaviorSubject<string>('metal');
   }
 
   ngOnInit(): void {
@@ -60,7 +60,7 @@ export class AppComponent implements OnInit {
   }
 
   private updateFileName() {
-    const fileName = this.musicGenres[this.selectedGenreIndex].subGenres[this.selectedSubGenreIndex].link;
+    const fileName = this.musicGenres[this.selectedGenreIndex].subGenres[this.selectedSubGenreIndex].fileName;
     this.fileNameBehaviourSubject.next(fileName);
   }
 }

src/app/models/subgenre.ts

@@ -1,5 +1,5 @@
 export class Subgenre {
-  constructor(public label: string, public link: string) {
+  constructor(public label: string, public fileName: string) {
 
   }
 }

src/app/services/data.service.ts

@@ -13,6 +13,7 @@ export class DataService {
   constructor(private http: HttpClient) { }
 
   getData(fileName: string): Observable<JsonBeat> {
-    return this.http.get<JsonBeat>(this.apiUrl + fileName + this.fileExtension);
+    const url = this.apiUrl + fileName + this.fileExtension;
+    return this.http.get<JsonBeat>(url);
   }
 }