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..d0e2fa3 100644 --- a/src/app/components/login/login.component.ts +++ b/src/app/components/login/login.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms'; @@ -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', @@ -29,10 +31,11 @@ import { NgIf } from '@angular/common'; styleUrl: './login.component.css' }) -export class LoginComponent { +export class LoginComponent implements OnInit { @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,10 +43,15 @@ export class LoginComponent { password: new FormControl(this.user.password, Validators.required), }); - connect() { - console.log(this.loginForm.value.login) - console.log(this.loginForm.value.password) + public constructor(us: UserService,private router: Router) { + this.UserService = us + } + + ngOnInit() { + sessionStorage.clear(); + } + connect() { if (this.loginForm.invalid) { console.log("ERREUR INVALIDE"); return; @@ -53,16 +61,19 @@ export class LoginComponent { console.log("ERREUR DIFFERENT"); return; } + console.log(this.loginForm.value.login) this.user = this.loginForm.value; - - this.addConnectEvent.emit(this.user); + localStorage.setItem('UserConnecte',String(this.user.login)); + + //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..5d868c1 --- /dev/null +++ b/src/app/components/user-accueil/user-accueil.component.html @@ -0,0 +1,18 @@ + + +

{{formattedDate}}

+ + + + + + + + + + + + + + +
LUNMARMERJEUVENSAMDIM
\ No newline at end of file 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..fd34869 --- /dev/null +++ b/src/app/components/user-accueil/user-accueil.component.ts @@ -0,0 +1,26 @@ +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 { + protected formattedDate : String + + public constructor() { + const currentDate: Date = new Date + const options: Intl.DateTimeFormatOptions = { + year: 'numeric', + month: 'long', + day: 'numeric' + }; + this.formattedDate = currentDate.toLocaleDateString(undefined, options); + } + +} diff --git a/src/app/components/user-list/user-list.component.html b/src/app/components/user-list/user-list.component.html index 3ebfae7..7c630a0 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 7cc2b0e..9f9b30d 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..a602d3d --- /dev/null +++ b/src/app/components/user-menu/user-menu.component.html @@ -0,0 +1,8 @@ + + + {{userconnecte}} + Accueil + Classement + Details + Sudoku + 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..8fecd66 --- /dev/null +++ b/src/app/components/user-menu/user-menu.component.ts @@ -0,0 +1,38 @@ +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 + this.userconnecte = id + } else { + this.userconnecte = "Pseudo"; + this.route = "/users/0"; + } + } + +}