Skip to content

Commit 30faee4

Browse files
committed
add filter for projects & update project & profile
1 parent 2d70ecd commit 30faee4

70 files changed

Lines changed: 1521 additions & 401 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.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"version": "0.0.0",
44
"scripts": {
55
"ng": "ng",
6-
"start": "ng serve social_platform",
6+
"start:social": "ng serve social_platform --open",
7+
"start:skills": "ng serve skills --open",
78
"build:social:dev": "npm run build:sprite && ng build social_platform --configuration=development",
89
"build:social:prod": "npm run build:sprite && ng build social_platform --configuration=production",
910
"build:skills:prod": "ng build skills --configuration=production",
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/** @format */
2+
3+
export const filterTags = [
4+
{ id: 2, label: "Все проекты", value: null },
5+
{ id: 1, label: "Оцененные", value: true },
6+
{ id: 0, label: "Не оцененные", value: false },
7+
];
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/** @format */
2+
3+
export const directionProjectList = [
4+
{
5+
id: 0,
6+
value: "Технология",
7+
label: "Технология",
8+
},
9+
{
10+
id: 1,
11+
value: "IT",
12+
label: "IT",
13+
},
14+
{
15+
id: 2,
16+
value: "Транспорт",
17+
label: "Транспорт",
18+
},
19+
{
20+
id: 3,
21+
value: "им Био",
22+
label: "Хим Био",
23+
},
24+
{
25+
id: 4,
26+
value: "Дизайн",
27+
label: "Дизайн",
28+
},
29+
{
30+
id: 5,
31+
value: "Мультимедиа",
32+
label: "Мультимедиа",
33+
},
34+
{
35+
id: 6,
36+
value: "СоцТех",
37+
label: "СоцТех",
38+
},
39+
{
40+
id: 7,
41+
value: "Урбанистика",
42+
label: "Урбанистика",
43+
},
44+
];
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/** @format */
2+
3+
export const rolesMembersList = [
4+
{
5+
id: 0,
6+
value: "Наставник",
7+
label: "Наставник",
8+
},
9+
{
10+
id: 1,
11+
value: "Руководитель проекта",
12+
label: "Руководитель проекта",
13+
},
14+
{
15+
id: 2,
16+
value: "Руководитель направления",
17+
label: "Руководитель направления",
18+
},
19+
{
20+
id: 3,
21+
value: "Проектный менеджер",
22+
label: "Проектный менеджер",
23+
},
24+
{
25+
id: 4,
26+
value: "Руководитель трека",
27+
label: "Руководитель трека",
28+
},
29+
{
30+
id: 5,
31+
value: "PR-менеджер",
32+
label: "PR-менеджер",
33+
},
34+
{
35+
id: 6,
36+
value: "Участник",
37+
label: "Участник",
38+
},
39+
];
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/** @format */
2+
3+
export const trackProjectList = [
4+
{
5+
id: 0,
6+
value: "Технологическое лидерство",
7+
label: "Технологическое лидерство",
8+
},
9+
{
10+
id: 1,
11+
value: "Индустриальные",
12+
label: "Индустриальные",
13+
},
14+
{
15+
id: 2,
16+
value: "Инициативные",
17+
label: "Инициативные",
18+
},
19+
{
20+
id: 3,
21+
value: "Стратегические",
22+
label: "Стратегические",
23+
},
24+
{
25+
id: 4,
26+
value: "Научные",
27+
label: "Научные",
28+
},
29+
];

projects/core/src/consts/navProjectItems.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ export const navItems = [
99
{
1010
step: "contacts",
1111
src: "/assets/images/projects/edit/contacts.svg",
12-
label: "Контакты",
12+
label: "Контакты и ссылки",
1313
},
1414
{
1515
step: "achievements",
1616
src: "/assets/images/projects/edit/achievements.svg",
1717
label: "Достижения",
1818
},
19-
{
20-
step: "team",
21-
src: "/assets/images/projects/edit/members.svg",
22-
label: "Участники",
23-
},
2419
{
2520
step: "vacancies",
2621
src: "/assets/images/projects/edit/vacancies.svg",
2722
label: "Вакансии",
2823
},
24+
{
25+
step: "team",
26+
src: "/assets/images/projects/edit/team.svg",
27+
label: "Команда",
28+
},
2929
];
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/** @format */
2+
3+
export const environments = {
4+
links: [],
5+
};

projects/skills/src/app/task/shared/relations-task/relations-task.component.html

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
<div class="relations">
44
<h2 class="relations__title">{{ data.text }}</h2>
55
<div class="relations__description" [innerHTML]="description"></div>
6-
<div class="relations__wrapper">
6+
<div class="relations__wrapper" style="position: relative">
7+
<svg
8+
#svgOverlay
9+
class="svg-overlay"
10+
style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; pointer-events: none"
11+
></svg>
12+
713
<div class="relations__column">
814
@for (_ of Array(data.connectLeft.length); track $index) {
915
<div
16+
#leftItem
17+
[attr.data-id]="data.connectLeft[$index].id"
1018
class="relations__item relations__a"
1119
[class.relations__item--active]="
1220
resultLeft().includes(data.connectLeft[$index].id) ||
@@ -27,6 +35,8 @@ <h2 class="relations__title">{{ data.text }}</h2>
2735
<div class="relations__column" [class.relations__column--grid]="isImageGrid">
2836
@for (_ of Array(data.connectRight.length); track $index) {
2937
<div
38+
#rightItem
39+
[attr.data-id]="data.connectRight[$index].id"
3040
class="relations__item relations__b"
3141
(click)="onSelectRight(data.connectRight[$index].id)"
3242
[class.relations__item--active]="resultRight().includes(data.connectRight[$index].id)"

projects/skills/src/app/task/shared/relations-task/relations-task.component.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@
4343
flex-direction: column;
4444
gap: 10px;
4545
min-width: 220px;
46-
47-
&:nth-child(2) {
48-
flex-grow: 1;
49-
}
46+
flex-grow: 1;
5047

5148
&--grid {
5249
display: grid;

0 commit comments

Comments
 (0)