Skip to content

Commit ba71b13

Browse files
committed
moved trajectory to course naming from skills to social-platform
1 parent c0cf17d commit ba71b13

106 files changed

Lines changed: 1729 additions & 158 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

projects/skills/src/app/shared/task-card/task-card.component.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ import { Component, Input } from "@angular/core";
44
import { CommonModule } from "@angular/common";
55
import { ButtonComponent } from "@ui/components";
66
import { IconComponent } from "@uilib";
7-
import type { Task, TasksResponse } from "../../../models/skill.model";
7+
import type {
8+
Task,
9+
TasksResponse,
10+
} from "../../../../../social_platform/src/app/office/models/skill.model";
811

912
/**
1013
* Компонент карточки задачи

projects/skills/src/app/skills/services/skill.service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
import { inject, Injectable } from "@angular/core";
44
import { SkillsApiService } from "@corelib";
55
import { ApiPagination } from "../../../models/api-pagination.model";
6-
import { Skill, TasksResponse } from "../../../models/skill.model";
6+
import {
7+
Skill,
8+
TasksResponse,
9+
} from "../../../../../social_platform/src/app/office/models/skill.model";
710
import { HttpParams } from "@angular/common/http";
811

912
/**

projects/skills/src/assets/icons/symbol/svg/sprite.css.svg

Lines changed: 1 addition & 1 deletion
Loading

projects/skills/src/models/trajectory.model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** @format */
22

33
import type { UserData } from "./profile.model";
4-
import type { Skill } from "./skill.model";
4+
import type { Skill } from "../../../social_platform/src/app/office/models/skill.model";
55

66
/**
77
* Информация о навыке в контексте траектории

projects/social_platform/src/app/auth/models/user.model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { Project } from "@models/project.model";
44
import { FileModel } from "@office/models/file.model";
5-
import { Skill } from "@office/models/skill";
5+
import { Skill } from "@office/models/skill.model";
66
import { Program } from "@office/program/models/program.model";
77

88
/**

projects/social_platform/src/app/auth/services/profile.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ApiService } from "projects/core";
55
import { Achievement } from "../models/user.model";
66
import { map, Observable } from "rxjs";
77
import { plainToInstance } from "class-transformer";
8-
import { Approve } from "@office/models/skill";
8+
import { Approve } from "@office/models/skill.model";
99

1010
/**
1111
* Сервис управления профилем пользователя
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!-- @format -->
2+
3+
<div class="profile">
4+
<app-back namespace="курсы" path="/office/program/all"></app-back>
5+
6+
<div class="profile__info">
7+
<form class="page__search" [formGroup]="searchForm">
8+
<app-search formControlName="search"></app-search>
9+
</form>
10+
11+
<router-outlet></router-outlet>
12+
13+
<app-soon-card
14+
title="аналитика"
15+
description="уровень включённости студентов, статистика достижения целей в проектах"
16+
></app-soon-card>
17+
</div>
18+
</div>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@use "styles/typography";
2+
@use "styles/responsive";
3+
4+
.profile {
5+
&__info {
6+
display: grid;
7+
grid-template-columns: 8fr 2fr;
8+
column-gap: 20px;
9+
}
10+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/** @format */
2+
3+
import { ComponentFixture, TestBed } from "@angular/core/testing";
4+
5+
import { TrackCareerComponent } from "./courses.component";
6+
7+
describe("TrackCareerComponent", () => {
8+
let component: TrackCareerComponent;
9+
let fixture: ComponentFixture<TrackCareerComponent>;
10+
11+
beforeEach(async () => {
12+
await TestBed.configureTestingModule({
13+
imports: [TrackCareerComponent],
14+
}).compileComponents();
15+
16+
fixture = TestBed.createComponent(TrackCareerComponent);
17+
component = fixture.componentInstance;
18+
fixture.detectChanges();
19+
});
20+
21+
it("should create", () => {
22+
expect(component).toBeTruthy();
23+
});
24+
});
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/** @format */
2+
3+
import { CommonModule } from "@angular/common";
4+
import { Component, inject } from "@angular/core";
5+
import { RouterModule } from "@angular/router";
6+
import { BackComponent } from "@uilib";
7+
import { SearchComponent } from "@ui/components/search/search.component";
8+
import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms";
9+
import { SoonCardComponent } from "@office/shared/soon-card/soon-card.component";
10+
11+
/**
12+
* Главный компонент модуля отслеживания карьерных траекторий
13+
* Служит контейнером для дочерних компонентов и маршрутизации
14+
* Отображает навигационную панель с вкладками "Траектории" и "Моя траектория"
15+
*/
16+
@Component({
17+
selector: "app-track-career",
18+
standalone: true,
19+
imports: [
20+
CommonModule,
21+
RouterModule,
22+
BackComponent,
23+
SearchComponent,
24+
ReactiveFormsModule,
25+
SoonCardComponent,
26+
],
27+
templateUrl: "./courses.component.html",
28+
styleUrl: "./courses.component.scss",
29+
})
30+
export class CoursesComponent {
31+
private readonly fb = inject(FormBuilder);
32+
33+
constructor() {
34+
this.searchForm = this.fb.group({
35+
search: [""],
36+
});
37+
}
38+
39+
searchForm: FormGroup;
40+
}

0 commit comments

Comments
 (0)