Skip to content

Commit a9c5214

Browse files
committed
fix skills detail
1 parent 27fcbb8 commit a9c5214

4 files changed

Lines changed: 20 additions & 4 deletions

File tree

projects/skills/src/app/task/task/task.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h1 class="badge__title">{{ skillStepsResponse()?.skillName }}</h1>
4848
? skillStepsResponse()?.nextLevel
4949
: skillStepsResponse()?.currentLevel
5050
}}
51-
уровень
51+
Задание
5252
</div>
5353
</div>
5454
<router-outlet></router-outlet>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
}
209209

210210
&__mentor {
211-
display: flex;
211+
display: none;
212212
flex-direction: column;
213213
gap: 20px;
214214
align-items: flex-start;

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,16 @@
99
<div class="trajectory__content">
1010
<h4 class="text-heading-4" [style.color]="trajectory.textColor">{{ trajectory.name }}</h4>
1111
<div class="trajectory__description">
12-
@if (trajectory.description) {
12+
@if (trajectory.description) { @if (desktopMode$ | async; as desktopMode) {
13+
<div class="text-body-14">
14+
<p
15+
[innerHTML]="trajectory.description | parseLinks | parseBreaks"
16+
[style.color]="
17+
trajectory.company === 'Procollab' ? 'var(--dark-grey)' : trajectory.textColor
18+
"
19+
></p>
20+
</div>
21+
} @else {
1322
<div class="text-body-14 about__text">
1423
<p
1524
#descEl
@@ -27,7 +36,7 @@ <h4 class="text-heading-4" [style.color]="trajectory.textColor">{{ trajectory.na
2736
</div>
2837
}
2938
</div>
30-
}
39+
} }
3140
</div>
3241
</div>
3342

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import { ParseBreaksPipe, ParseLinksPipe, PluralizePipe } from "@corelib";
2323
import { Trajectory } from "projects/skills/src/models/trajectory.model";
2424
import { trajectoryMore } from "projects/core/src/consts/trajectoryMore";
2525
import { HttpErrorResponse } from "@angular/common/http";
26+
import { BreakpointObserver } from "@angular/cdk/layout";
27+
import { map, Observable } from "rxjs";
2628

2729
@Component({
2830
selector: "app-trajectory",
@@ -47,6 +49,11 @@ export class TrajectoryComponent implements AfterViewInit, OnInit {
4749

4850
router = inject(Router);
4951
trajectoryService = inject(TrajectoriesService);
52+
breakpointObserver = inject(BreakpointObserver);
53+
54+
desktopMode$: Observable<boolean> = this.breakpointObserver
55+
.observe("(min-width: 920px)")
56+
.pipe(map(result => result.matches));
5057

5158
cdRef = inject(ChangeDetectorRef);
5259
sanitizer = inject(DomSanitizer);

0 commit comments

Comments
 (0)