Merge remote-tracking branch 'origin/master' into update-edit-project

Author: Awakich

projects/skills/src/app/profile/home/profile-home.component.html

@@ -10,7 +10,7 @@
   @if(type === 'months') {
   <app-month-block [months]="mockMonts" class="profile__month"></app-month-block>
   } @else {
-  <app-trajectory-block class="profile__month"></app-trajectory-block>
+  <!-- <app-trajectory-block class="profile__month"></app-trajectory-block> -->
   }
   <app-skills-block class="profile__skills"></app-skills-block>
   <app-progress-block></app-progress-block>

projects/skills/src/app/trajectories/track-career/detail/info/info.component.scss

@@ -227,11 +227,13 @@
     &__description {
       height: auto;
       padding: 18px 25px;
+      overflow-y: auto;
       border: 1px solid var(--grey-button);
       border-radius: 15px;
 
       @include responsive.apply-desktop {
         height: 235px;
+        overflow-y: auto;
       }
     }
   }

projects/skills/src/app/trajectories/track-career/list/list.component.html

@@ -1,7 +1,10 @@
 <!-- @format -->
 
 <div class="list">
-  @if (trajectoriesList().length) { @for(trajectory of trajectoriesList(); track $index){
+  @if (hasItems()) { @if (type() === 'all') { @for (trajectory of trajectoriesList().slice(0, 2);
+  track $index) {
   <app-trajectory [trajectory]="trajectory"></app-trajectory>
+  } } @else if (type() === 'my') {
+  <app-trajectory [trajectory]="userTrajectory()!"></app-trajectory>
   } }
 </div>

projects/skills/src/app/trajectories/track-career/list/list.component.ts

@@ -4,6 +4,7 @@ import {
   type AfterViewInit,
   ChangeDetectorRef,
   Component,
+  computed,
   inject,
   type OnDestroy,
   type OnInit,
@@ -37,6 +38,7 @@ export class TrajectoriesListComponent implements OnInit, AfterViewInit, OnDestr
 
   totalItemsCount = signal(0);
   trajectoriesList = signal<Trajectory[]>([]);
+  userTrajectory = signal<Trajectory | undefined>(undefined);
   trajectoriesPage = signal(1);
   perFetchTake = signal(20);
 
@@ -49,20 +51,17 @@ export class TrajectoriesListComponent implements OnInit, AfterViewInit, OnDestr
    * Определяет тип списка (all/my) и загружает начальные данные
    */
   ngOnInit(): void {
-    this.type.set(this.router.url.split("/").slice(-1)[0] as "all" | "my");
+    const currentType = this.router.url.split("/").pop() as "all" | "my";
+    this.type.set(currentType);
 
-    const routeData$ = this.route.data.pipe(map(r => r["data"]));
-
-    const subscription = routeData$.subscribe((trajectories: Trajectory[]) => {
-      if (this.type() === "all") {
-        this.trajectoriesList.set(trajectories);
-        this.totalItemsCount.set(trajectories.length);
+    this.route.data.pipe(map(r => r["data"])).subscribe(data => {
+      if (currentType === "all") {
+        this.trajectoriesList.set(data as Trajectory[]);
+        this.totalItemsCount.set((data as Trajectory[]).length);
       } else {
-        this.trajectoriesList.set(trajectories);
+        this.userTrajectory.set(data as Trajectory);
       }
     });
-
-    this.subscriptions$().push(subscription);
   }
 
   /**
@@ -130,4 +129,8 @@ export class TrajectoriesListComponent implements OnInit, AfterViewInit, OnDestr
       map(res => res)
     );
   }
+
+  hasItems = computed(() => {
+    return this.type() === "all" ? this.trajectoriesList().length > 0 : !!this.userTrajectory();
+  });
 }

projects/skills/src/app/trajectories/trajectories.service.ts

@@ -51,7 +51,7 @@ export class TrajectoriesService {
     return this.apiService.get<Trajectory[]>(this.TRAJECTORY_URL).pipe(
       map(track => {
         const choosedTrajctory = track.find(trajectory => trajectory.isActiveForUser === true);
-        return [choosedTrajctory];
+        return choosedTrajctory;
       })
     );
   }

projects/social_platform/src/app/office/program/detail/main/main.component.ts

@@ -9,7 +9,7 @@ import {
   ViewChild,
 } from "@angular/core";
 import { ProgramService } from "@office/program/services/program.service";
-import { ActivatedRoute, Router } from "@angular/router";
+import { ActivatedRoute, Router, RouterModule } from "@angular/router";
 import {
   concatMap,
   fromEvent,
@@ -39,6 +39,7 @@ import { ProjectAdditionalService } from "@office/projects/edit/services/project
 import { SoonCardComponent } from "@office/shared/soon-card/soon-card.component";
 import { NewsFormComponent } from "@office/features/news-form/news-form.component";
 import { AsyncPipe } from "@angular/common";
+import { AvatarComponent } from "@uilib";
 
 @Component({
   selector: "app-main",
@@ -59,6 +60,9 @@ import { AsyncPipe } from "@angular/common";
     NewsFormComponent,
     ModalComponent,
     MatProgressBarModule,
+    AvatarComponent,
+    TagComponent,
+    RouterModule,
   ],
 })
 export class ProgramDetailMainComponent implements OnInit, OnDestroy {