Bug fix and format code

src/app/app-routing.module.ts

@@ -23,5 +23,4 @@ const routes: Routes = [
   imports: [RouterModule.forRoot(routes)],
   exports: [RouterModule],
 })
-export class AppRoutingModule {
+export class AppRoutingModule {}
-}

src/app/components/editor/editor.component.scss

@@ -73,7 +73,6 @@ select {
   height: 100%;
 }
 
-
 // @mixin btn-styles($bg-color, $font-color) {
 
 //   background-color: $bg-color;

src/app/components/editor/editor.component.ts

@@ -1,12 +1,12 @@
-import {Component, ViewChild} from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
-import {CodeExecutionService} from 'src/app/services/codeExecution.service';
+import { CodeExecutionService } from 'src/app/services/codeExecution.service';
-import {Compartment} from '@codemirror/state';
+import { Compartment } from '@codemirror/state';
-import {CodeMirrorComponent} from '@sandkasten/codemirror6-editor';
+import { CodeMirrorComponent } from '@sandkasten/codemirror6-editor';
-import {LanguageDescription} from '@codemirror/language';
+import { LanguageDescription } from '@codemirror/language';
-import {CODE_DEFAULTS, LANGUAGES} from '../languages';
+import { CODE_DEFAULTS, LANGUAGES } from '../languages';
-import {SafeHTMLPipe} from '../../safe-html.pipe';
+import { SafeHTMLPipe } from '../../safe-html.pipe';
 import { TranslateModule } from '@ngx-translate/core';
