Bug fix and format code
continuous-integration/drone/push Build is passing Details

pull/15/head
Colin FRIZOT 11 months ago
parent f94e9e7634
commit a86a40e845

@ -20,8 +20,7 @@ const routes: Routes = [
];
@NgModule({
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule],
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule],
})
export class AppRoutingModule {
}
export class AppRoutingModule {}

@ -73,7 +73,6 @@ select {
height: 100%;
}
// @mixin btn-styles($bg-color, $font-color) {
// background-color: $bg-color;
@ -94,4 +93,4 @@ select {
// .btn-save {
// @include btn-styles(red, white);
// }
// }

@ -1,195 +1,197 @@
import {Component, ViewChild} from '@angular/core';
import {CodeExecutionService} from 'src/app/services/codeExecution.service';
import {Compartment} from '@codemirror/state';
import {CodeMirrorComponent} from '@sandkasten/codemirror6-editor';
import {LanguageDescription} from '@codemirror/language';
import {CODE_DEFAULTS, LANGUAGES} from '../languages';
import {SafeHTMLPipe} from '../../safe-html.pipe';
import { Component, ViewChild } from '@angular/core';
import { CodeExecutionService } from 'src/app/services/codeExecution.service';
import { Compartment } from '@codemirror/state';
import { CodeMirrorComponent } from '@sandkasten/codemirror6-editor';
import { LanguageDescription } from '@codemirror/language';
import { CODE_DEFAULTS, LANGUAGES } from '../languages';
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,
drawSelection,
highlightActiveLine,
dropCursor,
rectangularSelection,
crosshairCursor,
lineNumbers,
highlightActiveLineGutter,
gutter,
keymap,
highlightSpecialChars,
drawSelection,
highlightActiveLine,
dropCursor,
rectangularSelection,
crosshairCursor,
lineNumbers,
highlightActiveLineGutter,
gutter,
} from '@codemirror/view';
import {Extension, EditorState} from '@codemirror/state';
import { Extension, EditorState } from '@codemirror/state';
import {
defaultHighlightStyle,
syntaxHighlighting,
indentOnInput,
bracketMatching,
foldGutter,
foldKeymap,
defaultHighlightStyle,
syntaxHighlighting,
indentOnInput,
bracketMatching,
foldGutter,
foldKeymap,
} from '@codemirror/language';
import {defaultKeymap, history, historyKeymap} from '@codemirror/commands';
import {searchKeymap, highlightSelectionMatches} from '@codemirror/search';
import { defaultKeymap, history, historyKeymap } from '@codemirror/commands';
import { searchKeymap, highlightSelectionMatches } from '@codemirror/search';
import {
autocompletion,
completionKeymap,
closeBrackets,
closeBracketsKeymap,
autocompletion,
completionKeymap,
closeBrackets,
closeBracketsKeymap,
} from '@codemirror/autocomplete';
import {lintKeymap} from '@codemirror/lint';
import {WorkService} from "../../services/work.service";
import { lintKeymap } from '@codemirror/lint';
import { WorkService } from '../../services/work.service';
const basicSetup: Extension = (() => [
highlightActiveLineGutter(),
highlightSpecialChars(),
history(),
foldGutter(),
drawSelection(),
dropCursor(),
EditorState.allowMultipleSelections.of(true),
indentOnInput(),
syntaxHighlighting(defaultHighlightStyle, {fallback: true}),
bracketMatching(),
closeBrackets(),
autocompletion(),
rectangularSelection(),
crosshairCursor(),
highlightActiveLine(),
highlightSelectionMatches(),
keymap.of([
...closeBracketsKeymap,
...defaultKeymap,
...searchKeymap,
...historyKeymap,
...foldKeymap,
...completionKeymap,
...lintKeymap,
]),
highlightActiveLineGutter(),
highlightSpecialChars(),
history(),
foldGutter(),
drawSelection(),
dropCursor(),
EditorState.allowMultipleSelections.of(true),
indentOnInput(),
syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
bracketMatching(),
closeBrackets(),
autocompletion(),
rectangularSelection(),
crosshairCursor(),
highlightActiveLine(),
highlightSelectionMatches(),
keymap.of([
...closeBracketsKeymap,
...defaultKeymap,
...searchKeymap,
...historyKeymap,
...foldKeymap,
...completionKeymap,
...lintKeymap,
]),
])();
@Component({
selector: 'app-editor',
templateUrl: './editor.component.html',
styleUrls: ['./editor.component.scss'],
standalone: true,
imports: [
CodeMirrorComponent,
ReactiveFormsModule,
FormsModule,
SafeHTMLPipe,
TranslateModule
],
selector: 'app-editor',
templateUrl: './editor.component.html',
styleUrls: ['./editor.component.scss'],
standalone: true,
imports: [
CodeMirrorComponent,
ReactiveFormsModule,
FormsModule,
SafeHTMLPipe,
TranslateModule,
],
})
export class EditorComponent {
isLoaded: boolean = false; // Pour vérifier si le chargement est terminé
readonly languages: LanguageDescription[] = LANGUAGES;
// Mode par défaut
private _selectedLanguage = this.languages.find(
(lang) => lang.name === 'JavaScript'
)!;
get selectedLanguage(): LanguageDescription {
return this._selectedLanguage;
isLoaded: boolean = false; // Pour vérifier si le chargement est terminé
readonly languages: LanguageDescription[] = LANGUAGES;
// Mode par défaut
private _selectedLanguage = this.languages.find(
(lang) => lang.name === 'JavaScript'
)!;
get selectedLanguage(): LanguageDescription {
return this._selectedLanguage;
}
set selectedLanguage(value: LanguageDescription) {
this._selectedLanguage = value;
if (value.name in CODE_DEFAULTS) {
this.editorContent =
CODE_DEFAULTS[value.name as keyof typeof CODE_DEFAULTS];
}
set selectedLanguage(value: LanguageDescription) {
this._selectedLanguage = value;
if (value.name in CODE_DEFAULTS) {
this.editorContent =
CODE_DEFAULTS[value.name as keyof typeof CODE_DEFAULTS];
}
this.selectedLanguage.load().then((language) => {
this.codemirror.editor?.dispatch({
effects: this.languageCompartment.reconfigure(language),
});
});
}
private _linesNumbers: boolean = true;
get linesNumbers() {
return this._linesNumbers;
}
set linesNumbers(lines: boolean) {
this._linesNumbers = lines;
this.codemirror.editor?.dispatch({
effects: this.gutterCompartment.reconfigure(
lines ? lineNumbers() : gutter({})
),
});
}
// Contenu de l'éditeur que l'on passera au serveur
editorContent: string =
CODE_DEFAULTS[this.selectedLanguage.name as keyof typeof CODE_DEFAULTS];
resultContent: string = '';
// Message d'erreur
errorMessage: string = '';
@ViewChild(CodeMirrorComponent) private codemirror!: CodeMirrorComponent;
private readonly languageCompartment = new Compartment();
private readonly gutterCompartment = new Compartment();
protected readonly extensions: Extension[] = [
basicSetup,
this.gutterCompartment.of(lineNumbers()),
this.languageCompartment.of(this.selectedLanguage.support!),
];
constructor(private codeExecutionService: CodeExecutionService, protected workService: WorkService) {
}
// Efface le contenu de l'éditeur
clear(): void {
this.editorContent = '';
}
onRunButtonClicked() {
// Le code à exécuter est le contenu de l'éditeur
const codeToExecute = this.editorContent;
this.codeExecutionService.executeCode(
codeToExecute,
this.selectedLanguage.name
);
this.resultContent = '';
}
loadFromFile(event: Event) {
const file = (event.target as HTMLInputElement).files![0];
for (const language of this.languages) {
if (language.extensions.some((ext) => file.name.endsWith(`.${ext}`))) {
this.selectedLanguage = language;
const reader = new FileReader();
reader.onload = (event) => {
this.editorContent = event.target!.result as string;
this.errorMessage = '';
};
reader.readAsText(file);
return;
}
}
const extensions = this.languages.flatMap((lang) => lang.extensions);
this.errorMessage = `Unsupported language. Please select one of the following languages: ${extensions.join(', ')}.`;
console.error(this.errorMessage);
}
saveToFile() {
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);
a.click();
}
addToDatabase() {
this.workService.postWorkCode(this.editorContent);
this.selectedLanguage.load().then((language) => {
this.codemirror.editor?.dispatch({
effects: this.languageCompartment.reconfigure(language),
});
});
}
private _linesNumbers: boolean = true;
get linesNumbers() {
return this._linesNumbers;
}
set linesNumbers(lines: boolean) {
this._linesNumbers = lines;
this.codemirror.editor?.dispatch({
effects: this.gutterCompartment.reconfigure(
lines ? lineNumbers() : gutter({})
),
});
}
// Contenu de l'éditeur que l'on passera au serveur
editorContent: string =
CODE_DEFAULTS[this.selectedLanguage.name as keyof typeof CODE_DEFAULTS];
resultContent: string = '';
// Message d'erreur
errorMessage: string = '';
@ViewChild(CodeMirrorComponent) private codemirror!: CodeMirrorComponent;
private readonly languageCompartment = new Compartment();
private readonly gutterCompartment = new Compartment();
protected readonly extensions: Extension[] = [
basicSetup,
this.gutterCompartment.of(lineNumbers()),
this.languageCompartment.of(this.selectedLanguage.support!),
];
constructor(
private codeExecutionService: CodeExecutionService,
protected workService: WorkService
) {}
// Efface le contenu de l'éditeur
clear(): void {
this.editorContent = '';
}
onRunButtonClicked() {
// Le code à exécuter est le contenu de l'éditeur
const codeToExecute = this.editorContent;
this.codeExecutionService.executeCode(
codeToExecute,
this.selectedLanguage.name
);
this.resultContent = '';
}
loadFromFile(event: Event) {
const file = (event.target as HTMLInputElement).files![0];
for (const language of this.languages) {
if (language.extensions.some((ext) => file.name.endsWith(`.${ext}`))) {
this.selectedLanguage = language;
const reader = new FileReader();
reader.onload = (event) => {
this.editorContent = event.target!.result as string;
this.errorMessage = '';
};
reader.readAsText(file);
return;
}
}
shareButtonClicked(){}
saveButtonClicked(){}
protected readonly console = console;
const extensions = this.languages.flatMap((lang) => lang.extensions);
this.errorMessage = `Unsupported language. Please select one of the following languages: ${extensions.join(', ')}.`;
console.error(this.errorMessage);
}
saveToFile() {
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);
a.click();
}
addToDatabase() {
this.workService.postWorkCode(this.editorContent);
}
shareButtonClicked() {}
saveButtonClicked() {}
protected readonly console = console;
}

