Skip to content

Commit 1eccdee

Browse files
authored
Merge pull request #245 from PROCOLLAB-github/kanban-board
Kanban board
2 parents c6c8fa5 + 21d830f commit 1eccdee

1,783 files changed

Lines changed: 55978 additions & 36255 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.

.eslintrc.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"es2021": true,
55
"jasmine": true
66
},
7-
"extends": ["standard", "prettier", "plugin:@typescript-eslint/recommended"],
7+
"extends": ["standard", "plugin:@typescript-eslint/recommended", "prettier"],
88
"parser": "@typescript-eslint/parser",
99
"parserOptions": {
1010
"ecmaVersion": "latest",
@@ -15,8 +15,9 @@
1515
"no-useless-constructor": "off",
1616
"@typescript-eslint/no-empty-function": "off",
1717
"dot-notation": "off",
18-
"@typescript-eslint/no-explicit-any": "warn",
19-
"@typescript-eslint/no-unused-vars": "warn",
20-
"@typescript-eslint/no-unused-expressions": "warn"
18+
"lines-between-class-members": "off",
19+
"@typescript-eslint/no-explicit-any": "off",
20+
"@typescript-eslint/no-unused-vars": "off",
21+
"@typescript-eslint/no-unused-expressions": "off"
2122
}
2223
}

angular.json

