diff --git a/FencerJudgeFront/src/app/app-routing.module.ts b/FencerJudgeFront/src/app/app-routing.module.ts index b958478..0440f68 100644 --- a/FencerJudgeFront/src/app/app-routing.module.ts +++ b/FencerJudgeFront/src/app/app-routing.module.ts @@ -10,6 +10,8 @@ import { HomeComponent } from './components/home/home.component'; import { MatchesComponent } from './components/match/matches/matches.component'; import { MatchesIdComponent } from './components/match/matches-id/matches-id.component'; +import { MatchesAddComponent } from './components/match/matches-add/matches-add.component'; +import { MatchesDelComponent } from './components/match/matches-del/matches-del.component'; const routes: Routes = [ { path: 'login', component: LoginComponent }, @@ -19,6 +21,16 @@ const routes: Routes = [ { path: 'home', component: HomeComponent }, { path: 'matches', component: MatchesComponent }, + { + path: 'matches/add', + component: MatchesAddComponent, + canActivate: [authGuard], + }, + { + path: 'matches/del/:id', + component: MatchesDelComponent, + canActivate: [authGuard], + }, { path: 'matches/:id', component: MatchesIdComponent }, ]; diff --git a/FencerJudgeFront/src/app/app.component.html b/FencerJudgeFront/src/app/app.component.html index a37d5f5..eaf43d3 100644 --- a/FencerJudgeFront/src/app/app.component.html +++ b/FencerJudgeFront/src/app/app.component.html @@ -1,5 +1,3 @@ -
- -
+ \ No newline at end of file diff --git a/FencerJudgeFront/src/app/app.module.ts b/FencerJudgeFront/src/app/app.module.ts index e17ffe8..4490d31 100644 --- a/FencerJudgeFront/src/app/app.module.ts +++ b/FencerJudgeFront/src/app/app.module.ts @@ -11,6 +11,9 @@ import { LoginComponent } from './components/essentials/login/login.component'; import { LogoutComponent } from './components/essentials/logout/logout.component'; import { MatchesComponent } from './components/match/matches/matches.component'; import { MatchesIdComponent } from './components/match/matches-id/matches-id.component'; +import { MatchesAddComponent } from './components/match/matches-add/matches-add.component'; +import { SponsortComponent } from './templates/sponsort/sponsort.component'; +import { MatchesDelComponent } from './components/match/matches-del/matches-del.component'; @NgModule({ declarations: [ @@ -22,6 +25,9 @@ import { MatchesIdComponent } from './components/match/matches-id/matches-id.com LogoutComponent, MatchesComponent, MatchesIdComponent, + MatchesAddComponent, + SponsortComponent, + MatchesDelComponent, ], imports: [BrowserModule, AppRoutingModule, FormsModule], providers: [], diff --git a/FencerJudgeFront/src/app/components/essentials/footer/footer.component.html b/FencerJudgeFront/src/app/components/essentials/footer/footer.component.html index bd1e916..4025368 100644 --- a/FencerJudgeFront/src/app/components/essentials/footer/footer.component.html +++ b/FencerJudgeFront/src/app/components/essentials/footer/footer.component.html @@ -15,31 +15,25 @@ > Suivez-nous - +
  • + + MatchAdd + +
  • - 👤 - + +
    - 🔒 - + +
    - + \ No newline at end of file diff --git a/FencerJudgeFront/src/app/components/home/home.component.css b/FencerJudgeFront/src/app/components/home/home.component.css index e69de29..ddf7d9e 100644 --- a/FencerJudgeFront/src/app/components/home/home.component.css +++ b/FencerJudgeFront/src/app/components/home/home.component.css @@ -0,0 +1,568 @@ +.match-card { + background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%); + border: 2px solid #daa520; + padding: 24px; + box-shadow: 0 8px 32px rgba(0, 0, 0, 0.4), + inset 0 1px 0 rgba(255, 255, 255, 0.1); + position: relative; + overflow: hidden; + transition: all 0.3s ease; + height: 80vh; + width: 100%; +} + +.match-card::before { + content: ""; + position: absolute; + top: 0; + left: 0; + right: 0; + height: 2px; + background: linear-gradient(90deg, #daa520, #ffd700, #daa520); + background-size: 200% 100%; + animation: gradientShift 15s ease infinite; +} + +@keyframes gradientShift { + 0% { + background-position: 0% 50%; + } + + 50% { + background-position: 100% 50%; + } + + 100% { + background-position: 0% 50%; + } +} + +.match-card { + transform: translateY(-4px); + box-shadow: 0 12px 48px rgba(218, 165, 32, 0.2), 0 8px 32px rgba(0, 0, 0, 0.4); +} + +.match-background { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: -1; +} + +.background-image { + width: 100%; + height: 100%; + object-fit: cover; + filter: grayscale(30%) brightness(0.4) contrast(1.2); + transition: all 0.5s ease; +} + +.match-card:hover .background-image { + filter: grayscale(10%) brightness(0.3) contrast(1.4); + transform: scale(1.05); +} + +.image-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: linear-gradient( + 135deg, + rgba(26, 26, 46, 0.85) 0%, + rgba(0, 0, 0, 0.7) 50%, + rgba(22, 33, 62, 0.85) 100% + ); +} + +/* Header */ +.match-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 20px; +} + +.match-weapon { + display: flex; + align-items: center; + gap: 8px; + color: #daa520; + font-weight: 600; +} + +.weapon-type { + font-size: 14px; + text-transform: uppercase; + letter-spacing: 1px; +} + +/* Status */ +.match-status { + display: flex; + align-items: center; + gap: 8px; + padding: 6px 12px; + border-radius: 20px; + font-size: 12px; + font-weight: 600; + text-transform: uppercase; + letter-spacing: 0.5px; +} + +.status-warning { + background: rgba(34, 197, 94, 0.2); + color: #22c55e; + border: 1px solid #22c55e; +} + +.status-success { + background: rgba(239, 68, 68, 0.2); + color: #ef4444; + border: 1px solid #ef4444; +} + +.status-secondary { + background: rgba(59, 130, 246, 0.2); + color: #3b82f6; + border: 1px solid #3b82f6; +} + +.status-dot { + width: 8px; + height: 8px; + border-radius: 50%; + background: currentColor; + animation: pulse 2s infinite; +} + +@keyframes pulse { + 0%, + 100% { + opacity: 1; + } + 50% { + opacity: 0.5; + } +} + +/* Versus Section */ +.match-versus { + display: flex; + align-items: center; + justify-content: space-between; + margin: 24px 0; + position: relative; +} + +.fencer { + flex: 1; + text-align: center; + color: white; +} + +.fencer-name { + font-size: 18px; + font-weight: 700; + margin-bottom: 4px; + color: #daa520; +} + +.fencer-club { + font-size: 12px; + color: #9ca3af; + margin-bottom: 8px; +} + +.score { + font-size: 32px; + font-weight: 900; + color: white; + text-shadow: 0 2px 4px rgba(0, 0, 0, 0.5); +} + +.vs-divider { + display: flex; + flex-direction: column; + align-items: center; + gap: 4px; + margin: 0 20px; +} + +.vs-text { + font-size: 14px; + font-weight: 700; + color: #6b7280; + letter-spacing: 2px; +} + +.crossed-swords { + font-size: 20px; + opacity: 0.7; +} + +/* Details */ +.match-details { + display: flex; + flex-direction: column; + gap: 12px; + margin-top: 20px; + padding-top: 20px; + border-top: 1px solid rgba(255, 255, 255, 0.1); +} + +.detail-item { + display: flex; + align-items: center; + gap: 12px; + font-size: 14px; +} + +.detail-item .icon { + font-size: 16px; + width: 20px; + text-align: center; +} + +.detail-item .label { + color: #9ca3af; + font-weight: 500; + min-width: 60px; +} + +.detail-item .value { + color: white; + font-weight: 600; +} + +/* Responsive */ +@media (max-width: 768px) { + .match-card { + padding: 16px; + } + + .match-versus { + flex-direction: column; + gap: 16px; + } + + .vs-divider { + transform: rotate(90deg); + margin: 0; + } + + .fencer { + width: 100%; + } +} + +.combat-arena { + margin-top: 24px; + background: linear-gradient( + 135deg, + rgba(220, 38, 38, 0.1) 0%, + rgba(0, 0, 0, 0.8) 50%, + rgba(255, 215, 0, 0.1) 100% + ); + border: 2px solid; + border-image: linear-gradient(45deg, #dc2626, #ffd700, #dc2626) 1; + border-radius: 12px; + padding: 20px; + position: relative; + overflow: hidden; +} + +.combat-arena::before { + content: ""; + position: absolute; + top: -50%; + left: -50%; + width: 200%; + height: 200%; + background: repeating-conic-gradient( + from 0deg at 50% 50%, + transparent 0deg 2deg, + rgba(220, 38, 38, 0.05) 2deg 4deg + ); + animation: rotate 20s linear infinite; + pointer-events: none; +} + +@keyframes rotate { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + +/* Header Arena */ +.arena-header { + display: flex; + align-items: center; + justify-content: center; + gap: 12px; + margin-bottom: 20px; + position: relative; +} + +.arena-title { + font-family: "Orbitron", monospace; + font-size: 16px; + font-weight: 900; + color: #ffd700; + letter-spacing: 3px; + text-shadow: 0 0 10px #ffd700, 0 0 20px #ffd700, 0 0 30px #ffd700; + animation: titleGlow 2s ease-in-out infinite alternate; +} + +@keyframes titleGlow { + from { + text-shadow: 0 0 10px #ffd700, 0 0 20px #ffd700, 0 0 30px #ffd700; + } + to { + text-shadow: 0 0 20px #ffd700, 0 0 30px #ffd700, 0 0 40px #ffd700; + } +} + +.arena-pulse { + width: 10px; + height: 10px; + background: #dc2626; + border-radius: 50%; + position: relative; + animation: pulse-danger 1s infinite; +} + +.arena-pulse::before { + content: ""; + position: absolute; + top: -5px; + left: -5px; + right: -5px; + bottom: -5px; + background: #dc2626; + border-radius: 50%; + opacity: 0.3; + animation: pulse-ring 1s infinite; +} + +@keyframes pulse-danger { + 0%, + 100% { + transform: scale(1); + } + 50% { + transform: scale(1.2); + } +} + +@keyframes pulse-ring { + 0% { + transform: scale(0.8); + opacity: 0.8; + } + 100% { + transform: scale(2); + opacity: 0; + } +} + +/* Combat Grid */ +.combat-grid { + display: grid; + grid-template-columns: 1fr; + gap: 16px; +} + +.combat-stat { + display: flex; + align-items: center; + gap: 16px; + padding: 16px; + background: linear-gradient( + 90deg, + rgba(0, 0, 0, 0.8) 0%, + rgba(26, 26, 46, 0.9) 50%, + rgba(0, 0, 0, 0.8) 100% + ); + border: 1px solid rgba(255, 215, 0, 0.3); + border-radius: 8px; + position: relative; + transition: all 0.3s ease; + cursor: pointer; +} + +.combat-stat:hover { + transform: translateX(8px); + border-color: #ffd700; + box-shadow: 0 4px 20px rgba(255, 215, 0, 0.3), + inset 0 1px 0 rgba(255, 215, 0, 0.1); +} + +/* Icons animés */ +.stat-icon { + position: relative; + display: flex; + align-items: center; + justify-content: center; + width: 48px; + height: 48px; + font-size: 24px; +} + +.location-radar { + position: absolute; + width: 40px; + height: 40px; + border: 2px solid #10b981; + border-radius: 50%; + border-top-color: transparent; + animation: radar-spin 2s linear infinite; +} + +.referee-badge { + position: absolute; + width: 35px; + height: 35px; + background: linear-gradient(45deg, #ffd700, #ffed4a); + clip-path: polygon( + 50% 0%, + 61% 35%, + 98% 35%, + 68% 57%, + 79% 91%, + 50% 70%, + 21% 91%, + 32% 57%, + 2% 35%, + 39% 35% + ); + animation: badge-pulse 3s ease-in-out infinite; +} + +.time-ring { + position: absolute; + width: 36px; + height: 36px; + border: 3px solid #dc2626; + border-radius: 50%; + border-left-color: transparent; + animation: time-tick 1s linear infinite; +} + +@keyframes radar-spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + +@keyframes badge-pulse { + 0%, + 100% { + transform: scale(1) rotate(0deg); + } + 50% { + transform: scale(1.1) rotate(5deg); + } +} + +@keyframes time-tick { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + +/* Content */ +.stat-content { + flex: 1; + display: flex; + flex-direction: column; + gap: 2px; +} + +.stat-label { + font-family: "Orbitron", monospace; + font-size: 10px; + font-weight: 700; + color: #6b7280; + letter-spacing: 1px; + text-transform: uppercase; +} + +.stat-value { + font-size: 16px; + font-weight: 700; + color: #ffffff; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); +} + +.stat-sub { + font-size: 11px; + color: #9ca3af; + font-weight: 500; +} + +/* Glows spécifiques */ +.venue .stat-value { + color: #10b981; +} +.referee .stat-value { + color: #ffd700; +} +.timing .stat-value { + color: #dc2626; +} + +.stat-glow { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-radius: 8px; + opacity: 0; + transition: opacity 0.3s ease; + pointer-events: none; +} + +.combat-stat:hover .stat-glow { + opacity: 1; +} + +.venue-glow { + box-shadow: inset 0 0 20px rgba(16, 185, 129, 0.2); +} +.referee-glow { + box-shadow: inset 0 0 20px rgba(255, 215, 0, 0.2); +} +.timing-glow { + box-shadow: inset 0 0 20px rgba(220, 38, 38, 0.2); +} + +/* Responsive */ +@media (min-width: 768px) { + .combat-grid { + grid-template-columns: repeat(3, 1fr); + } + + .combat-stat { + flex-direction: column; + text-align: center; + gap: 12px; + } + + .combat-stat:hover { + transform: translateY(-4px); + } +} diff --git a/FencerJudgeFront/src/app/components/home/home.component.html b/FencerJudgeFront/src/app/components/home/home.component.html index a1ac75f..37d0ba6 100644 --- a/FencerJudgeFront/src/app/components/home/home.component.html +++ b/FencerJudgeFront/src/app/components/home/home.component.html @@ -1 +1,114 @@ -

    HELLO !

    +
    +
    + Escrime +
    +
    + +
    +
    + ⚔️ + {{ latestMatch.weapon }} +
    +
    + + {{ getMatchStateLabel(latestMatch.state) }} +
    +
    + +
    +
    +
    + {{ player1?.name }} {{ player1?.firstName }} +
    +
    {{ player1?.club }}
    +
    {{ latestMatch.score1 }}
    +
    + +
    + VS +
    ⚔️
    +
    + +
    +
    + {{ player2?.name }} {{ player2?.firstName }} +
    +
    {{ player2?.club }}
    +
    {{ latestMatch.score2 }}
    +
    +
    + +
    +
    + ARENA COMBAT +
    +
    + +
    +
    +
    +
    + 🏛️ +
    +
    + BATTLEFIELD + {{ latestMatch.city }} + {{ latestMatch.country }} +
    +
    +
    + +
    +
    +
    + ⚖️ +
    +
    + COMBAT JUDGE + {{ referee?.name }} {{ referee?.firstName }} + OFFICIAL REFEREE +
    +
    +
    + +
    +
    +
    + ⚡ +
    +
    + COMBAT START + {{ getTimeUntilMatch() }} + LIVE BATTLE +
    +
    +
    +
    +
    + 🎯 +
    +
    + FUN FACT + + Saviez-vous que l'escrime est l'un des sports les plus anciens aux + Jeux Olympiques ? + + Inspiration et tradition au rendez-vous +
    +
    +
    +
    +
    + + diff --git a/FencerJudgeFront/src/app/components/home/home.component.ts b/FencerJudgeFront/src/app/components/home/home.component.ts index f5902be..76699da 100644 --- a/FencerJudgeFront/src/app/components/home/home.component.ts +++ b/FencerJudgeFront/src/app/components/home/home.component.ts @@ -1,6 +1,16 @@ import { Component } from '@angular/core'; import { MatchesService } from '@services/matches/matches.service'; +<<<<<<< HEAD +======= +import { Matches, MatchState } from '@interfaces/matches'; + +import { PlayerService } from '@services/player/player.service'; +import { Player } from '@interfaces/player'; + +import { RefereeService } from '@services/referee/referee.service'; +import { Referee, RefereeLevel } from '@interfaces/referee'; +>>>>>>> feature/front @Component({ selector: 'app-home', @@ -9,9 +19,144 @@ import { MatchesService } from '@services/matches/matches.service'; styleUrl: './home.component.css', }) export class HomeComponent { - constructor(private matchesService: MatchesService) {} + latestMatch?: Matches; + player1?: Player; + player2?: Player; + referee?: Referee; + MatchState = MatchState; + intervalId?: any; + timeUntilMatch: string | null = null; - send(): void { - this.matchesService.sendCurrentMatches(); + constructor( + private matchesService: MatchesService, + private playerService: PlayerService, + private refereeService: RefereeService + ) {} + + ngOnInit(): void { + this.getLatestMatch(); + } + + ngOnDestroy(): void { + if (this.intervalId) { + clearInterval(this.intervalId); + } + } + + private getLatestMatch(): void { + this.matchesService.getMatches().subscribe((matches) => { + if (matches.length > 0) { + this.latestMatch = matches[matches.length - 1]; + console.log( + '[HomeComponent] 🏁 Dernier match ajouté :', + this.latestMatch + ); + + // Récupération des données liées + this.loadRelatedEntities(this.latestMatch); + + if (this.latestMatch.state === MatchState.NOT_STARTED) { + this.updateTimeUntilMatch(); // initial + this.intervalId = setInterval(() => { + this.updateTimeUntilMatch(); + }, 60000); // chaque minute + } + } else { + console.warn('[HomeComponent] Aucun match disponible'); + } + }); + } + + private updateTimeUntilMatch(): void { + if (!this.latestMatch) return; + + const now = new Date(); + const matchDate = new Date(this.latestMatch.date); + const diffMs = matchDate.getTime() - now.getTime(); + + if (diffMs <= 0) { + this.timeUntilMatch = null; + clearInterval(this.intervalId); + return; + } + + const totalMinutes = Math.floor(diffMs / (1000 * 60)); + const days = Math.floor(totalMinutes / (60 * 24)); + const hours = Math.floor((totalMinutes % (60 * 24)) / 60); + const minutes = totalMinutes % 60; + + let result = ''; + if (days > 0) result += `${days}j `; + if (hours > 0 || days > 0) result += `${hours}h `; + result += `${minutes}min`; + + this.timeUntilMatch = result.trim(); + } + + private loadRelatedEntities(match: Matches): void { + this.playerService.getPlayerById(match.player1ID).subscribe((p1) => { + this.player1 = p1!; + }); + + this.playerService.getPlayerById(match.player2ID).subscribe((p2) => { + this.player2 = p2!; + }); + + this.refereeService.getRefereeById(match.refereeID).subscribe((ref) => { + this.referee = ref!; + }); + } + + getMatchStateLabel(state: MatchState): string { + switch (state) { + case MatchState.NOT_STARTED: + return 'À venir'; + case MatchState.ONGOING: + return 'En cours'; + case MatchState.OVER: + return 'Terminé'; + default: + return 'Inconnu'; + } + } + + getMatchStateColor(state: MatchState): string { + switch (state) { + case MatchState.NOT_STARTED: + return 'secondary'; + case MatchState.ONGOING: + return 'warning'; + case MatchState.OVER: + return 'success'; + default: + return 'light'; + } + } + + getTimeUntilMatch(): string | null { + if ( + !this.latestMatch || + this.latestMatch.state !== MatchState.NOT_STARTED + ) { + return null; + } + + const now = new Date(); + const matchDate = new Date(this.latestMatch.date); + const diffMs = matchDate.getTime() - now.getTime(); + + if (diffMs <= 0) return null; + + const totalMinutes = Math.floor(diffMs / (1000 * 60)); + const days = Math.floor(totalMinutes / (60 * 24)); + const hours = Math.floor((totalMinutes % (60 * 24)) / 60); + const minutes = totalMinutes % 60; + + let result = ''; + if (days > 0) result += `${days}j `; + if (hours > 0 || days > 0) result += `${hours}h `; + result += `${minutes}min`; + + return result.trim(); } } diff --git a/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.css b/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.css new file mode 100644 index 0000000..bb537a4 --- /dev/null +++ b/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.css @@ -0,0 +1,18 @@ +form fieldset { + background-color: #f8f9fa; /* gris clair */ +} + +form legend { + font-weight: 600; + font-size: 1.1rem; +} + +form label { + font-weight: 500; +} + +form button { + width: 100%; + padding: 0.6rem; + font-size: 1.1rem; +} diff --git a/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.html b/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.html new file mode 100644 index 0000000..130f2cc --- /dev/null +++ b/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.html @@ -0,0 +1,171 @@ +

    Ajouter un match

    + +
    +
    + Joueur 1 + +
    + + +
    + +
    + + +
    + +
    + + +
    +
    + +
    + Joueur 2 + +
    + + +
    + +
    + + +
    + +
    + + +
    +
    + +
    + Arbitre + +
    + + +
    + +
    + + +
    + +
    + + +
    +
    + +
    + Match + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    +
    + + +
    diff --git a/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.spec.ts b/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.spec.ts new file mode 100644 index 0000000..5cd8289 --- /dev/null +++ b/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MatchesAddComponent } from './matches-add.component'; + +describe('MatchesAddComponent', () => { + let component: MatchesAddComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [MatchesAddComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(MatchesAddComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.ts b/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.ts new file mode 100644 index 0000000..77a8a94 --- /dev/null +++ b/FencerJudgeFront/src/app/components/match/matches-add/matches-add.component.ts @@ -0,0 +1,97 @@ +import { Component } from '@angular/core'; +import { Router } from '@angular/router'; +import { FormsModule } from '@angular/forms'; + +import { MatchesService } from '@services/matches/matches.service'; +import { MatchState } from '@interfaces/matches'; + +import { PlayerService } from '@services/player/player.service'; + +import { RefereeService } from '@services/referee/referee.service'; +import { Referee, RefereeLevel } from '@interfaces/referee'; + +@Component({ + selector: 'app-matches-add', + standalone: false, + templateUrl: './matches-add.component.html', + styleUrl: './matches-add.component.css', +}) +export class MatchesAddComponent { + formData = { + player1Id: 0, + player1FirstName: '', + player1Name: '', + player1Club: '', + + player2Id: 0, + player2FirstName: '', + player2Name: '', + player2Club: '', + + refereeId: 0, + refereeFirstName: '', + refereeName: '', + refereelevel: 0, + + city: '', + country: '', + weapon: '', + date: '', + }; + + constructor( + private matchService: MatchesService, + private playerService: PlayerService, + private refereeService: RefereeService, + private router: Router + ) {} + + onSubmit(): void { + this.playerService + .getOrCreateByName( + this.formData.player1FirstName, + this.formData.player1Name, + this.formData.player1Club + ) + .subscribe((player1) => { + this.formData['player1Id'] = player1.id; + + this.playerService + .getOrCreateByName( + this.formData.player2FirstName, + this.formData.player2Name, + this.formData.player2Club + ) + .subscribe((player2) => { + this.formData['player2Id'] = player2.id; + + this.refereeService + .getOrCreateByName( + this.formData.refereeFirstName, + this.formData.refereeName, + this.formData.refereelevel + ) + .subscribe((referee) => { + this.formData['refereeId'] = referee.id; + + const matchPayload = { + refereeID: referee.id, + player1ID: player1.id, + score1: 0, + player2ID: player2.id, + score2: 0, + country: this.formData.country, + city: this.formData.city, + weapon: this.formData.weapon, + date: new Date(this.formData.date), + state: MatchState.NOT_STARTED, + }; + + this.matchService.create(matchPayload).subscribe(() => { + this.router.navigate(['/matches']); + }); + }); + }); + }); + } +} diff --git a/FencerJudgeFront/src/app/components/match/matches-del/matches-del.component.css b/FencerJudgeFront/src/app/components/match/matches-del/matches-del.component.css new file mode 100644 index 0000000..e69de29 diff --git a/FencerJudgeFront/src/app/components/match/matches-del/matches-del.component.html b/FencerJudgeFront/src/app/components/match/matches-del/matches-del.component.html new file mode 100644 index 0000000..bae9ddd --- /dev/null +++ b/FencerJudgeFront/src/app/components/match/matches-del/matches-del.component.html @@ -0,0 +1 @@ +

    matches-del works!

    diff --git a/FencerJudgeFront/src/app/components/match/matches-del/matches-del.component.spec.ts b/FencerJudgeFront/src/app/components/match/matches-del/matches-del.component.spec.ts new file mode 100644 index 0000000..29459b8 --- /dev/null +++ b/FencerJudgeFront/src/app/components/match/matches-del/matches-del.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MatchesDelComponent } from './matches-del.component'; + +describe('MatchesDelComponent', () => { + let component: MatchesDelComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [MatchesDelComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(MatchesDelComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/FencerJudgeFront/src/app/components/match/matches-del/matches-del.component.ts b/FencerJudgeFront/src/app/components/match/matches-del/matches-del.component.ts new file mode 100644 index 0000000..b3b9bd4 --- /dev/null +++ b/FencerJudgeFront/src/app/components/match/matches-del/matches-del.component.ts @@ -0,0 +1,38 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; + +import { AuthService } from '@services/auth/auth.service'; +import { MatchesService } from '@services/matches/matches.service'; + +@Component({ + selector: 'app-matches-del', + standalone: false, + templateUrl: './matches-del.component.html', + styleUrl: './matches-del.component.css', +}) +export class MatchesDelComponent { + constructor( + private route: ActivatedRoute, + public authService: AuthService, + private router: Router, + private matchService: MatchesService + ) {} + + ngOnInit(): void { + const id = Number(this.route.snapshot.paramMap.get('id')); + + if (!isNaN(id)) { + this.matchService.deleteMatch(id).subscribe({ + next: () => { + console.log(`Match ${id} supprimé`); + this.router.navigate(['/matches']); // redirection après suppression + }, + error: (err) => { + console.error('Erreur lors de la suppression :', err); + }, + }); + } else { + console.error('ID de match invalide'); + } + } +} diff --git a/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.html b/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.html index 3e82262..2f926a0 100644 --- a/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.html +++ b/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.html @@ -92,3 +92,5 @@

    Match non trouvé.

    + +Delete diff --git a/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.ts b/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.ts index 65d932b..c0ff55a 100644 --- a/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.ts +++ b/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.ts @@ -1,14 +1,18 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { Router, ActivatedRoute } from '@angular/router'; import { AuthService } from '@services/auth/auth.service'; import { MatchesService } from '@services/matches/matches.service'; import { MatchState, Matches } from '@interfaces/matches'; + import { PlayerService } from '@services/player/player.service'; import { Player } from '@interfaces/player'; + import { RefereeService } from '@services/referee/referee.service'; import { Referee, RefereeLevel } from '@interfaces/referee'; +import { getMatchStateLabel, getMatchStateColor } from '@utils/getState'; + @Component({ selector: 'app-matches-id', standalone: false, @@ -26,7 +30,8 @@ export class MatchesIdComponent implements OnInit { private matchService: MatchesService, private playerService: PlayerService, private refereeService: RefereeService, - public authService: AuthService + public authService: AuthService, + private router: Router ) {} ngOnInit(): void { @@ -138,4 +143,11 @@ export class MatchesIdComponent implements OnInit { this.updateScores(); } + + goToMatchDel(): void { + this.router.navigate([ + '/matches/del/', + this.route.snapshot.paramMap.get('id'), + ]); + } } diff --git a/FencerJudgeFront/src/app/services/matches/matches.service.ts b/FencerJudgeFront/src/app/services/matches/matches.service.ts index 11ca740..f3dcc71 100644 --- a/FencerJudgeFront/src/app/services/matches/matches.service.ts +++ b/FencerJudgeFront/src/app/services/matches/matches.service.ts @@ -48,6 +48,7 @@ export class MatchesService { private socket?: WebSocket; private matchUpdates$ = new Subject(); private allMatches: Matches[] = []; + private nextMatchId = Math.max(...this.matches.map((m) => m.id)) + 1; constructor() { this.connectToMatchUpdatesWebSocket(); @@ -122,4 +123,29 @@ export class MatchesService { ngOnDestroy(): void { this.socket?.close(); } + + create(match: Omit): Observable { + const newMatch: Matches = { + ...match, + id: this.nextMatchId++, + }; + + this.matches.push(newMatch); + console.log('[MatchesService] Match created:', newMatch); + return of(newMatch); + } + + deleteMatch(id: number): Observable { + const index = this.matches.findIndex((m) => m.id === id); + + if (index !== -1) { + const deletedMatch = this.matches.splice(index, 1)[0]; + console.log(`[MatchesService] Match ${id} supprimé :`, deletedMatch); + + return of(true); + } else { + console.warn(`[MatchesService] Match ${id} introuvable pour suppression`); + return of(false); + } + } } diff --git a/FencerJudgeFront/src/app/services/player/player.service.ts b/FencerJudgeFront/src/app/services/player/player.service.ts index 53d4350..c5f3a1b 100644 --- a/FencerJudgeFront/src/app/services/player/player.service.ts +++ b/FencerJudgeFront/src/app/services/player/player.service.ts @@ -27,4 +27,35 @@ export class PlayerService { console.log(`[PlayerService] Fetching player ID: ${id}`, player); return of(player); } + + getOrCreateByName( + firstName: string, + name: string, + club: string = 'Inconnu' + ): Observable { + const existing = this.players.find( + (p) => + p.firstName.toLowerCase() === firstName.toLowerCase() && + p.name.toLowerCase() === name.toLowerCase() + ); + + if (existing) { + console.log('[PlayerService] Joueur trouvé :', existing); + return of(existing); + } + + const newPlayer: Player = { + id: + this.players.length > 0 + ? Math.max(...this.players.map((p) => p.id)) + 1 + : 1, + firstName, + name, + club, + }; + + this.players.push(newPlayer); + console.log('[PlayerService] Nouveau joueur créé :', newPlayer); + return of(newPlayer); + } } diff --git a/FencerJudgeFront/src/app/services/referee/referee.service.ts b/FencerJudgeFront/src/app/services/referee/referee.service.ts index 6963230..8d26a06 100644 --- a/FencerJudgeFront/src/app/services/referee/referee.service.ts +++ b/FencerJudgeFront/src/app/services/referee/referee.service.ts @@ -39,4 +39,35 @@ export class RefereeService { console.log(`[RefereeService] Fetching referee ID: ${id}`, ref); return of(ref); } + + getOrCreateByName( + firstName: string, + name: string, + level: RefereeLevel + ): Observable { + const existing = this.referees.find( + (r) => + r.firstName.toLowerCase() === firstName.toLowerCase() && + r.name.toLowerCase() === name.toLowerCase() + ); + + if (existing) { + console.log('[RefereeService] Arbitre trouvé :', existing); + return of(existing); + } + + const newPlayer: Referee = { + id: + this.referees.length > 0 + ? Math.max(...this.referees.map((r) => r.id)) + 1 + : 1, + firstName, + name, + level, + }; + + this.referees.push(newPlayer); + console.log('[RefereeService] Nouveau arbitre créé :', newPlayer); + return of(newPlayer); + } } diff --git a/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.css b/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.css new file mode 100644 index 0000000..13c800a --- /dev/null +++ b/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.css @@ -0,0 +1,56 @@ +@keyframes slides { + from { + transform: translateX(0); + } + to { + transform: translateX(-100%); + } +} + +.logos { + overflow: hidden; + padding: 30px 0px; + white-space: nowrap; + position: relative; +} + +.logos:before, +.logos:after { + position: absolute; + top: 0; + content: ""; + width: 250px; + height: 100%; + z-index: 2; +} + +.logos:before { + left: 0; + background: linear-gradient( + to left, + rgba(255, 255, 255, 0), + rgb(255, 255, 255) + ); +} + +.logos:after { + right: 0; + background: linear-gradient( + to right, + rgba(255, 255, 255, 0), + rgb(255, 255, 255) + ); +} + +.logo_items { + display: inline-block; + animation: 35s slides infinite linear; +} + +.logos:hover .logo_items { + animation-play-state: paused; +} + +.logo_items img { + height: 100px; +} diff --git a/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.html b/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.html new file mode 100644 index 0000000..89ce529 --- /dev/null +++ b/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.html @@ -0,0 +1,23 @@ +
    +
    + + + + + + + +
    +
    diff --git a/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.spec.ts b/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.spec.ts new file mode 100644 index 0000000..9ca3691 --- /dev/null +++ b/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SponsortComponent } from './sponsort.component'; + +describe('SponsortComponent', () => { + let component: SponsortComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SponsortComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(SponsortComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.ts b/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.ts new file mode 100644 index 0000000..8058d61 --- /dev/null +++ b/FencerJudgeFront/src/app/templates/sponsort/sponsort.component.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-sponsort', + standalone: false, + templateUrl: './sponsort.component.html', + styleUrl: './sponsort.component.css' +}) +export class SponsortComponent { + +} diff --git a/FencerJudgeFront/src/app/utils/getState.ts b/FencerJudgeFront/src/app/utils/getState.ts new file mode 100644 index 0000000..c7f141d --- /dev/null +++ b/FencerJudgeFront/src/app/utils/getState.ts @@ -0,0 +1,27 @@ +import { MatchState } from '@interfaces/matches'; + +export function getMatchStateLabel(state: MatchState): string { + switch (state) { + case MatchState.NOT_STARTED: + return 'À venir'; + case MatchState.ONGOING: + return 'En cours'; + case MatchState.OVER: + return 'Terminé'; + default: + return 'Inconnu'; + } +} + +export function getMatchStateColor(state: MatchState): string { + switch (state) { + case MatchState.NOT_STARTED: + return 'secondary'; + case MatchState.ONGOING: + return 'warning'; + case MatchState.OVER: + return 'success'; + default: + return 'light'; + } +} diff --git a/FencerJudgeFront/src/assets/duel.webp b/FencerJudgeFront/src/assets/duel.webp new file mode 100644 index 0000000..5282448 Binary files /dev/null and b/FencerJudgeFront/src/assets/duel.webp differ diff --git a/db.lock.db b/db.lock.db new file mode 100644 index 0000000..072e750 --- /dev/null +++ b/db.lock.db @@ -0,0 +1,6 @@ +#FileLock +#Mon Jun 02 17:40:34 CEST 2025 +hostName=ExostFlash +id=197313393c88a931fa21bf5ce1281b7253870b00683 +method=file +server=192.167.2.100\:54366