@ -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

@ -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;
@ -42,9 +43,13 @@ export class HeaderComponent {
// Instanciation du service pour les actions de traduction
constructor(
private router: Router,
private translationService: TranslationService,
private workService: WorkService)
{ }
private translationService: TranslationService,
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);
}
}

@ -1,3 +1,3 @@
body {
margin: 0 150px 0 150px;
}
margin: 0 150px 0 150px;
}

@ -1,3 +1,3 @@
body {
margin: 0 150px 0 150px;
}
margin: 0 150px 0 150px;
}

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

@ -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 {WorkService} from "../../services/work.service";
import {NgForOf} from "@angular/common";
import {FormsModule, NgForm} from "@angular/forms";
import { Work } from '../../models/work.model';
import { WorkService } from '../../services/work.service';
import { NgForOf } from '@angular/common';
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,
TranslateModule,
RouterLink,
NgForOf,
FormsModule
],
imports: [NgClass, 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);
}
}

@ -1,21 +1,33 @@
<h2>Works</h2>
<ul>
<li *ngFor="let work of works">
{{ work.id_work }} - {{ work.link }} - {{ work.content }}
</li>
<li *ngFor="let work of works">
{{ work.id_work }} - {{ work.link }} - {{ work.content }}
</li>
</ul>
<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>
</div>
<div class="form-group">
<label for="link">Link</label>
<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>
</div>
<div class="form-group">
<label for="content">Content</label>
<input
type="text"
class="form-control"
id="content"
name="content"
ngModel
required />
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form>
<button type="submit" class="btn btn-primary">Submit</button>
</form>

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

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

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

