Merge branch 'develop' into feature/bertapasamontes-onboarding

Author: bertapasamontes

src/app/app.component.html

@@ -1 +1 @@
-<router-outlet></router-outlet>
+<app-mentor-login (loginSuccess)="onLoginSuccess($event)"></app-mentor-login><router-outlet></router-outlet>

src/app/app.component.ts

@@ -6,4 +6,12 @@ import { Component } from '@angular/core'
 })
 export class AppComponent {
   title = 'ita-challenges'
-}
+
+  isLoggedIn:boolean = false
+
+  onLoginSuccess(success: boolean): void {
+    if (success) {
+      this.isLoggedIn = success
+    }
+  }
+}

src/app/app.module.ts

@@ -21,6 +21,8 @@ import localeCa from '@angular/common/locales/ca'
 import localeEn from '@angular/common/locales/en'
 import { registerLocaleData } from '@angular/common'
 
+import { MentorLoginComponent } from './modules/mentor/mentor-login/mentor-login.component';
+
 registerLocaleData(localeEs, 'es')
 registerLocaleData(localeCa, 'ca')
 registerLocaleData(localeEn, 'en')
@@ -35,6 +37,7 @@ export function HttpLoaderFactory (http: HttpClient): any {
   ],
   bootstrap: [AppComponent],
   imports: [BrowserModule,
+    MentorLoginComponent,
     AppRoutingModule,
     BrowserAnimationsModule,
     CoreModule,

src/app/core/layout/header/desktop-nav/desktop-nav.component.html

@@ -26,7 +26,4 @@
       {{'modules.challenge.header.login' | translate}}
     </button>
   }
-
-  <app-mentor-login (loginSuccess)="onLoginSuccess($event)"></app-mentor-login>
-
 </div>

src/app/core/layout/header/mobile-nav/mobile-nav.component.html

@@ -52,10 +52,7 @@
       </div>
   </div>
 </div>
-
-<app-mentor-login (loginSuccess)="onLoginSuccess($event)"></app-mentor-login>
 
-
 <nav class="navbar navbar-expand-md align-items-center">
 
   <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle"

src/app/modules/challenge/components/challenge-header/challenge-header.component.html

@@ -42,7 +42,7 @@ <h3 class="ms-2">{{title | dynamicTranslate}}</h3>
       <span class="stat" [ngbTooltip]="'tooltips.favorites' | translate" (click)="toggleFavorite()" style="cursor: pointer;">
         <img *ngIf="!isFavorite" src="assets/img/icon/heart.svg" alt="Add to favorites">
         <img *ngIf="isFavorite" src="assets/img/icon/heart-filled.svg" alt="Remove from favorites">
-        {{favorites_count}}
+        <span class="txt">{{favorites_count}}</span>
       </span>
       <span class="stat" [ngbTooltip]="'tooltips.creationDate' | translate">
         <img src="assets/img/icon/clock.svg" alt="Date">
@@ -55,7 +55,8 @@ <h3 class="ms-2">{{title | dynamicTranslate}}</h3>
     <ng-container *ngIf="!solutionSent; else solutionSentMessage">
       <button *ngIf="!challengeStarted"  class="btn btn-sm btn-primary" (click)="onStartChallenge()"> {{'modules.challenge.header.buttonStart' | translate }}</button>
       <button *ngIf="challengeStarted"  class="btn btn-sm btn-primary" (click)="saveChallenge()">{{'modules.challenge.header.buttonSaveChallenge' | translate }}</button>
-    <button *ngIf="challengeStarted"  class="btn btn-sm btn-primary" (click)="openSendSolutionModal()"> {{'modules.challenge.header.buttonSendSolution' | translate }}</button>
+      <button *ngIf="challengeStarted"  class="btn btn-sm btn-primary" (click)="openSendSolutionModal()"> {{'modules.challenge.header.buttonSendSolution' | translate }}</button>
+      <button *ngIf="userRole === 'ADMIN'" class="btn btn-sm btn-primary"> {{ 'modules.challenge.header.buttonEditChallenge' | translate }}</button>  
     </ng-container>
 
     <!-- Si ya se envió la solución -->
@@ -65,6 +66,7 @@ <h3 class="ms-2">{{title | dynamicTranslate}}</h3>
          <img src="assets/img/icon/tick-pink.svg" alt="tick icon">
        </div>
      </ng-template>
+
   </div>
 
 </div>

src/app/modules/challenge/components/challenge-header/challenge-header.component.scss

@@ -89,4 +89,10 @@ h3 {
     vertical-align: middle;
     margin-right: 4px;
   }
+}
+
+.stats .stat .txt {
+  display: inline-block;
+  min-width: 24px;
+  text-align: center;
 }

src/app/modules/challenge/components/challenge-header/challenge-header.component.ts

@@ -25,6 +25,8 @@ export class ChallengeHeaderComponent implements OnInit {
   private readonly solutionService = inject(SolutionService)
   private readonly authService = inject(AuthService);
   public userId: string | null = null;
+  public userRole: string | null = null;
+
   challengeTab = ChallengeTab;
 
   @Input() title = ''
@@ -80,6 +82,11 @@ export class ChallengeHeaderComponent implements OnInit {
       } 
     }); 
 
+    this.authService.getUserRole().subscribe(role => {
+      this.userRole = role
+    })
+
+    // Verifica si el reto ya ha comenzado
     if (this.challengeStarted) {
       this.activeId = ChallengeTab.SOLUTIONS
     }

src/app/shared/components/challenge-card/challenge-card.component.scss

@@ -67,6 +67,12 @@
   line-height: 16px;
   font-weight: 600;
   color: $gray-3;
+
+  .txt {
+    display: inline-block;
+    min-width: 20px;
+    text-align: center;
+  }
 }
 
 .favorite-icon {

src/app/shared/components/challenge-card/challenge-card.component.ts

@@ -50,5 +50,6 @@ export class ChallengeCardComponent implements OnInit {
   toggleFavorite (event: MouseEvent): void {
     event.stopPropagation()
     this.isFavorite = !this.isFavorite
+    this.favorites_count = this.isFavorite ? this.favorites_count + 1 : Math.max(0, this.favorites_count - 1)
   }
 }