Skip to content

Commit dee8975

Browse files
committed
fix changes in trajectory module
1 parent 81d5837 commit dee8975

3 files changed

Lines changed: 25 additions & 3 deletions

File tree

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,16 @@
7171
</div>
7272

7373
<div class="trajectory__description" [style.background-color]="trajectory.backgroundColor">
74-
@if (trajectory.description) {
74+
@if (trajectory.description) { @if (desktopMode$ | async; as desktopMode) {
75+
<div class="text-body-14">
76+
<p
77+
[innerHTML]="trajectory.description | parseLinks | parseBreaks"
78+
[style.color]="
79+
trajectory.company === 'Procollab' ? 'var(--dark-grey)' : trajectory.textColor
80+
"
81+
></p>
82+
</div>
83+
} @else {
7584
<div class="text-body-14 about__text">
7685
<p
7786
#descEl
@@ -89,7 +98,7 @@
8998
</div>
9099
}
91100
</div>
92-
}
101+
} }
93102
</div>
94103

95104
<div

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,11 @@
236236
padding: 18px 25px;
237237
border: 1px solid var(--grey-button);
238238
border-radius: 15px;
239+
height: auto;
240+
241+
@include responsive.apply-desktop {
242+
height: 235px;
243+
}
239244
}
240245
}
241246

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { ParseBreaksPipe, ParseLinksPipe } from "@corelib";
1616
import { ButtonComponent } from "@ui/components";
1717
import { AvatarComponent, IconComponent } from "@uilib";
1818
import { expandElement } from "@utils/expand-element";
19-
import { map, Subscription } from "rxjs";
19+
import { map, Observable, Subscription } from "rxjs";
2020
import { SkillCardComponent } from "../../../../skills/shared/skill-card/skill-card.component";
2121
import { CommonModule } from "@angular/common";
2222
import { MonthBlockComponent } from "projects/skills/src/app/profile/shared/month-block/month-block.component";
@@ -29,6 +29,7 @@ import { TrajectoriesService } from "../../../trajectories.service";
2929
import { Month, UserData } from "projects/skills/src/models/profile.model";
3030
import { ProfileService } from "projects/skills/src/app/profile/services/profile.service";
3131
import { SkillService } from "projects/skills/src/app/skills/services/skill.service";
32+
import { BreakpointObserver } from "@angular/cdk/layout";
3233

3334
@Component({
3435
selector: "app-detail",
@@ -56,6 +57,7 @@ export class TrajectoryInfoComponent implements OnInit, AfterViewInit {
5657
trajectoryService = inject(TrajectoriesService);
5758
profileService = inject(ProfileService);
5859
skillService = inject(SkillService);
60+
breakpointObserver = inject(BreakpointObserver);
5961

6062
subscriptions$: Subscription[] = [];
6163

@@ -78,7 +80,13 @@ export class TrajectoryInfoComponent implements OnInit, AfterViewInit {
7880

7981
@ViewChild("descEl") descEl?: ElementRef;
8082

83+
desktopMode$: Observable<boolean> = this.breakpointObserver
84+
.observe("(min-width: 920px)")
85+
.pipe(map(result => result.matches));
86+
8187
ngOnInit(): void {
88+
this.desktopMode$.subscribe(r => console.log(r));
89+
8290
this.route.data.pipe(map(r => r["data"])).subscribe(r => {
8391
this.trajectory = r[0];
8492
this.userTrajectory.set({ ...r[1], individualSkills: r[2] });

0 commit comments

Comments
 (0)