@ -1,43 +1,51 @@
import {Injectable} from '@angular/core';
import {Work} from "../models/work.model";
import {HttpClient} from "@angular/common/http";
import {Observable} from "rxjs";
import {NgForm} from "@angular/forms";
import { Injectable } from '@angular/core';
import { Work } from '../models/work.model';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { NgForm } from '@angular/forms';
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class WorkService {
API_URL = 'http://127.0.0.1:3000'
private works: Work[] = [];
constructor(private http: HttpClient) {
}
getWorks(): Observable<any> {
return this.http.get(`${this.API_URL}/works`);
}
//je veux return les works d'un user id
getWorksByUserId(user_id: string): Observable<any> {
return this.http.get(`${this.API_URL}/works/${user_id}`);
}
//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}`);
}
postWork(form: NgForm): void {
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}
this.http.post<any>(`${this.API_URL}/works`, body).subscribe();
}
}
API_URL = 'http://127.0.0.1:3000';
private works: Work[] = [];
constructor(private http: HttpClient) {}
getWorks(): Observable<any> {
return this.http.get(`${this.API_URL}/works`);
}
//je veux return les works d'un user id
getWorksByUserId(user_id: string): Observable<any> {
return this.http.get(`${this.API_URL}/works/${user_id}`);
}
//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}/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(),
};
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,
};
this.http.post<any>(`${this.API_URL}/works`, body).subscribe();
}
}

@ -1,32 +1,35 @@
import {Injectable} from '@angular/core';
import {Work} from "../models/work.model";
import {HttpClient} from "@angular/common/http";
import {Observable} from "rxjs";
import {NgForm} from "@angular/forms";
import { Injectable } from '@angular/core';
import { Work } from '../models/work.model';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
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[] = [];
private works: Work[] = [];
constructor(private http: HttpClient) {
}
constructor(private http: HttpClient) {}
getWorks(): Observable<any> {
return this.http.get(`${this.API_URL}/works`);
}
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}
this.http.post<any>(`${this.API_URL}/works`, body).subscribe();
}
postWork(form: NgForm): void {
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}
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 };
this.http.post<any>(`${this.API_URL}/works`, body).subscribe();
}
}

@ -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 !"
}
},

@ -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 !"
}
},

Loading…
Cancel
Save