Lines changed: 1 addition & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
"test": {
9090
"builder": "@angular-devkit/build-angular:karma",
9191
"options": {
92+
"karmaConfig": "karma.conf.js",
9293
"polyfills": ["zone.js", "zone.js/testing"],
9394
"tsConfig": "projects/social_platform/tsconfig.spec.json",
9495
"inlineStyleLanguage": "scss",
@@ -136,94 +137,6 @@
136137
}
137138
}
138139
},
139-
"skills": {
140-
"projectType": "application",
141-
"schematics": {
142-
"@schematics/angular:component": {
143-
"style": "scss"
144-
}
145-
},
146-
"root": "projects/skills",
147-
"sourceRoot": "projects/skills/src",
148-
"prefix": "app",
149-
"architect": {
150-
"build": {
151-
"builder": "@angular-devkit/build-angular:browser",
152-
"options": {
153-
"outputPath": "dist/skills",
154-
"index": "projects/skills/src/index.html",
155-
"main": "projects/skills/src/main.ts",
156-
"polyfills": ["zone.js"],
157-
"tsConfig": "projects/skills/tsconfig.app.json",
158-
"inlineStyleLanguage": "scss",
159-
"assets": ["projects/skills/src/favicon.ico", "projects/skills/src/assets"],
160-
"styles": ["projects/skills/src/styles.scss"],
161-
"scripts": [],
162-
"stylePreprocessorOptions": {
163-
"includePaths": ["projects/skills/src"]
164-
}
165-
},
166-
"configurations": {
167-
"production": {
168-
"fileReplacements": [
169-
{
170-
"replace": "projects/skills/src/environments/environment.ts",
171-
"with": "projects/skills/src/environments/environment.prod.ts"
172-
}
173-
],
174-
"budgets": [
175-
{
176-
"type": "initial",
177-
"maximumWarning": "500kb",
178-
"maximumError": "1mb"
179-
},
180-
{
181-
"type": "anyComponentStyle",
182-
"maximumWarning": "6kb",
183-
"maximumError": "12kb"
184-
}
185-
],
186-
"outputHashing": "all"
187-
},
188-
"development": {
189-
"optimization": false,
190-
"extractLicenses": false,
191-
"sourceMap": true
192-
}
193-
},
194-
"defaultConfiguration": "production"
195-
},
196-
"serve": {
197-
"builder": "@angular-devkit/build-angular:dev-server",
198-
"configurations": {
199-
"production": {
200-
"buildTarget": "skills:build:production"
201-
},
202-
"development": {
203-
"buildTarget": "skills:build:development"
204-
}
205-
},
206-
"defaultConfiguration": "development"
207-
},
208-
"extract-i18n": {
209-
"builder": "@angular-devkit/build-angular:extract-i18n",
210-
"options": {
211-
"buildTarget": "skills:build"
212-
}
213-
},
214-
"test": {
215-
"builder": "@angular-devkit/build-angular:karma",
216-
"options": {
217-
"polyfills": ["zone.js", "zone.js/testing"],
218-
"tsConfig": "projects/skills/tsconfig.spec.json",
219-
"inlineStyleLanguage": "scss",
220-
"assets": ["projects/skills/src/favicon.ico", "projects/skills/src/assets"],
221-
"styles": ["projects/skills/src/styles.scss"],
222-
"scripts": []
223-
}
224-
}
225-
}
226-
},
227140
"ui": {
228141
"projectType": "library",
229142
"root": "projects/ui",

package.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,12 @@
44
"scripts": {
55
"ng": "ng",
66
"start:social": "ng serve social_platform --open",
7-
"start:skills": "ng serve skills --open",
87
"build:social:dev": "npm run build:sprite && ng build social_platform --configuration=development",
98
"build:social:prod": "npm run build:sprite && ng build social_platform --configuration=production",
10-
"build:skills:prod": "ng build skills --configuration=production",
11-
"build:skills:dev": "ng build skills --configuration=development",
12-
"build:prod": "npm run build:social:prod && npm run build:skills:prod",
9+
"build:prod": "npm run build:social:prod",
1310
"build:pr": "npm run build:social:dev",
1411
"watch": "ng build --watch social_platform --configuration=development",
15-
"build:sprite-social": "svg-sprite -s --dest=projects/social_platform/src/assets/icons 'projects/social_platform/src/assets/icons/svg/**/*.svg'",
16-
"build:sprite-skills": "svg-sprite -s --dest=projects/skills/src/assets/icons 'projects/skills/src/assets/icons/svg/**/*.svg'",
17-
"build:sprite": "npm run build:sprite-skills && npm run build:sprite-social",
12+
"build:sprite": "svg-sprite -s --dest=projects/social_platform/src/assets/icons 'projects/social_platform/src/assets/icons/svg/**/*.svg'",
1813
"test": "ng test",
1914
"test:ci": "ng test --browsers=Headless --no-watch",
2015
"lint:ts": "eslint projects/**/*.ts",
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/** @format */
2+
3+
export const actionTypeList = [
4+
{
5+
id: 1,
6+
value: "action",
7+
label: "действие",
8+
additionalInfo: "task",
9+
},
10+
{
11+
id: 2,
12+
value: "call",
13+
label: "звонок",
14+
additionalInfo: "phone",
15+
},
16+
{
17+
id: 3,
18+
value: "meet",
19+
label: "встреча",
20+
additionalInfo: "people-bold",
21+
},
22+
];

projects/core/src/consts/lists/ldirection-project-list.const.ts renamed to projects/core/src/consts/lists/direction-project-list.const.ts

File renamed without changes.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/**
2+
* Информация для приоритетов
3+
*
4+
* @format
5+
* @field name - выбор в выпадающем списке
6+
* @field color - цвет для определенного типа приоритета
7+
* @field priorityType - значение (от 0 до 5), которое соотносится на бэке
8+
*/
9+
10+
export const priorityInfoList = [
11+
{
12+
id: 1,
13+
label: "бэклог",
14+
color: "#322299",
15+
priorityType: 1,
16+
},
17+
{
18+
id: 2,
19+
label: "в ближайшие часы",
20+
color: "#A63838",
21+
priorityType: 2,
22+
},
23+
{
24+
id: 3,
25+
label: "высокий",
26+
color: "#D48A9E",
27+
priorityType: 3,
28+
},
29+
{
30+
id: 4,
31+
label: "средний",
32+
color: "#E5B25D",
33+
priorityType: 4,
34+
},
35+
{
36+
id: 5,
37+
label: "низкий",
38+
color: "#297373",
39+
priorityType: 5,
40+
},
41+
{
42+
id: 6,
43+
label: "улучшение",
44+
color: "#88C9A1",
45+
priorityType: 6,
46+
},
47+
];

projects/core/src/consts/lists/trajectory-more-list.const.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

projects/core/src/consts/navigation/nav-profile-items.const.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
11
/** @format */
22

3+
import { EditStep } from "projects/social_platform/src/app/api/project/project-step.service";
4+
35
export const navProfileItems = [
46
{
5-
step: "main",
7+
step: "main" as EditStep,
68
src: "main",
79
label: "основные данные",
810
},
911
{
10-
step: "education",
12+
step: "education" as EditStep,
1113
src: "in-search",
1214
label: "образование",
1315
},
1416
{
15-
step: "experience",
17+
step: "experience" as EditStep,
1618
src: "suitcase",
1719
label: "работа",
1820
},
1921
{
20-
step: "achievements",
22+
step: "achievements" as EditStep,
2123
src: "medal",
2224
label: "достижения",
2325
},
2426
{
25-
step: "skills",
27+
step: "skills" as EditStep,
2628
src: "squiz",
2729
label: "навыки",
2830
},
2931
{
30-
step: "settings",
32+
step: "settings" as EditStep,
3133
src: "settings",
3234
label: "действия",
3335
},
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @format */
22

3-
import { EditStep } from "@office/projects/edit/services/project-step.service";
3+
import { EditStep } from "projects/social_platform/src/app/api/project/project-step.service";
44

55
/**
66
* Элементы навигации для редактирования проекта
@@ -9,26 +9,32 @@ import { EditStep } from "@office/projects/edit/services/project-step.service";
99
export const navProjectItems = [
1010
{
1111
step: "main" as EditStep, // Идентификатор шага
12+
src: "main",
1213
label: "основные данные", // Отображаемый текст
1314
},
1415
{
1516
step: "contacts" as EditStep,
17+
src: "contacts",
1618
label: "партнеры и ресурсы",
1719
},
1820
{
1921
step: "achievements" as EditStep,
22+
src: "achievements",
2023
label: "достижения",
2124
},
2225
{
2326
step: "vacancies" as EditStep,
27+
src: "vacancies",
2428
label: "вакансии",
2529
},
2630
{
2731
step: "team" as EditStep,
32+
src: "team",
2833
label: "команда",
2934
},
3035
{
3136
step: "additional" as EditStep,
37+
src: "additional",
3238
label: "данные для конкурсов",
3339
},
3440
];
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/** @format */
2+
3+
export const kanbanColumnInfo = [
4+
{
5+
id: 1,
6+
label: "редактировать",
7+
value: "edit",
8+
},
9+
{
10+
id: 2,
11+
label: "удалить",
12+
value: "delete",
13+
},
14+
];

0 commit comments

Comments
 (0)