-import {ReactiveFormsModule, FormsModule} from '@angular/forms';
+import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 import {
   keymap,
   highlightSpecialChars,
@@ -19,7 +19,7 @@ import {
   highlightActiveLineGutter,
   gutter,
 } from '@codemirror/view';
-import {Extension, EditorState} from '@codemirror/state';
+import { Extension, EditorState } from '@codemirror/state';
 import {
   defaultHighlightStyle,
   syntaxHighlighting,
@@ -28,16 +28,16 @@ import {
   foldGutter,
   foldKeymap,
 } from '@codemirror/language';
-import {defaultKeymap, history, historyKeymap} from '@codemirror/commands';
+import { defaultKeymap, history, historyKeymap } from '@codemirror/commands';
-import {searchKeymap, highlightSelectionMatches} from '@codemirror/search';
+import { searchKeymap, highlightSelectionMatches } from '@codemirror/search';
 import {
   autocompletion,
   completionKeymap,
   closeBrackets,
   closeBracketsKeymap,
 } from '@codemirror/autocomplete';
-import {lintKeymap} from '@codemirror/lint';
+import { lintKeymap } from '@codemirror/lint';
-import {WorkService} from "../../services/work.service";
+import { WorkService } from '../../services/work.service';
 
 const basicSetup: Extension = (() => [
   highlightActiveLineGutter(),
@@ -48,7 +48,7 @@ const basicSetup: Extension = (() => [
   dropCursor(),
   EditorState.allowMultipleSelections.of(true),
   indentOnInput(),
-    syntaxHighlighting(defaultHighlightStyle, {fallback: true}),
+  syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
   bracketMatching(),
   closeBrackets(),
   autocompletion(),
@@ -77,7 +77,7 @@ const basicSetup: Extension = (() => [
     ReactiveFormsModule,
     FormsModule,
     SafeHTMLPipe,
-        TranslateModule
+    TranslateModule,
   ],
 })
 export class EditorComponent {
@@ -137,8 +137,10 @@ export class EditorComponent {
     this.languageCompartment.of(this.selectedLanguage.support!),
   ];
 
-    constructor(private codeExecutionService: CodeExecutionService, protected workService: WorkService) {
+  constructor(
-    }
+    private codeExecutionService: CodeExecutionService,
+    protected workService: WorkService
+  ) {}
 
   // Efface le contenu de l'éditeur
   clear(): void {
@@ -177,7 +179,7 @@ export class EditorComponent {
   }
 
   saveToFile() {
-        const blob = new Blob([this.editorContent], {type: 'text/plain'});
+    const blob = new Blob([this.editorContent], { type: 'text/plain' });
     const a = document.createElement('a');
     a.download = `code.${this.selectedLanguage.extensions![0]}`;
     a.href = URL.createObjectURL(blob);
@@ -188,8 +190,8 @@ export class EditorComponent {
     this.workService.postWorkCode(this.editorContent);
   }
 
-    shareButtonClicked(){}
+  shareButtonClicked() {}
-    saveButtonClicked(){}
+  saveButtonClicked() {}
 
   protected readonly console = console;
 }

src/app/components/header/header.component.html

@@ -27,9 +27,8 @@
     </div>
 
     <nav class="right_part--menu">
-      <!--[routerLink]="getLastWorkLink()"-->
       <a
-        routerLink="work"
+        [routerLink]="linkLastWork"
         routerLinkActive="active"
         [routerLinkActiveOptions]="{ exact: true }"
         >{{ 'HeaderPage.Work' | translate }}</a

src/app/components/header/header.component.ts

@@ -13,6 +13,7 @@ import { Router, RouterLink, RouterLinkActive } from '@angular/router';
 import { NgClass, NgOptimizedImage } from '@angular/common';
 import { WorkService } from '../../services/work.service';
 import { Observable } from 'rxjs';
+import { Work } from '../../models/work.model';
 
 @Component({
   selector: 'app-header',
@@ -33,7 +34,7 @@ export class HeaderComponent {
   version: string = '1.0';
   isMenuOpen: boolean = false;
   isCheck: boolean = false;
-  linkLastWork: string = this.workService.getIdLastWorkByUserId("");
+  linkLastWork: string = '';
 
   @ViewChild('menuRef') menuRef!: ElementRef;
   @Input() themeClass!: string;
@@ -43,8 +44,12 @@ export class HeaderComponent {
   constructor(
     private router: Router,
     private translationService: TranslationService,
-    private workService: WorkService) 
+    private workService: WorkService
-    { }
+  ) {
+    this.workService.getLastWorkByUserId('5').subscribe((response: Work) => {
+      this.linkLastWork = 'work/' + response.link;
+    });
+  }
 
   // Méthode pour changer la langue
   onLanguageChange(event: Event) {
@@ -72,9 +77,8 @@ export class HeaderComponent {
     }
   }
 
-  onLastWorkLink() : void {
+  onLastWorkLink(): void {
     const url = `/work/${this.linkLastWork}`;
     this.router.navigateByUrl(url);
   }
-
 }

src/app/components/work/work.component.spec.ts

@@ -8,9 +8,8 @@ describe('WorkComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [WorkComponent]
+      imports: [WorkComponent],
-    })
+    }).compileComponents();
-    .compileComponents();
 
     fixture = TestBed.createComponent(WorkComponent);
     component = fixture.componentInstance;
@@ -21,5 +20,3 @@ describe('WorkComponent', () => {
     expect(component).toBeTruthy();
   });
 });
-
-

src/app/components/work/work.component.ts

@@ -3,10 +3,10 @@ import { RouterLink, ActivatedRoute } from '@angular/router';
 import { ThemeService } from '../../services/theme.service';
 import { NgClass } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
-import {Work} from "../../models/work.model";
+import { Work } from '../../models/work.model';
-import {WorkService} from "../../services/work.service";
+import { WorkService } from '../../services/work.service';
-import {NgForOf} from "@angular/common";
+import { NgForOf } from '@angular/common';
-import {FormsModule, NgForm} from "@angular/forms";
+import { FormsModule, NgForm } from '@angular/forms';
 import { Observable } from 'rxjs';
 
 @Component({
@@ -14,14 +14,8 @@ import { Observable } from 'rxjs';
   templateUrl: './work.component.html',
   styleUrl: './work.component.scss',
   standalone: true,
-  imports: [NgClass, 
+  imports: [NgClass, TranslateModule, RouterLink, NgForOf, FormsModule],
-    TranslateModule, 
-    RouterLink,
-    NgForOf,
-    FormsModule
-  ],
 })
-
 export class WorkComponent implements OnInit {
   // à retirer quand les boutons seront dans editor.component
   isLoaded: boolean = false; // Pour vérifier si le chargement est terminé
@@ -29,6 +23,7 @@ export class WorkComponent implements OnInit {
   themeClass!: string;
   works: Work[] = [];
   workEnCours: Observable<Work> = new Observable();
+
   constructor(
     private route: ActivatedRoute,
     private themeService: ThemeService,
@@ -41,10 +36,12 @@ export class WorkComponent implements OnInit {
         ? (this.themeClass = 'dark-theme')
         : (this.themeClass = 'light-theme');
     });
-    this.workService.getWorks().subscribe((response: Work[]) => this.works = response);
+    this.workService
+      .getWorks()
+      .subscribe((response: Work[]) => (this.works = response));
     const link = String(this.route.snapshot.paramMap.get('link'));
     if (link) {
-      this.workEnCours = this.workService.getWorkByLink(link);
+      // this.workEnCours = this.workService.getWorkByLink(link);
     }
   }
 

src/app/components/works-list/works-list.component.html

@@ -9,12 +9,24 @@
 <form #addBookForm="ngForm" (ngSubmit)="onSubmit(addBookForm)">
   <div class="form-group">
     <label for="link">Link</label>
-		<input type="text" class="form-control" id="link" name="link" ngModel required>
+    <input
+      type="text"
+      class="form-control"
+      id="link"
+      name="link"
+      ngModel
+      required />
   </div>
 
   <div class="form-group">
     <label for="content">Content</label>
-		<input type="text" class="form-control" id="content" name="content" ngModel required>
+    <input
+      type="text"
+      class="form-control"
+      id="content"
+      name="content"
+      ngModel
+      required />
   </div>
 
   <button type="submit" class="btn btn-primary">Submit</button>

src/app/components/works-list/works-list.component.spec.ts

@@ -8,9 +8,8 @@ describe('WorksListComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [WorksListComponent]
+      imports: [WorksListComponent],
-    })
+    }).compileComponents();
-    .compileComponents();
 
     fixture = TestBed.createComponent(WorksListComponent);
     component = fixture.componentInstance;

src/app/components/works-list/works-list.component.ts

@@ -1,27 +1,25 @@
-import {Component} from '@angular/core';
+import { Component } from '@angular/core';
-import {Work} from "../../models/work.model";
+import { Work } from '../../models/work.model';
-import {WorkService} from "../../services/work.service";
+import { WorkService } from '../../services/work.service';
-import {NgForOf} from "@angular/common";
+import { NgForOf } from '@angular/common';
-import {FormsModule, NgForm} from "@angular/forms";
+import { FormsModule, NgForm } from '@angular/forms';
 
 @Component({
   selector: 'app-works-list',
   standalone: true,
-    imports: [
+  imports: [NgForOf, FormsModule],
-        NgForOf,
-        FormsModule
-    ],
   templateUrl: './works-list.component.html',
-    styleUrl: './works-list.component.css'
+  styleUrl: './works-list.component.css',
 })
 export class WorksListComponent {
   works: Work[] = [];
 
-    constructor(protected workService: WorkService) {
+  constructor(protected workService: WorkService) {}
-    }
 
   ngOnInit() {
-        this.workService.getWorks().subscribe((response: Work[]) => this.works = response)
+    this.workService
+      .getWorks()
+      .subscribe((response: Work[]) => (this.works = response));
   }
 
   onSubmit(form: NgForm) {

src/app/models/work.model.ts

@@ -1,7 +1,7 @@
 export interface Work {
-    id_work: number,
+  id_work: number;
-    link: string,
+  link: string;
-    user_id: number,
+  user_id: number;
-    language_id: number,
+  language_id: number;
-    content: string
+  content: string;
 }

src/app/services/work.service.ts

@@ -1,20 +1,18 @@
-import {Injectable} from '@angular/core';
+import { Injectable } from '@angular/core';
-import {Work} from "../models/work.model";
+import { Work } from '../models/work.model';
-import {HttpClient} from "@angular/common/http";
+import { HttpClient } from '@angular/common/http';
-import {Observable} from "rxjs";
+import { Observable } from 'rxjs';
-import {NgForm} from "@angular/forms";
+import { NgForm } from '@angular/forms';
-
 
 @Injectable({
-    providedIn: 'root'
+  providedIn: 'root',
 })
 export class WorkService {
-    API_URL = 'http://127.0.0.1:3000'
+  API_URL = 'http://127.0.0.1:3000';
 
   private works: Work[] = [];
 
-    constructor(private http: HttpClient) {
+  constructor(private http: HttpClient) {}
-    }
 
   getWorks(): Observable<any> {
     return this.http.get(`${this.API_URL}/works`);
@@ -27,17 +25,27 @@ export class WorkService {
 
   //je veux return le link du dernier work d'un user (en l'occurence celui connecté)
   getLastWorkByUserId(user_id: string): Observable<any> {
-        return this.http.get(`${this.API_URL}/work/${user_id}`); 
+    return this.http.get(`${this.API_URL}/works/user/${user_id}`);
   }
 
-
   postWork(form: NgForm): void {
-        let body = {link: crypto.randomUUID(), user_id: 1, id_language: 1, code: form.value.content, saveDate: new Date()}
+    let body = {
+      link: crypto.randomUUID(),
+      user_id: 1,
+      id_language: 1,
+      code: form.value.content,
+      saveDate: new Date(),
+    };
     this.http.post<any>(`${this.API_URL}/works`, body).subscribe();
   }
 
   postWorkCode(code: string): void {
-        let body = {link: crypto.randomUUID(), user_id: 1, id_language: 1, code: code}
+    let body = {
+      link: crypto.randomUUID(),
+      user_id: 1,
+      id_language: 1,
+      code: code,
+    };
     this.http.post<any>(`${this.API_URL}/works`, body).subscribe();
   }
 }

src/app/services/works.service.ts

@@ -1,32 +1,35 @@
-import {Injectable} from '@angular/core';
+import { Injectable } from '@angular/core';
-import {Work} from "../models/work.model";
+import { Work } from '../models/work.model';
-import {HttpClient} from "@angular/common/http";
+import { HttpClient } from '@angular/common/http';
-import {Observable} from "rxjs";
+import { Observable } from 'rxjs';
-import {NgForm} from "@angular/forms";
+import { NgForm } from '@angular/forms';
-
 
 @Injectable({
-    providedIn: 'root'
+  providedIn: 'root',
 })
 export class WorksService {
-    API_URL = 'http://127.0.0.1:3000'
+  API_URL = 'http://127.0.0.1:3000';
 
   private works: Work[] = [];
 
-    constructor(private http: HttpClient) {
+  constructor(private http: HttpClient) {}
-    }
 
   getWorks(): Observable<any> {
     return this.http.get(`${this.API_URL}/works`);
   }
 
   postWork(form: NgForm): void {
-        let body = {link: form.value.link, id_user: 1, id_language: 1, code: form.value.content}
+    let body = {
+      link: form.value.link,
+      id_user: 1,
+      id_language: 1,
+      code: form.value.content,
+    };
     this.http.post<any>(`${this.API_URL}/works`, body).subscribe();
   }
 
   postWorkCode(code: string): void {
-        let body = {link: 'TODO', id_user: 1, id_language: 1, code: code}
+    let body = { link: 'TODO', id_user: 1, id_language: 1, code: code };
     this.http.post<any>(`${this.API_URL}/works`, body).subscribe();
   }
 }

src/assets/i18n/en.json

@@ -34,7 +34,7 @@
     "SocialTittle": "Join us on our networks",
     "GetStarted": {
       "Tittle": "Try Sandkasten",
-      "Description":"Join the Sandkasten community now by testing our editor!",
+      "Description": "Join the Sandkasten community now by testing our editor!",
       "Button": "Get Started !"
     }
   },

src/assets/i18n/fr.json

@@ -34,7 +34,7 @@
     "SocialTittle": "Rejoinez-nous sur nos réseaux",
     "GetStarted": {
       "Tittle": "Allez essayer Sandkasten",
-      "Description":"Rejoignez dès maintenant la communauté Sandkasten en testant notre éditeur !",
+      "Description": "Rejoignez dès maintenant la communauté Sandkasten en testant notre éditeur !",
       "Button": "Commencez !"
     }
   },