diff --git a/src/app/components/book-menu/book-menu.component.html b/src/app/components/book-menu/book-menu.component.html deleted file mode 100644 index c4b9517..0000000 --- a/src/app/components/book-menu/book-menu.component.html +++ /dev/null @@ -1,6 +0,0 @@ - - - Accueil - Liste des livres - Ajouter un livre - \ No newline at end of file diff --git a/src/app/components/book-menu/book-menu.component.ts b/src/app/components/book-menu/book-menu.component.ts deleted file mode 100644 index 450f6b4..0000000 --- a/src/app/components/book-menu/book-menu.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { MatButtonModule } from '@angular/material/button'; -import { MatMenuModule } from '@angular/material/menu'; - -@Component({ - selector: 'app-book-menu', - standalone: true, - imports: [RouterModule, MatButtonModule, MatMenuModule], - templateUrl: './book-menu.component.html' -}) -export class BookMenuComponent { - -} diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html index 32e8530..5ce396d 100644 --- a/src/app/components/login/login.component.html +++ b/src/app/components/login/login.component.html @@ -1,18 +1,19 @@
+

Identifiez vous !

Login - +
Password - +
diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts index 08b2501..96ad23a 100644 --- a/src/app/components/login/login.component.ts +++ b/src/app/components/login/login.component.ts @@ -10,6 +10,8 @@ import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { User } from '../../models/user.model'; import { NgIf } from '@angular/common'; +import { UserService } from '../../services/user-service'; +import { Router } from '@angular/router'; @Component({ selector: 'app-login', @@ -33,6 +35,7 @@ export class LoginComponent { @Output() addConnectEvent = new EventEmitter(); public isButtonVisible = false; + private UserService : UserService; user: User = {id:1, login: '', password: '', streak: null, streaks: [], points: null} loginForm: FormGroup = new FormGroup({ @@ -40,6 +43,11 @@ export class LoginComponent { password: new FormControl(this.user.password, Validators.required), }); + public constructor(us: UserService,private router: Router) { + this.UserService = us + } + + connect() { console.log(this.loginForm.value.login) console.log(this.loginForm.value.password) @@ -55,14 +63,17 @@ export class LoginComponent { } this.user = this.loginForm.value; - + localStorage.setItem('UserConnecte',String(this.user.id)); + + //this.UserService.addUserToLocal(this.user); this.addConnectEvent.emit(this.user); this.loginForm.reset(); this.isButtonVisible = false; + this.router.navigate(['/accueil']); } - onInputChange(event: Event) { + onInputChange() { if(this.loginForm.value.login != "" && this.loginForm.value.password != ""){ this.isButtonVisible = true; } else{ diff --git a/src/app/components/user-accueil/user-accueil.component.css b/src/app/components/user-accueil/user-accueil.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/components/user-accueil/user-accueil.component.html b/src/app/components/user-accueil/user-accueil.component.html new file mode 100644 index 0000000..e1d9f57 --- /dev/null +++ b/src/app/components/user-accueil/user-accueil.component.html @@ -0,0 +1,3 @@ + + +

user-accueil works!

diff --git a/src/app/components/user-accueil/user-accueil.component.ts b/src/app/components/user-accueil/user-accueil.component.ts new file mode 100644 index 0000000..64fdae7 --- /dev/null +++ b/src/app/components/user-accueil/user-accueil.component.ts @@ -0,0 +1,15 @@ +import { Component } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { UserMenuComponent } from '../user-menu/user-menu.component'; + +@Component({ + selector: 'app-user-accueil', + standalone: true, + imports: [UserMenuComponent,RouterModule], + templateUrl: './user-accueil.component.html', + styleUrl: './user-accueil.component.css' +}) + +export class UserAccueilComponent { + +} diff --git a/src/app/components/user-list/user-list.component.html b/src/app/components/user-list/user-list.component.html index b84a421..69a88cd 100644 --- a/src/app/components/user-list/user-list.component.html +++ b/src/app/components/user-list/user-list.component.html @@ -1,3 +1,5 @@ + +

User list

    diff --git a/src/app/components/user-list/user-list.component.ts b/src/app/components/user-list/user-list.component.ts index 73735b3..b6e0a1f 100644 --- a/src/app/components/user-list/user-list.component.ts +++ b/src/app/components/user-list/user-list.component.ts @@ -4,11 +4,12 @@ import { NgFor } from '@angular/common'; import { User } from '../../models/user.model'; import { UserService } from '../../services/user-service'; +import { UserMenuComponent } from '../user-menu/user-menu.component'; @Component({ selector: 'app-user-list', standalone: true, - imports: [RouterModule,NgFor,], + imports: [RouterModule,NgFor,UserMenuComponent], templateUrl: './user-list.component.html', styleUrl: './user-list.component.css' }) diff --git a/src/app/components/user-menu/user-menu.component.html b/src/app/components/user-menu/user-menu.component.html new file mode 100644 index 0000000..b1fdc89 --- /dev/null +++ b/src/app/components/user-menu/user-menu.component.html @@ -0,0 +1,7 @@ + + + {{userconnecte}} + Accueil + Classement + Details + diff --git a/src/app/components/user-menu/user-menu.component.ts b/src/app/components/user-menu/user-menu.component.ts new file mode 100644 index 0000000..01de6b6 --- /dev/null +++ b/src/app/components/user-menu/user-menu.component.ts @@ -0,0 +1,37 @@ +import { Component } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { MatButtonModule } from '@angular/material/button'; +import { MatMenuModule } from '@angular/material/menu'; +import { UserService } from '../../services/user-service'; + +@Component({ + selector: 'app-book-menu', + standalone: true, + imports: [RouterModule, MatButtonModule, MatMenuModule], + templateUrl: './user-menu.component.html' +}) + +export class UserMenuComponent { + private Service : UserService; + public userconnecte : String | undefined; + public route : String | undefined; + + public constructor(us: UserService) { + this.Service = us + this.reloadPseudo() + } + + public reloadPseudo(){ + let id = localStorage.getItem('UserConnecte'); + + if (typeof id === "string" && id !="undefined"){ + let user = this.Service.getUserById(+id); + this.route = "/users/" + user?.id; + this.userconnecte = user?.login; + } else { + this.userconnecte = "Pseudo"; + this.route = "/users/0"; + } + } + +}